From c17e73aa9b7d2fe36d2260f59cf9a34a4263ce1d Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 22 Jul 2022 15:13:41 +0200
Subject: [PATCH] Refactor analogWrite library

---
 .../src/esp8266toEsp32.cpp                    | 45 +++++++------------
 .../src/esp8266toEsp32.h                      | 10 ++---
 2 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.cpp b/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.cpp
index d3927fc2f..1438c306a 100644
--- a/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.cpp
+++ b/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.cpp
@@ -57,7 +57,7 @@ void _analogInit(void) {
   pwm_impl_inited = true;
 }
 
-int32_t _analog_pin2chan(uint32_t pin) {    // returns -1 if uallocated
+int _analog_pin2chan(uint32_t pin) {    // returns -1 if uallocated
   _analogInit();      // make sure the mapping array is initialized
   for (uint32_t channel = 0; channel < MAX_PWMS; channel++) {
     if ((pwm_channel[channel] < 255) && (pwm_channel[channel] == pin)) {
@@ -67,16 +67,16 @@ int32_t _analog_pin2chan(uint32_t pin) {    // returns -1 if uallocated
   return -1;
 }
 
-void _analogWriteFreqRange(uint8_t pin) {
+void _analogWriteFreqRange(uint32_t pin) {
   _analogInit();      // make sure the mapping array is initialized
-  if (pin == 255) {
-   for (uint32_t channel = 0; channel < MAX_PWMS; channel++) {
-     if (pwm_channel[channel] < 255) {
-       ledcSetup(channel, pwm_frequency, pwm_bit_num);
-     }
-   }
+  if (255 == pin) {
+    for (uint32_t channel = 0; channel < MAX_PWMS; channel++) {
+      if (pwm_channel[channel] < 255) {
+        ledcSetup(channel, pwm_frequency, pwm_bit_num);
+      }
+    }
   } else {
-   int32_t channel = _analog_pin2chan(pin);
+   int channel = _analog_pin2chan(pin);
    if (channel >= 0) {
      ledcSetup(channel, pwm_frequency, pwm_bit_num);
    }
@@ -93,30 +93,20 @@ uint32_t _analogGetResolution(uint32_t x) {
   return bits;
 }
 
-void analogWriteRange(uint32_t range) {
-  pwm_bit_num = _analogGetResolution(range);
-  _analogWriteFreqRange(255);
-}
-
-void analogWriteRange(uint32_t range, uint8_t pin) {
+void analogWriteRange(uint32_t range, uint32_t pin) {
   pwm_bit_num = _analogGetResolution(range);
   _analogWriteFreqRange(pin);
 }
 
-void analogWriteFreq(uint32_t freq) {
-  pwm_frequency = freq;
-  _analogWriteFreqRange(255);
-}
-
-void analogWriteFreq(uint32_t freq, uint8_t pin) {
+void analogWriteFreq(uint32_t freq, uint32_t pin) {
   pwm_frequency = freq;
   _analogWriteFreqRange(pin);
 }
 
-int32_t analogAttach(uint32_t pin, bool output_invert) {    // returns ledc channel used, or -1 if failed
+int analogAttach(uint32_t pin, bool output_invert) {    // returns ledc channel used, or -1 if failed
   _analogInit();      // make sure the mapping array is initialized
   // Find if pin is already attached
-  int32_t chan = _analog_pin2chan(pin);
+  int chan = _analog_pin2chan(pin);
   if (chan >= 0) { return chan; }
   // Find an empty channel
   for (chan = 0; chan < MAX_PWMS; chan++) {
@@ -154,22 +144,21 @@ extern "C" void __wrap__Z11analogWritehi(uint8_t pin, int val) {
   analogWritePhase(pin, val, 0);      // if unspecified, use phase = 0
 }
 
-
 /*
   The primary goal of this function is to add phase control to PWM ledc
   functions.
-  
+
   Phase control allows to stress less the power supply of LED lights.
   By default all phases are starting at the same moment. This means
   the the power supply always takes a power hit at the start of each
   new cycle, even if the average power is low.
   Phase control is also of major importance for H-bridge where
   both PWM lines should NEVER be active at the same time.
-  
+
   Unfortunately Arduino Core does not allow any customization nor
   extendibility for the ledc/analogWrite functions. We have therefore
   no other choice than duplicating part of Arduino code.
-  
+
   WARNING: this means it can easily break if ever Arduino internal
   implementation changes.
 */
@@ -179,7 +168,7 @@ extern uint8_t channels_resolution[MAX_PWMS];
 
 void analogWritePhase(uint8_t pin, uint32_t duty, uint32_t phase)
 {
-  int32_t chan = _analog_pin2chan(pin);
+  int chan = _analog_pin2chan(pin);
   if (chan < 0) {    // not yet allocated, try to allocate
     chan = analogAttach(pin);
     if (chan < 0) { return; }   // failed
diff --git a/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.h b/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.h
index a8a014abf..c10f111fb 100644
--- a/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.h
+++ b/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.h
@@ -25,11 +25,11 @@
 
 
 // input range is in full range, ledc needs bits
-void analogWriteRange(uint32_t range);
-void analogWriteRange(uint32_t range, uint8_t pin);
-void analogWriteFreq(uint32_t freq);
-void analogWriteFreq(uint32_t freq, uint8_t pin);
-int32_t analogAttach(uint32_t pin, bool output_invert = false);   // returns the ledc channel, or -1 if failed. This is implicitly called by analogWrite if the channel was not already allocated
+//void analogWriteRange(uint32_t range);
+void analogWriteRange(uint32_t range, uint32_t pin = 255);
+//void analogWriteFreq(uint32_t freq);
+void analogWriteFreq(uint32_t freq, uint32_t pin = 255);
+int analogAttach(uint32_t pin, bool output_invert = false);   // returns the ledc channel, or -1 if failed. This is implicitly called by analogWrite if the channel was not already allocated
 void analogWrite(uint8_t pin, int val);
 
 // Extended version that also allows to change phase