Merge branch 'master' into rx_lua_param

# Conflicts: # src/include/target/AXIS_THOR_2400_RX.h # src/include/target/BETAFPV_2400_RX.h # src/include/target/DIY_2400_RX_ESP8285_SX1280.h # src/include/target/DIY_2400_RX_PWMP.h # src/include/target/DIY_2400_RX_STM32_CCG_Nano_v0_5.h # src/include/target/GHOST_ATTO_2400_RX.h # src/include/target/MATEK_2400_RX.h # src/include/target/NamimnoRC_FLASH_2400_RX_ESP8285.h # src/include/target/NamimnoRC_FLASH_2400_RX_STM32.h # src/include/target/Vantac_2400_RX.h # src/include/target/iFlight_2400_RX.h
ExpressLRS · Feb 24, 2022 · b896c30 · b896c30
2 parents 7da21c8 + 84f2226
commit b896c30
Show file tree

Hide file tree

Showing 74 changed files with 153 additions and 237 deletions.
diff --git a/src/include/common.h b/src/include/common.h
@@ -3,9 +3,9 @@
 #ifndef UNIT_TEST
 #include "targets.h"
 
-#if defined(Regulatory_Domain_AU_915) || defined(Regulatory_Domain_EU_868)  || defined(Regulatory_Domain_IN_866) || defined(Regulatory_Domain_FCC_915) || defined(Regulatory_Domain_AU_433) || defined(Regulatory_Domain_EU_433)
+#if defined(RADIO_SX127X)
 #include "SX127xDriver.h"
-#elif defined(Regulatory_Domain_ISM_2400)
+#elif defined(RADIO_SX128X)
 #include "SX1280Driver.h"
 #else
 #error "Radio configuration is not valid!"
@@ -122,15 +122,14 @@ typedef struct expresslrs_mod_settings_s
 } expresslrs_mod_settings_t;
 
 #ifndef UNIT_TEST
-#if defined(Regulatory_Domain_AU_915) || defined(Regulatory_Domain_EU_868) || defined(Regulatory_Domain_IN_866) \
-    || defined(Regulatory_Domain_FCC_915) || defined(Regulatory_Domain_AU_433) || defined(Regulatory_Domain_EU_433)
+#if defined(RADIO_SX127X)
 #define RATE_MAX 4
 #define RATE_DEFAULT 0
 #define RATE_BINDING 2 // 50Hz bind mode
 
 extern SX127xDriver Radio;
 
-#elif defined(Regulatory_Domain_ISM_2400)
+#elif defined(RADIO_SX128X)
 #define RATE_MAX 4
 #define RATE_DEFAULT 0
 #define RATE_BINDING 2  // 50Hz bind mode

diff --git a/src/include/native.h b/src/include/native.h
@@ -12,6 +12,8 @@
 #include <math.h>
 #include <sys/time.h>
 
+#define RADIO_SX128X 1
+
 typedef uint8_t byte;
 
 #define HEX 16

diff --git a/src/include/target/AXIS_THOR_2400_RX.h b/src/include/target/AXIS_THOR_2400_RX.h
@@ -1,4 +1,5 @@
 #define DEVICE_NAME "AXIS THOR 2400RX"
+
 // GPIO pin definitions
 #define GPIO_PIN_NSS            15
 #define GPIO_PIN_BUSY           5
@@ -13,5 +14,3 @@
 #endif
 
 #define POWER_OUTPUT_FIXED 13 //MAX power for 2400 RXes that doesn't have PA is 12.5dbm
-
-#define Regulatory_Domain_ISM_2400 1
diff --git a/src/include/target/AXIS_THOR_2400_TX.h b/src/include/target/AXIS_THOR_2400_TX.h
@@ -52,5 +52,3 @@
 #define MaxPower            PWR_1000mW
 #define DefaultPower        PWR_10mW
 #define POWER_OUTPUT_VALUES {-16,-12,-9,-6,-2,0,7}
-
-#define Regulatory_Domain_ISM_2400 1
diff --git a/src/include/target/BETAFPV_2400_RX.h b/src/include/target/BETAFPV_2400_RX.h
@@ -24,4 +24,3 @@
 #define DefaultPower        PWR_100mW
 #define POWER_OUTPUT_VALUES {-10,-6,-3,1} //has PA, use Power array
 
-#define Regulatory_Domain_ISM_2400 1
diff --git a/src/include/target/BETAFPV_2400_TX.h b/src/include/target/BETAFPV_2400_TX.h
@@ -26,5 +26,3 @@
 #define MinPower PWR_10mW
 #define MaxPower PWR_500mW
 #define POWER_OUTPUT_VALUES {-18,-15,-13,-9,-4,3}
