Skip to content

Update Holybro #609

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

Merged
haslinghuis merged 11 commits into from
Nov 15, 2024
Merged

Update Holybro #609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
82171c7
Update Holybro
haslinghuis Nov 15, 2024
fa17e17
Update configs/KAKUTEF4/config.h
haslinghuis Nov 15, 2024
f9f2edc
Update configs/KAKUTEF4V2/config.h
haslinghuis Nov 15, 2024
b7f7e7a
Remove RX_PPM from KAKUTEF7
haslinghuis Nov 15, 2024
018ad01
Remove RX_PPM from KAKUTEF7HDV
haslinghuis Nov 15, 2024
a9a75b4
Remove RX_PPM from other F7 boards too
haslinghuis Nov 15, 2024
d9beaf7
Camera Control does not need DMA
haslinghuis Nov 15, 2024
924953f
Remove PE13 PPM_RX_PIN from KAKUTEF7V2
haslinghuis Nov 15, 2024
1d9606d
Fix copy paste error
haslinghuis Nov 15, 2024
c2a268f
Update TIMUP5_DMA_OPT
haslinghuis Nov 15, 2024
2762d17
While we are at it
haslinghuis Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 16 additions & 20 deletions configs/KAKUTEF4/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
#define USE_GYRO_SPI_MPU6000
#define USE_GYRO_SPI_ICM20689
#define USE_ACC_SPI_ICM20689
#define USE_BARO
#define USE_BARO_BMP280
#define USE_FLASH
#define USE_FLASH_W25Q128FV
#define USE_MAX7456
Expand Down Expand Up @@ -74,26 +72,24 @@
#define USB_DETECT_PIN PA8

#define TIMER_PIN_MAPPING \
TIMER_PIN_MAP( 0, PC7 , 2, 0) \
TIMER_PIN_MAP( 1, PB0 , 2, 0) \
TIMER_PIN_MAP( 2, PB1 , 2, 0) \
TIMER_PIN_MAP( 3, PA3 , 1, 1) \
TIMER_PIN_MAP( 4, PA2 , 1, 0) \
TIMER_PIN_MAP( 5, PA0 , 2, 0) \
TIMER_PIN_MAP( 6, PC8 , 2, 1) \
TIMER_PIN_MAP( 7, PA1 , 2, 0)


#define ADC1_DMA_OPT 0
TIMER_PIN_MAP( 0, RX_PPM_PIN, 2, -1) \
TIMER_PIN_MAP( 1, MOTOR1_PIN, 2, 0) \
TIMER_PIN_MAP( 2, MOTOR2_PIN, 2, 0) \
TIMER_PIN_MAP( 3, MOTOR3_PIN, 1, 1) \
TIMER_PIN_MAP( 4, MOTOR4_PIN, 1, 0) \
TIMER_PIN_MAP( 5, MOTOR5_PIN, 2, 0) \
TIMER_PIN_MAP( 6, MOTOR6_PIN, 2, 1) \
TIMER_PIN_MAP( 7, LED_STRIP_PIN, 2, 0)

#define ADC1_DMA_OPT 0

#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
#define DEFAULT_CURRENT_METER_SCALE 275
#define DEFAULT_CURRENT_METER_SCALE 275
#define BEEPER_INVERTED
#define SYSTEM_HSE_MHZ 8
#define MAX7456_SPI_INSTANCE SPI3
#define SYSTEM_HSE_MHZ 8
#define MAX7456_SPI_INSTANCE SPI3
//TODO #define MAX7456_PREINIT_OPU ON
#define FLASH_SPI_INSTANCE SPI3
#define GYRO_1_SPI_INSTANCE SPI1
#define GYRO_1_ALIGN CW270_DEG
#define GYRO_1_ALIGN_YAW 2700
#define FLASH_SPI_INSTANCE SPI3
#define GYRO_1_SPI_INSTANCE SPI1
#define GYRO_1_ALIGN CW270_DEG
#define GYRO_1_ALIGN_YAW 2700
37 changes: 18 additions & 19 deletions configs/KAKUTEF4V2/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
#define USE_GYRO_SPI_MPU6000
#define USE_GYRO_SPI_ICM20689
#define USE_ACC_SPI_ICM20689
#define USE_BARO
#define USE_BARO_BMP280
#define USE_BARO_DPS310
#define USE_FLASH
#define USE_FLASH_W25Q128FV
#define USE_MAX7456
Expand Down Expand Up @@ -76,30 +78,27 @@
#define USB_DETECT_PIN PA8

