Clean up core, remove unneeded weak call

Address @dok-net's comments and also remove the _weak/_bound version of startWaveform() since it's invariant of the actual waveform generator.
esp8266 · earlephilhower · Jan 17, 2021 · Dec 30, 2020 · Dec 31, 2020 · Dec 31, 2020
commit a7f9e1a7b79eb6f103a75f6588af5c17b3a5af1e
diff --git a/cores/esp8266/Esp.cpp b/cores/esp8266/Esp.cpp
@@ -30,7 +30,6 @@
 #include "coredecls.h"
 #include "umm_malloc/umm_malloc.h"
 // #include "core_esp8266_vm.h"
-#include "core_esp8266_waveform.h"
 #include <pgmspace.h>
 
 extern "C" {

diff --git a/cores/esp8266/core_esp8266_waveform_phase.cpp b/cores/esp8266/core_esp8266_waveform_phase.cpp
@@ -146,13 +146,6 @@ void setTimer1Callback_weak(uint32_t (*fn)()) {
 }
 
 int startWaveformClockCycles_weak(uint8_t pin, uint32_t highCcys, uint32_t lowCcys, uint32_t runTimeCcys, int8_t alignPhase, uint32_t phaseOffsetCcys, bool autoPwm);
-int startWaveform_weak(uint8_t pin, uint32_t highUS, uint32_t lowUS,
-  uint32_t runTimeUS, int8_t alignPhase, uint32_t phaseOffsetUS, bool autoPwm) {
-  return startWaveformClockCycles(pin,
-    microsecondsToClockCycles(highUS), microsecondsToClockCycles(lowUS),
-    microsecondsToClockCycles(runTimeUS), alignPhase, microsecondsToClockCycles(phaseOffsetUS), autoPwm);
-}
-
 // Start up a waveform on a pin, or change the current one.  Will change to the new
 // waveform smoothly on next low->high transition.  For immediate change, stopWaveform()
 // first, then it will immediately begin.

diff --git a/cores/esp8266/core_esp8266_waveform_pwm.cpp b/cores/esp8266/core_esp8266_waveform_pwm.cpp
@@ -346,24 +346,9 @@ bool _setPWM(int pin, uint32_t val, uint32_t range) {
   return _setPWM_bound(pin, val, range);
 }
 
-
 // Start up a waveform on a pin, or change the current one.  Will change to the new
 // waveform smoothly on next low->high transition.  For immediate change, stopWaveform()
 // first, then it will immediately begin.
-
-extern int startWaveform_weak(uint8_t pin, uint32_t timeHighUS, uint32_t timeLowUS, uint32_t runTimeUS, int8_t alignPhase, uint32_t phaseOffsetUS, bool autoPwm) __attribute__((weak));
-int startWaveform_weak(uint8_t pin, uint32_t timeHighUS, uint32_t timeLowUS, uint32_t runTimeUS,
-                  int8_t alignPhase, uint32_t phaseOffsetUS, bool autoPwm) {
-  (void) alignPhase;
-  (void) phaseOffsetUS;
-  (void) autoPwm;
-  return startWaveformClockCycles(pin, microsecondsToClockCycles(timeHighUS), microsecondsToClockCycles(timeLowUS), microsecondsToClockCycles(runTimeUS));
-}
-static int startWaveform_bound(uint8_t pin, uint32_t timeHighUS, uint32_t timeLowUS, uint32_t runTimeUS, int8_t alignPhase, uint32_t phaseOffsetUS, bool autoPwm) __attribute__((weakref("startWaveform_weak")));
-int startWaveform(uint8_t pin, uint32_t timeHighUS, uint32_t timeLowUS, uint32_t runTimeUS, int8_t alignPhase, uint32_t phaseOffsetUS, bool autoPwm) {
-  return startWaveform_bound(pin, timeHighUS, timeLowUS, runTimeUS, alignPhase, phaseOffsetUS, autoPwm);
-}
-
 extern int startWaveformClockCycles_weak(uint8_t pin, uint32_t timeHighCycles, uint32_t timeLowCycles, uint32_t runTimeCycles, int8_t alignPhase, uint32_t phaseOffsetUS, bool autoPwm)  __attribute__((weak));
 int startWaveformClockCycles_weak(uint8_t pin, uint32_t timeHighCycles, uint32_t timeLowCycles, uint32_t runTimeCycles,
                              int8_t alignPhase, uint32_t phaseOffsetUS, bool autoPwm) {
@@ -419,6 +404,15 @@ int startWaveformClockCycles(uint8_t pin, uint32_t timeHighCycles, uint32_t time
   return startWaveformClockCycles_bound(pin, timeHighCycles, timeLowCycles, runTimeCycles, alignPhase, phaseOffsetUS, autoPwm);
 }
 
+
+// This version falls-thru to the proper startWaveformClockCycles call and is invariant across waveform generators
+int startWaveform(uint8_t pin, uint32_t timeHighUS, uint32_t timeLowUS, uint32_t runTimeUS,
+                  int8_t alignPhase, uint32_t phaseOffsetUS, bool autoPwm) {
+  return startWaveformClockCycles_bound(pin,
+    microsecondsToClockCycles(timeHighUS), microsecondsToClockCycles(timeLowUS),
+    microsecondsToClockCycles(runTimeUS), alignPhase, microsecondsToClockCycles(phaseOffsetUS), autoPwm);
+}
+
 // Set a callback.  Pass in NULL to stop it
 extern void setTimer1Callback_weak(uint32_t (*fn)()) __attribute__((weak));
 void setTimer1Callback_weak(uint32_t (*fn)()) {

diff --git a/cores/esp8266/core_esp8266_wiring_digital.cpp b/cores/esp8266/core_esp8266_wiring_digital.cpp
@@ -82,8 +82,8 @@ extern void __pinMode(uint8_t pin, uint8_t mode) {
 }
 
 extern void ICACHE_RAM_ATTR __digitalWrite(uint8_t pin, uint8_t val) {
-  stopWaveform(pin); // Disable any tone
-  _stopPWM(pin);     // ...and any analogWrite
+  stopWaveform(pin); // Disable any Tone or startWaveform on this pin
+  _stopPWM(pin);     // and any analogWrites (PWM)
   if(pin < 16){
     if(val) GPOS = (1 << pin);
     else GPOC = (1 << pin);

diff --git a/cores/esp8266/core_esp8266_wiring_pwm.cpp b/cores/esp8266/core_esp8266_wiring_pwm.cpp
@@ -70,10 +70,9 @@ extern void __analogWrite(uint8_t pin, int val) {
   int phaseReference = __builtin_ffs(analogMap) - 1;
   if (_setPWM(pin, val, analogScale)) {
     analogMap |= (1 << pin);
-  } else  if (startWaveformClockCycles(pin, high, low, 0, phaseReference, 0, true)) {
+  } else if (startWaveformClockCycles(pin, high, low, 0, phaseReference, 0, true)) {
     analogMap |= (1 << pin);
   }
-  _setPWM(pin, val, analogScale);
 }
 
 extern void __analogWriteRange(uint32_t range) {