djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hack up STM32 PulseIn so it builds

Browse Source
This commit is contained in:
Scott Shawcroft 2020-03-31 15:12:11 -07:00
parent a4a458943d
commit 4b063aeb29
No known key found for this signature in database
GPG Key ID: 9349BC7E64B1921E
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ports/stm/common-hal/pulseio/PulseIn.c
View File

@ -61,7 +61,10 @@ void TIM6_IRQHandler(void)
static void pulsein_handler(uint8_t num) { static void pulsein_handler(uint8_t num) {
// Grab the current time first. // Grab the current time first.
uint32_t current_overflow = overflow_count; uint32_t current_overflow = overflow_count;
uint32_t current_count = TIM6->CNT; uint32_t current_count = 0;
#if HAS_BASIC_TIM
current_count = TIM6->CNT;
#endif
// Interrupt register must be cleared manually // Interrupt register must be cleared manually
EXTI->PR = 1 << num; EXTI->PR = 1 << num;
@ -105,12 +108,17 @@ void pulsein_reset(void) {
} }
memset(_objs, 0, sizeof(_objs)); memset(_objs, 0, sizeof(_objs));
#if HAS_BASIC_TIM
__HAL_RCC_TIM6_CLK_DISABLE(); __HAL_RCC_TIM6_CLK_DISABLE();
refcount = 0; refcount = 0;
#endif
} }
void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t* self, const mcu_pin_obj_t* pin, void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t* self, const mcu_pin_obj_t* pin,
uint16_t maxlen, bool idle_state) { uint16_t maxlen, bool idle_state) {
#if !(HAS_BASIC_TIM)
mp_raise_NotImplementedError(translate("PulseOut not supported on this chip"));
#else
// STM32 has one shared EXTI for each pin number, 0-15 // STM32 has one shared EXTI for each pin number, 0-15
uint8_t p_num = pin->number; uint8_t p_num = pin->number;
if(_objs[p_num]) { if(_objs[p_num]) {
@ -153,6 +161,7 @@ void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t* self, const mcu
} }
// Add to active PulseIns // Add to active PulseIns
refcount++; refcount++;
#endif
// EXTI pins can also be read as an input // EXTI pins can also be read as an input
GPIO_InitTypeDef GPIO_InitStruct = {0}; GPIO_InitTypeDef GPIO_InitStruct = {0};