juribeparada/MMDVM_HS
1
0
Fork 0
mirror of https://github.com/juribeparada/MMDVM_HS.git synced 2025-12-06 07:12:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Config.h options for frequency band check and restrictions

Browse source
This commit is contained in:
Andy CA6JAU 2018-10-08 21:21:17 -03:00
parent 77c988c21d
commit 8d55079058
15 changed files with 88 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Config.h
View file

@ -95,4 +95,10 @@
// Enable modem debug messages // Enable modem debug messages
// #define ENABLE_DEBUG // #define ENABLE_DEBUG
// Disable frequency bands check
// #define DISABLE_FREQ_CHECK
// Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN
#endif #endif

4
IO.cpp
View file

@ -310,6 +310,7 @@ uint8_t CIO::setFreq(uint32_t frequency_rx, uint32_t frequency_tx, uint8_t rf_po
// Configure power level // Configure power level
setPower(rf_power); setPower(rf_power);
#if !defined(DISABLE_FREQ_CHECK)
// Check frequency ranges // Check frequency ranges
if( !( ((frequency_rx >= VHF1_MIN)&&(frequency_rx < VHF1_MAX)) || ((frequency_tx >= VHF1_MIN)&&(frequency_tx < VHF1_MAX)) || \ 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)) || \ ((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 >= VHF2_MIN)&&(pocsag_freq_tx < VHF2_MAX)) || \
((pocsag_freq_tx >= UHF2_MIN)&&(pocsag_freq_tx < UHF2_MAX)) ) ) ((pocsag_freq_tx >= UHF2_MIN)&&(pocsag_freq_tx < UHF2_MAX)) ) )
return 4U; return 4U;
#endif
#if !defined(DISABLE_FREQ_BAN)
// Check banned frequency ranges // Check banned frequency ranges
if( ((frequency_rx >= BAN1_MIN)&&(frequency_rx <= BAN1_MAX)) || ((frequency_tx >= BAN1_MIN)&&(frequency_tx <= BAN1_MAX)) || \ 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)) ) ((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)) || \ if( ((pocsag_freq_tx >= BAN1_MIN)&&(pocsag_freq_tx <= BAN1_MAX)) || \
((pocsag_freq_tx >= BAN2_MIN)&&(pocsag_freq_tx <= BAN2_MAX)) ) ((pocsag_freq_tx >= BAN2_MIN)&&(pocsag_freq_tx <= BAN2_MAX)) )
return 4U; return 4U;
#endif
// Configure frequency // Configure frequency
m_frequency_rx = frequency_rx; m_frequency_rx = frequency_rx;

6
configs/MMDVM_HS_Dual_Hat-12mhz.h
View file

@ -95,4 +95,10 @@
// Enable modem debug messages // Enable modem debug messages
// #define ENABLE_DEBUG // #define ENABLE_DEBUG
// Disable frequency bands check
// #define DISABLE_FREQ_CHECK
// Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN
#endif #endif

6
configs/MMDVM_HS_Dual_Hat.h
View file

@ -95,4 +95,10 @@
// Enable modem debug messages // Enable modem debug messages
// #define ENABLE_DEBUG // #define ENABLE_DEBUG
// Disable frequency bands check
// #define DISABLE_FREQ_CHECK
// Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN
#endif #endif

6
configs/MMDVM_HS_Hat-12mhz.h
View file

@ -95,4 +95,10 @@
// Enable modem debug messages // Enable modem debug messages
// #define ENABLE_DEBUG // #define ENABLE_DEBUG
// Disable frequency bands check
// #define DISABLE_FREQ_CHECK
// Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN
#endif #endif

6
configs/MMDVM_HS_Hat.h
View file

@ -95,4 +95,10 @@
// Enable modem debug messages // Enable modem debug messages
// #define ENABLE_DEBUG // #define ENABLE_DEBUG
// Disable frequency bands check
// #define DISABLE_FREQ_CHECK
// Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN
#endif #endif

6
configs/NanoDV_NPI.h
View file

@ -95,4 +95,10 @@
// Enable modem debug messages // Enable modem debug messages
// #define ENABLE_DEBUG // #define ENABLE_DEBUG
// Disable frequency bands check
// #define DISABLE_FREQ_CHECK
// Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN
#endif #endif

6
configs/NanoDV_USB.h
View file

@ -95,4 +95,10 @@
// Enable modem debug messages // Enable modem debug messages
// #define ENABLE_DEBUG // #define ENABLE_DEBUG
// Disable frequency bands check
// #define DISABLE_FREQ_CHECK
// Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN
#endif #endif

6
configs/Nano_hotSPOT.h
View file

@ -95,4 +95,10 @@
// Enable modem debug messages // Enable modem debug messages
// #define ENABLE_DEBUG // #define ENABLE_DEBUG
// Disable frequency bands check
// #define DISABLE_FREQ_CHECK
// Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN
#endif #endif

6
configs/ZUMspot_Libre.h
View file

@ -95,4 +95,10 @@
// Enable modem debug messages // Enable modem debug messages
// #define ENABLE_DEBUG // #define ENABLE_DEBUG
// Disable frequency bands check
// #define DISABLE_FREQ_CHECK
// Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN
#endif #endif

6
configs/ZUMspot_RPi.h
View file

@ -95,4 +95,10 @@
// Enable modem debug messages // Enable modem debug messages
// #define ENABLE_DEBUG // #define ENABLE_DEBUG
// Disable frequency bands check
// #define DISABLE_FREQ_CHECK
// Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN
#endif #endif

6
configs/ZUMspot_USB.h
View file

@ -95,4 +95,10 @@
// Enable modem debug messages // Enable modem debug messages
// #define ENABLE_DEBUG // #define ENABLE_DEBUG
// Disable frequency bands check
// #define DISABLE_FREQ_CHECK
// Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN
#endif #endif

6
configs/ZUMspot_duplex.h
View file

@ -95,4 +95,10 @@
// Enable modem debug messages // Enable modem debug messages
// #define ENABLE_DEBUG // #define ENABLE_DEBUG
// Disable frequency bands check
// #define DISABLE_FREQ_CHECK
// Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN
#endif #endif

6
configs/generic_duplex_gpio.h
View file

@ -95,4 +95,10 @@
// Enable modem debug messages // Enable modem debug messages
// #define ENABLE_DEBUG // #define ENABLE_DEBUG
// Disable frequency bands check
// #define DISABLE_FREQ_CHECK
// Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN
#endif #endif

6
configs/generic_gpio.h
View file

@ -95,4 +95,10 @@
// Enable modem debug messages // Enable modem debug messages
// #define ENABLE_DEBUG // #define ENABLE_DEBUG
// Disable frequency bands check
// #define DISABLE_FREQ_CHECK
// Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN
#endif #endif