Update

settings.h

@@ -31,9 +31,10 @@
 typedef enum ModemModulation {
     MOD_FSK_450,   // for bad conditions
     MOD_FSK_700,   // for medium conditions
+    MOD_FSK_1200,
+    MOD_FSK_2400,
     MOD_AFSK_1200,  // for good conditions
     MOD_AFSK_2400,
-    MOD_FSK_1200_2400,
     MOD_NOAA_SAME
 } ModemModulation;
 
@@ -261,11 +262,6 @@ typedef struct {
     uint8_t MIC_SENSITIVITY;
     uint8_t MIC_SENSITIVITY_TUNING;
     uint8_t CHAN_1_CALL;
-#ifdef ENABLE_DTMF_CALLING
-    char                  ANI_DTMF_ID[8];
-    char                  KILL_CODE[8];
-    char                  REVIVE_CODE[8];
-#endif
     char DTMF_UP_CODE[16];
 
     uint8_t field57_0x6c;
@@ -276,21 +272,12 @@ typedef struct {
     uint8_t field60_0x7e;
     uint8_t field61_0x7f;
 
-#ifdef ENABLE_DTMF_CALLING
-    char                  DTMF_SEPARATE_CODE;
-    char                  DTMF_GROUP_CALL_CODE;
-    uint8_t               DTMF_DECODE_RESPONSE;
-    uint8_t               DTMF_auto_reset_time;
-#endif
     uint16_t DTMF_PRELOAD_TIME;
     uint16_t DTMF_FIRST_CODE_PERSIST_TIME;
     uint16_t DTMF_HASH_CODE_PERSIST_TIME;
     uint16_t DTMF_CODE_PERSIST_TIME;
     uint16_t DTMF_CODE_INTERVAL_TIME;
     bool DTMF_SIDE_TONE;
-#ifdef ENABLE_DTMF_CALLING
-    bool                  PERMIT_REMOTE_KILL;
-#endif
     int16_t BK4819_XTAL_FREQ_LOW;
 #ifdef ENABLE_NOAA
     bool              NOAA_AUTO_SCAN;