-
-#define Regulatory_Domain_ISM_2400 1
diff --git a/src/include/target/BETAFPV_2400_TX_MICRO.h b/src/include/target/BETAFPV_2400_TX_MICRO.h
@@ -50,5 +50,3 @@
 
 /* Joystick values              {UP, DOWN, LEFT, RIGHT, ENTER, IDLE}*/
 #define JOY_ADC_VALUES          {2839, 2191, 1616, 3511, 0, 4095}
-
-#define Regulatory_Domain_ISM_2400 1
diff --git a/src/include/target/DIY_2400_RX_ESP8285_SX1280.h b/src/include/target/DIY_2400_RX_ESP8285_SX1280.h
@@ -15,6 +15,4 @@
 #define GPIO_PIN_ANTENNA_SELECT 0 // Low = Ant1, High = Ant2, pulled high by external resistor
 #endif
 
-#define Regulatory_Domain_ISM_2400 1
-
 #define POWER_OUTPUT_FIXED 13 //MAX power for 2400 RXes that doesn't have PA is 12.5dbm
diff --git a/src/include/target/DIY_2400_RX_PWMP.h b/src/include/target/DIY_2400_RX_PWMP.h
@@ -22,6 +22,4 @@
 #define GPIO_PIN_PWM_OUTPUTS    {0, 1, 3, 9, 10}
 #endif
 
-#define Regulatory_Domain_ISM_2400 1
-
 #define POWER_OUTPUT_FIXED 13 //MAX power for 2400 RXes that doesn't have PA is 12.5dbm
diff --git a/src/include/target/DIY_2400_RX_STM32_CCG_Nano_v0_5.h b/src/include/target/DIY_2400_RX_STM32_CCG_Nano_v0_5.h
@@ -19,6 +19,4 @@
 
 // Output Power - use default SX1280
 
-#define Regulatory_Domain_ISM_2400 1
-
 #define POWER_OUTPUT_FIXED 13 //MAX power for 2400 RXes that doesn't have PA is 12.5dbm
diff --git a/src/include/target/DIY_2400_TX_DUPLETX_TX.h b/src/include/target/DIY_2400_TX_DUPLETX_TX.h
@@ -3,8 +3,8 @@
 #endif
 
 // Any device features
-#define USE_TX_BACKPACK
 #define USE_SX1280_DCDC
+#define USE_TX_BACKPACK
 #define USE_SKY85321
 #define SKY85321_PDET_SLOPE     0.035
 #define SKY85321_PDET_INTERCEPT 2.4
@@ -35,5 +35,3 @@
 #define MinPower PWR_10mW
 #define MaxPower PWR_250mW
 #define POWER_OUTPUT_VALUES {-17,-13,-9,-6,-2}
-
-#define Regulatory_Domain_ISM_2400 1
diff --git a/src/include/target/DIY_2400_TX_ESP32_SX1280_E28.h b/src/include/target/DIY_2400_TX_ESP32_SX1280_E28.h
@@ -3,10 +3,10 @@
 #endif
 
 // Any device features
+#define USE_SX1280_DCDC
 #if !defined(USE_OLED_I2C)
 #define USE_OLED_SPI
 #endif
-#define USE_SX1280_DCDC
 
 // GPIO pin definitions
 #define GPIO_PIN_NSS            5
@@ -38,5 +38,3 @@
 #define MinPower            PWR_10mW
 #define MaxPower            PWR_250mW
 #define POWER_OUTPUT_VALUES {-15,-11,-8,-5,-1}
-
-#define Regulatory_Domain_ISM_2400 1
diff --git a/src/include/target/DIY_2400_TX_ESP32_SX1280_Mini.h b/src/include/target/DIY_2400_TX_ESP32_SX1280_Mini.h
@@ -17,5 +17,3 @@
 #define MinPower PWR_10mW
 #define MaxPower PWR_25mW
 #define POWER_OUTPUT_VALUES {8, 13}
-
-#define Regulatory_Domain_ISM_2400 1
diff --git a/src/include/target/DIY_2400_TX_ESP8285_SX1280.h b/src/include/target/DIY_2400_TX_ESP8285_SX1280.h
@@ -19,5 +19,3 @@
 #define MinPower PWR_10mW
 #define MaxPower PWR_10mW
 #define POWER_OUTPUT_VALUES {13}
