fix(x10express): restore RADIO_X10EXPRESS guards, de-dupe RADIO_FLAVOR, add ci check to prevent future occurances (#7725)

Co-authored-by: Peter Feerick <5500713+pfeerick@users.noreply.github.com>
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Peter Feerick
2026-08-30 18:55:03 +10:00
committed by GitHub
co-authored by Peter Feerick Claude Opus 5
parent 076d80ed9e
commit 26bd20663e
16 changed files with 178 additions and 20 deletions
@@ -604,7 +604,7 @@ const etx_module_t _sport_module = {
#endif // SPORT_UPDATE_PWR_GPIO
#if !defined(RADIO_X10E)
#if !defined(RADIO_X10EXPRESS)
uint32_t __pxx1_get_inverter_comp() { return 1; }
#endif
+1 -1
View File
@@ -56,7 +56,7 @@ add_definitions(-DFIRMWARE_FORMAT_UF2)
add_definitions(-DUSE_CUSTOM_EXTI_IRQ)
set(FLAVOUR c14)
add_definitions(-DRADIO_C14)
add_definitions(-DMANUFACTURER_IFLIGHT)
# Defines internal modules for PL18 via UART7
# set(INTERNAL_MODULES MULTI CACHE STRING "Internal modules")
-1
View File
@@ -50,7 +50,6 @@ add_definitions(-DUSB_CHARGER)
add_definitions(-DUSB_CHARGE_CONTROL)
set(FLAVOUR gx15)
add_definitions(-DRADIO_GX15)
add_definitions(-DMANUFACTURER_RADIOMASTER)
# defines existing internal modules
+1 -1
View File
@@ -211,7 +211,7 @@ void lcdCopy(void * dest, void * src);
#define BACKLIGHT_FORCED_ON BACKLIGHT_LEVEL_MAX + 1
#if defined(PCBX12S)
#define BACKLIGHT_LEVEL_MIN 5
#elif defined(RADIO_FAMILY_T16) || defined(RADIO_X10E)
#elif defined(RADIO_FAMILY_T16) || defined(RADIO_X10EXPRESS)
#define BACKLIGHT_LEVEL_MIN 1
#else
#define BACKLIGHT_LEVEL_MIN 46
+1 -1
View File
@@ -62,7 +62,7 @@
#elif defined(RADIO_V16)
#define ADC_VREF_PREC2 330
#elif defined(PCBX10)
#if defined(RADIO_X10) || defined(RADIO_X10E)
#if defined(RADIO_X10) || defined(RADIO_X10EXPRESS)
#define PWM_STICKS
#define PWM_TIMER TIM5
#define PWM_TIMER_FREQ (PERI1_FREQUENCY * TIMER_MULT_APB1)
+1
View File
@@ -47,6 +47,7 @@ add_definitions(-DFIRMWARE_FORMAT_UF2)
add_definitions(-DUSE_CUSTOM_EXTI_IRQ)
set(FLAVOUR pa01)
add_definitions(-DMANUFACTURER_FLYSKY)
# Defines internal modules for PL18 via UART7
set(INTERNAL_MODULES AFHDS3;CRSF CACHE STRING "Internal modules")
+1
View File
@@ -40,6 +40,7 @@ set(PCB_RF_BAUD 921600 CACHE STRING "INTERNAL_MODULE_BAUDRATE: ${RF_BAUD_RATE}")
set_property(CACHE PCB_RF_BAUD PROPERTY STRINGS ${RF_BAUD_RATE})
add_definitions(-DPCBPL18 -DPCBFLYSKY)
add_definitions(-DMANUFACTURER_FLYSKY)
add_definitions(-DBATTERY_CHARGE)
add_definitions(-DSTM32_SUPPORT_32BIT_TIMERS)
+1
View File
@@ -48,6 +48,7 @@ add_definitions(-DFIRMWARE_FORMAT_UF2)
add_definitions(-DUSE_CUSTOM_EXTI_IRQ)
set(FLAVOUR st16)
add_definitions(-DMANUFACTURER_FLYSKY)
# Defines internal modules for PL18 via UART7
# set(INTERNAL_MODULES MULTI CACHE STRING "Internal modules")
+1 -1
View File
@@ -47,7 +47,7 @@ add_definitions(-DUSE_CUSTOM_EXTI_IRQ)
add_definitions(-DUSB_CHARGER)
set(FLAVOUR t15pro)
add_definitions(-DRADIO_T15PRO)
add_definitions(-DMANUFACTURER_JUMPER)
# defines existing internal modules
set(INTERNAL_MODULES CRSF CACHE STRING "Internal modules")
+1 -1
View File
@@ -47,7 +47,7 @@ add_definitions(-DUSE_CUSTOM_EXTI_IRQ)
add_definitions(-DUSB_CHARGER)
set(FLAVOUR t22)
add_definitions(-DRADIO_T22)
add_definitions(-DMANUFACTURER_JUMPER)
# defines existing internal modules
set(INTERNAL_MODULES CRSF CACHE STRING "Internal modules")
@@ -68,7 +68,6 @@ add_definitions(-DUSB_CHARGE_CONTROL)
add_definitions(-DLUMINOSITY_SENSOR)
set(FLAVOUR tx16smk3)
add_definitions(-DRADIO_TX16SMK3)
add_definitions(-DMANUFACTURER_RADIOMASTER)
# defines existing internal modules
-1
View File
@@ -47,7 +47,6 @@ add_definitions(-DUSE_CUSTOM_EXTI_IRQ)
add_definitions(-DUSB_CHARGER)
set(FLAVOUR v12)
add_definitions(-DRADIO_V12)
add_definitions(-DMANUFACTURER_HELLORADIOSKY)
# defines existing internal modules