Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX CONFIG #12480

Merged
merged 3 commits into from
Mar 9, 2023
Merged

FIX CONFIG #12480

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0a4ff9
FIX CONFIG and Add AOCODARCF722
haslinghuis Mar 8, 2023
1c92942
Fixes per review
haslinghuis Mar 9, 2023
33aac5a
Remove more non-existent settings
haslinghuis Mar 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/config/FLYWOOF405NANO/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#define USE_GYRO_SPI_ICM42688P
#define USE_ACC_SPI_ICM42688P
#define USE_BARO_BMP280
#define USE_BARO_DPS310
#define USE_FLASH_W25Q128FV
#define USE_MAX7456

Expand Down
3 changes: 2 additions & 1 deletion src/config/FOXEERF722V4/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
#define USE_ACC_SPI_MPU6000
#define USE_GYRO_SPI_ICM42688P
#define USE_ACC_SPI_ICM42688P
#define USE_BARO
#define USE_BARO_DPS310
#define USE_FLASH_W25Q128FV
#define USE_MAX7456

Expand Down Expand Up @@ -93,7 +95,6 @@

//TODO #define MAG_BUSTYPE I2C
#define MAG_I2C_INSTANCE (I2CDEV_1)
#define USE_BARO
#define BARO_I2C_INSTANCE (I2CDEV_1)
#define USE_ADC
#define ADC_INSTANCE ADC3
Expand Down
84 changes: 46 additions & 38 deletions src/config/MAMBAG4/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,64 +28,72 @@

#define USE_ACC
#define USE_ACC_SPI_MPU6000
#define USE_BARO
#define USE_BARO_DPS310
#define USE_GYRO
#define USE_GYRO_SPI_MPU6000
#define USE_FLASH_W25Q128FV
#define USE_MAX7456

#define ADC_VBAT_PIN PB2
#define ADC_CURR_PIN PB1
#define BEEPER_PIN PA15
#define FLASH_CS_PIN PC6
#define GYRO_1_EXTI_PIN PC4
#define GYRO_2_EXTI_PIN PB12
#define GYRO_1_CS_PIN PA4
#define GYRO_2_CS_PIN PB0
#define I2C1_SCL_PIN PA13
#define I2C1_SDA_PIN PA14
#define LED0_PIN PC15
#define LED1_PIN PC14
#define LED_STRIP_PIN PB6
#define MAX7456_SPI_CS_PIN PA8
#define MOTOR1_PIN PA0
#define MOTOR2_PIN PA1
#define MOTOR3_PIN PA2
#define MOTOR4_PIN PA3
#define SPI1_SCK_PIN PA5
#define SPI1_SDI_PIN PA6
#define SPI1_SDO_PIN PA7
#define SPI2_SCK_PIN PB13
#define SPI2_SDI_PIN PB14
#define SPI2_SDO_PIN PB15
#define UART1_RX_PIN PA10
#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 UART4_RX_PIN PC11
#define UART4_TX_PIN PC10
#define UART11_TX_PIN PB9
#define UART1_RX_PIN PA10
#define UART2_RX_PIN PB4
#define UART3_RX_PIN PB11
#define UART4_RX_PIN PC11
#define I2C1_SCL_PIN PA13
#define I2C1_SDA_PIN PA14
#define LED0_PIN PC15
#define LED1_PIN PC14
#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 PC4
#define GYRO_2_EXTI_PIN PB12
#define GYRO_1_CS_PIN PA4
#define GYRO_2_CS_PIN PB0

#define TIMER_PIN_MAPPING \
TIMER_PIN_MAP( 0, PA0 , 1, 1) \
TIMER_PIN_MAP( 1, PA1 , 1, 2) \
TIMER_PIN_MAP( 2, PA2 , 1, 3) \
TIMER_PIN_MAP( 3, PA3 , 1, 4) \
TIMER_PIN_MAP( 4, PB6 , 3, 9)
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)


