Move radio define to ini files

ExpressLRS · Feb 13, 2022 · 33299e2 · 33299e2
1 parent d8118e2
commit 33299e2
Show file tree

Hide file tree

Showing 73 changed files with 65 additions and 68 deletions.
diff --git a/src/include/target/AXIS_THOR_2400_RX.h b/src/include/target/AXIS_THOR_2400_RX.h
@@ -1,7 +1,5 @@
 #define DEVICE_NAME "AXIS THOR 2400RX"
 
-#define RADIO_SX1280
-
 // GPIO pin definitions
 #define GPIO_PIN_NSS            15
 #define GPIO_PIN_BUSY           5

diff --git a/src/include/target/AXIS_THOR_2400_TX.h b/src/include/target/AXIS_THOR_2400_TX.h
@@ -1,6 +1,5 @@
 #define DEVICE_NAME "AXIS THOR 2400TX"
 
-#define RADIO_SX1280
 #define USE_TX_BACKPACK
 
 #define HAS_TFT_SCREEN

diff --git a/src/include/target/BETAFPV_2400_RX.h b/src/include/target/BETAFPV_2400_RX.h
@@ -2,7 +2,6 @@
 #define DEVICE_NAME "BETAFPV 2G4RX"
 #endif
 
-#define RADIO_SX1280
 #define USE_SX1280_DCDC
 
 // GPIO pin definitions

diff --git a/src/include/target/BETAFPV_2400_TX.h b/src/include/target/BETAFPV_2400_TX.h
@@ -4,7 +4,6 @@
 
 // There is some special handling for this target
 #define TARGET_TX_BETAFPV_2400_V1
-#define RADIO_SX1280
 
 // GPIO pin definitions
 #define GPIO_PIN_NSS            5

diff --git a/src/include/target/BETAFPV_2400_TX_MICRO.h b/src/include/target/BETAFPV_2400_TX_MICRO.h
@@ -8,7 +8,6 @@
 
 // Any device features
 #define USE_TX_BACKPACK
-#define RADIO_SX1280
 #define USE_OLED_I2C
 #define OLED_REVERSED
 #define HAS_FIVE_WAY_BUTTON

diff --git a/src/include/target/BETAFPV_900_TX.h b/src/include/target/BETAFPV_900_TX.h
@@ -4,7 +4,6 @@
 
 // There is some special handling for this target
 #define TARGET_TX_BETAFPV_900_V1
-#define RADIO_SX127X
 #define USE_SX1276_RFO_HF
 
 // GPIO pin definitions

diff --git a/src/include/target/BETAFPV_900_TX_MICRO.h b/src/include/target/BETAFPV_900_TX_MICRO.h
@@ -3,7 +3,6 @@
 #endif
 
 // Any device features
-#define RADIO_SX127X
 #define USE_SX1276_RFO_HF
 #define USE_OLED_I2C
 #define OLED_REVERSED

diff --git a/src/include/target/DIY_2400_RX_ESP8285_SX1280.h b/src/include/target/DIY_2400_RX_ESP8285_SX1280.h
@@ -2,8 +2,6 @@
 #define DEVICE_NAME "ELRS 2400RX"
 #endif
 
-#define RADIO_SX1280
-
 // GPIO pin definitions
 #define GPIO_PIN_NSS            15
 #define GPIO_PIN_BUSY           5

diff --git a/src/include/target/DIY_2400_RX_PWMP.h b/src/include/target/DIY_2400_RX_PWMP.h
@@ -2,7 +2,6 @@
 #define DEVICE_NAME "DIY2400 PWMP"
 #endif
 
-#define RADIO_SX1280
 #define CRSF_RCVR_NO_SERIAL
 
 // GPIO pin definitions

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
@@ -2,8 +2,6 @@
 #define DEVICE_NAME "ELRS 2400RX"
 #endif
 
-#define RADIO_SX1280
-
 // GPIO pin definitions
 #define GPIO_PIN_NSS         PA4
 #define GPIO_PIN_MOSI        PA7

diff --git a/src/include/target/DIY_2400_TX_DUPLETX_TX.h b/src/include/target/DIY_2400_TX_DUPLETX_TX.h
@@ -3,7 +3,6 @@
 #endif
 
 // Any device features
-#define RADIO_SX1280
 #define USE_SX1280_DCDC
 #define USE_TX_BACKPACK
 #define USE_SKY85321

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,7 +3,6 @@
 #endif
 
 // Any device features
-#define RADIO_SX1280
 #define USE_SX1280_DCDC
 #if !defined(USE_OLED_I2C)
 #define USE_OLED_SPI

