From 0dea82a3067f79b2a318bacec7131c5038c1ef31 Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Thu, 28 Nov 2024 11:46:02 +0100 Subject: [PATCH 1/3] Add JHEG473 --- configs/JHEG473/config.h | 110 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 configs/JHEG473/config.h diff --git a/configs/JHEG473/config.h b/configs/JHEG473/config.h new file mode 100644 index 00000000..404d0309 --- /dev/null +++ b/configs/JHEG473/config.h @@ -0,0 +1,110 @@ +/* + * 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 STM32G47X + +#define BOARD_NAME JHEG473 +#define MANUFACTURER_ID JHEM + +#define USE_ACC +#define USE_GYRO +#define USE_ACC_SPI_ICM42688P +#define USE_GYRO_SPI_ICM42688P +#define USE_ACCGYRO_BMI270 +#define USE_BARO +#define USE_BARO_BMP280 +#define USE_BARO_DPS3120 +#define USE_FLASH +#define USE_FLASH_M25P16 +#define USE_MAX7456 + +#define BEEPER_PIN PA8 +#define MOTOR1_PIN PB0 +#define MOTOR2_PIN PB1 +#define MOTOR3_PIN PB6 +#define MOTOR4_PIN PC13 +#define LED_STRIP_PIN PB2 +#define UART1_TX_PIN PA9 +#define UART2_TX_PIN PA2 +#define UART3_TX_PIN PB10 +#define UART4_TX_PIN PC10 +#define UART1_RX_PIN PA10 +#define UART2_RX_PIN PA3 +#define UART3_RX_PIN PB11 +#define UART4_RX_PIN PC11 +#define I2C1_SCL_PIN PA15 +#define I2C1_SDA_PIN PB7 +#define LED0_PIN PC15 +#define LED1_PIN PC14 +#define PINIO1_PIN PC6 +#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 PA0 +#define ADC_CURR_PIN PA1 +#define FLASH_CS_PIN PB9 +#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, PB2, 1, 1 ) \ + TIMER_PIN_MAP( 1, PB0, 1, 2 ) \ + TIMER_PIN_MAP( 2, PB1, 1, 3 ) \ + TIMER_PIN_MAP( 3, PB6, 3, 4 ) \ + TIMER_PIN_MAP( 4, PC13, 2, 5 ) + +#define ADC1_DMA_OPT 6 + +#define SPI1_TX_DMA_OPT 14 +#define SPI2_TX_DMA_OPT 10 +#define SPI3_TX_DMA_OPT 9 +#define SPI1_RX_DMA_OPT 13 +#define SPI2_RX_DMA_OPT 11 +#define SPI3_RX_DMA_OPT 8 + +#define VTX_SMARTAUDIO_UART SERIAL_PORT_USART2 +#define SERIALRX_UART SERIAL_PORT_USART3 + +#define BARO_I2C_INSTANCE I2CDEV_1 +#define MAG_I2C_INSTANCE I2CDEV_1 +#define SERIALRX_PROVIDER SERIALRX_CRSF +#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH +//TODO #define DSHOT_IDLE_VALUE 450 +#define DEFAULT_DSHOT_BURST DSHOT_DMAR_OFF +#define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_ON +#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC +#define DEFAULT_CURRENT_METER_SCALE 750 +#define BEEPER_INVERTED +#define MAX7456_SPI_INSTANCE SPI2 +#define FLASH_SPI_INSTANCE SPI3 +#define GYRO_1_SPI_INSTANCE SPI1 +#define GYRO_1_ALIGN CW180_DEG +#define GYRO_1_ALIGN_YAW 1800 From 4f1d915733b71887a74d737326ca61e9d7665387 Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Wed, 8 Jan 2025 15:57:52 +0100 Subject: [PATCH 2/3] Reshuffle and fixes --- configs/JHEG473/config.h | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/configs/JHEG473/config.h b/configs/JHEG473/config.h index 404d0309..559b9c61 100644 --- a/configs/JHEG473/config.h +++ b/configs/JHEG473/config.h @@ -33,7 +33,7 @@ #define USE_ACCGYRO_BMI270 #define USE_BARO #define USE_BARO_BMP280 -#define USE_BARO_DPS3120 +#define USE_BARO_DPS310 #define USE_FLASH #define USE_FLASH_M25P16 #define USE_MAX7456 @@ -45,12 +45,12 @@ #define MOTOR4_PIN PC13 #define LED_STRIP_PIN PB2 #define UART1_TX_PIN PA9 -#define UART2_TX_PIN PA2 -#define UART3_TX_PIN PB10 -#define UART4_TX_PIN PC10 #define UART1_RX_PIN PA10 +#define UART2_TX_PIN PA2 #define UART2_RX_PIN PA3 +#define UART3_TX_PIN PB10 #define UART3_RX_PIN PB11 +#define UART4_TX_PIN PC10 #define UART4_RX_PIN PC11 #define I2C1_SCL_PIN PA15 #define I2C1_SDA_PIN PB7 @@ -58,13 +58,13 @@ #define LED1_PIN PC14 #define PINIO1_PIN PC6 #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_SCK_PIN PB13 +#define SPI2_SDI_PIN PB14 #define SPI2_SDO_PIN PB15 +#define SPI3_SCK_PIN PB3 +#define SPI3_SDI_PIN PB4 #define SPI3_SDO_PIN PB5 #define ADC_VBAT_PIN PA0 #define ADC_CURR_PIN PA1 @@ -74,29 +74,21 @@ #define GYRO_1_CS_PIN PA4 #define TIMER_PIN_MAPPING \ - TIMER_PIN_MAP( 0, PB2, 1, 1 ) \ - TIMER_PIN_MAP( 1, PB0, 1, 2 ) \ - TIMER_PIN_MAP( 2, PB1, 1, 3 ) \ - TIMER_PIN_MAP( 3, PB6, 3, 4 ) \ - TIMER_PIN_MAP( 4, PC13, 2, 5 ) + TIMER_PIN_MAP( 0, LED_STRIP_PIN, 1, 0 ) \ + TIMER_PIN_MAP( 1, MOTOR1_PIN, 1, 1 ) \ + TIMER_PIN_MAP( 2, MOTOR2_PIN, 1, 2 ) \ + TIMER_PIN_MAP( 3, MOTOR3_PIN, 3, 3 ) \ + TIMER_PIN_MAP( 4, MOTOR4_PIN, 2, 4 ) -#define ADC1_DMA_OPT 6 - -#define SPI1_TX_DMA_OPT 14 -#define SPI2_TX_DMA_OPT 10 -#define SPI3_TX_DMA_OPT 9 -#define SPI1_RX_DMA_OPT 13 -#define SPI2_RX_DMA_OPT 11 -#define SPI3_RX_DMA_OPT 8 +#define ADC1_DMA_OPT 8 #define VTX_SMARTAUDIO_UART SERIAL_PORT_USART2 #define SERIALRX_UART SERIAL_PORT_USART3 #define BARO_I2C_INSTANCE I2CDEV_1 #define MAG_I2C_INSTANCE I2CDEV_1 -#define SERIALRX_PROVIDER SERIALRX_CRSF + #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH -//TODO #define DSHOT_IDLE_VALUE 450 #define DEFAULT_DSHOT_BURST DSHOT_DMAR_OFF #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_ON #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC @@ -107,4 +99,3 @@ #define FLASH_SPI_INSTANCE SPI3 #define GYRO_1_SPI_INSTANCE SPI1 #define GYRO_1_ALIGN CW180_DEG -#define GYRO_1_ALIGN_YAW 1800 From e368737c092d97a083a43aa580174910c4a9655c Mon Sep 17 00:00:00 2001 From: ot0tot <36753790+ot0tot@users.noreply.github.com> Date: Thu, 9 Jan 2025 23:03:17 -0500 Subject: [PATCH 3/3] Update config.h based on revised schematic --- configs/JHEG473/config.h | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/configs/JHEG473/config.h b/configs/JHEG473/config.h index 559b9c61..a0ad8c33 100644 --- a/configs/JHEG473/config.h +++ b/configs/JHEG473/config.h @@ -30,19 +30,17 @@ #define USE_GYRO #define USE_ACC_SPI_ICM42688P #define USE_GYRO_SPI_ICM42688P -#define USE_ACCGYRO_BMI270 #define USE_BARO -#define USE_BARO_BMP280 #define USE_BARO_DPS310 #define USE_FLASH -#define USE_FLASH_M25P16 +#define USE_FLASH_W25Q128FV #define USE_MAX7456 #define BEEPER_PIN PA8 #define MOTOR1_PIN PB0 #define MOTOR2_PIN PB1 -#define MOTOR3_PIN PB6 -#define MOTOR4_PIN PC13 +#define MOTOR3_PIN PA4 +#define MOTOR4_PIN PC6 #define LED_STRIP_PIN PB2 #define UART1_TX_PIN PA9 #define UART1_RX_PIN PA10 @@ -54,9 +52,9 @@ #define UART4_RX_PIN PC11 #define I2C1_SCL_PIN PA15 #define I2C1_SDA_PIN PB7 -#define LED0_PIN PC15 -#define LED1_PIN PC14 -#define PINIO1_PIN PC6 +#define LED0_PIN PB6 +#define LED1_PIN PB9 +#define PINIO1_PIN PC15 #define SPI1_SCK_PIN PA5 #define SPI1_SDI_PIN PA6 #define SPI1_SDO_PIN PA7 @@ -68,23 +66,21 @@ #define SPI3_SDO_PIN PB5 #define ADC_VBAT_PIN PA0 #define ADC_CURR_PIN PA1 -#define FLASH_CS_PIN PB9 +#define FLASH_CS_PIN PC14 #define MAX7456_SPI_CS_PIN PB12 #define GYRO_1_EXTI_PIN PC4 -#define GYRO_1_CS_PIN PA4 +#define GYRO_1_CS_PIN PC13 #define TIMER_PIN_MAPPING \ - TIMER_PIN_MAP( 0, LED_STRIP_PIN, 1, 0 ) \ - TIMER_PIN_MAP( 1, MOTOR1_PIN, 1, 1 ) \ - TIMER_PIN_MAP( 2, MOTOR2_PIN, 1, 2 ) \ - TIMER_PIN_MAP( 3, MOTOR3_PIN, 3, 3 ) \ - TIMER_PIN_MAP( 4, MOTOR4_PIN, 2, 4 ) + TIMER_PIN_MAP( 0, LED_STRIP_PIN, 1, 0 ) \ + TIMER_PIN_MAP( 1, MOTOR1_PIN, 1, 1 ) \ + TIMER_PIN_MAP( 2, MOTOR2_PIN, 1, 2 ) \ + TIMER_PIN_MAP( 3, MOTOR3_PIN, 1, 3 ) \ + TIMER_PIN_MAP( 4, MOTOR4_PIN, 1, 4 ) \ + TIMER_PIN_MAP( 5, BEEPER_PIN, 1, -1 ) #define ADC1_DMA_OPT 8 -#define VTX_SMARTAUDIO_UART SERIAL_PORT_USART2 -#define SERIALRX_UART SERIAL_PORT_USART3 - #define BARO_I2C_INSTANCE I2CDEV_1 #define MAG_I2C_INSTANCE I2CDEV_1 @@ -93,7 +89,6 @@ #define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_ON #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC -#define DEFAULT_CURRENT_METER_SCALE 750 #define BEEPER_INVERTED #define MAX7456_SPI_INSTANCE SPI2 #define FLASH_SPI_INSTANCE SPI3