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

fix DTMF TX bug

Browse Source
This commit is contained in:
OneOfEleven 2023-12-08 14:21:41 +00:00
parent 8084a92c39
commit 23214087dc
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -10,7 +10,7 @@ ENABLE_OVERLAY := 0
ENABLE_LTO := 1 ENABLE_LTO := 1
# UART Programming 2.9 kB # UART Programming 2.9 kB
ENABLE_UART := 1 ENABLE_UART := 1
ENABLE_UART_DEBUG := 0 ENABLE_UART_DEBUG := 1
# AirCopy 2.5 kB # AirCopy 2.5 kB
ENABLE_AIRCOPY := 0 ENABLE_AIRCOPY := 0
ENABLE_AIRCOPY_REMEMBER_FREQ := 1 ENABLE_AIRCOPY_REMEMBER_FREQ := 1
@ -27,7 +27,7 @@ ENABLE_NOAA := 0
ENABLE_VOICE := 0 ENABLE_VOICE := 0
ENABLE_MUTE_RADIO_FOR_VOICE := 0 ENABLE_MUTE_RADIO_FOR_VOICE := 0
# Tx on Voice 1.0 kB # Tx on Voice 1.0 kB
ENABLE_VOX := 1 ENABLE_VOX := 0
ENABLE_VOX_MORE_SENSITIVE := 1 ENABLE_VOX_MORE_SENSITIVE := 1
# Tx Alarm 600 B # Tx Alarm 600 B
ENABLE_ALARM := 0 ENABLE_ALARM := 0
@ -47,7 +47,7 @@ ENABLE_DTMF_CALL_FLASH_LIGHT := 0
# Kill and Revive 400 B # Kill and Revive 400 B
ENABLE_DTMF_KILL_REVIVE := 0 ENABLE_DTMF_KILL_REVIVE := 0
ENABLE_SHOW_FREQ_IN_CHAN := 1 ENABLE_SHOW_FREQ_IN_CHAN := 1
# smaa bold 580 B # small bold 580 B
ENABLE_SMALL_BOLD := 1 ENABLE_SMALL_BOLD := 1
# smallest font 2 kB # smallest font 2 kB
ENABLE_SMALLEST_FONT := 0 ENABLE_SMALLEST_FONT := 0

11
app/dtmf.c
View File

@ -410,6 +410,10 @@ bool DTMF_Reply(void)
char str[23]; char str[23];
#endif #endif
#if defined(ENABLE_UART) && defined(ENABLE_UART_DEBUG)
UART_printf("dtmf reply none %d, %s\n", g_dtmf_reply_state, g_dtmf_string);
#endif
switch (g_dtmf_reply_state) switch (g_dtmf_reply_state)
{ {
case DTMF_REPLY_STR: case DTMF_REPLY_STR:
@ -440,15 +444,10 @@ bool DTMF_Reply(void)
sprintf(str, "%s%c%s", g_eeprom.config.setting.dtmf.ani_id, g_eeprom.config.setting.dtmf.separate_code, "AAAAA"); sprintf(str, "%s%c%s", g_eeprom.config.setting.dtmf.ani_id, g_eeprom.config.setting.dtmf.separate_code, "AAAAA");
pString = str; pString = str;
break; break;
case DTMF_REPLY_NONE:
#endif #endif
case DTMF_REPLY_NONE:
default: default:
#if defined(ENABLE_UART) && defined(ENABLE_UART_DEBUG)
// UART_printf("dtmf tx reply none %s\r\n", g_dtmf_string);
#endif
if ( if (
#ifdef ENABLE_DTMF_CALLING #ifdef ENABLE_DTMF_CALLING
g_dtmf_call_state != DTMF_CALL_STATE_NONE || g_dtmf_call_state != DTMF_CALL_STATE_NONE ||

BIN
firmware.bin
View File

Binary file not shown.

BIN
firmware.packed.bin
View File

Binary file not shown.

2
functions.c
View File

@ -268,9 +268,7 @@ void FUNCTION_Select(function_type_t Function)
} }
else else
#endif #endif
#ifdef ENABLE_DTMF_CALLING
if (!DTMF_Reply()) if (!DTMF_Reply())
#endif
{ {
#ifdef ENABLE_MDC1200 #ifdef ENABLE_MDC1200
if (g_current_vfo->channel.mdc1200_mode == MDC1200_MODE_BOT || g_current_vfo->channel.mdc1200_mode == MDC1200_MODE_BOTH) if (g_current_vfo->channel.mdc1200_mode == MDC1200_MODE_BOT || g_current_vfo->channel.mdc1200_mode == MDC1200_MODE_BOTH)

7
radio.c
View File

@ -1176,9 +1176,9 @@ void RADIO_PrepareTX(void)
{ {
if (g_dtmf_call_mode == DTMF_CALL_MODE_DTMF) if (g_dtmf_call_mode == DTMF_CALL_MODE_DTMF)
{ {
g_dtmf_is_tx = true;
g_dtmf_call_state = DTMF_CALL_STATE_NONE; g_dtmf_call_state = DTMF_CALL_STATE_NONE;
g_dtmf_tx_stop_tick_500ms = dtmf_txstop_500ms; g_dtmf_tx_stop_tick_500ms = dtmf_txstop_500ms;
g_dtmf_is_tx = true;
} }
else else
{ {
@ -1188,7 +1188,10 @@ void RADIO_PrepareTX(void)
} }
#else #else
if (g_dtmf_reply_state == DTMF_REPLY_STR) if (g_dtmf_reply_state == DTMF_REPLY_STR)
g_dtmf_is_tx = false; {
g_dtmf_tx_stop_tick_500ms = dtmf_txstop_500ms;
g_dtmf_is_tx = true;
}
#endif #endif
FUNCTION_Select(FUNCTION_TRANSMIT); FUNCTION_Select(FUNCTION_TRANSMIT);