Update latest unified target changes

betaflight · Mar 5, 2023 · c90de67 · c90de67
1 parent 0d0e02f
commit c90de67
Show file tree

Hide file tree

Showing 7 changed files with 119 additions and 109 deletions.
diff --git a/src/config/CRAZYBEEF4DX/config.h b/src/config/CRAZYBEEF4DX/config.h
@@ -26,10 +26,15 @@
 #define BOARD_NAME        CRAZYBEEF4DX
 #define MANUFACTURER_ID   HAMO
 
+#define USE_ACC
 #define USE_ACC_SPI_MPU6000
-#define USE_GYRO_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_GYRO_SPI_ICM20689
+#define USE_GYRO_SPI_ICM42688P
 #define USE_MAX7456
 
 #define BEEPER_PIN           PC15
@@ -79,14 +84,18 @@
 
 //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
-//TODO #define CURRENT_METER ADC
-//TODO #define BATTERY_METER ADC
-//TODO #define IBATA_SCALE 179
+#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/FLYWOOF405S_AIO/config.h b/src/config/FLYWOOF405S_AIO/config.h
@@ -26,10 +26,14 @@
 #define BOARD_NAME        FLYWOOF405S_AIO
 #define MANUFACTURER_ID   FLWO
 
+#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
@@ -89,22 +93,19 @@
 
 
 
-#define ADC1_DMA_OPT        0
-
-//TODO #define MAG_BUSTYPE I2C
-#define MAG_I2C_INSTANCE (I2CDEV_1)
-//TODO #define BARO_BUSTYPE I2C
-#define BARO_I2C_INSTANCE (I2CDEV_1)
-//TODO #define BLACKBOX_DEVICE SPIFLASH
-//TODO #define CURRENT_METER ADC
-//TODO #define BATTERY_METER ADC
-//TODO #define IBATA_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/HGLRCF411SX1280/config.h b/src/config/HGLRCF411SX1280/config.h
@@ -89,7 +89,7 @@
 
 #define ADC1_DMA_OPT        0
 
-#define RX_SPI_INSTANCE SPI1
+#define RX_SPI_INSTANCE SPI3
 //TODO #define RX_SPI_LED_INVERSION ON
 //TODO #define BLACKBOX_DEVICE SPIFLASH
 //TODO #define DSHOT_BURST OFF

diff --git a/src/config/KAKUTEF7MINI/config.h b/src/config/KAKUTEF7MINI/config.h
@@ -26,11 +26,15 @@
 #define BOARD_NAME        KAKUTEF7MINI
 #define MANUFACTURER_ID   HBRO
 
-#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
@@ -88,23 +92,20 @@
 
 
 
-#define ADC1_DMA_OPT        1
-
-//TODO #define MAG_BUSTYPE I2C
-#define MAG_I2C_INSTANCE (I2CDEV_1)
-//TODO #define MAG_HARDWARE NONE
-//TODO #define BARO_BUSTYPE I2C
-#define BARO_I2C_INSTANCE (I2CDEV_1)
-//TODO #define BARO_HARDWARE BMP280
-//TODO #define BLACKBOX_DEVICE SPIFLASH
-//TODO #define CURRENT_METER ADC
-//TODO #define IBATA_SCALE 275
-//TODO #define BATTERY_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
diff --git a/src/config/MATEKF722HD/config.h b/src/config/MATEKF722HD/config.h
@@ -103,23 +103,26 @@
 #define ADC1_DMA_OPT            0  // DMA 2 Stream 0 Channel 0 
 
 #define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
-#define SERIALRX_PROVIDER       SERIALRX_SBUS
+// #define SERIALRX_PROVIDER       SERIALRX_SBUS
 #define SERIALRX_UART           SERIAL_PORT_USART2
 
 #define MAG_BUSTYPE             I2C
 #define MAG_I2C_INSTANCE        (I2CDEV_1)
 //TODO #define MAG_HARDWARE AUTO
-
 #define BARO_BUSTYPE I2C
 #define BARO_I2C_INSTANCE       (I2CDEV_1)
-//TODO #define BARO_HARDWARE AUTO
+#define BARO_HARDWARE           AUTO
 #define BLACKBOX_DEVICE         SPIFLASH
 #define DSHOT_BURST             ON
-#define CURRENT_METER           ADC
-#define BATTERY_METER           ADC
+#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
+#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
+#define DEFAULT_CURRENT_METER_SCALE 179
+
 #define BEEPER_INVERTED
 //TODO #define PINIO_BOX 40,41,255,255
 #define FLASH_SPI_INSTANCE      SPI2
+#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH
+
 #define USE_SPI_GYRO
 #define GYRO_1_SPI_INSTANCE     SPI1
 #define GYRO_1_ALIGN            CW180_DEG_FLIP
@@ -128,11 +131,8 @@
 
 #define GYRO_2_SPI_INSTANCE     SPI1
 #define GYRO_2_ALIGN            CW90_DEG
-#define CAMERA_CONTROL_MODE     HARDWARE_PWM
 
-#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
-#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
-#define CURRENT_METER_SCALE_DEFAULT 179
+#define CAMERA_CONTROL_MODE     HARDWARE_PWM
 
 #define ENSURE_MPU_DATA_READY_IS_LOW
 #define GYRO_CONFIG_USE_GYRO_DEFAULT GYRO_CONFIG_USE_GYRO_1

diff --git a/src/config/NBD_INFINITYAIOV2/config.h b/src/config/NBD_INFINITYAIOV2/config.h
@@ -26,6 +26,12 @@
 #define BOARD_NAME        NBD_INFINITYAIOV2
 #define MANUFACTURER_ID   NEBD
 
+#define USE_ACC
+#define USE_GYRO
+#define USE_ACCGYRO_BMI270
+#define USE_FLASH_W25Q128FV
+#define USE_MAX7456
+
 #define BEEPER_PIN           PD13
 #define MOTOR1_PIN           PC6
 #define MOTOR2_PIN           PC7
@@ -70,23 +76,19 @@
 
 
 
-#define ADC1_DMA_OPT        1
-
-//TODO #define MAG_BUSTYPE I2C
-#define MAG_I2C_INSTANCE (I2CDEV_1)
-
-//TODO #define BLACKBOX_DEVICE SPIFLASH
+#define ADC1_DMA_OPT                    1
+#define MAG_I2C_INSTANCE                (I2CDEV_1)
 //TODO #define DSHOT_BURST ON
 //TODO #define DSHOT_BIDIR ON
-//TODO #define MOTOR_PWM_PROTOCOL DSHOT600
-//TODO #define CURRENT_METER ADC
-//TODO #define BATTERY_METER ADC
-//TODO #define IBATA_SCALE 230
+#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     230
 #define BEEPER_INVERTED
-#define BEEPER_PWM_HZ 5400
-#define MAX7456_SPI_INSTANCE SPI3
-#define FLASH_SPI_INSTANCE SPI1
+#define BEEPER_PWM_HZ                   5400
+#define MAX7456_SPI_INSTANCE            SPI3
+#define FLASH_SPI_INSTANCE              SPI1
 #define USE_SPI_GYRO
-#define GYRO_1_SPI_INSTANCE SPI4
-#define GYRO_1_ALIGN CW180_DEG
-#define GYRO_1_ALIGN_YAW 1800
+#define GYRO_1_SPI_INSTANCE             SPI4
+#define GYRO_1_ALIGN                    CW180_DEG
+#define GYRO_1_ALIGN_YAW                1800