From 39efc9ab1daaa67dc4784a5afb461c162b8aeb56 Mon Sep 17 00:00:00 2001 From: mikeller Date: Thu, 30 Nov 2017 18:18:17 +1300 Subject: [PATCH] Updated MATEKF722 target definition. --- src/main/target/MATEKF722/target.c | 22 +++++++++++++--------- src/main/target/MATEKF722/target.h | 5 +++-- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/main/target/MATEKF722/target.c b/src/main/target/MATEKF722/target.c index f46b93782..d45154f9d 100644 --- a/src/main/target/MATEKF722/target.c +++ b/src/main/target/MATEKF722/target.c @@ -25,17 +25,21 @@ #include "drivers/timer_def.h" const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { - DEF_TIM(TIM5, CH4, PA3, TIM_USE_PPM, 0, 0), // PPM DMA1_ST1 + DEF_TIM(TIM9, CH2, PA3, TIM_USE_PPM, 0, 0), // PPM - DEF_TIM(TIM3, CH1, PC6, TIM_USE_MOTOR, 0, 0), // S1 DMA1_ST4 - DEF_TIM(TIM8, CH2, PC7, TIM_USE_MOTOR, 0, 0), // S2 DMA2_ST3 - DEF_TIM(TIM3, CH3, PC8, TIM_USE_MOTOR, 0, 0), // S3 DMA1_ST7 - DEF_TIM(TIM8, CH4, PC9, TIM_USE_MOTOR, 0, 0), // S4 DMA2_ST7 + DEF_TIM(TIM3, CH1, PC6, TIM_USE_MOTOR, 0, 0), // S1 DMA1_ST4 + DEF_TIM(TIM8, CH2, PC7, TIM_USE_MOTOR, 0, 0), // S2 DMA2_ST3 + DEF_TIM(TIM8, CH3, PC8, TIM_USE_MOTOR, 0, 0), // S3 DMA2_ST4 + DEF_TIM(TIM8, CH4, PC9, TIM_USE_MOTOR, 0, 0), // S4 DMA2_ST7 - DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0), // S5 DMA1_ST2 - DEF_TIM(TIM1, CH1, PA8, TIM_USE_MOTOR, 0, 0), // S6 DMA2_ST6 + DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0), // S5 DMA1_ST2 + DEF_TIM(TIM1, CH1, PA8, TIM_USE_MOTOR, 0, 0), // S6 DMA2_ST6 - DEF_TIM(TIM4, CH3, PB8, TIM_USE_MOTOR, 0, 0), // PWM + DEF_TIM(TIM4, CH3, PB8, TIM_USE_MOTOR, 0, 0), // pwm/S7 DMA1_ST7 + DEF_TIM(TIM5, CH3, PA2, TIM_USE_MOTOR, 0, 0), // TX2/S8 DMA1_ST0 - DEF_TIM(TIM2, CH1, PA15, TIM_USE_LED, 0, 0), // LED STRIP DMA1_ST5 + DEF_TIM(TIM5, CH1, PA0, TIM_USE_PWM, 0, 0), // TX4 + DEF_TIM(TIM5, CH2, PA1, TIM_USE_PWM, 0, 0), // RX4 + + DEF_TIM(TIM2, CH1, PA15, TIM_USE_LED, 0, 0), // LED STRIP DMA1_ST5 }; diff --git a/src/main/target/MATEKF722/target.h b/src/main/target/MATEKF722/target.h index 1992a38a7..c6ed62e13 100644 --- a/src/main/target/MATEKF722/target.h +++ b/src/main/target/MATEKF722/target.h @@ -151,6 +151,7 @@ #define DEFAULT_FEATURES (FEATURE_OSD | FEATURE_TELEMETRY ) #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC +#define CURRENT_METER_SCALE_DEFAULT 179 #define USE_LED_STRIP @@ -162,5 +163,5 @@ #define TARGET_IO_PORTC 0xffff #define TARGET_IO_PORTD (BIT(2)) -#define USABLE_TIMER_CHANNEL_COUNT 9 -#define USED_TIMERS (TIM_N(1)|TIM_N(2)|TIM_N(3)|TIM_N(4)|TIM_N(5)|TIM_N(8)) +#define USABLE_TIMER_CHANNEL_COUNT 12 +#define USED_TIMERS (TIM_N(1)|TIM_N(2)|TIM_N(3)|TIM_N(4)|TIM_N(5)|TIM_N(8)|TIM_N(9)) -- 2.11.4.GIT