From eb7ffb65e4e0f0162a8c7acd9b09755e9e5ddec1 Mon Sep 17 00:00:00 2001
From: Bryan Biedenkapp <gatekeep@gmail.com>
Date: Sat, 11 Mar 2023 17:57:48 -0500
Subject: [PATCH] remove unnecessary compiler directives;

---
 Defines.h        | 52 +++++++++++++++++++++++++++++++++++++--------
 FirmwareMain.cpp | 12 -----------
 SerialPort.cpp   | 55 ------------------------------------------------
 3 files changed, 43 insertions(+), 76 deletions(-)

diff --git a/Defines.h b/Defines.h
index 1d32c90..7dd8be4 100644
--- a/Defines.h
+++ b/Defines.h
@@ -92,15 +92,6 @@ typedef unsigned long long  ulong64_t;
 
 #define DSP_FW_API 
 
-// Allow the DMR protocol
-#define ENABLE_DMR
-
-// Allow the P25 protocol
-#define ENABLE_P25
-
-// Allow the NXDN protocol
-#define ENABLE_NXDN
-
 // Enable ADF7021 support
 #define ENABLE_ADF7021
 
@@ -128,6 +119,49 @@ typedef unsigned long long  ulong64_t;
 // Pass RSSI information to the host
 // #define SEND_RSSI_DATA
 
+#define DESCR_DMR        "DMR, "
+#define DESCR_P25        "P25, "
+#define DESCR_NXDN       "NXDN, "
+
+#if defined(SEND_RSSI_DATA)
+#define DESCR_RSSI        "RSSI, "
+#else
+#define DESCR_RSSI        ""
+#endif
+
+#if defined(ZUMSPOT_ADF7021)
+#define BOARD_INFO      "ZUMspot"
+#elif defined(MMDVM_HS_HAT_REV12)
+#define BOARD_INFO      "MMDVM_HS_Hat"
+#elif defined(MMDVM_HS_DUAL_HAT_REV10)
+#define BOARD_INFO      "MMDVM_HS_Dual_Hat"
+#elif defined(NANO_HOTSPOT)
+#define BOARD_INFO      "Nano_hotSPOT"
+#elif defined(NANO_DV_REV11)
+#define BOARD_INFO      "Nano_DV"
+#elif defined(SKYBRIDGE_HS)
+#define BOARD_INFO      "SkyBridge"
+#elif defined(LONESTAR_USB)
+#define BOARD_INFO      "LS_USB_STICK"
+#else
+#define BOARD_INFO      "MMDVM_HS"
+#endif
+
+#if defined(ADF7021_14_7456)
+#define DESCR_OSC       "TCXO 14.7456, "
+#endif
+#if defined(ADF7021_12_2880)
+#define DESCR_OSC       "TCXO 12.2880, "
+#endif
+
+#if defined(ENABLE_ADF7021) && defined(ADF7021_N_VER)
+#define RF_CHIP         "ADF7021N, "
+#elif defined(ENABLE_ADF7021)
+#define RF_CHIP         "ADF7021, "
+#endif
+
+#define DESCRIPTION        "Digital Voice Modem DSP Hotspot [" BOARD_INFO "] (" RF_CHIP DESCR_DMR DESCR_P25 DESCR_NXDN DESCR_OSC DESCR_RSSI "CW Id)"
+
 const uint8_t BIT_MASK_TABLE[] = { 0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U };
 
 #define CPU_TYPE_STM32 0x02U
diff --git a/FirmwareMain.cpp b/FirmwareMain.cpp
index a63dea8..773491e 100644
--- a/FirmwareMain.cpp
+++ b/FirmwareMain.cpp
@@ -42,21 +42,9 @@ DVM_STATE m_modemState = STATE_IDLE;
 bool m_cwIdState = false;
 uint8_t m_cwIdTXLevel = 30;
 
-#ifdef ENABLE_DMR
 bool m_dmrEnable = true;
-#else
-bool m_dmrEnable = false;
-#endif
-#ifdef ENABLE_P25
 bool m_p25Enable = true;
-#else
-bool m_p25Enable = false;
-#endif
-#ifdef ENABLE_NXDN
 bool m_nxdnEnable = true;
-#else
-bool m_nxdnEnable = false;
-#endif
 
 bool m_duplex = false;
 
diff --git a/SerialPort.cpp b/SerialPort.cpp
index 0d24308..e4ca8ac 100644
--- a/SerialPort.cpp
+++ b/SerialPort.cpp
@@ -38,61 +38,6 @@
  //  Constants
  // ---------------------------------------------------------------------------
 
-#if defined(ENABLE_DMR)
-#define DESCR_DMR        "DMR, "
-#else
-#define DESCR_DMR        ""
-#endif
-#if defined(ENABLE_P25)
-#define DESCR_P25        "P25, "
-#else
-#define DESCR_P25        ""
-#endif
-#if defined(ENABLE_NXDN)
-#define DESCR_NXDN       "NXDN, "
-#else
-#define DESCR_NXDN       ""
-#endif
-
-#if defined(SEND_RSSI_DATA)
-#define DESCR_RSSI        "RSSI, "
-#else
-#define DESCR_RSSI        ""
-#endif
-
-#if defined(ZUMSPOT_ADF7021)
-#define BOARD_INFO      "ZUMspot"
-#elif defined(MMDVM_HS_HAT_REV12)
-#define BOARD_INFO      "MMDVM_HS_Hat"
-#elif defined(MMDVM_HS_DUAL_HAT_REV10)
-#define BOARD_INFO      "MMDVM_HS_Dual_Hat"
-#elif defined(NANO_HOTSPOT)
-#define BOARD_INFO      "Nano_hotSPOT"
-#elif defined(NANO_DV_REV11)
-#define BOARD_INFO      "Nano_DV"
-#elif defined(SKYBRIDGE_HS)
-#define BOARD_INFO      "SkyBridge"
-#elif defined(LONESTAR_USB)
-#define BOARD_INFO      "LS_USB_STICK"
-#else
-#define BOARD_INFO      "MMDVM_HS"
-#endif
-
-#if defined(ADF7021_14_7456)
-#define DESCR_OSC       "TCXO 14.7456, "
-#endif
-#if defined(ADF7021_12_2880)
-#define DESCR_OSC       "TCXO 12.2880, "
-#endif
-
-#if defined(ENABLE_ADF7021) && defined(ADF7021_N_VER)
-#define RF_CHIP         "ADF7021N, "
-#elif defined(ENABLE_ADF7021)
-#define RF_CHIP         "ADF7021, "
-#endif
-
-#define DESCRIPTION        "Digital Voice Modem DSP Hotspot [" BOARD_INFO "] (" RF_CHIP DESCR_DMR DESCR_P25 DESCR_NXDN DESCR_OSC DESCR_RSSI "CW Id)"
-
 #define concat(a, b, c) a " (build " b " " c ")"
 const char HARDWARE[] = concat(DESCRIPTION, __TIME__, __DATE__);