From a3ca659dc9d500ce8035bc0fd6d279aab735e181 Mon Sep 17 00:00:00 2001 From: elin-neo Date: Wed, 27 Mar 2019 14:36:30 +0900 Subject: [PATCH] Update ELINF405 config --- src/main/target/REVO/target.c | 9 ++++----- src/main/target/REVO/target.h | 13 ++++++++++++- src/main/target/REVO/target.mk | 2 ++ unified_targets/configs/ELINF405.config | 21 ++++++++++++--------- 4 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src/main/target/REVO/target.c b/src/main/target/REVO/target.c index e5b081dff..427fc2ca0 100644 --- a/src/main/target/REVO/target.c +++ b/src/main/target/REVO/target.c @@ -29,13 +29,12 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { #if defined(ELINF405) - DEF_TIM(TIM11, CH1, PB9, TIM_USE_ANY, 0, 0), - DEF_TIM(TIM8, CH2N, PB0, TIM_USE_MOTOR, 0, 0), - DEF_TIM(TIM8, CH3N, PB1, TIM_USE_MOTOR, 0, 0), - DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR, 0, 0), + DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0), + DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0), + DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR, 0, 1), DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, 0, 0), DEF_TIM(TIM1, CH1, PA8, TIM_USE_ANY, 0, 0), - DEF_TIM(TIM3, CH4, PC9, TIM_USE_ANY, 0, 0), + DEF_TIM(TIM8, CH4, PC9, TIM_USE_ANY, 0, 0), DEF_TIM(TIM4, CH1, PB6, TIM_USE_PPM | TIM_USE_LED, 0, 0), DEF_TIM(TIM4, CH2, PB7, TIM_USE_CAMERA_CONTROL, 0, 0), #else diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h index b87a0663a..cf36ab5e4 100644 --- a/src/main/target/REVO/target.h +++ b/src/main/target/REVO/target.h @@ -164,6 +164,17 @@ #define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) #define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) +#define USE_BARO +#define USE_BARO_MS5611 +#define USE_BARO_BMP085 +#define USE_BARO_BMP280 + +#define USE_MAG +#define USE_MAG_HMC5883 +#define USE_MAG_QMC5883 +#define USE_MAG_AK8963 +#define USE_MAG_AK8975 + #else #define GYRO_2_EXTI_PIN NONE @@ -320,7 +331,7 @@ #if defined(ELINF405) #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC -#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #endif #if defined(AIRBOTF4SD) diff --git a/src/main/target/REVO/target.mk b/src/main/target/REVO/target.mk index 2a7790660..2412d8926 100644 --- a/src/main/target/REVO/target.mk +++ b/src/main/target/REVO/target.mk @@ -14,4 +14,6 @@ TARGET_SRC = \ drivers/barometer/barometer_bmp280.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_ak8963.c \ + drivers/compass/compass_ak8975.c \ drivers/max7456.c diff --git a/unified_targets/configs/ELINF405.config b/unified_targets/configs/ELINF405.config index 61ddea58e..70d1a6976 100755 --- a/unified_targets/configs/ELINF405.config +++ b/unified_targets/configs/ELINF405.config @@ -1,4 +1,4 @@ -# Betaflight / STM32F405 (S405) 4.0.0 Mar 12 2019 / 12:01:13 (0deca9c6f) MSP API: 1.41 +# Betaflight / STM32F405 (S405) 4.0.0 Mar 26 2019 / 19:49:32 (173e958da) MSP API: 1.41 board_name ELINF405 manufacturer_id DRCL @@ -36,7 +36,7 @@ resource SPI_MISO 3 C11 resource SPI_MOSI 1 A07 resource SPI_MOSI 2 B15 resource SPI_MOSI 3 C12 -resource CAMERA_CONTROL 1 B09 +resource CAMERA_CONTROL 1 B07 resource ADC_BATT 1 C02 resource ADC_CURR 1 C01 resource PINIO 1 C13 @@ -48,32 +48,34 @@ resource GYRO_CS 1 A04 resource USB_DETECT 1 C05 # timer -timer B09 1 timer B00 1 timer B01 1 timer A03 0 timer A02 0 timer A08 0 -timer C09 0 +timer C09 1 timer B06 0 +timer B07 0 # dma dma ADC 1 1 # ADC 1: DMA2 Stream 4 Channel 0 dma pin B00 0 -# pin B00: DMA2 Stream 2 Channel 0 +# pin B00: DMA1 Stream 7 Channel 5 dma pin B01 0 -# pin B01: DMA2 Stream 2 Channel 0 +# pin B01: DMA1 Stream 2 Channel 5 dma pin A03 1 -# pin A03: DMA1 Stream 7 Channel 3 +# pin A03: DMA1 Stream 6 Channel 3 dma pin A02 0 # pin A02: DMA1 Stream 1 Channel 3 dma pin A08 0 # pin A08: DMA2 Stream 6 Channel 0 dma pin C09 0 -# pin C09: DMA1 Stream 2 Channel 5 +# pin C09: DMA2 Stream 7 Channel 7 dma pin B06 0 # pin B06: DMA1 Stream 0 Channel 2 +dma pin B07 0 +# pin B07: DMA1 Stream 3 Channel 2 # mixer @@ -118,7 +120,8 @@ serial 0 64 115200 57600 0 115200 # master set mag_hardware = NONE -set baro_hardware = NONE +set baro_bustype = I2C +set baro_i2c_device = 1 set serialrx_provider = SBUS set dshot_burst = ON set motor_pwm_protocol = DSHOT600