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

Revert dangling pointer issue in PWMOut

This commit is contained in:
Lucian Copeland 2020-01-22 14:41:37 -05:00
parent b326ee0a3d
commit 36792926d2
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ports/stm32f4/common-hal/pulseio/PWMOut.c
View File

@ -111,15 +111,13 @@ pwmout_result_t common_hal_pulseio_pwmout_construct(pulseio_pwmout_obj_t* self,
bool tim_taken_f_mismatch = false;
bool var_freq_mismatch = false;
bool first_time_setup = true;
mcu_tim_pin_obj_t l_tim = {0};
for (uint i = 0; i < tim_num; i++) {
l_tim = mcu_tim_pin_list[i];
uint8_t l_tim_index = l_tim.tim_index - 1;
uint8_t l_tim_channel = l_tim.channel_index - 1;
uint8_t l_tim_index = mcu_tim_pin_list[i].tim_index - 1;
uint8_t l_tim_channel = mcu_tim_pin_list[i].channel_index - 1;
//if pin is same
if (l_tim.pin == pin) {
if (mcu_tim_pin_list[i].pin == pin) {
//check if the timer has a channel active
if (reserved_tim[l_tim_index] != 0) {
//is it the same channel? (or all channels reserved by a var-freq)
@ -140,7 +138,7 @@ pwmout_result_t common_hal_pulseio_pwmout_construct(pulseio_pwmout_obj_t* self,
first_time_setup = false; //skip setting up the timer
}
//No problems taken, so set it up
self->tim = &l_tim;
self->tim = &mcu_tim_pin_list[i];
break;
}
}