Skip to content

Commit

Permalink
[CONFIG] Updates from master-config and more (betaflight#12741)
Browse files Browse the repository at this point in the history
* Updates from master-config
* Add OMNIBUSF4NANO
* Add TMOTORH743
* add GEPRCG4AIO
* Update MAMBAG4
* Update NEUTRONRCF435
  • Loading branch information
haslinghuis authored and AkankshaJjw committed May 29, 2023
1 parent aae9819 commit ceaa8d1
Show file tree
Hide file tree
Showing 15 changed files with 508 additions and 41 deletions.
2 changes: 2 additions & 0 deletions src/config/AXISFLYINGF7PRO/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
#define USE_GYRO
#define USE_ACC
#define USE_ACCGYRO_BMI270
#define USE_GYRO_SPI_ICM42688P
#define USE_ACC_SPI_ICM42688P
#define USE_BARO_DPS310
#define USE_FLASH
#define USE_FLASH_W25Q128FV
Expand Down
101 changes: 101 additions & 0 deletions src/config/GEPRCG4AIO/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
/*
* 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 <http://www.gnu.org/licenses/>.
*/

#define FC_TARGET_MCU STM32G47X
#define BOARD_NAME GEPRCG4AIO
#define MANUFACTURER_ID GEPR

#define USE_ACC
#define USE_ACC_SPI_MPU6000
#define USE_ACC_SPI_ICM42688P
#define USE_GYRO
#define USE_GYRO_SPI_MPU6000
#define USE_GYRO_SPI_ICM42688P
#define USE_BARO
#define USE_BARO_BMP280
#define USE_FLASH
#define USE_FLASH_W25Q128FV
#define USE_MAX7456

#define BEEPER_PIN PA15
#define MOTOR1_PIN PA0
#define MOTOR2_PIN PA1
#define MOTOR3_PIN PA2
#define MOTOR4_PIN PA3
#define LED_STRIP_PIN PB6
#define UART1_TX_PIN PA9
#define UART2_TX_PIN PB3
// #define UART3_TX_PIN PB9
#define UART4_TX_PIN PC10
#define UART1_RX_PIN PA10
#define UART2_RX_PIN PB4
#define UART4_RX_PIN PC11
#define UART1_RX_PIN1 PB11
#define LPUART1_TX_PIN PB10
#define I2C1_SCL_PIN PA13
#define I2C1_SDA_PIN PA14
#define LED0_PIN PB7
#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 PB2
#define ADC_CURR_PIN PB1
#define FLASH_CS_PIN PC6
#define MAX7456_SPI_CS_PIN PA8
#define GYRO_1_EXTI_PIN PA4
#define GYRO_1_CS_PIN PB0

#define TIMER_PIN_MAPPING TIMER_PIN_MAP( 0, PB6 , 3, 9) \
TIMER_PIN_MAP( 1, PA0 , 1, 1) \
TIMER_PIN_MAP( 2, PA1 , 1, 2) \
TIMER_PIN_MAP( 3, PA2 , 2, 3) \
TIMER_PIN_MAP( 4, PA3 , 2, 4)

#define ADC1_DMA_OPT 10
#define ADC2_DMA_OPT 11

#define SPI1_RX_DMA_OPT 6
#define SPI1_TX_DMA_OPT 7

#define SPI2_RX_DMA_OPT 8
#define SPI2_TX_DMA_OPT 9

// #define TIMUP2_DMA_OPT 0
// #define TIMUP8_DMA_OPT 0

#define ADC_INSTANCE ADC2
#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_1
#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH
#define MAX7456_SPI_INSTANCE SPI2
#define BEEPER_INVERTED
#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
#define DEFAULT_CURRENT_METER_SCALE 120
#define FLASH_SPI_INSTANCE SPI2
#define USE_SPI_GYRO
#define GYRO_1_SPI_INSTANCE SPI1
#define GYRO_1_ALIGN CW270_DEG
2 changes: 1 addition & 1 deletion src/config/HGLRCF745/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
#define GYRO_1_ALIGN CW90_DEG
#define USE_SPI_GYRO
#define GYRO_2_SPI_INSTANCE SPI1
#define GYRO_2_ALIGN DEFAULT
#define GYRO_2_ALIGN CW0_DEG
#define USE_I2C1_PULLUP OFF
//TODO #define I2C1_OVERCLOCK ON
#define USE_I2C2_PULLUP OFF
Expand Down
2 changes: 2 additions & 0 deletions src/config/JHEF405/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
#define USE_GYRO_SPI_MPU6000
#define USE_ACC
#define USE_ACC_SPI_MPU6000
#define USE_FLASH
#define USE_FLASH_W25Q128FV
#define USE_MAX7456

#define BEEPER_PIN PB4
Expand Down
1 change: 1 addition & 0 deletions src/config/MAMBAF405US_I2C/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
#define ADC3_DMA_OPT 0

#define INVERTER_PIN_UART1 PC0
#define ESCSERIAL_PIN PB9
#define PINIO1_PIN PB0

#define USE_BARO
Expand Down
21 changes: 13 additions & 8 deletions src/config/MAMBAG4/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,31 +64,36 @@
#define UART1_TX_PIN PA9
#define UART2_RX_PIN PB4
#define UART2_TX_PIN PB3
#define UART3_RX_PIN PB11
#define UART3_TX_PIN PB10
#define UART3_TX_PIN PB9
#define UART4_RX_PIN PC11
#define UART4_TX_PIN PC10
#define SOFTSERIAL1_TX_PIN PB9
// alternative for UART5 ESC TLM
#define LPUART1_RX_PIN PB11

#define TIMER_PIN_MAPPING \
TIMER_PIN_MAP( 0, MOTOR1_PIN, 1, 1) \
TIMER_PIN_MAP( 1, MOTOR2_PIN, 1, 2) \
TIMER_PIN_MAP( 2, MOTOR3_PIN, 1, 3) \
TIMER_PIN_MAP( 3, MOTOR4_PIN, 1, 4) \
TIMER_PIN_MAP( 4, LED_STRIP_PIN, 3, 9)
TIMER_PIN_MAP( 4, LED_STRIP_PIN, 3, 12)


#define ADC1_DMA_OPT 1
#define TIMUP2_DMA_OPT 0
#define TIMUP8_DMA_OPT 0
#define ADC1_DMA_OPT 10
#define ADC2_DMA_OPT 11

#define SPI_RX_DMA_OPT 6
#define SPI_TX_DMA_OPT 7
#define SPI_RX_DMA_OPT 8
#define SPI_TX_DMA_OPT 9

#define ADC_INSTANCE ADC2
#define BARO_I2C_INSTANCE (I2CDEV_1)
#define BEEPER_INVERTED
#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH
#define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON
#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
#define DEFAULT_PID_PROCESS_DENOM 2
#define DEFAULT_PID_PROCESS_DENOM 2
#define MAX7456_SPI_INSTANCE SPI2
#define FLASH_SPI_INSTANCE SPI2
#define USE_SPI_GYRO
Expand Down
5 changes: 5 additions & 0 deletions src/config/NBD_CRICKETF7/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@
#define BOARD_NAME NBD_CRICKETF7
#define MANUFACTURER_ID NEBD

#define USE_ACC
#define USE_ACC_SPI_MPU6000
#define USE_GYRO
#define USE_GYRO_SPI_MPU6000

#define BEEPER_PIN PC15
#define MOTOR1_PIN PB4
#define MOTOR2_PIN PB1
Expand Down
4 changes: 4 additions & 0 deletions src/config/NBD_CRICKETF7V2/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
#define BOARD_NAME NBD_CRICKETF7V2
#define MANUFACTURER_ID NEBD

#define USE_ACC
#define USE_GYRO
#define USE_ACCGYRO_BMI270

#define BEEPER_PIN PC15
#define MOTOR1_PIN PB4
#define MOTOR2_PIN PB1
Expand Down
8 changes: 8 additions & 0 deletions src/config/NBD_INFINITYF4/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@
#define BOARD_NAME NBD_INFINITYF4
#define MANUFACTURER_ID NEBD

#define USE_ACC
#define USE_ACC_SPI_MPU6000
#define USE_GYRO
#define USE_GYRO_SPI_MPU6000
#define USE_FLASH
#define USE_FLASH_W25Q128FV
#define USE_MAX7456

#define BEEPER_PIN PB6
#define MOTOR1_PIN PB1
#define MOTOR2_PIN PB0
Expand Down
110 changes: 83 additions & 27 deletions src/config/NEUTRONRCF435/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,51 +19,107 @@
* If not, see <http://www.gnu.org/licenses/>.
*/

#define FC_TARGET_MCU AT32F435G
#pragma once

#define BOARD_NAME NEUTRONRCF435
#define MANUFACTURER_ID NERC
#define FC_TARGET_MCU AT32F435G

#define LED0_PIN PC4
#define BOARD_NAME NEUTRONRCF435
#define MANUFACTURER_ID NERC

#define USE_GYRO
#define USE_ACC
#define USE_GYRO
#define USE_ACCGYRO_BMI270
#define GYRO_1_CS_PIN PA15
#define GYRO_1_SPI_INSTANCE SPI1
#define GYRO_1_ALIGN CW270_DEG

#define GYRO_1_CS_PIN PA15
#define GYRO_1_SPI_INSTANCE SPI1
#define GYRO_1_ALIGN CW270_DEG

// MPU6000 interrupts
#define USE_EXTI
#define USE_GYRO_EXTI
#define GYRO_1_EXTI_PIN PB8

#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 GYRO_1_EXTI_PIN PB8

#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 BEEPER_PIN PC15

#define MOTOR1_PIN PC9
#define MOTOR2_PIN PC8
#define MOTOR3_PIN PC7
#define MOTOR4_PIN PC6

#define SERVO1_PIN PB6
#define SERVO2_PIN PB7
#define SERVO3_PIN PB1
#define SERVO4_PIN PB0

#define RX_PPM_PIN PA3

#define LED0_PIN PC4
#define LED_STRIP_PIN PA1

#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 PB10
#define I2C1_SDA_PIN PB11

//TODO resource RX_BIND 1 @01
#define RX_BIND_PLUG_PIN PO15

#define CAMERA_CONTROL_PIN PA0

#define ADC_VBAT_PIN PC2
#define ADC_CURR_PIN PC1
#define ADC1_DMA_OPT 11

#define USE_FLASH
#define USE_FLASH_W25Q128FV
#define FLASH_CS_PIN PB9
#define FLASH_SPI_INSTANCE SPI3
#define FLASH_CS_PIN PB9
#define FLASH_SPI_INSTANCE SPI3

#define I2C2_SCL_PIN PB10
#define I2C2_SDA_PIN PB11
#define I2C2_SCL_PIN PB10
#define I2C2_SDA_PIN PB11

#define BARO_I2C_INSTANCE I2CDEV_2
#define BARO_I2C_INSTANCE I2CDEV_2
#define USE_BARO
#define USE_BARO_BMP280
#define USE_BARO_DPS310

#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI2
#define MAX7456_SPI_CS_PIN PB12
#define MAX7456_SPI_INSTANCE SPI2
#define MAX7456_SPI_CS_PIN PB12

#define ADC1_DMA_OPT 1
#define TIMER_PIN_MAPPING TIMER_PIN_MAP( 0, CAMERA_CONTROL_PIN, 2, 13 ) \
TIMER_PIN_MAP( 1, LED_STRIP_PIN, 2, 7 ) \
TIMER_PIN_MAP( 2, UART2_RX_PIN, 1, 6 ) \
TIMER_PIN_MAP( 3, SERVO1_PIN, 1, 11 ) \
TIMER_PIN_MAP( 4, SERVO2_PIN, 1, 10 ) \
TIMER_PIN_MAP( 5, SERVO3_PIN, 2, 8 ) \
TIMER_PIN_MAP( 6, SERVO4_PIN, 2, 9 ) \
TIMER_PIN_MAP( 7, MOTOR1_PIN, 2, 0 ) \
TIMER_PIN_MAP( 8, MOTOR2_PIN, 2, 2 ) \
TIMER_PIN_MAP( 9, MOTOR3_PIN, 1, 1 ) \
TIMER_PIN_MAP(10, MOTOR4_PIN, 1, 3 )

#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
#define DEFAULT_VOLTAGE_METER_SCALE 210
#define DEFAULT_CURRENT_METER_SCALE 400

0 comments on commit ceaa8d1

Please sign in to comment.