From 50b3c9dc620881f872dd1d48ae92274a99ce2e60 Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Sun, 7 May 2023 21:15:31 +0200
Subject: [PATCH] library updates

* FastLED 3.5.0 #master (up to 50% faster)
* All ESP32 env use NeoPixelBus 2.7.3 (slightly faster)
* Weather usermod: small update, as fastLED wants an explicit conversion from CRGB -> uint32_t
* weather usermod: avoid using palette color #0 = black
---
 platformio.ini                                | 21 +++++++++----------
 .../usermod_v2_weather/usermod_v2_weather.h   | 18 ++++++++--------
 wled00/wled.h                                 |  2 +-
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index deb62cce..48d826dd 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -199,7 +199,8 @@ upload_speed = 115200
 # ------------------------------------------------------------------------------
 lib_compat_mode = strict
 lib_deps =
-    fastled/FastLED @ 3.5.0
+    ;fastled/FastLED @ 3.5.0
+    https://github.com/FastLED/FastLED.git#master ;; up to 50% faster
     IRremoteESP8266 @ 2.8.2
     ;;https://github.com/Aircoookie/ESPAsyncWebServer.git @ ~2.0.7
     https://github.com/lost-hope/ESPAsyncWebServer.git#master  ;; WLEDMM to display .log and .wled files in /edit
@@ -244,8 +245,8 @@ lib_deps =
   #https://github.com/lorol/LITTLEFS.git
   ESPAsyncTCP @ 1.2.2
   ESPAsyncUDP
-  ${env.lib_deps}
   makuna/NeoPixelBus @ 2.6.9
+  ${env.lib_deps}
 
 [esp32]
 #platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2.3/platform-espressif32-2.0.2.3.zip
@@ -269,8 +270,9 @@ lib_deps =
   ; https://github.com/lorol/LITTLEFS.git
   ; WLEDMM specific: use patched version of lorol LittleFS
   https://github.com/softhack007/LITTLEFS-threadsafe.git#master
+  ;;makuna/NeoPixelBus @ 2.6.9 ;; WLEDMM default
+  makuna/NeoPixelBus @ 2.7.3
   ${env.lib_deps}
-  makuna/NeoPixelBus @ 2.6.9
 
 ;; ** For compiling with latest Frameworks (IDF4.4.x and arduino-esp32 v2.0.x) **
 ;;; standard V4 platform
@@ -296,9 +298,8 @@ build_flagsV4 = -g
 ;;; V4.4.x libraries (without LOROL_LITTLEFS; with newer NeoPixelBus)
 lib_depsV4 =
   https://github.com/pbolduc/AsyncTCP.git @ 1.2.0 ;; WLEDMM this must be first in the list, otherwise Aircoookie/ESPAsyncWebServer pulls in an older version of AsyncTCP !!
+  makuna/NeoPixelBus @ 2.7.3
   ${env.lib_deps}
-  ;https://github.com/Makuna/NeoPixelBus.git#master ;; NPB 2.6.9 tends to crash whith IDF V4.4.3 -> use latest NeoPixelBus dev instead
-  makuna/NeoPixelBus @ 2.7.1
 
 [esp32s2]
 build_flags = -g
@@ -314,8 +315,8 @@ build_flags = -g
 
 lib_deps =
   https://github.com/pbolduc/AsyncTCP.git @ 1.2.0 ;; WLEDMM this must be first in the list, otherwise Aircoookie/ESPAsyncWebServer pulls in an older version of AsyncTCP !!
+  makuna/NeoPixelBus @ 2.7.3 ;; WLEDMM - new version is more stable on -S2
   ${env.lib_deps}
-  makuna/NeoPixelBus @ 2.7.1 ;; WLEDMM - new version is more stable on -S2
 
 [esp32c3]
 build_flags = -g
@@ -352,8 +353,8 @@ build_flags = -g
 
 lib_deps =
   https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
-  ${env.lib_deps}
   makuna/NeoPixelBus @ 2.7.3
+  ${env.lib_deps}
 
 
 # ------------------------------------------------------------------------------
@@ -1242,16 +1243,14 @@ build_flags = ${esp32_4MB_V4_M_base.build_flags}
   -D WLED_RELEASE_NAME=esp32_4MB_V4_M
   -D WLED_WATCHDOG_TIMEOUT=0 #-D WLED_DISABLE_BROWNOUT_DET
   -D ARDUINO_USB_CDC_ON_BOOT=0 ; needed for arduino-esp32 >=2.0.4; avoids errors on startup
-  ; RAM:   [==        ]  24.8% (used 81316 bytes from 327680 bytes)
-  ; Flash: [==========]  97.2% (used 1528253 bytes from 1572864 bytes)
   -D WLED_DISABLE_LOXONE ; FLASH 1272 bytes
   -D WLED_DISABLE_ALEXA ;  RAM 116 bytes; FLASH 13524 bytes
   -D WLED_DISABLE_HUESYNC ;RAM 122 bytes; FLASH  6308 bytes
