Update latest unified target changes

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

Hide file tree

Showing 6 changed files with 118 additions and 107 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/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,9 @@
 
 #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 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
diff --git a/src/config/SPRACINGH7RF/config.h b/src/config/SPRACINGH7RF/config.h
@@ -19,17 +19,17 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define FC_TARGET_MCU     STM32H730
+#define FC_TARGET_MCU           STM32H730
 
-#define BOARD_NAME        SPRACINGH7RF
-#define MANUFACTURER_ID   SPRO
+#define BOARD_NAME              SPRACINGH7RF
+#define MANUFACTURER_ID         SPRO
 
 #define TARGET_BOARD_IDENTIFIER "SP7R"
-#define USBD_PRODUCT_STRING "SPRacingH7RF"
+#define USBD_PRODUCT_STRING     "SPRacingH7RF"
 
-#define FC_VMA_ADDRESS    0x90100000
+#define FC_VMA_ADDRESS          0x90100000
 
-#define EEPROM_SIZE 8192
+#define EEPROM_SIZE             8192
 
 #define USE_SPRACING_PERSISTENT_RTC_WORKAROUND
 
@@ -77,14 +77,14 @@
 #define SDIO_D2_PIN             PC10
 #define SDIO_D3_PIN             PC11
 
-#define TARGET_IO_PORTA 0xffff
-#define TARGET_IO_PORTB (0xffff & ~(BIT(2)|BIT(6)))
-#define TARGET_IO_PORTC 0xffff
-#define TARGET_IO_PORTD (0xffff & ~(BIT(11)|BIT(12)|BIT(13)))
-#define TARGET_IO_PORTE (0xffff & ~(BIT(2)|BIT(7)|BIT(8)|BIT(9)|BIT(10)))
-#define TARGET_IO_PORTF 0xffff
-#define TARGET_IO_PORTG 0xffff
-#define TARGET_IO_PORTH 0xffff
+#define TARGET_IO_PORTA         0xffff
+#define TARGET_IO_PORTB         (0xffff & ~(BIT(2)|BIT(6)))
+#define TARGET_IO_PORTC         0xffff
+#define TARGET_IO_PORTD         (0xffff & ~(BIT(11)|BIT(12)|BIT(13)))
+#define TARGET_IO_PORTE         (0xffff & ~(BIT(2)|BIT(7)|BIT(8)|BIT(9)|BIT(10)))
+#define TARGET_IO_PORTF         0xffff
+#define TARGET_IO_PORTG         0xffff
+#define TARGET_IO_PORTH         0xffff
 
 #define USE_I2C
 #define USE_I2C_DEVICE_1
@@ -111,15 +111,15 @@
 #define USE_RX_SPI
 #define USE_RX_EXPRESSLRS
 #define USE_RX_SX1280
-#define RX_SPI_INSTANCE                                 SPI2
-#define RX_NSS_PIN                                      SPI2_NSS_PIN
-#define RX_SPI_EXTI_PIN                                 SX1280_DIO1_PIN
-#define RX_EXPRESSLRS_SPI_RESET_PIN                     SX1280_NRESET_PIN
-#define RX_EXPRESSLRS_SPI_BUSY_PIN                      SX1280_BUSY_PIN
-#define RX_EXPRESSLRS_TIMER_INSTANCE                    TIM6
+#define RX_SPI_INSTANCE               SPI2
+#define RX_NSS_PIN                    SPI2_NSS_PIN
+#define RX_SPI_EXTI_PIN               SX1280_DIO1_PIN
+#define RX_EXPRESSLRS_SPI_RESET_PIN   SX1280_NRESET_PIN
+#define RX_EXPRESSLRS_SPI_BUSY_PIN    SX1280_BUSY_PIN
+#define RX_EXPRESSLRS_TIMER_INSTANCE  TIM6
 
-#define DEFAULT_RX_FEATURE      FEATURE_RX_SPI
-#define RX_SPI_DEFAULT_PROTOCOL RX_SPI_EXPRESSLRS
+#define DEFAULT_RX_FEATURE            FEATURE_RX_SPI
+#define RX_SPI_DEFAULT_PROTOCOL       RX_SPI_EXPRESSLRS
 
 #define ADC3_DMA_OPT 10
 #define ADC_INSTANCE                  ADC3
