mirrors/uv-k5-firmware-custom
0
Fork 0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-06-19 06:39:49 +03:00
Code Issues Releases Activity

vox update - disabled while in menu mode

Browse Source
This commit is contained in:
OneOfEleven
2023-11-02 14:38:03 +00:00
parent bb3b6812c6
commit 5055586035
19 changed files with 195 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/action.c
View File

@ -300,9 +300,10 @@ void ACTION_Scan(bool bRestart)
#ifdef ENABLE_VOX
void ACTION_Vox(void)
{
g_eeprom.config.setting.vox_switch = (g_eeprom.config.setting.vox_switch + 1) & 1u;
g_request_save_settings = true;
g_flag_reconfigure_vfos = true;
// toggle VOX on/off
g_eeprom.config.setting.vox_enabled = (g_eeprom.config.setting.vox_enabled + 1) & 1u;
g_request_save_settings = true;
g_flag_reconfigure_vfos = true;
#ifdef ENABLE_VOICE
g_another_voice_id = VOICE_ID_VOX;
#endif

105
app/app.c
View File

@ -1011,9 +1011,15 @@ void APP_process_radio_interrupts(void)
if (int_bits & BK4819_REG_02_VOX_LOST)
{
g_vox_lost = true;
g_vox_pause_tick_10ms = 10;
g_vox_pause_tick_10ms = 10; // 100ms
if (g_eeprom.config.setting.vox_switch)
g_update_status = true;
#if defined(ENABLE_UART) && defined(ENABLE_UART_DEBUG)
// UART_SendText("vox lost\r\n");
#endif
if (g_eeprom.config.setting.vox_enabled)
{
if (g_current_function == FUNCTION_POWER_SAVE && !g_rx_idle_mode)
{
@ -1034,6 +1040,12 @@ void APP_process_radio_interrupts(void)
{
g_vox_lost = false;
g_vox_pause_tick_10ms = 0;
g_update_status = true;
#if defined(ENABLE_UART) && defined(ENABLE_UART_DEBUG)
// UART_SendText("vox found\r\n");
#endif
}
#endif
@ -1111,26 +1123,18 @@ void APP_end_tx(void)
#ifdef ENABLE_VOX
static void APP_process_vox(void)
{
#ifdef ENABLE_KILL_REVIVE
if (g_eeprom.config.setting.radio_disabled)
return;
#endif
if (g_vox_resume_tick_10ms == 0)
{
if (g_vox_pause_tick_10ms)
if (g_vox_pause_tick_10ms > 0)
return;
}
else
{
g_vox_lost = false;
g_vox_lost = false;
g_vox_pause_tick_10ms = 0;
}
#ifdef ENABLE_FMRADIO
if (g_fm_radio_mode)
return;
#endif
g_update_status = true;
}
if (g_current_function == FUNCTION_RECEIVE || g_monitor_enabled)
return;
@ -1141,19 +1145,21 @@ void APP_end_tx(void)
if (g_vox_noise_detected)
{
if (g_vox_lost)
g_vox_stop_tick_10ms = vox_stop_10ms;
{
g_vox_stop_tick_10ms = vox_stop_10ms; // 1 second
}
else
if (g_vox_stop_tick_10ms == 0)
{
g_vox_noise_detected = false;
g_update_status = true;
}
if (g_current_function == FUNCTION_TRANSMIT &&
!g_ptt_is_pressed &&
!g_vox_noise_detected)
if (g_current_function == FUNCTION_TRANSMIT && !g_ptt_is_pressed && !g_vox_noise_detected)
{
if (g_flag_end_tx)
{
//if (g_current_function != FUNCTION_FOREGROUND)
FUNCTION_Select(FUNCTION_FOREGROUND);
{ // back to RX mode
FUNCTION_Select(FUNCTION_FOREGROUND);
}
else
{
@ -1170,23 +1176,46 @@ void APP_end_tx(void)
g_flag_end_tx = false;
}
return;
}
if (g_vox_lost)
{
g_vox_noise_detected = true;
if (!g_vox_lost)
return;
if (g_current_function == FUNCTION_POWER_SAVE)
FUNCTION_Select(FUNCTION_FOREGROUND);
g_vox_noise_detected = true;
if (g_current_function != FUNCTION_TRANSMIT && g_serial_config_tick_500ms == 0)
{
g_dtmf_reply_state = DTMF_REPLY_NONE;
RADIO_PrepareTX();
g_update_display = true;
}
}
g_update_status = true;
#ifdef ENABLE_KILL_REVIVE
if (g_eeprom.config.setting.radio_disabled)
return;
#endif
if (!g_eeprom.config.setting.tx_enable)
return;
#ifdef ENABLE_FMRADIO
if (g_fm_radio_mode)
return;
#endif
if (g_current_display_screen == DISPLAY_MENU)
return;
if (g_current_function == FUNCTION_POWER_SAVE)
FUNCTION_Select(FUNCTION_FOREGROUND);
if (g_current_function == FUNCTION_TRANSMIT || g_serial_config_tick_500ms > 0)
return;
// ************* go into TX mode
g_dtmf_reply_state = DTMF_REPLY_NONE;
RADIO_PrepareTX();
g_update_display = true;
}
#endif
@ -1235,9 +1264,9 @@ void APP_check_keys(void)
{ // PTT released
#ifdef ENABLE_KILL_REVIVE
if (g_ptt_is_pressed || g_serial_config_tick_500ms > 0 || !g_eeprom.config.setting.tx_enable || g_current_function == FUNCTION_TRANSMIT || g_eeprom.config.setting.radio_disabled)
if (g_ptt_is_pressed || g_serial_config_tick_500ms > 0 || !g_eeprom.config.setting.tx_enable || g_eeprom.config.setting.radio_disabled)
#else
if (g_ptt_is_pressed || g_serial_config_tick_500ms > 0 || !g_eeprom.config.setting.tx_enable || g_current_function == FUNCTION_TRANSMIT)
if (g_ptt_is_pressed || g_serial_config_tick_500ms > 0 || !g_eeprom.config.setting.tx_enable)
#endif
{
if (--g_ptt_debounce <= 0)
@ -1825,8 +1854,8 @@ void APP_process_power_save(void)
BK4819_Conditional_RX_TurnOn();
#ifdef ENABLE_VOX
if (g_eeprom.config.setting.vox_switch)
BK4819_EnableVox(g_vox_threshold[1], g_vox_threshold[0]);
if (g_eeprom.config.setting.vox_enabled)
RADIO_enable_vox(g_eeprom.config.setting.vox_level);
#endif
if (APP_toggle_dual_watch_vfo())
@ -2401,7 +2430,7 @@ void APP_time_slice_10ms(void)
if (g_vox_pause_tick_10ms > 0)
g_vox_pause_tick_10ms--;
if (g_eeprom.config.setting.vox_switch)
if (g_eeprom.config.setting.vox_enabled)
APP_process_vox();
#endif

10
app/menu.c
View File

@ -557,8 +557,8 @@ void MENU_AcceptSetting(void)
#ifdef ENABLE_VOX
case MENU_VOX:
g_eeprom.config.setting.vox_switch = g_sub_menu_selection != 0;
if (g_eeprom.config.setting.vox_switch)
g_eeprom.config.setting.vox_enabled = (g_sub_menu_selection != 0) ? 1 : 0;
if (g_eeprom.config.setting.vox_enabled)
g_eeprom.config.setting.vox_level = g_sub_menu_selection - 1;
g_flag_reconfigure_vfos = true;
g_update_status = true;
@ -1054,11 +1054,11 @@ void MENU_ShowCurrentSetting(void)
g_sub_menu_selection = g_eeprom.config.setting.battery_save_ratio;
break;
#ifdef ENABLE_VOX
#ifdef ENABLE_VOX
case MENU_VOX:
g_sub_menu_selection = g_eeprom.config.setting.vox_switch ? g_eeprom.config.setting.vox_level + 1 : 0;
g_sub_menu_selection = g_eeprom.config.setting.vox_enabled ? g_eeprom.config.setting.vox_level + 1 : 0;
break;
#endif
#endif
case MENU_AUTO_BACKLITE:
g_sub_menu_selection = g_eeprom.config.setting.backlight_time;

2
app/search.c
View File

@ -650,7 +650,7 @@ void SEARCH_Start(void)
DTMF_clear_RX();
#ifdef ENABLE_VOX
g_vox_lost = false;
g_vox_lost = false;
#endif
g_cxcss_tail_found = false;