mirrors/uv-k5-firmware-custom
0
Fork 0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-04-27 22:01:26 +03:00
Code Issues Releases Activity

PTT-ID tone burst now uses 'ENABLE_TX_TONE_HZ' frequency

Browse Source
This commit is contained in:
OneOfEleven 2023-12-12 10:57:51 +00:00
parent 21584a8d1e
commit a902e9561f
9 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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

8
app/dtmf.c
View File

@ -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;

2
app/menu.c
View File

@ -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;

BIN
firmware.bin
View File

Binary file not shown.

BIN
firmware.packed.bin
View File

Binary file not shown.

8
functions.c
View File

@ -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);
}

2
settings.h
View File

@ -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;

13
ui/menu.c
View File

@ -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;

2
ui/menu.h
View File

@ -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