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

Change upper limit of airband to 137MHz

Browse Source
This commit is contained in:
Krzysiek Egzmont
2023-10-24 03:29:50 +02:00
parent 8ab123c927
commit e877820594
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
frequencies.c
View File

@@ -26,22 +26,22 @@ const freq_band_table_t frequencyBandTable[7] =
{ {
#ifndef ENABLE_WIDE_RX #ifndef ENABLE_WIDE_RX
// QS original // QS original
{ 5000000, 7600000}, {.lower = 5000000, .upper = 7600000},
{10800000, 13600000}, {.lower = 10800000, .upper = 13700000},
{13600000, 17400000}, {.lower = 13700000, .upper = 17400000},
{17400000, 35000000}, {.lower = 17400000, .upper = 35000000},
{35000000, 40000000}, {.lower = 35000000, .upper = 40000000},
{40000000, 47000000}, {.lower = 40000000, .upper = 47000000},
{47000000, 60000000} {.lower = 47000000, .upper = 60000000}
#else #else
// extended range // extended range
{ 1800000, 10800000}, {.lower = 1800000, .upper = 10800000},
{10800000, 13600000}, {.lower = 10800000, .upper = 13700000},
{13600000, 17400000}, {.lower = 13700000, .upper = 17400000},
{17400000, 35000000}, {.lower = 17400000, .upper = 35000000},
{35000000, 40000000}, {.lower = 35000000, .upper = 40000000},
{40000000, 47000000}, {.lower = 40000000, .upper = 47000000},
{47000000, 130000000} {.lower = 47000000, .upper = 130000000}
#endif #endif
}; };
@@ -130,17 +130,17 @@ int TX_freq_check(const uint32_t Frequency)
switch (gSetting_F_LOCK) switch (gSetting_F_LOCK)
{ {
case F_LOCK_OFF: case F_LOCK_OFF:
if (Frequency >= 13600000 && Frequency < 17400000) if (Frequency >= frequencyBandTable[BAND3_137MHz].lower && Frequency < frequencyBandTable[BAND3_137MHz].upper)
return 0; return 0;
if (Frequency >= 17400000 && Frequency < 35000000) if (Frequency >= frequencyBandTable[BAND4_174MHz].lower && Frequency < frequencyBandTable[BAND4_174MHz].upper)
if (gSetting_200TX) if (gSetting_200TX)
return 0; return 0;
if (Frequency >= 35000000 && Frequency < 40000000) if (Frequency >= frequencyBandTable[BAND5_350MHz].lower && Frequency < frequencyBandTable[BAND5_350MHz].upper)
if (gSetting_350TX && gSetting_350EN) if (gSetting_350TX && gSetting_350EN)
return 0; return 0;
if (Frequency >= 40000000 && Frequency < 47000000) if (Frequency >= frequencyBandTable[BAND6_400MHz].lower && Frequency < frequencyBandTable[BAND6_400MHz].upper)
return 0; return 0;
if (Frequency >= 47000000 && Frequency <= 60000000) if (Frequency >= frequencyBandTable[BAND7_470MHz].lower && Frequency <= 60000000)
if (gSetting_500TX) if (gSetting_500TX)
return 0; return 0;
break; break;
@@ -167,14 +167,14 @@ int TX_freq_check(const uint32_t Frequency)
break; break;
case F_LOCK_430: case F_LOCK_430:
if (Frequency >= 13600000 && Frequency < 17400000) if (Frequency >= frequencyBandTable[BAND3_137MHz].lower && Frequency < 17400000)
return 0; return 0;
if (Frequency >= 40000000 && Frequency < 43000000) if (Frequency >= 40000000 && Frequency < 43000000)
return 0; return 0;
break; break;
case F_LOCK_438: case F_LOCK_438:
if (Frequency >= 13600000 && Frequency < 17400000) if (Frequency >= frequencyBandTable[BAND3_137MHz].lower && Frequency < 17400000)
return 0; return 0;
if (Frequency >= 40000000 && Frequency < 43800000) if (Frequency >= 40000000 && Frequency < 43800000)
return 0; return 0;

2
frequencies.h
View File

@@ -35,7 +35,7 @@ enum FREQUENCY_Band_t {
BAND_NONE = -1, BAND_NONE = -1,
BAND1_50MHz = 0, BAND1_50MHz = 0,
BAND2_108MHz, BAND2_108MHz,
BAND3_136MHz, BAND3_137MHz,
BAND4_174MHz, BAND4_174MHz,
BAND5_350MHz, BAND5_350MHz,
BAND6_400MHz, BAND6_400MHz,

2
radio.c
View File

@@ -375,7 +375,7 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
pRadio->freq_config_RX.Frequency = Frequency; pRadio->freq_config_RX.Frequency = Frequency;
if (Frequency >= 10800000 && Frequency < 13600000) if (Frequency >= frequencyBandTable[BAND2_108MHz].upper && Frequency < frequencyBandTable[BAND2_108MHz].upper)
gEeprom.VfoInfo[VFO].TX_OFFSET_FREQUENCY_DIRECTION = TX_OFFSET_FREQUENCY_DIRECTION_OFF; gEeprom.VfoInfo[VFO].TX_OFFSET_FREQUENCY_DIRECTION = TX_OFFSET_FREQUENCY_DIRECTION_OFF;
else if (Channel > MR_CHANNEL_LAST) else if (Channel > MR_CHANNEL_LAST)
gEeprom.VfoInfo[VFO].TX_OFFSET_FREQUENCY = FREQUENCY_RoundToStep(gEeprom.VfoInfo[VFO].TX_OFFSET_FREQUENCY, gEeprom.VfoInfo[VFO].StepFrequency); gEeprom.VfoInfo[VFO].TX_OFFSET_FREQUENCY = FREQUENCY_RoundToStep(gEeprom.VfoInfo[VFO].TX_OFFSET_FREQUENCY, gEeprom.VfoInfo[VFO].StepFrequency);