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

DTMF update

Browse Source
This commit is contained in:
OneOfEleven 2023-12-03 08:29:31 +00:00
parent 1bff1b5cb1
commit 17922878fd
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/dtmf.c
View File

@ -400,11 +400,9 @@ bool DTMF_Reply(void)
switch (g_dtmf_reply_state) switch (g_dtmf_reply_state)
{ {
case DTMF_REPLY_ANI: case DTMF_REPLY_ANI:
if (g_dtmf_call_mode == DTMF_CALL_MODE_DTMF)
{
pString = g_dtmf_string; pString = g_dtmf_string;
}
else if (g_dtmf_call_mode != DTMF_CALL_MODE_DTMF)
{ // append our ID code onto the end of the DTMF code to send { // append our ID code onto the end of the DTMF code to send
sprintf(str, "%s%c%s", g_dtmf_string, g_eeprom.config.setting.dtmf.separate_code, g_eeprom.config.setting.dtmf.ani_id); sprintf(str, "%s%c%s", g_dtmf_string, g_eeprom.config.setting.dtmf.separate_code, g_eeprom.config.setting.dtmf.ani_id);
pString = str; pString = str;

9
app/generic.c
View File

@ -213,17 +213,16 @@ void GENERIC_Key_PTT(bool key_pressed)
if (g_dtmf_input_box_index < sizeof(g_dtmf_input_box)) if (g_dtmf_input_box_index < sizeof(g_dtmf_input_box))
g_dtmf_input_box[g_dtmf_input_box_index] = 0; // NULL term the string g_dtmf_input_box[g_dtmf_input_box_index] = 0; // NULL term the string
#if 1
// append our DTMF ID to the inputted DTMF code - // append our DTMF ID to the inputted DTMF code -
// IF the user inputted code is exactly 3 digits long #if 0
// QS
if (g_dtmf_input_box_index == 3) if (g_dtmf_input_box_index == 3)
g_dtmf_call_mode = DTMF_CheckGroupCall(g_dtmf_input_box, 3); g_dtmf_call_mode = DTMF_CheckGroupCall(g_dtmf_input_box, 3);
else else
g_dtmf_call_mode = DTMF_CALL_MODE_DTMF; g_dtmf_call_mode = DTMF_CALL_MODE_DTMF;
#else #else
// append our DTMF ID to the inputted DTMF code - // 1of11
// IF the user inputted code is exactly 3 digits long and D-DCD is enabled if (g_dtmf_input_box_index == 3 && g_dtmf_input_box[0] != '*' && g_dtmf_input_box[0] != '#')
if (g_dtmf_input_box_index == 3 && g_tx_vfo->channel.dtmf_decoding_enable > 0)
g_dtmf_call_mode = DTMF_CheckGroupCall(g_dtmf_input_box, 3); g_dtmf_call_mode = DTMF_CheckGroupCall(g_dtmf_input_box, 3);
else else
g_dtmf_call_mode = DTMF_CALL_MODE_DTMF; g_dtmf_call_mode = DTMF_CALL_MODE_DTMF;

BIN
firmware.bin
View File

Binary file not shown.

BIN
firmware.packed.bin
View File

Binary file not shown.