From 4a8bd16c46145a49f5f2884ea531195331c8b1e7 Mon Sep 17 00:00:00 2001 From: ThanYangFPV <825243151@qq.com> Date: Tue, 19 Nov 2024 22:18:36 +0800 Subject: [PATCH 1/8] Add DAKEFPVF722X8 --- configs/DAKEFPVF722X8/config.h | 128 +++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 configs/DAKEFPVF722X8/config.h diff --git a/configs/DAKEFPVF722X8/config.h b/configs/DAKEFPVF722X8/config.h new file mode 100644 index 00000000..6a5bf10d --- /dev/null +++ b/configs/DAKEFPVF722X8/config.h @@ -0,0 +1,128 @@ +/* + * 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 STM32F7X2 + +#define BOARD_NAME DAKEFPVF722X8 +#define MANUFACTURER_ID DAKE + +#define USE_ACC +#define USE_ACC_SPI_MPU6000 +#define USE_ACC_SPI_MPU6500 +#define USE_ACC_SPI_ICM42688P +#define USE_GYRO +#define USE_GYRO_SPI_MPU6000 +#define USE_GYRO_SPI_MPU6500 +#define USE_GYRO_SPI_ICM42688P + +#define USE_BARO +#define USE_BARO_BMP280 +#define USE_BARO_DPS310 +#define USE_FLASH +#define USE_FLASH_M25P16 +#define USE_MAX7456 +#define USE_CAMERA_CONTROL + +#define BEEPER_PIN PC3 +#define MOTOR1_PIN PC6 +#define MOTOR2_PIN PC7 +#define MOTOR3_PIN PC8 +#define MOTOR4_PIN PC9 +#define MOTOR5_PIN PA8 +#define MOTOR6_PIN PA15 +#define MOTOR7_PIN PB7 +#define MOTOR8_PIN PA1 +#define LED_STRIP_PIN PA0 +#define UART1_TX_PIN PA9 +#define UART2_TX_PIN PA2 +#define UART3_TX_PIN PB10 +#define UART4_TX_PIN PC10 +#define UART5_TX_PIN PC12 +#define UART1_RX_PIN PA10 +#define UART2_RX_PIN PA3 +#define UART3_RX_PIN PB11 +#define UART4_RX_PIN PC11 +#define UART5_RX_PIN PD2 +#define I2C1_SCL_PIN PB8 +#define I2C1_SDA_PIN PB9 +#define LED0_PIN PC14 +#define LED1_PIN PC15 +#define SPI1_SCK_PIN PA5 +#define SPI2_SCK_PIN PB13 +#define SPI3_SCK_PIN PB3 +#define SPI1_SDI_PIN PA6 +#define SPI2_SDI_PIN PB14 +#define SPI3_SDI_PIN PB4 +#define SPI1_SDO_PIN PA7 +#define SPI2_SDO_PIN PB15 +#define SPI3_SDO_PIN PB5 +#define CAMERA_CONTROL_PIN PB0 +#define ADC_VBAT_PIN PC1 +#define ADC_RSSI_PIN PC2 +#define ADC_CURR_PIN PC0 +#define PINIO1_PIN PC13 +#define PINIO2_PIN PB1 +#define FLASH_CS_PIN PB6 +#define MAX7456_SPI_CS_PIN PB12 +#define GYRO_1_EXTI_PIN PC4 +#define GYRO_1_CS_PIN PA4 + +#define TIMER_PIN_MAPPING \ + TIMER_PIN_MAP( 0, PC6 , 2, 0) \ + TIMER_PIN_MAP( 1, PC7 , 2, 1) \ + TIMER_PIN_MAP( 2, PC8 , 2, 1) \ + TIMER_PIN_MAP( 3, PC9 , 2, 0) \ + TIMER_PIN_MAP( 4, PA8 , 1, 0) \ + TIMER_PIN_MAP( 5, PA15, 1, 0) \ + TIMER_PIN_MAP( 6, PB7 , 1, 0) \ + TIMER_PIN_MAP( 7, PA1 , 1, 0) \ + TIMER_PIN_MAP( 8, PA0 , 2, 0) \ + TIMER_PIN_MAP( 9, PB0 , 2, 0) + + + +#define ADC3_DMA_OPT 1 + +#define ADC_INSTANCE ADC3 +#define FLASH_SPI_INSTANCE SPI3 +#define MAX7456_SPI_INSTANCE SPI2 + +#define BARO_I2C_INSTANCE (I2CDEV_1) + +#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH +#define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_ON +#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC + +#define BEEPER_INVERTED +#define PINIO1_CONFIG 129 +#define PINIO1_BOX 40 +#define PINIO2_CONFIG 129 +#define PINIO2_BOX 41 + +#define GYRO_1_SPI_INSTANCE SPI1 +#define GYRO_1_ALIGN CW90_DEG +#define GYRO_1_ALIGN_YAW 900 + +#define SERIALRX_UART SERIAL_PORT_USART2 +#define ESC_SENSOR_UART SERIAL_PORT_USART3 From 5236b301f4f48aa6a75b1fd06480b98fd46cd090 Mon Sep 17 00:00:00 2001 From: ThanYangFPV <74483959+ThanYangFPV@users.noreply.github.com> Date: Wed, 20 Nov 2024 08:26:59 +0800 Subject: [PATCH 2/8] Update CAMERA_CONTROL for DAKEFPVF722X8 Co-authored-by: Mark Haslinghuis --- configs/DAKEFPVF722X8/config.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/DAKEFPVF722X8/config.h b/configs/DAKEFPVF722X8/config.h index 6a5bf10d..5d42caf2 100644 --- a/configs/DAKEFPVF722X8/config.h +++ b/configs/DAKEFPVF722X8/config.h @@ -41,7 +41,9 @@ #define USE_FLASH #define USE_FLASH_M25P16 #define USE_MAX7456 +#ifndef USE_CAMERA_CONTROL #define USE_CAMERA_CONTROL +#endif #define BEEPER_PIN PC3 #define MOTOR1_PIN PC6 From 3da22cf59580baf15297398f8a84915b9841399e Mon Sep 17 00:00:00 2001 From: ThanYangFPV <74483959+ThanYangFPV@users.noreply.github.com> Date: Wed, 20 Nov 2024 08:28:15 +0800 Subject: [PATCH 3/8] Update PB0 TIMER_PIN_MAP of DAKEFPVF722X8 Co-authored-by: Mark Haslinghuis --- configs/DAKEFPVF722X8/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/DAKEFPVF722X8/config.h b/configs/DAKEFPVF722X8/config.h index 5d42caf2..de02a065 100644 --- a/configs/DAKEFPVF722X8/config.h +++ b/configs/DAKEFPVF722X8/config.h @@ -99,7 +99,7 @@ TIMER_PIN_MAP( 6, PB7 , 1, 0) \ TIMER_PIN_MAP( 7, PA1 , 1, 0) \ TIMER_PIN_MAP( 8, PA0 , 2, 0) \ - TIMER_PIN_MAP( 9, PB0 , 2, 0) + TIMER_PIN_MAP( 9, PB0 , 2, -1) From df975dcd28ce9e26016af3eeed0354ab889ca3ab Mon Sep 17 00:00:00 2001 From: ThanYangFPV <74483959+ThanYangFPV@users.noreply.github.com> Date: Wed, 27 Nov 2024 22:40:13 +0800 Subject: [PATCH 4/8] Remove the MPU6500 of DAKEFPVF722X8 Co-authored-by: ot0tot <36753790+ot0tot@users.noreply.github.com> --- configs/DAKEFPVF722X8/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/DAKEFPVF722X8/config.h b/configs/DAKEFPVF722X8/config.h index de02a065..b0108182 100644 --- a/configs/DAKEFPVF722X8/config.h +++ b/configs/DAKEFPVF722X8/config.h @@ -28,7 +28,6 @@ #define USE_ACC #define USE_ACC_SPI_MPU6000 -#define USE_ACC_SPI_MPU6500 #define USE_ACC_SPI_ICM42688P #define USE_GYRO #define USE_GYRO_SPI_MPU6000 From 6886c91b3bbd8171bc133ee6d113177535a0dcdd Mon Sep 17 00:00:00 2001 From: ThanYangFPV <74483959+ThanYangFPV@users.noreply.github.com> Date: Wed, 27 Nov 2024 22:41:39 +0800 Subject: [PATCH 5/8] Remove the GYRO_MPU6500 of DAKEFPVF722X8. Co-authored-by: ot0tot <36753790+ot0tot@users.noreply.github.com> --- configs/DAKEFPVF722X8/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/DAKEFPVF722X8/config.h b/configs/DAKEFPVF722X8/config.h index b0108182..eefc3aec 100644 --- a/configs/DAKEFPVF722X8/config.h +++ b/configs/DAKEFPVF722X8/config.h @@ -31,7 +31,6 @@ #define USE_ACC_SPI_ICM42688P #define USE_GYRO #define USE_GYRO_SPI_MPU6000 -#define USE_GYRO_SPI_MPU6500 #define USE_GYRO_SPI_ICM42688P #define USE_BARO From e4f79240e068ff84f11e0c8c344ac7f50a948c49 Mon Sep 17 00:00:00 2001 From: ThanYangFPV <825243151@qq.com> Date: Wed, 27 Nov 2024 23:54:02 +0800 Subject: [PATCH 6/8] Modify the resource of DAKEFPVF722X8 --- configs/DAKEFPVF722X8/config.h | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/configs/DAKEFPVF722X8/config.h b/configs/DAKEFPVF722X8/config.h index eefc3aec..86aa2535 100644 --- a/configs/DAKEFPVF722X8/config.h +++ b/configs/DAKEFPVF722X8/config.h @@ -48,25 +48,22 @@ #define MOTOR2_PIN PC7 #define MOTOR3_PIN PC8 #define MOTOR4_PIN PC9 -#define MOTOR5_PIN PA8 -#define MOTOR6_PIN PA15 -#define MOTOR7_PIN PB7 -#define MOTOR8_PIN PA1 +#define MOTOR5_PIN PA15 +#define MOTOR6_PIN PA1 +#define MOTOR7_PIN PA2 +#define MOTOR8_PIN PA3 #define LED_STRIP_PIN PA0 #define UART1_TX_PIN PA9 -#define UART2_TX_PIN PA2 #define UART3_TX_PIN PB10 #define UART4_TX_PIN PC10 #define UART5_TX_PIN PC12 #define UART1_RX_PIN PA10 -#define UART2_RX_PIN PA3 #define UART3_RX_PIN PB11 #define UART4_RX_PIN PC11 #define UART5_RX_PIN PD2 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 -#define LED0_PIN PC14 -#define LED1_PIN PC15 +#define LED0_PIN PB7 #define SPI1_SCK_PIN PA5 #define SPI2_SCK_PIN PB13 #define SPI3_SCK_PIN PB3 @@ -80,7 +77,7 @@ #define ADC_VBAT_PIN PC1 #define ADC_RSSI_PIN PC2 #define ADC_CURR_PIN PC0 -#define PINIO1_PIN PC13 +#define PINIO1_PIN PA8 #define PINIO2_PIN PB1 #define FLASH_CS_PIN PB6 #define MAX7456_SPI_CS_PIN PB12 @@ -92,10 +89,10 @@ TIMER_PIN_MAP( 1, PC7 , 2, 1) \ TIMER_PIN_MAP( 2, PC8 , 2, 1) \ TIMER_PIN_MAP( 3, PC9 , 2, 0) \ - TIMER_PIN_MAP( 4, PA8 , 1, 0) \ - TIMER_PIN_MAP( 5, PA15, 1, 0) \ - TIMER_PIN_MAP( 6, PB7 , 1, 0) \ - TIMER_PIN_MAP( 7, PA1 , 1, 0) \ + TIMER_PIN_MAP( 4, PA15, 1, 0) \ + TIMER_PIN_MAP( 5, PA1 , 1, 0) \ + TIMER_PIN_MAP( 6, PA2 , 1, 0) \ + TIMER_PIN_MAP( 7, PA3 , 1, 0) \ TIMER_PIN_MAP( 8, PA0 , 2, 0) \ TIMER_PIN_MAP( 9, PB0 , 2, -1) @@ -124,5 +121,5 @@ #define GYRO_1_ALIGN CW90_DEG #define GYRO_1_ALIGN_YAW 900 -#define SERIALRX_UART SERIAL_PORT_USART2 +#define SERIALRX_UART SERIAL_PORT_UART5 #define ESC_SENSOR_UART SERIAL_PORT_USART3 From e774ce0ce850b11455c81bdb764770f96e412c7c Mon Sep 17 00:00:00 2001 From: ThanYangFPV <825243151@qq.com> Date: Fri, 29 Nov 2024 23:28:36 +0800 Subject: [PATCH 7/8] Reallocate resources of DAKEFPVF722X8 Provides 4 full UARTs and 1 ESC TLM UART --- configs/DAKEFPVF722X8/config.h | 54 +++++++++++++++++----------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/configs/DAKEFPVF722X8/config.h b/configs/DAKEFPVF722X8/config.h index 86aa2535..b2f8a495 100644 --- a/configs/DAKEFPVF722X8/config.h +++ b/configs/DAKEFPVF722X8/config.h @@ -44,26 +44,27 @@ #endif #define BEEPER_PIN PC3 -#define MOTOR1_PIN PC6 -#define MOTOR2_PIN PC7 -#define MOTOR3_PIN PC8 -#define MOTOR4_PIN PC9 -#define MOTOR5_PIN PA15 -#define MOTOR6_PIN PA1 -#define MOTOR7_PIN PA2 -#define MOTOR8_PIN PA3 #define LED_STRIP_PIN PA0 -#define UART1_TX_PIN PA9 -#define UART3_TX_PIN PB10 +#define MOTOR1_PIN PA1 +#define MOTOR2_PIN PA2 +#define MOTOR3_PIN PA3 +#define MOTOR4_PIN PA8 +#define MOTOR5_PIN PA9 +#define MOTOR6_PIN PA10 +#define MOTOR7_PIN PC8 +#define MOTOR8_PIN PC9 +#define UART1_TX_PIN PB6 #define UART4_TX_PIN PC10 #define UART5_TX_PIN PC12 -#define UART1_RX_PIN PA10 +#define UART6_TX_PIN PC6 +#define UART1_RX_PIN PB7 #define UART3_RX_PIN PB11 #define UART4_RX_PIN PC11 #define UART5_RX_PIN PD2 +#define UART6_RX_PIN PC7 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 -#define LED0_PIN PB7 +#define LED0_PIN PA15 #define SPI1_SCK_PIN PA5 #define SPI2_SCK_PIN PB13 #define SPI3_SCK_PIN PB3 @@ -77,30 +78,28 @@ #define ADC_VBAT_PIN PC1 #define ADC_RSSI_PIN PC2 #define ADC_CURR_PIN PC0 -#define PINIO1_PIN PA8 -#define PINIO2_PIN PB1 -#define FLASH_CS_PIN PB6 +#define PINIO1_PIN PB1 +#define PINIO2_PIN PB10 +#define FLASH_CS_PIN PB2 #define MAX7456_SPI_CS_PIN PB12 #define GYRO_1_EXTI_PIN PC4 #define GYRO_1_CS_PIN PA4 #define TIMER_PIN_MAPPING \ - TIMER_PIN_MAP( 0, PC6 , 2, 0) \ - TIMER_PIN_MAP( 1, PC7 , 2, 1) \ - TIMER_PIN_MAP( 2, PC8 , 2, 1) \ - TIMER_PIN_MAP( 3, PC9 , 2, 0) \ - TIMER_PIN_MAP( 4, PA15, 1, 0) \ - TIMER_PIN_MAP( 5, PA1 , 1, 0) \ - TIMER_PIN_MAP( 6, PA2 , 1, 0) \ - TIMER_PIN_MAP( 7, PA3 , 1, 0) \ + TIMER_PIN_MAP( 0, PA1 , 1, 0) \ + TIMER_PIN_MAP( 1, PA2 , 1, 0) \ + TIMER_PIN_MAP( 2, PA3 , 1, 0) \ + TIMER_PIN_MAP( 3, PA8 , 1, 1) \ + TIMER_PIN_MAP( 4, PA9 , 1, 1) \ + TIMER_PIN_MAP( 5, PA10, 1, 1) \ + TIMER_PIN_MAP( 6, PC8 , 2, 1) \ + TIMER_PIN_MAP( 7, PC9 , 2, 0) \ TIMER_PIN_MAP( 8, PA0 , 2, 0) \ TIMER_PIN_MAP( 9, PB0 , 2, -1) - +#define ADC2_DMA_OPT 1 -#define ADC3_DMA_OPT 1 - -#define ADC_INSTANCE ADC3 +#define ADC_INSTANCE ADC2 #define FLASH_SPI_INSTANCE SPI3 #define MAX7456_SPI_INSTANCE SPI2 @@ -120,6 +119,7 @@ #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW90_DEG #define GYRO_1_ALIGN_YAW 900 +#define DEFAULT_CURRENT_METER_SCALE 120 #define SERIALRX_UART SERIAL_PORT_UART5 #define ESC_SENSOR_UART SERIAL_PORT_USART3 From 24ef4d95bf25f4bd66a5268b075d86dcd362553e Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Fri, 29 Nov 2024 19:27:58 +0100 Subject: [PATCH 8/8] Update configs/DAKEFPVF722X8/config.h --- configs/DAKEFPVF722X8/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/DAKEFPVF722X8/config.h b/configs/DAKEFPVF722X8/config.h index b2f8a495..f002ed99 100644 --- a/configs/DAKEFPVF722X8/config.h +++ b/configs/DAKEFPVF722X8/config.h @@ -103,7 +103,7 @@ #define FLASH_SPI_INSTANCE SPI3 #define MAX7456_SPI_INSTANCE SPI2 -#define BARO_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE I2CDEV_1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_ON