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 update, RSSI bar graphs now include gain compensation

Browse Source
This commit is contained in:
OneOfEleven 2023-09-23 03:28:21 +01:00
parent 2643d197c6
commit d874893a50
10 changed files with 90 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
app/app.c
View File

@ -62,19 +62,21 @@
#include "ui/status.h" #include "ui/status.h"
#include "ui/ui.h" #include "ui/ui.h"
// original QS front end gains // original QS front end gain settings
const uint16_t orig_lna_short = 3; // 0dB static const uint8_t orig_lna_short = 3; // 0dB
const uint16_t orig_lna = 2; // -14dB static const uint8_t orig_lna = 2; // -14dB
const uint16_t orig_mixer = 3; // 0dB static const uint8_t orig_mixer = 3; // 0dB
const uint16_t orig_pga = 6; // -3dB static const uint8_t orig_pga = 6; // -3dB
#ifdef ENABLE_AM_FIX #ifdef ENABLE_AM_FIX
// stuff to overcome the AM demodulator saturation problem // stuff to overcome the AM demodulator saturation problem
static uint16_t am_lna_short = orig_lna_short; int16_t rssi_db_gain_diff = 0; // holds the compensation value to correct the RSSI reading
static uint16_t am_lna = orig_lna;
static uint16_t am_mixer = orig_mixer; static uint8_t am_lna_short = orig_lna_short;
static uint16_t am_pga = orig_pga; static uint8_t am_lna = orig_lna;
static uint8_t am_mixer = orig_mixer;
static uint8_t am_pga = orig_pga;
// moving average RSSI buffer // moving average RSSI buffer
struct { struct {
@ -82,7 +84,7 @@ const uint16_t orig_pga = 6; // -3dB
unsigned int index; unsigned int index;
uint16_t samples[4]; // 40ms long buffer (10ms RSSI sample rate) uint16_t samples[4]; // 40ms long buffer (10ms RSSI sample rate)
uint16_t sum; // sum of all samples in the buffer uint16_t sum; // sum of all samples in the buffer
} moving_avg_rssi; } moving_avg_rssi = {0};
unsigned int am_gain_hold_counter = 0; unsigned int am_gain_hold_counter = 0;
@ -92,8 +94,9 @@ const uint16_t orig_pga = 6; // -3dB
memset(&moving_avg_rssi, 0, sizeof(moving_avg_rssi)); memset(&moving_avg_rssi, 0, sizeof(moving_avg_rssi));
am_gain_hold_counter = 0; am_gain_hold_counter = 0;
}
rssi_db_gain_diff = 0;
}
#endif #endif
static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld); static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld);
@ -452,7 +455,7 @@ void APP_StartListening(FUNCTION_Type_t Function, const bool reset_am_fix)
APP_reset_AM_fix(); // TODO: only reset it when moving channel/frequency APP_reset_AM_fix(); // TODO: only reset it when moving channel/frequency
#endif #endif
gVFO_RSSI_Level[gEeprom.RX_CHANNEL == 0] = 0; gVFO_RSSI_bar_level[gEeprom.RX_CHANNEL == 0] = 0;
GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH); GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
@ -512,10 +515,10 @@ void APP_StartListening(FUNCTION_Type_t Function, const bool reset_am_fix)
} }
// original setting // original setting
uint16_t lna_short = orig_lna_short; uint8_t lna_short = orig_lna_short;
uint16_t lna = orig_lna; uint8_t lna = orig_lna;
uint16_t mixer = orig_mixer; uint8_t mixer = orig_mixer;
uint16_t pga = orig_pga; uint8_t pga = orig_pga;
if (gRxVfo->IsAM) if (gRxVfo->IsAM)
{ // AM { // AM
@ -551,7 +554,7 @@ void APP_StartListening(FUNCTION_Type_t Function, const bool reset_am_fix)
} }
// apply the front end gain settings // apply the front end gain settings
BK4819_WriteRegister(BK4819_REG_13, (lna_short << 8) | (lna << 5) | (mixer << 3) | (pga << 0)); BK4819_WriteRegister(BK4819_REG_13, ((uint16_t)lna_short << 8) | ((uint16_t)lna << 5) | ((uint16_t)mixer << 3) | ((uint16_t)pga << 0));
// AF gain - original // AF gain - original
BK4819_WriteRegister(BK4819_REG_48, BK4819_WriteRegister(BK4819_REG_48,
@ -1167,7 +1170,13 @@ void APP_Update(void)
{ // dual watch mode, go back to sleep { // dual watch mode, go back to sleep
// sample the RSSI // sample the RSSI
gCurrentRSSI = BK4819_GetRSSI(); #ifdef ENABLE_AM_FIX
// with compensation
gCurrentRSSI = (int16_t)BK4819_GetRSSI() - (rssi_db_gain_diff * 2);
#else
gCurrentRSSI = (int16_t)BK4819_GetRSSI();
#endif
UI_UpdateRSSI(gCurrentRSSI); UI_UpdateRSSI(gCurrentRSSI);
// go back to sleep // go back to sleep
@ -1343,7 +1352,14 @@ void APP_CheckKeys(void)
} }
#ifdef ENABLE_AM_FIX #ifdef ENABLE_AM_FIX
void adjustAMFrontEnd10ms(void)
// front end register dB values
static const int8_t lna_short_dB[] = {-19, -16, -11, 0};
static const int8_t lna_dB[] = {-24, -19, -14, -9, -6, -4, -2, 0};
static const int8_t mixer_dB[] = { -8, -6, -3, 0};
static const int8_t pga_dB[] = {-33, -27, -21, -15, -9, -6, -3, 0};
void adjust_AM_frontEnd_10ms(void)
{ {
// we don't play with the front end gains if in FM mode // we don't play with the front end gains if in FM mode
if (!gRxVfo->IsAM) if (!gRxVfo->IsAM)
@ -1358,7 +1374,7 @@ void APP_CheckKeys(void)
case FUNCTION_POWER_SAVE: case FUNCTION_POWER_SAVE:
return; return;
// only adjust the front end gains if in one of these modes // only adjust the front end if in one of these modes
case FUNCTION_FOREGROUND: case FUNCTION_FOREGROUND:
case FUNCTION_RECEIVE: case FUNCTION_RECEIVE:
case FUNCTION_MONITOR: case FUNCTION_MONITOR:
@ -1366,7 +1382,7 @@ void APP_CheckKeys(void)
break; break;
} }
// REG_10 <15:0> 0x0038 Rx AGC Gain Table[0]. (Index Max->Min is 3,2,1,0,-1) // REG_10 <15:0> 0x0038 Rx AGC Gain Table
// //
// <9:8> = LNA Gain Short // <9:8> = LNA Gain Short
// 3 = 0dB < original value // 3 = 0dB < original value
@ -1404,26 +1420,26 @@ void APP_CheckKeys(void)
const uint16_t desired_rssi = (-87 + 160) * 2; // dBm to ADC sample const uint16_t desired_rssi = (-87 + 160) * 2; // dBm to ADC sample
// start with the current gain settings // start with the current gain settings
register uint16_t new_lna_short = am_lna_short; uint8_t new_lna_short = am_lna_short;
register uint16_t new_lna = am_lna; uint8_t new_lna = am_lna;
register uint16_t new_mixer = am_mixer; uint8_t new_mixer = am_mixer;
register uint16_t new_pga = am_pga; uint8_t new_pga = am_pga;
// current RX frequency // current RX frequency
const uint32_t rx_frequency = gRxVfo->pRX->Frequency; const uint32_t rx_frequency = gRxVfo->pRX->Frequency;
// max gains to use // max gains to use
// uint16_t max_lna_short = orig_lna_short; // we're not altering this one // uint8_t max_lna_short = orig_lna_short; // we're not altering this one
uint16_t max_lna = orig_lna; uint8_t max_lna = orig_lna;
uint16_t max_mixer = orig_mixer; uint8_t max_mixer = orig_mixer;
uint16_t max_pga = orig_pga; uint8_t max_pga = orig_pga;
if (rx_frequency <= 22640000) // the RX gain abrutly reduces above this frequency if (rx_frequency <= 22640000) // the RX sensitivity abrutly drops above this frequency
{ {
max_pga = 7; max_pga = 7;
} }
else else
{ // allow a bit more gain { // allow a bit more adjustment gain
// max_lna = 4; // max_lna = 4;
max_lna = 7; max_lna = 7;
max_pga = 7; max_pga = 7;
@ -1431,7 +1447,7 @@ void APP_CheckKeys(void)
// sample the current RSSI level // sample the current RSSI level
uint16_t rssi = BK4819_GetRSSI(); // 9-bit value (0 .. 511) uint16_t rssi = BK4819_GetRSSI(); // 9-bit value (0 .. 511)
//gCurrentRSSI = rssi; //gCurrentRSSI = rssi - (rssi_db_gain_diff * 2);
// compute the moving average RSSI // compute the moving average RSSI
if (moving_avg_rssi.count < ARRAY_SIZE(moving_avg_rssi.samples)) if (moving_avg_rssi.count < ARRAY_SIZE(moving_avg_rssi.samples))
@ -1439,11 +1455,11 @@ void APP_CheckKeys(void)
moving_avg_rssi.sum -= moving_avg_rssi.samples[moving_avg_rssi.index]; // subtract the oldest sample moving_avg_rssi.sum -= moving_avg_rssi.samples[moving_avg_rssi.index]; // subtract the oldest sample
moving_avg_rssi.sum += rssi; // add the newest sample moving_avg_rssi.sum += rssi; // add the newest sample
moving_avg_rssi.samples[moving_avg_rssi.index] = rssi; // save the newest sample moving_avg_rssi.samples[moving_avg_rssi.index] = rssi; // save the newest sample
if (++moving_avg_rssi.index >= ARRAY_SIZE(moving_avg_rssi.samples)) // next buffer slot if (++moving_avg_rssi.index >= ARRAY_SIZE(moving_avg_rssi.samples)) //
moving_avg_rssi.index = 0; // wrap-a-round moving_avg_rssi.index = 0; //
rssi = moving_avg_rssi.sum / moving_avg_rssi.count; // compute the average of the past 'n' samples rssi = moving_avg_rssi.sum / moving_avg_rssi.count; // compute the average of the past 'n' samples
// the register adjustments below need to be more intelligent // the register adjustments below need to be a bit more intelligent
// in order to maintain a good stable setting // in order to maintain a good stable setting
if (rssi > desired_rssi) if (rssi > desired_rssi)
@ -1479,7 +1495,7 @@ void APP_CheckKeys(void)
if (am_gain_hold_counter == 0) if (am_gain_hold_counter == 0)
{ // hold has been released, we're now free to increase gain { // hold has been released, we're now free to increase gain
if (rssi < (desired_rssi - 10)) // 5dB hysterisis - to help prevent gain hunting if (rssi < (desired_rssi - 10)) // 5dB hysterisis (helps prevent gain hunting)
{ // increase gain { // increase gain
if (new_pga < max_pga) if (new_pga < max_pga)
@ -1519,12 +1535,14 @@ void APP_CheckKeys(void)
am_mixer = new_mixer; am_mixer = new_mixer;
am_pga = new_pga; am_pga = new_pga;
BK4819_WriteRegister(BK4819_REG_13, (am_lna_short << 8) | (am_lna << 5) | (am_mixer << 3) | (am_pga << 0)); BK4819_WriteRegister(BK4819_REG_13, ((uint16_t)am_lna_short << 8) | ((uint16_t)am_lna << 5) | ((uint16_t)am_mixer << 3) | ((uint16_t)am_pga << 0));
// TODO: offset the RSSI reading to the rest of the firmware to cancel out the gain adjustments we've made here
{ // offset the RSSI reading to the rest of the firmware to cancel out the gain adjustments we've made here
static const int16_t orig_dB_gain = lna_short_dB[orig_lna_short & 3u] + lna_dB[orig_lna & 7u] + mixer_dB[orig_mixer & 3u] + pga_dB[orig_pga & 7u];
const int16_t am_dB_gain = lna_short_dB[am_lna_short & 3u] + lna_dB[am_lna & 7u] + mixer_dB[am_mixer & 3u] + pga_dB[am_pga & 7u];
rssi_db_gain_diff = am_dB_gain - orig_dB_gain;
}
} }
#endif #endif
@ -1540,7 +1558,7 @@ void APP_TimeSlice10ms(void)
#ifdef ENABLE_AM_FIX #ifdef ENABLE_AM_FIX
if (gSetting_AM_fix) if (gSetting_AM_fix)
adjustAMFrontEnd10ms(); adjust_AM_frontEnd_10ms();
#endif #endif
if (UART_IsCommandAvailable()) if (UART_IsCommandAvailable())
@ -1873,7 +1891,13 @@ void APP_TimeSlice500ms(void)
if (gCurrentFunction != FUNCTION_POWER_SAVE) if (gCurrentFunction != FUNCTION_POWER_SAVE)
{ {
gCurrentRSSI = BK4819_GetRSSI(); #ifdef ENABLE_AM_FIX
// with compensation
gCurrentRSSI = (int16_t)BK4819_GetRSSI() - (rssi_db_gain_diff * 2);
#else
gCurrentRSSI = (int16_t)BK4819_GetRSSI();
#endif
UI_UpdateRSSI(gCurrentRSSI); UI_UpdateRSSI(gCurrentRSSI);
} }
@ -2538,10 +2562,10 @@ Skip:
gDTMF_TxStopCountdown_500ms = 0; gDTMF_TxStopCountdown_500ms = 0;
gDTMF_IsTx = false; gDTMF_IsTx = false;
gVFO_RSSI_Level[0] = 0; gVFO_RSSI_bar_level[0] = 0;
gVFO_RSSI_Level[1] = 0; gVFO_RSSI_bar_level[1] = 0;
gFlagReconfigureVfos = false; gFlagReconfigureVfos = false;
} }
if (gFlagRefreshSetting) if (gFlagRefreshSetting)

