mirror of
https://github.com/OneOfEleven/uv-k5-firmware-custom.git
synced 2025-04-28 14:21:25 +03:00
Added DTMF timings menu compile option ENABLE_DTMF_TIMING_SETTINGS
This commit is contained in:
OneOfEleven
parent
c5035f7c49
commit
049b2237b7
5
Makefile
5
Makefile
@ -41,7 +41,7 @@ ENABLE_PWRON_PASSWORD := 0
|
||||
ENABLE_RESET_AES_KEY := 0
|
||||
ENABLE_BIG_FREQ := 0
|
||||
ENABLE_DTMF_LIVE_DECODER := 0
|
||||
ENABLE_DTMF_TIMING_SETTINGS := 1
|
||||
ENABLE_DTMF_TIMING_SETTINGS := 0
|
||||
ENABLE_SHOW_FREQ_IN_CHAN := 1
|
||||
# smaa bolf 580 B
|
||||
ENABLE_SMALL_BOLD := 0
|
||||
@ -336,6 +336,9 @@ endif
|
||||
ifeq ($(ENABLE_DTMF_LIVE_DECODER),1)
|
||||
CFLAGS += -DENABLE_DTMF_LIVE_DECODER
|
||||
endif
|
||||
ifeq ($(ENABLE_DTMF_TIMING_SETTINGS),1)
|
||||
CFLAGS += -DENABLE_DTMF_TIMING_SETTINGS
|
||||
endif
|
||||
ifeq ($(ENABLE_SHOW_FREQ_IN_CHAN),1)
|
||||
CFLAGS += -DENABLE_SHOW_FREQ_IN_CHAN
|
||||
endif
|
||||
|
||||
60
app/menu.c
60
app/menu.c
@ -360,15 +360,13 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax)
|
||||
*pMax = 99;
|
||||
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.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.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.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;
|
||||
case MENU_DTMF_1ST_PERSIST:
|
||||
case MENU_DTMF_HASH_PERSIST:
|
||||
case MENU_DTMF_PERSIST:
|
||||
case MENU_DTMF_INTERVAL:
|
||||
*pMin = 5;
|
||||
*pMax = 20;
|
||||
break;
|
||||
#endif
|
||||
|
||||
case MENU_DTMF_LIST:
|
||||
@ -756,15 +754,21 @@ void MENU_AcceptSetting(void)
|
||||
g_eeprom.config.setting.dtmf.preload_time = g_sub_menu_selection;
|
||||
break;
|
||||
|
||||
// MENU_DTMF_1ST_PERSIST,
|
||||
// MENU_DTMF_HASH_PERSIST,
|
||||
// MENU_DTMF_PERSIST,
|
||||
// MENU_DTMF_INTERVAL,
|
||||
case MENU_DTMF_1ST_PERSIST:
|
||||
g_eeprom.config.setting.dtmf.first_code_persist_time = g_sub_menu_selection;
|
||||
break;
|
||||
|
||||
// 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
|
||||
case MENU_DTMF_HASH_PERSIST:
|
||||
g_eeprom.config.setting.dtmf.hash_code_persist_time = g_sub_menu_selection;
|
||||
break;
|
||||
|
||||
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
|
||||
|
||||
#ifdef ENABLE_MDC1200
|
||||
@ -1300,15 +1304,21 @@ void MENU_ShowCurrentSetting(void)
|
||||
g_sub_menu_selection = g_eeprom.config.setting.dtmf.preload_time;
|
||||
break;
|
||||
|
||||
// MENU_DTMF_1ST_PERSIST,
|
||||
// MENU_DTMF_HASH_PERSIST,
|
||||
// MENU_DTMF_PERSIST,
|
||||
// MENU_DTMF_INTERVAL,
|
||||
case MENU_DTMF_1ST_PERSIST:
|
||||
g_sub_menu_selection = g_eeprom.config.setting.dtmf.first_code_persist_time;
|
||||
break;
|
||||
|
||||
// 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
|
||||
case MENU_DTMF_HASH_PERSIST:
|
||||
g_sub_menu_selection = g_eeprom.config.setting.dtmf.hash_code_persist_time;
|
||||
break;
|
||||
|
||||
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
|
||||
|
||||
#ifdef ENABLE_MDC1200
|
||||
|
||||
BIN
firmware.bin
BIN
firmware.bin
Binary file not shown.
Binary file not shown.
@ -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;
|
||||
#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.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.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.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;
|
||||
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 < 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 < 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 < 5 || g_eeprom.config.setting.dtmf.code_interval_time > 20) ? 10 : g_eeprom.config.setting.dtmf.code_interval_time;
|
||||
#if 0
|
||||
#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;
|
||||
|
||||
46
ui/menu.c
46
ui/menu.c
@ -127,14 +127,10 @@ const t_menu_item g_menu_list[] =
|
||||
#endif
|
||||
#ifdef ENABLE_DTMF_TIMING_SETTINGS
|
||||
{"D PRE", VOICE_ID_INVALID, MENU_DTMF_PRE },
|
||||
// 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
|
||||
{"D1PERS", VOICE_ID_INVALID, MENU_DTMF_1ST_PERSIST },
|
||||
{"DHPERS", VOICE_ID_INVALID, MENU_DTMF_HASH_PERSIST },
|
||||
{"D PER", VOICE_ID_INVALID, MENU_DTMF_PERSIST },
|
||||
{"D INT", VOICE_ID_INVALID, MENU_DTMF_INTERVAL },
|
||||
#endif
|
||||
{"PonMSG", VOICE_ID_INVALID, MENU_PON_MSG },
|
||||
{"ROGER", VOICE_ID_INVALID, MENU_ROGER_MODE },
|
||||
@ -1085,19 +1081,31 @@ void UI_DisplayMenu(void)
|
||||
|
||||
#ifdef ENABLE_DTMF_TIMING_SETTINGS
|
||||
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);
|
||||
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
|
||||
|
||||
#ifdef ENABLE_MDC1200
|
||||
|
||||
12
ui/menu.h
12
ui/menu.h
@ -108,14 +108,10 @@ enum
|
||||
#endif
|
||||
#ifdef ENABLE_DTMF_TIMING_SETTINGS
|
||||
MENU_DTMF_PRE,
|
||||
// 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
|
||||
MENU_DTMF_1ST_PERSIST,
|
||||
MENU_DTMF_HASH_PERSIST,
|
||||
MENU_DTMF_PERSIST,
|
||||
MENU_DTMF_INTERVAL,
|
||||
#endif
|
||||
#ifdef ENABLE_MDC1200
|
||||
MENU_MDC1200_MODE,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user