Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-15 04:15:44 +03:00
Code Issues Wiki Activity

Fixed CC Channel versus Index issue, and added additional mapping in timerHardware for 7X2 target

Browse source
This commit is contained in:
blckmn 2018-05-06 08:02:33 +10:00
parent e5031407a6
commit 6d33fc6b0b
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/interface/cli.c
View file

@ -3692,7 +3692,7 @@ static void cliTimer(char *cmdline)
cliPrintLinef("# %d. TIM%d CH%d", cliPrintLinef("# %d. TIM%d CH%d",
index, index,
timerGetTIMNumber(timerHardware[i].tim), timerGetTIMNumber(timerHardware[i].tim),
timerHardware[i].channel CC_INDEX_FROM_CHANNEL(timerHardware[i].channel)
); );
index++; index++;
} }

5
src/main/target/STM32F7X2/target.c
View file

@ -41,4 +41,9 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM4, CH4, PB9, TIM_USE_MOTOR, 0, 0), DEF_TIM(TIM4, CH4, PB9, TIM_USE_MOTOR, 0, 0),
DEF_TIM(TIM9, CH2, PE6, TIM_USE_MOTOR, 0, 0), DEF_TIM(TIM9, CH2, PE6, TIM_USE_MOTOR, 0, 0),
DEF_TIM(TIM3, CH1, PB4, TIM_USE_MOTOR, 0, 0), DEF_TIM(TIM3, CH1, PB4, TIM_USE_MOTOR, 0, 0),
//11
DEF_TIM(TIM10, CH1, PB8, TIM_USE_MOTOR, 0, 0),
DEF_TIM(TIM5, CH4, PA3, TIM_USE_MOTOR, 0, 0),
DEF_TIM(TIM9, CH2, PA3, TIM_USE_MOTOR, 0, 0),
DEF_TIM(TIM11, CH1, PB9, TIM_USE_MOTOR, 0, 0),
}; };

2
src/main/target/STM32F7X2/target.h
View file

@ -92,6 +92,6 @@
#define TARGET_IO_PORTE 0xffff #define TARGET_IO_PORTE 0xffff
#define TARGET_IO_PORTF 0xffff #define TARGET_IO_PORTF 0xffff
#define USABLE_TIMER_CHANNEL_COUNT 11 #define USABLE_TIMER_CHANNEL_COUNT 15
#define USE_TIMER_MGMT #define USE_TIMER_MGMT