effectID: a few more 16bit fixes

* proper default MaxVal for parseNumber16, getVal16, updateVal16
* more fixes for IR.cpp
* json robustness improvement

Author: softhack007

wled00/FX.cpp

@@ -11772,6 +11772,13 @@ static const char _data_RESERVED[] PROGMEM = "RSVD";
 // add (or replace reserved) effect mode and data into vector
 // use id==255 to find unallocated gaps (with "Reserved" data string)
 // if vector size() is smaller than id (single) data is appended at the end (regardless of id)
+///// 
+// WLEDMM extended to use 16bit effect IDs
+//   PoC: if id >= _mode.size(), we currently append at the tail and ignore the explicit id.
+//   TODO(WLED‑MM): honor explicit IDs by resizing/backfilling up to `id` and placing the effect
+//   at exactly that slot; update _modeCount = max(_modeCount, id+1).// PoC: if id >= _mode.size(), we currently append at the tail and ignore the explicit id.
+//   TODO(WLED‑MM): honor explicit IDs by resizing/backfilling up to `id` and placing the effect
+//   at exactly that slot; update _modeCount = max(_modeCount, id+1).
 void WS2812FX::addEffect(uint16_t id, mode_ptr mode_fn, const char *mode_name) {
   if ((id < _mode.size()) && (_modeData[id] != _data_RESERVED)) {
       DEBUG_PRINTF("addEffect(%d) -> ", id);

wled00/fcn_declare.h

@@ -387,9 +387,9 @@ void parseNumber(const char* str, byte* val, byte minv=0, byte maxv=255);
 bool getVal(JsonVariant elem, byte* val, byte minv=0, byte maxv=255);
 bool updateVal(const char* req, const char* key, byte* val, byte minv=0, byte maxv=255);
 
-void parseNumber16(const char* str, uint16_t* val, uint16_t minv=0, uint16_t maxv=255); // the real thing in 16bit
-bool getVal16(JsonVariant elem, uint16_t* val, uint16_t vmin, uint16_t vmax=255); // same as above, with 2byte output buffer
-bool updateVal16(const char* req, const char* key, uint16_t* val, uint16_t minv=0, uint16_t maxv=255);
+void parseNumber16(const char* str, uint16_t* val, uint16_t minv=0, uint16_t maxv=65535); // the real thing in 16bit
+bool getVal16(JsonVariant elem, uint16_t* val, uint16_t vmin, uint16_t vmax=65535); // same as above, with 2byte output buffer
+bool updateVal16(const char* req, const char* key, uint16_t* val, uint16_t minv=0, uint16_t maxv=65535);
 
 void oappendUseDeflate(bool OnOff); // enable / disable string squeezing
 bool oappend(const char* txt); // append new c string to temp buffer efficiently

wled00/ir.cpp

@@ -91,6 +91,16 @@ byte relativeChange(byte property, int8_t amount, byte lowerBoundary, byte highe
   return (byte)constrain(new_val, 0, 255);
 }
 
+// 16‑bit variant for effect IDs
+uint16_t relativeChange16(uint16_t property, int16_t amount, uint16_t lowerBoundary, uint16_t higherBoundary)
+{
+  int32_t new_val = (int32_t)property + amount;
+  if (lowerBoundary >= higherBoundary) return property;
+  if (new_val > higherBoundary) new_val = higherBoundary;
+  if (new_val < lowerBoundary)  new_val = lowerBoundary;
+  return (uint16_t)new_val;
+}
+
 void changeEffect(uint16_t fx)
 {
   if (irApplyToAllSelected) {
@@ -508,8 +518,8 @@ void decodeIR44(uint32_t code)
     case IR44_WARMWHITE   : changeColor(COLOR_WARMWHITE,     63); changeEffect(FX_MODE_STATIC);  break;
     case IR44_COLDWHITE   : changeColor(COLOR_COLDWHITE,    191); changeEffect(FX_MODE_STATIC);  break;
     case IR44_COLDWHITE2  : changeColor(COLOR_COLDWHITE2,   255); changeEffect(FX_MODE_STATIC);  break;
-    case IR44_REDPLUS     : changeEffect(relativeChange(effectCurrent,  1, 0, strip.getModeCount() -1));               break;
-    case IR44_REDMINUS    : changeEffect(relativeChange(effectCurrent, -1, 0, strip.getModeCount() -1));               break;
+    case IR44_REDPLUS     : changeEffect(relativeChange16(effectCurrent,  1, 0, strip.getModeCount() -1));               break;
+    case IR44_REDMINUS    : changeEffect(relativeChange16(effectCurrent, -1, 0, strip.getModeCount() -1));               break;
     case IR44_GREENPLUS   : changePalette(relativeChange(effectPalette,  1, 0, strip.getPaletteCount() -1)); break;
     case IR44_GREENMINUS  : changePalette(relativeChange(effectPalette, -1, 0, strip.getPaletteCount() -1)); break;
     case IR44_BLUEPLUS    : changeEffectIntensity( 16);                  break;
@@ -568,7 +578,7 @@ void decodeIR6(uint32_t code)
     case IR6_POWER:        toggleOnOff();                                                    break;
     case IR6_CHANNEL_UP:   incBrightness();                                                  break;
     case IR6_CHANNEL_DOWN: decBrightness();                                                  break;
-    case IR6_VOLUME_UP:    changeEffect(relativeChange(effectCurrent, 1, 0, strip.getModeCount() -1)); break;
+    case IR6_VOLUME_UP:    changeEffect(relativeChange16(effectCurrent, 1, 0, strip.getModeCount() -1)); break;
     case IR6_VOLUME_DOWN:  changePalette(relativeChange(effectPalette, 1, 0, strip.getPaletteCount() -1));
       switch(lastIR6ColourIdx) {
         case 0: changeColor(COLOR_RED);       break;
@@ -606,7 +616,7 @@ void decodeIR9(uint32_t code)
     case IR9_DOWN       : decBrightness();                                                  break;
     case IR9_LEFT       : changeEffectSpeed(-16);                                           break;
     case IR9_RIGHT      : changeEffectSpeed(16);                                            break;
-    case IR9_SELECT     : changeEffect(relativeChange(effectCurrent, 1, 0, strip.getModeCount() -1)); break;
+    case IR9_SELECT     : changeEffect(relativeChange16(effectCurrent, 1, 0, strip.getModeCount() -1)); break;
     default: return;
   }
   lastValidCode = code;
@@ -621,8 +631,8 @@ void decodeIR24MC(uint32_t code)
     case IR24_MC_OFF        : if (bri > 0) briLast = bri; bri = 0; break;
     case IR24_MC_AUTO       : changeEffect(FX_MODE_FADE);          break;
     case IR24_MC_ON         : bri = briLast;                       break;
-    case IR24_MC_MODES      : changeEffect(relativeChange(effectCurrent,  1, 0, strip.getModeCount() -1)); break; //WLEDMM: sound and non sound modes
-    case IR24_MC_MODE       : changeEffect(relativeChange(effectCurrent, -1, 0, strip.getModeCount() -1)); break; //WLEDMM: sound and non sound modes
+    case IR24_MC_MODES      : changeEffect(relativeChange16(effectCurrent,  1, 0, strip.getModeCount() -1)); break; //WLEDMM: sound and non sound modes
+    case IR24_MC_MODE       : changeEffect(relativeChange16(effectCurrent, -1, 0, strip.getModeCount() -1)); break; //WLEDMM: sound and non sound modes
     case IR24_MC_BRIGHTER   : incBrightness();                     break;
     case IR24_MC_DARKER     : decBrightness();                     break;
     case IR24_MC_QUICK      : changeEffectSpeed( 16);              break;
@@ -711,7 +721,7 @@ void decodeIRJson(uint32_t code)
         decBrightness();
       } else if (cmdStr.startsWith(F("!presetF"))) { //!presetFallback
         uint8_t p1 = fdo["PL"] | 1;
-        uint8_t p2 = fdo["FX"] | random8(strip.getModeCount() -1);
+        uint16_t p2 = fdo["FX"] | random16(strip.getModeCount() -1);
         uint8_t p3 = fdo["FP"] | 0;
         presetFallback(p1, p2, p3);
       }

wled00/json.cpp

@@ -293,7 +293,8 @@ bool deserializeSegment(JsonObject elem, byte it, byte presetId)
   #endif
 
   uint16_t fx = seg.mode;
-  uint16_t last = max(strip.getModeCount()-1, 0);     // WLEDMM bugfix: make sure that fx= cannot go out of range (effects IDs start at 0)
+  uint16_t fxModeCount = strip.getModeCount();
+  uint16_t last = fxModeCount ? (uint16_t)(fxModeCount - 1) : 0;  // WLEDMM bugfix: make sure that fx= cannot go out of range (effects IDs start at 0)
   // partial fix for #3605
   if (!elem["fx"].isNull() && elem["fx"].is<const char*>()) {
     const char *tmp = elem["fx"].as<const char *>();