-  ; RAM:   [==        ]  24.7% (used 81076 bytes from 327680 bytes)
-  ; Flash: [==========]  95.8% (used 1506893 bytes from 1572864 bytes)
   ;-D WLED_DISABLE_MQTT ;   RAM 216 bytes; FLASH 16496 bytes
   -D WLED_DISABLE_INFRARED ;RAM 136 bytes; FLASH 24492 bytes  ;; softhack007 disabled to stay below 100% flash size
 lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
+;; RAM:   [==        ]  24.7% (used 80884 bytes from 327680 bytes)
+;; Flash: [==========]  99.0% (used 1556429 bytes from 1572864 bytes)
 
 ; compiled with ESP-IDF 4.4.1
 [env:esp32_16MB_V4_M]
diff --git a/usermods/usermod_v2_weather/usermod_v2_weather.h b/usermods/usermod_v2_weather/usermod_v2_weather.h
index 2ed00424..95e02379 100644
--- a/usermods/usermod_v2_weather/usermod_v2_weather.h
+++ b/usermods/usermod_v2_weather/usermod_v2_weather.h
@@ -35,7 +35,7 @@ uint16_t mode_2DWeather(void) {
       // currentTime = localTime;
     }
     else
-      color = ColorFromPalette(SEGPALETTE, map((uint8_t)weather_temps[x%100], 0, 40, 0, 255), 255, LINEARBLEND);
+      color = ColorFromPalette(SEGPALETTE, map((uint8_t)weather_temps[x%100], 0, 40, 1, 255), 255, LINEARBLEND);
 
     for (int y=0; y<SEGMENT.virtualHeight() * (weather_temps[x%100]-weather_minTemp)/(weather_maxTemp - weather_minTemp); y++) {
       SEGMENT.setPixelColorXY(x, SEGMENT.virtualHeight() - y, color);
@@ -58,7 +58,7 @@ uint16_t mode_2DWeather(void) {
   snprintf(tempString, 5, "%5.2f", currentTemp); // snprintf will prevent overflow
   // Serial.println();
 
-  CRGB color = ColorFromPalette(SEGPALETTE, map((uint8_t)currentTemp, 0, 40, 0, 255), 255, LINEARBLEND);
+  CRGB color = ColorFromPalette(SEGPALETTE, map((uint8_t)currentTemp, 0, 40, 1, 255), 255, LINEARBLEND);
   //really don't understand why this is not working if width < 16 (only works when Serial.println is uncommented ???)
   // uint16_t x = 0;
   // const uint16_t xSpace = (SEGMENT.virtualWidth()<16)?4:5;
@@ -78,17 +78,17 @@ uint16_t mode_2DWeather(void) {
   // // Serial.printf("  %d %d\n", x, xSpace);
 
  if (SEGMENT.virtualWidth() < 16) {
-    SEGMENT.drawCharacter(tempString[0], 0, -2, 5, 8, color);
-    SEGMENT.drawCharacter(tempString[1], 4, -2, 5, 8, color);
+    SEGMENT.drawCharacter(tempString[0], 0, -2, 5, 8, uint32_t(color), BLACK);
+    SEGMENT.drawCharacter(tempString[1], 4, -2, 5, 8, uint32_t(color), BLACK);
     SEGMENT.setPixelColorXY(8, 4, color);
-    SEGMENT.drawCharacter(tempString[3], 9, -2, 5, 8, color);
+    SEGMENT.drawCharacter(tempString[3], 9, -2, 5, 8, uint32_t(color), BLACK);
   }
   else {
-    SEGMENT.drawCharacter(tempString[0], 0, -2, 5, 8, color);
-    SEGMENT.drawCharacter(tempString[1], 5, -2, 5, 8, color);
+    SEGMENT.drawCharacter(tempString[0], 0, -2, 5, 8, uint32_t(color), BLACK);
+    SEGMENT.drawCharacter(tempString[1], 5, -2, 5, 8, uint32_t(color), BLACK);
     SEGMENT.setPixelColorXY(10, 4, color);
-    SEGMENT.drawCharacter(tempString[3], 12, -2, 5, 8, color);
-    SEGMENT.drawCharacter(tempString[4], 17, -2, 5, 8, color);
+    SEGMENT.drawCharacter(tempString[3], 12, -2, 5, 8, uint32_t(color), BLACK);
+    SEGMENT.drawCharacter(tempString[4], 17, -2, 5, 8, uint32_t(color), BLACK);
   }
 
   return FRAMETIME;
diff --git a/wled00/wled.h b/wled00/wled.h
index fc835252..c85b449a 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2305040 // May-the-4th be with you ;-)
+#define VERSION 2305070
 
 //uncomment this if you have a "my_config.h" file you'd like to use
 //#define WLED_USE_MY_CONFIG