diff --git a/Makefile b/Makefile index 38d56a7..d77aa07 100644 --- a/Makefile +++ b/Makefile @@ -19,8 +19,8 @@ ENABLE_MAIN_KEY_HOLD := 1 ENABLE_BOOT_BEEPS := 0 ENABLE_COMPANDER := 1 ENABLE_SHOW_CHARGE_LEVEL := 1 -ENABLE_STATUSBAR_VOLTAGE := 1 -ENABLE_STATUSBAR_PERCENTAGE := 0 +ENABLE_STATUSBAR_VOLTAGE := 0 +ENABLE_STATUSBAR_PERCENTAGE := 1 #ENABLE_SINGLE_VFO_CHAN := 1 #ENABLE_BAND_SCOPE := 1 diff --git a/README.md b/README.md index 5bcf675..78569f1 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,7 @@ ENABLE_STATUSBAR_PERCENTAGE := 1 show the battery percentage on the top * AM RX everywhere * Better backlight times (inc always on) * Nicer/cleaner big numeric font than original Quansheng big numeric font +* Live DTMF decoder option, though the decoder needs some coeff tuning changes to decode other radios it seems * Various menu re-wordings (trying to reduce 'WTH does that mean ?') * Extra menu items (including hidden ones) * plus others diff --git a/app/app.c b/app/app.c index 541be93..f5dcd06 100644 --- a/app/app.c +++ b/app/app.c @@ -2068,14 +2068,12 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) if (gEeprom.AUTO_KEYPAD_LOCK) gKeyLockCountdown = 30; // 15 seconds - #ifdef ENABLE_DTMF_DECODER - if (Key == KEY_EXIT && bKeyPressed && bKeyHeld && gDTMF_ReceivedSaved[0] > 0) - { // clear the live DTMF decoder if the EXIT key is held - gDTMF_RecvTimeoutSaved = 0; - gDTMF_ReceivedSaved[0] = '\0'; - gUpdateDisplay = true; - } - #endif + if (Key == KEY_EXIT && bKeyPressed && bKeyHeld && gDTMF_ReceivedSaved[0] > 0) + { // clear the live DTMF decoder if the EXIT key is held + gDTMF_RecvTimeoutSaved = 0; + gDTMF_ReceivedSaved[0] = '\0'; + gUpdateDisplay = true; + } if (!bKeyPressed) { diff --git a/firmware b/firmware index cce4e8a..d9e7188 100644 Binary files a/firmware and b/firmware differ diff --git a/firmware.bin b/firmware.bin index 7443878..5233efe 100644 Binary files a/firmware.bin and b/firmware.bin differ diff --git a/firmware.packed.bin b/firmware.packed.bin index cd1ac98..05400ab 100644 Binary files a/firmware.packed.bin and b/firmware.packed.bin differ diff --git a/radio.c b/radio.c index 1bbbc14..883cfe3 100644 --- a/radio.c +++ b/radio.c @@ -706,7 +706,7 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0) BK4819_SetCompander(!gRxVfo->IsAM ? gRxVfo->Compander : 0); #endif - #ifndef ENABLE_DTMF_DECODER + #if 0 // there's no reason the DTMF decoder can't be used in AM RX mode too // aircraft comms use it on HF (AM and SSB) if (gRxVfo->IsAM || (!gRxVfo->DTMF_DECODING_ENABLE && !gSetting_KILLED)) diff --git a/ui/main.c b/ui/main.c index e3c49c0..ea1c599 100644 --- a/ui/main.c +++ b/ui/main.c @@ -99,9 +99,7 @@ void UI_DisplayMain(void) { sprintf(String, ">%s", gDTMF_InputBox); - #ifdef ENABLE_DTMF_DECODER - center_line_is_free = false; - #endif + center_line_is_free = false; } UI_PrintString(String, 2, 0, vfo_num * 3, 8); @@ -120,16 +118,11 @@ void UI_DisplayMain(void) } else { - #ifdef ENABLE_DTMF_DECODER - center_line_is_free = false; - #endif + center_line_is_free = false; } UI_PrintString(String, 2, 0, 2 + (vfo_num * 3), 8); - #ifdef ENABLE_DTMF_DECODER - center_line_is_free = false; - #endif - + center_line_is_free = false; continue; } @@ -236,9 +229,7 @@ void UI_DisplayMain(void) { // user entering a frequency UI_DisplayFrequency(gInputBox, 31, Line, true, false); - #ifdef ENABLE_DTMF_DECODER - center_line_is_free = false; - #endif + center_line_is_free = false; } else {