#define TIMER_PIN_MAPPING \
TIMER_PIN_MAP( 0, PC7 , 2, 0) \
TIMER_PIN_MAP( 1, PB0 , 2, 0) \
TIMER_PIN_MAP( 2, PB1 , 2, 0) \
TIMER_PIN_MAP( 3, PA3 , 1, 1) \
TIMER_PIN_MAP( 4, PA2 , 1, 0) \
TIMER_PIN_MAP( 5, PC8 , 2, 0)

TIMER_PIN_MAP( 0, RX_PPM_PIN, 2, -1) \
TIMER_PIN_MAP( 1, MOTOR1_PIN, 2, 0) \
TIMER_PIN_MAP( 2, MOTOR2_PIN, 2, 0) \
TIMER_PIN_MAP( 3, MOTOR3_PIN, 1, 1) \
TIMER_PIN_MAP( 4, MOTOR4_PIN, 1, 0) \
TIMER_PIN_MAP( 5, LED_STRIP_PIN, 2, 0)

#define ADC1_DMA_OPT 1
#define ADC1_DMA_OPT 1

#define MAG_I2C_INSTANCE (I2CDEV_1)
#define USE_BARO
#define BARO_I2C_INSTANCE (I2CDEV_1)
#define MAG_I2C_INSTANCE I2CDEV_1
#define BARO_I2C_INSTANCE I2CDEV_1

#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
#define DEFAULT_CURRENT_METER_SCALE 275
#define DEFAULT_CURRENT_METER_SCALE 275
#define BEEPER_INVERTED
//TODO #define TLM_INVERTED ON
//TODO #define TLM_HALFDUPLEX OFF
#define SYSTEM_HSE_MHZ 8
#define MAX7456_SPI_INSTANCE SPI3
#define SYSTEM_HSE_MHZ 8
#define MAX7456_SPI_INSTANCE SPI3
//TODO #define MAX7456_PREINIT_OPU ON
#define DASHBOARD_I2C_INSTANCE (I2CDEV_1)
#define FLASH_SPI_INSTANCE SPI3
#define GYRO_1_SPI_INSTANCE SPI1
#define GYRO_1_ALIGN CW270_DEG
#define GYRO_2_SPI_INSTANCE SPI1
#define FLASH_SPI_INSTANCE SPI3
#define GYRO_1_SPI_INSTANCE SPI1
#define GYRO_1_ALIGN CW270_DEG
#define GYRO_2_SPI_INSTANCE SPI1
7 changes: 3 additions & 4 deletions configs/KAKUTEF4WING/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,12 @@
TIMER_PIN_MAP( 5, SERVO4_PIN , 2, -1) \
TIMER_PIN_MAP( 6, LED_STRIP_PIN, 1, 0)


#define ADC1_DMA_OPT 1

#define MIXER_MODE MIXER_FLYING_WING
#define MIXER_MODE MIXER_FLYING_WING

#define MAG_I2C_INSTANCE (I2CDEV_2)
#define BARO_I2C_INSTANCE (I2CDEV_2)
#define MAG_I2C_INSTANCE I2CDEV_2
#define BARO_I2C_INSTANCE I2CDEV_2

