Merge branch 'betaflight:master' into patch-2

.github/pull_request_template.md

@@ -1,3 +1,9 @@
+> [!IMPORTANT]
+>
+> Unified-Targets are being sunsetted in favor of Target Configuration (config.h) files.  Please see https://betaflight.com/docs/development/manufacturer/creating-configuration for creating targets in the https://github.com/betaflight/config repository.
+>
+> NO new unified targets will be accepted, please ensure you are only updating an existing target with your PR
+
 ## Important considerations when opening a pull request:
 
 1. For all pull requests that add or update a Unified Target configuration, please read and follow [these instructions](https://github.com/betaflight/betaflight/blob/master/docs/TargetMaintenance/CreatingAUnifiedTarget.md).

Manufacturers.md

@@ -33,6 +33,7 @@ This is the official list of manufacturer ids (`manufacturer_id` in the target c
 |DRRC|DroidRC|https://github.com/xiaoxiabub|
 |DYST|DongYang Smart Technology Co.,Ltd (dys)|http://www.dys.hk/|
 |EACH|eachine|https://www.eachine.com/|
+|EASP|Ewing Aerospace|[https://ewingaerospace.com/|
 |EXUA|EXUAV FPV|https://github.com/Linjieqiang|
 |FFPV|Furious FPV|https://furiousfpv.com/|
 |FFRC|FlyFishRC|https://www.flyfish-rc.com/|

README.md

@@ -1,16 +1,19 @@
 # Betaflight Target Configuration Repository
 
+> [!IMPORTANT]
+>
+> Unified-Targets are being sunsetted in favor of Target Configuration (config.h) files.  Please see https://betaflight.com/docs/development/manufacturer/creating-configuration for creating targets in the https://github.com/betaflight/config repository.
 
 ## ATTENTION
 
-Instructions have been updated as Betaflight requires certification as we are migrating to a new build API.
+Please see the [Manufacturer Guildlines](https://betaflight.com/docs/development/manufacturer/manufacturer-design-guidelines) for hardware certification.
 
-Manufacturers can contact us on Discord to be part of our certification program.
+Manufacturers can contact us on [Discord](https://discord.betaflight.com/) to be part of our certification program.
 
 
 ## Manufacturer Design Guidelines
 
-Read the [hardware specification](https://betaflight.com/docs/manufacturer/manufacturer-design-guidelines).
+Read the [hardware specification](https://betaflight.com/docs/development/manufacturer/manufacturer-design-guidelines).
 
 
 ## Build API
@@ -28,4 +31,4 @@ Betaflight will include a certified flag as new hardware specification requireme
 
 ## Instructions
 
-Please follow [these instructions](https://betaflight.com/docs/manufacturer/creating-an-unified-target) to create and publish a Target configuration.
+Please follow [these instructions](https://betaflight.com/docs/development/manufacturer/creating-an-unified-target) to create and publish a Target configuration.

configs/default/BEFH-BETAFPVG473.config

@@ -45,7 +45,6 @@ resource SPI_MOSI 2 B15
 resource SPI_MOSI 3 B05
 resource ADC_BATT 1 A00
 resource ADC_CURR 1 A01
-resource BARO_CS 1 C06
 resource FLASH_CS 1 B09
 resource OSD_CS 1 B12
 resource GYRO_EXTI 1 C04
@@ -64,18 +63,30 @@ timer C13 AF6
 # pin C13: TIM8 CH4N (AF6)
 
 # dma
-dma SPI_MOSI 1 7
-# SPI_MOSI 1: DMA1 Channel 8 Request 11
-dma SPI_MOSI 2 8
-# SPI_MOSI 2: DMA2 Channel 1 Request 13
+dma SPI_MOSI 1 14
+# SPI_MOSI 1: DMA2 Channel 7 Request 11
+dma SPI_MOSI 2 10
+# SPI_MOSI 2: DMA2 Channel 3 Request 13
 dma SPI_MOSI 3 9
 # SPI_MOSI 3: DMA2 Channel 2 Request 15
-dma SPI_MISO 1 10
-# SPI_MISO 1: DMA2 Channel 3 Request 10
+dma SPI_MISO 1 13
+# SPI_MISO 1: DMA2 Channel 6 Request 10
 dma SPI_MISO 2 11
 # SPI_MISO 2: DMA2 Channel 4 Request 12
-dma SPI_MISO 3 12
-# SPI_MISO 3: DMA2 Channel 5 Request 14
+dma SPI_MISO 3 8
+# SPI_MISO 3: DMA2 Channel 1 Request 14
+dma SPI_TX 1 14
+# SPI_TX 1: DMA2 Channel 7 Request 11
+dma SPI_TX 2 10
+# SPI_TX 2: DMA2 Channel 3 Request 13
+dma SPI_TX 3 9
+# SPI_TX 3: DMA2 Channel 2 Request 15
+dma SPI_RX 1 13
+# SPI_RX 1: DMA2 Channel 6 Request 10
+dma SPI_RX 2 11
+# SPI_RX 2: DMA2 Channel 4 Request 12
+dma SPI_RX 3 8
+# SPI_RX 3: DMA2 Channel 1 Request 14
 dma ADC 1 6
 # ADC 1: DMA1 Channel 7 Request 5
 dma pin B02 1
@@ -96,16 +107,18 @@ feature OSD
 feature AIRMODE
 
 # serial
-serial 1 64 115200 57600 0 115200
+serial 1 2048 115200 57600 0 115200
+serial 2 64 115200 57600 0 115200
 
 # master
 set baro_bustype = I2C
 set baro_i2c_device = 1
 set serialrx_provider = CRSF
 set blackbox_device = SPIFLASH
+set ibata_scale = 750
 set dshot_idle_value = 450
 set dshot_burst = OFF
-set dshot_bitbang = OFF
+set dshot_bitbang = AUTO
 set current_meter = ADC
 set battery_meter = ADC
 set beeper_inversion = ON

configs/default/FLWO-FLYWOOF722PROV2.config

@@ -139,6 +139,7 @@ set battery_meter = ADC
 set ibata_scale = 170
 set beeper_inversion = ON
 set beeper_od = OFF
+set pid_process_denom = 4
 set osd_vbat_pos = 14570
 set osd_current_pos = 14721
 set osd_canvas_width = 30

configs/default/FLWO-FLYWOOF745.config

@@ -16,11 +16,11 @@ manufacturer_id FLWO
 
 # resources
 resource BEEPER 1 D15
-resource MOTOR 1 B01
-resource MOTOR 2 C09
-resource MOTOR 3 B00
+resource MOTOR 1 B00
+resource MOTOR 2 B01
+resource MOTOR 3 E09
 resource MOTOR 4 E11
-resource MOTOR 5 E09
+resource MOTOR 5 C09
 resource MOTOR 6 A03
 resource MOTOR 7 B04
 resource MOTOR 8 B05

configs/default/FLWO-FLYWOOF745HEX.config

@@ -0,0 +1,138 @@
+# Betaflight / STM32F745 (S745) 4.2.0 Jun 14 2020 / 03:05:04 (8f2d21460) MSP API: 1.43
+
+#define USE_ACC
+#define USE_ACC_SPI_MPU6000
+#define USE_GYRO
+#define USE_GYRO_SPI_MPU6000
+#define USE_BARO
+#define USE_BARO_BMP280
+#define USE_BARO_DPS310
+#define USE_FLASH
+#define USE_FLASH_W25Q128FV
+#define USE_MAX7456
+
+board_name FLYWOOF745HEX
+manufacturer_id FLWO
+
+# resources
+resource BEEPER 1 D15
+resource MOTOR 1 B01
+resource MOTOR 2 C09
+resource MOTOR 3 B00
+resource MOTOR 4 E11
+resource MOTOR 5 E09
+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 I2C_SCL 1 B06
+resource I2C_SDA 1 B07
+resource LED 1 A02
+resource SPI_SCK 1 A05
+resource SPI_SCK 2 B13
+resource SPI_SCK 4 E02
+resource SPI_MISO 1 A06
+resource SPI_MISO 2 B14
+resource SPI_MISO 4 E05
+resource SPI_MOSI 1 A07
+resource SPI_MOSI 2 B15
+resource SPI_MOSI 4 E06
+resource ADC_BATT 1 C03
+resource ADC_RSSI 1 C05
+resource ADC_CURR 1 C02
+resource PINIO 1 C00
+resource FLASH_CS 1 A04
+resource OSD_CS 1 B12
+resource GYRO_EXTI 1 E01
+resource GYRO_CS 1 E04
+resource USB_DETECT 1 A08
+
+# timer
+timer E13 AF1
+# pin E13: TIM1 CH3 (AF1)
+timer B00 AF2
+# pin B00: TIM3 CH3 (AF2)
+timer B01 AF2
+# pin B01: TIM3 CH4 (AF2)
+timer E09 AF1
+# pin E09: TIM1 CH1 (AF1)
+timer E11 AF1
+# pin E11: TIM1 CH2 (AF1)
+timer C09 AF3
+# pin C09: TIM8 CH4 (AF3)
+timer A03 AF2
+# pin A03: TIM5 CH4 (AF2)
+timer B03 AF1
+# pin B03: TIM2 CH2 (AF1)
+timer B04 AF2
+# pin B04: TIM3 CH1 (AF2)
+timer B05 AF2
+# pin B05: TIM3 CH2 (AF2)
+timer D12 AF2
+# pin D12: TIM4 CH1 (AF2)
+
+# dma
+dma ADC 1 1
+# ADC 1: DMA2 Stream 4 Channel 0
+dma pin E13 1
+# pin E13: DMA2 Stream 6 Channel 6
+dma pin B00 0
+# pin B00: DMA1 Stream 7 Channel 5
+dma pin B01 0
+# pin B01: DMA1 Stream 2 Channel 5
+dma pin E09 2
+# pin E09: DMA2 Stream 3 Channel 6
+dma pin E11 1
+# pin E11: DMA2 Stream 2 Channel 6
+dma pin C09 0
+# pin C09: DMA2 Stream 7 Channel 7
+dma pin A03 0
+# pin A03: DMA1 Stream 1 Channel 6
+dma pin B03 0
+# pin B03: DMA1 Stream 6 Channel 3
+dma pin B04 0
+# pin B04: DMA1 Stream 4 Channel 5
+dma pin B05 0
+# pin B05: DMA1 Stream 5 Channel 5
+dma pin D12 0
+# pin D12: DMA1 Stream 0 Channel 2
+
+# feature
+feature RX_SERIAL
+feature LED_STRIP
+feature OSD
+
+# master
+set mag_bustype = I2C
+set mag_i2c_device = 1
+set baro_bustype = I2C
+set baro_i2c_device = 1
+set blackbox_device = SPIFLASH
+set dshot_bitbang = OFF
+set current_meter = ADC
+set ibata_scale = 175
+set battery_meter = ADC
+set beeper_inversion = ON
+set beeper_od = OFF
+set max7456_spi_bus = 2
+set dashboard_i2c_bus = 1
+set flash_spi_bus = 1
+set gyro_1_bustype = SPI
+set gyro_1_spibus = 4
+set gyro_1_sensor_align = CW270
+set gyro_2_spibus = 4

configs/default/FPVM-FPVM_BETAFLIGHTF7.config

@@ -7,6 +7,8 @@
 #define USE_GYRO_SPI_MPU6500
 #define USE_ACC_SPI_MPU6500
 #define USE_MAX7456
+#define USE_FLASH
+#define USE_FLASH_W25Q128FV
 
 board_name FPVM_BETAFLIGHTF7
 manufacturer_id FPVM

configs/default/GEPR-GEPRCF411.config

@@ -9,8 +9,6 @@
 #define USE_GYRO_SPI_ICM42688P
 #define USE_ACC_SPI_ICM42688P
 #define USE_ACCGYRO_BMI270
-#define USE_FLASH
-#define USE_FLASH_W25Q128FV
 #define USE_MAX7456
 
 board_name GEPRCF411