Fix boolean/bitmask typo in starting waveform

earlephilhower · earlephilhower · commit 923f2f41033e · 2019-01-05T12:56:49.000-08:00
diff --git a/cores/esp8266/core_esp8266_waveform.c b/cores/esp8266/core_esp8266_waveform.c
@@ -134,7 +134,7 @@ int startWaveform(uint8_t pin, uint32_t timeHighUS, uint32_t timeLowUS, uint32_t
   }
 
   uint32_t mask = 1<<pin;
-  if (!waveformEnabled && mask) {
+  if (!(waveformEnabled & mask)) {
     // Actually set the pin high or low in the IRQ service to guarantee times
     wave->nextServiceCycle = GetCycleCount() + MicrosecondsToCycles(1);
     waveformToEnable |= mask;
@@ -143,7 +143,7 @@ int startWaveform(uint8_t pin, uint32_t timeHighUS, uint32_t timeLowUS, uint32_t
     }
     timer1_write(MicrosecondsToCycles(1)); // Cause an interrupt post-haste
     while (waveformToEnable) {
-      delay(1); // Wait for waveform to update
+      delay(0); // Wait for waveform to update
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ int startWaveform(uint8_t pin, uint32_t timeHighUS, uint32_t timeLowUS, uint32_t`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`uint32_t mask = 1<<pin;`
`137`		`- if (!waveformEnabled && mask) {`
	`137`	`+ if (!(waveformEnabled & mask)) {`
`138`	`138`	`// Actually set the pin high or low in the IRQ service to guarantee times`
`139`	`139`	`wave->nextServiceCycle = GetCycleCount() + MicrosecondsToCycles(1);`
`140`	`140`	`waveformToEnable \|= mask;`
`@@ -143,7 +143,7 @@ int startWaveform(uint8_t pin, uint32_t timeHighUS, uint32_t timeLowUS, uint32_t`
`143`	`143`	`}`
`144`	`144`	`timer1_write(MicrosecondsToCycles(1)); // Cause an interrupt post-haste`
`145`	`145`	`while (waveformToEnable) {`
`146`		`- delay(1); // Wait for waveform to update`
	`146`	`+ delay(0); // Wait for waveform to update`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`