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

.

Browse Source
This commit is contained in:
OneOfEleven
2023-11-10 07:31:50 +00:00
parent a48b3bc475
commit aebd397221
11 changed files with 85 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
app/app.c
View File

@@ -625,7 +625,7 @@ void APP_stop_scan(void)
// find the first channel that contains this frequency
g_rx_vfo->freq_in_channel = SETTINGS_find_channel(g_rx_vfo->freq_config_rx.frequency);
RADIO_ApplyOffset(g_rx_vfo, false);
RADIO_apply_offset(g_rx_vfo, false);
RADIO_ConfigureSquelch(g_rx_vfo);
RADIO_setup_registers(true);
}
@@ -637,7 +637,7 @@ void APP_stop_scan(void)
if (g_rx_vfo->channel_save > USER_CHANNEL_LAST)
{ // frequency mode
RADIO_ApplyOffset(g_rx_vfo, false);
RADIO_apply_offset(g_rx_vfo, false);
RADIO_ConfigureSquelch(g_rx_vfo);
SETTINGS_save_channel(g_rx_vfo->channel_save, g_rx_vfo_num, g_rx_vfo, 1);
return;
@@ -692,8 +692,7 @@ static void APP_next_freq(void)
#if 0
// original slower method
RADIO_ApplyOffset(g_tx_vfo, false);
// RADIO_ConfigureSquelch(g_tx_vfo);
RADIO_apply_offset(g_tx_vfo, false);
RADIO_setup_registers(true);
#ifdef ENABLE_FASTER_CHANNEL_SCAN
@@ -708,12 +707,11 @@ static void APP_next_freq(void)
BK4819_set_rf_frequency(g_tx_vfo->freq_config_rx.frequency, true);
BK4819_set_rf_filter_path(g_tx_vfo->freq_config_rx.frequency);
RADIO_ApplyOffset(g_tx_vfo, false);
// RADIO_ConfigureSquelch(g_tx_vfo);
RADIO_apply_offset(g_tx_vfo, false);
#ifdef ENABLE_FASTER_CHANNEL_SCAN
//g_scan_tick_10ms = 10; // 100ms
g_scan_tick_10ms = 7; // 70ms
g_scan_tick_10ms = 6; // 60ms
#else
g_scan_tick_10ms = scan_pause_freq_10ms;
#endif
@@ -2163,8 +2161,8 @@ void APP_time_slice_500ms(void)
}
}
if (g_current_function != FUNCTION_POWER_SAVE && g_current_function != FUNCTION_TRANSMIT)
APP_update_rssi(g_rx_vfo_num, false);
// if (g_current_function != FUNCTION_POWER_SAVE && g_current_function != FUNCTION_TRANSMIT)
// APP_update_rssi(g_rx_vfo_num, false);
if (g_low_battery)
{
@@ -2321,10 +2319,6 @@ void APP_time_slice_10ms(void)
g_request_display_screen = DISPLAY_INVALID;
}
// 1of11
if (g_update_rssi)
APP_update_rssi(g_rx_vfo_num, false);
if (g_update_display)
GUI_DisplayScreen();
@@ -2419,11 +2413,19 @@ void APP_time_slice_10ms(void)
AUDIO_PlayBeep(BEEP_880HZ_40MS_OPTIONAL);
#endif
// 1of11
// if (g_update_rssi)
if (g_current_function != FUNCTION_POWER_SAVE && g_current_function != FUNCTION_TRANSMIT)
if (!g_flag_save_channel)
APP_update_rssi(g_rx_vfo_num, false);
if (g_current_function != FUNCTION_POWER_SAVE || !g_rx_idle_mode)
APP_process_radio_interrupts();
APP_process_functions();
APP_process_flash_light_10ms();
if (g_current_function == FUNCTION_TRANSMIT)
{ // transmitting
#ifdef ENABLE_TX_AUDIO_BAR
@@ -2440,8 +2442,6 @@ void APP_time_slice_10ms(void)
}
#endif
APP_process_flash_light_10ms();
#ifdef ENABLE_FMRADIO
if (g_fm_radio_mode && g_fm_radio_tick_500ms > 0)
return;
@@ -2461,6 +2461,15 @@ void APP_time_slice_10ms(void)
APP_process_transmit();
#ifdef ENABLE_FMRADIO
if (g_fm_radio_mode && g_fm_restore_tick_10ms > 0)
{
if (--g_fm_restore_tick_10ms == 0)
{ // switch back to FM radio mode
FM_turn_on();
GUI_SelectNextDisplay(DISPLAY_FM);
}
}
if (g_fm_schedule &&
g_fm_scan_state_dir != FM_SCAN_STATE_DIR_OFF &&
!g_monitor_enabled &&
@@ -2474,17 +2483,6 @@ void APP_time_slice_10ms(void)
APP_process_power_save();
#ifdef ENABLE_FMRADIO
if (g_fm_radio_mode && g_fm_restore_tick_10ms > 0)
{
if (--g_fm_restore_tick_10ms == 0)
{ // switch back to FM radio mode
FM_turn_on();
GUI_SelectNextDisplay(DISPLAY_FM);
}
}
#endif
APP_process_scan();
APP_process_search();
@@ -2820,7 +2818,7 @@ Skip:
MENU_AcceptSetting();
g_flag_refresh_menu = true;
g_update_menu = true;
g_flag_accept_setting = false;
}
@@ -2930,9 +2928,9 @@ Skip:
g_flag_reconfigure_vfos = false;
}
if (g_flag_refresh_menu)
if (g_update_menu)
{
g_flag_refresh_menu = false;
g_update_menu = false;
g_menu_tick_10ms = menu_timeout_500ms;
MENU_ShowCurrentSetting();

12
app/main.c
View File

@@ -141,7 +141,7 @@ void toggle_chan_scanlist(void)
g_eeprom.config.setting.tx_vfo_num = vfo;
RADIO_select_vfos();
RADIO_ApplyOffset(g_tx_vfo, false);
RADIO_apply_offset(g_tx_vfo, false);
RADIO_ConfigureSquelch(g_tx_vfo);
// RADIO_ConfigureTXPower(g_tx_vfo);
RADIO_setup_registers(true);
@@ -186,7 +186,7 @@ void toggle_chan_scanlist(void)
#endif
g_sub_menu_selection = chan;
g_flag_refresh_menu = false;
g_update_menu = false;
g_current_display_screen = DISPLAY_MENU;
g_update_display = false;
UI_DisplayMenu();
@@ -820,7 +820,7 @@ void MAIN_Key_MENU(const bool key_pressed, const bool key_held)
if (flag)
{
g_flag_refresh_menu = true;
g_update_menu = true;
g_request_display_screen = DISPLAY_MENU;
#ifdef ENABLE_VOICE
@@ -962,7 +962,7 @@ void MAIN_Key_UP_DOWN(bool key_pressed, bool key_held, scan_state_dir_t directio
SETTINGS_save_channel(g_tx_vfo->channel_save, g_eeprom.config.setting.tx_vfo_num, g_tx_vfo, 1);
RADIO_ApplyOffset(g_tx_vfo, true);
RADIO_apply_offset(g_tx_vfo, true);
#if defined(ENABLE_UART) && defined(ENABLE_UART_DEBUG)
// UART_printf("save chan %u\r\n", g_rx_vfo->channel_save);
@@ -1065,7 +1065,7 @@ void MAIN_Key_UP_DOWN(bool key_pressed, bool key_held, scan_state_dir_t directio
g_tx_vfo->freq_in_channel = 0xff;
#if 0
RADIO_ApplyOffset(g_tx_vfo, false);
RADIO_apply_offset(g_tx_vfo, false);
RADIO_ConfigureSquelch(g_tx_vfo);
// RADIO_ConfigureTXPower(g_tx_vfo);
@@ -1091,7 +1091,7 @@ void MAIN_Key_UP_DOWN(bool key_pressed, bool key_held, scan_state_dir_t directio
BK4819_set_rf_frequency(freq, true); // set the VCO/PLL
BK4819_set_rf_filter_path(freq); // set the proper LNA/PA filter path
RADIO_ApplyOffset(g_tx_vfo, false);
RADIO_apply_offset(g_tx_vfo, false);
RADIO_ConfigureSquelch(g_tx_vfo);
// RADIO_ConfigureTXPower(g_tx_vfo);
#endif

8
app/menu.c
View File

@@ -1404,7 +1404,7 @@ static void MENU_Key_0_to_9(key_code_t Key, bool key_pressed, bool key_held)
if (value > 0 && value <= g_menu_list_count)
{
g_menu_cursor = value - 1;
g_flag_refresh_menu = true;
g_update_menu = true;
return;
}
@@ -1421,7 +1421,7 @@ static void MENU_Key_0_to_9(key_code_t Key, bool key_pressed, bool key_held)
if (value > 0 && value <= g_menu_list_count)
{
g_menu_cursor = value - 1;
g_flag_refresh_menu = true;
g_update_menu = true;
return;
}
break;
@@ -1581,7 +1581,7 @@ static void MENU_Key_EXIT(bool key_pressed, bool key_held)
g_ask_for_confirmation = 0;
g_in_sub_menu = false;
g_input_box_index = 0;
g_flag_refresh_menu = true;
g_update_menu = true;
#ifdef ENABLE_VOICE
g_another_voice_id = VOICE_ID_CANCEL;
@@ -1884,7 +1884,7 @@ static void MENU_Key_UP_DOWN(bool key_pressed, bool key_held, int8_t Direction)
{
g_menu_cursor = NUMBER_AddWithWraparound(g_menu_cursor, -Direction, 0, g_menu_list_count - 1);
g_flag_refresh_menu = true;
g_update_menu = true;
g_request_display_screen = DISPLAY_MENU;