From 893f64cfb6595ea80d427a25ba5e2fcc84be3883 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 21 Dec 2018 17:56:09 +0100
Subject: [PATCH] Still need patched PWM for core 2.5.0

Still need patched PWM for core 2.5.0
---
 sonoff/core_esp8266_timer.c          | 6 ++++--
 sonoff/core_esp8266_wiring_digital.c | 6 ++++--
 sonoff/core_esp8266_wiring_pwm.c     | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/sonoff/core_esp8266_timer.c b/sonoff/core_esp8266_timer.c
index fdc7342e5..81c3a76e0 100644
--- a/sonoff/core_esp8266_timer.c
+++ b/sonoff/core_esp8266_timer.c
@@ -18,8 +18,10 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+
+// Use PWM from core 2.4.0 as all other version produce LED flickering when settings are saved to flash. Still true for 2.5.0
 //#include <core_version.h>
-//#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
+//#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2)
 //#warning **** Tasmota is using v2.4.0 timer.c as planned ****
 
 #include "wiring_private.h"
@@ -106,4 +108,4 @@ void ICACHE_RAM_ATTR timer0_detachInterrupt(void) {
     ETS_CCOMPARE0_DISABLE();
 }
 
-//#endif  // ARDUINO_ESP8266_RELEASE_2_3_0
+//#endif  // ARDUINO_ESP8266_RELEASE
diff --git a/sonoff/core_esp8266_wiring_digital.c b/sonoff/core_esp8266_wiring_digital.c
index b51a85aad..33de53c75 100644
--- a/sonoff/core_esp8266_wiring_digital.c
+++ b/sonoff/core_esp8266_wiring_digital.c
@@ -18,8 +18,10 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+
+// Use PWM from core 2.4.0 as all other version produce LED flickering when settings are saved to flash. Still true for 2.5.0
 //#include <core_version.h>
-//#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
+//#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2)
 //#warning **** Tasmota is using v2.4.0 wiring_digital.c as planned ****
 
 #define ARDUINO_MAIN
@@ -212,4 +214,4 @@ extern int digitalRead(uint8_t pin) __attribute__ ((weak, alias("__digitalRead")
 extern void attachInterrupt(uint8_t pin, voidFuncPtr handler, int mode) __attribute__ ((weak, alias("__attachInterrupt")));
 extern void detachInterrupt(uint8_t pin) __attribute__ ((weak, alias("__detachInterrupt")));
 
-//#endif  // ARDUINO_ESP8266_RELEASE_2_3_0
+//#endif  // ARDUINO_ESP8266_RELEASE
diff --git a/sonoff/core_esp8266_wiring_pwm.c b/sonoff/core_esp8266_wiring_pwm.c
index 92d73a4b7..780190059 100644
--- a/sonoff/core_esp8266_wiring_pwm.c
+++ b/sonoff/core_esp8266_wiring_pwm.c
@@ -18,8 +18,10 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+
+// Use PWM from core 2.4.0 as all other version produce flicker when settings are saved to flash. Still true for 2.5.0
 //#include <core_version.h>
-//#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
+//#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2)
 //#warning **** Tasmota is using v2.4.0 wiring_pwm.c as planned ****
 
 #include "wiring_private.h"
@@ -224,4 +226,4 @@ extern void analogWrite(uint8_t pin, int val) __attribute__ ((weak, alias("__ana
 extern void analogWriteFreq(uint32_t freq) __attribute__ ((weak, alias("__analogWriteFreq")));
 extern void analogWriteRange(uint32_t range) __attribute__ ((weak, alias("__analogWriteRange")));
 
-//#endif  // ARDUINO_ESP8266_RELEASE_2_3_0
+//#endif  // ARDUINO_ESP8266_RELEASE