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

Fix IRQ enum protections

Browse Source
This commit is contained in:
Lucian Copeland 2020-07-14 16:33:36 -04:00
parent b8910676db
commit 818b96ae61
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,7 +133,7 @@ void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t* self, const mcu
self->last_count = 0;
self->last_overflow = 0;
if (HAL_TIM_Base_GetState(&tim_handle) == HAL_TIM_STATE_RESET) {
if (HAL_TIM_Base_GetState(&tim_handle) == HAL_TIM_STATE_RESET) { //TODO: there's no state yet
// Find a suitable timer
TIM_TypeDef * tim_instance = stm_peripherals_find_timer();
stm_peripherals_timer_reserve(tim_instance);

6
ports/stm/peripherals/timers.c
View File

@ -67,7 +67,11 @@ static size_t irq_map[] = {
NULL_IRQ,
#endif
#ifdef TIM6
TIM6_DAC_IRQn,
#if !defined(DAC_BASE) || !defined(DAC1_BASE)
TIM6_IRQn,
#else
TIM6_DAC_IRQn,
#endif
#else
NULL_IRQ,
#endif