diff --git a/Makefile b/Makefile index c27c748..067052d 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ ENABLE_OVERLAY := 0 ENABLE_LTO := 1 # UART Programming 2.9 kB ENABLE_UART := 1 -ENABLE_UART_DEBUG := 0 +ENABLE_UART_DEBUG := 1 # AirCopy 2.5 kB ENABLE_AIRCOPY := 0 ENABLE_AIRCOPY_REMEMBER_FREQ := 1 @@ -27,7 +27,7 @@ ENABLE_NOAA := 0 ENABLE_VOICE := 0 ENABLE_MUTE_RADIO_FOR_VOICE := 0 # Tx on Voice 1.0 kB -ENABLE_VOX := 1 +ENABLE_VOX := 0 ENABLE_VOX_MORE_SENSITIVE := 1 # Tx Alarm 600 B ENABLE_ALARM := 0 @@ -47,7 +47,7 @@ ENABLE_DTMF_CALL_FLASH_LIGHT := 0 # Kill and Revive 400 B ENABLE_DTMF_KILL_REVIVE := 0 ENABLE_SHOW_FREQ_IN_CHAN := 1 -# smaa bold 580 B +# small bold 580 B ENABLE_SMALL_BOLD := 1 # smallest font 2 kB ENABLE_SMALLEST_FONT := 0 diff --git a/app/dtmf.c b/app/dtmf.c index f6564fd..4a6b0f9 100644 --- a/app/dtmf.c +++ b/app/dtmf.c @@ -410,6 +410,10 @@ bool DTMF_Reply(void) char str[23]; #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) { 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"); pString = str; break; - - case DTMF_REPLY_NONE: #endif + case DTMF_REPLY_NONE: default: - #if defined(ENABLE_UART) && defined(ENABLE_UART_DEBUG) -// UART_printf("dtmf tx reply none %s\r\n", g_dtmf_string); - #endif - if ( #ifdef ENABLE_DTMF_CALLING g_dtmf_call_state != DTMF_CALL_STATE_NONE || diff --git a/firmware.bin b/firmware.bin index a696352..3241941 100644 Binary files a/firmware.bin and b/firmware.bin differ diff --git a/firmware.packed.bin b/firmware.packed.bin index 7d81d3e..82b679a 100644 Binary files a/firmware.packed.bin and b/firmware.packed.bin differ diff --git a/functions.c b/functions.c index bcdc55b..090083a 100644 --- a/functions.c +++ b/functions.c @@ -268,9 +268,7 @@ void FUNCTION_Select(function_type_t Function) } else #endif - #ifdef ENABLE_DTMF_CALLING if (!DTMF_Reply()) - #endif { #ifdef ENABLE_MDC1200 if (g_current_vfo->channel.mdc1200_mode == MDC1200_MODE_BOT || g_current_vfo->channel.mdc1200_mode == MDC1200_MODE_BOTH) diff --git a/radio.c b/radio.c index ed81abc..c094de5 100644 --- a/radio.c +++ b/radio.c @@ -1176,9 +1176,9 @@ void RADIO_PrepareTX(void) { if (g_dtmf_call_mode == DTMF_CALL_MODE_DTMF) { - g_dtmf_is_tx = true; g_dtmf_call_state = DTMF_CALL_STATE_NONE; g_dtmf_tx_stop_tick_500ms = dtmf_txstop_500ms; + g_dtmf_is_tx = true; } else { @@ -1188,7 +1188,10 @@ void RADIO_PrepareTX(void) } #else 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 FUNCTION_Select(FUNCTION_TRANSMIT);