mirrors/uv-k5-firmware-custom
0
Fork 0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-06-19 14:48:03 +03:00
Code Issues Releases Activity

Sanity check on DTMF hold time

Browse Source
This commit is contained in:
OneOfEleven
2023-10-04 21:29:35 +01:00
parent 5900d46edb
commit fe949d2ae3
10 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/app.c
View File

@ -1979,9 +1979,9 @@ void APP_TimeSlice500ms(void)
gCurrentFunction != FUNCTION_TRANSMIT &&
gCurrentFunction != FUNCTION_RECEIVE)
{
if (gDTMF_AUTO_RESET_TIME > 0)
if (gDTMF_auto_reset_time_500ms > 0)
{
if (--gDTMF_AUTO_RESET_TIME == 0)
if (--gDTMF_auto_reset_time_500ms == 0)
{
gDTMF_CallState = DTMF_CALL_STATE_NONE;
gUpdateDisplay = true;
@ -2469,7 +2469,7 @@ Skip:
RADIO_SetupRegisters(true);
gDTMF_AUTO_RESET_TIME = 0;
gDTMF_auto_reset_time_500ms = 0;
gDTMF_CallState = DTMF_CALL_STATE_NONE;
gDTMF_TxStopCountdown_500ms = 0;
gDTMF_IsTx = false;

4
app/dtmf.c
View File

@ -54,8 +54,8 @@ char gDTMF_Caller[4];
char gDTMF_Callee[4];
DTMF_State_t gDTMF_State;
uint8_t gDTMF_DecodeRingCountdown_500ms;
uint8_t gDTMFChosenContact;
uint8_t gDTMF_AUTO_RESET_TIME;
uint8_t gDTMF_chosen_contact;
uint8_t gDTMF_auto_reset_time_500ms;
DTMF_CallState_t gDTMF_CallState;
DTMF_ReplyState_t gDTMF_ReplyState;
DTMF_CallMode_t gDTMF_CallMode;

4
app/dtmf.h
View File

@ -83,8 +83,8 @@ extern char gDTMF_Caller[4];
extern char gDTMF_Callee[4];
extern DTMF_State_t gDTMF_State;
extern uint8_t gDTMF_DecodeRingCountdown_500ms;
extern uint8_t gDTMFChosenContact;
extern uint8_t gDTMF_AUTO_RESET_TIME;
extern uint8_t gDTMF_chosen_contact;
extern uint8_t gDTMF_auto_reset_time_500ms;
extern DTMF_CallState_t gDTMF_CallState;
extern DTMF_ReplyState_t gDTMF_ReplyState;
extern DTMF_CallMode_t gDTMF_CallMode;

8
app/menu.c
View File

@ -630,7 +630,7 @@ void MENU_AcceptSetting(void)
break;
case MENU_D_HOLD:
gEeprom.DTMF_AUTO_RESET_TIME = gSubMenuSelection;
gEeprom.DTMF_auto_reset_time = gSubMenuSelection;
break;
case MENU_D_PRE:
@ -663,7 +663,7 @@ void MENU_AcceptSetting(void)
break;
case MENU_D_LIST:
gDTMFChosenContact = gSubMenuSelection - 1;
gDTMF_chosen_contact = gSubMenuSelection - 1;
if (gIsDtmfContactValid)
{
GUI_SelectNextDisplay(DISPLAY_MAIN);
@ -1044,7 +1044,7 @@ void MENU_ShowCurrentSetting(void)
break;
case MENU_D_HOLD:
gSubMenuSelection = gEeprom.DTMF_AUTO_RESET_TIME;
gSubMenuSelection = gEeprom.DTMF_auto_reset_time;
break;
case MENU_D_PRE:
@ -1064,7 +1064,7 @@ void MENU_ShowCurrentSetting(void)
break;
case MENU_D_LIST:
gSubMenuSelection = gDTMFChosenContact + 1;
gSubMenuSelection = gDTMF_chosen_contact + 1;
break;
case MENU_D_LIVE_DEC: