Skip to content

Commit

Permalink
Merge branch 'betaflight:master' into patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
HGLRC-T authored Aug 22, 2023
2 parents 67a2841 + e7a6aa1 commit d207c42
Show file tree
Hide file tree
Showing 15 changed files with 803 additions and 5 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
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
2 changes: 2 additions & 0 deletions configs/default/DAKE-DAKEFPVF722.config
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ timer B01 AF2
# pin B01: TIM3 CH4 (AF2)
timer B03 AF1
# pin B03: TIM2 CH2 (AF1)
timer B04 AF2
# pin B04: TIM3 CH1 (AF2)
timer B06 AF2
# pin B06: TIM4 CH1 (AF2)
timer B07 AF2
Expand Down
133 changes: 133 additions & 0 deletions configs/default/FLMO-STELLARF7.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
# Betaflight / STM32F7X2 (S7X2) 4.4.2 Aug 14 2023 / 20:54:15 (23d066d08) MSP API: 1.45

#define USE_GYRO
#define USE_GYRO_SPI_MPU6000
#define USE_ACC
#define USE_ACC_SPI_MPU6000
#define USE_ACC_SPI_ICM20602
#define USE_GYRO_SPI_ICM20602
#define USE_ACCGYRO_BMI270
#define USE_BARO
#define USE_BARO_BMP280
#define USE_FLASH
#define USE_FLASH_M25P16
#define USE_MAX7456

board_name STELLARF7
manufacturer_id FLMO

# resources
resource MOTOR 1 C06
resource MOTOR 2 C07
resource MOTOR 3 C08
resource MOTOR 4 C09
resource PWM 1 B10
resource PWM 2 B11
resource PPM 1 B07
resource SERIAL_TX 1 B06
resource SERIAL_RX 1 B07
resource SERIAL_TX 2 A02
resource SERIAL_RX 2 A03
resource SERIAL_TX 3 C10
resource SERIAL_RX 3 C11
resource SERIAL_TX 4 A00
resource SERIAL_RX 4 A01
resource SERIAL_TX 5 C12
resource SERIAL_RX 5 D02
resource I2C_SCL 1 B08
resource I2C_SDA 1 B09
resource LED 1 B02
resource SPI_SCK 1 A05
resource SPI_SCK 2 B13
resource SPI_SCK 3 B03
resource SPI_MISO 1 A06
resource SPI_MISO 2 B14
resource SPI_MISO 3 B04
resource SPI_MOSI 1 A07
resource SPI_MOSI 2 B15
resource SPI_MOSI 3 B05
resource ADC_BATT 1 C01
resource ADC_CURR 1 C00
resource PINIO 1 C14
resource PINIO 2 A15
resource PINIO 3 C15
resource FLASH_CS 1 C13
resource OSD_CS 1 B12s
resource GYRO_EXTI 1 C04
resource GYRO_CS 1 A04
resource USB_DETECT 1 A09
resource BEEPER 1 C03

# timer
timer B07 AF2
# pin B07: TIM4 CH2 (AF2)
timer C06 AF3
# pin C06: TIM8 CH1 (AF3)
timer C07 AF3
# pin C07: TIM8 CH2 (AF3)
timer C08 AF3
# pin C08: TIM8 CH3 (AF3)
timer C09 AF3
# pin C09: TIM8 CH4 (AF3)
timer B10 AF1
# pin B10: TIM2 CH3 (AF1)
timer B11 AF1
# pin B11: TIM2 CH4 (AF1)

# dma
dma ADC 1 1
# ADC 1: DMA2 Stream 4 Channel 0
dma pin C06 1
# pin C06: DMA2 Stream 2 Channel 7
dma pin C07 1
# pin C07: DMA2 Stream 3 Channel 7
dma pin C08 1
# pin C08: DMA2 Stream 4 Channel 7
dma pin C09 0
# pin C09: DMA2 Stream 7 Channel 7
dma pin B10 0
# pin B10: DMA1 Stream 1 Channel 3
dma pin B11 0
# pin B11: DMA1 Stream 7 Channel 3

# feature
feature OSD
feature RX_SERIAL
feature TELEMETRY

# serial
serial 0 64 115200 57600 0 115200
serial 1 1 115200 57600 0 115200
serial 2 2048 115200 57600 0 115200
serial 4 2 115200 57600 0 115200