BIN
firmware
View File

Binary file not shown.

BIN
firmware.bin
View File

Binary file not shown.

BIN
firmware.packed.bin
View File

Binary file not shown.

4
functions.c
View File

@ -107,8 +107,8 @@ void FUNCTION_Select(FUNCTION_Type_t Function)
if (PreviousFunction == FUNCTION_TRANSMIT) if (PreviousFunction == FUNCTION_TRANSMIT)
{ {
gVFO_RSSI_Level[0] = 0; gVFO_RSSI_bar_level[0] = 0;
gVFO_RSSI_Level[1] = 0; gVFO_RSSI_bar_level[1] = 0;
} }
else else
if (PreviousFunction != FUNCTION_RECEIVE) if (PreviousFunction != FUNCTION_RECEIVE)

6
misc.c
View File

@ -123,8 +123,8 @@ uint8_t gFoundCTCSS;
uint8_t gFoundCDCSS; uint8_t gFoundCDCSS;
bool gEndOfRxDetectedMaybe; bool gEndOfRxDetectedMaybe;
uint16_t gVFO_RSSI[2]; int16_t gVFO_RSSI[2];
uint8_t gVFO_RSSI_Level[2]; uint8_t gVFO_RSSI_bar_level[2];
uint8_t gReducedService; uint8_t gReducedService;
uint8_t gBatteryVoltageIndex; uint8_t gBatteryVoltageIndex;
@ -218,7 +218,7 @@ volatile bool gFlagTailNoteEliminationComplete;
volatile uint8_t boot_counter_10ms; volatile uint8_t boot_counter_10ms;
uint16_t gCurrentRSSI; int16_t gCurrentRSSI = 0;
uint8_t gIsLocked = 0xFF; uint8_t gIsLocked = 0xFF;

