Merge branch 'master' into aocodarc-f405aio

.github/workflows/deploy.yaml

@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - id: files
-      uses: tj-actions/changed-files@v34
+      uses: tj-actions/changed-files@v41
       with:
         files: |
           configs/default/**

Manufacturers.md

@@ -18,19 +18,23 @@ This is the official list of manufacturer ids (`manufacturer_id` in the target c
 |AXFL|Axisflying|https://www.axisflying.com/|
 |BEFH|BETAFPV Hobby|https://betafpv.com/|
 |BKMN|Jason Blackman|https://github.com/blckmn|
+|BSTF|BEASTFPV|http://www.beastfpv.com/|
 |CLRA|CLRACING LLC|https://cl-racing.myshopify.com/|
 |CYCL|CycloneRC|http://www.cyclone-rc.com|
 |DAFP|DarwinFPV|https://darwinfpv.com/|
 |DALR|DALRC TECHNOLOGY CO,.LIMITED|http://www.dalrc.cn/DALRC/|
 |DERC|DemonRC|https://demonrc.eu/|
 |DFRA|Drone FPV Racer|https://www.drone-fpv-racer.com/|
+|DFRC|Shenzhen Jingfei Technology Co., LTD|https://dreamflyrc.com/|
 |DIAT|Diatone Innovations|https://www.diatoneusa.com/|
 |DRCL|dronercland|https://www.instagram.com/dronercland/|
+|DREA|DREAMRC|https://github.com/Dreamworks-fpv|
 |DRRC|DroidRC|https://github.com/xiaoxiabub|
 |DYST|DongYang Smart Technology Co.,Ltd (dys)|http://www.dys.hk/|
 |EACH|eachine|https://www.eachine.com/|
 |EXUA|EXUAV FPV|https://github.com/Linjieqiang|
 |FFPV|Furious FPV|https://furiousfpv.com/|
+|FFRC|FlyFishRC|https://www.flyfish-rc.com/|
 |FLCO|Shenzhen Flycolor Electronic Co., LTD|http://www.flycolor.net/|
 |FLLF|Flying Lemon FPV|https://github.com/flyinglemonfpv|
 |FLMO|FlyMod|https://flymod.net/|
@@ -52,11 +56,12 @@ This is the official list of manufacturer ids (`manufacturer_id` in the target c
 |HNEC|Huizhou NIDICI Electronic Co., LTD|https://shop.nidici.com/|
 |HOWI|Hobbywing Technology CO., LTD.|http://hobbywing.com/|
 |IFRC|iFlight Innovation Technology Ltd.|https://www.iflight-rc.com/|
-|JHEF|JHE\_FPV|https://github.com/atgfpeyv|
+|JHEF|JHE\_FPV|https://www.jhemcu.com/|
 |KLEE|Kevin Lee (WhitenoiseFPV)|https://whitenoisefpv.com/|
 |LDAR|LDARC|http://ldarc.com/|
 |LMNR|Lumenier|https://www.lumenier.com/|
 |MARC|Mayhem RC|https://mayhemrc.com.au/|
+|MEPS|MepsKing|https://www.mepsking.com/|
 |MERA|MerakRC|http://www.merakrc.com/|
 |MOLA|MotoLab|https://github.com/MotoLab|
 |MOQU|Modd Quad|https://www.moddquad.com/|
@@ -66,6 +71,7 @@ This is the official list of manufacturer ids (`manufacturer_id` in the target c
 |NEBD|NewBeeDrone|https://newbeedrone.com/|
 |NERC|NeutronRC|https://www.facebook.com/Neutronrc-575638996448880|
 |NGUA|NG.UAVP|https://ng.uavp.ch/Shop|
+|ODTY|OddityRC|http://www.oddityrc.com|
 |OPEN|OpenPilot|https://librepilot.atlassian.net/wiki/spaces/LPDOC/pages/31588369/Supported+Hardware|
 |PYDR|Pyro-Drone|https://pyrodrone.com/|
 |RAST|Racerstar|https://www.racerstar.com/|

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

configs/default/JHEF-JHEF405.config → configs/default/BSTF-BEASTFPVF722.config

@@ -1,39 +1,52 @@
-# Betaflight / STM32F405 (S405) 4.2.0 Nov 22 2020 / 18:38:23 (afdac08b3) MSP API: 1.43
+# Betaflight / STM32F7X2 (S7X2) 4.3.2 Nov 28 2022 / 07:30:19 (60c9521) MSP API: 1.44
 
-board_name JHEF405
-manufacturer_id JHEF
+#mcu STM32F7X2
 
-#define USE_GYRO
-#define USE_GYRO_SPI_MPU6000
 #define USE_ACC
 #define USE_ACC_SPI_MPU6000
-#define USE_ACCGYRO_BMI270
+#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_FLASH_W25Q128FV
+#define USE_GYRO
+#define USE_GYRO_SPI_MPU6000
+#define USE_GYRO_SPI_ICM42688P
 #define USE_MAX7456
 
+board_name BEASTFPVF722
+manufacturer_id BSTF
+
 # resources
-resource BEEPER 1 B04
-resource MOTOR 1 B00
-resource MOTOR 2 B01
-resource MOTOR 3 C09
-resource MOTOR 4 C08
-resource MOTOR 5 B06
-resource PPM 1 B08
-resource PWM 1 B08
-resource LED_STRIP 1 B06
-resource SERIAL_TX 1 A09
+resource BEEPER 1 C13
+resource MOTOR 1 C08
+resource MOTOR 2 C09
+resource MOTOR 3 A08
+resource MOTOR 4 A09
+resource MOTOR 5 B00
+resource MOTOR 6 B01
+resource MOTOR 7 A10
+resource MOTOR 8 B04
+resource LED_STRIP 1 B03
+resource SERIAL_TX 1 B06
 resource SERIAL_TX 2 A02
 resource SERIAL_TX 3 B10
+resource SERIAL_TX 4 A00
+resource SERIAL_TX 5 C12
 resource SERIAL_TX 6 C06
-resource SERIAL_RX 1 A10
+resource SERIAL_RX 1 B07
 resource SERIAL_RX 2 A03
 resource SERIAL_RX 3 B11
+resource SERIAL_RX 4 A01
+resource SERIAL_RX 5 D02
 resource SERIAL_RX 6 C07
-resource INVERTER 2 C13
-resource LED 1 B05
+
+resource I2C_SCL 1 B08
+resource I2C_SDA 1 B09
+
+resource LED 1 C15
+
 resource SPI_SCK 1 A05
 resource SPI_SCK 2 B13
 resource SPI_SCK 3 C10
@@ -42,87 +55,88 @@ 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 ESCSERIAL 1 B08
-resource ADC_BATT 1 C02
-resource ADC_CURR 1 C01
+resource SPI_MOSI 3 B05
+
+resource ADC_BATT 1 C01
+resource ADC_CURR 1 C03
+
+resource PINIO 1 C02
+resource PINIO 2 C14
+
 resource FLASH_CS 1 A15
 resource OSD_CS 1 B12
 resource GYRO_EXTI 1 C04
 resource GYRO_CS 1 A04
-resource USB_DETECT 1 C05
-resource PULLDOWN 1 B08
 
 # timer
-timer B08 AF3
-# pin B08: TIM10 CH1 (AF3)
-timer B00 AF2
-# pin B00: TIM3 CH3 (AF2)
-timer B01 AF2
-# pin B01: TIM3 CH4 (AF2)
-timer C09 AF3
-# pin C09: TIM8 CH4 (AF3)
 timer C08 AF3
 # pin C08: TIM8 CH3 (AF3)
-timer B06 AF2
-# pin B06: TIM4 CH1 (AF2)
+timer C09 AF3
+# pin C09: TIM8 CH4 (AF3)
+timer A08 AF1
+# pin A08: TIM1 CH1 (AF1)
 timer A09 AF1
 # pin A09: TIM1 CH2 (AF1)
+timer B00 AF2
+# pin B00: TIM3 CH3 (AF2)
+timer B01 AF2
+# pin B01: TIM3 CH4 (AF2)
 timer A10 AF1
 # pin A10: TIM1 CH3 (AF1)
-timer A02 AF2
-# pin A02: TIM5 CH3 (AF2)
-timer A03 AF3
-# pin A03: TIM9 CH2 (AF3)
-timer B10 AF1
-# pin B10: TIM2 CH3 (AF1)
-timer B11 AF1
-# pin B11: TIM2 CH4 (AF1)
+timer B04 AF2
+# pin B04: TIM3 CH1 (AF2)
+timer B03 AF1
+# pin B03: TIM2 CH2 (AF1)
 
 # dma
-dma ADC 1 1
-# ADC 1: DMA2 Stream 4 Channel 0
-dma pin B00 0
-# pin B00: DMA1 Stream 7 Channel 5
-dma pin B01 0
-# pin B01: DMA1 Stream 2 Channel 5
-dma pin C09 0
-# pin C09: DMA2 Stream 7 Channel 7
+dma ADC 3 0
+# ADC 3: DMA2 Stream 0 Channel 2
 dma pin C08 0
 # pin C08: DMA2 Stream 2 Channel 0
-dma pin B06 0
-# pin B06: DMA1 Stream 0 Channel 2
+dma pin C09 0
+# pin C09: DMA2 Stream 7 Channel 7
+dma pin A08 0
+# pin A08: DMA2 Stream 6 Channel 0
 dma pin A09 0
 # pin A09: DMA2 Stream 6 Channel 0
+dma pin B00 0
+# pin B00: DMA1 Stream 7 Channel 5
+dma pin B01 0
+# pin B01: DMA1 Stream 2 Channel 5
 dma pin A10 0
 # pin A10: DMA2 Stream 6 Channel 0
-dma pin A02 0
-# pin A02: DMA1 Stream 0 Channel 6
-dma pin B10 0
-# pin B10: DMA1 Stream 1 Channel 3
-dma pin B11 0
-# pin B11: DMA1 Stream 7 Channel 3
+dma pin B04 0
+# pin B04: DMA1 Stream 4 Channel 5
+dma pin B03 0
+# pin B03: DMA1 Stream 6 Channel 3
 
 # feature
 feature RX_SERIAL
+feature TELEMETRY
 feature OSD
 
+# serial
+serial 1 64 115200 57600 0 115200
+
 # master
 set mag_bustype = I2C
-set mag_i2c_device = 2
+set mag_i2c_device = 1
 set baro_bustype = I2C
-set baro_i2c_device = 2
+set baro_i2c_device = 1
+set serialrx_provider = CRSF
+set adc_device = 3
 set blackbox_device = SPIFLASH
+set dshot_burst = ON
 set current_meter = ADC
 set battery_meter = ADC
+set ibata_scale = 250
 set beeper_inversion = ON
 set beeper_od = OFF
-set osd_vbat_pos = 14570
-set osd_crosshairs_pos = 14541
-set system_hse_mhz = 8
 set max7456_spi_bus = 2
-set dashboard_i2c_bus = 2
+set pinio_config = 129,129,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 = CW90
+set gyro_1_align_yaw = 900

configs/default/CLNE-FREEAXISF4.config

@@ -0,0 +1,125 @@
+# Betaflight / STM32F411 (S411) 4.1.0 Jun 25 2019 / 10:27:57 (2a6e94d03) MSP API: 1.42
+
+#mcu STM32F411
+
+#define USE_GYRO
+#define USE_ACC
+#define USE_ACCGYRO_BMI270
+#define USE_BARO
+#define USE_BARO_BMP280
+#define USE_FLASH
+#define USE_FLASH_W25N01G
+#define USE_MAX7456
+
+board_name FREEAXISF4
+manufacturer_id CLNE
+
+# resources
+resource BEEPER 1 B02
+resource MOTOR 1 B04
+resource MOTOR 2 B05
+resource MOTOR 3 B06
+resource MOTOR 4 B07
+resource MOTOR 5 B03
+resource MOTOR 6 B10
+resource PPM 1 A03
+resource LED_STRIP 1 A08
+resource SERIAL_TX 1 A09
+resource SERIAL_TX 2 A02
+resource SERIAL_RX 1 A10
+resource SERIAL_RX 2 A03
+resource SERIAL_TX 12 A00
+resource SERIAL_RX 12 A00
+resource I2C_SCL 1 B08
+resource I2C_SDA 1 B09
+resource LED 1 C13
+resource LED 2 C14
+resource SPI_SCK 1 A05
+resource SPI_SCK 2 B13
+resource SPI_MISO 1 A06
+resource SPI_MISO 2 B14
+resource SPI_MOSI 1 A07
+resource SPI_MOSI 2 B15
+resource ADC_BATT 1 B00
+resource ADC_CURR 1 B01
+resource FLASH_CS 1 A15
+resource OSD_CS 1 B12
+resource GYRO_EXTI 1 A01
+resource GYRO_EXTI 2 NONE
+resource GYRO_CS 1 A04
+resource USB_DETECT 1 C15
+
+# timer list
+timer A03 AF3
+# pin A03: TIM9 CH2 (AF3)
+timer B04 AF2
+# pin B04: TIM3 CH1 (AF2)
+timer B05 AF2
+# pin B05: TIM3 CH2 (AF2)
+timer B06 AF2
+# pin B06: TIM4 CH1 (AF2)
+timer B07 AF2
+# pin B07: TIM4 CH2 (AF2)
+timer B03 AF1
+# pin B03: TIM2 CH2 (AF1)
+timer B10 AF1
+# pin B10: TIM2 CH3 (AF1)
+timer A00 AF2
+# pin A00: TIM5 CH1 (AF2)
+timer A02 AF2
+# pin A02: TIM5 CH3 (AF2)
+timer A08 AF1
+# pin A08: TIM1 CH1 (AF1)
+
+# 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 B06 0
+# pin B06: DMA1 Stream 0 Channel 2
+dma pin B07 0
+# pin B07: DMA1 Stream 3 Channel 2
+dma pin B03 0
+# pin B03: DMA1 Stream 6 Channel 3
+dma pin B10 0
+# pin B10: DMA1 Stream 1 Channel 3
+dma pin A00 0
+# pin A00: DMA1 Stream 2 Channel 6
+dma pin A02 0
+# pin A02: DMA1 Stream 0 Channel 6
+dma pin A08 0
+# pin A08: DMA2 Stream 6 Channel 0
+
+# feature
+feature RX_SERIAL
+feature SOFTSERIAL
+feature TELEMETRY
+feature OSD
+feature AIRMODE
+
+# master
+set dshot_burst = OFF
+set dshot_bitbang = OFF
+set mag_bustype = I2C
+set mag_i2c_device = 1
+set mag_hardware = NONE
+set baro_bustype = I2C
+set baro_i2c_device = 1
+set baro_hardware = NONE
+set current_meter = ADC
+set battery_meter = ADC
+set vbat_detect_cell_voltage = 300
+set beeper_inversion = ON
+set beeper_od = OFF
+set system_hse_mhz = 8
+set flash_spi_bus = 2
+set blackbox_device = SPIFLASH
+set max7456_spi_bus = 2
+set gyro_1_bustype = SPI
+set gyro_1_spibus = 1
+set gyro_1_i2cBus = 0
+set gyro_1_i2c_address = 0
+set gyro_1_sensor_align = CW180