Do some stuff

2025-03-04 16:46:02 +01:00
parent fabf38f1bc
commit 72558f93f3
34 changed files with 937 additions and 1248 deletions
--- a/frequencies.c
+++ b/frequencies.c
@@ -24,90 +24,90 @@
 #define BX4819_band1_lower 1800000
 #define BX4819_band2_upper 130000000

-const freq_band_table_t BX4819_band1 = {BX4819_band1_lower,  63000000};
+const freq_band_table_t BX4819_band1 = {BX4819_band1_lower, 63000000};
 const freq_band_table_t BX4819_band2 = {84000000, BX4819_band2_upper};

 const freq_band_table_t frequencyBandTable[] =
-{
-    #ifndef ENABLE_WIDE_RX
-        // QS original
-        [BAND1_50MHz ]={.lower =  5000000,  .upper =  7600000},
-        [BAND7_470MHz]={.lower = 47000000,  .upper = 60000000},
-    #else
-        // extended range
-        [BAND1_50MHz ]={.lower =  BX4819_band1_lower, .upper =  10800000},
-        [BAND7_470MHz]={.lower = 47000000, .upper = BX4819_band2_upper},
-    #endif
-        [BAND2_108MHz]={.lower = 10800000,  .upper = 13700000},
-        [BAND3_137MHz]={.lower = 13700000,  .upper = 17400000},
-        [BAND4_174MHz]={.lower = 17400000,  .upper = 35000000},
-        [BAND5_350MHz]={.lower = 35000000,  .upper = 40000000},
-        [BAND6_400MHz]={.lower = 40000000,  .upper = 47000000}
-};
+        {
+#ifndef ENABLE_WIDE_RX
+                // QS original
+                [BAND1_50MHz ]={.lower =  5000000,  .upper =  7600000},
+                [BAND7_470MHz]={.lower = 47000000,  .upper = 60000000},
+#else
+                // extended range
+                [BAND1_50MHz]={.lower =  BX4819_band1_lower, .upper =  10800000},
+                [BAND7_470MHz]={.lower = 47000000, .upper = BX4819_band2_upper},
+#endif
+                [BAND2_108MHz]={.lower = 10800000, .upper = 13700000},
+                [BAND3_137MHz]={.lower = 13700000, .upper = 17400000},
+                [BAND4_174MHz]={.lower = 17400000, .upper = 35000000},
+                [BAND5_350MHz]={.lower = 35000000, .upper = 40000000},
+                [BAND6_400MHz]={.lower = 40000000, .upper = 47000000}
+        };

 #ifdef ENABLE_NOAA
