diff --git a/README.md b/README.md index e92ed79..645be78 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ ENABLE_MUTE_RADIO_FOR_VOICE := 1 1 = mute the radios audio when a voi ENABLE_VOX := 0 1 = voice operated transmission ENABLE_VOX_MORE_SENSITIVE := 1 1 = make VOX more sensitive ENABLE_ALARM := 0 1 = enable TX alarm -ENABLE_TX_TONE_HZ := 1750 side key tx tone frequency 0 = disable >0 = frequency of tone +ENABLE_TX_TONE_HZ := 1750 side key and tone burst tx frequency 0 = disable >0 = frequency of audio tone ENABLE_MDC1200 := 0 1 = enable MDC1200 TX/RX + menu TX option ENABLE_MDC1200_SHOW_OP_ARG := 1 1 = show RX opcode and argument values when MDC1200 is RX'ed ENABLE_MDC1200_SIDE_BEEP := 1 1 = enable short side tone/beep when MDC1200 is sent - so user knows when they can start taking after PTT pressed diff --git a/app/dtmf.c b/app/dtmf.c index 83957f8..5303105 100644 --- a/app/dtmf.c +++ b/app/dtmf.c @@ -450,11 +450,11 @@ bool DTMF_Reply(void) default: if ( #ifdef ENABLE_DTMF_CALLING - g_dtmf_call_state != DTMF_CALL_STATE_NONE || + g_dtmf_call_state != DTMF_CALL_STATE_NONE || #endif - g_current_vfo->channel.dtmf_ptt_id_tx_mode == PTT_ID_APOLLO || - g_current_vfo->channel.dtmf_ptt_id_tx_mode == PTT_ID_1750 || - g_current_vfo->channel.dtmf_ptt_id_tx_mode == PTT_ID_OFF || + g_current_vfo->channel.dtmf_ptt_id_tx_mode == PTT_ID_APOLLO || + g_current_vfo->channel.dtmf_ptt_id_tx_mode == PTT_ID_TONE_BURST || + g_current_vfo->channel.dtmf_ptt_id_tx_mode == PTT_ID_OFF || g_current_vfo->channel.dtmf_ptt_id_tx_mode == PTT_ID_EOT) { g_dtmf_reply_state = DTMF_REPLY_NONE; diff --git a/app/menu.c b/app/menu.c index 5414715..70be56e 100644 --- a/app/menu.c +++ b/app/menu.c @@ -811,7 +811,7 @@ void MENU_AcceptSetting(void) if (g_tx_vfo->channel.dtmf_ptt_id_tx_mode == PTT_ID_EOT || g_tx_vfo->channel.dtmf_ptt_id_tx_mode == PTT_ID_BOTH || g_tx_vfo->channel.dtmf_ptt_id_tx_mode == PTT_ID_APOLLO || - g_tx_vfo->channel.dtmf_ptt_id_tx_mode == PTT_ID_1750) + g_tx_vfo->channel.dtmf_ptt_id_tx_mode == PTT_ID_TONE_BURST) { g_eeprom.config.setting.roger_mode = ROGER_MODE_OFF; break; diff --git a/firmware.bin b/firmware.bin index b394193..5a615b4 100644 Binary files a/firmware.bin and b/firmware.bin differ diff --git a/firmware.packed.bin b/firmware.packed.bin index 3edc40f..ea6722f 100644 Binary files a/firmware.packed.bin and b/firmware.packed.bin differ diff --git a/functions.c b/functions.c index 64ab2fd..54daaa8 100644 --- a/functions.c +++ b/functions.c @@ -295,9 +295,13 @@ void FUNCTION_Select(function_type_t Function) } else #endif - if (g_current_vfo->channel.dtmf_ptt_id_tx_mode == PTT_ID_1750) + if (g_current_vfo->channel.dtmf_ptt_id_tx_mode == PTT_ID_TONE_BURST) { - BK4819_start_tone(1750, 28, true, false); + #if (ENABLE_TX_TONE_HZ > 0) + BK4819_start_tone(ENABLE_TX_TONE_HZ, 28, true, false); + #else + BK4819_start_tone(1750, 28, true, false); + #endif SYSTEM_DelayMs(TONE_1750_MS); BK4819_stop_tones(true); } diff --git a/settings.h b/settings.h index bb90383..ba7e26e 100644 --- a/settings.h +++ b/settings.h @@ -161,7 +161,7 @@ enum ptt_id_e { PTT_ID_EOT, // END OF TX PTT_ID_BOTH, // BOTH PTT_ID_APOLLO, // Apolo quindar tones - PTT_ID_1750, // 1750Hz tone burst + PTT_ID_TONE_BURST // tone burst }; typedef enum ptt_id_e ptt_id_t; diff --git a/ui/menu.c b/ui/menu.c index 6cf0b23..b0feaf4 100644 --- a/ui/menu.c +++ b/ui/menu.c @@ -312,14 +312,14 @@ const char g_sub_menu_mem_disp[4][12] = }; #endif -const char g_sub_menu_ptt_id[6][18] = +const char g_sub_menu_ptt_id[6][17] = { "DTMF ID\nOFF", "DTMF ID\nBOT", "DTMF ID\nEOT", "DTMF ID\nBOT+EOT", "APOLLO\nQUINDAR", - "TONE BURST\n1750Hz" + "TONE BURST\n" }; #ifdef ENABLE_MDC1200 @@ -1068,6 +1068,15 @@ void UI_DisplayMenu(void) case MENU_PTT_ID: strcpy(str, g_sub_menu_ptt_id[g_sub_menu_selection]); + if (g_sub_menu_selection == PTT_ID_TONE_BURST) + { + #if (ENABLE_TX_TONE_HZ > 0) + sprintf(str + strlen(str), "%uHz", (uint16_t)ENABLE_TX_TONE_HZ); + #else + strcat("1750Hz"); + #endif + } + channel_setting = true; break; diff --git a/ui/menu.h b/ui/menu.h index 13cb517..27cf5fa 100644 --- a/ui/menu.h +++ b/ui/menu.h @@ -207,7 +207,7 @@ extern const char g_sub_menu_mem_disp[4][12]; #ifdef ENABLE_DTMF_CALLING extern const char g_sub_menu_dtmf_rsp[4][9]; #endif -extern const char g_sub_menu_ptt_id[6][18]; +extern const char g_sub_menu_ptt_id[6][17]; #ifdef ENABLE_MDC1200 extern const char g_sub_menu_mdc1200_mode[4][5]; #endif