mirrors/uv-k5-firmware-custom
0
Fork 0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-04-28 22:31:25 +03:00
Code Issues Releases Activity

Added DTMF timings menu compile option ENABLE_DTMF_TIMING_SETTINGS

Browse Source
This commit is contained in:
OneOfEleven 2023-12-06 09:08:24 +00:00
parent c5035f7c49
commit 049b2237b7
7 changed files with 74 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -41,7 +41,7 @@ ENABLE_PWRON_PASSWORD := 0
ENABLE_RESET_AES_KEY := 0 ENABLE_RESET_AES_KEY := 0
ENABLE_BIG_FREQ := 0 ENABLE_BIG_FREQ := 0
ENABLE_DTMF_LIVE_DECODER := 0 ENABLE_DTMF_LIVE_DECODER := 0
ENABLE_DTMF_TIMING_SETTINGS := 1 ENABLE_DTMF_TIMING_SETTINGS := 0
ENABLE_SHOW_FREQ_IN_CHAN := 1 ENABLE_SHOW_FREQ_IN_CHAN := 1
# smaa bolf 580 B # smaa bolf 580 B
ENABLE_SMALL_BOLD := 0 ENABLE_SMALL_BOLD := 0
@ -336,6 +336,9 @@ endif
ifeq ($(ENABLE_DTMF_LIVE_DECODER),1) ifeq ($(ENABLE_DTMF_LIVE_DECODER),1)
CFLAGS += -DENABLE_DTMF_LIVE_DECODER CFLAGS += -DENABLE_DTMF_LIVE_DECODER
endif endif
ifeq ($(ENABLE_DTMF_TIMING_SETTINGS),1)
CFLAGS += -DENABLE_DTMF_TIMING_SETTINGS
endif
ifeq ($(ENABLE_SHOW_FREQ_IN_CHAN),1) ifeq ($(ENABLE_SHOW_FREQ_IN_CHAN),1)
CFLAGS += -DENABLE_SHOW_FREQ_IN_CHAN CFLAGS += -DENABLE_SHOW_FREQ_IN_CHAN
endif endif

60
app/menu.c
View File

