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

Merge pull request #3441 from hierophect/stm32-rgbmatrix-crashfix

Browse Source 
STM32: Add never_reset reservation to RGBMatrix init
This commit is contained in:
Jeff Epler 2020-09-20 07:51:09 -05:00 committed by GitHub
commit ce266425e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ports/stm/common-hal/rgbmatrix/RGBMatrix.c
View File

@ -36,6 +36,7 @@ extern void _PM_IRQ_HANDLER(void);
void *common_hal_rgbmatrix_timer_allocate() { void *common_hal_rgbmatrix_timer_allocate() {
TIM_TypeDef * timer = stm_peripherals_find_timer(); TIM_TypeDef * timer = stm_peripherals_find_timer();
stm_peripherals_timer_reserve(timer); stm_peripherals_timer_reserve(timer);
stm_peripherals_timer_never_reset(timer);
return timer; return timer;
} }

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

@ -195,9 +195,7 @@ TIM_TypeDef * stm_peripherals_find_timer(void) {
// If no results are found, no unclaimed pins with this timer are in this package, // If no results are found, no unclaimed pins with this timer are in this package,
// and it is safe to pick // and it is safe to pick
if (timer_in_package == false && mcu_tim_banks[i] != NULL) { if (timer_in_package == false && mcu_tim_banks[i] != NULL) {
// DEBUG: print the timer
return mcu_tim_banks[i]; return mcu_tim_banks[i];
mp_printf(&mp_plat_print, "Timer: %d\n",i);
} }
} }
//TODO: secondary search for timers outside the pins in the board profile //TODO: secondary search for timers outside the pins in the board profile
@ -205,8 +203,6 @@ TIM_TypeDef * stm_peripherals_find_timer(void) {
// Work backwards - higher index timers have fewer pin allocations // Work backwards - higher index timers have fewer pin allocations
for (size_t i = (MP_ARRAY_SIZE(mcu_tim_banks) - 1); i >= 0; i--) { for (size_t i = (MP_ARRAY_SIZE(mcu_tim_banks) - 1); i >= 0; i--) {
if ((!stm_timer_reserved[i]) && (mcu_tim_banks[i] != NULL)) { if ((!stm_timer_reserved[i]) && (mcu_tim_banks[i] != NULL)) {
// DEBUG: print the timer
mp_printf(&mp_plat_print, "Timer: %d\n",i);
return mcu_tim_banks[i]; return mcu_tim_banks[i];
} }
} }