From eabd6e1c92097250977624d41f24f7c439ad0613 Mon Sep 17 00:00:00 2001 From: "Konstantin Sharlaimov (DigitalEntity)" Date: Sun, 13 May 2018 21:57:03 +1000 Subject: [PATCH] Fix DALRC and RADIX targets --- src/main/target/DALRCF405/target.c | 5 ++--- src/main/target/DALRCF405/target.h | 5 ----- src/main/target/RADIX/target.c | 4 +++- src/main/target/RADIX/target.h | 3 --- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/main/target/DALRCF405/target.c b/src/main/target/DALRCF405/target.c index 1a6db468919..71727d41575 100644 --- a/src/main/target/DALRCF405/target.c +++ b/src/main/target/DALRCF405/target.c @@ -21,7 +21,7 @@ #include "drivers/pwm_mapping.h" #include "drivers/timer.h" -const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { +const timerHardware_t timerHardware[] = { { TIM12, IO_TAG(PB15), TIM_Channel_2, 0, IOCFG_AF_PP_PD, GPIO_AF_TIM10, TIM_USE_PPM }, { TIM3, IO_TAG(PB0), TIM_Channel_3, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM3, TIM_USE_MC_MOTOR | TIM_USE_MC_SERVO | TIM_USE_FW_MOTOR }, @@ -37,5 +37,4 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { { TIM2, IO_TAG(PA5), TIM_Channel_1, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM2, TIM_USE_PWM }, }; - - +const int timerHardwareCount = sizeof(timerHardware) / sizeof(timerHardware[0]); diff --git a/src/main/target/DALRCF405/target.h b/src/main/target/DALRCF405/target.h index 2d0d6272ba4..fe898641bee 100644 --- a/src/main/target/DALRCF405/target.h +++ b/src/main/target/DALRCF405/target.h @@ -154,9 +154,4 @@ #define TARGET_IO_PORTD 0xffff //TIMER -#define USABLE_TIMER_CHANNEL_COUNT 11 #define MAX_PWM_OUTPUT_PORTS 10 -#define USED_TIMERS (TIM_N(1)|TIM_N(2)|TIM_N(3)|TIM_N(4)|TIM_N(8)|TIM_N(12)) - - - diff --git a/src/main/target/RADIX/target.c b/src/main/target/RADIX/target.c index b108c88f72e..7433461eee1 100644 --- a/src/main/target/RADIX/target.c +++ b/src/main/target/RADIX/target.c @@ -24,7 +24,7 @@ #include "drivers/timer.h" /* TIMERS */ -const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { +const timerHardware_t timerHardware[] = { { TIM12, IO_TAG(PB14), TIM_Channel_1, 0, IOCFG_AF_PP_PD, GPIO_AF_TIM12, TIM_USE_PPM }, { TIM5, IO_TAG(PA2), TIM_Channel_3, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM5, TIM_USE_MC_MOTOR }, // S3_OUT { TIM5, IO_TAG(PA3), TIM_Channel_4, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM5, TIM_USE_MC_MOTOR }, // S4_OUT @@ -33,3 +33,5 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { { TIM8, IO_TAG(PC8), TIM_Channel_3, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM8, TIM_USE_MC_MOTOR }, // S5_OUT { TIM3, IO_TAG(PB0), TIM_Channel_3, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM3, TIM_USE_MC_MOTOR }, // S6_OUT }; + +const int timerHardwareCount = sizeof(timerHardware) / sizeof(timerHardware[0]); diff --git a/src/main/target/RADIX/target.h b/src/main/target/RADIX/target.h index 9adf51ccd9a..d6ce6591632 100644 --- a/src/main/target/RADIX/target.h +++ b/src/main/target/RADIX/target.h @@ -139,6 +139,3 @@ #define TARGET_IO_PORTB 0xffff #define TARGET_IO_PORTC 0xffff #define TARGET_IO_PORTD (BIT(2)) - -#define USABLE_TIMER_CHANNEL_COUNT 7 -#define USED_TIMERS ( TIM_N(1) | TIM_N(2) | TIM_N(5) | TIM_N(12) )