Merge branch 'master' into mqtt

Defines.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2018,2020,2021,2023 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2017,2018,2020,2021,2023,2025 by Jonathan Naylor G4KLX
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -54,56 +54,56 @@ const unsigned char TAG_RSSI   = 0x04U;
 
 const unsigned int  DSTAR_MODEM_DATA_LEN = 220U;
 
-enum HW_TYPE {
-	HWT_MMDVM,
-	HWT_DVMEGA,
-	HWT_MMDVM_ZUMSPOT,
-	HWT_MMDVM_HS_HAT,
-	HWT_MMDVM_HS_DUAL_HAT,
-	HWT_NANO_HOTSPOT,
-	HWT_NANO_DV,
-	HWT_D2RG_MMDVM_HS,
-	HWT_MMDVM_HS,
-	HWT_OPENGD77_HS,
-	HWT_SKYBRIDGE,
-	HWT_UNKNOWN
+enum class HW_TYPE {
+	MMDVM,
+	DVMEGA,
+	MMDVM_ZUMSPOT,
+	MMDVM_HS_HAT,
+	MMDVM_HS_DUAL_HAT,
+	NANO_HOTSPOT,
+	NANO_DV,
+	D2RG_MMDVM_HS,
+	MMDVM_HS,
+	OPENGD77_HS,
+	SKYBRIDGE,
+	UNKNOWN
 };
 
-enum RPT_RF_STATE {
-	RS_RF_LISTENING,
-	RS_RF_LATE_ENTRY,
-	RS_RF_AUDIO,
-	RS_RF_DATA_AUDIO,
-	RS_RF_DATA,
-	RS_RF_REJECTED,
-	RS_RF_INVALID
+enum class RPT_RF_STATE {
+	LISTENING,
+	LATE_ENTRY,
+	AUDIO,
+	DATA_AUDIO,
+	DATA,
+	REJECTED,
+	INVALID
 };
 
-enum RPT_NET_STATE {
-	RS_NET_IDLE,
-	RS_NET_AUDIO,
-	RS_NET_DATA_AUDIO,
-	RS_NET_DATA
+enum class RPT_NET_STATE {
+	IDLE,
+	AUDIO,
+	DATA_AUDIO,
+	DATA
 };
 
-enum DMR_BEACONS {
-	DMR_BEACONS_OFF,
-	DMR_BEACONS_NETWORK,
-	DMR_BEACONS_TIMED
+enum class DMR_BEACONS {
+	OFF,
+	NETWORK,
+	TIMED
 };
 
-enum DMR_OVCM_TYPES {
-	DMR_OVCM_OFF,
-	DMR_OVCM_RX_ON,
-	DMR_OVCM_TX_ON,
-	DMR_OVCM_ON,
-	DMR_OVCM_FORCE_OFF
+enum class DMR_OVCM {
+	OFF,
+	RX_ON,
+	TX_ON,
+	ON,
+	FORCE_OFF
 };
 
-enum DSTAR_ACK_MESSAGE {
-	DSTAR_ACK_BER,
-	DSTAR_ACK_RSSI,
-	DSTAR_ACK_SMETER
+enum class DSTAR_ACK {
+	BER,
+	RSSI,
+	SMETER
 };
 
 #endif