diff --git a/src/include/target/DIY_2400_TX_ESP32_SX1280_Mini.h b/src/include/target/DIY_2400_TX_ESP32_SX1280_Mini.h
@@ -2,8 +2,6 @@
 #define DEVICE_NAME "DIY2400 Mini"
 #endif
 
-#define RADIO_SX1280
-
 // GPIO pin definitions
 #define GPIO_PIN_NSS          5
 #define GPIO_PIN_BUSY         21

diff --git a/src/include/target/DIY_2400_TX_ESP8285_SX1280.h b/src/include/target/DIY_2400_TX_ESP8285_SX1280.h
@@ -2,8 +2,6 @@
 #define DEVICE_NAME "DIY2400 ESP8266"
 #endif
 
-#define RADIO_SX1280
-
 // GPIO pin definitions
 #define GPIO_PIN_NSS            15
 #define GPIO_PIN_BUSY           5

diff --git a/src/include/target/DIY_900_RX_ESP8285_SX127x.h b/src/include/target/DIY_900_RX_ESP8285_SX127x.h
@@ -2,8 +2,6 @@
 #define DEVICE_NAME "ELRS 900RX"
 #endif
 
-#define RADIO_SX127X
-
 // GPIO pin definitions
 #define GPIO_PIN_NSS 15
 #define GPIO_PIN_DIO0 4

diff --git a/src/include/target/DIY_900_RX_HUZZAH_RFM95W.h b/src/include/target/DIY_900_RX_HUZZAH_RFM95W.h
@@ -2,8 +2,6 @@
 #define DEVICE_NAME "ELRS 900RX"
 #endif
 
-#define RADIO_SX127X
-
 // GPIO pin definitions
 #define GPIO_PIN_NSS 15
 #define GPIO_PIN_DIO0 5

diff --git a/src/include/target/DIY_900_RX_PWMP.h b/src/include/target/DIY_900_RX_PWMP.h
@@ -2,7 +2,6 @@
 #define DEVICE_NAME "DIY900 PWMP"
 #endif
 
-#define RADIO_SX127X
 #define CRSF_RCVR_NO_SERIAL
 
 // GPIO pin definitions

diff --git a/src/include/target/DIY_900_TX_ESP32_SX127x_E19.h b/src/include/target/DIY_900_TX_ESP32_SX127x_E19.h
@@ -3,8 +3,6 @@
 #define DEVICE_NAME "DIY900 E19"
 #endif
 
-#define RADIO_SX127X
-
 // GPIO pin definitions
 #define GPIO_PIN_NSS 5
 #define GPIO_PIN_DIO0 26

diff --git a/src/include/target/DIY_900_TX_ESP32_SX127x_RFM95.h b/src/include/target/DIY_900_TX_ESP32_SX127x_RFM95.h
@@ -3,8 +3,6 @@
 #define DEVICE_NAME "DIY900 RFM95"
 #endif
 
-#define RADIO_SX127X
-
 // GPIO pin definitions
 #define GPIO_PIN_NSS 5
 #define GPIO_PIN_DIO0 26

diff --git a/src/include/target/DIY_900_TX_TTGO_V1_SX127x.h b/src/include/target/DIY_900_TX_TTGO_V1_SX127x.h
@@ -4,7 +4,6 @@
 #endif
 
 // Any device features
-#define RADIO_SX127X
 #define USE_OLED_I2C
 
 // GPIO pin definitions

diff --git a/src/include/target/DIY_900_TX_TTGO_V2_SX127x.h b/src/include/target/DIY_900_TX_TTGO_V2_SX127x.h
@@ -4,7 +4,6 @@
 #endif
 
 // Any device features
-#define RADIO_SX127X
 #define USE_OLED_I2C
 
 // GPIO pin definitions

diff --git a/src/include/target/FM30_RX_MINI.h b/src/include/target/FM30_RX_MINI.h
@@ -12,7 +12,6 @@
     #endif
 #endif
 
-#define RADIO_SX1280
 #define USE_SX1280_DCDC
 
 // GPIO pin definitions

diff --git a/src/include/target/FM30_TX.h b/src/include/target/FM30_TX.h
@@ -4,7 +4,6 @@
 
 // There is some special handling for this target
 #define TARGET_TX_FM30
-#define RADIO_SX1280
 #define USE_SX1280_DCDC
 
 // GPIO pin definitions

diff --git a/src/include/target/Frsky_RX_R9M.h b/src/include/target/Frsky_RX_R9M.h
@@ -7,8 +7,6 @@ Credit to Jacob Walser (jaxxzer) for the pinout!!!
     #define TARGET_EEPROM_ADDR              0x50
 #endif
 
