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

AM fix tweaks

Browse Source
This commit is contained in:
OneOfEleven 2023-09-26 09:33:07 +01:00
parent 75cef967ba
commit 4428cdf372
3 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
am_fix.c
View File

@ -362,15 +362,19 @@ const uint8_t orig_pga = 6; // -3dB
{ // sample the current RSSI level, average it with the previous rssi { // sample the current RSSI level, average it with the previous rssi
const int16_t new_rssi = BK4819_GetRSSI(); const int16_t new_rssi = BK4819_GetRSSI();
rssi = (prev_rssi[vfo] > 0) ? (prev_rssi[vfo] + new_rssi) / 2 : new_rssi; // rssi = (prev_rssi[vfo] > 0) ? (prev_rssi[vfo] + new_rssi) / 2 : new_rssi;
rssi = (prev_rssi[vfo] > 0 && new_rssi > prev_rssi[vfo]) ? (prev_rssi[vfo] + new_rssi) / 2 : new_rssi;
prev_rssi[vfo] = new_rssi; prev_rssi[vfo] = new_rssi;
} }
#ifdef ENABLE_AM_FIX_TEST1 #ifdef ENABLE_AM_FIX_TEST1
// user is manually adjusting a gain register - don't do anything automatically // user is manually adjusting a gain register - don't do anything automatically
am_fix_gain_table_index[vfo] = 1 + gSetting_AM_fix_test1; {
int i = 1 + (int)gSetting_AM_fix_test1;
i = (i < 1) ? 1 : (i > ((int)ARRAY_SIZE(am_fix_gain_table) - 1) ? ARRAY_SIZE(am_fix_gain_table) - 1 : i;
am_fix_gain_table_index[vfo] = i;
}
if (am_gain_hold_counter[vfo] > 0) if (am_gain_hold_counter[vfo] > 0)
{ {
@ -381,16 +385,15 @@ const uint8_t orig_pga = 6; // -3dB
} }
} }
am_gain_hold_counter[vfo] = 250; // 250ms hold am_gain_hold_counter[vfo] = 30; // update register once every 300ms
#else #else
// automatically choose a front end gain setting by monitoring the RSSI
if (am_gain_hold_counter[vfo] > 0) if (am_gain_hold_counter[vfo] > 0)
am_gain_hold_counter[vfo]--; am_gain_hold_counter[vfo]--;
// automatically choose a front end gain setting by monitoring the RSSI // dB difference between actual and desired RSSI level
// compute the dB different
diff_dB = (rssi - desired_rssi) / 2; diff_dB = (rssi - desired_rssi) / 2;
if (diff_dB > 0) if (diff_dB > 0)
@ -398,6 +401,7 @@ const uint8_t orig_pga = 6; // -3dB
if (diff_dB >= 12) if (diff_dB >= 12)
{ // jump immediately to a new gain setting { // jump immediately to a new gain setting
// this greatly speeds up initial gain reduction (but reduces noise/spike immunity)
unsigned int index = am_fix_gain_table_index[vfo]; // current position we're at unsigned int index = am_fix_gain_table_index[vfo]; // current position we're at
@ -407,9 +411,9 @@ const uint8_t orig_pga = 6; // -3dB
unsigned int pga = am_fix_gain_table[index].pga; unsigned int pga = am_fix_gain_table[index].pga;
// const int16_t desired_gain_dB = lna_short_dB[lna_short] + lna_dB[lna] + mixer_dB[mixer] + pga_dB[pga] - diff_dB; // const int16_t desired_gain_dB = lna_short_dB[lna_short] + lna_dB[lna] + mixer_dB[mixer] + pga_dB[pga] - diff_dB;
const int16_t desired_gain_dB = lna_short_dB[lna_short] + lna_dB[lna] + mixer_dB[mixer] + pga_dB[pga] - diff_dB + 6; const int16_t desired_gain_dB = lna_short_dB[lna_short] + lna_dB[lna] + mixer_dB[mixer] + pga_dB[pga] - diff_dB + 6; // 6dB headroom
// scan the table to see what index to jump too // scan the table to see what index to jump straight too
while (index > 1) while (index > 1)
{ {
index--; index--;
@ -426,30 +430,30 @@ const uint8_t orig_pga = 6; // -3dB
} }
} }
am_fix_gain_table_index[vfo] = index; //am_fix_gain_table_index[vfo] = (am_fix_gain_table_index[vfo] + index) / 2; // easy does it
//am_fix_gain_table_index[vfo] = (am_fix_gain_table_index[vfo] + index) / 2; am_fix_gain_table_index[vfo] = index; // noo, go now !
} }
else else
{ // incrementally reduce the gain { // incrementally reduce the gain .. taking it slow improves noise/spike immunity
// if (am_fix_gain_table_index[vfo] >= (1 + 3) && diff_dB >= 3) // if (am_fix_gain_table_index[vfo] >= (1 + 3) && diff_dB >= 3)
// am_fix_gain_table_index[vfo] -= 3; // faster gain reduction // am_fix_gain_table_index[vfo] -= 3; // faster gain reduction
// else // else
if (am_fix_gain_table_index[vfo] > 1) if (am_fix_gain_table_index[vfo] > 1)
am_fix_gain_table_index[vfo]--; // slow gain reduction am_fix_gain_table_index[vfo]--; // slow step-by-step gain reduction
} }
am_gain_hold_counter[vfo] = 50; // 500ms hold am_gain_hold_counter[vfo] = 30; // 300ms hold
} }
else else
if (diff_dB >= -5) // 5dB hysterisis (help reduce gain hunting) if (diff_dB >= -4) // 4dB hysterisis (help reduce gain hunting)
am_gain_hold_counter[vfo] = 50; // 500ms hold am_gain_hold_counter[vfo] = 30; // 300ms hold
if (am_gain_hold_counter[vfo] == 0) if (am_gain_hold_counter[vfo] == 0)
{ // hold has been released, we're free to increase gain { // hold has been released, we're free to increase gain
if (diff_dB <= -5) // 5dB hysterisis (help reduce gain hunting) if (diff_dB < -4) // 4dB hysterisis (help reduce gain hunting)
{ // increase gain { // increase gain
if (am_fix_gain_table_index[vfo] < (ARRAY_SIZE(am_fix_gain_table) - 1)) if (am_fix_gain_table_index[vfo] < (ARRAY_SIZE(am_fix_gain_table) - 1))

BIN
firmware.bin
View File

Binary file not shown.

BIN
firmware.packed.bin
View File

Binary file not shown.