-    const uint32_t NoaaFrequencyTable[10] =
-    {
-        16255000,
-        16240000,
-        16247500,
-        16242500,
-        16245000,
-        16250000,
-        16252500,
-        16152500,
-        16177500,
-        16327500
-    };
+const uint32_t NoaaFrequencyTable[10] =
+{
+    16255000,
+    16240000,
+    16247500,
+    16242500,
+    16245000,
+    16250000,
+    16252500,
+    16152500,
+    16177500,
+    16327500
+};
 #endif


 // this order of steps has to be preserved for backwards compatibility with other/stock firmwares
 const uint16_t gStepFrequencyTable[] = {
 // standard steps
-    [STEP_2_5kHz]   = 250,
-    [STEP_5kHz]     = 500,
-    [STEP_6_25kHz]  = 625,
-    [STEP_10kHz]    = 1000,
-    [STEP_12_5kHz]  = 1250,
-    [STEP_25kHz]    = 2500,
-    [STEP_8_33kHz]  = 833,
+        [STEP_2_5kHz]   = 250,
+        [STEP_5kHz]     = 500,
+        [STEP_6_25kHz]  = 625,
+        [STEP_10kHz]    = 1000,
+        [STEP_12_5kHz]  = 1250,
+        [STEP_25kHz]    = 2500,
+        [STEP_8_33kHz]  = 833,
 // custom steps
-    [STEP_0_01kHz]  = 1,
-    [STEP_0_05kHz]  = 5,
-    [STEP_0_1kHz]   = 10,
-    [STEP_0_25kHz]  = 25,
-    [STEP_0_5kHz]   = 50,
-    [STEP_1kHz]     = 100,
-    [STEP_1_25kHz]  = 125,
-    [STEP_9kHz]     = 900,
-    [STEP_15kHz]    = 1500,
-    [STEP_20kHz]    = 2000,
-    [STEP_30kHz]    = 3000,
-    [STEP_50kHz]    = 5000,
-    [STEP_100kHz]   = 10000,
-    [STEP_125kHz]   = 12500,
-    [STEP_200kHz]   = 20000,
-    [STEP_250kHz]   = 25000,
-    [STEP_500kHz]   = 50000
+        [STEP_0_01kHz]  = 1,
+        [STEP_0_05kHz]  = 5,
+        [STEP_0_1kHz]   = 10,
+        [STEP_0_25kHz]  = 25,
+        [STEP_0_5kHz]   = 50,
+        [STEP_1kHz]     = 100,
+        [STEP_1_25kHz]  = 125,
+        [STEP_9kHz]     = 900,
+        [STEP_15kHz]    = 1500,
+        [STEP_20kHz]    = 2000,
+        [STEP_30kHz]    = 3000,
+        [STEP_50kHz]    = 5000,
+        [STEP_100kHz]   = 10000,
+        [STEP_125kHz]   = 12500,
+        [STEP_200kHz]   = 20000,
+        [STEP_250kHz]   = 25000,
+        [STEP_500kHz]   = 50000
 };


 const STEP_Setting_t StepSortedIndexes[] = {
-    STEP_0_01kHz, STEP_0_05kHz, STEP_0_1kHz, STEP_0_25kHz, STEP_0_5kHz, STEP_1kHz, STEP_1_25kHz, STEP_2_5kHz, STEP_5kHz, STEP_6_25kHz,
-    STEP_8_33kHz, STEP_9kHz, STEP_10kHz, STEP_12_5kHz, STEP_15kHz, STEP_20kHz, STEP_25kHz, STEP_30kHz, STEP_50kHz, STEP_100kHz,
-    STEP_125kHz, STEP_200kHz, STEP_250kHz, STEP_500kHz
+        STEP_0_01kHz, STEP_0_05kHz, STEP_0_1kHz, STEP_0_25kHz, STEP_0_5kHz, STEP_1kHz, STEP_1_25kHz, STEP_2_5kHz,
+        STEP_5kHz, STEP_6_25kHz,
+        STEP_8_33kHz, STEP_9kHz, STEP_10kHz, STEP_12_5kHz, STEP_15kHz, STEP_20kHz, STEP_25kHz, STEP_30kHz, STEP_50kHz,
+        STEP_100kHz,
+        STEP_125kHz, STEP_200kHz, STEP_250kHz, STEP_500kHz
 };

