Merge branch '0_15' into suspend

wled00/FX.h

@@ -62,10 +62,10 @@
 //#define FRAMETIME        _frametime
 #define FRAMETIME        strip.getFrameTime()
 
-/* each segment uses 52 bytes of SRAM memory, so if you're application fails because of
+/* each segment uses 82 bytes of SRAM memory, so if you're application fails because of
   insufficient memory, decreasing MAX_NUM_SEGMENTS may help */
 #ifdef ESP8266
-  #define MAX_NUM_SEGMENTS    16
+  #define MAX_NUM_SEGMENTS    12
   /* How much data bytes all segments combined may allocate */
   #define MAX_SEGMENT_DATA  5120
 #else
@@ -73,9 +73,13 @@
     #define MAX_NUM_SEGMENTS  32
   #endif
   #if defined(ARDUINO_ARCH_ESP32S2)
-    #define MAX_SEGMENT_DATA  24576
+    #if defined(BOARD_HAS_PSRAM) && defined(WLED_USE_PSRAM)
+      #define MAX_SEGMENT_DATA  MAX_NUM_SEGMENTS*1024 // 32k by default
+    #else
+      #define MAX_SEGMENT_DATA  MAX_NUM_SEGMENTS*768  // 24k by default
+    #endif
   #else
-    #define MAX_SEGMENT_DATA  32767
+    #define MAX_SEGMENT_DATA  MAX_NUM_SEGMENTS*1280 // 40k by default
   #endif
 #endif
 
@@ -682,10 +686,7 @@ class WS2812FX {  // 96 bytes
     WS2812FX() :
       paletteFade(0),
       paletteBlend(0),
-      milliampsPerLed(55),
       cctBlending(0),
-      ablMilliampsMax(ABL_MILLIAMPS_DEFAULT),
-      currentMilliamps(0),
       now(millis()),
       timebase(0),
       isMatrix(false),
@@ -797,7 +798,6 @@ class WS2812FX {  // 96 bytes
 
     uint8_t
       paletteBlend,
-      milliampsPerLed,
       cctBlending,
       getActiveSegmentsNum(void),
       getFirstSelectedSegId(void),
@@ -815,8 +815,6 @@ class WS2812FX {  // 96 bytes
     inline uint8_t getModeCount() { return _modeCount; }
 
     uint16_t
-      ablMilliampsMax,
-      currentMilliamps,
       getLengthPhysical(void),
       getLengthTotal(void), // will include virtual/nonexistent pixels in matrix
       getFps();