Small refactoring, remove code path that is never taken even at 3x25kHz/1023 PWM.

dok-net · dok-net · commit 3b28ee506e3f · 2020-05-22T19:16:03.000+02:00
diff --git a/cores/esp8266/core_esp8266_waveform.cpp b/cores/esp8266/core_esp8266_waveform.cpp
@@ -362,22 +362,19 @@ static ICACHE_RAM_ATTR void timer1Interrupt() {
               waveNextEventCcy = wave.endDutyCcy = wave.nextPeriodCcy;
             }
             else {
-              if (wave.autoPwm && static_cast<int32_t>(now - wave.nextPeriodCcy) >= 0) {
-                wave.endDutyCcy += periodCcys - overshootCcys;
-                wave.nextPeriodCcy += periodCcys;
-                if (static_cast<int32_t>(now - wave.endDutyCcy) >= 0) {
-                  waveNextEventCcy = wave.nextPeriodCcy;
+              if (wave.autoPwm) {
+                if (static_cast<int32_t>(now - wave.nextPeriodCcy) >= 0) {
+                  wave.endDutyCcy += periodCcys - overshootCcys;
+                  wave.nextPeriodCcy += periodCcys;
+                  waveNextEventCcy = wave.endDutyCcy;
+                  // adapt expiry such that it occurs during intended cycle
+                  if (WaveformMode::EXPIRES == wave.mode)
+                    wave.expiryCcy += periodCcys;
                 }
                 else {
-                  waveNextEventCcy = wave.endDutyCcy;
+                  wave.adjDutyCcys = overshootCcys;
+                  waveNextEventCcy = wave.nextPeriodCcy;
                 }
-                // adapt expiry such that it occurs during intended cycle
-                if (WaveformMode::EXPIRES == wave.mode)
-                  wave.expiryCcy += periodCcys;
-              }
-              else if (wave.autoPwm) {
-                wave.adjDutyCcys = overshootCcys;
-                waveNextEventCcy = wave.nextPeriodCcy;
               }
               else {
                 waveNextEventCcy = wave.nextPeriodCcy;
