From 6d67b44a613257e8662c73530888af99844f292c Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 17:19:41 +0800 Subject: [PATCH 01/26] Add file SJET-AOCODARCF405_AIOV1 .config --- .../default/SJET-AOCODARCF405_AIOV1 .config | 118 ++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 configs/default/SJET-AOCODARCF405_AIOV1 .config diff --git a/configs/default/SJET-AOCODARCF405_AIOV1 .config b/configs/default/SJET-AOCODARCF405_AIOV1 .config new file mode 100644 index 000000000..75213beaf --- /dev/null +++ b/configs/default/SJET-AOCODARCF405_AIOV1 .config @@ -0,0 +1,118 @@ +# Betaflight / STM32F405 (S405) 4.4.2 Sep 21 2023 / 15:19:47 (23d066d08) MSP API: 1.45 +#define USE_GYRO +#define USE_GYRO_SPI_MPU6000 +#define USE_GYRO_SPI_ICM42688P +#define USE_ACC +#define USE_ACC_SPI_MPU6000 +#define USE_ACC_SPI_ICM42688P +#define USE_ACCGYRO_BMI270 +#define USE_FLASH_W25Q128FV +#define USE_BARO +#define USE_BARO_DPS310 +#define USE_BARO_BMP280 +#define USE_MAX7456 + +board_name AOCODARCF405_AIOV1 +manufacturer_id SJET + +# resources +resource BEEPER 1 B08 +resource MOTOR 1 C06 +resource MOTOR 2 C07 +resource MOTOR 3 C08 +resource MOTOR 4 C09 +resource LED_STRIP 1 B01 +resource SERIAL_TX 1 A09 +resource SERIAL_TX 2 A02 +resource SERIAL_TX 3 C10 +resource SERIAL_TX 4 A00 +resource SERIAL_TX 5 C12 +resource SERIAL_RX 1 A10 +resource SERIAL_RX 2 A03 +resource SERIAL_RX 3 C11 +resource SERIAL_RX 4 A01 +resource SERIAL_RX 5 D02 +resource I2C_SCL 1 B06 +resource I2C_SDA 1 B07 +resource LED 1 C13 +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 ESCSERIAL 1 C11 +resource ADC_BATT 1 C02 +resource ADC_RSSI 1 C03 +resource ADC_CURR 1 C01 +resource FLASH_CS 1 C00 +resource OSD_CS 1 A13 +resource GYRO_EXTI 1 C04 +resource GYRO_CS 1 A04 +resource USB_DETECT 1 B12 + +# timer +timer A03 AF2 +# pin A03: TIM5 CH4 (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 B01 AF2 +# pin B01: TIM3 CH4 (AF2) + +# dma +dma ADC 1 0 +# ADC 1: DMA2 Stream 0 Channel 0 +dma pin A03 0 +# pin A03: DMA1 Stream 1 Channel 6 +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 B01 0 +# pin B01: DMA1 Stream 2 Channel 5 + +# feature +feature TELEMETRY +feature RX_SERIAL +feature OSD +feature LED_STRIP + +# serial +serial 0 0 115200 57600 0 115200 +serial 1 64 115200 57600 0 115200 + +# 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_burst = ON +set motor_pwm_protocol = DSHOT600 +set current_meter = ADC +set battery_meter = ADC +set ibata_scale = 500 +set beeper_inversion = ON +set beeper_od = OFF +set system_hse_mhz = 8 +set max7456_spi_bus = 2 +set pinio_box = 40,41,255,255 +set flash_spi_bus = 3 +set gyro_1_bustype = SPI +set gyro_1_spibus = 1 +set serialrx_provider = CRSF +set align_board_yaw = 90 +set align_board_pitch= 180 \ No newline at end of file From 03ed8a61207431b50f7789cdff9f5b19d60bfd49 Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 17:30:58 +0800 Subject: [PATCH 02/26] Update and rename SJET-AOCODARCF405_AIOV1 .config to SJET-AOCODARCF405_AIO .config --- ...CODARCF405_AIOV1 .config => SJET-AOCODARCF405_AIO .config} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename configs/default/{SJET-AOCODARCF405_AIOV1 .config => SJET-AOCODARCF405_AIO .config} (93%) diff --git a/configs/default/SJET-AOCODARCF405_AIOV1 .config b/configs/default/SJET-AOCODARCF405_AIO .config similarity index 93% rename from configs/default/SJET-AOCODARCF405_AIOV1 .config rename to configs/default/SJET-AOCODARCF405_AIO .config index 75213beaf..2ec7f6273 100644 --- a/configs/default/SJET-AOCODARCF405_AIOV1 .config +++ b/configs/default/SJET-AOCODARCF405_AIO .config @@ -12,7 +12,7 @@ #define USE_BARO_BMP280 #define USE_MAX7456 -board_name AOCODARCF405_AIOV1 +board_name AOCODARCF405_AIO manufacturer_id SJET # resources @@ -115,4 +115,4 @@ set gyro_1_bustype = SPI set gyro_1_spibus = 1 set serialrx_provider = CRSF set align_board_yaw = 90 -set align_board_pitch= 180 \ No newline at end of file +set align_board_pitch= 180 From 0dab34484f2df220ed83fda8295a8e202d4fbdd6 Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 17:57:05 +0800 Subject: [PATCH 03/26] Update and rename SJET-AOCODARCF405_AIO .config to SJET-AOCODARCF405_AIO.config delete space icon --- ...SJET-AOCODARCF405_AIO .config => SJET-AOCODARCF405_AIO.config} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename configs/default/{SJET-AOCODARCF405_AIO .config => SJET-AOCODARCF405_AIO.config} (100%) diff --git a/configs/default/SJET-AOCODARCF405_AIO .config b/configs/default/SJET-AOCODARCF405_AIO.config similarity index 100% rename from configs/default/SJET-AOCODARCF405_AIO .config rename to configs/default/SJET-AOCODARCF405_AIO.config From 6c01d5bdcba92110f382740a470ac33eb018819f Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 18:00:51 +0800 Subject: [PATCH 04/26] Update SJET-AOCODARCF405_AIO.config add (DOS) line endings --- configs/default/SJET-AOCODARCF405_AIO.config | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/default/SJET-AOCODARCF405_AIO.config b/configs/default/SJET-AOCODARCF405_AIO.config index 2ec7f6273..36908a96f 100644 --- a/configs/default/SJET-AOCODARCF405_AIO.config +++ b/configs/default/SJET-AOCODARCF405_AIO.config @@ -116,3 +116,4 @@ set gyro_1_spibus = 1 set serialrx_provider = CRSF set align_board_yaw = 90 set align_board_pitch= 180 + From acd9182ad4f159e0843bb314a09757605d8f3972 Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 18:04:38 +0800 Subject: [PATCH 05/26] Update SJET-AOCODARCF405_AIO.config --- configs/default/SJET-AOCODARCF405_AIO.config | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/default/SJET-AOCODARCF405_AIO.config b/configs/default/SJET-AOCODARCF405_AIO.config index 36908a96f..2ec7f6273 100644 --- a/configs/default/SJET-AOCODARCF405_AIO.config +++ b/configs/default/SJET-AOCODARCF405_AIO.config @@ -116,4 +116,3 @@ set gyro_1_spibus = 1 set serialrx_provider = CRSF set align_board_yaw = 90 set align_board_pitch= 180 - From b78d383ea334b78b99efba25f7390642f28a899e Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 18:06:42 +0800 Subject: [PATCH 06/26] Update SJET-AOCODARCF405_AIO.config From 44e98d4b171add02dd35dc0af256d14c8ca04ebd Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 18:23:54 +0800 Subject: [PATCH 07/26] Update SJET-AOCODARCF405_AIO.config --- configs/default/SJET-AOCODARCF405_AIO.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/default/SJET-AOCODARCF405_AIO.config b/configs/default/SJET-AOCODARCF405_AIO.config index 2ec7f6273..f18437e74 100644 --- a/configs/default/SJET-AOCODARCF405_AIO.config +++ b/configs/default/SJET-AOCODARCF405_AIO.config @@ -115,4 +115,4 @@ set gyro_1_bustype = SPI set gyro_1_spibus = 1 set serialrx_provider = CRSF set align_board_yaw = 90 -set align_board_pitch= 180 +set align_board_pitch = 180 From 5c424ec72a278a8d8d9770dbd48f164e12c3f590 Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 18:29:57 +0800 Subject: [PATCH 08/26] Update SJET-AOCODARCF405_AIO.config --- configs/default/SJET-AOCODARCF405_AIO.config | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/default/SJET-AOCODARCF405_AIO.config b/configs/default/SJET-AOCODARCF405_AIO.config index f18437e74..f3dde2b45 100644 --- a/configs/default/SJET-AOCODARCF405_AIO.config +++ b/configs/default/SJET-AOCODARCF405_AIO.config @@ -111,8 +111,9 @@ set system_hse_mhz = 8 set max7456_spi_bus = 2 set pinio_box = 40,41,255,255 set flash_spi_bus = 3 +set align_board_yaw = 90 +set align_board_pitch = 180 set gyro_1_bustype = SPI set gyro_1_spibus = 1 set serialrx_provider = CRSF -set align_board_yaw = 90 -set align_board_pitch = 180 + From ff542ede13745dc1b1255e0ba616468f4317683f Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 18:35:19 +0800 Subject: [PATCH 09/26] Update SJET-AOCODARCF405_AIO.config --- configs/default/SJET-AOCODARCF405_AIO.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/default/SJET-AOCODARCF405_AIO.config b/configs/default/SJET-AOCODARCF405_AIO.config index f3dde2b45..23b3ca6ac 100644 --- a/configs/default/SJET-AOCODARCF405_AIO.config +++ b/configs/default/SJET-AOCODARCF405_AIO.config @@ -113,7 +113,7 @@ set pinio_box = 40,41,255,255 set flash_spi_bus = 3 set align_board_yaw = 90 set align_board_pitch = 180 +set gyro_1_align_yaw = 0 set gyro_1_bustype = SPI set gyro_1_spibus = 1 set serialrx_provider = CRSF - From bcf70bb0994230592ecfcacbf58d957e56a51d89 Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 18:39:36 +0800 Subject: [PATCH 10/26] Update SJET-AOCODARCF405_AIO.config --- configs/default/SJET-AOCODARCF405_AIO.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/default/SJET-AOCODARCF405_AIO.config b/configs/default/SJET-AOCODARCF405_AIO.config index 23b3ca6ac..002077e6e 100644 --- a/configs/default/SJET-AOCODARCF405_AIO.config +++ b/configs/default/SJET-AOCODARCF405_AIO.config @@ -113,7 +113,7 @@ set pinio_box = 40,41,255,255 set flash_spi_bus = 3 set align_board_yaw = 90 set align_board_pitch = 180 -set gyro_1_align_yaw = 0 +set gyro_1_align_yaw = CW0 set gyro_1_bustype = SPI set gyro_1_spibus = 1 set serialrx_provider = CRSF From 44c6d75f6f79dfcd9329fc7710c980c05d74d38a Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 18:41:31 +0800 Subject: [PATCH 11/26] Update SJET-AOCODARCF405_AIO.config --- configs/default/SJET-AOCODARCF405_AIO.config | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/default/SJET-AOCODARCF405_AIO.config b/configs/default/SJET-AOCODARCF405_AIO.config index 002077e6e..a4444ed0f 100644 --- a/configs/default/SJET-AOCODARCF405_AIO.config +++ b/configs/default/SJET-AOCODARCF405_AIO.config @@ -117,3 +117,4 @@ set gyro_1_align_yaw = CW0 set gyro_1_bustype = SPI set gyro_1_spibus = 1 set serialrx_provider = CRSF +set ibata_scale = 650 From 856166e3b9cd84058654e3e0dd5dabe03f4048f4 Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 18:44:52 +0800 Subject: [PATCH 12/26] Update SJET-AOCODARCF405_AIO.config --- configs/default/SJET-AOCODARCF405_AIO.config | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/default/SJET-AOCODARCF405_AIO.config b/configs/default/SJET-AOCODARCF405_AIO.config index a4444ed0f..002077e6e 100644 --- a/configs/default/SJET-AOCODARCF405_AIO.config +++ b/configs/default/SJET-AOCODARCF405_AIO.config @@ -117,4 +117,3 @@ set gyro_1_align_yaw = CW0 set gyro_1_bustype = SPI set gyro_1_spibus = 1 set serialrx_provider = CRSF -set ibata_scale = 650 From e1cee27ca8fef993538c566298558daba79da439 Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 18:52:27 +0800 Subject: [PATCH 13/26] Update SJET-AOCODARCF405_AIO.config --- configs/default/SJET-AOCODARCF405_AIO.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/default/SJET-AOCODARCF405_AIO.config b/configs/default/SJET-AOCODARCF405_AIO.config index 002077e6e..1da0f6870 100644 --- a/configs/default/SJET-AOCODARCF405_AIO.config +++ b/configs/default/SJET-AOCODARCF405_AIO.config @@ -102,8 +102,6 @@ set baro_i2c_device = 1 set blackbox_device = SPIFLASH set dshot_burst = ON set motor_pwm_protocol = DSHOT600 -set current_meter = ADC -set battery_meter = ADC set ibata_scale = 500 set beeper_inversion = ON set beeper_od = OFF @@ -117,3 +115,5 @@ set gyro_1_align_yaw = CW0 set gyro_1_bustype = SPI set gyro_1_spibus = 1 set serialrx_provider = CRSF +set battery_meter = ADC +set current_meter = ADC From e1fc09f2501745f4a86c7f8eeaeca3b1097c446f Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 19:00:49 +0800 Subject: [PATCH 14/26] Update SJET-AOCODARCF405_AIO.config --- configs/default/SJET-AOCODARCF405_AIO.config | 24 +------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/configs/default/SJET-AOCODARCF405_AIO.config b/configs/default/SJET-AOCODARCF405_AIO.config index 1da0f6870..1be0eae17 100644 --- a/configs/default/SJET-AOCODARCF405_AIO.config +++ b/configs/default/SJET-AOCODARCF405_AIO.config @@ -94,26 +94,4 @@ feature LED_STRIP serial 0 0 115200 57600 0 115200 serial 1 64 115200 57600 0 115200 -# 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_burst = ON -set motor_pwm_protocol = DSHOT600 -set ibata_scale = 500 -set beeper_inversion = ON -set beeper_od = OFF -set system_hse_mhz = 8 -set max7456_spi_bus = 2 -set pinio_box = 40,41,255,255 -set flash_spi_bus = 3 -set align_board_yaw = 90 -set align_board_pitch = 180 -set gyro_1_align_yaw = CW0 -set gyro_1_bustype = SPI -set gyro_1_spibus = 1 -set serialrx_provider = CRSF -set battery_meter = ADC -set current_meter = ADC + From 00e580d9a2950a211f92cf9ac438426bbfd384e5 Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 19:02:39 +0800 Subject: [PATCH 15/26] Update SJET-AOCODARCF405_AIO.config --- configs/default/SJET-AOCODARCF405_AIO.config | 8 -------- 1 file changed, 8 deletions(-) diff --git a/configs/default/SJET-AOCODARCF405_AIO.config b/configs/default/SJET-AOCODARCF405_AIO.config index 1be0eae17..88f86cb73 100644 --- a/configs/default/SJET-AOCODARCF405_AIO.config +++ b/configs/default/SJET-AOCODARCF405_AIO.config @@ -84,14 +84,6 @@ dma pin C09 0 dma pin B01 0 # pin B01: DMA1 Stream 2 Channel 5 -# feature -feature TELEMETRY -feature RX_SERIAL -feature OSD -feature LED_STRIP -# serial -serial 0 0 115200 57600 0 115200 -serial 1 64 115200 57600 0 115200 From cf574592b7fbe6169598a7011e45af12ee3d0ea3 Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 19:03:53 +0800 Subject: [PATCH 16/26] Update SJET-AOCODARCF405_AIO.config --- configs/default/SJET-AOCODARCF405_AIO.config | 67 -------------------- 1 file changed, 67 deletions(-) diff --git a/configs/default/SJET-AOCODARCF405_AIO.config b/configs/default/SJET-AOCODARCF405_AIO.config index 88f86cb73..a24a6c4d3 100644 --- a/configs/default/SJET-AOCODARCF405_AIO.config +++ b/configs/default/SJET-AOCODARCF405_AIO.config @@ -15,74 +15,7 @@ board_name AOCODARCF405_AIO manufacturer_id SJET -# resources -resource BEEPER 1 B08 -resource MOTOR 1 C06 -resource MOTOR 2 C07 -resource MOTOR 3 C08 -resource MOTOR 4 C09 -resource LED_STRIP 1 B01 -resource SERIAL_TX 1 A09 -resource SERIAL_TX 2 A02 -resource SERIAL_TX 3 C10 -resource SERIAL_TX 4 A00 -resource SERIAL_TX 5 C12 -resource SERIAL_RX 1 A10 -resource SERIAL_RX 2 A03 -resource SERIAL_RX 3 C11 -resource SERIAL_RX 4 A01 -resource SERIAL_RX 5 D02 -resource I2C_SCL 1 B06 -resource I2C_SDA 1 B07 -resource LED 1 C13 -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 ESCSERIAL 1 C11 -resource ADC_BATT 1 C02 -resource ADC_RSSI 1 C03 -resource ADC_CURR 1 C01 -resource FLASH_CS 1 C00 -resource OSD_CS 1 A13 -resource GYRO_EXTI 1 C04 -resource GYRO_CS 1 A04 -resource USB_DETECT 1 B12 -# timer -timer A03 AF2 -# pin A03: TIM5 CH4 (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 B01 AF2 -# pin B01: TIM3 CH4 (AF2) - -# dma -dma ADC 1 0 -# ADC 1: DMA2 Stream 0 Channel 0 -dma pin A03 0 -# pin A03: DMA1 Stream 1 Channel 6 -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 B01 0 -# pin B01: DMA1 Stream 2 Channel 5 From 242e9d21830a43a6e34f1fb97a73a2155cf2aa81 Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 19:05:32 +0800 Subject: [PATCH 17/26] Update SJET-AOCODARCF405_AIO.config --- configs/default/SJET-AOCODARCF405_AIO.config | 6 ------ 1 file changed, 6 deletions(-) diff --git a/configs/default/SJET-AOCODARCF405_AIO.config b/configs/default/SJET-AOCODARCF405_AIO.config index a24a6c4d3..a2b1b4746 100644 --- a/configs/default/SJET-AOCODARCF405_AIO.config +++ b/configs/default/SJET-AOCODARCF405_AIO.config @@ -14,9 +14,3 @@ board_name AOCODARCF405_AIO manufacturer_id SJET - - - - - - From b0904055915cb1e99bb26cf3efb6ebe048727f92 Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 19:06:52 +0800 Subject: [PATCH 18/26] Update SJET-AOCODARCF405_AIO.config --- configs/default/SJET-AOCODARCF405_AIO.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/default/SJET-AOCODARCF405_AIO.config b/configs/default/SJET-AOCODARCF405_AIO.config index a2b1b4746..91aa34a77 100644 --- a/configs/default/SJET-AOCODARCF405_AIO.config +++ b/configs/default/SJET-AOCODARCF405_AIO.config @@ -13,4 +13,4 @@ #define USE_MAX7456 board_name AOCODARCF405_AIO -manufacturer_id SJET + From 6454f44cfb5a6d2836ca12f25785011c36ebb367 Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 19:08:24 +0800 Subject: [PATCH 19/26] Update SJET-AOCODARCF405_AIO.config --- configs/default/SJET-AOCODARCF405_AIO.config | 102 +++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/configs/default/SJET-AOCODARCF405_AIO.config b/configs/default/SJET-AOCODARCF405_AIO.config index 91aa34a77..2ec7f6273 100644 --- a/configs/default/SJET-AOCODARCF405_AIO.config +++ b/configs/default/SJET-AOCODARCF405_AIO.config @@ -13,4 +13,106 @@ #define USE_MAX7456 board_name AOCODARCF405_AIO +manufacturer_id SJET +# resources +resource BEEPER 1 B08 +resource MOTOR 1 C06 +resource MOTOR 2 C07 +resource MOTOR 3 C08 +resource MOTOR 4 C09 +resource LED_STRIP 1 B01 +resource SERIAL_TX 1 A09 +resource SERIAL_TX 2 A02 +resource SERIAL_TX 3 C10 +resource SERIAL_TX 4 A00 +resource SERIAL_TX 5 C12 +resource SERIAL_RX 1 A10 +resource SERIAL_RX 2 A03 +resource SERIAL_RX 3 C11 +resource SERIAL_RX 4 A01 +resource SERIAL_RX 5 D02 +resource I2C_SCL 1 B06 +resource I2C_SDA 1 B07 +resource LED 1 C13 +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 ESCSERIAL 1 C11 +resource ADC_BATT 1 C02 +resource ADC_RSSI 1 C03 +resource ADC_CURR 1 C01 +resource FLASH_CS 1 C00 +resource OSD_CS 1 A13 +resource GYRO_EXTI 1 C04 +resource GYRO_CS 1 A04 +resource USB_DETECT 1 B12 + +# timer +timer A03 AF2 +# pin A03: TIM5 CH4 (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 B01 AF2 +# pin B01: TIM3 CH4 (AF2) + +# dma +dma ADC 1 0 +# ADC 1: DMA2 Stream 0 Channel 0 +dma pin A03 0 +# pin A03: DMA1 Stream 1 Channel 6 +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 B01 0 +# pin B01: DMA1 Stream 2 Channel 5 + +# feature +feature TELEMETRY +feature RX_SERIAL +feature OSD +feature LED_STRIP + +# serial +serial 0 0 115200 57600 0 115200 +serial 1 64 115200 57600 0 115200 + +# 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_burst = ON +set motor_pwm_protocol = DSHOT600 +set current_meter = ADC +set battery_meter = ADC +set ibata_scale = 500 +set beeper_inversion = ON +set beeper_od = OFF +set system_hse_mhz = 8 +set max7456_spi_bus = 2 +set pinio_box = 40,41,255,255 +set flash_spi_bus = 3 +set gyro_1_bustype = SPI +set gyro_1_spibus = 1 +set serialrx_provider = CRSF +set align_board_yaw = 90 +set align_board_pitch= 180 From 9fdbe609d72896fa63dffb17fed3854563464fe3 Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 19:10:17 +0800 Subject: [PATCH 20/26] Update SJET-AOCODARCF405_AIO.config --- configs/default/SJET-AOCODARCF405_AIO.config | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/default/SJET-AOCODARCF405_AIO.config b/configs/default/SJET-AOCODARCF405_AIO.config index 2ec7f6273..68092b78f 100644 --- a/configs/default/SJET-AOCODARCF405_AIO.config +++ b/configs/default/SJET-AOCODARCF405_AIO.config @@ -1,4 +1,5 @@ # Betaflight / STM32F405 (S405) 4.4.2 Sep 21 2023 / 15:19:47 (23d066d08) MSP API: 1.45 + #define USE_GYRO #define USE_GYRO_SPI_MPU6000 #define USE_GYRO_SPI_ICM42688P From ceca8e56368903487ac710f9b96c4f52416b443e Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 19:23:15 +0800 Subject: [PATCH 21/26] Update SJET-AOCODARCF405_AIO.config --- configs/default/SJET-AOCODARCF405_AIO.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/default/SJET-AOCODARCF405_AIO.config b/configs/default/SJET-AOCODARCF405_AIO.config index 68092b78f..69ca3cef1 100644 --- a/configs/default/SJET-AOCODARCF405_AIO.config +++ b/configs/default/SJET-AOCODARCF405_AIO.config @@ -114,6 +114,8 @@ 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 set serialrx_provider = CRSF set align_board_yaw = 90 set align_board_pitch= 180 +set pinio_config = 1,1,1,1 From 90bf5888426c3ed895747bb76afb7ea4cebcdac2 Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 19:24:40 +0800 Subject: [PATCH 22/26] Update SJET-AOCODARCF405_AIO.config --- configs/default/SJET-AOCODARCF405_AIO.config | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/default/SJET-AOCODARCF405_AIO.config b/configs/default/SJET-AOCODARCF405_AIO.config index 69ca3cef1..08f485b78 100644 --- a/configs/default/SJET-AOCODARCF405_AIO.config +++ b/configs/default/SJET-AOCODARCF405_AIO.config @@ -92,7 +92,6 @@ feature OSD feature LED_STRIP # serial -serial 0 0 115200 57600 0 115200 serial 1 64 115200 57600 0 115200 # master From 834c313fc90b6eb46253ba02a86d43efc1fb8ada Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 19:29:10 +0800 Subject: [PATCH 23/26] Update SJET-AOCODARCF405_AIO.config --- configs/default/SJET-AOCODARCF405_AIO.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/default/SJET-AOCODARCF405_AIO.config b/configs/default/SJET-AOCODARCF405_AIO.config index 08f485b78..14c750111 100644 --- a/configs/default/SJET-AOCODARCF405_AIO.config +++ b/configs/default/SJET-AOCODARCF405_AIO.config @@ -109,6 +109,7 @@ set beeper_inversion = ON set beeper_od = OFF set system_hse_mhz = 8 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 @@ -117,4 +118,3 @@ set gyro_1_sensor_align = CW0 set serialrx_provider = CRSF set align_board_yaw = 90 set align_board_pitch= 180 -set pinio_config = 1,1,1,1 From 9fd4a9769ef69f88f0f86808c231809c4085cc68 Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 19:38:14 +0800 Subject: [PATCH 24/26] Update SJET-AOCODARCF405_AIO.config --- configs/default/SJET-AOCODARCF405_AIO.config | 45 ++++++++++++-------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/configs/default/SJET-AOCODARCF405_AIO.config b/configs/default/SJET-AOCODARCF405_AIO.config index 14c750111..5b6d9b7e7 100644 --- a/configs/default/SJET-AOCODARCF405_AIO.config +++ b/configs/default/SJET-AOCODARCF405_AIO.config @@ -1,19 +1,17 @@ -# Betaflight / STM32F405 (S405) 4.4.2 Sep 21 2023 / 15:19:47 (23d066d08) MSP API: 1.45 +# Betaflight / STM32F405 (S405) 4.2.11 Nov 9 2021 / 20:27:49 (948ba6339) MSP API: 1.43 #define USE_GYRO -#define USE_GYRO_SPI_MPU6000 -#define USE_GYRO_SPI_ICM42688P +#define USE_GYRO_SPI_MPU6500 #define USE_ACC -#define USE_ACC_SPI_MPU6000 -#define USE_ACC_SPI_ICM42688P -#define USE_ACCGYRO_BMI270 -#define USE_FLASH_W25Q128FV +#define USE_ACC_SPI_MPU6500 #define USE_BARO -#define USE_BARO_DPS310 #define USE_BARO_BMP280 +#define USE_BARO_DPS310 +#define USE_FLASH +#define USE_FLASH_W25Q128FV #define USE_MAX7456 -board_name AOCODARCF405_AIO +board_name AOCODAF405_AIO manufacturer_id SJET # resources @@ -22,6 +20,11 @@ resource MOTOR 1 C06 resource MOTOR 2 C07 resource MOTOR 3 C08 resource MOTOR 4 C09 +resource MOTOR 5 A15 +resource MOTOR 6 A08 +resource MOTOR 7 B10 +resource MOTOR 8 B11 +resource PPM 1 A03 resource LED_STRIP 1 B01 resource SERIAL_TX 1 A09 resource SERIAL_TX 2 A02 @@ -66,6 +69,14 @@ timer C08 AF3 # pin C08: TIM8 CH3 (AF3) timer C09 AF3 # pin C09: TIM8 CH4 (AF3) +timer A15 AF1 +# pin A15: TIM2 CH1 (AF1) +timer A08 AF1 +# pin A08: TIM1 CH1 (AF1) +timer B10 AF1 +# pin B10: TIM2 CH3 (AF1) +timer B11 AF1 +# pin B11: TIM2 CH4 (AF1) timer B01 AF2 # pin B01: TIM3 CH4 (AF2) @@ -82,6 +93,14 @@ dma pin C08 1 # pin C08: DMA2 Stream 4 Channel 7 dma pin C09 0 # pin C09: DMA2 Stream 7 Channel 7 +dma pin A15 0 +# pin A15: DMA1 Stream 5 Channel 3 +dma pin A08 1 +# pin A08: DMA2 Stream 1 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 B01 0 # pin B01: DMA1 Stream 2 Channel 5 @@ -89,7 +108,6 @@ dma pin B01 0 feature TELEMETRY feature RX_SERIAL feature OSD -feature LED_STRIP # serial serial 1 64 115200 57600 0 115200 @@ -101,7 +119,6 @@ set baro_bustype = I2C set baro_i2c_device = 1 set blackbox_device = SPIFLASH set dshot_burst = ON -set motor_pwm_protocol = DSHOT600 set current_meter = ADC set battery_meter = ADC set ibata_scale = 500 @@ -109,12 +126,6 @@ set beeper_inversion = ON set beeper_od = OFF set system_hse_mhz = 8 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 -set serialrx_provider = CRSF -set align_board_yaw = 90 -set align_board_pitch= 180 From d7239b50ef37d89a3e1c332d5a6bf28c7a6a4406 Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 19:39:48 +0800 Subject: [PATCH 25/26] Update SJET-AOCODARCF405_AIO.config --- configs/default/SJET-AOCODARCF405_AIO.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/default/SJET-AOCODARCF405_AIO.config b/configs/default/SJET-AOCODARCF405_AIO.config index 5b6d9b7e7..8ade2fae6 100644 --- a/configs/default/SJET-AOCODARCF405_AIO.config +++ b/configs/default/SJET-AOCODARCF405_AIO.config @@ -11,7 +11,7 @@ #define USE_FLASH_W25Q128FV #define USE_MAX7456 -board_name AOCODAF405_AIO +board_name AOCODARCF405_AIO manufacturer_id SJET # resources From 2d931466ee7920f9847605df48beffe6173606e8 Mon Sep 17 00:00:00 2001 From: aocodarc <105714332+aocodarc@users.noreply.github.com> Date: Thu, 21 Sep 2023 19:42:35 +0800 Subject: [PATCH 26/26] Update SJET-AOCODARCF405_AIO.config --- configs/default/SJET-AOCODARCF405_AIO.config | 43 +++++++------------- 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/configs/default/SJET-AOCODARCF405_AIO.config b/configs/default/SJET-AOCODARCF405_AIO.config index 8ade2fae6..2ec7f6273 100644 --- a/configs/default/SJET-AOCODARCF405_AIO.config +++ b/configs/default/SJET-AOCODARCF405_AIO.config @@ -1,14 +1,15 @@ -# Betaflight / STM32F405 (S405) 4.2.11 Nov 9 2021 / 20:27:49 (948ba6339) MSP API: 1.43 - +# Betaflight / STM32F405 (S405) 4.4.2 Sep 21 2023 / 15:19:47 (23d066d08) MSP API: 1.45 #define USE_GYRO -#define USE_GYRO_SPI_MPU6500 +#define USE_GYRO_SPI_MPU6000 +#define USE_GYRO_SPI_ICM42688P #define USE_ACC -#define USE_ACC_SPI_MPU6500 +#define USE_ACC_SPI_MPU6000 +#define USE_ACC_SPI_ICM42688P +#define USE_ACCGYRO_BMI270 +#define USE_FLASH_W25Q128FV #define USE_BARO -#define USE_BARO_BMP280 #define USE_BARO_DPS310 -#define USE_FLASH -#define USE_FLASH_W25Q128FV +#define USE_BARO_BMP280 #define USE_MAX7456 board_name AOCODARCF405_AIO @@ -20,11 +21,6 @@ resource MOTOR 1 C06 resource MOTOR 2 C07 resource MOTOR 3 C08 resource MOTOR 4 C09 -resource MOTOR 5 A15 -resource MOTOR 6 A08 -resource MOTOR 7 B10 -resource MOTOR 8 B11 -resource PPM 1 A03 resource LED_STRIP 1 B01 resource SERIAL_TX 1 A09 resource SERIAL_TX 2 A02 @@ -69,14 +65,6 @@ timer C08 AF3 # pin C08: TIM8 CH3 (AF3) timer C09 AF3 # pin C09: TIM8 CH4 (AF3) -timer A15 AF1 -# pin A15: TIM2 CH1 (AF1) -timer A08 AF1 -# pin A08: TIM1 CH1 (AF1) -timer B10 AF1 -# pin B10: TIM2 CH3 (AF1) -timer B11 AF1 -# pin B11: TIM2 CH4 (AF1) timer B01 AF2 # pin B01: TIM3 CH4 (AF2) @@ -93,14 +81,6 @@ dma pin C08 1 # pin C08: DMA2 Stream 4 Channel 7 dma pin C09 0 # pin C09: DMA2 Stream 7 Channel 7 -dma pin A15 0 -# pin A15: DMA1 Stream 5 Channel 3 -dma pin A08 1 -# pin A08: DMA2 Stream 1 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 B01 0 # pin B01: DMA1 Stream 2 Channel 5 @@ -108,8 +88,10 @@ dma pin B01 0 feature TELEMETRY feature RX_SERIAL feature OSD +feature LED_STRIP # serial +serial 0 0 115200 57600 0 115200 serial 1 64 115200 57600 0 115200 # master @@ -119,6 +101,7 @@ set baro_bustype = I2C set baro_i2c_device = 1 set blackbox_device = SPIFLASH set dshot_burst = ON +set motor_pwm_protocol = DSHOT600 set current_meter = ADC set battery_meter = ADC set ibata_scale = 500 @@ -126,6 +109,10 @@ set beeper_inversion = ON set beeper_od = OFF set system_hse_mhz = 8 set max7456_spi_bus = 2 +set pinio_box = 40,41,255,255 set flash_spi_bus = 3 set gyro_1_bustype = SPI set gyro_1_spibus = 1 +set serialrx_provider = CRSF +set align_board_yaw = 90 +set align_board_pitch= 180