-STEP_Setting_t FREQUENCY_GetStepIdxFromSortedIdx(uint8_t sortedIdx)
-{
+STEP_Setting_t FREQUENCY_GetStepIdxFromSortedIdx(uint8_t sortedIdx) {
    return StepSortedIndexes[sortedIdx];
 }

-uint32_t FREQUENCY_GetSortedIdxFromStepIdx(uint8_t stepIdx)
-{
-    for(uint8_t i = 0; i < ARRAY_SIZE(gStepFrequencyTable); i++)
-        if(StepSortedIndexes[i] == stepIdx)
+uint32_t FREQUENCY_GetSortedIdxFromStepIdx(uint8_t stepIdx) {
+    for (uint8_t i = 0; i < ARRAY_SIZE(gStepFrequencyTable); i++)
+        if (StepSortedIndexes[i] == stepIdx)
            return i;
    return 0;
 }
@@ -115,25 +115,24 @@ uint32_t FREQUENCY_GetSortedIdxFromStepIdx(uint8_t stepIdx)
 static_assert(ARRAY_SIZE(gStepFrequencyTable) == STEP_N_ELEM);


-FREQUENCY_Band_t FREQUENCY_GetBand(uint32_t Frequency)
-{
+FREQUENCY_Band_t FREQUENCY_GetBand(uint32_t Frequency) {
    for (int32_t band = BAND_N_ELEM - 1; band >= 0; band--)
        if (Frequency >= frequencyBandTable[band].lower)
-            return (FREQUENCY_Band_t)band;
+            return (FREQUENCY_Band_t) band;

    return BAND1_50MHz;
 }

-uint8_t FREQUENCY_CalculateOutputPower(uint8_t TxpLow, uint8_t TxpMid, uint8_t TxpHigh, int32_t LowerLimit, int32_t Middle, int32_t UpperLimit, int32_t Frequency)
-{
+uint8_t
+FREQUENCY_CalculateOutputPower(uint8_t TxpLow, uint8_t TxpMid, uint8_t TxpHigh, int32_t LowerLimit, int32_t Middle,
+                               int32_t UpperLimit, int32_t Frequency) {
    if (Frequency <= LowerLimit)
        return TxpLow;

    if (UpperLimit <= Frequency)
        return TxpHigh;

-    if (Frequency <= Middle)
-    {
+    if (Frequency <= Middle) {
        TxpMid += ((TxpMid - TxpLow) * (Frequency - LowerLimit)) / (Middle - LowerLimit);
        return TxpMid;
    }
@@ -144,23 +143,22 @@ uint8_t FREQUENCY_CalculateOutputPower(uint8_t TxpLow, uint8_t TxpMid, uint8_t T
 }


-uint32_t FREQUENCY_RoundToStep(uint32_t freq, uint16_t step)
-{
-    if(step == 833) {
-        uint32_t base = freq/2500*2500;
-        int chno = (freq - base) / 700;    // convert entered aviation 8.33Khz channel number scheme to actual frequency. 
+uint32_t FREQUENCY_RoundToStep(uint32_t freq, uint16_t step) {
+    if (step == 833) {
+        uint32_t base = freq / 2500 * 2500;
+        int chno =
+                (freq - base) / 700;    // convert entered aviation 8.33Khz channel number scheme to actual frequency.
        return base + (chno * 833) + (chno == 3);
    }

-    if(step == 1)
+    if (step == 1)
        return freq;
-    if(step >= 1000) 
-        step = step/2;
+    if (step >= 1000)
+        step = step / 2;
    return (freq + (step + 1) / 2) / step * step;
 }

-int32_t TX_freq_check(const uint32_t Frequency)
-{   // return '0' if TX frequency is allowed
+int32_t TX_freq_check(const uint32_t Frequency) {   // return '0' if TX frequency is allowed
    // otherwise return '-1'

    if (Frequency < frequencyBandTable[0].lower || Frequency > frequencyBandTable[BAND_N_ELEM - 1].upper)
@@ -169,30 +167,22 @@ int32_t TX_freq_check(const uint32_t Frequency)
    if (Frequency >= BX4819_band1.upper && Frequency < BX4819_band2.lower)
        return -1;  // BX chip does not work in this range

-    switch (gSetting_F_LOCK)
-    {
+    switch (gSetting_F_LOCK) {
        case F_LOCK_DEF:
-            if (Frequency >= frequencyBandTable[BAND3_137MHz].lower && Frequency < frequencyBandTable[BAND3_137MHz].upper)
+            if (Frequency >= frequencyBandTable[BAND3_137MHz].lower &&
+                Frequency < frequencyBandTable[BAND3_137MHz].upper)
                return 0;
-            if (Frequency >= frequencyBandTable[BAND4_174MHz].lower && Frequency < frequencyBandTable[BAND4_174MHz].upper)
-            #ifndef ENABLE_FEAT_F4HWN
-                if (gSetting_200TX)
-            #endif
-                    return 0;
-            if (Frequency >= frequencyBandTable[BAND5_350MHz].lower && Frequency < frequencyBandTable[BAND5_350MHz].upper)
-            #ifndef ENABLE_FEAT_F4HWN
-                if (gSetting_350TX && gSetting_350EN)
-            #else
-                if (gSetting_350EN)
-            #endif
-                    return 0;
-            if (Frequency >= frequencyBandTable[BAND6_400MHz].lower && Frequency < frequencyBandTable[BAND6_400MHz].upper)
+            if (Frequency >= frequencyBandTable[BAND4_174MHz].lower &&
+                Frequency < frequencyBandTable[BAND4_174MHz].upper)
+                return 0;
+            if (Frequency >= frequencyBandTable[BAND5_350MHz].lower &&
+                Frequency < frequencyBandTable[BAND5_350MHz].upper)
+                return 0;
+            if (Frequency >= frequencyBandTable[BAND6_400MHz].lower &&
+                Frequency < frequencyBandTable[BAND6_400MHz].upper)
                return 0;
            if (Frequency >= frequencyBandTable[BAND7_470MHz].lower && Frequency <= 60000000)
-            #ifndef ENABLE_FEAT_F4HWN
-                if (gSetting_500TX)
-            #endif
-                    return 0;
+                return 0;
            break;

 //        case F_LOCK_FCC:
@@ -231,28 +221,28 @@ int32_t TX_freq_check(const uint32_t Frequency)
 //            break;

 #ifdef ENABLE_FEAT_F4HWN_PMR
-        case F_LOCK_PMR:
-            if (Frequency >= 44600625 && Frequency <= 44619375)
-                return 0;
-            break;
+            case F_LOCK_PMR:
+                if (Frequency >= 44600625 && Frequency <= 44619375)
+                    return 0;
+                break;
 #endif

 #ifdef ENABLE_FEAT_F4HWN_GMRS_FRS_MURS
-        case F_LOCK_GMRS_FRS_MURS:
-            // https://forums.radioreference.com/threads/the-great-unofficial-radioreference-frs-gmrs-murs-fact-sheet.275370/
-            if ((Frequency >= 46255000 && Frequency <= 46272500) ||
-                (Frequency >= 46755000 && Frequency <= 46772500)) // FRS/GMRS
-                return 0;
-            if (Frequency == 15182000 || 
-                Frequency == 15188000 || 
-                Frequency == 15194000 || 
-                Frequency == 15457000 || 
-                Frequency == 15460000) // MURS
-                return 0;
-            break;
+            case F_LOCK_GMRS_FRS_MURS:
+                // https://forums.radioreference.com/threads/the-great-unofficial-radioreference-frs-gmrs-murs-fact-sheet.275370/
+                if ((Frequency >= 46255000 && Frequency <= 46272500) ||
+                    (Frequency >= 46755000 && Frequency <= 46772500)) // FRS/GMRS
+                    return 0;
+                if (Frequency == 15182000 ||
+                    Frequency == 15188000 ||
+                    Frequency == 15194000 ||
+                    Frequency == 15457000 ||
+                    Frequency == 15460000) // MURS
+                    return 0;
+                break;
 #endif

-#ifdef ENABLE_FEAT_F4HWN_CA 
+#ifdef ENABLE_FEAT_F4HWN_CA
        case F_LOCK_CA:
            if (Frequency >= 14400000 && Frequency < 14800000)
                return 0;
@@ -275,8 +265,7 @@ int32_t TX_freq_check(const uint32_t Frequency)
    return -1;
 }

-int32_t RX_freq_check(const uint32_t Frequency)
-{   // return '0' if RX frequency is allowed
+int32_t RX_freq_check(const uint32_t Frequency) {   // return '0' if RX frequency is allowed
    // otherwise return '-1'

    if (Frequency < frequencyBandTable[0].lower || Frequency > frequencyBandTable[BAND_N_ELEM - 1].upper)