Pin has uint8_t, not int type.

esp8266 · dok-net · Apr 29, 2021 · Apr 29, 2021 · May 2, 2021 · May 2, 2021
commit b89932c64d858dea58229f22bf6ca4b61dcf9cdd
diff --git a/cores/esp8266/core_esp8266_waveform.h b/cores/esp8266/core_esp8266_waveform.h
@@ -110,11 +110,10 @@ int stopWaveform(uint8_t pin);
 // Make sure the CB function has the IRAM_ATTR decorator.
 void setTimer1Callback(uint32_t (*fn)());
 
-
 // Internal-only calls, not for applications
-extern void _setPWMFreq(uint32_t freq);
-extern bool _stopPWM(uint8_t pin);
-extern bool _setPWM(int pin, uint32_t val, uint32_t range);
+void _setPWMFreq(uint32_t freq);
+bool _stopPWM(uint8_t pin);
+bool _setPWM(uint8_t pin, uint32_t val, uint32_t range);
 
 #ifdef __cplusplus
 }

diff --git a/cores/esp8266/core_esp8266_waveform_phase.cpp b/cores/esp8266/core_esp8266_waveform_phase.cpp
@@ -55,8 +55,8 @@ extern "C" void enablePhaseLockedWaveform (void)
 
 // No-op calls to override the PWM implementation
 extern "C" void _setPWMFreq_weak(uint32_t freq) { (void) freq; }
-extern "C" IRAM_ATTR bool _stopPWM_weak(int pin) { (void) pin; return false; }
-extern "C" bool _setPWM_weak(int pin, uint32_t val, uint32_t range) { (void) pin; (void) val; (void) range; return false; }
+extern "C" IRAM_ATTR bool _stopPWM_weak(uint8_t pin) { (void) pin; return false; }
+extern "C" bool _setPWM_weak(uint8_t pin, uint32_t val, uint32_t range) { (void) pin; (void) val; (void) range; return false; }
 
 
 // Timer is 80MHz fixed. 160MHz CPU frequency need scaling.
@@ -116,6 +116,7 @@ static IRAM_ATTR void timer1Interrupt();
 // Non-speed critical bits
 #pragma GCC optimize ("Os")
 
+static void initTimer() __attribute__((noinline));
 static void initTimer() {
   timer1_disable();
   ETS_FRC_TIMER1_INTR_ATTACH(NULL, NULL);

diff --git a/cores/esp8266/core_esp8266_waveform_pwm.cpp b/cores/esp8266/core_esp8266_waveform_pwm.cpp
@@ -97,7 +97,7 @@ static WVFState wvfState;
 static IRAM_ATTR void timer1Interrupt();
 static bool timerRunning = false;
 
-static __attribute__((noinline)) void initTimer() {
+static void initTimer() {
   if (!timerRunning) {
     timer1_disable();
     ETS_FRC_TIMER1_INTR_ATTACH(NULL, NULL);
@@ -169,8 +169,7 @@ static IRAM_ATTR void _notifyPWM(PWMState *p, bool idle) {
   }
 }
 
-static void _addPWMtoList(PWMState &p, int pin, uint32_t val, uint32_t range);
-
+static void _addPWMtoList(PWMState &p, uint8_t pin, uint32_t val, uint32_t range);
 
 // Called when analogWriteFreq() changed to update the PWM total period
 extern void _setPWMFreq_weak(uint32_t freq) __attribute__((weak)); 
@@ -216,7 +215,7 @@ void _setPWMFreq(uint32_t freq) {
 
 // Helper routine to remove an entry from the state machine
 // and clean up any marked-off entries
-static void _cleanAndRemovePWM(PWMState *p, int pin) {
+static void _cleanAndRemovePWM(PWMState *p, uint8_t pin) {
   uint32_t leftover = 0;
   uint32_t in, out;
   for (in = 0, out = 0; in < p->cnt; in++) {
@@ -265,7 +264,7 @@ IRAM_ATTR bool _stopPWM(uint8_t pin) {
   return _stopPWM_bound(pin);
 }
 
-static void _addPWMtoList(PWMState &p, int pin, uint32_t val, uint32_t range) {
+static void _addPWMtoList(PWMState &p, uint8_t pin, uint32_t val, uint32_t range) {
   // Stash the val and range so we can re-evaluate the fraction
   // should the user change PWM frequency.  This allows us to
   // give as great a precision as possible.  We know by construction
@@ -311,8 +310,8 @@ static void _addPWMtoList(PWMState &p, int pin, uint32_t val, uint32_t range) {
 }
 
 // Called by analogWrite(1...99%) to set the PWM duty in clock cycles
-extern bool _setPWM_weak(int pin, uint32_t val, uint32_t range) __attribute__((weak));
-bool _setPWM_weak(int pin, uint32_t val, uint32_t range) {
+extern bool _setPWM_weak(uint8_t pin, uint32_t val, uint32_t range) __attribute__((weak));
+bool _setPWM_weak(uint8_t pin, uint32_t val, uint32_t range) {
   stopWaveform(pin);
   PWMState p;  // Working copy
   p = pwmState;
@@ -342,8 +341,8 @@ bool _setPWM_weak(int pin, uint32_t val, uint32_t range) {
 
   return true;
 }
-static bool _setPWM_bound(int pin, uint32_t val, uint32_t range) __attribute__((weakref("_setPWM_weak")));
-bool _setPWM(int pin, uint32_t val, uint32_t range) {
+static bool _setPWM_bound(uint8_t pin, uint32_t val, uint32_t range) __attribute__((weakref("_setPWM_weak")));
+bool _setPWM(uint8_t pin, uint32_t val, uint32_t range) {
   return _setPWM_bound(pin, val, range);
 }