@ -360,15 +360,13 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax)
*pMax = 99; *pMax = 99;
break; break;
// MENU_DTMF_1ST_PERSIST, case MENU_DTMF_1ST_PERSIST:
// MENU_DTMF_HASH_PERSIST, case MENU_DTMF_HASH_PERSIST:
// MENU_DTMF_PERSIST, case MENU_DTMF_PERSIST:
// MENU_DTMF_INTERVAL, case MENU_DTMF_INTERVAL:
*pMin = 5;
// g_eeprom.config.setting.dtmf.first_code_persist_time = (g_eeprom.config.setting.dtmf.first_code_persist_time < 8 || g_eeprom.config.setting.dtmf.first_code_persist_time > 20) ? 10 : g_eeprom.config.setting.dtmf.first_code_persist_time; *pMax = 20;
// g_eeprom.config.setting.dtmf.hash_code_persist_time = (g_eeprom.config.setting.dtmf.hash_code_persist_time < 8 || g_eeprom.config.setting.dtmf.hash_code_persist_time > 20) ? 10 : g_eeprom.config.setting.dtmf.hash_code_persist_time; break;
// g_eeprom.config.setting.dtmf.code_persist_time = (g_eeprom.config.setting.dtmf.code_persist_time < 8 || g_eeprom.config.setting.dtmf.code_persist_time > 20) ? 10 : g_eeprom.config.setting.dtmf.code_persist_time;
// g_eeprom.config.setting.dtmf.code_interval_time = (g_eeprom.config.setting.dtmf.code_interval_time < 8 || g_eeprom.config.setting.dtmf.code_interval_time > 20) ? 10 : g_eeprom.config.setting.dtmf.code_interval_time;
#endif #endif
case MENU_DTMF_LIST: case MENU_DTMF_LIST:
@ -756,15 +754,21 @@ void MENU_AcceptSetting(void)
g_eeprom.config.setting.dtmf.preload_time = g_sub_menu_selection; g_eeprom.config.setting.dtmf.preload_time = g_sub_menu_selection;
break; break;
// MENU_DTMF_1ST_PERSIST, case MENU_DTMF_1ST_PERSIST:
// MENU_DTMF_HASH_PERSIST, g_eeprom.config.setting.dtmf.first_code_persist_time = g_sub_menu_selection;
// MENU_DTMF_PERSIST, break;
// MENU_DTMF_INTERVAL,
// g_eeprom.config.setting.dtmf.first_code_persist_time case MENU_DTMF_HASH_PERSIST:
// g_eeprom.config.setting.dtmf.hash_code_persist_time g_eeprom.config.setting.dtmf.hash_code_persist_time = g_sub_menu_selection;
// g_eeprom.config.setting.dtmf.code_persist_time break;
// g_eeprom.config.setting.dtmf.code_interval_time
case MENU_DTMF_PERSIST:
g_eeprom.config.setting.dtmf.code_persist_time = g_sub_menu_selection;
break;
case MENU_DTMF_INTERVAL:
g_eeprom.config.setting.dtmf.code_interval_time = g_sub_menu_selection;
break;
#endif #endif
#ifdef ENABLE_MDC1200 #ifdef ENABLE_MDC1200
@ -1300,15 +1304,21 @@ void MENU_ShowCurrentSetting(void)
g_sub_menu_selection = g_eeprom.config.setting.dtmf.preload_time; g_sub_menu_selection = g_eeprom.config.setting.dtmf.preload_time;
break; break;
// MENU_DTMF_1ST_PERSIST, case MENU_DTMF_1ST_PERSIST:
// MENU_DTMF_HASH_PERSIST, g_sub_menu_selection = g_eeprom.config.setting.dtmf.first_code_persist_time;
// MENU_DTMF_PERSIST, break;
// MENU_DTMF_INTERVAL,
// g_eeprom.config.setting.dtmf.first_code_persist_time case MENU_DTMF_HASH_PERSIST:
// g_eeprom.config.setting.dtmf.hash_code_persist_time g_sub_menu_selection = g_eeprom.config.setting.dtmf.hash_code_persist_time;
// g_eeprom.config.setting.dtmf.code_persist_time break;
// g_eeprom.config.setting.dtmf.code_interval_time
case MENU_DTMF_PERSIST:
g_sub_menu_selection = g_eeprom.config.setting.dtmf.code_persist_time;
break;
case MENU_DTMF_INTERVAL:
g_sub_menu_selection = g_eeprom.config.setting.dtmf.code_interval_time;
break;
#endif #endif
#ifdef ENABLE_MDC1200 #ifdef ENABLE_MDC1200

BIN
firmware.bin
View File

Binary file not shown.

BIN
firmware.packed.bin
View File

Binary file not shown.

8
settings.c
View File

