From ee380c5377b1f73e2a8da2247bb77288b9670899 Mon Sep 17 00:00:00 2001
From: Blaz Kristan <blaz@kristan-sp.si>
Date: Mon, 30 Sep 2024 16:35:40 +0200
Subject: [PATCH] Replace uint16_t with unsigned for segment data swap if
 statements in color_fade

---
 wled00/FX.h       | 8 ++++----
 wled00/FX_fcn.cpp | 4 ++--
 wled00/colors.cpp | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/wled00/FX.h b/wled00/FX.h
index 763dc2639..065daa86d 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -400,7 +400,7 @@ typedef struct Segment {
       uint32_t _stepT;
       uint32_t _callT;
       uint8_t *_dataT;
-      uint16_t _dataLenT;
+      unsigned _dataLenT;
       TemporarySegmentData()
         : _dataT(nullptr) // just in case...
         , _dataLenT(0)
@@ -418,8 +418,8 @@ typedef struct Segment {
         uint8_t _reserved : 4;
       };
     };
-    uint16_t        _dataLen;
-    static uint16_t _usedSegmentData;
+    unsigned        _dataLen;
+    static unsigned _usedSegmentData;
     static uint8_t  _segBri;                  // brightness of segment for current effect
     static unsigned _vLength;                 // 1D dimension used for current effect
     static unsigned _vWidth, _vHeight;        // 2D dimensions used for current effect
@@ -537,7 +537,7 @@ typedef struct Segment {
     inline uint16_t groupLength()        const { return grouping + spacing; }
     inline uint8_t  getLightCapabilities() const { return _capabilities; }
 
-    inline static uint16_t getUsedSegmentData()            { return Segment::_usedSegmentData; }
+    inline static unsigned getUsedSegmentData()            { return Segment::_usedSegmentData; }
     inline static void     addUsedSegmentData(int len)     { Segment::_usedSegmentData += len; }
     #ifndef WLED_DISABLE_MODE_BLEND
     inline static void     modeBlend(bool blend)           { _modeBlend = blend; }
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 232994e73..13e9e73bb 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -80,7 +80,7 @@ static constexpr bool validatePinsAndTypes(const unsigned* types, unsigned numTy
 ///////////////////////////////////////////////////////////////////////////////
 // Segment class implementation
 ///////////////////////////////////////////////////////////////////////////////
-uint16_t      Segment::_usedSegmentData   = 0U; // amount of RAM all segments use for their data[]
+unsigned      Segment::_usedSegmentData   = 0U; // amount of RAM all segments use for their data[]
 uint16_t      Segment::maxWidth           = DEFAULT_LED_COUNT;
 uint16_t      Segment::maxHeight          = 1;
 unsigned      Segment::_vLength           = 0;
@@ -433,7 +433,7 @@ uint8_t Segment::currentMode() const {
   return mode;
 }
 
-uint32_t IRAM_ATTR_YN Segment::currentColor(uint8_t slot) const {
+uint32_t Segment::currentColor(uint8_t slot) const {
   if (slot >= NUM_COLORS) slot = 0;
 #ifndef WLED_DISABLE_MODE_BLEND
   return isInTransition() ? color_blend(_t->_segT._colorT[slot], colors[slot], progress(), true) : colors[slot];
diff --git a/wled00/colors.cpp b/wled00/colors.cpp
index 1c4844371..c059ea9db 100644
--- a/wled00/colors.cpp
+++ b/wled00/colors.cpp
@@ -77,8 +77,8 @@ uint32_t color_add(uint32_t c1, uint32_t c2, bool preserveCR)
 
 uint32_t color_fade(uint32_t c1, uint8_t amount, bool video)
 {
-  if (c1 == BLACK || amount == 0) return BLACK;
   if (amount == 255) return c1;
+  if (c1 == BLACK || amount == 0) return BLACK;
   uint32_t scaledcolor; // color order is: W R G B from MSB to LSB
   uint32_t scale = amount; // 32bit for faster calculation
   uint32_t addRemains = 0;