#define ADC1_DMA_OPT 1
#define TIMUP2_DMA_OPT 0
#define TIMUP8_DMA_OPT 0
#define ADC1_DMA_OPT 1
#define TIMUP2_DMA_OPT 0
#define TIMUP8_DMA_OPT 0

#define USE_BARO
#define BARO_I2C_INSTANCE (I2CDEV_1)
#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 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
//TODO #define PID_PROCESS_DENOM 2
#define MAX7456_SPI_INSTANCE SPI2
#define FLASH_SPI_INSTANCE SPI2
#define GYRO_1_SPI_INSTANCE SPI1
#define GYRO_1_ALIGN CW180_DEG
#define GYRO_1_ALIGN_YAW 1800
#define GYRO_2_SPI_INSTANCE SPI1
#define GYRO_2_ALIGN CW270_DEG
#define GYRO_2_ALIGN_YAW 2700
#define MAX7456_SPI_INSTANCE SPI2
#define FLASH_SPI_INSTANCE SPI2
#define USE_SPI_GYRO
#define GYRO_1_SPI_INSTANCE SPI1
#define GYRO_1_ALIGN CW180_DEG
#define GYRO_1_ALIGN_YAW 1800
#define GYRO_2_SPI_INSTANCE SPI1
#define GYRO_2_ALIGN CW270_DEG
#define GYRO_2_ALIGN_YAW 2700
2 changes: 1 addition & 1 deletion src/config/MATEKF405TE/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
#define DEFAULT_CURRENT_METER_SCALE 150
#define BEEPER_INVERTED
#define SYSTEM_HSE_MHZ 8
#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH
#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD
#define MAX7456_SPI_INSTANCE SPI1
#define PINIO1_BOX 40
#define PINIO2_BOX 41
Expand Down
6 changes: 3 additions & 3 deletions src/config/MATEKH743/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@
#define GYRO_1_CS_PIN PC15
#define GYRO_2_CS_PIN PE11
#define USB_DETECT_PIN PE2
#define VBAT_ADC_PIN PC0 //ADC123 VBAT1
#define CURRENT_METER_ADC_PIN PC1 //ADC123 CURR1
#define RSSI_ADC_PIN PC5 //ADC12 RSSI
#define ADC_VBAT_PIN PC0 //ADC123 VBAT1
#define ADC_CURR_PIN PC1 //ADC123 CURR1
#define ADC_RSSI_PIN PC5 //ADC12 RSSI
blckmn marked this conversation as resolved.
Show resolved Hide resolved


#define TIMER_PIN_MAPPING \
Expand Down
6 changes: 3 additions & 3 deletions src/config/SPRACINGH7RF/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,14 @@
#define CURRENT_METER_1_ADC_INSTANCE ADC3
#define ADC_EXTERNAL1_PIN PC2
#define ADC_EXTERNAL1_INSTANCE ADC3
#define VBAT_ADC_PIN PC3
#define ADC_VBAT_PIN PC3
blckmn marked this conversation as resolved.
Show resolved Hide resolved
#define VBAT_ADC_INSTANCE ADC3
#define VIDEO_IN_ADC_PIN PC5
#define VIDEO_OUT_ADC_PIN PC4

#define RSSI_ADC_PIN CURRENT_METER_2_ADC_PIN
#define ADC_RSSI_PIN CURRENT_METER_2_ADC_PIN
blckmn marked this conversation as resolved.
Show resolved Hide resolved
#define RSSI_ADC_INSTANCE CURRENT_METER_2_ADC_INSTANCE
#define CURRENT_METER_ADC_PIN CURRENT_METER_1_ADC_PIN
#define ADC_CURR_PIN CURRENT_METER_1_ADC_PIN
blckmn marked this conversation as resolved.
Show resolved Hide resolved
#define CURRENT_METER_ADC_INSTANCE CURRENT_METER_1_ADC_INSTANCE
#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
Expand Down