-#define RADIO_SX127X
-
 #define GPIO_PIN_NSS            PB12 //confirmed on SLIMPLUS, R900MINI
 #define GPIO_PIN_DIO0           PA15 //confirmed on SLIMPLUS, R900MINI
 #define GPIO_PIN_DIO1           PA1  // NOT CORRECT!!! PIN STILL NEEDS TO BE FOUND BUT IS CURRENTLY UNUSED

diff --git a/src/include/target/Frsky_TX_R9M.h b/src/include/target/Frsky_TX_R9M.h
@@ -3,7 +3,6 @@
     #define DEVICE_NAME "FrSky R9M"
 #endif
 
-#define RADIO_SX127X
 #define TARGET_USE_EEPROM               1
 #define TARGET_EEPROM_ADDR              0x51
 #define TARGET_EEPROM_400K

diff --git a/src/include/target/Frsky_TX_R9M_LITE.h b/src/include/target/Frsky_TX_R9M_LITE.h
@@ -2,7 +2,6 @@
 #define DEVICE_NAME "FrSky R9M Lite"
 #endif
 
-#define RADIO_SX127X
 #define TARGET_USE_EEPROM           1
 #define TARGET_EEPROM_ADDR          0x51
 

diff --git a/src/include/target/Frsky_TX_R9M_LITE_PRO.h b/src/include/target/Frsky_TX_R9M_LITE_PRO.h
@@ -2,7 +2,6 @@
 #define DEVICE_NAME "FrSky R9M Lt Pro"
 #endif
 
-#define RADIO_SX127X
 #define TARGET_USE_EEPROM           1
 #define TARGET_EEPROM_ADDR          0x51
 

diff --git a/src/include/target/GHOST_2400_TX.h b/src/include/target/GHOST_2400_TX.h
@@ -3,7 +3,6 @@
 #endif
 // There is some special handling for this target
 #define TARGET_TX_GHOST
-#define RADIO_SX1280
 
 // Any device features
 #if !defined(USE_OLED_SPI_SMALL)

diff --git a/src/include/target/GHOST_ATTO_2400_RX.h b/src/include/target/GHOST_ATTO_2400_RX.h
@@ -3,7 +3,6 @@
 #endif
 // There is some special handling for this target
 #define TARGET_RX_GHOST_ATTO_V1
-#define RADIO_SX1280
 
 // GPIO pin definitions
 #define GPIO_PIN_NSS            PA15

diff --git a/src/include/target/HGLRC_Hermes_2400_TX.h b/src/include/target/HGLRC_Hermes_2400_TX.h
@@ -3,7 +3,6 @@
 #endif
 
 // Any device features
-#define RADIO_SX1280
 #define USE_SX1280_DCDC
 
 // GPIO pin definitions

diff --git a/src/include/target/HappyModel_ES24TX_2400_TX.h b/src/include/target/HappyModel_ES24TX_2400_TX.h
@@ -3,7 +3,6 @@
 #endif
 
 // Any device features
-#define RADIO_SX1280
 #define USE_SX1280_DCDC
 #define USE_TX_BACKPACK
 

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,7 +3,6 @@
 #endif
 
 // Any device features
-#define RADIO_SX1280
 #define USE_SX1280_DCDC
 #define USE_TX_BACKPACK
 #define WS2812_IS_GRB

diff --git a/src/include/target/HappyModel_TX_ES900TX.h b/src/include/target/HappyModel_TX_ES900TX.h
@@ -2,7 +2,6 @@
 #define DEVICE_NAME          "HM ES900TX"
 #endif
 
-#define RADIO_SX127X
 #define USE_TX_BACKPACK
 
 // GPIO pin definitions

diff --git a/src/include/target/Jumper_AION_2400_T-Pro_TX.h b/src/include/target/Jumper_AION_2400_T-Pro_TX.h
@@ -1,7 +1,6 @@
 #define DEVICE_NAME "AION T-Pro TX"
 
 // Any device features
-#define RADIO_SX1280
 #define USE_SX1280_DCDC
 
 // GPIO pin definitions

diff --git a/src/include/target/Jumper_AION_NANO_2400_TX.h b/src/include/target/Jumper_AION_NANO_2400_TX.h
@@ -3,7 +3,6 @@
 #endif
 
 // Any device features
-#define RADIO_SX1280
 #define USE_SX1280_DCDC
 #define USE_OLED_I2C
 #define HAS_FIVE_WAY_BUTTON

diff --git a/src/include/target/MATEK_2400_RX.h b/src/include/target/MATEK_2400_RX.h
@@ -2,8 +2,6 @@
 #define DEVICE_NAME "MATEK R24"
 #endif
 
