Add Config.h options for frequency band check and restrictions

g4klx · Oct 9, 2018 · 8d55079 · 8d55079
1 parent 77c988c
commit 8d55079
Show file tree

Hide file tree

Showing 15 changed files with 88 additions and 0 deletions.
diff --git a/Config.h b/Config.h
@@ -95,4 +95,10 @@
 // Enable modem debug messages
 // #define ENABLE_DEBUG
 
+// Disable frequency bands check
+// #define DISABLE_FREQ_CHECK
+
+// Disable frequency restrictions (satellite, ISS, etc)
+// #define DISABLE_FREQ_BAN
+
 #endif
diff --git a/IO.cpp b/IO.cpp
@@ -310,6 +310,7 @@ uint8_t CIO::setFreq(uint32_t frequency_rx, uint32_t frequency_tx, uint8_t rf_po
   // Configure power level
   setPower(rf_power);
 
+#if !defined(DISABLE_FREQ_CHECK)
   // Check frequency ranges
   if( !( ((frequency_rx >= VHF1_MIN)&&(frequency_rx < VHF1_MAX)) || ((frequency_tx >= VHF1_MIN)&&(frequency_tx < VHF1_MAX)) || \
   ((frequency_rx >= UHF1_MIN)&&(frequency_rx < UHF1_MAX)) || ((frequency_tx >= UHF1_MIN)&&(frequency_tx < UHF1_MAX)) || \
@@ -322,7 +323,9 @@ uint8_t CIO::setFreq(uint32_t frequency_rx, uint32_t frequency_tx, uint8_t rf_po
   ((pocsag_freq_tx >= VHF2_MIN)&&(pocsag_freq_tx < VHF2_MAX)) || \
   ((pocsag_freq_tx >= UHF2_MIN)&&(pocsag_freq_tx < UHF2_MAX)) ) )
     return 4U;
+#endif
 
+#if !defined(DISABLE_FREQ_BAN)
   // Check banned frequency ranges
   if( ((frequency_rx >= BAN1_MIN)&&(frequency_rx <= BAN1_MAX)) || ((frequency_tx >= BAN1_MIN)&&(frequency_tx <= BAN1_MAX)) || \
   ((frequency_rx >= BAN2_MIN)&&(frequency_rx <= BAN2_MAX)) || ((frequency_tx >= BAN2_MIN)&&(frequency_tx <= BAN2_MAX)) )
@@ -331,6 +334,7 @@ uint8_t CIO::setFreq(uint32_t frequency_rx, uint32_t frequency_tx, uint8_t rf_po
   if( ((pocsag_freq_tx >= BAN1_MIN)&&(pocsag_freq_tx <= BAN1_MAX)) || \
   ((pocsag_freq_tx >= BAN2_MIN)&&(pocsag_freq_tx <= BAN2_MAX)) )
     return 4U;
+#endif
 
   // Configure frequency
   m_frequency_rx = frequency_rx;

diff --git a/configs/MMDVM_HS_Dual_Hat-12mhz.h b/configs/MMDVM_HS_Dual_Hat-12mhz.h
@@ -95,4 +95,10 @@
 // Enable modem debug messages
 // #define ENABLE_DEBUG
 
+// Disable frequency bands check
+// #define DISABLE_FREQ_CHECK
+
+// Disable frequency restrictions (satellite, ISS, etc)
+// #define DISABLE_FREQ_BAN
+
 #endif
diff --git a/configs/MMDVM_HS_Dual_Hat.h b/configs/MMDVM_HS_Dual_Hat.h
@@ -95,4 +95,10 @@
 // Enable modem debug messages
 // #define ENABLE_DEBUG
 
+// Disable frequency bands check
+// #define DISABLE_FREQ_CHECK
+
+// Disable frequency restrictions (satellite, ISS, etc)
+// #define DISABLE_FREQ_BAN
+
 #endif
diff --git a/configs/MMDVM_HS_Hat-12mhz.h b/configs/MMDVM_HS_Hat-12mhz.h
@@ -95,4 +95,10 @@
 // Enable modem debug messages
 // #define ENABLE_DEBUG
 
+// Disable frequency bands check
+// #define DISABLE_FREQ_CHECK
+
+// Disable frequency restrictions (satellite, ISS, etc)
+// #define DISABLE_FREQ_BAN
+
 #endif
diff --git a/configs/MMDVM_HS_Hat.h b/configs/MMDVM_HS_Hat.h
@@ -95,4 +95,10 @@
 // Enable modem debug messages
 // #define ENABLE_DEBUG
 
+// Disable frequency bands check
+// #define DISABLE_FREQ_CHECK
+
+// Disable frequency restrictions (satellite, ISS, etc)
+// #define DISABLE_FREQ_BAN
+
 #endif
diff --git a/configs/NanoDV_NPI.h b/configs/NanoDV_NPI.h
@@ -95,4 +95,10 @@
 // Enable modem debug messages
 // #define ENABLE_DEBUG
 
+// Disable frequency bands check
+// #define DISABLE_FREQ_CHECK
+
+// Disable frequency restrictions (satellite, ISS, etc)
+// #define DISABLE_FREQ_BAN
+
 #endif
diff --git a/configs/NanoDV_USB.h b/configs/NanoDV_USB.h
@@ -95,4 +95,10 @@
 // Enable modem debug messages
 // #define ENABLE_DEBUG
 
+// Disable frequency bands check
+// #define DISABLE_FREQ_CHECK
+
+// Disable frequency restrictions (satellite, ISS, etc)
+// #define DISABLE_FREQ_BAN
+
 #endif
diff --git a/configs/Nano_hotSPOT.h b/configs/Nano_hotSPOT.h
@@ -95,4 +95,10 @@
 // Enable modem debug messages
 // #define ENABLE_DEBUG
 
+// Disable frequency bands check
+// #define DISABLE_FREQ_CHECK
+
+// Disable frequency restrictions (satellite, ISS, etc)
+// #define DISABLE_FREQ_BAN
+
 #endif
diff --git a/configs/ZUMspot_Libre.h b/configs/ZUMspot_Libre.h
@@ -95,4 +95,10 @@
 // Enable modem debug messages
 // #define ENABLE_DEBUG
 
+// Disable frequency bands check
+// #define DISABLE_FREQ_CHECK
+
+// Disable frequency restrictions (satellite, ISS, etc)
+// #define DISABLE_FREQ_BAN
+
 #endif
diff --git a/configs/ZUMspot_RPi.h b/configs/ZUMspot_RPi.h
@@ -95,4 +95,10 @@
 // Enable modem debug messages
 // #define ENABLE_DEBUG
 
+// Disable frequency bands check
+// #define DISABLE_FREQ_CHECK
+
+// Disable frequency restrictions (satellite, ISS, etc)
+// #define DISABLE_FREQ_BAN
+
 #endif
diff --git a/configs/ZUMspot_USB.h b/configs/ZUMspot_USB.h
@@ -95,4 +95,10 @@
 // Enable modem debug messages
 // #define ENABLE_DEBUG
 
+// Disable frequency bands check
+// #define DISABLE_FREQ_CHECK
+
+// Disable frequency restrictions (satellite, ISS, etc)
+// #define DISABLE_FREQ_BAN
+
 #endif
diff --git a/configs/ZUMspot_duplex.h b/configs/ZUMspot_duplex.h
@@ -95,4 +95,10 @@
 // Enable modem debug messages
 // #define ENABLE_DEBUG
 
+// Disable frequency bands check
+// #define DISABLE_FREQ_CHECK
+
+// Disable frequency restrictions (satellite, ISS, etc)
+// #define DISABLE_FREQ_BAN
+
 #endif
diff --git a/configs/generic_duplex_gpio.h b/configs/generic_duplex_gpio.h
@@ -95,4 +95,10 @@
 // Enable modem debug messages
 // #define ENABLE_DEBUG
 
+// Disable frequency bands check
+// #define DISABLE_FREQ_CHECK
+
+// Disable frequency restrictions (satellite, ISS, etc)
+// #define DISABLE_FREQ_BAN
+
 #endif
diff --git a/configs/generic_gpio.h b/configs/generic_gpio.h
@@ -95,4 +95,10 @@
 // Enable modem debug messages
 // #define ENABLE_DEBUG
 
+// Disable frequency bands check
+// #define DISABLE_FREQ_CHECK
+
+// Disable frequency restrictions (satellite, ISS, etc)
+// #define DISABLE_FREQ_BAN
+
 #endif