Turn off IRQ on stopWaveform after Tone timeout #7232
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Fix esp8266#7230 (until 3.0 when this whole code will probably change). Before, a timed out pin would clear its bit in `waveformEnabled`. The logic in `stopWaveform`. If only one tone was running and timed out, `stopWaveform` would check the `enabled` bitmask and see nothing active and immediately return w/o cancelling the IRQ. So, the IRQ would be called every 1/100th of a second and return immediately when no work to be done was detected. Remove the check and always send in a `waveformToDisable` bit. It's save to disable an already disabled pin, so no logical consequences will occur, and the final IRQ disable will be executed when appropriate.
| @earlephilhower Off the top of my head, your fix isn't right, if you'd just cherry-pick mine from PR#7022 it will be correct? |
| @dok-net I'm looking at your commit bb3ee99 . I think we're both fine here. It's doing the same thing, but this small PR sends in the In your PR it's also possible to have a race condition where the bit is cleared in |
devyte requested changes Apr 20, 2020
s-hadinger reviewed Apr 20, 2020
| Closing |
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
Fix #7230 (until 3.0 when this whole code will probably change).
Before, a timed out pin would clear its bit in
waveformEnabled. Thelogic in
stopWaveform. If only one tone was running and timed out,stopWaveformwould check theenabledbitmask and see nothing activeand immediately return w/o cancelling the IRQ. So, the IRQ would be
called every 1/100th of a second and return immediately when no work to
be done was detected.
Remove the check and always send in a
waveformToDisablebit. It'ssave to disable an already disabled pin, so no logical consequences will
occur, and the final IRQ disable will be executed when appropriate.