mirror of
https://github.com/egzumer/uv-k5-firmware-custom
synced 2024-11-21 17:19:57 +00:00
Clean up DTMF decoder code (now menu item)
This commit is contained in:
parent
609e50f034
commit
797fc0729f
4
Makefile
4
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
|
||||
|
||||
|
@ -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
|
||||
|
14
app/app.c
14
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)
|
||||
{
|
||||
|
BIN
firmware.bin
BIN
firmware.bin
Binary file not shown.
Binary file not shown.
2
radio.c
2
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))
|
||||
|
17
ui/main.c
17
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
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user