FIX: update & clean configuration (#12451)

betaflight · Mar 6, 2023 · 5834641 · 5834641
1 parent ca9dd3d
commit 5834641
Show file tree

Hide file tree

Showing 17 changed files with 221 additions and 200 deletions.
diff --git a/src/config/ALIENFLIGHTNGF7_ELRS/config.h b/src/config/ALIENFLIGHTNGF7_ELRS/config.h
@@ -43,6 +43,8 @@
 #define USE_RX_SX1280
 #define RX_CHANNELS_AETR
 #define RX_SPI_DEFAULT_PROTOCOL         RX_SPI_EXPRESSLRS
+#define DEFAULT_RX_FEATURE              FEATURE_RX_SPI
+#define RX_SPI_PROTOCOL                 EXPRESSLRS
 #define RX_EXPRESSLRS_TIMER_INSTANCE    TIM5
 #define RX_EXPRESSLRS_SPI_RESET_PIN     PB6
 #define RX_EXPRESSLRS_SPI_BUSY_PIN      PB7

diff --git a/src/config/BETAFPVF4SX1280/config.h b/src/config/BETAFPVF4SX1280/config.h
@@ -40,6 +40,8 @@
 #define USE_RX_SX1280
 #define RX_CHANNELS_AETR
 #define RX_SPI_DEFAULT_PROTOCOL         RX_SPI_EXPRESSLRS
+#define DEFAULT_RX_FEATURE              FEATURE_RX_SPI
+#define RX_SPI_PROTOCOL                 EXPRESSLRS
 #define RX_EXPRESSLRS_TIMER_INSTANCE    TIM5
 #define RX_EXPRESSLRS_SPI_RESET_PIN     PB9
 #define RX_EXPRESSLRS_SPI_BUSY_PIN      PA13

diff --git a/src/config/CRAZYBEEF4DX/config.h b/src/config/CRAZYBEEF4DX/config.h
@@ -28,10 +28,13 @@
 
 #define USE_ACC
 #define USE_ACC_SPI_MPU6000
+#define USE_ACC_SPI_ICM20689
+#define USE_ACC_SPI_ICM42688P
+#define USE_ACCGYRO_BMI270
 #define USE_GYRO
 #define USE_GYRO_SPI_MPU6000
-#define USE_ACC_SPI_ICM20689
 #define USE_GYRO_SPI_ICM20689
+#define USE_GYRO_SPI_ICM42688P
 #define USE_MAX7456
 
 #define BEEPER_PIN           PC15
@@ -81,14 +84,17 @@
 
 //TODO #define DSHOT_BURST AUTO
 //TODO #define DSHOT_BITBANG OFF
-//TODO #define SERIALRX_PROVIDER SPEK2048
+#define SERIALRX_PROVIDER SPEK2048
 //TODO #define MOTOR_PWM_PROTOCOL DSHOT600
 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
 #define DEFAULT_CURRENT_METER_SCALE 179
 #define BEEPER_INVERTED
+
 #define SYSTEM_HSE_MHZ 8
+
 #define MAX7456_SPI_INSTANCE SPI2
+
 #define USE_SPI_GYRO
 #define GYRO_1_SPI_INSTANCE SPI1
 #define GYRO_1_ALIGN CW90_DEG
diff --git a/src/config/CRAZYBEEF4SX1280/config.h b/src/config/CRAZYBEEF4SX1280/config.h
@@ -43,6 +43,8 @@
 #define USE_RX_SX1280
 #define RX_CHANNELS_AETR
 #define RX_SPI_DEFAULT_PROTOCOL         RX_SPI_EXPRESSLRS
+#define DEFAULT_RX_FEATURE              FEATURE_RX_SPI
+#define RX_SPI_PROTOCOL                 EXPRESSLRS
 #define RX_EXPRESSLRS_TIMER_INSTANCE    TIM3
 #define RX_EXPRESSLRS_SPI_RESET_PIN     PA8
 #define RX_EXPRESSLRS_SPI_BUSY_PIN      PA13

diff --git a/src/config/DALRCF722DUAL/config.h b/src/config/DALRCF722DUAL/config.h
@@ -33,6 +33,7 @@
 #define USE_GYRO_SPI_MPU6500
 #define USE_GYRO_SPI_MPU6000
 #define USE_BARO_MS5611
+#define USE_FLASH_W25Q128FV
 #define USE_MAX7456
 
 #define BEEPER_PIN           PC13

diff --git a/src/config/DARWINF4SX1280HD/config.h b/src/config/DARWINF4SX1280HD/config.h
@@ -47,6 +47,8 @@
 #define USE_RX_SX1280
 #define RX_CHANNELS_AETR
 #define RX_SPI_DEFAULT_PROTOCOL         RX_SPI_EXPRESSLRS
+#define DEFAULT_RX_FEATURE              FEATURE_RX_SPI
+#define RX_SPI_PROTOCOL                 EXPRESSLRS
 #define RX_EXPRESSLRS_TIMER_INSTANCE    TIM5
 #define RX_EXPRESSLRS_SPI_RESET_PIN     PB9
 #define RX_EXPRESSLRS_SPI_BUSY_PIN      PA13

diff --git a/src/config/EMAX_TINYHAWKF4SX1280/config.h b/src/config/EMAX_TINYHAWKF4SX1280/config.h
@@ -42,6 +42,9 @@
 #define USE_RX_SX1280
 #define RX_CHANNELS_AETR
 #define RX_SPI_DEFAULT_PROTOCOL         RX_SPI_EXPRESSLRS
+#define RX_SPI_DEFAULT_PROTOCOL         RX_SPI_EXPRESSLRS
+#define DEFAULT_RX_FEATURE              FEATURE_RX_SPI
+#define RX_SPI_PROTOCOL                 EXPRESSLRS
 #define RX_EXPRESSLRS_TIMER_INSTANCE    TIM5
 #define RX_EXPRESSLRS_SPI_RESET_PIN     PA8
 #define RX_EXPRESSLRS_SPI_BUSY_PIN      PA13

diff --git a/src/config/FLYWOOF405S_AIO/config.h b/src/config/FLYWOOF405S_AIO/config.h
@@ -28,10 +28,12 @@
 
 #define USE_ACC
 #define USE_ACC_SPI_MPU6000
+#define USE_ACC_SPI_ICM42688P
+#define USE_ACCGYRO_BMI270
 #define USE_GYRO
 #define USE_GYRO_SPI_MPU6000
 #define USE_GYRO_SPI_ICM42688P
-#define USE_ACC_SPI_ICM42688P
+#define USE_BARO
 #define USE_BARO_BMP280
 #define USE_BARO_DPS310
 #define USE_FLASH_W25Q128FV
@@ -91,22 +93,19 @@
 
 
 
-#define ADC1_DMA_OPT        0
-
-//TODO #define MAG_BUSTYPE I2C
-#define MAG_I2C_INSTANCE (I2CDEV_1)
-#define USE_BARO
-#define BARO_I2C_INSTANCE (I2CDEV_1)
-#define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH
-#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
-#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
-#define DEFAULT_CURRENT_METER_SCALE 170
+#define ADC1_DMA_OPT                    0
+#define MAG_I2C_INSTANCE                (I2CDEV_1)
+#define BARO_I2C_INSTANCE               (I2CDEV_1)
+#define DEFAULT_BLACKBOX_DEVICE         BLACKBOX_DEVICE_FLASH
+#define DEFAULT_CURRENT_METER_SOURCE    CURRENT_METER_ADC
+#define DEFAULT_VOLTAGE_METER_SOURCE    VOLTAGE_METER_ADC
+#define DEFAULT_CURRENT_METER_SCALE     170
 #define BEEPER_INVERTED
-#define MAX7456_SPI_INSTANCE SPI3
-//TODO #define DASHBOARD_I2C_BUS 1
-#define FLASH_SPI_INSTANCE SPI3
+#define MAX7456_SPI_INSTANCE            SPI3
+#define DASHBOARD_I2C_INSTANCE          (I2CDEV_1)
+#define FLASH_SPI_INSTANCE              SPI3
 #define USE_SPI_GYRO
-#define GYRO_1_SPI_INSTANCE SPI1
-#define GYRO_1_ALIGN CW180_DEG
-#define GYRO_1_ALIGN_YAW 1800
-#define GYRO_2_SPI_INSTANCE SPI1
+#define GYRO_1_SPI_INSTANCE             SPI1
+#define GYRO_1_ALIGN                    CW180_DEG
+#define GYRO_1_ALIGN_YAW                1800
+#define GYRO_2_SPI_INSTANCE             SPI1
diff --git a/src/config/GEPRCF411SX1280/config.h b/src/config/GEPRCF411SX1280/config.h
@@ -46,6 +46,8 @@
 #define USE_RX_SX1280
 #define RX_CHANNELS_AETR
 #define RX_SPI_DEFAULT_PROTOCOL         RX_SPI_EXPRESSLRS
+#define DEFAULT_RX_FEATURE              FEATURE_RX_SPI
+#define RX_SPI_PROTOCOL                 EXPRESSLRS
 #define RX_EXPRESSLRS_TIMER_INSTANCE    TIM5
 #define RX_EXPRESSLRS_SPI_RESET_PIN     PB9
 #define RX_EXPRESSLRS_SPI_BUSY_PIN      PA13

diff --git a/src/config/HGLRCF411SX1280/config.h b/src/config/HGLRCF411SX1280/config.h
@@ -39,6 +39,8 @@
 #define USE_RX_SX1280
 #define RX_CHANNELS_AETR
 #define RX_SPI_DEFAULT_PROTOCOL         RX_SPI_EXPRESSLRS
+#define DEFAULT_RX_FEATURE              FEATURE_RX_SPI
+#define RX_SPI_PROTOCOL                 EXPRESSLRS
 #define RX_EXPRESSLRS_TIMER_INSTANCE    TIM5
 #define RX_EXPRESSLRS_SPI_RESET_PIN     PB9
 #define RX_EXPRESSLRS_SPI_BUSY_PIN      PA13
@@ -90,7 +92,7 @@
 
 #define ADC1_DMA_OPT        0
 
-#define RX_SPI_INSTANCE SPI1
+#define RX_SPI_INSTANCE SPI3
 //TODO #define RX_SPI_LED_INVERSION ON
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH
 //TODO #define DSHOT_BURST OFF

diff --git a/src/config/KAKUTEF7MINI/config.h b/src/config/KAKUTEF7MINI/config.h
@@ -26,13 +26,15 @@
 #define BOARD_NAME        KAKUTEF7MINI
 #define MANUFACTURER_ID   HBRO
 
-#define USE_GYRO
-#define USE_GYRO_SPI_ICM20689
 #define USE_ACC
+#define USE_ACC_SPI_MPU6000
 #define USE_ACC_SPI_ICM20689
+#define USE_GYRO
 #define USE_GYRO_SPI_MPU6000
-#define USE_ACC_SPI_MPU6000
+#define USE_GYRO_SPI_ICM20689
+#define USE_BARO
 #define USE_BARO_BMP280
+#define USE_FLASH_W25Q128FV
 #define USE_MAX7456
 
 #define BEEPER_PIN           PD15
@@ -89,23 +91,20 @@
     TIMER_PIN_MAP( 8, PB3 , 1,  0)
 
 
-#define ADC1_DMA_OPT        1
-
-//TODO #define MAG_BUSTYPE I2C
-#define MAG_I2C_INSTANCE (I2CDEV_1)
-//TODO #define MAG_HARDWARE NONE
-#define USE_BARO
-#define BARO_I2C_INSTANCE (I2CDEV_1)
-//TODO #define BARO_HARDWARE BMP280
-#define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH
-#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
-#define DEFAULT_CURRENT_METER_SCALE 275
-#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
+#define ADC1_DMA_OPT                    1
+#define MAG_I2C_INSTANCE                (I2CDEV_1)
+#define MAG_HARDWARE                    NONE
+#define BARO_I2C_INSTANCE               (I2CDEV_1)
+#define BARO_HARDWARE                   BMP280
+#define DEFAULT_BLACKBOX_DEVICE         BLACKBOX_DEVICE_FLASH
+#define DEFAULT_CURRENT_METER_SOURCE    CURRENT_METER_ADC
+#define DEFAULT_VOLTAGE_METER_SOURCE    VOLTAGE_METER_ADC
+#define DEFAULT_CURRENT_METER_SCALE     275
 #define BEEPER_INVERTED
-#define MAX7456_SPI_INSTANCE SPI2
-//TODO #define DASHBOARD_I2C_BUS 1
-#define FLASH_SPI_INSTANCE SPI1
+#define MAX7456_SPI_INSTANCE            SPI2
+#define DASHBOARD_I2C_INSTANCE          (I2CDEV_1)
+#define FLASH_SPI_INSTANCE              SPI1
 #define USE_SPI_GYRO
-#define GYRO_1_SPI_INSTANCE SPI4
-#define GYRO_1_ALIGN CW270_DEG
-#define GYRO_2_SPI_INSTANCE SPI4
+#define GYRO_1_SPI_INSTANCE             SPI4
+#define GYRO_1_ALIGN                    CW270_DEG
+#define GYRO_2_SPI_INSTANCE             SPI4