-
-#define Regulatory_Domain_ISM_2400 1
diff --git a/src/include/target/FM30_RX_MINI.h b/src/include/target/FM30_RX_MINI.h
@@ -52,5 +52,3 @@
     #define DefaultPower        PWR_100mW
     #define POWER_OUTPUT_VALUES {-10,-6,-3,1} //has PA, use Power array
 #endif
-
-#define Regulatory_Domain_ISM_2400 1
diff --git a/src/include/target/FM30_TX.h b/src/include/target/FM30_TX.h
@@ -45,5 +45,3 @@
 #define HighPower               PWR_100mW
 #define MaxPower                PWR_250mW
 #define POWER_OUTPUT_VALUES     {-15,-11,-7,-1,6}
-
-#define Regulatory_Domain_ISM_2400 1
diff --git a/src/include/target/GHOST_2400_TX.h b/src/include/target/GHOST_2400_TX.h
@@ -48,5 +48,3 @@
 /* Joystick values              {UP, DOWN, LEFT, RIGHT, ENTER, IDLE}*/
 #define JOY_ADC_VALUES          {459, 509, 326, 182, 91, 1021}
 #endif
-
-#define Regulatory_Domain_ISM_2400 1
diff --git a/src/include/target/GHOST_ATTO_2400_RX.h b/src/include/target/GHOST_ATTO_2400_RX.h
@@ -22,7 +22,4 @@
 //#define GPIO_PIN_BUTTON         PA12
 
 // Output Power - use default SX1280
-
-#define Regulatory_Domain_ISM_2400 1
-
 #define POWER_OUTPUT_FIXED 13 //MAX power for 2400 RXes that doesn't have PA is 12.5dbm
diff --git a/src/include/target/HGLRC_Hermes_2400_TX.h b/src/include/target/HGLRC_Hermes_2400_TX.h
@@ -22,5 +22,3 @@
 #define MinPower PWR_10mW
 #define MaxPower PWR_250mW
 #define POWER_OUTPUT_VALUES {-18,-15,-11,-8,-4}
-
-#define Regulatory_Domain_ISM_2400 1
diff --git a/src/include/target/HappyModel_ES24TX_2400_TX.h b/src/include/target/HappyModel_ES24TX_2400_TX.h
@@ -3,8 +3,8 @@
 #endif
 
 // Any device features
-#define USE_TX_BACKPACK
 #define USE_SX1280_DCDC
+#define USE_TX_BACKPACK
 
 // GPIO pin definitions
 #define GPIO_PIN_NSS            5
@@ -25,5 +25,3 @@
 #define MinPower PWR_10mW
 #define MaxPower PWR_250mW
 #define POWER_OUTPUT_VALUES {-17,-13,-9,-6,-2}
-
-#define Regulatory_Domain_ISM_2400 1
diff --git a/src/include/target/HappyModel_ES24TX_Pro_Series_2400_TX.h b/src/include/target/HappyModel_ES24TX_Pro_Series_2400_TX.h
@@ -3,8 +3,8 @@
 #endif
 
 // Any device features
-#define USE_TX_BACKPACK
 #define USE_SX1280_DCDC
+#define USE_TX_BACKPACK
 #define WS2812_IS_GRB
 
 // GPIO pin definitions
@@ -26,5 +26,3 @@
 #define MinPower PWR_25mW
 #define MaxPower PWR_1000mW
 #define POWER_OUTPUT_VALUES {-18,-15,-12,-7,-4,2}
-
-#define Regulatory_Domain_ISM_2400 1
diff --git a/src/include/target/Jumper_AION_2400_T-Pro_TX.h b/src/include/target/Jumper_AION_2400_T-Pro_TX.h
@@ -20,11 +20,9 @@
 
 // Backpack pins
 #define GPIO_PIN_DEBUG_RX       13
-#define GPIO_PIN_DEBUG_TX       12 
+#define GPIO_PIN_DEBUG_TX       12
 
 // Output Power
 #define MinPower                PWR_25mW
 #define MaxPower                PWR_1000mW
 #define POWER_OUTPUT_VALUES     {-18,-13,-10,-5,-2,3}
-
-#define Regulatory_Domain_ISM_2400 1
diff --git a/src/include/target/Jumper_AION_NANO_2400_TX.h b/src/include/target/Jumper_AION_NANO_2400_TX.h
@@ -3,8 +3,8 @@
 #endif
 
 // Any device features
-#define USE_OLED_I2C
 #define USE_SX1280_DCDC
+#define USE_OLED_I2C
 #define HAS_FIVE_WAY_BUTTON
 #define WS2812_IS_GRB
 