6
misc.h
View File

@ -187,8 +187,8 @@ extern uint8_t gFoundCTCSS;
extern uint8_t gFoundCDCSS; extern uint8_t gFoundCDCSS;
extern bool gEndOfRxDetectedMaybe; extern bool gEndOfRxDetectedMaybe;
extern uint16_t gVFO_RSSI[2]; extern int16_t gVFO_RSSI[2];
extern uint8_t gVFO_RSSI_Level[2]; extern uint8_t gVFO_RSSI_bar_level[2];
extern uint8_t gReducedService; extern uint8_t gReducedService;
extern uint8_t gBatteryVoltageIndex; extern uint8_t gBatteryVoltageIndex;
@ -275,7 +275,7 @@ extern volatile bool gFlagTailNoteEliminationComplete;
#ifdef ENABLE_FMRADIO #ifdef ENABLE_FMRADIO
extern volatile bool gScheduleFM; extern volatile bool gScheduleFM;
#endif #endif
extern uint16_t gCurrentRSSI; extern int16_t gCurrentRSSI;
extern uint8_t gIsLocked; extern uint8_t gIsLocked;
extern volatile uint8_t boot_counter_10ms; extern volatile uint8_t boot_counter_10ms;

8
ui/main.c
View File

@ -393,17 +393,17 @@ void UI_DisplayMain(void)
// dBm // dBm
// //
// this doesn't yet quite fit into the available screen space // this doesn't yet quite fit into the available screen space
const uint16_t rssi = gVFO_RSSI[vfo_num]; const int16_t rssi = gVFO_RSSI[vfo_num];
if (rssi > 0) if (rssi > 0)
{ {
const int16_t dBm = (int16_t)(rssi / 2) - 160; const int16_t dBm = (rssi / 2) - 160;
sprintf(String, "%-3d", dBm); sprintf(String, "%-3d", dBm);
UI_PrintStringSmall(String, 2, 0, Line + 2); UI_PrintStringSmall(String, 2, 0, Line + 2);
} }
#else #else
// bar graph // bar graph
if (gVFO_RSSI_Level[vfo_num] > 0) if (gVFO_RSSI_bar_level[vfo_num] > 0)
Level = gVFO_RSSI_Level[vfo_num]; Level = gVFO_RSSI_bar_level[vfo_num];
#endif #endif
} }

