mirrors/uv-k5-firmware-custom
1
0
Fork 0
mirror of https://github.com/egzumer/uv-k5-firmware-custom synced 2024-11-22 18:44:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed new bug in frequency entry/stepping

Browse Source
This commit is contained in:
OneOfEleven 2023-09-27 22:14:39 +01:00
parent 3137a515ac
commit 71c87dbad8
4 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/main.c
View File

@ -334,6 +334,7 @@ static void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
// #endif // #endif
if (IS_FREQ_CHANNEL(gTxVfo->CHANNEL_SAVE)) if (IS_FREQ_CHANNEL(gTxVfo->CHANNEL_SAVE))
{ // user is entering frequency { // user is entering frequency
uint32_t Frequency; uint32_t Frequency;
if (gInputBoxIndex < 6) if (gInputBoxIndex < 6)
@ -349,16 +350,22 @@ static void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
NUMBER_Get(gInputBox, &Frequency); NUMBER_Get(gInputBox, &Frequency);
// if (Frequency < bx_start1_Hz || Frequency >= bx_stop2_Hz) if (Frequency < LowerLimitFrequencyBandTable[0])
// { // the BK4819 chip does not do this frequency range {
// } Frequency = LowerLimitFrequencyBandTable[0];
// else }
// if (Frequency >= bx_stop1_Hz && Frequency < bx_start2_Hz) else
// { // the BK4819 chip does not do this frequency range if (Frequency >= bx_stop1_Hz && Frequency < bx_start2_Hz)
// } { // move the frequency to the closest limit
// else const uint32_t center = (bx_stop1_Hz + bx_start2_Hz) / 2;
// if (gSetting_350EN || Frequency < 35000000 || Frequency >= 40000000) Frequency = (Frequency < center) ? bx_stop1_Hz - 10 : bx_start2_Hz;
if (RX_FREQUENCY_Check(Frequency) == 0) }
else
if (Frequency > UpperLimitFrequencyBandTable[6])
{
Frequency = UpperLimitFrequencyBandTable[6];
}
{ {
unsigned int i; unsigned int i;
for (i = 0; i < 7; i++) for (i = 0; i < 7; i++)
@ -380,8 +387,9 @@ static void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
RADIO_ConfigureChannel(Vfo, 2); RADIO_ConfigureChannel(Vfo, 2);
} }
Frequency += 75; // Frequency += 75; // is this for rounding
Frequency += gTxVfo->StepFrequency / 2; // this is though
gTxVfo->freq_config_RX.Frequency = FREQUENCY_FloorToStep(Frequency, gTxVfo->StepFrequency, LowerLimitFrequencyBandTable[gTxVfo->Band]); gTxVfo->freq_config_RX.Frequency = FREQUENCY_FloorToStep(Frequency, gTxVfo->StepFrequency, LowerLimitFrequencyBandTable[gTxVfo->Band]);
gRequestSaveChannel = 1; gRequestSaveChannel = 1;

BIN
firmware.bin
View File

Binary file not shown.

BIN
firmware.packed.bin
View File

Binary file not shown.

6
frequencies.c
View File

@ -21,7 +21,7 @@
// the BK4819 has 2 bands it covers, 18MHz ~ 630MHz and 760MHz ~ 1300MHz // the BK4819 has 2 bands it covers, 18MHz ~ 630MHz and 760MHz ~ 1300MHz
const uint32_t bx_start1_Hz = 1800000; // 18MHz const uint32_t bx_start1_Hz = 1800000; // 18MHz
const uint32_t bx_stop1_Hz = 1800000; // 630MHz const uint32_t bx_stop1_Hz = 63000000; // 630MHz
const uint32_t bx_start2_Hz = 76000000; // 760MHz const uint32_t bx_start2_Hz = 76000000; // 760MHz
const uint32_t bx_stop2_Hz = 130000000; // 1300MHz const uint32_t bx_stop2_Hz = 130000000; // 1300MHz
@ -189,7 +189,7 @@ int TX_FREQUENCY_Check(const uint32_t Frequency)
if (Frequency < LowerLimitFrequencyBandTable[0] || Frequency > UpperLimitFrequencyBandTable[6]) if (Frequency < LowerLimitFrequencyBandTable[0] || Frequency > UpperLimitFrequencyBandTable[6])
return -1; return -1;
if (Frequency >= 63000000 && Frequency < 75700000) if (Frequency >= bx_stop1_Hz && Frequency < bx_start2_Hz)
return -1; return -1;
switch (gSetting_F_LOCK) switch (gSetting_F_LOCK)
@ -254,7 +254,7 @@ int RX_FREQUENCY_Check(const uint32_t Frequency)
if (Frequency < LowerLimitFrequencyBandTable[0] || Frequency > UpperLimitFrequencyBandTable[6]) if (Frequency < LowerLimitFrequencyBandTable[0] || Frequency > UpperLimitFrequencyBandTable[6])
return -1; return -1;
if (Frequency >= 63000000 && Frequency < 75700000) if (Frequency >= bx_stop1_Hz && Frequency < bx_start2_Hz)
return -1; return -1;
return 0; // OK frequency return 0; // OK frequency