From 52969568c395ae47951ff71e4838d133cdbc1cc6 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Sat, 11 Mar 2023 18:07:44 -0500 Subject: [PATCH] fix compiler directive typo; --- SerialPort.cpp | 59 ++------------------------------------------------ 1 file changed, 2 insertions(+), 57 deletions(-) diff --git a/SerialPort.cpp b/SerialPort.cpp index 035d965..dce493a 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__); @@ -208,10 +153,10 @@ void SerialPort::process() if (m_modemState == STATE_P25_CAL_1K || m_modemState == STATE_P25_CAL) err = calP25.write(m_buffer + 3U, m_len - 3U); #endif // defined(ENABLE_P25) -#if defined(ENABLE_P25) +#if defined(ENABLE_NXDN) if (m_modemState == STATE_NXDN_CAL) err = calNXDN.write(m_buffer + 3U, m_len - 3U); -#endif // defined(ENABLE_P25) +#endif // defined(ENABLE_NXDN) if (err == RSN_OK) { sendACK();