17
ui/rssi.c
View File

@ -28,7 +28,7 @@
#ifdef ENABLE_DBM #ifdef ENABLE_DBM
void UI_UpdateRSSI(uint16_t RSSI) void UI_UpdateRSSI(const int16_t RSSI)
{ // dBm { // dBm
// //
// this doesn't yet quite fit into the available screen space // this doesn't yet quite fit into the available screen space
@ -39,12 +39,11 @@ void UI_UpdateRSSI(uint16_t RSSI)
if (gEeprom.KEY_LOCK && gKeypadLocked > 0) if (gEeprom.KEY_LOCK && gKeypadLocked > 0)
return; // the screen is currently in use return; // the screen is currently in use
gVFO_RSSI[gEeprom.RX_CHANNEL] = RSSI; gVFO_RSSI[gEeprom.RX_CHANNEL] = RSSI;
gVFO_RSSI_Level[gEeprom.RX_CHANNEL] = 0; gVFO_RSSI_bar_level[gEeprom.RX_CHANNEL] = 0;
if (RSSI > 0)
{ // drop the '.5' { // drop the '.5'
const int16_t dBm = (int16_t)(RSSI / 2) - 160; const int16_t dBm = (RSSI / 2) - 160;
sprintf(s, "%-3d", dBm); sprintf(s, "%-3d", dBm);
} }
else else
@ -105,11 +104,11 @@ void Render(const uint8_t rssi, const uint8_t RssiLevel, const uint8_t VFO)
ST7565_DrawLine(0, Line, 23, pLine); ST7565_DrawLine(0, Line, 23, pLine);
} }
void UI_UpdateRSSI(uint16_t RSSI) void UI_UpdateRSSI(const int16_t RSSI)
{ {
gVFO_RSSI[gEeprom.RX_CHANNEL] = RSSI; gVFO_RSSI[gEeprom.RX_CHANNEL] = RSSI;
//const int16_t dBm = (int16_t)(RSSI / 2) - 160; //const int16_t dBm = (RSSI / 2) - 160;
#if 0 #if 0
//const unsigned int band = gRxVfo->Band; //const unsigned int band = gRxVfo->Band;
@ -144,9 +143,9 @@ void UI_UpdateRSSI(uint16_t RSSI)
else else
if (RSSI >= level0) Level = 1; if (RSSI >= level0) Level = 1;
if (gVFO_RSSI_Level[gEeprom.RX_CHANNEL] != Level) if (gVFO_RSSI_bar_level[gEeprom.RX_CHANNEL] != Level)
{ {
gVFO_RSSI_Level[gEeprom.RX_CHANNEL] = Level; gVFO_RSSI_bar_level[gEeprom.RX_CHANNEL] = Level;
Render(RSSI, Level, gEeprom.RX_CHANNEL); Render(RSSI, Level, gEeprom.RX_CHANNEL);
} }
} }

2
ui/rssi.h
View File

@ -17,7 +17,7 @@
#ifndef UI_RSSI_H #ifndef UI_RSSI_H
#define UI_RSSI_H #define UI_RSSI_H
void UI_UpdateRSSI(uint16_t RSSI); void UI_UpdateRSSI(const int16_t RSSI);
#endif #endif