#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH
#define SERIALRX_UART SERIAL_PORT_USART3
Expand Down
42 changes: 20 additions & 22 deletions configs/KAKUTEF7/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
#define USE_ACC_SPI_ICM20689
#define USE_GYRO_SPI_MPU6000
#define USE_ACC_SPI_MPU6000
#define USE_BARO
#define USE_BARO_BMP280
#define USE_BARO_DPS310
#define USE_MAX7456
#define USE_SDCARD

Expand Down Expand Up @@ -79,33 +81,29 @@
#define USB_DETECT_PIN PA8

#define TIMER_PIN_MAPPING \
TIMER_PIN_MAP( 0, PE13, 1, 1) \
TIMER_PIN_MAP( 1, PB0 , 2, 0) \
TIMER_PIN_MAP( 2, PB1 , 2, 0) \
TIMER_PIN_MAP( 3, PE9 , 1, 2) \
TIMER_PIN_MAP( 4, PE11, 1, 1) \
TIMER_PIN_MAP( 5, PC9 , 2, 0) \
TIMER_PIN_MAP( 6, PA3 , 2, 0) \
TIMER_PIN_MAP( 7, PD12, 1, 0)
TIMER_PIN_MAP( 0, MOTOR1_PIN , 2, 0) \
TIMER_PIN_MAP( 1, MOTOR2_PIN , 2, 0) \
TIMER_PIN_MAP( 2, MOTOR3_PIN , 1, 2) \
TIMER_PIN_MAP( 3, MOTOR4_PIN , 1, 1) \
TIMER_PIN_MAP( 4, MOTOR5_PIN , 2, 0) \
TIMER_PIN_MAP( 5, MOTOR6_PIN , 2, 0) \
TIMER_PIN_MAP( 6, LED_STRIP_PIN, 1, 0)

#define SPI1_TX_DMA_OPT 1
#define ADC1_DMA_OPT 1

#define SPI1_TX_DMA_OPT 1
#define ADC1_DMA_OPT 1
#define MAG_I2C_INSTANCE I2CDEV_1
#define BARO_I2C_INSTANCE I2CDEV_1

#define MAG_I2C_INSTANCE (I2CDEV_1)
#define USE_BARO
#define BARO_I2C_INSTANCE (I2CDEV_1)
#define DEFAULT_BARO_DEVICE BARO_BMP280
#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD
#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD
#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
#define DEFAULT_CURRENT_METER_SCALE 275
#define DEFAULT_CURRENT_METER_SCALE 275
#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
#define BEEPER_INVERTED
#define SDCARD_DETECT_INVERTED
#define USE_SDCARD_SPI
#define SDCARD_SPI_INSTANCE SPI1
#define MAX7456_SPI_INSTANCE SPI2
#define DASHBOARD_I2C_INSTANCE (I2CDEV_1)
#define GYRO_1_SPI_INSTANCE SPI4
#define GYRO_1_ALIGN CW270_DEG
#define GYRO_2_SPI_INSTANCE SPI4
#define SDCARD_SPI_INSTANCE SPI1
#define MAX7456_SPI_INSTANCE SPI2
#define GYRO_1_SPI_INSTANCE SPI4
#define GYRO_1_ALIGN CW270_DEG
#define GYRO_2_SPI_INSTANCE SPI4
41 changes: 19 additions & 22 deletions configs/KAKUTEF7HDV/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@
#define USE_ACC_SPI_MPU6000
#define USE_GYRO
#define USE_GYRO_SPI_MPU6000
#define USE_BARO
#define USE_BARO_BMP280
#define USE_BARO_DPS310
#define USE_SDCARD

#define BEEPER_PIN PD15
Expand Down Expand Up @@ -76,33 +78,28 @@
#define USB_DETECT_PIN PA8

#define TIMER_PIN_MAPPING \
TIMER_PIN_MAP( 0, PE13, 1, 1) \
TIMER_PIN_MAP( 1, PB0 , 2, 0) \
TIMER_PIN_MAP( 2, PB1 , 2, 0) \
TIMER_PIN_MAP( 3, PE9 , 1, 2) \
TIMER_PIN_MAP( 4, PE11, 1, 1) \
TIMER_PIN_MAP( 5, PC9 , 2, 0) \
TIMER_PIN_MAP( 6, PA3 , 2, 0) \
TIMER_PIN_MAP( 7, PD12, 1, 0)

