Skip to content

Turn off IRQ on stopWaveform after Tone timeout #7232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Turn off IRQ on stopWaveform after Tone timeout #7232

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07125d9
Turn off IRQ on stopWaveform after Tone timeout
earlephilhower Apr 20, 2020
6579c9f
No-op push to get Travis running again
earlephilhower Apr 20, 2020
70a38d7
Fix syntax error
earlephilhower Apr 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions cores/esp8266/core_esp8266_waveform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,19 +176,13 @@ int ICACHE_RAM_ATTR stopWaveform(uint8_t pin) {
if (!timerRunning) {
return false;
}
// If user sends in a pin >16 but <32, this will always point to a 0 bit
// If they send >=32, then the shift will result in 0 and it will also return false
uint32_t mask = 1<<pin;
if (!(waveformEnabled & mask)) {
return false; // It's not running, nothing to do here
}
waveformToDisable |= mask;
// Ensure timely service....
if (T1L > microsecondsToClockCycles(10)) {
timer1_write(microsecondsToClockCycles(10));
}
while (waveformToDisable) {
/* no-op */ // Can't delay() since stopWaveform may be called from an IRQ
/* no-op */ // Can't delay() because stopWaveform may be called from an IRQ
}
if (!waveformEnabled && !timer1CB) {
deinitTimer();
Expand Down