Merge pull request #10576 from mikeller/fix_stm32g4_timer

Fixed incorrect timer mapping for STM32G4.
This commit is contained in:
Michael Keller 2021-02-26 02:11:25 +13:00 committed by GitHub
commit bc4372588b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -1344,7 +1344,7 @@
#define DEF_TIM_AF__PB6__TCH_TIM8_CH1 D(5, 8)
#define DEF_TIM_AF__PB0__TCH_TIM1_CH2N D(6, 1)
#define DEF_TIM_AF__PB0__TCH_TIM1_CH3N D(6, 1)
#define DEF_TIM_AF__PB1__TCH_TIM1_CH3N D(6, 1)
#define DEF_TIM_AF__PB13__TCH_TIM1_CH1N D(6, 1)
#define DEF_TIM_AF__PB14__TCH_TIM1_CH2N D(6, 1)

View File

@ -130,7 +130,7 @@ const timerHardware_t fullTimerHardware[FULL_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM8, CH1, PB6, TIM_USE_ANY, 0, 0, 0),
DEF_TIM(TIM1, CH2N, PB0, TIM_USE_ANY, 0, 0, 0),
DEF_TIM(TIM1, CH3N, PB0, TIM_USE_ANY, 0, 0, 0),
DEF_TIM(TIM1, CH3N, PB1, TIM_USE_ANY, 0, 0, 0),
DEF_TIM(TIM1, CH1N, PB13, TIM_USE_ANY, 0, 0, 0),
DEF_TIM(TIM1, CH2N, PB14, TIM_USE_ANY, 0, 0, 0),