rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

free up timers for hardware PWM (#1459) 

* free up timers

* put that back
This commit is contained in:
Matthew Kennedy 2020-05-20 16:14:42 -07:00 committed by GitHub
parent a608f185d5
commit 125701f514
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/config/stm32f4ems/mcuconf.h
View File

@ -244,8 +244,8 @@
#define STM32_ICU_USE_TIM3 TRUE #define STM32_ICU_USE_TIM3 TRUE
#define STM32_ICU_USE_TIM4 FALSE #define STM32_ICU_USE_TIM4 FALSE
#define STM32_ICU_USE_TIM5 FALSE #define STM32_ICU_USE_TIM5 FALSE
#define STM32_ICU_USE_TIM8 TRUE #define STM32_ICU_USE_TIM8 FALSE
#define STM32_ICU_USE_TIM9 TRUE #define STM32_ICU_USE_TIM9 FALSE
#define STM32_ICU_TIM1_IRQ_PRIORITY ICU_PRIORITY #define STM32_ICU_TIM1_IRQ_PRIORITY ICU_PRIORITY
#define STM32_ICU_TIM2_IRQ_PRIORITY ICU_PRIORITY #define STM32_ICU_TIM2_IRQ_PRIORITY ICU_PRIORITY
#define STM32_ICU_TIM3_IRQ_PRIORITY ICU_PRIORITY #define STM32_ICU_TIM3_IRQ_PRIORITY ICU_PRIORITY

4
firmware/config/stm32f7ems/mcuconf.h
View File

@ -255,8 +255,8 @@
#define STM32_ICU_USE_TIM3 TRUE #define STM32_ICU_USE_TIM3 TRUE
#define STM32_ICU_USE_TIM4 FALSE #define STM32_ICU_USE_TIM4 FALSE
#define STM32_ICU_USE_TIM5 FALSE #define STM32_ICU_USE_TIM5 FALSE
#define STM32_ICU_USE_TIM8 TRUE #define STM32_ICU_USE_TIM8 FALSE
#define STM32_ICU_USE_TIM9 TRUE #define STM32_ICU_USE_TIM9 FALSE
#define STM32_ICU_TIM1_IRQ_PRIORITY ICU_PRIORITY #define STM32_ICU_TIM1_IRQ_PRIORITY ICU_PRIORITY
#define STM32_ICU_TIM2_IRQ_PRIORITY ICU_PRIORITY #define STM32_ICU_TIM2_IRQ_PRIORITY ICU_PRIORITY
#define STM32_ICU_TIM3_IRQ_PRIORITY ICU_PRIORITY #define STM32_ICU_TIM3_IRQ_PRIORITY ICU_PRIORITY

9
firmware/hw_layer/digital_input_icu.cpp
View File

@ -119,13 +119,11 @@ static uint32_t getAlternateFunctions(ICUDriver *driver) {
icuchannel_t getInputCaptureChannel(brain_pin_e hwPin) { icuchannel_t getInputCaptureChannel(brain_pin_e hwPin) {
switch (hwPin) { switch (hwPin) {
case GPIOA_2: // TIM9
case GPIOA_5: // TIM2 stm32f4discovery/Frankenso default case GPIOA_5: // TIM2 stm32f4discovery/Frankenso default
case GPIOA_6: // TIM3 case GPIOA_6: // TIM3
case GPIOA_8: // TIM1 case GPIOA_8: // TIM1
case GPIOA_15: // TIM2 case GPIOA_15: // TIM2
case GPIOC_6: // TIM3 or TIM8 stm32f4discovery/Frankenso default case GPIOC_6: // TIM3 stm32f4discovery/Frankenso default
case GPIOE_5: // TIM9
case GPIOE_9: // TIM1 case GPIOE_9: // TIM1
return ICU_CHANNEL_1; return ICU_CHANNEL_1;
@ -135,8 +133,7 @@ icuchannel_t getInputCaptureChannel(brain_pin_e hwPin) {
case GPIOA_9: // TIM1 case GPIOA_9: // TIM1
case GPIOB_3: // TIM2 case GPIOB_3: // TIM2
case GPIOB_5: // TIM2 case GPIOB_5: // TIM2
case GPIOC_7: // TIM3 or TIM8 case GPIOC_7: // TIM3
case GPIOE_6: // TIM9
case GPIOE_11: // TIM1 case GPIOE_11: // TIM1
return ICU_CHANNEL_2; return ICU_CHANNEL_2;
default: default:
@ -199,7 +196,7 @@ ICUDriver * getInputCaptureDriver(const char *msg, brain_pin_e hwPin) {
return &ICUD9; return &ICUD9;
} }
#endif #endif
return (ICUDriver *) NULL; return nullptr;
} }
void turnOnCapturePin(const char *msg, brain_pin_e brainPin) { void turnOnCapturePin(const char *msg, brain_pin_e brainPin) {