@@ -135,21 +135,26 @@
 #define VBAT_ADC_INSTANCE             ADC3
 #define VIDEO_IN_ADC_PIN              PC5
 #define VIDEO_OUT_ADC_PIN             PC4
+
 #define RSSI_ADC_PIN                  CURRENT_METER_2_ADC_PIN
 #define RSSI_ADC_INSTANCE             CURRENT_METER_2_ADC_INSTANCE
 #define CURRENT_METER_ADC_PIN         CURRENT_METER_1_ADC_PIN
 #define CURRENT_METER_ADC_INSTANCE    CURRENT_METER_1_ADC_INSTANCE
-#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
-#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
+#define DEFAULT_VOLTAGE_METER_SOURCE  VOLTAGE_METER_ADC
+#define DEFAULT_CURRENT_METER_SOURCE  CURRENT_METER_ADC
 
-#define VTX_ENABLE_PIN          PC15
-#define PINIO1_PIN              VTX_ENABLE_PIN
+#define VTX_ENABLE_PIN                PC15
+#define PINIO1_PIN                    VTX_ENABLE_PIN
 
+#define USE_ACC
 #define USE_ACC_SPI_ICM42605
 #define USE_ACC_SPI_ICM42688P
+#define USE_GYRO
 #define USE_GYRO_SPI_ICM42605
 #define USE_GYRO_SPI_ICM42688P
+#define USE_BARO
 #define USE_BARO_BMP388
+#define USE_MAG
 #define USE_MAG_HMC5883
 #define USE_MAG_QMC5883
 #define USE_FLASH_W25Q128FV
@@ -165,19 +170,14 @@
 #define SPRACING_PIXEL_OSD_WHITE_SOURCE_SELECT_PIN      PE15
 
 #define SPRACING_PIXEL_OSD_SYNC_IN_PIN                  PE11
-
 #define SPRACING_PIXEL_OSD_SYNC_OUT_PIN                 PA8
 
 #define SPRACING_PIXEL_OSD_WHITE_SOURCE_PIN             PA4
-
 #define SPRACING_PIXEL_OSD_VIDEO_THRESHOLD_DEBUG_PIN    PA5
 
 #define SPRACING_PIXEL_OSD_PIXEL_DEBUG_1_PIN            PE5
-
 #define SPRACING_PIXEL_OSD_PIXEL_DEBUG_2_PIN            PE6
-
 #define SPRACING_PIXEL_OSD_PIXEL_GATING_DEBUG_PIN       PB0
-
 #define SPRACING_PIXEL_OSD_PIXEL_BLANKING_DEBUG_PIN     PB1
 
 #define BEEPER_PIN           PE4
@@ -255,24 +255,21 @@
 
 #define ADC3_DMA_OPT       10
 
-//TODO #define MAG_BUSTYPE I2C
-#define MAG_I2C_INSTANCE (I2CDEV_1)
-
-//TODO #define BARO_BUSTYPE I2C
-#define BARO_I2C_INSTANCE (I2CDEV_2)
+#define MAG_I2C_INSTANCE     (I2CDEV_1)
+#define BARO_I2C_INSTANCE    (I2CDEV_2)
 
 //TODO #define ADC_DEVICE 3
 
-//TODO #define RX_SPI_PROTOCOL EXPRESSLRS
-#define RX_SPI_INSTANCE SPI2
+#define RX_SPI_PROTOCOL      EXPRESSLRS
+#define RX_SPI_INSTANCE      SPI2
 
 //TODO #define PINIO_CONFIG 1,1,1,1
 //TODO #define PINIO_BOX 40,255,255,255
 
 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
 
-//TODO #define CURRENT_METER ADC
-//TODO #define BATTERY_METER ADC
+#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
+#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
 
 #define USE_SPI_GYRO
 #define GYRO_1_SPI_INSTANCE SPI6