From 3ad578ded8c9e74a861843f54f073b80aee439cd Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Tue, 10 Sep 2024 12:28:26 +0200 Subject: [PATCH 1/7] Add FLYWOOH743PRO --- configs/FLYWOOH743PRO/config.h | 148 +++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) create mode 100644 configs/FLYWOOH743PRO/config.h diff --git a/configs/FLYWOOH743PRO/config.h b/configs/FLYWOOH743PRO/config.h new file mode 100644 index 00000000..2f915d28 --- /dev/null +++ b/configs/FLYWOOH743PRO/config.h @@ -0,0 +1,148 @@ +/* + * This file is part of Betaflight. + * + * Betaflight is free software. You can redistribute this software + * and/or modify this software under the terms of the GNU General + * Public License as published by the Free Software Foundation, + * either version 3 of the License, or (at your option) any later + * version. + * + * Betaflight is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this software. + * + * If not, see . + */ + +#pragma once + +#define FC_TARGET_MCU STM32H743 + +#define BOARD_NAME FLYWOOH743PRO +#define MANUFACTURER_ID FLWO + +#define USE_ACC +#define USE_ACC_SPI_ICM42688P +#define USE_GYRO +#define USE_GYRO_SPI_ICM42688P +#define USE_BARO +#define USE_BARO_BMP280 +#define USE_BARO_DPS310 +#define USE_MAX7456 +#define USE_SDCARD +#define USE_MAG +#define USE_GPS +#define USE_LED_STRIP + +#define BEEPER_PIN PA15 +#define MOTOR1_PIN PB0 +#define MOTOR2_PIN PB1 +#define MOTOR3_PIN PA0 +#define MOTOR4_PIN PA1 +#define MOTOR5_PIN PA2 +#define MOTOR6_PIN PA3 +#define MOTOR7_PIN PD12 +#define MOTOR8_PIN PD13 +#define SERVO1_PIN PE5 +#define SERVO2_PIN PE6 +#define RX_PPM_PIN PC7 +#define LED_STRIP_PIN PA8 +#define UART1_TX_PIN PA9 +#define UART2_TX_PIN PD5 +#define UART3_TX_PIN PD8 +#define UART4_TX_PIN PB9 +#define UART6_TX_PIN PC6 +#define UART7_TX_PIN PE8 +#define UART8_TX_PIN PE1 +#define UART1_RX_PIN PA10 +#define UART2_RX_PIN PD6 +#define UART3_RX_PIN PD9 +#define UART4_RX_PIN PB8 +#define UART6_RX_PIN PC7 +#define UART7_RX_PIN PE7 +#define UART8_RX_PIN PE0 +#define I2C1_SCL_PIN PB6 +#define I2C2_SCL_PIN PB10 +#define I2C1_SDA_PIN PB7 +#define I2C2_SDA_PIN PB11 +#define LED0_PIN PE3 +#define LED1_PIN PE4 +#define SPI1_SCK_PIN PA5 +#define SPI2_SCK_PIN PB13 +#define SPI3_SCK_PIN PB3 +#define SPI4_SCK_PIN PE12 +#define SPI1_SDI_PIN PA6 +#define SPI2_SDI_PIN PB14 +#define SPI3_SDI_PIN PB4 +#define SPI4_SDI_PIN PE13 +#define SPI1_SDO_PIN PD7 +#define SPI2_SDO_PIN PB15 +#define SPI3_SDO_PIN PB5 +#define SPI4_SDO_PIN PE14 +#define ADC_VBAT_PIN PC0 +#define ADC_RSSI_PIN PC5 +#define ADC_CURR_PIN PC1 +#define SDIO_CK_PIN PC12 +#define SDIO_CMD_PIN PD2 +#define SDIO_D0_PIN PC8 +#define SDIO_D1_PIN PC9 +#define SDIO_D2_PIN PC10 +#define SDIO_D3_PIN PC11 +#define PINIO1_PIN PD10 //9V BEC +#define PINIO2_PIN PD11 //CAM1,2 +#define MAX7456_SPI_CS_PIN PB12 +#define GYRO_1_EXTI_PIN PB2 +#define GYRO_2_EXTI_PIN PE15 +#define GYRO_1_CS_PIN PC15 +#define GYRO_2_CS_PIN PE11 + +#define TIMER_PIN_MAPPING \ + TIMER_PIN_MAP( 0, PB0 , 2, 0) \ + TIMER_PIN_MAP( 1, PB1 , 2, 1) \ + TIMER_PIN_MAP( 2, PA0 , 2, 2) \ + TIMER_PIN_MAP( 3, PA1 , 2, 3) \ + TIMER_PIN_MAP( 4, PA2 , 2, 4) \ + TIMER_PIN_MAP( 5, PA3 , 2, 5) \ + TIMER_PIN_MAP( 6, PD12, 1, 6) \ + TIMER_PIN_MAP( 7, PD13, 1, 7) \ + TIMER_PIN_MAP( 8, PD14, 1, 12) \ + TIMER_PIN_MAP( 9, PD15, 1, -1) \ + TIMER_PIN_MAP(10, PE5 , 1, 0) \ + TIMER_PIN_MAP(11, PE6 , 1, -1) \ + TIMER_PIN_MAP(12, PA8 , 1, 14) + +#define ADC1_DMA_OPT 8 +#define ADC3_DMA_OPT 9 +#define TIMUP1_DMA_OPT 0 +#define TIMUP2_DMA_OPT 0 +#define TIMUP3_DMA_OPT 2 +#define TIMUP4_DMA_OPT 1 +#define TIMUP5_DMA_OPT 0 +#define TIMUP8_DMA_OPT 0 + +#define BARO_I2C_INSTANCE (I2CDEV_2) +#define MAG_I2C_INSTANCE (I2CDEV_1) +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH +#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD +#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC +#define DEFAULT_VOLTAGE_METER_SCALE_DEFAULT 110 +#define DEFAULT_CURRENT_METER_SCALE 250 +#define BEEPER_INVERTED +#define SDCARD_DETECT_PIN NONE +#define SDIO_DEVICE SDIODEV_1 +#define SDIO_USE_4BIT 1 +#define MAX7456_SPI_INSTANCE SPI2 +#define PINIO1_BOX 40 +#define PINIO2_BOX 41 +#define GYRO_1_SPI_INSTANCE SPI1 +#define GYRO_1_ALIGN CW270_DEG +#define GYRO_1_ALIGN_YAW 2700 +#define GYRO_2_SPI_INSTANCE SPI4 +#define GYRO_2_ALIGN CW270_DEG +#define GYRO_2_ALIGN_YAW 2700 From 3d4842b9174b83f54f6d82d6ccaeff5ee34f2dd6 Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Tue, 10 Sep 2024 12:30:30 +0200 Subject: [PATCH 2/7] Remove user defines --- configs/FLYWOOH743PRO/config.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/configs/FLYWOOH743PRO/config.h b/configs/FLYWOOH743PRO/config.h index 2f915d28..0a350a1d 100644 --- a/configs/FLYWOOH743PRO/config.h +++ b/configs/FLYWOOH743PRO/config.h @@ -35,9 +35,6 @@ #define USE_BARO_DPS310 #define USE_MAX7456 #define USE_SDCARD -#define USE_MAG -#define USE_GPS -#define USE_LED_STRIP #define BEEPER_PIN PA15 #define MOTOR1_PIN PB0 From 03eeb505f0c7825eff8da5991c9a493f8b5ff280 Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Tue, 10 Sep 2024 12:40:50 +0200 Subject: [PATCH 3/7] Update timer pin mapping --- configs/FLYWOOH743PRO/config.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/configs/FLYWOOH743PRO/config.h b/configs/FLYWOOH743PRO/config.h index 0a350a1d..c67b290c 100644 --- a/configs/FLYWOOH743PRO/config.h +++ b/configs/FLYWOOH743PRO/config.h @@ -99,19 +99,19 @@ #define GYRO_2_CS_PIN PE11 #define TIMER_PIN_MAPPING \ - TIMER_PIN_MAP( 0, PB0 , 2, 0) \ - TIMER_PIN_MAP( 1, PB1 , 2, 1) \ - TIMER_PIN_MAP( 2, PA0 , 2, 2) \ - TIMER_PIN_MAP( 3, PA1 , 2, 3) \ - TIMER_PIN_MAP( 4, PA2 , 2, 4) \ - TIMER_PIN_MAP( 5, PA3 , 2, 5) \ - TIMER_PIN_MAP( 6, PD12, 1, 6) \ - TIMER_PIN_MAP( 7, PD13, 1, 7) \ + TIMER_PIN_MAP( 0, MOTOR1_PIN, 2, 0) \ + TIMER_PIN_MAP( 1, MOTOR2_PIN, 2, 1) \ + TIMER_PIN_MAP( 2, MOTOR3_PIN, 2, 2) \ + TIMER_PIN_MAP( 3, MOTOR4_PIN, 2, 3) \ + TIMER_PIN_MAP( 4, MOTOR5_PIN, 2, 4) \ + TIMER_PIN_MAP( 5, MOTOR6_PIN, 2, 5) \ + TIMER_PIN_MAP( 6, MOTOR7_PIN, 1, 6) \ + TIMER_PIN_MAP( 7, MOTOR8_PIN, 1, 7) \ TIMER_PIN_MAP( 8, PD14, 1, 12) \ TIMER_PIN_MAP( 9, PD15, 1, -1) \ - TIMER_PIN_MAP(10, PE5 , 1, 0) \ - TIMER_PIN_MAP(11, PE6 , 1, -1) \ - TIMER_PIN_MAP(12, PA8 , 1, 14) + TIMER_PIN_MAP(10, SERVO1_PIN, 1, 0) \ + TIMER_PIN_MAP(11, SERVO2_PIN, 1, -1) \ + TIMER_PIN_MAP(12, LED_STRIP_PIN, 1, 14) #define ADC1_DMA_OPT 8 #define ADC3_DMA_OPT 9 From 330de0dece9f361b20052450f824b4855565bc7f Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Tue, 10 Sep 2024 12:45:28 +0200 Subject: [PATCH 4/7] Add box_user_x_names --- configs/FLYWOOH743PRO/config.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/FLYWOOH743PRO/config.h b/configs/FLYWOOH743PRO/config.h index c67b290c..650a7891 100644 --- a/configs/FLYWOOH743PRO/config.h +++ b/configs/FLYWOOH743PRO/config.h @@ -137,6 +137,8 @@ #define MAX7456_SPI_INSTANCE SPI2 #define PINIO1_BOX 40 #define PINIO2_BOX 41 +#define BOX_USER_1_NAME "9V BEC" +#define BOX_USER_2_NAME "CAM 1,2" #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW270_DEG #define GYRO_1_ALIGN_YAW 2700 From ee531974622726035459443ca29b4f4f95162987 Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Tue, 10 Sep 2024 16:27:54 +0200 Subject: [PATCH 5/7] Add motor 9 and 10 --- configs/FLYWOOH743PRO/config.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/configs/FLYWOOH743PRO/config.h b/configs/FLYWOOH743PRO/config.h index 650a7891..c83f76fe 100644 --- a/configs/FLYWOOH743PRO/config.h +++ b/configs/FLYWOOH743PRO/config.h @@ -45,6 +45,8 @@ #define MOTOR6_PIN PA3 #define MOTOR7_PIN PD12 #define MOTOR8_PIN PD13 +#define MOTOR9_PIN PD14 +#define MOTOR10_PIN PD15 #define SERVO1_PIN PE5 #define SERVO2_PIN PE6 #define RX_PPM_PIN PC7 @@ -107,8 +109,8 @@ TIMER_PIN_MAP( 5, MOTOR6_PIN, 2, 5) \ TIMER_PIN_MAP( 6, MOTOR7_PIN, 1, 6) \ TIMER_PIN_MAP( 7, MOTOR8_PIN, 1, 7) \ - TIMER_PIN_MAP( 8, PD14, 1, 12) \ - TIMER_PIN_MAP( 9, PD15, 1, -1) \ + TIMER_PIN_MAP( 8, MOTOR9_PIN, 1, 12) \ + TIMER_PIN_MAP( 9, MOTOR10_PIN, 1, -1) \ TIMER_PIN_MAP(10, SERVO1_PIN, 1, 0) \ TIMER_PIN_MAP(11, SERVO2_PIN, 1, -1) \ TIMER_PIN_MAP(12, LED_STRIP_PIN, 1, 14) @@ -137,8 +139,8 @@ #define MAX7456_SPI_INSTANCE SPI2 #define PINIO1_BOX 40 #define PINIO2_BOX 41 -#define BOX_USER_1_NAME "9V BEC" -#define BOX_USER_2_NAME "CAM 1,2" +#define BOX_USER1_NAME "9V BEC" +#define BOX_USER2_NAME "CAM 1,2" #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW270_DEG #define GYRO_1_ALIGN_YAW 2700 From ec106a10e47832608e418b3017e21362590a849c Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Fri, 11 Oct 2024 17:54:03 +0200 Subject: [PATCH 6/7] Update configs/FLYWOOH743PRO/config.h Co-authored-by: ot0tot <36753790+ot0tot@users.noreply.github.com> --- configs/FLYWOOH743PRO/config.h | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/configs/FLYWOOH743PRO/config.h b/configs/FLYWOOH743PRO/config.h index c83f76fe..c57ec5dd 100644 --- a/configs/FLYWOOH743PRO/config.h +++ b/configs/FLYWOOH743PRO/config.h @@ -101,19 +101,20 @@ #define GYRO_2_CS_PIN PE11 #define TIMER_PIN_MAPPING \ - TIMER_PIN_MAP( 0, MOTOR1_PIN, 2, 0) \ - TIMER_PIN_MAP( 1, MOTOR2_PIN, 2, 1) \ - TIMER_PIN_MAP( 2, MOTOR3_PIN, 2, 2) \ - TIMER_PIN_MAP( 3, MOTOR4_PIN, 2, 3) \ - TIMER_PIN_MAP( 4, MOTOR5_PIN, 2, 4) \ - TIMER_PIN_MAP( 5, MOTOR6_PIN, 2, 5) \ - TIMER_PIN_MAP( 6, MOTOR7_PIN, 1, 6) \ - TIMER_PIN_MAP( 7, MOTOR8_PIN, 1, 7) \ - TIMER_PIN_MAP( 8, MOTOR9_PIN, 1, 12) \ - TIMER_PIN_MAP( 9, MOTOR10_PIN, 1, -1) \ - TIMER_PIN_MAP(10, SERVO1_PIN, 1, 0) \ - TIMER_PIN_MAP(11, SERVO2_PIN, 1, -1) \ - TIMER_PIN_MAP(12, LED_STRIP_PIN, 1, 14) + TIMER_PIN_MAP( 0, MOTOR1_PIN , 2, 0) \ + TIMER_PIN_MAP( 1, MOTOR2_PIN , 2, 0) \ + TIMER_PIN_MAP( 2, MOTOR3_PIN , 2, 0) \ + TIMER_PIN_MAP( 3, MOTOR4_PIN , 2, 0) \ + TIMER_PIN_MAP( 4, MOTOR5_PIN , 2, 0) \ + TIMER_PIN_MAP( 5, MOTOR6_PIN , 2, 0) \ + TIMER_PIN_MAP( 6, MOTOR7_PIN , 1, 0) \ + TIMER_PIN_MAP( 7, MOTOR8_PIN , 1, 0) \ + TIMER_PIN_MAP( 8, MOTOR9_PIN , 1, 0) \ + TIMER_PIN_MAP( 9, MOTOR10_PIN, 1, 0) \ + TIMER_PIN_MAP(10, SERVO1_PIN , 1, -1) \ + TIMER_PIN_MAP(11, SERVO2_PIN , 1, -1) \ + TIMER_PIN_MAP(12, LED_STRIP_PIN, 1, 0) \ + TIMER_PIN_MAP(13, RX_PPM_PIN , 2, -1) #define ADC1_DMA_OPT 8 #define ADC3_DMA_OPT 9 From 498b50c8946e1775c4a7c80ed9faa03d2676a53a Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Thu, 24 Oct 2024 14:17:02 +0200 Subject: [PATCH 7/7] Fixes per review --- configs/FLYWOOH743PRO/config.h | 81 +++++++++++++++++----------------- 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/configs/FLYWOOH743PRO/config.h b/configs/FLYWOOH743PRO/config.h index c57ec5dd..b0b365cc 100644 --- a/configs/FLYWOOH743PRO/config.h +++ b/configs/FLYWOOH743PRO/config.h @@ -45,10 +45,10 @@ #define MOTOR6_PIN PA3 #define MOTOR7_PIN PD12 #define MOTOR8_PIN PD13 -#define MOTOR9_PIN PD14 -#define MOTOR10_PIN PD15 -#define SERVO1_PIN PE5 -#define SERVO2_PIN PE6 +#define SERVO1_PIN PD14 +#define SERVO2_PIN PD15 +#define SERVO3_PIN PE5 +#define SERVO4_PIN PE6 #define RX_PPM_PIN PC7 #define LED_STRIP_PIN PA8 #define UART1_TX_PIN PA9 @@ -92,8 +92,8 @@ #define SDIO_D1_PIN PC9 #define SDIO_D2_PIN PC10 #define SDIO_D3_PIN PC11 -#define PINIO1_PIN PD10 //9V BEC -#define PINIO2_PIN PD11 //CAM1,2 +#define PINIO1_PIN PD10 +#define PINIO2_PIN PD11 #define MAX7456_SPI_CS_PIN PB12 #define GYRO_1_EXTI_PIN PB2 #define GYRO_2_EXTI_PIN PE15 @@ -101,20 +101,20 @@ #define GYRO_2_CS_PIN PE11 #define TIMER_PIN_MAPPING \ - TIMER_PIN_MAP( 0, MOTOR1_PIN , 2, 0) \ - TIMER_PIN_MAP( 1, MOTOR2_PIN , 2, 0) \ - TIMER_PIN_MAP( 2, MOTOR3_PIN , 2, 0) \ - TIMER_PIN_MAP( 3, MOTOR4_PIN , 2, 0) \ - TIMER_PIN_MAP( 4, MOTOR5_PIN , 2, 0) \ - TIMER_PIN_MAP( 5, MOTOR6_PIN , 2, 0) \ - TIMER_PIN_MAP( 6, MOTOR7_PIN , 1, 0) \ - TIMER_PIN_MAP( 7, MOTOR8_PIN , 1, 0) \ - TIMER_PIN_MAP( 8, MOTOR9_PIN , 1, 0) \ - TIMER_PIN_MAP( 9, MOTOR10_PIN, 1, 0) \ - TIMER_PIN_MAP(10, SERVO1_PIN , 1, -1) \ - TIMER_PIN_MAP(11, SERVO2_PIN , 1, -1) \ - TIMER_PIN_MAP(12, LED_STRIP_PIN, 1, 0) \ - TIMER_PIN_MAP(13, RX_PPM_PIN , 2, -1) + TIMER_PIN_MAP( 0, MOTOR1_PIN, 2, 0) \ + TIMER_PIN_MAP( 1, MOTOR2_PIN, 2, 0) \ + TIMER_PIN_MAP( 2, MOTOR3_PIN, 2, 0) \ + TIMER_PIN_MAP( 3, MOTOR4_PIN, 2, 0) \ + TIMER_PIN_MAP( 4, MOTOR5_PIN, 2, 0) \ + TIMER_PIN_MAP( 5, MOTOR6_PIN, 2, 0) \ + TIMER_PIN_MAP( 6, MOTOR7_PIN, 1, 0) \ + TIMER_PIN_MAP( 7, MOTOR8_PIN, 1, 0) \ + TIMER_PIN_MAP( 8, SERVO1_PIN, 1, -1) \ + TIMER_PIN_MAP( 9, SERVO2_PIN, 1, -1) \ + TIMER_PIN_MAP(10, SERVO3_PIN, 1, -1) \ + TIMER_PIN_MAP(11, SERVO4_PIN, 1, -1) \ + TIMER_PIN_MAP(12, LED_STRIP_PIN, 1, 0) \ + TIMER_PIN_MAP(13, RX_PPM_PIN , 2, -1) #define ADC1_DMA_OPT 8 #define ADC3_DMA_OPT 9 @@ -125,26 +125,25 @@ #define TIMUP5_DMA_OPT 0 #define TIMUP8_DMA_OPT 0 -#define BARO_I2C_INSTANCE (I2CDEV_2) -#define MAG_I2C_INSTANCE (I2CDEV_1) -#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH -#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD -#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC -#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC +#define BARO_I2C_INSTANCE I2CDEV_2 +#define MAG_I2C_INSTANCE I2CDEV_1 +#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH +#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD +#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_VOLTAGE_METER_SCALE_DEFAULT 110 -#define DEFAULT_CURRENT_METER_SCALE 250 +#define DEFAULT_CURRENT_METER_SCALE 250 #define BEEPER_INVERTED -#define SDCARD_DETECT_PIN NONE -#define SDIO_DEVICE SDIODEV_1 -#define SDIO_USE_4BIT 1 -#define MAX7456_SPI_INSTANCE SPI2 -#define PINIO1_BOX 40 -#define PINIO2_BOX 41 -#define BOX_USER1_NAME "9V BEC" -#define BOX_USER2_NAME "CAM 1,2" -#define GYRO_1_SPI_INSTANCE SPI1 -#define GYRO_1_ALIGN CW270_DEG -#define GYRO_1_ALIGN_YAW 2700 -#define GYRO_2_SPI_INSTANCE SPI4 -#define GYRO_2_ALIGN CW270_DEG -#define GYRO_2_ALIGN_YAW 2700 +#define SDIO_DEVICE SDIODEV_1 +#define SDIO_USE_4BIT 1 +#define MAX7456_SPI_INSTANCE SPI2 +#define PINIO1_BOX 40 +#define PINIO2_BOX 41 +#define BOX_USER1_NAME "9V BEC" +#define BOX_USER2_NAME "CAM 1,2" +#define GYRO_1_SPI_INSTANCE SPI1 +#define GYRO_1_ALIGN CW270_DEG +#define GYRO_1_ALIGN_YAW 2700 +#define GYRO_2_SPI_INSTANCE SPI4 +#define GYRO_2_ALIGN CW270_DEG +#define GYRO_2_ALIGN_YAW 2700