# beacon
beacon RX_LOST
beacon RX_SET

# master
set serialrx_provider = CRSF
set mag_bustype = I2C
set mag_i2c_device = 1
set baro_bustype = I2C
set baro_i2c_device = 1
set adc_device = 1
set blackbox_device = SPIFLASH
set dshot_burst = ON
set motor_pwm_protocol = DSHOT300
set current_meter = ADC
set battery_meter = ADC
set vbat_scale = 111
set ibata_scale = 182
set beeper_inversion = ON
set beeper_od = OFF
set osd_displayport_device = MAX7456
set max7456_spi_bus = 2
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_pitch = 1800
set pinio_config = 1,1,1,1
set pinio_box = 40,41,42,255
set small_angle = 180
4 changes: 2 additions & 2 deletions configs/default/GEPR-GEPRCF405.config
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ aux 0 0 0 1700 2100 0 0
set mag_bustype = I2C
set mag_i2c_device = 1
set baro_bustype = I2C
set baro_i2c_device = 2
set baro_i2c_device = 1
set serialrx_provider = SBUS
set blackbox_device = SPIFLASH
set motor_pwm_protocol = DSHOT600
Expand All @@ -143,5 +143,5 @@ set max7456_spi_bus = 1
set flash_spi_bus = 2
set gyro_1_bustype = SPI
set gyro_1_spibus = 3
set gyro_1_sensor_align = CW270
set gyro_1_sensor_align = CW180
set gyro_1_align_yaw = 2700
2 changes: 1 addition & 1 deletion configs/default/GEPR-GEPRCF722.config
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ aux 1 41 3 1800 2100 0 0

# master
set mag_bustype = I2C
set mag_i2c_device = 2
set mag_i2c_device = 1
set baro_bustype = I2C
set baro_i2c_device = 1
set serialrx_provider = SBUS
Expand Down
119 changes: 119 additions & 0 deletions configs/default/HAMO-CRAZYBEEF405.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
# Betaflight / STM32F405 (S405) 4.2.0 Dec 3 2019 / 01:50:56 (054bd66bc4) MSP API: 1.43

#define USE_ACC
#define USE_ACC_SPI_MPU6000
#define USE_ACCGYRO_BMI270
#define USE_BARO
#define USE_BARO_BMP280
#define USE_FLASH
#define USE_FLASH_W25Q128FV
#define USE_GYRO
#define USE_GYRO_SPI_MPU6000
#define USE_MAX7456

board_name CRAZYBEEF405
manufacturer_id HAMO

# resources
resource BEEPER 1 B04
resource MOTOR 1 B00
resource MOTOR 2 B01
resource MOTOR 3 C09
resource MOTOR 4 C08
resource PPM 1 B08
resource PWM 1 B08
resource LED_STRIP 1 B06
resource SERIAL_TX 1 A09
resource SERIAL_TX 2 A02
resource SERIAL_TX 6 C06
resource SERIAL_RX 1 A10
resource SERIAL_RX 2 A03
resource SERIAL_RX 6 C07
resource INVERTER 2 C13
resource I2C_SCL 2 B10
resource I2C_SDA 2 B11
resource LED 1 B05
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 ESCSERIAL 1 B08
resource ADC_BATT 1 C02
resource ADC_CURR 1 C01
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
# this enables non-inverted serial receivers on the SUMD/DSM2 pin
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 A09 AF1
# pin A09: TIM1 CH2 (AF1)
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)

# 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 pin C08 0
# pin C08: DMA2 Stream 2 Channel 0
dma pin A09 0
# pin A09: DMA2 Stream 6 Channel 0
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

# feature
feature OSD

# master
set mag_bustype = I2C
set mag_i2c_device = 2
set baro_bustype = I2C
set baro_i2c_device = 2
set blackbox_device = SPIFLASH
set beeper_inversion = ON
set beeper_od = OFF
set system_hse_mhz = 8
set max7456_spi_bus = 2
set flash_spi_bus = 3
set gyro_1_bustype = SPI
set gyro_1_spibus = 1
set gyro_1_sensor_align = CW180
set gyro_1_align_yaw = 1800
Loading

0 comments on commit d207c42

Please sign in to comment.