Skip to content

Commit

Permalink
Merge branch 'betaflight:master' into aocodarc-f7miniv2
Browse files Browse the repository at this point in the history
  • Loading branch information
aocodarc authored Sep 7, 2023
2 parents 7cf2925 + fc31359 commit eb508b8
Show file tree
Hide file tree
Showing 51 changed files with 2,311 additions and 38 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
/configs/default/RUSH-* @DusKing1 @betaflight/unified-target-administrators
/configs/default/SJET-* @aocodarc @betaflight/unified-target-administrators
/configs/default/SKST-* @hongzhou-zeng @betaflight/unified-target-administrators
/configs/default/SLGD-* @GEME-Cyi @betaflight/unified-target-administrators
/configs/default/SNMT-* @hongzhou-zeng @betaflight/unified-target-administrators
/configs/default/SPBE-* @SEA729 @betaflight/unified-target-administrators
/configs/default/SPCM-* @Linjieqiang @betaflight/unified-target-administrators
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
deploy:
name: Deploy
name: Update Build API
runs-on: ubuntu-latest

steps:
Expand Down
4 changes: 3 additions & 1 deletion Manufacturers.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ This is the official list of manufacturer ids (`manufacturer_id` in the target c
|GEPR|GEPRC|https://geprc.com/|
|GFPV|GE-FPV|http://www.ge-fpv.com/|
|HAMO|Happymodel|http://www.happymodel.cn/|
|HARC|HAKRC|https://github.com/loopur|
|HARC|HAKRC|https://www.hakrc.com/|
|HBRO|Holybro|http://www.holybro.com/index.html|
|HEBI|Shenzhen High Energy Bili Co., Ltd.|http://www.coddar.net/|
|HENA|Heli-Nation|https://www.heli-nation.com/|
Expand All @@ -62,6 +62,7 @@ This is the official list of manufacturer ids (`manufacturer_id` in the target c
|MOQU|Modd Quad|https://www.moddquad.com/|
|MTKS|Matek Systems|http://www.mateksys.com/|
|MZGC|Manaz GCS|https://www.shop-mzgcs.de/|
|NAMO|Namimno Silan Electronic Technology Co.Ltd|http://namimnorc.com/]
|NEBD|NewBeeDrone|https://newbeedrone.com/|
|NERC|NeutronRC|https://www.facebook.com/Neutronrc-575638996448880|
|NGUA|NG.UAVP|https://ng.uavp.ch/Shop|
Expand All @@ -73,6 +74,7 @@ This is the official list of manufacturer ids (`manufacturer_id` in the target c
|SJET|Shenzhen Jiufang Electronic Technology Co., Ltd.|https://www.jiufang-tech.com/|
|SKST|Shenzhen SKYSTARS Tech Co., LIMITED|http://www.skystars-rc.com/index.html|
|SKZO|SkyZone|http://www.skyzonehobbies.com/|
|SLGD|Sologood RC|https://www.sologood.net/|
|SNMT|Shenzhen NewMumu Technolagy Co.Ltd.|http://nvisionfpv.com/|
|SPBE|LangTian Technology (Shenzhen) Co. (SpeedyBee)|https://www.speedybee.com/|
|SPCM|Guangzhou shi parker electronic technology Co., Ltd|https://www.spcmaker.com/|
Expand Down
2 changes: 2 additions & 0 deletions configs/default/AIRB-AIRBOTF7.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#define USE_ACC
#define USE_ACC_SPI_MPU6500
#define USE_ACC_SPI_MPU6000
#define USE_FLASH
#define USE_FLASH_W25Q128FV
#define USE_GYRO
#define USE_GYRO_SPI_MPU6500
#define USE_GYRO_SPI_MPU6000
Expand Down
117 changes: 117 additions & 0 deletions configs/default/AIRB-AIRBOTG4AIO.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
# Betaflight / STM32G47X (SG47) 4.5.0 Jun 4 2023 / 14:46:36 (5e4d8efc5) MSP API: 1.46

#define USE_ACC
#define USE_ACC_SPI_ICM42688P
#define USE_BARO
#define USE_BARO_DPS310
#define USE_GYRO
#define USE_GYRO_SPI_ICM42688P
#define USE_FLASH
#define USE_FLASH_W25Q128FV
#define USE_MAX7456

# config: YES

board_name AIRBOTG4AIO
manufacturer_id AIRB

#resource
resource BEEPER 1 B07
resource MOTOR 1 A00
resource MOTOR 2 A01
resource MOTOR 3 A02
resource MOTOR 4 A03
resource LED_STRIP 1 B06
resource SERIAL_TX 1 A09
resource SERIAL_TX 2 B03
resource SERIAL_TX 4 C10
resource SERIAL_TX 11 B11
resource SERIAL_RX 1 A10
resource SERIAL_RX 2 B04
resource SERIAL_RX 3 B09
resource SERIAL_RX 4 C11
resource SERIAL_RX 11 B10
resource I2C_SCL 1 A13
resource I2C_SDA 1 A14
resource LED 1 B05
resource LED 2 C15
resource SPI_SCK 1 A05
resource SPI_SCK 2 B13
resource SPI_SDI 1 A06
resource SPI_SDI 2 B14
resource SPI_SDO 1 A07
resource SPI_SDO 2 B15
resource CAMERA_CONTROL 1 A15
resource ADC_BATT 1 B02
resource ADC_CURR 1 B01
resource FLASH_CS 1 C06
resource OSD_CS 1 A08
resource GYRO_EXTI 1 C04
resource GYRO_CS 1 B00

# timer
timer B06 AF5
# pin B06: TIM8 CH1 (AF5)
timer A00 AF1
# pin A00: TIM2 CH1 (AF1)
timer A01 AF1
# pin A01: TIM2 CH2 (AF1)
timer A02 AF2
# pin A02: TIM5 CH3 (AF2)
timer A03 AF2
# pin A03: TIM5 CH4 (AF2)

# dma
dma SPI_SDO 1 7
# SPI_SDO 1: DMA1 Channel 8 Request 11
dma SPI_SDO 2 9
# SPI_SDO 2: DMA2 Channel 2 Request 13
dma SPI_SDI 1 6
# SPI_SDI 1: DMA1 Channel 7 Request 10
dma SPI_SDI 2 8
# SPI_SDI 2: DMA2 Channel 1 Request 12
dma SPI_TX 1 7
# SPI_TX 1: DMA1 Channel 8 Request 11
dma SPI_TX 2 9
# SPI_TX 2: DMA2 Channel 2 Request 13
dma SPI_RX 1 6
# SPI_RX 1: DMA1 Channel 7 Request 10
dma SPI_RX 2 8
# SPI_RX 2: DMA2 Channel 1 Request 12
dma ADC 1 10
# ADC 1: DMA2 Channel 3 Request 5
dma ADC 2 11
# ADC 2: DMA2 Channel 4 Request 36
dma pin B06 12
# pin B06: DMA2 Channel 5 Request 49
dma pin A00 1
# pin A00: DMA1 Channel 2 Request 56
dma pin A01 2
# pin A01: DMA1 Channel 3 Request 57
dma pin A02 3
# pin A02: DMA1 Channel 4 Request 74
dma pin A03 4
# pin A03: DMA1 Channel 5 Request 75

# feature
feature OSD
feature ESC_SENSOR

# serial
serial 2 1024 115200 57600 0 115200

# master
set baro_bustype = I2C
set baro_i2c_device = 1
set blackbox_device = SPIFLASH
set dshot_burst = ON
set current_meter = ADC
set battery_meter = ADC
set beeper_inversion = ON
set beeper_od = OFF
set pid_process_denom = 2
set max7456_spi_bus = 2
set flash_spi_bus = 2
set gyro_1_spibus = 1
set gyro_1_sensor_align = CW0FLIP
set gyro_1_align_pitch = 1800
104 changes: 104 additions & 0 deletions configs/default/AXFL-ARGUSF7AIO.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
# Betaflight / STM32F7X2 (S7X2) 4.2.11 Nov 9 2021 / 20:29:32 (948ba6339) MSP API: 1.43

#define USE_ACC
#define USE_ACC_SPI_ICM42688P
#define USE_GYRO
#define USE_GYRO_SPI_ICM42688P
#define USE_ACCGYRO_BMI270
#define USE_BARO
#define USE_BARO_DPS310
#define USE_FLASH
#define USE_FLASH_W25Q128FV
#define USE_MAX7456

board_name ARGUSF7AIO
manufacturer_id AXFL

# resources
resource BEEPER 1 C13
resource MOTOR 1 B04
resource MOTOR 2 B05
resource MOTOR 3 B00
resource MOTOR 4 B01
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_CURR 1 C01
resource FLASH_CS 1 D02
resource OSD_CS 1 B12
resource GYRO_EXTI 1 C04
resource GYRO_CS 1 B02

# timer
timer A08 AF1
# pin A08: TIM1 CH1 (AF1)
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)

# dma
dma ADC 1 1
# ADC 1: DMA2 Stream 4 Channel 0
dma pin A08 0
# pin A08: DMA2 Stream 6 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

# feature
feature LED_STRIP
feature ESC_SENSOR
feature OSD

# led
led 0 6,7::CY:2

# serial
serial 5 1024 115200 57600 0 115200

# master
set baro_bustype = I2C
set baro_i2c_device = 1
set blackbox_device = SPIFLASH
set dshot_burst = ON
set current_meter = ADC
set battery_meter = ADC
set ibata_scale = 179
set beeper_inversion = ON
set beeper_od = OFF
set max7456_spi_bus = 2
set flash_spi_bus = 3
set gyro_1_spibus = 1
set gyro_1_bustype = SPI
4 changes: 4 additions & 0 deletions configs/default/BEFH-BETAFPVF405.config
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
#define USE_GYRO_SPI_ICM42688P
#define USE_ACC_SPI_ICM42688P
#define USE_ACCGYRO_BMI270
#define USE_BARO
#define USE_BARO_SPI_BMP280
#define USE_FLASH
#define USE_FLASH_W25Q128FV
#define USE_MAX7456

board_name BETAFPVF405
Expand Down
3 changes: 3 additions & 0 deletions configs/default/DAFP-DARWINF411.config
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,11 @@ serial 0 64 115200 57600 0 115200
serial 30 2048 115200 57600 0 115200

# master
set mag_bustype = I2C
set mag_i2c_device = 1
set baro_bustype = I2C
set baro_i2c_device = 1
set i2c1_clockspeed_khz = 400
set serialrx_provider = CRSF
set blackbox_device = SDCARD
set dshot_burst = AUTO
Expand Down
13 changes: 9 additions & 4 deletions configs/default/DAKE-DAKEFPVF405.config
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
# Betaflight / STM32F405 (S405) 4.3.1 Jul 13 2022 / 03:32:11 (8d4f005) MSP API: 1.44

#define USE_GYRO
#define USE_GYRO_SPI_MPU6000
#define USE_GYRO_SPI_MPU6500
#define USE_GYRO_SPI_ICM42688P
#define USE_ACC
#define USE_ACC_SPI_MPU6000
#define USE_ACC_SPI_MPU6500
#define USE_ACC_SPI_ICM42688P
#define USE_ACCGYRO_BMI270
#define USE_BARO
#define USE_BARO_SPI_BMP280
#define USE_BARO_SPI_DPS310
#define USE_FLASH
#define USE_FLASH_M25P16
#define USE_MAX7456
Expand Down Expand Up @@ -37,8 +42,8 @@ resource SERIAL_RX 5 D02
resource SERIAL_RX 6 C07
resource I2C_SCL 1 B08
resource I2C_SDA 1 B09
resource LED 1 C15
resource LED 2 C14
resource LED 1 C14
resource LED 2 C15
resource SPI_SCK 1 A05
resource SPI_SCK 2 B13
resource SPI_SCK 3 C10
Expand Down Expand Up @@ -129,5 +134,5 @@ set pinio_box = 40,255,255,255
set flash_spi_bus = 3
set gyro_1_bustype = SPI
set gyro_1_spibus = 1
set gyro_1_sensor_align = CW270
set gyro_1_align_yaw = 2700
set gyro_1_sensor_align = CW90
set gyro_1_align_yaw = 900
Loading

0 comments on commit eb508b8

Please sign in to comment.