@ -231,10 +231,10 @@ void SETTINGS_read_eeprom(void)
g_eeprom.config.setting.dtmf.auto_reset_time = (g_eeprom.config.setting.dtmf.auto_reset_time <= DTMF_HOLD_MAX) ? g_eeprom.config.setting.dtmf.auto_reset_time : (g_eeprom.config.setting.dtmf.auto_reset_time >= DTMF_HOLD_MIN) ? g_eeprom.config.setting.dtmf.auto_reset_time : DTMF_HOLD_MAX; g_eeprom.config.setting.dtmf.auto_reset_time = (g_eeprom.config.setting.dtmf.auto_reset_time <= DTMF_HOLD_MAX) ? g_eeprom.config.setting.dtmf.auto_reset_time : (g_eeprom.config.setting.dtmf.auto_reset_time >= DTMF_HOLD_MIN) ? g_eeprom.config.setting.dtmf.auto_reset_time : DTMF_HOLD_MAX;
#endif #endif
g_eeprom.config.setting.dtmf.preload_time = (g_eeprom.config.setting.dtmf.preload_time < 3 || g_eeprom.config.setting.dtmf.preload_time > 99) ? 30 : g_eeprom.config.setting.dtmf.preload_time; g_eeprom.config.setting.dtmf.preload_time = (g_eeprom.config.setting.dtmf.preload_time < 3 || g_eeprom.config.setting.dtmf.preload_time > 99) ? 30 : g_eeprom.config.setting.dtmf.preload_time;
g_eeprom.config.setting.dtmf.first_code_persist_time = (g_eeprom.config.setting.dtmf.first_code_persist_time < 8 || g_eeprom.config.setting.dtmf.first_code_persist_time > 20) ? 10 : g_eeprom.config.setting.dtmf.first_code_persist_time; g_eeprom.config.setting.dtmf.first_code_persist_time = (g_eeprom.config.setting.dtmf.first_code_persist_time < 5 || g_eeprom.config.setting.dtmf.first_code_persist_time > 20) ? 10 : g_eeprom.config.setting.dtmf.first_code_persist_time;
g_eeprom.config.setting.dtmf.hash_code_persist_time = (g_eeprom.config.setting.dtmf.hash_code_persist_time < 8 || g_eeprom.config.setting.dtmf.hash_code_persist_time > 20) ? 10 : g_eeprom.config.setting.dtmf.hash_code_persist_time; g_eeprom.config.setting.dtmf.hash_code_persist_time = (g_eeprom.config.setting.dtmf.hash_code_persist_time < 5 || g_eeprom.config.setting.dtmf.hash_code_persist_time > 20) ? 10 : g_eeprom.config.setting.dtmf.hash_code_persist_time;
g_eeprom.config.setting.dtmf.code_persist_time = (g_eeprom.config.setting.dtmf.code_persist_time < 8 || g_eeprom.config.setting.dtmf.code_persist_time > 20) ? 10 : g_eeprom.config.setting.dtmf.code_persist_time; g_eeprom.config.setting.dtmf.code_persist_time = (g_eeprom.config.setting.dtmf.code_persist_time < 5 || g_eeprom.config.setting.dtmf.code_persist_time > 20) ? 10 : g_eeprom.config.setting.dtmf.code_persist_time;
g_eeprom.config.setting.dtmf.code_interval_time = (g_eeprom.config.setting.dtmf.code_interval_time < 8 || g_eeprom.config.setting.dtmf.code_interval_time > 20) ? 10 : g_eeprom.config.setting.dtmf.code_interval_time; g_eeprom.config.setting.dtmf.code_interval_time = (g_eeprom.config.setting.dtmf.code_interval_time < 5 || g_eeprom.config.setting.dtmf.code_interval_time > 20) ? 10 : g_eeprom.config.setting.dtmf.code_interval_time;
#if 0 #if 0
#ifdef ENABLE_KILL_REVIVE #ifdef ENABLE_KILL_REVIVE
g_eeprom.config.setting.dtmf.permit_remote_kill = (g_eeprom.config.setting.dtmf.permit_remote_kill < 2) ? g_eeprom.config.setting.dtmf.permit_remote_kill : 0; g_eeprom.config.setting.dtmf.permit_remote_kill = (g_eeprom.config.setting.dtmf.permit_remote_kill < 2) ? g_eeprom.config.setting.dtmf.permit_remote_kill : 0;

46
ui/menu.c
View File

