Platform: Add frequency limit check

openrtx/src/ui.c

@@ -552,6 +552,20 @@ freq_t _ui_freq_add_digit(freq_t freq, uint8_t pos, uint8_t number)
     return freq += number * coefficient;
 }
 
+bool _ui_freq_check_limits(freq_t freq)
+{
+    bool valid = false;
+#ifdef BAND_VHF
+    if(freq >= FREQ_LIMIT_VHF_LO && freq <= FREQ_LIMIT_VHF_HI)
+        valid = true;
+#endif
+#ifdef BAND_UHF
+    if(freq >= FREQ_LIMIT_UHF_LO && freq <= FREQ_LIMIT_UHF_HI)
+        valid = true;
+#endif
+    return valid;
+}
+
 void ui_updateFSM(event_t event, bool *sync_rtx)
 {
     // Check if battery has enough charge to operate
@@ -577,18 +591,26 @@ void ui_updateFSM(event_t event, bool *sync_rtx)
             case VFO_MAIN:
                 if(msg.keys & KEY_UP)
                 {
-                    // Advance TX and RX frequency of 12.5KHz
+                    // Increment TX and RX frequency of 12.5KHz
+                    if(_ui_freq_check_limits(state.channel.rx_frequency + 12500) &&
+                       _ui_freq_check_limits(state.channel.tx_frequency + 12500))
+                    {
                         state.channel.rx_frequency += 12500;
                         state.channel.tx_frequency += 12500;
                         *sync_rtx = true;
                     }
+                }
                 else if(msg.keys & KEY_DOWN)
                 {
-                    // Advance TX and RX frequency of 12.5KHz
+                    // Decrement TX and RX frequency of 12.5KHz
+                    if(_ui_freq_check_limits(state.channel.rx_frequency - 12500) &&
+                       _ui_freq_check_limits(state.channel.tx_frequency - 12500))
+                    {
                         state.channel.rx_frequency -= 12500;
                         state.channel.tx_frequency -= 12500;
                         *sync_rtx = true;
                     }
+                }
                 else if(msg.keys & KEY_ENTER)
                     // Open Menu
                     state.ui_screen = MENU_TOP;
@@ -622,16 +644,23 @@ void ui_updateFSM(event_t event, bool *sync_rtx)
                         // Save new frequency setting
                         // If TX frequency was not set, TX = RX
                         if(new_tx_frequency == 0)
+                        {
+                            if(_ui_freq_check_limits(new_rx_frequency))
                             {
                                 state.channel.rx_frequency = new_rx_frequency;
                                 state.channel.tx_frequency = new_rx_frequency;
                             }
+                        }
                         // Otherwise set both frequencies
                         else
+                        {
+                            if(_ui_freq_check_limits(new_rx_frequency) && 
+                               _ui_freq_check_limits(new_tx_frequency))
                             {
                                 state.channel.rx_frequency = new_rx_frequency;
                                 state.channel.tx_frequency = new_tx_frequency;
                             }
+                        }
                         state.ui_screen = VFO_MAIN;
                     }
                 }
@@ -679,8 +708,12 @@ void ui_updateFSM(event_t event, bool *sync_rtx)
                         if(input_position >= (FREQ_DIGITS))
                         {
                             // Save both inserted frequencies
+                            if(_ui_freq_check_limits(new_rx_frequency) && 
+                               _ui_freq_check_limits(new_tx_frequency))
+                            {
                                 state.channel.rx_frequency = new_rx_frequency;
                                 state.channel.tx_frequency = new_tx_frequency;
+                            }
                             state.ui_screen = VFO_MAIN;
                         }
                     }

platform/targets/DM-1801/hwconfig.h

@@ -23,6 +23,16 @@
 
 #include "MK22F51212.h"
 
+/* Supported radio bands */
+#define BAND_VHF
+#define BAND_UHF
+
+/* Band limits in Hz */
+#define FREQ_LIMIT_VHF_LO 136000000
+#define FREQ_LIMIT_VHF_HI 136000000
+#define FREQ_LIMIT_UHF_LO 400000000
+#define FREQ_LIMIT_UHF_HI 470000000
+
 /* Screen dimensions */
 #define SCREEN_WIDTH 128
 #define SCREEN_HEIGHT 64

platform/targets/GD77/hwconfig.h

@@ -23,6 +23,16 @@
 
 #include "MK22F51212.h"
 
+/* Supported radio bands */
+#define BAND_VHF
+#define BAND_UHF
+
+/* Band limits in Hz */
+#define FREQ_LIMIT_VHF_LO 136000000
+#define FREQ_LIMIT_VHF_HI 136000000
+#define FREQ_LIMIT_UHF_LO 400000000
+#define FREQ_LIMIT_UHF_HI 470000000
+
 /* Screen dimensions */
 #define SCREEN_WIDTH 128
 #define SCREEN_HEIGHT 64

platform/targets/MD-380/hwconfig.h

@@ -22,6 +22,16 @@
 
 #include <stm32f4xx.h>
 
+/* Supported radio bands */
+#define BAND_VHF
+#define BAND_UHF
+
+/* Band limits in Hz */
+#define FREQ_LIMIT_VHF_LO 136000000
+#define FREQ_LIMIT_VHF_HI 136000000
+#define FREQ_LIMIT_UHF_LO 400000000
+#define FREQ_LIMIT_UHF_HI 480000000
+
 /* Screen dimensions */
 #define SCREEN_WIDTH 160
 #define SCREEN_HEIGHT 128

platform/targets/MD-390/hwconfig.h

@@ -22,6 +22,16 @@
 
 #include <stm32f4xx.h>
 
+/* Supported radio bands */
+#define BAND_VHF
+#define BAND_UHF
+
+/* Band limits in Hz */
+#define FREQ_LIMIT_VHF_LO 136000000
+#define FREQ_LIMIT_VHF_HI 136000000
+#define FREQ_LIMIT_UHF_LO 400000000
+#define FREQ_LIMIT_UHF_HI 480000000
+
 /* Screen dimensions */
 #define SCREEN_WIDTH 160
 #define SCREEN_HEIGHT 128

platform/targets/MD-UV380/hwconfig.h

@@ -22,6 +22,16 @@
 
 #include <stm32f4xx.h>
 
+/* Supported radio bands */
+#define BAND_VHF
+#define BAND_UHF
+
+/* Band limits in Hz */
+#define FREQ_LIMIT_VHF_LO 136000000
+#define FREQ_LIMIT_VHF_HI 136000000
+#define FREQ_LIMIT_UHF_LO 400000000
+#define FREQ_LIMIT_UHF_HI 480000000
+
 /* Screen dimensions */
 #define SCREEN_WIDTH 160
 #define SCREEN_HEIGHT 128

platform/targets/linux/hwconfig.h

@@ -18,6 +18,16 @@
 
 #define PLATFORM_LINUX
 
+/* Supported radio bands */
+#define BAND_VHF
+#define BAND_UHF
+
+/* Band limits in Hz */
+#define FREQ_LIMIT_VHF_LO 136000000
+#define FREQ_LIMIT_VHF_HI 136000000
+#define FREQ_LIMIT_UHF_LO 400000000
+#define FREQ_LIMIT_UHF_HI 480000000
+
 /* Battery type */
 #define BAT_LIPO_2S