BRNSystems/brnQuanFW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

FIX #194: Spectrum going crazy when AM-fix is active

Browse Source
This commit is contained in:
Krzysiek Egzmont
2023-12-07 14:46:13 +01:00
parent 5c1cb4f2fc
commit c697596806
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/spectrum.c
View File

@@ -113,7 +113,7 @@ static uint16_t GetRegMenuValue(uint8_t st) {
void LockAGC() void LockAGC()
{ {
RADIO_SetupAGC(true, lockAGC); RADIO_SetupAGC(settings.modulationType==MODULATION_AM, lockAGC);
lockAGC = true; lockAGC = true;
} }
@@ -290,8 +290,12 @@ uint16_t GetRssi() {
while ((BK4819_ReadRegister(0x63) & 0b11111111) >= 255) { while ((BK4819_ReadRegister(0x63) & 0b11111111) >= 255) {
SYSTICK_DelayUs(100); SYSTICK_DelayUs(100);
} }
uint16_t rssi = BK4819_GetRSSI();
return BK4819_GetRSSI(); #ifdef ENABLE_AM_FIX
if(settings.modulationType==MODULATION_AM && gSetting_AM_fix)
rssi += AM_fix_get_gain_diff()*2;
#endif
return rssi;
} }
static void ToggleAudio(bool on) { static void ToggleAudio(bool on) {
@@ -309,6 +313,7 @@ static void ToggleAudio(bool on) {
static void ToggleRX(bool on) { static void ToggleRX(bool on) {
isListening = on; isListening = on;
RADIO_SetupAGC(on, lockAGC);
BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2_GREEN, on); BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2_GREEN, on);
ToggleAudio(on); ToggleAudio(on);
@@ -1121,8 +1126,11 @@ static void UpdateListening() {
static void Tick() { static void Tick() {
#ifdef ENABLE_AM_FIX #ifdef ENABLE_AM_FIX
if(settings.modulationType == MODULATION_AM) { if (gNextTimeslice) {
gNextTimeslice = false;
if(settings.modulationType == MODULATION_AM) {
AM_fix_10ms(vfo, !lockAGC); //allow AM_Fix to apply its AGC action AM_fix_10ms(vfo, !lockAGC); //allow AM_Fix to apply its AGC action
}
} }
#endif #endif

2
radio.c
View File

@@ -936,7 +936,7 @@ void RADIO_SetupAGC(bool listeningAM, bool disable)
if(!listeningAM) { // if not actively listening AM we don't need any AM specific regulation if(!listeningAM) { // if not actively listening AM we don't need any AM specific regulation
BK4819_SetAGC(1); BK4819_SetAGC(!disable);
BK4819_InitAGC(false); BK4819_InitAGC(false);
} }
else { else {