@@ -36,5 +36,3 @@
 /* Joystick values              {UP, DOWN, LEFT, RIGHT, ENTER, IDLE}*/
 #define JOY_ADC_VALUES          {870, 600, 230, 35, 0, 4095}
 #endif
-
-#define Regulatory_Domain_ISM_2400 1
diff --git a/src/include/target/MATEK_2400_RX.h b/src/include/target/MATEK_2400_RX.h
@@ -1,6 +1,7 @@
 #ifndef DEVICE_NAME
 #define DEVICE_NAME "MATEK R24"
 #endif
+
 // GPIO pin definitions
 #define GPIO_PIN_NSS                15
 #define GPIO_PIN_BUSY               5
@@ -21,5 +22,3 @@
 #define MaxPower            PWR_100mW
 #define DefaultPower        PWR_100mW
 #define POWER_OUTPUT_VALUES {-10,-6,-3,1} //has PA, use Power array
-
-#define Regulatory_Domain_ISM_2400 1
diff --git a/src/include/target/NamimnoRC_FLASH_2400_OLED_TX.h b/src/include/target/NamimnoRC_FLASH_2400_OLED_TX.h
@@ -6,6 +6,7 @@
 #define USE_TX_BACKPACK
 #define USE_OLED_SPI
 #define HAS_FIVE_WAY_BUTTON
+#define WS2812_IS_GRB
 
 // GPIO pin definitions
 #define GPIO_PIN_RST            21
@@ -46,6 +47,3 @@
 
 /* Joystick values              {UP, DOWN, LEFT, RIGHT, ENTER, IDLE}*/
 #define JOY_ADC_VALUES          {1850, 900, 490, 1427, 0, 2978}
-
-/* Frequency */
-#define Regulatory_Domain_ISM_2400 1
diff --git a/src/include/target/NamimnoRC_FLASH_2400_RX_ESP8285.h b/src/include/target/NamimnoRC_FLASH_2400_RX_ESP8285.h
@@ -1,4 +1,5 @@
 #define DEVICE_NAME "Namimno 2400RX"
+
 // GPIO pin definitions
 #define GPIO_PIN_NSS            15
 #define GPIO_PIN_BUSY           5
@@ -15,7 +16,4 @@
 #endif
 
 // Output Power - use default SX1280
-
-#define Regulatory_Domain_ISM_2400 1
-
-#define POWER_OUTPUT_FIXED 13 //MAX power for 2400 RXes that doesn't have PA is 12.5dbm
+#define POWER_OUTPUT_FIXED 13 //MAX power for 2400 RXes that doesn't have PA is 12.5dbm
diff --git a/src/include/target/NamimnoRC_FLASH_2400_RX_STM32.h b/src/include/target/NamimnoRC_FLASH_2400_RX_STM32.h
@@ -1,6 +1,7 @@
 #ifndef DEVICE_NAME
 #define DEVICE_NAME "Namimno 2G4RX"
 #endif
+
 // GPIO pin definitions
 #define GPIO_PIN_RST            PB4
 #define GPIO_PIN_BUSY           PB5
@@ -16,7 +17,4 @@
 #define GPIO_PIN_RCSIGNAL_TX    PA9
 
 // Output Power - default for SX120
-
-#define Regulatory_Domain_ISM_2400 1
-
-#define POWER_OUTPUT_FIXED 13 //MAX power for 2400 RXes that doesn't have PA is 12.5dbm
+#define POWER_OUTPUT_FIXED 13 //MAX power for 2400 RXes that doesn't have PA is 12.5dbm
diff --git a/src/include/target/NamimnoRC_FLASH_2400_TX.h b/src/include/target/NamimnoRC_FLASH_2400_TX.h
@@ -25,13 +25,8 @@
 #define GPIO_PIN_BUFFER_OE_INVERTED 1
 #define GPIO_PIN_FAN_EN             PB1
 /* Backpack logger connection */
-#ifdef USE_ESP8266_BACKPACK
-    #define GPIO_PIN_DEBUG_RX       PA10
-    #define GPIO_PIN_DEBUG_TX       PA9
-#else
-    #define GPIO_PIN_DEBUG_RX       PA3
-    #define GPIO_PIN_DEBUG_TX       PA2
-#endif
+#define GPIO_PIN_DEBUG_RX       PA10
+#define GPIO_PIN_DEBUG_TX       PA9
 /* WS2812 led */
 #define GPIO_PIN_LED_WS2812         PB0
 #define GPIO_PIN_LED_WS2812_FAST    PB_0
