From ba0221cd81013996f216996e9fe362a004e79355 Mon Sep 17 00:00:00 2001 From: WRK <9857999+AldenW@user.noreply.gitee.com> Date: Fri, 23 Aug 2024 11:22:38 +0800 Subject: [PATCH 1/7] Your commit message --- configs/GEEHY405/config.h | 117 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 configs/GEEHY405/config.h diff --git a/configs/GEEHY405/config.h b/configs/GEEHY405/config.h new file mode 100644 index 00000000..f4bfa90b --- /dev/null +++ b/configs/GEEHY405/config.h @@ -0,0 +1,117 @@ +/* + * 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 APM32F405 + +#define BOARD_NAME GEEHY405 +#define MANUFACTURER_ID geehy + +#define USE_ACC +#define USE_GYRO +#define USE_GYRO_SPI_ICM42688P +#define USE_ACC_SPI_ICM42688P +#define USE_SDCARD +#define USE_FLASH +#define USE_FLASH_W25Q128FV +#define USE_MAX7456 +#define USE_BARO +#define USE_MAG +#define USE_BARO_DPS310 + +#define BEEPER_PIN PB9 +#define MOTOR1_PIN PC9 +#define MOTOR2_PIN PC8 +#define MOTOR3_PIN PC7 +#define MOTOR4_PIN PC6 +#define MOTOR5_PIN PB0 +#define MOTOR6_PIN PB1 +#define MOTOR7_PIN PB10 +#define MOTOR8_PIN PB11 +#define LED_STRIP_PIN PB8 +#define RX_PPM_PIN PA3 +#define UART1_TX_PIN PB6 +#define UART2_TX_PIN PA2 +#define UART3_TX_PIN PC10 +#define UART4_TX_PIN PA0 +#define UART5_TX_PIN PC12 +#define UART1_RX_PIN PB7 +#define UART2_RX_PIN PA3 +#define UART3_RX_PIN PC11 +#define UART4_RX_PIN PA1 +#define UART5_RX_PIN PD2 +#define I2C1_SCL_PIN PB6 +#define I2C1_SDA_PIN PB7 +#define LED0_PIN PC13 +#define LED1_PIN PC14 +#define PINIO1_PIN PC0 +#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 ADC_VBAT_PIN PC2 +#define ADC_CURR_PIN PC1 +#define ADC_RSSI_PIN PC3 +#define FLASH_CS_PIN PA15 +#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, PC9 , 1, 0) \ + TIMER_PIN_MAP( 1, PC8 , 1, 0) \ + TIMER_PIN_MAP( 2, PC7 , 1, 0) \ + TIMER_PIN_MAP( 3, PC6 , 1, 0) \ + TIMER_PIN_MAP( 4, PB0 , 1, 0) \ + TIMER_PIN_MAP( 5, PB1 , 1, 0) \ + TIMER_PIN_MAP( 6, PB10, 1, 0) \ + TIMER_PIN_MAP( 7, PB11, 1, 0) \ + TIMER_PIN_MAP( 8, PB8 , 1, -1) \ + TIMER_PIN_MAP( 9, PA3 , 2, 0) + +#define ADC1_DMA_OPT 0 + +#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE (I2CDEV_1) +#define ADC_INSTANCE ADC1 +#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH +#define DEFAULT_DSHOT_BURST DSHOT_DMAR_AUTO +#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC +#define DEFAULT_CURRENT_METER_SCALE 400 +#define BEEPER_INVERTED +#define SDCARD_DETECT_INVERTED +#define USE_SDCARD_SPI +#define FLASH_SPI_INSTANCE SPI3 +#define SDCARD_SPI_INSTANCE SPI3 +#define SYSTEM_HSE_MHZ 8 +#define MAX7456_SPI_INSTANCE SPI2 +#define PINIO1_BOX 40 +#define GYRO_1_SPI_INSTANCE SPI1 +#define GYRO_1_ALIGN CW90_DEG +#define GYRO_1_ALIGN_YAW 900 +#define SERIALRX_UART SERIAL_PORT_USART2 From 2f60c408c8971984b40b907e15c864a9f35eec3c Mon Sep 17 00:00:00 2001 From: Alden-wrk <168357057+Alden-wrk@users.noreply.github.com> Date: Fri, 23 Aug 2024 15:27:15 +0800 Subject: [PATCH 2/7] Update config.h --- configs/GEEHY405/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/GEEHY405/config.h b/configs/GEEHY405/config.h index f4bfa90b..f9cc0159 100644 --- a/configs/GEEHY405/config.h +++ b/configs/GEEHY405/config.h @@ -49,12 +49,12 @@ #define MOTOR8_PIN PB11 #define LED_STRIP_PIN PB8 #define RX_PPM_PIN PA3 -#define UART1_TX_PIN PB6 +#define UART1_TX_PIN PA9 #define UART2_TX_PIN PA2 #define UART3_TX_PIN PC10 #define UART4_TX_PIN PA0 #define UART5_TX_PIN PC12 -#define UART1_RX_PIN PB7 +#define UART1_RX_PIN PA10 #define UART2_RX_PIN PA3 #define UART3_RX_PIN PC11 #define UART4_RX_PIN PA1 From ade4d9907e006a3eced3cd8fb7ae0022f5cfce9d Mon Sep 17 00:00:00 2001 From: Alden-wrk <168357057+Alden-wrk@users.noreply.github.com> Date: Fri, 23 Aug 2024 23:11:30 +0800 Subject: [PATCH 3/7] Update config.h --- configs/GEEHY405/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/GEEHY405/config.h b/configs/GEEHY405/config.h index f9cc0159..6eb9224d 100644 --- a/configs/GEEHY405/config.h +++ b/configs/GEEHY405/config.h @@ -24,7 +24,7 @@ #define FC_TARGET_MCU APM32F405 #define BOARD_NAME GEEHY405 -#define MANUFACTURER_ID geehy +#define MANUFACTURER_ID FOSS #define USE_ACC #define USE_GYRO From f4a4b13bda0b6ed496cc6b089f7a7f9051786cc2 Mon Sep 17 00:00:00 2001 From: Alden-wrk <168357057+Alden-wrk@users.noreply.github.com> Date: Sat, 24 Aug 2024 00:36:27 +0800 Subject: [PATCH 4/7] Update config.h --- configs/GEEHY405/config.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/configs/GEEHY405/config.h b/configs/GEEHY405/config.h index 6eb9224d..4f8dcb82 100644 --- a/configs/GEEHY405/config.h +++ b/configs/GEEHY405/config.h @@ -24,13 +24,12 @@ #define FC_TARGET_MCU APM32F405 #define BOARD_NAME GEEHY405 -#define MANUFACTURER_ID FOSS +#define MANUFACTURER_ID CUST #define USE_ACC #define USE_GYRO #define USE_GYRO_SPI_ICM42688P #define USE_ACC_SPI_ICM42688P -#define USE_SDCARD #define USE_FLASH #define USE_FLASH_W25Q128FV #define USE_MAX7456 @@ -48,7 +47,6 @@ #define MOTOR7_PIN PB10 #define MOTOR8_PIN PB11 #define LED_STRIP_PIN PB8 -#define RX_PPM_PIN PA3 #define UART1_TX_PIN PA9 #define UART2_TX_PIN PA2 #define UART3_TX_PIN PC10 @@ -90,8 +88,7 @@ TIMER_PIN_MAP( 5, PB1 , 1, 0) \ TIMER_PIN_MAP( 6, PB10, 1, 0) \ TIMER_PIN_MAP( 7, PB11, 1, 0) \ - TIMER_PIN_MAP( 8, PB8 , 1, -1) \ - TIMER_PIN_MAP( 9, PA3 , 2, 0) + TIMER_PIN_MAP( 8, PB8 , 1, -1) #define ADC1_DMA_OPT 0 @@ -104,10 +101,7 @@ #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_CURRENT_METER_SCALE 400 #define BEEPER_INVERTED -#define SDCARD_DETECT_INVERTED -#define USE_SDCARD_SPI #define FLASH_SPI_INSTANCE SPI3 -#define SDCARD_SPI_INSTANCE SPI3 #define SYSTEM_HSE_MHZ 8 #define MAX7456_SPI_INSTANCE SPI2 #define PINIO1_BOX 40 From 4bed1c1fbbc25ffb760f4d76a827d4ddb7532735 Mon Sep 17 00:00:00 2001 From: Alden-wrk <168357057+Alden-wrk@users.noreply.github.com> Date: Sun, 25 Aug 2024 23:08:49 +0800 Subject: [PATCH 5/7] Update config.h --- configs/GEEHY405/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/configs/GEEHY405/config.h b/configs/GEEHY405/config.h index 4f8dcb82..edd8c16c 100644 --- a/configs/GEEHY405/config.h +++ b/configs/GEEHY405/config.h @@ -34,7 +34,6 @@ #define USE_FLASH_W25Q128FV #define USE_MAX7456 #define USE_BARO -#define USE_MAG #define USE_BARO_DPS310 #define BEEPER_PIN PB9 @@ -92,7 +91,6 @@ #define ADC1_DMA_OPT 0 -#define MAG_I2C_INSTANCE (I2CDEV_1) #define BARO_I2C_INSTANCE (I2CDEV_1) #define ADC_INSTANCE ADC1 #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH From 9e02387ae9a2b71e79fa105066eccb65fa9b235c Mon Sep 17 00:00:00 2001 From: Alden-wrk <168357057+Alden-wrk@users.noreply.github.com> Date: Wed, 4 Sep 2024 07:54:46 +0800 Subject: [PATCH 6/7] Update Manufacturers.md --- Manufacturers.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Manufacturers.md b/Manufacturers.md index 895d860a..5b1a5819 100644 --- a/Manufacturers.md +++ b/Manufacturers.md @@ -63,6 +63,7 @@ This is the official list of manufacturer ids (`manufacturer_id` in the target c |HEBI|Shenzhen High Energy Bili Co., Ltd.|http://www.coddar.net/| |HENA|Heli-Nation|https://www.heli-nation.com/| |HFOR|HIFIONRC|http://www.hifionrc.com/| +|HGFP|HXW GEEHY FPV|| |HGLR|HGLRC|https://www.hglrc.com/| |HNEC|Huizhou NIDICI Electronic Co., LTD|https://shop.nidici.com/| |HOWI|Hobbywing Technology CO., LTD.|http://hobbywing.com/| From b6e4883da8e91db4aa7516208a2b5bac01bf2c81 Mon Sep 17 00:00:00 2001 From: Alden-wrk <168357057+Alden-wrk@users.noreply.github.com> Date: Wed, 4 Sep 2024 07:56:05 +0800 Subject: [PATCH 7/7] Update config.h --- configs/GEEHY405/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/GEEHY405/config.h b/configs/GEEHY405/config.h index edd8c16c..ef97cb98 100644 --- a/configs/GEEHY405/config.h +++ b/configs/GEEHY405/config.h @@ -24,7 +24,7 @@ #define FC_TARGET_MCU APM32F405 #define BOARD_NAME GEEHY405 -#define MANUFACTURER_ID CUST +#define MANUFACTURER_ID HGFP #define USE_ACC #define USE_GYRO