From 96a7fa5422f10c7859d5c1647f0e942a0a0e6f1e Mon Sep 17 00:00:00 2001 From: ot0tot <36753790+ot0tot@users.noreply.github.com> Date: Fri, 11 Oct 2024 11:37:08 -0400 Subject: [PATCH] Fix KAKUTEF4WING timer and DMA assignments (#590) --- configs/KAKUTEF4WING/config.h | 46 +++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/configs/KAKUTEF4WING/config.h b/configs/KAKUTEF4WING/config.h index a4be6a5f..258b3b22 100644 --- a/configs/KAKUTEF4WING/config.h +++ b/configs/KAKUTEF4WING/config.h @@ -81,36 +81,36 @@ #define PINIO2_PIN PB15 #define TIMER_PIN_MAPPING \ - TIMER_PIN_MAP( 0, MOTOR1_PIN , 1, 1) \ - TIMER_PIN_MAP( 1, MOTOR2_PIN , 1, 1) \ - TIMER_PIN_MAP( 2, SERVO1_PIN , 2, 0) \ - TIMER_PIN_MAP( 3, SERVO2_PIN , 2, 0) \ - TIMER_PIN_MAP( 4, SERVO3_PIN , 2, 1) \ - TIMER_PIN_MAP( 5, SERVO4_PIN , 2, 0) \ - TIMER_PIN_MAP( 6, LED_STRIP_PIN , 1, 0) + TIMER_PIN_MAP( 0, MOTOR1_PIN , 1, 1) \ + TIMER_PIN_MAP( 1, MOTOR2_PIN , 1, 1) \ + TIMER_PIN_MAP( 2, SERVO1_PIN , 2, -1) \ + TIMER_PIN_MAP( 3, SERVO2_PIN , 2, -1) \ + TIMER_PIN_MAP( 4, SERVO3_PIN , 2, -1) \ + TIMER_PIN_MAP( 5, SERVO4_PIN , 2, -1) \ + TIMER_PIN_MAP( 6, LED_STRIP_PIN, 1, 0) -#define ADC1_DMA_OPT 0 +#define ADC1_DMA_OPT 1 #define MIXER_MODE MIXER_FLYING_WING #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 -#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL +#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH +#define SERIALRX_UART SERIAL_PORT_USART3 +#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC -#define DEFAULT_VOLTAGE_METER_SCALE 110 -#define DEFAULT_CURRENT_METER_SCALE 250 -#define SYSTEM_HSE_MHZ 8 -#define MAX7456_SPI_INSTANCE SPI2 -#define FLASH_SPI_INSTANCE SPI3 -#define PINIO1_CONFIG 129 -#define PINIO1_BOX 40 -#define PINIO2_CONFIG 129 -#define PINIO2_BOX 41 -#define GYRO_1_SPI_INSTANCE SPI1 -#define GYRO_1_ALIGN CW270_DEG -#define GYRO_1_ALIGN_YAW 2700 +#define DEFAULT_VOLTAGE_METER_SCALE 110 +#define DEFAULT_CURRENT_METER_SCALE 250 +#define SYSTEM_HSE_MHZ 8 +#define MAX7456_SPI_INSTANCE SPI2 +#define FLASH_SPI_INSTANCE SPI3 +#define PINIO1_CONFIG 129 +#define PINIO1_BOX 40 +#define PINIO2_CONFIG 129 +#define PINIO2_BOX 41 +#define GYRO_1_SPI_INSTANCE SPI1 +#define GYRO_1_ALIGN CW270_DEG +#define GYRO_1_ALIGN_YAW 2700