Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

comment out unsupported defines, and perhaps fix some #420

Merged
merged 4 commits into from
Aug 1, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions configs/AG3XF7/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/ALIENFLIGHTF4/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion configs/ALIENFLIGHTNGF7/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion configs/ALIENFLIGHTNGF7_DUAL/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion configs/ALIENFLIGHTNGF7_ELRS/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/BETAFPVF4SX1280/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/BLUEJAYF4/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#define USE_ACC
#define USE_ACC_SPI_MPU6500
#define USE_FLASH
#define USE_FLASH_W25P16
#define USE_FLASH_M25P16

#define BEEPER_PIN PC1
#define MOTOR1_PIN PA0
Expand Down
3 changes: 2 additions & 1 deletion configs/BRAHMA_F405/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
#define USE_BARO
#define USE_BARO_DPS310
#define USE_FLASH
#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
Expand Down
2 changes: 1 addition & 1 deletion configs/CRAZYBEEF4SX1280/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion configs/CYCLONEF722_PRO/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
#define USE_ACC_SPI_MPU6000
#define USE_BARO_BMP280
#define USE_FLASH
#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

Expand Down
2 changes: 1 addition & 1 deletion configs/DARWINF4SX1280HD/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/EMAX_TINYHAWKF4SX1280/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/FF_RACEPIT/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/FF_RACEPIT_MINI/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/FOSSF4ELRS/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/GEPRCF411SX1280/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions configs/HGLRCF411/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/HGLRCF411SX1280/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/HGLRCF411SX1280V2/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/IFLIGHT_F4SX1280/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/MEPSF4SX1280/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/NEUTRONRCF411SX1280/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion configs/NEUTRONRCF435SE/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions configs/NOX/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 10 additions & 9 deletions configs/NUCLEOF446/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,29 +29,30 @@
#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
// #define USE_RX_INAV
// #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

Expand Down
4 changes: 2 additions & 2 deletions configs/OMNIBUSF4SD/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/SPRACINGH7EF/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
haslinghuis marked this conversation as resolved.
Show resolved Hide resolved
#define USE_FLASH_M25P16

#define FLASH_CS_PIN PD7 // *NOT* SPI6_NSS, SOFTWARE CS ONLY
Expand Down
3 changes: 2 additions & 1 deletion configs/SPRACINGH7EVO/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
haslinghuis marked this conversation as resolved.
Show resolved Hide resolved
haslinghuis marked this conversation as resolved.
Show resolved Hide resolved
#define ENSURE_MPU_DATA_READY_IS_LOW


Expand Down
2 changes: 1 addition & 1 deletion configs/TMOTORF4SX1280/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion configs/YUPIF4/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down