-#define RADIO_SX1280
-
 // GPIO pin definitions
 #define GPIO_PIN_NSS                15
 #define GPIO_PIN_BUSY               5

diff --git a/src/include/target/NamimnoRC_FLASH_2400_OLED_TX.h b/src/include/target/NamimnoRC_FLASH_2400_OLED_TX.h
@@ -3,7 +3,6 @@
 #endif
 
 // Features
-#define RADIO_SX1280
 #define USE_TX_BACKPACK
 #define USE_OLED_SPI
 #define HAS_FIVE_WAY_BUTTON

diff --git a/src/include/target/NamimnoRC_FLASH_2400_RX_ESP8285.h b/src/include/target/NamimnoRC_FLASH_2400_RX_ESP8285.h
@@ -1,7 +1,5 @@
 #define DEVICE_NAME "Namimno 2400RX"
 
-#define RADIO_SX1280
-
 // GPIO pin definitions
 #define GPIO_PIN_NSS            15
 #define GPIO_PIN_BUSY           5

diff --git a/src/include/target/NamimnoRC_FLASH_2400_RX_STM32.h b/src/include/target/NamimnoRC_FLASH_2400_RX_STM32.h
@@ -2,8 +2,6 @@
 #define DEVICE_NAME "Namimno 2G4RX"
 #endif
 
-#define RADIO_SX1280
-
 // GPIO pin definitions
 #define GPIO_PIN_RST            PB4
 #define GPIO_PIN_BUSY           PB5

diff --git a/src/include/target/NamimnoRC_FLASH_2400_TX.h b/src/include/target/NamimnoRC_FLASH_2400_TX.h
@@ -2,7 +2,6 @@
 #define DEVICE_NAME "Namimno Flash"
 #endif
 
-#define RADIO_SX1280
 #define USE_TX_BACKPACK
 
 // GPIO pin definitions

diff --git a/src/include/target/NamimnoRC_VOYAGER_900_ESP_RX.h b/src/include/target/NamimnoRC_VOYAGER_900_ESP_RX.h
@@ -2,8 +2,6 @@
 #define DEVICE_NAME "Namimno 900RX"
 #endif
 
-#define RADIO_SX127X
-
 // GPIO pin definitions
 #define GPIO_PIN_NSS          15
 #define GPIO_PIN_DIO0         5

diff --git a/src/include/target/NamimnoRC_VOYAGER_900_OLED_TX.h b/src/include/target/NamimnoRC_VOYAGER_900_OLED_TX.h
@@ -3,7 +3,6 @@
 #endif
 
 // Features
-#define RADIO_SX127X
 #define USE_TX_BACKPACK
 #define USE_OLED_SPI
 

diff --git a/src/include/target/NamimnoRC_VOYAGER_900_RX.h b/src/include/target/NamimnoRC_VOYAGER_900_RX.h
@@ -2,8 +2,6 @@
 #define DEVICE_NAME "Namimno 900RX"
 #endif
 
-#define RADIO_SX127X
-
 // 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
@@ -2,7 +2,6 @@
 #define DEVICE_NAME "Namimno Voyager"
 #endif
 
-#define RADIO_SX127X
 #define USE_TX_BACKPACK
 
 // GPIO pin definitions

diff --git a/src/include/target/QuadKopters_JR_2400_TX.h b/src/include/target/QuadKopters_JR_2400_TX.h
@@ -3,7 +3,6 @@
 #endif
 
 // Any device features
-#define RADIO_SX1280
 #define USE_TX_BACKPACK
 
 // GPIO pin definitions

diff --git a/src/include/target/RadioMaster_Zorro_2400_TX.h b/src/include/target/RadioMaster_Zorro_2400_TX.h
@@ -4,7 +4,6 @@
 // Copied from DupleTX
 
 // Any device features
-#define RADIO_SX1280
 #define USE_SX1280_DCDC
 #define USE_SKY85321
 #define SKY85321_PDET_SLOPE     0.035

diff --git a/src/include/target/Vantac_2400_RX.h b/src/include/target/Vantac_2400_RX.h
@@ -2,8 +2,6 @@
 #define DEVICE_NAME "Vantac 2400 RX"
 #endif
 
-#define RADIO_SX1280
-
 // GPIO pin definitions
 #define GPIO_PIN_NSS            15
 #define GPIO_PIN_BUSY           5

diff --git a/src/include/target/Vantac_Lite_2400_TX.h b/src/include/target/Vantac_Lite_2400_TX.h
@@ -3,7 +3,6 @@
 #endif
 
 // Any device features
-#define RADIO_SX1280
 
 // GPIO pin definitions
 #define GPIO_PIN_NSS            5