From fa5346504ca79b5c8b2f2c9a8e038bde103887dd Mon Sep 17 00:00:00 2001 From: ctzsnooze Date: Fri, 10 May 2024 22:41:59 +1000 Subject: [PATCH 1/4] comment out unsupported defines, fix some --- configs/AG3XF7/config.h | 4 ++-- configs/ALIENFLIGHTF4/config.h | 2 +- configs/ALIENFLIGHTNGF7/config.h | 2 +- configs/ALIENFLIGHTNGF7_DUAL/config.h | 2 +- configs/ALIENFLIGHTNGF7_ELRS/config.h | 2 +- configs/BETAFPVF4SX1280/config.h | 2 +- configs/BLUEJAYF4/config.h | 3 ++- configs/BRAHMA_F405/config.h | 3 ++- configs/CRAZYBEEF4SX1280/config.h | 2 +- configs/CYCLONEF722_PRO/config.h | 3 ++- configs/DARWINF4SX1280HD/config.h | 2 +- configs/EMAX_TINYHAWKF4SX1280/config.h | 2 +- configs/FF_RACEPIT/config.h | 2 +- configs/FF_RACEPIT_MINI/config.h | 2 +- configs/FOSSF4ELRS/config.h | 2 +- configs/GEPRCF411SX1280/config.h | 2 +- configs/HGLRCF411/config.h | 4 ++-- configs/HGLRCF411SX1280/config.h | 2 +- configs/HGLRCF411SX1280V2/config.h | 2 +- configs/IFLIGHT_F4SX1280/config.h | 2 +- configs/MEPSF4SX1280/config.h | 2 +- configs/NEUTRONRCF411SX1280/config.h | 2 +- configs/NEUTRONRCF435SE/config.h | 3 ++- configs/NOX/config.h | 4 ++-- configs/NUCLEOF446/config.h | 19 ++++++++++--------- configs/OMNIBUSF4SD/config.h | 4 ++-- configs/SPRACINGH7EF/config.h | 2 +- configs/SPRACINGH7EVO/config.h | 3 ++- configs/TMOTORF4SX1280/config.h | 2 +- configs/YUPIF4/config.h | 3 ++- 30 files changed, 49 insertions(+), 42 deletions(-) diff --git a/configs/AG3XF7/config.h b/configs/AG3XF7/config.h index cac61109..6d6e1f55 100644 --- a/configs/AG3XF7/config.h +++ b/configs/AG3XF7/config.h @@ -102,9 +102,9 @@ #define USE_BARO #define BARO_SPI_INSTANCE SPI2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH -//TODO #define MIN_THROTTLE 1070 +// TODO #define MIN_THROTTLE 1070 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON -//TODO #define USE_UNSYNCED_PWM OFF +// TODO #define USE_UNSYNCED_PWM OFF #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ESC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED diff --git a/configs/ALIENFLIGHTF4/config.h b/configs/ALIENFLIGHTF4/config.h index 39fdf34a..43619d87 100644 --- a/configs/ALIENFLIGHTF4/config.h +++ b/configs/ALIENFLIGHTF4/config.h @@ -120,4 +120,4 @@ #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW270_DEG #define GYRO_1_ALIGN_YAW 2700 -#define USE_I2C1_PULLUP ON +#define I2C1_PULLUP ON diff --git a/configs/ALIENFLIGHTNGF7/config.h b/configs/ALIENFLIGHTNGF7/config.h index 6bb94408..45978338 100644 --- a/configs/ALIENFLIGHTNGF7/config.h +++ b/configs/ALIENFLIGHTNGF7/config.h @@ -126,4 +126,4 @@ #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW270_DEG #define GYRO_1_ALIGN_YAW 2700 -#define USE_I2C1_PULLUP ON +#define I2C1_PULLUP ON diff --git a/configs/ALIENFLIGHTNGF7_DUAL/config.h b/configs/ALIENFLIGHTNGF7_DUAL/config.h index fb5fb106..1e934d61 100644 --- a/configs/ALIENFLIGHTNGF7_DUAL/config.h +++ b/configs/ALIENFLIGHTNGF7_DUAL/config.h @@ -112,4 +112,4 @@ #define GYRO_2_SPI_INSTANCE SPI3 #define GYRO_2_ALIGN CW270_DEG #define GYRO_2_ALIGN_YAW 2700 -#define USE_I2C1_PULLUP ON +#define I2C1_PULLUP ON diff --git a/configs/ALIENFLIGHTNGF7_ELRS/config.h b/configs/ALIENFLIGHTNGF7_ELRS/config.h index abbe6b27..8212e543 100644 --- a/configs/ALIENFLIGHTNGF7_ELRS/config.h +++ b/configs/ALIENFLIGHTNGF7_ELRS/config.h @@ -39,7 +39,7 @@ #define USE_SDCARD #define USE_RX_SPI #define USE_RX_EXPRESSLRS -#define USE_RX_EXPRESSLRS_TELEMETRY +// #define USE_RX_EXPRESSLRS_TELEMETRY #define USE_RX_SX1280 #define RX_CHANNELS_AETR #define RX_SPI_DEFAULT_PROTOCOL RX_SPI_EXPRESSLRS diff --git a/configs/BETAFPVF4SX1280/config.h b/configs/BETAFPVF4SX1280/config.h index daf14b43..98dc64cb 100644 --- a/configs/BETAFPVF4SX1280/config.h +++ b/configs/BETAFPVF4SX1280/config.h @@ -38,7 +38,7 @@ #define USE_MAX7456 #define USE_RX_SPI #define USE_RX_EXPRESSLRS -#define USE_RX_EXPRESSLRS_TELEMETRY +// #define USE_RX_EXPRESSLRS_TELEMETRY #define USE_RX_SX1280 #define RX_CHANNELS_AETR #define RX_SPI_DEFAULT_PROTOCOL RX_SPI_EXPRESSLRS diff --git a/configs/BLUEJAYF4/config.h b/configs/BLUEJAYF4/config.h index dec22510..3baccaa7 100644 --- a/configs/BLUEJAYF4/config.h +++ b/configs/BLUEJAYF4/config.h @@ -31,7 +31,8 @@ #define USE_ACC #define USE_ACC_SPI_MPU6500 #define USE_FLASH -#define USE_FLASH_W25P16 +// No matching hardware define for W25P16 +// #define USE_FLASH_W25P16 #define BEEPER_PIN PC1 #define MOTOR1_PIN PA0 diff --git a/configs/BRAHMA_F405/config.h b/configs/BRAHMA_F405/config.h index 22897a26..324eab59 100644 --- a/configs/BRAHMA_F405/config.h +++ b/configs/BRAHMA_F405/config.h @@ -33,7 +33,8 @@ #define USE_BARO #define USE_BARO_DPS310 #define USE_FLASH -#define USE_FLASH_W25Q256 +// Although we do mention the W25Q256 in drivers/flash_m25p16.c, USE_FLASH_W25Q256 is not defined anywhere +// #define USE_FLASH_W25Q256 #define USE_MAX7456 #define BEEPER_PIN PC13 diff --git a/configs/CRAZYBEEF4SX1280/config.h b/configs/CRAZYBEEF4SX1280/config.h index 6a965b0e..bfe1fb55 100644 --- a/configs/CRAZYBEEF4SX1280/config.h +++ b/configs/CRAZYBEEF4SX1280/config.h @@ -40,7 +40,7 @@ #define USE_MAX7456 #define USE_RX_SPI #define USE_RX_EXPRESSLRS -#define USE_RX_EXPRESSLRS_TELEMETRY +// #define USE_RX_EXPRESSLRS_TELEMETRY #define USE_RX_SX1280 #define RX_CHANNELS_AETR #define RX_SPI_DEFAULT_PROTOCOL RX_SPI_EXPRESSLRS diff --git a/configs/CYCLONEF722_PRO/config.h b/configs/CYCLONEF722_PRO/config.h index 34f80cf7..9d4de397 100644 --- a/configs/CYCLONEF722_PRO/config.h +++ b/configs/CYCLONEF722_PRO/config.h @@ -32,7 +32,8 @@ #define USE_ACC_SPI_MPU6000 #define USE_BARO_BMP280 #define USE_FLASH -#define USE_FLASH_W25P16 +// No matching hardware define for W25P16 +// #define USE_FLASH_W25P16 #define USE_FLASH_W25Q128FV #define USE_MAX7456 diff --git a/configs/DARWINF4SX1280HD/config.h b/configs/DARWINF4SX1280HD/config.h index d9c32d46..7492e1e2 100644 --- a/configs/DARWINF4SX1280HD/config.h +++ b/configs/DARWINF4SX1280HD/config.h @@ -43,7 +43,7 @@ #define USE_MAX7456 #define USE_RX_SPI #define USE_RX_EXPRESSLRS -#define USE_RX_EXPRESSLRS_TELEMETRY +// #define USE_RX_EXPRESSLRS_TELEMETRY #define USE_RX_SX1280 #define RX_CHANNELS_AETR #define RX_SPI_DEFAULT_PROTOCOL RX_SPI_EXPRESSLRS diff --git a/configs/EMAX_TINYHAWKF4SX1280/config.h b/configs/EMAX_TINYHAWKF4SX1280/config.h index eb223183..fadaca7d 100644 --- a/configs/EMAX_TINYHAWKF4SX1280/config.h +++ b/configs/EMAX_TINYHAWKF4SX1280/config.h @@ -38,7 +38,7 @@ #define USE_MAX7456 #define USE_RX_SPI #define USE_RX_EXPRESSLRS -#define USE_RX_EXPRESSLRS_TELEMETRY +// #define USE_RX_EXPRESSLRS_TELEMETRY #define USE_RX_SX1280 #define RX_CHANNELS_AETR #define RX_SPI_DEFAULT_PROTOCOL RX_SPI_EXPRESSLRS diff --git a/configs/FF_RACEPIT/config.h b/configs/FF_RACEPIT/config.h index 7943d290..d987d59f 100644 --- a/configs/FF_RACEPIT/config.h +++ b/configs/FF_RACEPIT/config.h @@ -42,7 +42,7 @@ #define I2C3_SCL_PIN PA8 #define I2C3_SDA_PIN PC9 -#define USE_I2C3_PULLUP ON +#define I2C3_PULLUP ON #define SPI1_SCK_PIN PA5 #define SPI1_SDI_PIN PA6 diff --git a/configs/FF_RACEPIT_MINI/config.h b/configs/FF_RACEPIT_MINI/config.h index 850c2f7a..4d8dd887 100644 --- a/configs/FF_RACEPIT_MINI/config.h +++ b/configs/FF_RACEPIT_MINI/config.h @@ -41,7 +41,7 @@ #define I2C3_SCL_PIN PA8 #define I2C3_SDA_PIN PC9 -#define USE_I2C3_PULLUP ON +#define I2C3_PULLUP ON #define SPI1_SCK_PIN PA5 #define SPI1_SDI_PIN PA6 diff --git a/configs/FOSSF4ELRS/config.h b/configs/FOSSF4ELRS/config.h index 743f1468..f829f71a 100644 --- a/configs/FOSSF4ELRS/config.h +++ b/configs/FOSSF4ELRS/config.h @@ -37,7 +37,7 @@ #define USE_RX_SPI #define USE_RX_EXPRESSLRS -#define USE_RX_EXPRESSLRS_TELEMETRY +// #define USE_RX_EXPRESSLRS_TELEMETRY #define USE_RX_SX1280 #define RX_CHANNELS_AETR diff --git a/configs/GEPRCF411SX1280/config.h b/configs/GEPRCF411SX1280/config.h index d5df0f47..6d2d52e9 100644 --- a/configs/GEPRCF411SX1280/config.h +++ b/configs/GEPRCF411SX1280/config.h @@ -46,7 +46,7 @@ #define USE_RX_SPI #define USE_RX_EXPRESSLRS -#define USE_RX_EXPRESSLRS_TELEMETRY +// #define USE_RX_EXPRESSLRS_TELEMETRY #define USE_RX_SX1280 #define RX_CHANNELS_AETR #define RX_SPI_DEFAULT_PROTOCOL RX_SPI_EXPRESSLRS diff --git a/configs/HGLRCF411/config.h b/configs/HGLRCF411/config.h index 5181bfdc..6bb3cf8c 100644 --- a/configs/HGLRCF411/config.h +++ b/configs/HGLRCF411/config.h @@ -81,8 +81,8 @@ #define ADC1_DMA_OPT 1 -//TODO #define MIN_THROTTLE 1070 -//TODO #define USE_UNSYNCED_PWM OFF +// TODO #define MIN_THROTTLE 1070 +// TODO #define USE_UNSYNCED_PWM OFF #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_OFF #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/configs/HGLRCF411SX1280/config.h b/configs/HGLRCF411SX1280/config.h index 55b256f8..f4268efe 100644 --- a/configs/HGLRCF411SX1280/config.h +++ b/configs/HGLRCF411SX1280/config.h @@ -36,7 +36,7 @@ #define USE_MAX7456 #define USE_RX_SPI #define USE_RX_EXPRESSLRS -#define USE_RX_EXPRESSLRS_TELEMETRY +// #define USE_RX_EXPRESSLRS_TELEMETRY #define USE_RX_SX1280 #define RX_CHANNELS_AETR #define RX_SPI_DEFAULT_PROTOCOL RX_SPI_EXPRESSLRS diff --git a/configs/HGLRCF411SX1280V2/config.h b/configs/HGLRCF411SX1280V2/config.h index 10a4c470..00e16127 100644 --- a/configs/HGLRCF411SX1280V2/config.h +++ b/configs/HGLRCF411SX1280V2/config.h @@ -37,7 +37,7 @@ #define USE_MAX7456 #define USE_RX_SPI #define USE_RX_EXPRESSLRS -#define USE_RX_EXPRESSLRS_TELEMETRY +// #define USE_RX_EXPRESSLRS_TELEMETRY #define USE_RX_SX1280 #define RX_CHANNELS_AETR #define RX_SPI_DEFAULT_PROTOCOL RX_SPI_EXPRESSLRS diff --git a/configs/IFLIGHT_F4SX1280/config.h b/configs/IFLIGHT_F4SX1280/config.h index c7e9c622..484b0948 100644 --- a/configs/IFLIGHT_F4SX1280/config.h +++ b/configs/IFLIGHT_F4SX1280/config.h @@ -32,7 +32,7 @@ #define USE_MAX7456 #define USE_RX_SPI #define USE_RX_EXPRESSLRS -#define USE_RX_EXPRESSLRS_TELEMETRY +// #define USE_RX_EXPRESSLRS_TELEMETRY #define USE_RX_SX1280 #define RX_CHANNELS_AETR #define RX_SPI_DEFAULT_PROTOCOL RX_SPI_EXPRESSLRS diff --git a/configs/MEPSF4SX1280/config.h b/configs/MEPSF4SX1280/config.h index f5d4e4e7..19e4b3e1 100644 --- a/configs/MEPSF4SX1280/config.h +++ b/configs/MEPSF4SX1280/config.h @@ -33,7 +33,7 @@ #define USE_MAX7456 #define USE_RX_SPI #define USE_RX_EXPRESSLRS -#define USE_RX_EXPRESSLRS_TELEMETRY +// #define USE_RX_EXPRESSLRS_TELEMETRY #define USE_RX_SX1280 #define RX_CHANNELS_AETR #define RX_SPI_DEFAULT_PROTOCOL RX_SPI_EXPRESSLRS diff --git a/configs/NEUTRONRCF411SX1280/config.h b/configs/NEUTRONRCF411SX1280/config.h index abe437a3..22104327 100644 --- a/configs/NEUTRONRCF411SX1280/config.h +++ b/configs/NEUTRONRCF411SX1280/config.h @@ -41,7 +41,7 @@ #define USE_MAX7456 #define USE_RX_SPI #define USE_RX_EXPRESSLRS -#define USE_RX_EXPRESSLRS_TELEMETRY +// #define USE_RX_EXPRESSLRS_TELEMETRY #define USE_RX_SX1280 #define RX_CHANNELS_AETR #define RX_SPI_DEFAULT_PROTOCOL RX_SPI_EXPRESSLRS diff --git a/configs/NEUTRONRCF435SE/config.h b/configs/NEUTRONRCF435SE/config.h index 281f9741..843db024 100644 --- a/configs/NEUTRONRCF435SE/config.h +++ b/configs/NEUTRONRCF435SE/config.h @@ -29,7 +29,8 @@ #define USE_ACC #define USE_GYRO #define USE_ACCGYRO_BMI270 -#define USE_ACCGYRO_ASM330LHH +// no matching hardware define for ASM330LHH +// #define USE_ACCGYRO_ASM330LHH #define USE_ACC_SPI_ICM42688P #define USE_GYRO_SPI_ICM42688P diff --git a/configs/NOX/config.h b/configs/NOX/config.h index 187d2c1f..b91bd8c5 100644 --- a/configs/NOX/config.h +++ b/configs/NOX/config.h @@ -81,8 +81,8 @@ #define BARO_SPI_INSTANCE SPI2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH -//TODO #define MIN_THROTTLE 1070 -//TODO #define USE_UNSYNCED_PWM OFF +// TODO #define MIN_THROTTLE 1070 +// TODO #define USE_UNSYNCED_PWM OFF #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ESC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ESC #define BEEPER_INVERTED diff --git a/configs/NUCLEOF446/config.h b/configs/NUCLEOF446/config.h index 5bb5533e..f1dd583a 100644 --- a/configs/NUCLEOF446/config.h +++ b/configs/NUCLEOF446/config.h @@ -29,20 +29,21 @@ #define MANUFACTURER_ID STMI #define USE_ACC -#define USE_FAKE_ACC +// #define USE_FAKE_ACC #define USE_ACC_SPI_MPU6500 #define USE_ACC_SPI_MPU9250 #define USE_GYRO -#define USE_FAKE_GYRO +// #define USE_FAKE_GYRO #define USE_GYRO_SPI_MPU6500 #define USE_GYRO_SPI_MPU9250 #define USE_MAG -#define USE_FAKE_MAG -//#define USE_MAX7456 -//#define USE_SDCARD -#define USE_SONAR +// #define USE_FAKE_MAG +// #define USE_MAX7456 +// #define USE_SDCARD +// SONAR is not supported +// #define USE_SONAR #define USE_RX_SPI -#define USE_CC2500 +// #define USE_CC2500 // #define USE_RX_NRF24 // #define USE_RX_CX10 // #define USE_RX_H8_3D @@ -50,8 +51,8 @@ // #define USE_RX_SYMA // #define USE_RX_V202 -//#define USE_BEEPER -//#define BEEPER_PIN PD12 +// #define USE_BEEPER +// #define BEEPER_PIN PD12 #define LED0_PIN PA5 // Onboard (green) LED diff --git a/configs/OMNIBUSF4SD/config.h b/configs/OMNIBUSF4SD/config.h index 115fe01a..80fd8b23 100644 --- a/configs/OMNIBUSF4SD/config.h +++ b/configs/OMNIBUSF4SD/config.h @@ -109,9 +109,9 @@ #define BARO_SPI_INSTANCE SPI3 #define ADC_INSTANCE ADC2 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD -//TODO #define MIN_THROTTLE 1070 +// TODO #define MIN_THROTTLE 1070 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON -//TODO #define USE_UNSYNCED_PWM OFF +// TODO #define USE_UNSYNCED_PWM OFF #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define BEEPER_INVERTED diff --git a/configs/SPRACINGH7EF/config.h b/configs/SPRACINGH7EF/config.h index 764a49d5..fcf64775 100644 --- a/configs/SPRACINGH7EF/config.h +++ b/configs/SPRACINGH7EF/config.h @@ -85,7 +85,7 @@ #define USE_FLASHFS #define USE_FLASH_TOOLS // For the SPI flash chip for logging -#define USE_FLASH_W25Q128 +#define USE_FLASH_W25Q128FV #define USE_FLASH_M25P16 #define FLASH_CS_PIN PD7 // *NOT* SPI6_NSS, SOFTWARE CS ONLY diff --git a/configs/SPRACINGH7EVO/config.h b/configs/SPRACINGH7EVO/config.h index 5eb36ea3..17fcc288 100644 --- a/configs/SPRACINGH7EVO/config.h +++ b/configs/SPRACINGH7EVO/config.h @@ -113,7 +113,8 @@ #define MAG_I2C_INSTANCE (I2CDEV_2) #define BARO_I2C_INSTANCE (I2CDEV_2) -#define USE_MPU_DATA_READY_SIGNAL +// no define matching USE_MPU_DATA_READY_SIGNAL in Betaflight 4.5 - did this mean gyro_exti? +// #define USE_MPU_DATA_READY_SIGNAL #define ENSURE_MPU_DATA_READY_IS_LOW diff --git a/configs/TMOTORF4SX1280/config.h b/configs/TMOTORF4SX1280/config.h index c4537a03..7efa9c34 100644 --- a/configs/TMOTORF4SX1280/config.h +++ b/configs/TMOTORF4SX1280/config.h @@ -32,7 +32,7 @@ #define USE_MAX7456 #define USE_RX_SPI #define USE_RX_EXPRESSLRS -#define USE_RX_EXPRESSLRS_TELEMETRY +// #define USE_RX_EXPRESSLRS_TELEMETRY #define USE_RX_SX1280 #define RX_CHANNELS_AETR #define RX_SPI_DEFAULT_PROTOCOL RX_SPI_EXPRESSLRS diff --git a/configs/YUPIF4/config.h b/configs/YUPIF4/config.h index 7e072a92..fa26b2b5 100644 --- a/configs/YUPIF4/config.h +++ b/configs/YUPIF4/config.h @@ -27,7 +27,8 @@ #define MANUFACTURER_ID YUPF #define USE_GYRO -#define USE_GYRO_FAST_KALMAN +// no matching hardware define for GYRO_FAST_KALMAN +// #define USE_GYRO_FAST_KALMAN #define USE_GYRO_SPI_MPU6500 #define USE_GYRO_SPI_ICM20689 #define USE_ACC From 91d1d908e6c6811610e118d488a1b908109be51b Mon Sep 17 00:00:00 2001 From: ctzsnooze Date: Sat, 11 May 2024 12:04:52 +1000 Subject: [PATCH 2/4] updates from review --- configs/BLUEJAYF4/config.h | 3 +-- configs/BRAHMA_F405/config.h | 4 ++-- configs/CYCLONEF722_PRO/config.h | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/configs/BLUEJAYF4/config.h b/configs/BLUEJAYF4/config.h index 3baccaa7..7c0a00f8 100644 --- a/configs/BLUEJAYF4/config.h +++ b/configs/BLUEJAYF4/config.h @@ -31,8 +31,7 @@ #define USE_ACC #define USE_ACC_SPI_MPU6500 #define USE_FLASH -// No matching hardware define for W25P16 -// #define USE_FLASH_W25P16 +#define USE_FLASH_M25P16 #define BEEPER_PIN PC1 #define MOTOR1_PIN PA0 diff --git a/configs/BRAHMA_F405/config.h b/configs/BRAHMA_F405/config.h index 324eab59..676f6592 100644 --- a/configs/BRAHMA_F405/config.h +++ b/configs/BRAHMA_F405/config.h @@ -33,8 +33,8 @@ #define USE_BARO #define USE_BARO_DPS310 #define USE_FLASH -// Although we do mention the W25Q256 in drivers/flash_m25p16.c, USE_FLASH_W25Q256 is not defined anywhere -// #define USE_FLASH_W25Q256 +// Originally used #define USE_FLASH_W25Q256, but we don't have such a define, hence use W25Q128FV +#define USE_FLASH_W25Q128FV #define USE_MAX7456 #define BEEPER_PIN PC13 diff --git a/configs/CYCLONEF722_PRO/config.h b/configs/CYCLONEF722_PRO/config.h index 9d4de397..4e7645fe 100644 --- a/configs/CYCLONEF722_PRO/config.h +++ b/configs/CYCLONEF722_PRO/config.h @@ -32,8 +32,8 @@ #define USE_ACC_SPI_MPU6000 #define USE_BARO_BMP280 #define USE_FLASH -// No matching hardware define for W25P16 -// #define USE_FLASH_W25P16 +// was #define USE_FLASH_W25P16, but no such define exists, so changed to USE_FLASH_M25P16 +#define USE_FLASH_M25P16 #define USE_FLASH_W25Q128FV #define USE_MAX7456 From eed0b54f512b21b4cf2cf37da51e5980e567ae13 Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Wed, 31 Jul 2024 23:13:22 +0200 Subject: [PATCH 3/4] Update configs/SPRACINGH7EF/config.h --- configs/SPRACINGH7EF/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/SPRACINGH7EF/config.h b/configs/SPRACINGH7EF/config.h index fcf64775..21d23c2b 100644 --- a/configs/SPRACINGH7EF/config.h +++ b/configs/SPRACINGH7EF/config.h @@ -85,7 +85,6 @@ #define USE_FLASHFS #define USE_FLASH_TOOLS // For the SPI flash chip for logging -#define USE_FLASH_W25Q128FV #define USE_FLASH_M25P16 #define FLASH_CS_PIN PD7 // *NOT* SPI6_NSS, SOFTWARE CS ONLY From 9b8b2e4d45cc18743cee1c4730fc3437f715bc38 Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Thu, 1 Aug 2024 09:57:56 +0200 Subject: [PATCH 4/4] Update configs/SPRACINGH7EVO/config.h --- configs/SPRACINGH7EVO/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/configs/SPRACINGH7EVO/config.h b/configs/SPRACINGH7EVO/config.h index 17fcc288..b38f3dbf 100644 --- a/configs/SPRACINGH7EVO/config.h +++ b/configs/SPRACINGH7EVO/config.h @@ -113,8 +113,6 @@ #define MAG_I2C_INSTANCE (I2CDEV_2) #define BARO_I2C_INSTANCE (I2CDEV_2) -// no define matching USE_MPU_DATA_READY_SIGNAL in Betaflight 4.5 - did this mean gyro_exti? -// #define USE_MPU_DATA_READY_SIGNAL #define ENSURE_MPU_DATA_READY_IS_LOW