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

panadapter clean up

Browse Source
This commit is contained in:
OneOfEleven 2023-11-20 11:41:36 +00:00
parent 37ee519916
commit 66ac485bbc
3 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
firmware.bin
View File

Binary file not shown.

BIN
firmware.packed.bin
View File

Binary file not shown.

47
panadapter.c
View File

@ -148,7 +148,7 @@ void PAN_process_10ms(void)
if (g_current_function == FUNCTION_TRANSMIT) if (g_current_function == FUNCTION_TRANSMIT)
{ {
g_panadapter_vfo_mode = 100; // 1000ms g_panadapter_vfo_mode = 100; // 1 sec - stay on the VFO frequency for at least this amount of time after PTT release
panadapter_rssi_index = -1; panadapter_rssi_index = -1;
return; return;
} }
@ -162,8 +162,8 @@ void PAN_process_10ms(void)
g_panadapter_vfo_mode = 0; g_panadapter_vfo_mode = 0;
// g_panadapter_max_rssi = 0; // g_panadapter_max_rssi = 0;
// g_panadapter_min_rssi = 0; // g_panadapter_min_rssi = 0;
panadapter_rssi_index = 0;
// memset(g_panadapter_rssi, 0, sizeof(g_panadapter_rssi)); // memset(g_panadapter_rssi, 0, sizeof(g_panadapter_rssi));
panadapter_rssi_index = 0;
g_panadapter_enabled = true; g_panadapter_enabled = true;
PAN_set_freq(); PAN_set_freq();
@ -178,49 +178,44 @@ void PAN_process_10ms(void)
return; return;
} }
if (g_panadapter_vfo_mode > 0 && g_squelch_open) if (g_panadapter_vfo_mode > 0)
{ // we have a signal on the VFO frequency { // we're paused on the VFO/center frequency
// save the current RSSI value .. center bin is the VFO frequency // save the current RSSI value
const int16_t rssi = g_current_rssi[g_eeprom.config.setting.tx_vfo_num]; const int16_t rssi = g_current_rssi[g_eeprom.config.setting.tx_vfo_num];
g_panadapter_rssi[PANADAPTER_BINS] = (rssi > 255) ? 255 : (rssi < panadapter_min_rssi) ? panadapter_min_rssi : rssi; g_panadapter_rssi[PANADAPTER_BINS] = (rssi > 255) ? 255 : (rssi < panadapter_min_rssi) ? panadapter_min_rssi : rssi;
PAN_update_min_max(); PAN_update_min_max();
g_panadapter_vfo_mode = 40; // pause scanning for at least another 400ms g_panadapter_vfo_mode = g_squelch_open ? 40 : g_panadapter_vfo_mode - 1;
return; return;
} }
if (g_panadapter_vfo_mode <= 0) // scanning/sweeping
{ // scanning
// save the current RSSI value // save the current RSSI value
const uint16_t rssi = BK4819_GetRSSI(); const uint16_t rssi = BK4819_GetRSSI();
g_panadapter_rssi[panadapter_rssi_index] = (rssi > 255) ? 255 : (rssi < panadapter_min_rssi) ? panadapter_min_rssi : rssi; g_panadapter_rssi[panadapter_rssi_index] = (rssi > 255) ? 255 : (rssi < panadapter_min_rssi) ? panadapter_min_rssi : rssi;
// next frequency // next frequency
if (++panadapter_rssi_index >= (int)ARRAY_SIZE(g_panadapter_rssi)) if (++panadapter_rssi_index >= (int)ARRAY_SIZE(g_panadapter_rssi))
panadapter_rssi_index = 0; panadapter_rssi_index = 0;
if (g_tx_vfo->channel.mod_mode == MOD_MODE_FM) if (g_tx_vfo->channel.mod_mode == MOD_MODE_FM)
{ // switch back to the VFO frequency for 100ms once every 400ms { // switch back to the VFO/center frequency for 100ms once every 400ms
g_panadapter_vfo_mode = ((panadapter_rssi_index % 40) == 0) ? 10 : 0; g_panadapter_vfo_mode = ((panadapter_rssi_index % 40) == 0) ? 10 : 0;
}
else
{ // switch back to the VFO frequency for 100ms once each scan cycle
g_panadapter_vfo_mode = (panadapter_rssi_index == 0) ? 10 : 0;
}
} }
else else
{ // checking the VFO frequency for a signal { // switch back to the VFO/center frequency for 100ms once per full sweep/scan cycle
g_panadapter_vfo_mode--; g_panadapter_vfo_mode = (panadapter_rssi_index == 0) ? 10 : 0;
} }
PAN_set_freq(); PAN_set_freq();
// the last bin value .. draw the panadapter once each scan cycle
if (panadapter_rssi_index == 0) if (panadapter_rssi_index == 0)
{ { // the last bin value .. only draw the panadapter once per full sweep/scan cycle
PAN_update_min_max(); PAN_update_min_max();
#ifdef ENABLE_PANADAPTER_PEAK_FREQ #ifdef ENABLE_PANADAPTER_PEAK_FREQ