Must always recompute new waveform.nextEventCcy if there is any busy pin.

dok-net · dok-net · commit ca28263a2686 · 2020-05-23T22:36:10.000+02:00
diff --git a/cores/esp8266/core_esp8266_waveform.cpp b/cores/esp8266/core_esp8266_waveform.cpp
@@ -308,7 +308,7 @@ static ICACHE_RAM_ATTR void timer1Interrupt() {
   // Exit the loop if the next event, if any, is sufficiently distant.
   const uint32_t isrTimeoutCcy = isrStartCcy + ISRTIMEOUTCCYS;
   uint32_t busyPins = (static_cast<int32_t>(waveform.nextEventCcy - isrTimeoutCcy) < 0) ? waveform.enabled : 0;
-  if (!waveform.enabled) {
+  if (!waveform.enabled || busyPins) {
     waveform.nextEventCcy = isrStartCcy + MAXIRQTICKSCCYS;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ static ICACHE_RAM_ATTR void timer1Interrupt() {`
`308`	`308`	`// Exit the loop if the next event, if any, is sufficiently distant.`
`309`	`309`	`const uint32_t isrTimeoutCcy = isrStartCcy + ISRTIMEOUTCCYS;`
`310`	`310`	`uint32_t busyPins = (static_cast<int32_t>(waveform.nextEventCcy - isrTimeoutCcy) < 0) ? waveform.enabled : 0;`
`311`		`- if (!waveform.enabled) {`
	`311`	`+ if (!waveform.enabled \|\| busyPins) {`
`312`	`312`	`waveform.nextEventCcy = isrStartCcy + MAXIRQTICKSCCYS;`
`313`	`313`	`}`
`314`	`314`