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

Fix frequency band error from yesterday

Browse Source
This commit is contained in:
OneOfEleven
2023-10-03 11:48:00 +01:00
parent 010ea0308a
commit c5c86d0ad0
7 changed files with 32 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
am_fix.c
View File

@ -443,7 +443,7 @@
#if 0 #if 0
if (gain_table_index[vfo] == gain_table_index_prev[vfo]) if (gain_table_index[vfo] == gain_table_index_prev[vfo])
return; // no gain change return; // no gain change - this is to reduce writing to the BK chip on ever call
#endif #endif
#endif #endif

72
app/app.c
View File

@ -543,48 +543,34 @@ void APP_StartListening(FUNCTION_Type_t Function, const bool reset_am_fix)
// ****************************************** // ******************************************
// original setting {
uint16_t lna_short = orig_lna_short; // original setting
uint16_t lna = orig_lna; uint16_t lna_short = orig_lna_short;
uint16_t mixer = orig_mixer; uint16_t lna = orig_lna;
uint16_t pga = orig_pga; uint16_t mixer = orig_mixer;
uint16_t pga = orig_pga;
if (gRxVfo->AM_mode) #ifdef ENABLE_AM_FIX
{ // AM
/*
#ifndef ENABLE_AM_FIX
const uint32_t rx_frequency = gRxVfo->pRX->Frequency;
// the RX gain abrutly reduces above this frequency
// I guess this is (one of) the freq the hardware switches the front ends over ? // TODO:
if (rx_frequency <= 22640000)
{ // decrease front end gain - AM demodulator saturates at a slightly higher signal level
lna_short = 3; // 3 original // if (gRxVfo->AM_mode)
lna = 2; // 2 original // { // AM RX
mixer = 3; // 3 original // if (gEeprom.VfoInfo[gEeprom.RX_CHANNEL].AM_mode && gSetting_AM_fix)
pga = 3; // 6 original, 3 reduced // {
} // AM_fix_10ms(gEeprom.RX_CHANNEL);
else // }
{ // increase the front end to compensate the reduced gain, but more gain decreases dynamic range :( // }
lna_short = 3; // 3 original // else
lna = 4; // 2 original, 4 increased BK4819_WriteRegister(BK4819_REG_13, (lna_short << 8) | (lna << 5) | (mixer << 3) | (pga << 0));
mixer = 3; // 3 original #else
pga = 7; // 6 original, 7 increased // apply the front end gain settings
} BK4819_WriteRegister(BK4819_REG_13, (lna_short << 8) | (lna << 5) | (mixer << 3) | (pga << 0));
#endif #endif
*/
// what do these 4 other gain settings do ???
//BK4819_WriteRegister(BK4819_REG_12, 0x037B); // 000000 11 011 11 011
//BK4819_WriteRegister(BK4819_REG_11, 0x027B); // 000000 10 011 11 011
//BK4819_WriteRegister(BK4819_REG_10, 0x007A); // 000000 00 011 11 010
//BK4819_WriteRegister(BK4819_REG_14, 0x0019); // 000000 00 000 11 001
gNeverUsed = 0;
} }
// apply the front end gain settings
BK4819_WriteRegister(BK4819_REG_13, (lna_short << 8) | (lna << 5) | (mixer << 3) | (pga << 0));
// ****************************************** // ******************************************
// AF gain - original // AF gain - original
@ -1739,7 +1725,7 @@ void APP_TimeSlice500ms(void)
{ {
// gReducedService = true; // a serial config upload/download is in progress // gReducedService = true; // a serial config upload/download is in progress
} }
// Skipped authentic device check // Skipped authentic device check
#ifdef ENABLE_FMRADIO #ifdef ENABLE_FMRADIO
@ -1794,7 +1780,7 @@ void APP_TimeSlice500ms(void)
gUpdateDisplay = true; gUpdateDisplay = true;
#endif #endif
} }
if (gCurrentFunction != FUNCTION_POWER_SAVE) if (gCurrentFunction != FUNCTION_POWER_SAVE)
updateRSSI(gEeprom.RX_CHANNEL); updateRSSI(gEeprom.RX_CHANNEL);
@ -1817,7 +1803,7 @@ void APP_TimeSlice500ms(void)
#endif #endif
{ {
bool exit_menu = false; bool exit_menu = false;
if (gEeprom.AUTO_KEYPAD_LOCK && gKeyLockCountdown > 0 && !gDTMF_InputMode) if (gEeprom.AUTO_KEYPAD_LOCK && gKeyLockCountdown > 0 && !gDTMF_InputMode)
{ {
if (--gKeyLockCountdown == 0) if (--gKeyLockCountdown == 0)
@ -1829,11 +1815,11 @@ void APP_TimeSlice500ms(void)
if (gMenuCountdown > 0) if (gMenuCountdown > 0)
if (--gMenuCountdown == 0) if (--gMenuCountdown == 0)
exit_menu = true; // exit menu mode exit_menu = true; // exit menu mode
if (exit_menu) if (exit_menu)
{ {
gMenuCountdown = 0; gMenuCountdown = 0;
if (gEeprom.BACKLIGHT == 0 && gScreenToDisplay == DISPLAY_MENU) if (gEeprom.BACKLIGHT == 0 && gScreenToDisplay == DISPLAY_MENU)
{ {
gBacklightCountdown = 0; gBacklightCountdown = 0;
@ -2127,7 +2113,7 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
{ {
if (gScreenToDisplay == DISPLAY_MENU) // 1of11 if (gScreenToDisplay == DISPLAY_MENU) // 1of11
gMenuCountdown = menu_timeout_500ms; gMenuCountdown = menu_timeout_500ms;
BACKLIGHT_TurnOn(); BACKLIGHT_TurnOn();
if (gDTMF_DecodeRingCountdown_500ms > 0) if (gDTMF_DecodeRingCountdown_500ms > 0)

BIN
firmware.bin
View File

Binary file not shown.

BIN
firmware.packed.bin
View File

Binary file not shown.

1
misc.c
View File

@ -217,7 +217,6 @@ uint8_t gScanDelay_10ms;
uint8_t gAircopySendCountdown; uint8_t gAircopySendCountdown;
#endif #endif
uint8_t gFSKWriteIndex; uint8_t gFSKWriteIndex;
uint8_t gNeverUsed;
#ifdef ENABLE_NOAA #ifdef ENABLE_NOAA
bool gIsNoaaMode; bool gIsNoaaMode;

1
misc.h
View File

@ -285,7 +285,6 @@ extern uint8_t gScanDelay_10ms;
extern uint8_t gAircopySendCountdown; extern uint8_t gAircopySendCountdown;
#endif #endif
extern uint8_t gFSKWriteIndex; extern uint8_t gFSKWriteIndex;
extern uint8_t gNeverUsed;
#ifdef ENABLE_NOAA #ifdef ENABLE_NOAA
extern bool gIsNoaaMode; extern bool gIsNoaaMode;
extern uint8_t gNoaaChannel; extern uint8_t gNoaaChannel;

4
radio.c
View File

@ -371,8 +371,8 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
if (Frequency < frequencyBandTable[Band].lower) if (Frequency < frequencyBandTable[Band].lower)
Frequency = frequencyBandTable[Band].lower; Frequency = frequencyBandTable[Band].lower;
else else
if (Frequency > frequencyBandTable[Band + 1].upper) if (Frequency > frequencyBandTable[Band].upper)
Frequency = frequencyBandTable[Band + 1].upper; Frequency = frequencyBandTable[Band].upper;
else else
if (Channel >= FREQ_CHANNEL_FIRST) if (Channel >= FREQ_CHANNEL_FIRST)
Frequency = FREQUENCY_FloorToStep(Frequency, gEeprom.VfoInfo[VFO].StepFrequency, frequencyBandTable[Band].lower); Frequency = FREQUENCY_FloorToStep(Frequency, gEeprom.VfoInfo[VFO].StepFrequency, frequencyBandTable[Band].lower);