TIMER_PIN_MAP( 0, MOTOR1_PIN , 2, 0) \
TIMER_PIN_MAP( 1, MOTOR2_PIN , 2, 0) \
TIMER_PIN_MAP( 2, MOTOR3_PIN , 1, 2) \
TIMER_PIN_MAP( 3, MOTOR4_PIN , 1, 1) \
TIMER_PIN_MAP( 4, MOTOR5_PIN , 2, 0) \
TIMER_PIN_MAP( 5, MOTOR6_PIN , 2, 0) \
TIMER_PIN_MAP( 6, LED_STRIP_PIN, 1, 0)

#define SPI1_TX_DMA_OPT 1
#define ADC1_DMA_OPT 1
#define SPI1_TX_DMA_OPT 1
#define ADC1_DMA_OPT 1

#define MAG_I2C_INSTANCE I2CDEV_1
#define BARO_I2C_INSTANCE I2CDEV_1

#define MAG_I2C_INSTANCE (I2CDEV_1)
#define USE_BARO
#define BARO_I2C_INSTANCE (I2CDEV_1)
#define DEFAULT_BARO_DEVICE BARO_BMP280
#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD
#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD
#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
#define DEFAULT_CURRENT_METER_SCALE 275
#define DEFAULT_CURRENT_METER_SCALE 275
#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
#define BEEPER_INVERTED
#define SDCARD_DETECT_INVERTED
#define USE_SDCARD_SPI
#define SDCARD_SPI_INSTANCE SPI1
#define DASHBOARD_I2C_INSTANCE (I2CDEV_1)
#define GYRO_1_SPI_INSTANCE SPI4
#define GYRO_1_ALIGN CW270_DEG
#define GYRO_2_SPI_INSTANCE SPI4
#define SDCARD_SPI_INSTANCE SPI1
#define GYRO_1_SPI_INSTANCE SPI4
#define GYRO_1_ALIGN CW270_DEG
#define GYRO_2_SPI_INSTANCE SPI4
27 changes: 13 additions & 14 deletions configs/KAKUTEF7MINI/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_ICM20689
#define USE_BARO
#define USE_BARO_BMP280
#define USE_BARO_DPS310
#define USE_FLASH
#define USE_FLASH_W25Q128FV
#define USE_MAX7456
Expand Down Expand Up @@ -81,29 +82,27 @@
#define USB_DETECT_PIN PA8

#define TIMER_PIN_MAPPING \
TIMER_PIN_MAP( 0, PE13, 1, 1) \
TIMER_PIN_MAP( 1, PB0 , 2, 0) \
TIMER_PIN_MAP( 2, PB1 , 2, 0) \
TIMER_PIN_MAP( 3, PE9 , 1, 2) \
TIMER_PIN_MAP( 4, PE11, 1, 1) \
TIMER_PIN_MAP( 5, PC9 , 2, 0) \
TIMER_PIN_MAP( 6, PA3 , 2, 0) \
TIMER_PIN_MAP( 7, PD12, 1, 0) \
TIMER_PIN_MAP( 8, PB3 , 1, 0)
TIMER_PIN_MAP( 0, MOTOR1_PIN , 2, 0) \
TIMER_PIN_MAP( 1, MOTOR2_PIN , 2, 0) \
TIMER_PIN_MAP( 2, MOTOR3_PIN , 1, 2) \
TIMER_PIN_MAP( 3, MOTOR4_PIN , 1, 1) \
TIMER_PIN_MAP( 4, MOTOR5_PIN , 2, 0) \
TIMER_PIN_MAP( 5, MOTOR6_PIN , 2, 0) \
TIMER_PIN_MAP( 6, LED_STRIP_PIN , 1, 0) \
TIMER_PIN_MAP( 7, CAMERA_CONTROL_PIN, 1, -1)