@@ -40,5 +35,3 @@
 #define MinPower PWR_25mW
 #define MaxPower PWR_1000mW
 #define POWER_OUTPUT_VALUES {-18,-15,-12,-8,-5,3}
-
-#define Regulatory_Domain_ISM_2400 1
diff --git a/src/include/target/NamimnoRC_VOYAGER_900_ESP_RX.h b/src/include/target/NamimnoRC_VOYAGER_900_ESP_RX.h
@@ -1,6 +1,7 @@
 #ifndef DEVICE_NAME
 #define DEVICE_NAME "Namimno 900RX"
 #endif
+
 // GPIO pin definitions
 #define GPIO_PIN_NSS          15
 #define GPIO_PIN_DIO0         5

diff --git a/src/include/target/NamimnoRC_VOYAGER_900_RX.h b/src/include/target/NamimnoRC_VOYAGER_900_RX.h
@@ -1,6 +1,7 @@
 #ifndef DEVICE_NAME
 #define DEVICE_NAME "Namimno 900RX"
 #endif
+
 // GPIO pin definitions
 #define GPIO_PIN_RST            PC14
 #define GPIO_PIN_DIO0           PA15

diff --git a/src/include/target/NamimnoRC_VOYAGER_900_TX.h b/src/include/target/NamimnoRC_VOYAGER_900_TX.h
@@ -23,13 +23,8 @@
 #define GPIO_PIN_BUFFER_OE_INVERTED 1
 #define GPIO_PIN_FAN_EN             PB1
 /* Backpack logger connection */
-#ifdef USE_ESP8266_BACKPACK
-    #define GPIO_PIN_DEBUG_RX       PA10
-    #define GPIO_PIN_DEBUG_TX       PA9
-#else
-    #define GPIO_PIN_DEBUG_RX       PA3
-    #define GPIO_PIN_DEBUG_TX       PA2
-#endif
+#define GPIO_PIN_DEBUG_RX       PA10
+#define GPIO_PIN_DEBUG_TX       PA9
 /* WS2812 led */
 #define GPIO_PIN_LED_WS2812         PB0
 #define GPIO_PIN_LED_WS2812_FAST    PB_0

diff --git a/src/include/target/QuadKopters_JR_2400_TX.h b/src/include/target/QuadKopters_JR_2400_TX.h
@@ -23,5 +23,3 @@
 #define MinPower PWR_10mW
 #define MaxPower PWR_250mW
 #define POWER_OUTPUT_VALUES {-15,-11,-8,-5,0}
-
-#define Regulatory_Domain_ISM_2400 1
diff --git a/src/include/target/RadioMaster_Zorro_2400_TX.h b/src/include/target/RadioMaster_Zorro_2400_TX.h
@@ -4,11 +4,11 @@
 // Copied from DupleTX
 
 // Any device features
-#define USE_TX_BACKPACK
 #define USE_SX1280_DCDC
 #define USE_SKY85321
 #define SKY85321_PDET_SLOPE     0.035
 #define SKY85321_PDET_INTERCEPT 2.4
+#define USE_TX_BACKPACK
 
 // GPIO pin definitions
 #define GPIO_PIN_NSS            5
@@ -36,5 +36,3 @@
 #define MinPower PWR_10mW
 #define MaxPower PWR_250mW
 #define POWER_OUTPUT_VALUES {-17,-13,-9,-6,-2}
-
-#define Regulatory_Domain_ISM_2400 1
diff --git a/src/include/target/Vantac_2400_RX.h b/src/include/target/Vantac_2400_RX.h
@@ -15,10 +15,8 @@
 #define GPIO_PIN_RX_ENABLE      9
 #define GPIO_PIN_TX_ENABLE      10
 
-#define Regulatory_Domain_ISM_2400 1
-
 // Output Power
 #define MinPower            PWR_10mW
 #define MaxPower            PWR_100mW
 #define DefaultPower        PWR_100mW
-#define POWER_OUTPUT_VALUES {-10,-6,-3,1} //has PA, use Power array
+#define POWER_OUTPUT_VALUES {-10,-6,-3,1} //has PA, use Power array
diff --git a/src/include/target/Vantac_Lite_2400_TX.h b/src/include/target/Vantac_Lite_2400_TX.h
@@ -25,5 +25,3 @@
 #define MinPower                PWR_10mW
 #define MaxPower                PWR_500mW
 #define POWER_OUTPUT_VALUES     {-17,-14,-11,-7,-1,2}
-
-#define Regulatory_Domain_ISM_2400 1