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

Edited "D HOLD" times to include "STAY ON SCREEN" option

Browse Source
This commit is contained in:
OneOfEleven
2023-10-08 11:40:17 +01:00
parent 06c7d79b4b
commit 0547452589
24 changed files with 977 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ui/inputbox.c
View File

@ -31,6 +31,5 @@ void INPUTBOX_Append(const KEY_Code_t Digit)
if (Digit >= KEY_0 && Digit != KEY_INVALID)
gInputBox[gInputBoxIndex++] = (char)(Digit - KEY_0);
// gInputBox[gInputBoxIndex++] = Digit;
}

16
ui/main.c
View File

@ -377,7 +377,7 @@ void UI_DisplayMain(void)
if (gDTMF_CallState == DTMF_CALL_STATE_CALL_OUT)
strcpy(String, (gDTMF_State == DTMF_STATE_CALL_OUT_RSP) ? "CALL OUT(RSP)" : "CALL OUT");
else
if (gDTMF_CallState == DTMF_CALL_STATE_RECEIVED)
if (gDTMF_CallState == DTMF_CALL_STATE_RECEIVED || gDTMF_CallState == DTMF_CALL_STATE_RECEIVED_STAY)
sprintf(String, "CALL FRM:%s", (DTMF_FindContact(gDTMF_Caller, Contact)) ? Contact : gDTMF_Caller);
else
if (gDTMF_IsTx)
@ -396,7 +396,7 @@ void UI_DisplayMain(void)
if (gDTMF_CallState == DTMF_CALL_STATE_CALL_OUT)
sprintf(String, ">%s", (DTMF_FindContact(gDTMF_String, Contact)) ? Contact : gDTMF_String);
else
if (gDTMF_CallState == DTMF_CALL_STATE_RECEIVED)
if (gDTMF_CallState == DTMF_CALL_STATE_RECEIVED || gDTMF_CallState == DTMF_CALL_STATE_RECEIVED_STAY)
sprintf(String, ">%s", (DTMF_FindContact(gDTMF_Callee, Contact)) ? Contact : gDTMF_Callee);
else
if (gDTMF_IsTx)
@ -735,8 +735,7 @@ void UI_DisplayMain(void)
#if defined(ENABLE_AM_FIX) && defined(ENABLE_AM_FIX_SHOW_DATA)
if (rx && gEeprom.VfoInfo[gEeprom.RX_VFO].AM_mode && gSetting_AM_fix)
{
if (gScreenToDisplay != DISPLAY_MAIN ||
gDTMF_CallState != DTMF_CALL_STATE_NONE)
if (gScreenToDisplay != DISPLAY_MAIN || gDTMF_CallState != DTMF_CALL_STATE_NONE)
return;
center_line = CENTER_LINE_AM_FIX_DATA;
@ -763,8 +762,7 @@ void UI_DisplayMain(void)
const unsigned int len = strlen(gDTMF_RX_live);
const unsigned int idx = (len > (17 - 5)) ? len - (17 - 5) : 0; // limit to last 'n' chars
if (gScreenToDisplay != DISPLAY_MAIN ||
gDTMF_CallState != DTMF_CALL_STATE_NONE)
if (gScreenToDisplay != DISPLAY_MAIN || gDTMF_CallState != DTMF_CALL_STATE_NONE)
return;
center_line = CENTER_LINE_DTMF_DEC;
@ -779,8 +777,7 @@ void UI_DisplayMain(void)
const unsigned int len = gDTMF_RX_index;
const unsigned int idx = (len > (17 - 5)) ? len - (17 - 5) : 0; // limit to last 'n' chars
if (gScreenToDisplay != DISPLAY_MAIN ||
gDTMF_CallState != DTMF_CALL_STATE_NONE)
if (gScreenToDisplay != DISPLAY_MAIN || gDTMF_CallState != DTMF_CALL_STATE_NONE)
return;
center_line = CENTER_LINE_DTMF_DEC;
@ -795,8 +792,7 @@ void UI_DisplayMain(void)
else
if (gChargingWithTypeC)
{ // charging .. show the battery state
if (gScreenToDisplay != DISPLAY_MAIN ||
gDTMF_CallState != DTMF_CALL_STATE_NONE)
if (gScreenToDisplay != DISPLAY_MAIN || gDTMF_CallState != DTMF_CALL_STATE_NONE)
return;
center_line = CENTER_LINE_CHARGE_DATA;

25
ui/menu.c
View File

@ -816,7 +816,30 @@ void UI_DisplayMenu(void)
break;
case MENU_D_HOLD:
sprintf(String, "%ds", gSubMenuSelection);
// only allow 5, 10, 20, 30, 40, 50 or "STAY ON SCREEN" (60)
switch (gSubMenuSelection)
{
case 4: gSubMenuSelection = 60; break;
case 6: gSubMenuSelection = 10; break;
case 9: gSubMenuSelection = 5; break;
case 11: gSubMenuSelection = 20; break;
case 19: gSubMenuSelection = 10; break;
case 21: gSubMenuSelection = 30; break;
case 29: gSubMenuSelection = 20; break;
case 31: gSubMenuSelection = 40; break;
case 39: gSubMenuSelection = 30; break;
case 41: gSubMenuSelection = 50; break;
case 49: gSubMenuSelection = 40; break;
case 51: gSubMenuSelection = 60; break;
case 59: gSubMenuSelection = 50; break;
case 61: gSubMenuSelection = 5; break;
}
if (gSubMenuSelection < DTMF_HOLD_MAX)
sprintf(String, "%d sec", gSubMenuSelection);
else
strcpy(String, "STAY ON\nSCREEN"); // 60
break;
case MENU_D_PRE:

1
ui/scanner.c
View File

@ -70,7 +70,6 @@ void UI_DisplayScanner(void)
else
if (gScanCssState == SCAN_CSS_STATE_FOUND)
{
// strcpy(String, "SCAN COMPLETE");
strcpy(String, "* repeat M save");
text_centered = true;
}