From 9b90b5730741f49c97888d1b7323285b8b5b8eac Mon Sep 17 00:00:00 2001 From: JHEMCU <88915836+jhemcu@users.noreply.github.com> Date: Thu, 14 Dec 2023 22:26:54 +0800 Subject: [PATCH 01/14] JHEF745: Supplementary definition based on schematic diagram (#1218) --- configs/default/JHEF-JHEF745.config | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configs/default/JHEF-JHEF745.config b/configs/default/JHEF-JHEF745.config index 829063b6e..9a5c49170 100644 --- a/configs/default/JHEF-JHEF745.config +++ b/configs/default/JHEF-JHEF745.config @@ -22,20 +22,24 @@ resource MOTOR 3 E09 resource MOTOR 4 E11 resource MOTOR 5 C09 resource MOTOR 6 A03 +resource MOTOR 7 B04 +resource MOTOR 8 B05 resource PPM 1 E13 resource LED_STRIP 1 D12 resource SERIAL_TX 1 A09 resource SERIAL_TX 2 D05 resource SERIAL_TX 3 B10 resource SERIAL_TX 4 A00 +resource SERIAL_TX 5 C12 resource SERIAL_TX 6 C06 +resource SERIAL_TX 7 E08 resource SERIAL_RX 1 A10 resource SERIAL_RX 2 D06 resource SERIAL_RX 3 B11 resource SERIAL_RX 4 A01 +resource SERIAL_RX 5 D02 resource SERIAL_RX 6 C07 resource SERIAL_RX 7 E07 -resource SERIAL_TX 7 E08 resource I2C_SCL 1 B06 resource I2C_SDA 1 B07 resource LED 1 A02 @@ -57,6 +61,7 @@ resource OSD_CS 1 B12 resource GYRO_EXTI 1 E01 resource GYRO_CS 1 E04 resource USB_DETECT 1 A08 +resource PINIO 1 C00 # timer timer E13 AF1 From 78441189b38b46e35af1d1733c2f090c13f1b389 Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Tue, 19 Dec 2023 23:18:35 +0100 Subject: [PATCH 02/14] Add baro bus settings for RUSH-BLADE_F7 (#1204) Add bus settings for RUSH-BLADE_F7 --- configs/default/RUSH-BLADE_F7.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/default/RUSH-BLADE_F7.config b/configs/default/RUSH-BLADE_F7.config index b9d6349d3..bfa5d7d8d 100644 --- a/configs/default/RUSH-BLADE_F7.config +++ b/configs/default/RUSH-BLADE_F7.config @@ -118,6 +118,8 @@ serial 3 2048 115200 57600 0 115200 led 0 0,15::C:2 # master +set baro_bustype = I2C +set baro_i2c_device = 1 set blackbox_device = SPIFLASH set dshot_burst = ON set current_meter = ADC From e902034fa0088ef3023821173b042c8c759d7fd9 Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Tue, 19 Dec 2023 23:19:47 +0100 Subject: [PATCH 03/14] Update SPRO-SPRACINGH7NANO.config (#1223) * Update SPRO-SPRACINGH7NANO.config See https://build.betaflight.com/api/builds/975537c50081df35df0f71bb234e4c67/log * Update configs/default/SPRO-SPRACINGH7NANO.config * Update configs/default/SPRO-SPRACINGH7NANO.config --- configs/default/SPRO-SPRACINGH7NANO.config | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/default/SPRO-SPRACINGH7NANO.config b/configs/default/SPRO-SPRACINGH7NANO.config index 3364e1070..f43ca9b75 100644 --- a/configs/default/SPRO-SPRACINGH7NANO.config +++ b/configs/default/SPRO-SPRACINGH7NANO.config @@ -74,14 +74,14 @@ #define USE_I2C #define USE_I2C_DEVICE_1 -#define I2C1_SCL_PIN PB8 -#define I2C1_SDA_PIN PB9 +#define I2C1_SCL PB8 +#define I2C1_SDA PB9 #define I2C_DEVICE (I2CDEV_1) # I2C shared with motor outputs 5/6 #define USE_I2C_DEVICE_4 -#define I2C4_SCL_PIN PB6 -#define I2C4_SDA_PIN PB7 +#define I2C4_SCL PB6 +#define I2C4_SDA PB7 #define ENSURE_MPU_DATA_READY_IS_LOW From dd24c99e57510aeaa15e742ee5ed55b6d1f9468a Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Wed, 20 Dec 2023 12:00:17 +0100 Subject: [PATCH 04/14] Update DFRA-DFR_F722_DUAL_HD.config (#1198) --- configs/default/DFRA-DFR_F722_DUAL_HD.config | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/configs/default/DFRA-DFR_F722_DUAL_HD.config b/configs/default/DFRA-DFR_F722_DUAL_HD.config index fecb408c0..58663a368 100644 --- a/configs/default/DFRA-DFR_F722_DUAL_HD.config +++ b/configs/default/DFRA-DFR_F722_DUAL_HD.config @@ -3,6 +3,17 @@ board_name DFR_F722_DUAL_HD manufacturer_id DFRA +#define USE_ACC +#define USE_BARO +#define USE_FLASH +#define USE_GYRO + +#define USE_ACC_SPI_ICM20689 +#define USE_BARO_BMP280 +#define USE_FLASH_W25Q128FV +#define USE_GYRO_SPI_ICM20689 +#define USE_MAX7456 + # resources resource BEEPER 1 C15 resource MOTOR 1 C08 From cd2ebd0000116bdb8ed362a2472fca77b08deaa4 Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Wed, 20 Dec 2023 12:00:29 +0100 Subject: [PATCH 05/14] Fix TAKERF411 (#1201) --- configs/default/GEPR-TAKERF411.config | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/configs/default/GEPR-TAKERF411.config b/configs/default/GEPR-TAKERF411.config index 64277f1e2..e1c05be94 100644 --- a/configs/default/GEPR-TAKERF411.config +++ b/configs/default/GEPR-TAKERF411.config @@ -1,14 +1,15 @@ # Betaflight / STM32F411 (S411) 4.3.2 Nov 28 2022 / 07:27:10 (60c9521) MSP API: 1.44 -#define USE_ACCGYRO_BMI270 -#define USE_GYRO -#define USE_GYRO_SPI_ICM42688P #define USE_ACC -#define USE_ACC_SPI_ICM42688P #define USE_BARO -#define USE_BARO_DPS310 -#define USE_BARO_BMP280 #define USE_FLASH +#define USE_GYRO + +#define USE_ACCGYRO_BMI270 +#define USE_ACC_SPI_ICM42688P +#define USE_GYRO_SPI_ICM42688P +#define USE_BARO_BMP280 +#define USE_BARO_DPS310 #define USE_FLASH_W25Q128FV #define USE_MAX7456 From 5e8703694f58447157f241e2568e80b1ef9ced7c Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Wed, 20 Dec 2023 12:01:06 +0100 Subject: [PATCH 06/14] Add BMP280 to HNEC-NIDICI_F4.config (#1199) --- configs/default/HNEC-NIDICI_F4.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/default/HNEC-NIDICI_F4.config b/configs/default/HNEC-NIDICI_F4.config index 44814f602..9e7535fde 100644 --- a/configs/default/HNEC-NIDICI_F4.config +++ b/configs/default/HNEC-NIDICI_F4.config @@ -2,6 +2,8 @@ #define USE_ACC #define USE_ACC_SPI_MPU6000 +#define USE_BARO +#define USE_BARO_BMP280 #define USE_GYRO #define USE_GYRO_SPI_MPU6000 #define USE_FLASH From dbfec65fe27abf215486ac1322e0a21235561bf8 Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Wed, 20 Dec 2023 12:01:37 +0100 Subject: [PATCH 07/14] Rename FLWO-FLYWOOF745AIOV2.config to FLWO-FLYWOOF745AIO.config (#1200) as there is no V1 version. Found out looking at cloud build issues. --- .../{FLWO-FLYWOOF745AIOV2.config => FLWO-FLYWOOF745AIO.config} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename configs/default/{FLWO-FLYWOOF745AIOV2.config => FLWO-FLYWOOF745AIO.config} (99%) diff --git a/configs/default/FLWO-FLYWOOF745AIOV2.config b/configs/default/FLWO-FLYWOOF745AIO.config similarity index 99% rename from configs/default/FLWO-FLYWOOF745AIOV2.config rename to configs/default/FLWO-FLYWOOF745AIO.config index b42767573..f220ea5be 100644 --- a/configs/default/FLWO-FLYWOOF745AIOV2.config +++ b/configs/default/FLWO-FLYWOOF745AIO.config @@ -11,7 +11,7 @@ #define USE_FLASH_W25Q128FV #define USE_MAX7456 -board_name FLYWOOF745AIOV2 +board_name FLYWOOF745AIO manufacturer_id FLWO # resources From 3c00bdf5d27844080ba5bcd0429b969567c73644 Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Wed, 20 Dec 2023 12:05:54 +0100 Subject: [PATCH 08/14] Add BMP280 to HARC-HAKRCF722D (#1214) Resolves #1213 --- configs/default/HARC-HAKRCF722D.config | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/default/HARC-HAKRCF722D.config b/configs/default/HARC-HAKRCF722D.config index ae0bd183f..b8d9ddbf6 100644 --- a/configs/default/HARC-HAKRCF722D.config +++ b/configs/default/HARC-HAKRCF722D.config @@ -10,6 +10,7 @@ #define USE_GYRO_SPI_ICM42688P #define USE_ACC_SPI_ICM42688P #define USE_BARO +#define USE_BARO_BMP280 #define USE_BARO_DPS310 #define USE_FLASH #define USE_FLASH_W25Q128FV From 6df80df8d1a9db555652a28c35e667f922b84c77 Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Wed, 20 Dec 2023 12:06:27 +0100 Subject: [PATCH 09/14] Update FHRC-FLASHHOBBYF722.config (#1215) Got this log https://build.betaflight.com/api/builds/ae40ad6122f0e873ba59bbebe1b0b3e7/log --- configs/default/FHRC-FLASHHOBBYF722.config | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/default/FHRC-FLASHHOBBYF722.config b/configs/default/FHRC-FLASHHOBBYF722.config index c7a81a3ca..72e1521e5 100644 --- a/configs/default/FHRC-FLASHHOBBYF722.config +++ b/configs/default/FHRC-FLASHHOBBYF722.config @@ -1,4 +1,5 @@ # Betaflight / STM32F7X2 (S7X2) 4.3.2 Nov 28 2022 / 07:30:19 (60c9521) MSP API: 1.44 +#mcu STM32F7X2 #define USE_GYRO #define USE_GYRO_SPI_MPU6000 From 723ca248832cb83a5557a2b86e5bae65b5542ddb Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Wed, 20 Dec 2023 12:07:32 +0100 Subject: [PATCH 10/14] Add DPS310 to SPDX-SPEDIXF722 (#1216) --- configs/default/SPDX-SPEDIXF722.config | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/default/SPDX-SPEDIXF722.config b/configs/default/SPDX-SPEDIXF722.config index db5a0fb9b..6622fdf4c 100644 --- a/configs/default/SPDX-SPEDIXF722.config +++ b/configs/default/SPDX-SPEDIXF722.config @@ -9,6 +9,7 @@ #define USE_ACC_SPI_ICM42688P #define USE_BARO #define USE_BARO_BMP280 +#define USE_BARO_DPS310 #define USE_FLASH #define USE_FLASH_M25P16 #define USE_MAX7456 From 3a3af8aa2ae8340d076608fa63c6f7e4868e5a68 Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Wed, 20 Dec 2023 12:08:08 +0100 Subject: [PATCH 11/14] Add DPS310 to DIAT-MAMBAF722_I2C (#1224) --- configs/default/DIAT-MAMBAF722_I2C.config | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/default/DIAT-MAMBAF722_I2C.config b/configs/default/DIAT-MAMBAF722_I2C.config index 5b868cd8c..85c0d1d8a 100644 --- a/configs/default/DIAT-MAMBAF722_I2C.config +++ b/configs/default/DIAT-MAMBAF722_I2C.config @@ -8,6 +8,7 @@ #define USE_ACC_SPI_MPU6500 #define USE_BARO #define USE_BARO_BMP280 +#define USE_BARO_DPS310 #define USE_FLASH #define USE_FLASH_W25Q128FV #define USE_MAX7456 From 27261bdc75d2e2ea6c751b301124c9b304ea9e8c Mon Sep 17 00:00:00 2001 From: SugarK Date: Fri, 22 Dec 2023 00:29:28 +1100 Subject: [PATCH 12/14] Update AIRB-AIRBOTG4AIO.config (#1225) add lsm gyro to airbot fenix aio --- configs/default/AIRB-AIRBOTG4AIO.config | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/default/AIRB-AIRBOTG4AIO.config b/configs/default/AIRB-AIRBOTG4AIO.config index ffcaca514..475f4040f 100644 --- a/configs/default/AIRB-AIRBOTG4AIO.config +++ b/configs/default/AIRB-AIRBOTG4AIO.config @@ -6,6 +6,7 @@ #define USE_BARO_DPS310 #define USE_GYRO #define USE_GYRO_SPI_ICM42688P +#define USE_ACCGYRO_LSM6DVS16X #define USE_FLASH #define USE_FLASH_W25Q128FV #define USE_MAX7456 From 8fa7af066c5802cc5f908a7f63d258c201ebbf95 Mon Sep 17 00:00:00 2001 From: Rocky <517503838@qq.com> Date: Thu, 28 Dec 2023 01:09:21 +0800 Subject: [PATCH 13/14] HGLRC: Add HGLRCF722MINIV2 board target (#1228) --- configs/default/HGLR-HGLRCF722MINIV2.config | 154 ++++++++++++++++++++ 1 file changed, 154 insertions(+) create mode 100644 configs/default/HGLR-HGLRCF722MINIV2.config diff --git a/configs/default/HGLR-HGLRCF722MINIV2.config b/configs/default/HGLR-HGLRCF722MINIV2.config new file mode 100644 index 000000000..46f72e37b --- /dev/null +++ b/configs/default/HGLR-HGLRCF722MINIV2.config @@ -0,0 +1,154 @@ +# Betaflight / STM32F7X2 (S7X2) 4.4.3 Nov 17 2023 / 05:45:22 (738127e7e) MSP API: 1.45 + +#define USE_ACC +#define USE_ACC_SPI_MPU6000 +#define USE_ACC_SPI_ICM42688P +#define USE_ACCGYRO_BMI270 +#define USE_BARO +#define USE_BARO_BMP280 +#define USE_BARO_DPS310 +#define USE_FLASH +#define USE_FLASH_W25Q128FV +#define USE_GYRO +#define USE_GYRO_SPI_MPU6000 +#define USE_GYRO_SPI_ICM42688P +#define USE_MAX7456 + +board_name HGLRCF722MINIV2 +manufacturer_id HGLR + +# resources +resource BEEPER 1 C13 +resource MOTOR 1 B04 +resource MOTOR 2 B05 +resource MOTOR 3 B00 +resource MOTOR 4 B01 +resource MOTOR 5 A15 +resource MOTOR 6 B03 +resource MOTOR 7 B06 +resource MOTOR 8 B07 +resource LED_STRIP 1 A08 +resource SERIAL_TX 1 A09 +resource SERIAL_TX 2 A02 +resource SERIAL_TX 3 B10 +resource SERIAL_TX 4 A00 +resource SERIAL_TX 6 C06 +resource SERIAL_RX 1 A10 +resource SERIAL_RX 2 A03 +resource SERIAL_RX 3 B11 +resource SERIAL_RX 4 A01 +resource SERIAL_RX 6 C07 +resource I2C_SCL 1 B08 +resource I2C_SDA 1 B09 +resource LED 1 A14 +resource LED 2 A13 +resource SPI_SCK 1 A05 +resource SPI_SCK 2 B13 +resource SPI_SCK 3 C10 +resource SPI_MISO 1 A06 +resource SPI_MISO 2 B14 +resource SPI_MISO 3 C11 +resource SPI_MOSI 1 A07 +resource SPI_MOSI 2 B15 +resource SPI_MOSI 3 C12 +resource ADC_BATT 1 C02 +resource ADC_RSSI 1 C00 +resource ADC_CURR 1 C01 +resource BARO_CS 1 A04 +resource PINIO 1 C08 +resource PINIO 2 C09 +resource FLASH_CS 1 D02 +resource OSD_CS 1 B12 +resource GYRO_EXTI 1 C04 +resource GYRO_CS 1 B02 +resource USB_DETECT 1 C14 + +# timer +timer B04 AF2 +# pin B04: TIM3 CH1 (AF2) +timer B05 AF2 +# pin B05: TIM3 CH2 (AF2) +timer B00 AF2 +# pin B00: TIM3 CH3 (AF2) +timer B01 AF2 +# pin B01: TIM3 CH4 (AF2) +timer A15 AF1 +# pin A15: TIM2 CH1 (AF1) +timer B03 AF1 +# pin B03: TIM2 CH2 (AF1) +timer B06 AF2 +# pin B06: TIM4 CH1 (AF2) +timer B07 AF2 +# pin B07: TIM4 CH2 (AF2) +timer A08 AF1 +# pin A08: TIM1 CH1 (AF1) +timer A03 AF3 +# pin A03: TIM9 CH2 (AF3) +timer A02 AF3 +# pin A02: TIM9 CH1 (AF3) +timer A01 AF2 +# pin A01: TIM5 CH2 (AF2) +timer A00 AF2 +# pin A00: TIM5 CH1 (AF2) + +# dma +dma ADC 1 1 +# ADC 1: DMA2 Stream 4 Channel 0 +dma pin B04 0 +# pin B04: DMA1 Stream 4 Channel 5 +dma pin B05 0 +# pin B05: DMA1 Stream 5 Channel 5 +dma pin B00 0 +# pin B00: DMA1 Stream 7 Channel 5 +dma pin B01 0 +# pin B01: DMA1 Stream 2 Channel 5 +dma pin A15 0 +# pin A15: DMA1 Stream 5 Channel 3 +dma pin B03 0 +# pin B03: DMA1 Stream 6 Channel 3 +dma pin B06 0 +# pin B06: DMA1 Stream 0 Channel 2 +dma pin B07 0 +# pin B07: DMA1 Stream 3 Channel 2 +dma pin A08 2 +# pin A08: DMA2 Stream 3 Channel 6 +dma pin A01 0 +# pin A01: DMA1 Stream 4 Channel 6 +dma pin A00 0 +# pin A00: DMA1 Stream 2 Channel 6 + +# feature +feature OSD +feature RX_SERIAL +feature LED_STRIP + +# serial +serial 20 1 115200 57600 0 115200 +serial 0 0 115200 57600 0 115200 +serial 1 0 115200 57600 0 115200 +serial 2 0 115200 57600 0 115200 +serial 3 0 115200 57600 0 115200 + +# aux +aux 1 1 1 1300 1700 0 0 + +# master +set baro_bustype = I2C +set baro_i2c_device = 1 +set baro_i2c_address = 0 +set adc_device = 1 +set blackbox_device = SPIFLASH +set dshot_burst = ON +set current_meter = ADC +set battery_meter = ADC +set vbat_scale = 110 +set ibata_scale = 179 +set beeper_inversion = ON +set beeper_od = OFF +set max7456_spi_bus = 2 +set pinio_config = 1,1,1,1 +set pinio_box = 40,41,255,255 +set flash_spi_bus = 3 +set gyro_1_bustype = SPI +set gyro_1_spibus = 1 +set gyro_1_sensor_align = CW0 From bfe22251782627a2174646a594724a8142f63599 Mon Sep 17 00:00:00 2001 From: Eike Ahmels Date: Sun, 31 Dec 2023 17:29:48 +0100 Subject: [PATCH 14/14] add dsp310 baro define (#1226) --- configs/default/DIAT-FURYF4OSD.config | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/default/DIAT-FURYF4OSD.config b/configs/default/DIAT-FURYF4OSD.config index b57bdb1ff..d47b2a269 100644 --- a/configs/default/DIAT-FURYF4OSD.config +++ b/configs/default/DIAT-FURYF4OSD.config @@ -12,6 +12,7 @@ #define USE_GYRO_SPI_ICM42688P #define USE_BARO #define USE_BARO_BMP280 +#define USE_BARO_DSP310 #define USE_FLASH #define USE_FLASH_W25Q128FV #define USE_MAX7456