mirrors/uv-k5-firmware-custom
0
Fork 0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-04-28 14:21:25 +03:00
Code Issues Releases Activity

panadapter update

Browse Source
This commit is contained in:
OneOfEleven 2023-11-22 17:49:21 +00:00
parent 5f046c5d45
commit d8579b1518
6 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/app.c
View File

@ -1469,6 +1469,7 @@ void APP_cancel_user_input_modes(void)
g_ask_to_save = false;
g_update_display = true;
}
if (g_ask_to_delete)
{
g_ask_to_delete = false;

6
app/main.c
View File

@ -150,10 +150,10 @@ void toggle_chan_scanlist(void)
// find the first channel that contains this frequency
g_tx_vfo->freq_in_channel = SETTINGS_find_channel(g_tx_vfo->freq_config_tx.frequency);
SETTINGS_save_channel(g_tx_vfo->channel_save, g_eeprom.config.setting.tx_vfo_num, g_tx_vfo, 1);
SETTINGS_save_channel(g_tx_vfo->channel_save, g_eeprom.config.setting.tx_vfo_num, g_tx_vfo, 2);
#if defined(ENABLE_UART) && defined(ENABLE_UART_DEBUG)
UART_printf("chan-vfo %u\r\n", g_tx_vfo->channel_save);
// UART_printf("chan-vfo %u\r\n", g_tx_vfo->channel_save);
#endif
g_beep_to_play = BEEP_880HZ_60MS_TRIPLE_BEEP;
@ -183,7 +183,7 @@ void toggle_chan_scanlist(void)
if (chan <= USER_CHANNEL_LAST)
{
#if defined(ENABLE_UART) && defined(ENABLE_UART_DEBUG)
UART_printf("vfo to mem %u\r\n", chan);
// UART_printf("vfo to mem %u\r\n", chan);
#endif
g_sub_menu_selection = chan;

BIN
firmware.bin
View File

Binary file not shown.

BIN
firmware.packed.bin
View File

Binary file not shown.

30
panadapter.c
View File

@ -36,7 +36,7 @@ const uint8_t panadapter_min_rssi = (-147 + 160) * 2; // -147dBm (S0) min RSSI
inline void PAN_restart(const bool full)
{
if (full)
g_panadapter_cycles = 0;
g_panadapter_cycles = 0;
panadapter_rssi_index = 0;
panadapter_delay = 3;
}
@ -105,8 +105,11 @@ void PAN_set_freq(void)
int32_t freq = g_tx_vfo->p_rx->frequency;
if (g_current_function == FUNCTION_TRANSMIT || panadapter_rssi_index < 0)
return;
// if not paused on the VFO/center freq, add the panadapter bin offset frequency
if (g_panadapter_enabled && g_panadapter_vfo_tick <= 0 && panadapter_rssi_index >= 0)
if (g_panadapter_enabled && g_panadapter_vfo_tick <= 0)
{
int32_t step_size = g_tx_vfo->step_freq;
@ -141,13 +144,14 @@ void PAN_process_10ms(void)
g_current_display_screen == DISPLAY_SEARCH ||
g_css_scan_mode != CSS_SCAN_MODE_OFF ||
g_scan_state_dir != SCAN_STATE_DIR_OFF ||
g_dtmf_call_state != DTMF_CALL_STATE_NONE ||
g_dtmf_is_tx ||
g_dtmf_input_mode)
g_dtmf_call_state != DTMF_CALL_STATE_NONE) // ||
// g_dtmf_is_tx ||
// g_dtmf_input_mode)
{
if (g_panadapter_enabled)
{ // disable the panadapter
g_panadapter_enabled = false;
PAN_restart(true);
PAN_set_freq();
g_update_display = true;
}
@ -156,7 +160,6 @@ void PAN_process_10ms(void)
if (g_current_function == FUNCTION_TRANSMIT)
{
g_panadapter_vfo_tick = 100; // 1 sec - stay on the VFO frequency for at least this amount of time after PTT release
panadapter_rssi_index = -1;
return;
}
@ -173,8 +176,9 @@ void PAN_process_10ms(void)
if (panadapter_rssi_index < 0)
{ // guess we've just come out of TX mode
g_panadapter_vfo_tick = 100; // 1 sec - stay on the VFO frequency for at least this amount of time after PTT release
PAN_restart(false);
PAN_set_freq();
// PAN_set_freq();
return;
}
@ -197,8 +201,10 @@ void PAN_process_10ms(void)
if (--panadapter_delay == 0)
{
panadapter_delay = 20;
UI_DisplayMain_pan(true);
//g_update_display = true;
if (!g_dtmf_input_mode)
UI_DisplayMain_pan(true);
else
g_update_display = true;
}
}
return;
@ -254,6 +260,8 @@ void PAN_process_10ms(void)
PAN_find_peak();
#endif
UI_DisplayMain_pan(true);
//g_update_display = true;
if (!g_dtmf_input_mode)
UI_DisplayMain_pan(true);
else
g_update_display = true;
}

2
settings.c
View File

@ -483,6 +483,8 @@ void SETTINGS_save_channel(const unsigned int channel, const unsigned int vfo, v
// ****************
// SETTINGS_save_vfo_indices();
SETTINGS_save_chan_attribs_name(channel, p_vfo);
if (channel <= USER_CHANNEL_LAST)