From 7fa8d740dbaadbe098cc20a5b26ddc3869f472f4 Mon Sep 17 00:00:00 2001 From: Ray Morris Date: Tue, 15 Sep 2026 16:06:32 -0500 Subject: [PATCH 1/2] Fix mistyped target macros that silently disable features check_macro_typos.py flagged target.h defines that resemble typos of real INAV macros. Verified each against driver/core usage and fixed the confirmed cases: - IFLIGHT_H743_AIO_V2, JHEH7AIO: BEEPER_PIN -> BEEPER. The beeper driver gates on #ifdef BEEPER, so the beeper was silently compiled out. - RADIOLINKF405: USE_SERIAL_3WAY_BLHELI_INTERFACE -> USE_SERIAL_4WAY_BLHELI_INTERFACE. The 4-way BLHeli passthrough was compiled out (no 3WAY macro exists in core). - BETAFPVF435: ADC_CHANNEL1/2/3_PIN -> ADC_CHANNEL_1/2/3_PIN. adcInit disables channels whose *_PIN macro is missing, so VBAT/current/RSSI ADC was dead. Also dropped a duplicate INVERTER_PIN_USART3_RX. - AIKONF7, BETAFPVF435, BROTHERHOBBYF405V3, PRINCIPIOTF7: removed the never-implemented USE_FLASH_W25M* / W25M* cruft (all four still define the real USE_FLASH_W25N01G). --- src/main/target/AIKONF7/target.h | 9 --------- src/main/target/BETAFPVF435/target.h | 16 +++------------- src/main/target/BROTHERHOBBYF405V3/target.h | 9 --------- src/main/target/IFLIGHT_H743_AIO_V2/target.h | 2 +- src/main/target/JHEH7AIO/target.h | 2 +- src/main/target/PRINCIPIOTF7/target.h | 9 --------- src/main/target/RADIOLINKF405/target.h | 2 +- 7 files changed, 6 insertions(+), 43 deletions(-) diff --git a/src/main/target/AIKONF7/target.h b/src/main/target/AIKONF7/target.h index f738d688a88..b29a2c9366c 100644 --- a/src/main/target/AIKONF7/target.h +++ b/src/main/target/AIKONF7/target.h @@ -109,15 +109,6 @@ #define USE_FLASH_M25P16 #define M25P16_SPI_BUS BUS_SPI3 #define M25P16_CS_PIN PB0 -#define USE_FLASH_W25M -#define W25M_SPI_BUS BUS_SPI3 -#define W25M_CS_PIN PB0 -#define USE_FLASH_W25M02G -#define W25M02G_SPI_BUS BUS_SPI3 -#define W25M02G_CS_PIN PB0 -#define USE_FLASH_W25M512 -#define W25M512_SPI_BUS BUS_SPI3 -#define W25M512_CS_PIN PB0 #define USE_FLASH_W25N01G #define W25N01G_SPI_BUS BUS_SPI3 #define W25N01G_CS_PIN PB0 diff --git a/src/main/target/BETAFPVF435/target.h b/src/main/target/BETAFPVF435/target.h index fa025b9d7fd..db897e42b31 100644 --- a/src/main/target/BETAFPVF435/target.h +++ b/src/main/target/BETAFPVF435/target.h @@ -94,15 +94,6 @@ #define USE_FLASH_W25N01G // 1Gb NAND flash support #define W25N01G_SPI_BUS BUS_SPI2 #define W25N01G_CS_PIN FLASH_CS_PIN -#define USE_FLASH_W25M // Stacked die support -#define W25M_SPI_BUS BUS_SPI2 -#define W25M_CS_PIN FLASH_CS_PIN -#define USE_FLASH_W25M512 // 512Kb (256Kb x 2 stacked) NOR flash support -#define W25M512_SPI_BUS BUS_SPI2 -#define W25M512_CS_PIN FLASH_CS_PIN -#define USE_FLASH_W25M02G // 2Gb (1Gb x 2 stacked) NAND flash support -#define W25M02G_SPI_BUS BUS_SPI2 -#define W25M02G_CS_PIN FLASH_CS_PIN // *************** OSD ***************************** #define USE_SPI_DEVICE_3 @@ -143,7 +134,6 @@ #define UART3_TX_PIN PB10 #define USE_UART_INVERTER #define INVERTER_PIN_UART3_RX PC9 -#define INVERTER_PIN_USART3_RX PC9 #define USE_UART4 #define UART4_RX_PIN PA1 @@ -167,9 +157,9 @@ #define USE_ADC #define ADC_INSTANCE ADC1 #define ADC1_DMA_STREAM DMA2_CHANNEL5 -#define ADC_CHANNEL1_PIN PC2 -#define ADC_CHANNEL2_PIN PC1 -#define ADC_CHANNEL3_PIN PC0 +#define ADC_CHANNEL_1_PIN PC2 +#define ADC_CHANNEL_2_PIN PC1 +#define ADC_CHANNEL_3_PIN PC0 #define VBAT_ADC_CHANNEL ADC_CHN_1 #define CURRENT_METER_ADC_CHANNEL ADC_CHN_2 #define RSSI_ADC_CHANNEL ADC_CHN_3 diff --git a/src/main/target/BROTHERHOBBYF405V3/target.h b/src/main/target/BROTHERHOBBYF405V3/target.h index acf1f82a6b2..b4b977f8d73 100644 --- a/src/main/target/BROTHERHOBBYF405V3/target.h +++ b/src/main/target/BROTHERHOBBYF405V3/target.h @@ -116,15 +116,6 @@ #define USE_FLASH_M25P16 #define M25P16_SPI_BUS BUS_SPI3 #define M25P16_CS_PIN PA15 -#define USE_FLASH_W25M -#define W25M_SPI_BUS BUS_SPI3 -#define W25M_CS_PIN PA15 -#define USE_FLASH_W25M02G -#define W25M02G_SPI_BUS BUS_SPI3 -#define W25M02G_CS_PIN PA15 -#define USE_FLASH_W25M512 -#define W25M512_SPI_BUS BUS_SPI3 -#define W25M512_CS_PIN PA15 #define USE_FLASH_W25N01G #define W25N01G_SPI_BUS BUS_SPI3 #define W25N01G_CS_PIN PA15 diff --git a/src/main/target/IFLIGHT_H743_AIO_V2/target.h b/src/main/target/IFLIGHT_H743_AIO_V2/target.h index c3900376686..a5257993798 100644 --- a/src/main/target/IFLIGHT_H743_AIO_V2/target.h +++ b/src/main/target/IFLIGHT_H743_AIO_V2/target.h @@ -24,7 +24,7 @@ #define LED0 PC13 -#define BEEPER_PIN PD2 +#define BEEPER PD2 #define BEEPER_INVERTED // *************** SPI1 Gyro & ACC ******************* diff --git a/src/main/target/JHEH7AIO/target.h b/src/main/target/JHEH7AIO/target.h index 00ecf856e23..a3d0bf6a419 100644 --- a/src/main/target/JHEH7AIO/target.h +++ b/src/main/target/JHEH7AIO/target.h @@ -24,7 +24,7 @@ #define LED0 PC13 -#define BEEPER_PIN PD15 +#define BEEPER PD15 #define BEEPER_INVERTED // *************** SPI1 Gyro & ACC ******************* diff --git a/src/main/target/PRINCIPIOTF7/target.h b/src/main/target/PRINCIPIOTF7/target.h index aa486d6af25..0208f55a361 100644 --- a/src/main/target/PRINCIPIOTF7/target.h +++ b/src/main/target/PRINCIPIOTF7/target.h @@ -128,15 +128,6 @@ #define USE_FLASH_M25P16 #define M25P16_SPI_BUS BUS_SPI2 #define M25P16_CS_PIN PB12 -#define USE_FLASH_W25M -#define W25M_SPI_BUS BUS_SPI2 -#define W25M_CS_PIN PB12 -#define USE_FLASH_W25M02G -#define W25M02G_SPI_BUS BUS_SPI2 -#define W25M02G_CS_PIN PB12 -#define USE_FLASH_W25M512 -#define W25M512_SPI_BUS BUS_SPI2 -#define W25M512_CS_PIN PB12 #define USE_FLASH_W25N01G #define W25N01G_SPI_BUS BUS_SPI2 #define W25N01G_CS_PIN PB12 diff --git a/src/main/target/RADIOLINKF405/target.h b/src/main/target/RADIOLINKF405/target.h index 6665a46a4f8..9a1afd47739 100644 --- a/src/main/target/RADIOLINKF405/target.h +++ b/src/main/target/RADIOLINKF405/target.h @@ -162,7 +162,7 @@ #define MAX_PWM_OUTPUT_PORTS 8 -#define USE_SERIAL_3WAY_BLHELI_INTERFACE +#define USE_SERIAL_4WAY_BLHELI_INTERFACE #define USE_DSHOT #define USE_DSHOT_DMAR #define USE_ESC_SENSOR From aa7fdea2596fc032ad48b550ac6cfe76df0494a9 Mon Sep 17 00:00:00 2001 From: Ray Morris Date: Tue, 15 Sep 2026 17:17:48 -0500 Subject: [PATCH 2/2] Stop bf2inav converter from emitting dead W25M flash macros The Betaflight->INAV converter emitted USE_FLASH_W25M/W25M02G/W25M512 for every converted target, but that flash family has no driver (targets use W25N01G). Removing them from the supported list prevents the dead macros from being regenerated on future conversions. --- src/utils/bf2inav.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/utils/bf2inav.py b/src/utils/bf2inav.py index 8309cb1d756..c810b53d888 100755 --- a/src/utils/bf2inav.py +++ b/src/utils/bf2inav.py @@ -468,9 +468,6 @@ def writeTargetH(folder, map): # TODO: add more drivers suppored_flash_chips = [ 'M25P16', - 'W25M', - 'W25M02G', - 'W25M512', 'W25N01G', 'W25N02K', ]