#define ADC1_DMA_OPT 1
#define MAG_I2C_INSTANCE (I2CDEV_1)
#define MAG_HARDWARE NONE
#define BARO_I2C_INSTANCE (I2CDEV_1)
#define BARO_HARDWARE BMP280

#define MAG_I2C_INSTANCE I2CDEV_1
#define BARO_I2C_INSTANCE I2CDEV_1

#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH
#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
#define DEFAULT_CURRENT_METER_SCALE 275
#define BEEPER_INVERTED
#define MAX7456_SPI_INSTANCE SPI2
#define DASHBOARD_I2C_INSTANCE (I2CDEV_1)
#define FLASH_SPI_INSTANCE SPI1
#define GYRO_1_SPI_INSTANCE SPI4
#define GYRO_1_ALIGN CW270_DEG
Expand Down
40 changes: 19 additions & 21 deletions configs/KAKUTEF7MINIV3/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_BARO
#define USE_BARO_BMP280
#define USE_BARO_DPS310
#define USE_FLASH
#define USE_FLASH_W25Q128FV
#define USE_MAX7456
Expand Down Expand Up @@ -80,30 +81,27 @@
#define CAMERA_CONTROL_PIN PB3

#define TIMER_PIN_MAPPING \
TIMER_PIN_MAP( 0, PB4 , 1, 0) \
TIMER_PIN_MAP( 1, PB5 , 1, 0) \
TIMER_PIN_MAP( 2, PB0 , 2, 0) \
TIMER_PIN_MAP( 3, PB1 , 2, 0) \
TIMER_PIN_MAP( 4, PB3 , 1, 0) \
TIMER_PIN_MAP( 5, PB6 , 1, 0) \
TIMER_PIN_MAP( 6, PB7 , 1, 0) \
TIMER_PIN_MAP( 7, PA8 , 1, 2) \
TIMER_PIN_MAP( 8, PA3 , 3, -1)
TIMER_PIN_MAP( 0, MOTOR1_PIN , 2, 0) \
TIMER_PIN_MAP( 1, MOTOR2_PIN , 2, 0) \
TIMER_PIN_MAP( 2, MOTOR3_PIN , 1, 0) \
TIMER_PIN_MAP( 3, MOTOR4_PIN , 1, 0) \
TIMER_PIN_MAP( 4, MOTOR5_PIN , 1, 0) \
TIMER_PIN_MAP( 5, MOTOR6_PIN , 1, 0) \
TIMER_PIN_MAP( 6, CAMERA_CONTROL_PIN, 1, -1) \
TIMER_PIN_MAP( 7, LED_STRIP_PIN , 1, 2)

#define ADC1_DMA_OPT 1

#define ADC1_DMA_OPT 1
#define MAG_I2C_INSTANCE I2CDEV_1
#define BARO_I2C_INSTANCE I2CDEV_1

#define MAG_I2C_INSTANCE (I2CDEV_1)
#define BARO_I2C_INSTANCE (I2CDEV_1)
#define DEFAULT_BARO_DEVICE BARO_BMP280
#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH
#define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON
#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_CURRENT_METER_SCALE 275
#define DEFAULT_CURRENT_METER_SCALE 275
#define BEEPER_INVERTED
#define MAX7456_SPI_INSTANCE SPI3
#define FLASH_SPI_INSTANCE SPI2
#define GYRO_1_SPI_INSTANCE SPI1
#define GYRO_1_ALIGN CW270_DEG
#define GYRO_2_SPI_INSTANCE SPI1
#define MAX7456_SPI_INSTANCE SPI3
#define FLASH_SPI_INSTANCE SPI2
#define GYRO_1_SPI_INSTANCE SPI1
#define GYRO_1_ALIGN CW270_DEG
Loading