diff --git a/app/dtmf.c b/app/dtmf.c index 40231fd..d29492d 100644 --- a/app/dtmf.c +++ b/app/dtmf.c @@ -391,9 +391,9 @@ void DTMF_HandleRequest(void) bool DTMF_Reply(void) { - uint16_t Delay; - char String[20]; - const char *pString = NULL; + const uint16_t Delay = (g_eeprom.dtmf_preload_time < 150) ? 150 : g_eeprom.dtmf_preload_time; + const char *pString = NULL; + char String[20]; switch (g_dtmf_reply_state) { @@ -439,8 +439,6 @@ bool DTMF_Reply(void) if (pString == NULL) return false; - Delay = (g_eeprom.dtmf_preload_time < 200) ? 200 : g_eeprom.dtmf_preload_time; - if (g_eeprom.dtmf_side_tone) { // the user will also hear the transmitted tones GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_SPEAKER); diff --git a/driver/bk4819.c b/driver/bk4819.c index 9d466bf..9cdc5a4 100644 --- a/driver/bk4819.c +++ b/driver/bk4819.c @@ -1043,8 +1043,8 @@ void BK4819_StartTone1(const uint16_t frequency, const unsigned int level, const if (set_dac) { BK4819_WriteRegister(BK4819_REG_30, 0); - BK4819_WriteRegister(BK4819_REG_30, BK4819_REG_30_ENABLE_AF_DAC | BK4819_REG_30_ENABLE_DISC_MODE | BK4819_REG_30_ENABLE_TX_DSP); - //BK4819_EnableTXLink(); + //BK4819_WriteRegister(BK4819_REG_30, BK4819_REG_30_ENABLE_AF_DAC | BK4819_REG_30_ENABLE_DISC_MODE | BK4819_REG_30_ENABLE_TX_DSP); + BK4819_EnableTXLink(); } BK4819_WriteRegister(BK4819_REG_71, scale_freq(frequency)); diff --git a/firmware.bin b/firmware.bin index 19e62cd..7dd0471 100644 Binary files a/firmware.bin and b/firmware.bin differ diff --git a/firmware.packed.bin b/firmware.packed.bin index 0c8e156..6f50b8d 100644 Binary files a/firmware.packed.bin and b/firmware.packed.bin differ diff --git a/radio.c b/radio.c index 14220f8..da82f97 100644 --- a/radio.c +++ b/radio.c @@ -1138,8 +1138,7 @@ void RADIO_tx_eot(void) { GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_SPEAKER); g_enable_speaker = true; -// SYSTEM_DelayMs(60); - SYSTEM_DelayMs(5); + SYSTEM_DelayMs(60); } BK4819_EnterDTMF_TX(g_eeprom.dtmf_side_tone); BK4819_PlayDTMFString(