@ -127,14 +127,10 @@ const t_menu_item g_menu_list[] =
#endif #endif
#ifdef ENABLE_DTMF_TIMING_SETTINGS #ifdef ENABLE_DTMF_TIMING_SETTINGS
{"D PRE", VOICE_ID_INVALID, MENU_DTMF_PRE }, {"D PRE", VOICE_ID_INVALID, MENU_DTMF_PRE },
// MENU_DTMF_1ST_PERSIST, {"D1PERS", VOICE_ID_INVALID, MENU_DTMF_1ST_PERSIST },
// MENU_DTMF_HASH_PERSIST, {"DHPERS", VOICE_ID_INVALID, MENU_DTMF_HASH_PERSIST },
// MENU_DTMF_PERSIST, {"D PER", VOICE_ID_INVALID, MENU_DTMF_PERSIST },
// MENU_DTMF_INTERVAL, {"D INT", VOICE_ID_INVALID, MENU_DTMF_INTERVAL },
// g_eeprom.config.setting.dtmf.first_code_persist_time
// g_eeprom.config.setting.dtmf.hash_code_persist_time
// g_eeprom.config.setting.dtmf.code_persist_time
// g_eeprom.config.setting.dtmf.code_interval_time
#endif #endif
{"PonMSG", VOICE_ID_INVALID, MENU_PON_MSG }, {"PonMSG", VOICE_ID_INVALID, MENU_PON_MSG },
{"ROGER", VOICE_ID_INVALID, MENU_ROGER_MODE }, {"ROGER", VOICE_ID_INVALID, MENU_ROGER_MODE },
@ -1085,19 +1081,31 @@ void UI_DisplayMenu(void)
#ifdef ENABLE_DTMF_TIMING_SETTINGS #ifdef ENABLE_DTMF_TIMING_SETTINGS
case MENU_DTMF_PRE: case MENU_DTMF_PRE:
strcpy(str, "DTMF BOT\nDELAY\n"); case MENU_DTMF_1ST_PERSIST:
case MENU_DTMF_HASH_PERSIST:
case MENU_DTMF_PERSIST:
case MENU_DTMF_INTERVAL:
strcpy(str, "DTMF ");
switch (g_menu_cursor)
{
case MENU_DTMF_PRE:
strcat(str, " PRE\n");
break;
case MENU_DTMF_1ST_PERSIST:
strcat(str, "1 CODE\nPERSIST\n");
break;
case MENU_DTMF_HASH_PERSIST:
strcat(str, "#\nPERSIST\n");
break;
case MENU_DTMF_PERSIST:
strcat(str, "CODE\nPERSIST\n");
break;
case MENU_DTMF_INTERVAL:
strcat(str, "CODE\nINTERVAL\n");
break;
}
sprintf(str + strlen(str), "%dms", 10 * g_sub_menu_selection); sprintf(str + strlen(str), "%dms", 10 * g_sub_menu_selection);
break; break;
// MENU_DTMF_1ST_PERSIST,
// MENU_DTMF_HASH_PERSIST,
// MENU_DTMF_PERSIST,
// MENU_DTMF_INTERVAL,
// g_eeprom.config.setting.dtmf.first_code_persist_time
// g_eeprom.config.setting.dtmf.hash_code_persist_time
// g_eeprom.config.setting.dtmf.code_persist_time
// g_eeprom.config.setting.dtmf.code_interval_time
#endif #endif
#ifdef ENABLE_MDC1200 #ifdef ENABLE_MDC1200

12
ui/menu.h
View File

@ -108,14 +108,10 @@ enum
#endif #endif
#ifdef ENABLE_DTMF_TIMING_SETTINGS #ifdef ENABLE_DTMF_TIMING_SETTINGS
MENU_DTMF_PRE, MENU_DTMF_PRE,
// MENU_DTMF_1ST_PERSIST, MENU_DTMF_1ST_PERSIST,
// MENU_DTMF_HASH_PERSIST, MENU_DTMF_HASH_PERSIST,
// MENU_DTMF_PERSIST, MENU_DTMF_PERSIST,
// MENU_DTMF_INTERVAL, MENU_DTMF_INTERVAL,
// g_eeprom.config.setting.dtmf.first_code_persist_time
// g_eeprom.config.setting.dtmf.hash_code_persist_time
// g_eeprom.config.setting.dtmf.code_persist_time
// g_eeprom.config.setting.dtmf.code_interval_time
#endif #endif
#ifdef ENABLE_MDC1200 #ifdef ENABLE_MDC1200
MENU_MDC1200_MODE, MENU_MDC1200_MODE,