Small changes

ewowi · ewowi · commit 395d4ebf6fe1 · 2026-03-19T23:56:47.000+01:00
diff --git a/livescripts/Effects/Arti-FX/E_Beatmania.sc b/livescripts/Effects/Arti-FX/E_Beatmania.sc
@@ -14,7 +14,6 @@ void loop() {
 
   uint8_t locn1 = beatsin8(speed / 3 + 1, 0, NUM_LEDS - 1, 0, 0);
   uint8_t locn2 = beatsin8(speed / 4 + 1, 0, NUM_LEDS - 1, 0, 0);
-  uint8_t locn3 = beatsin8(speed / 5 + 1, 0, NUM_LEDS / 2 + NUM_LEDS / 3, 0, 0);
 
   uint8_t colr1 = beatsin8(intensity / 6 + 1, 0, 255, 0, 0);
   uint8_t colr2 = beatsin8(intensity / 7 + 1, 0, 255, 0, 0);
@@ -28,5 +27,5 @@ void loop() {
 
   setRGBPal(locn12, colr12, bri12);
   setRGBPal(locn1, colr2, bri1);
-  setRGBPal(locn2 % (NUM_LEDS - 1), colr1, bri2);
+  setRGBPal(locn2, colr1, bri2);
 }
diff --git a/livescripts/Effects/Arti-FX/E_Clock.sc b/livescripts/Effects/Arti-FX/E_Clock.sc
@@ -3,10 +3,7 @@
 // Requires NTP to be configured for correct time
 
 void loop() {
-  // clear all
-  for (int i = 0; i < NUM_LEDS; i++) {
-    setRGB(i, CRGB(0, 0, 0));
-  }
+  fadeToBlackBy(255);  // instant clear
 
   // hour, minute, second as dots at positions along the strip
   if (hour < NUM_LEDS) setRGBPal(hour, 25, 255);
diff --git a/livescripts/Effects/Arti-FX/E_Clock2D.sc b/livescripts/Effects/Arti-FX/E_Clock2D.sc
@@ -5,10 +5,7 @@
 #define PI2 6.28318
 
 void loop() {
-  // clear all
-  for (int i = 0; i < NUM_LEDS; i++) {
-    setRGB(i, CRGB(0, 0, 0));
-  }
+  fadeToBlackBy(255);  // instant clear
 
   int cx = width / 2;
   int cy = height / 2;
diff --git a/livescripts/Effects/Arti-FX/E_Drip.sc b/livescripts/Effects/Arti-FX/E_Drip.sc
@@ -21,11 +21,11 @@ void loop() {
   dripSpd = dripSpd + grav;
   dripLocn = dripLocn - dripSpd;
 
-  if (dripLocn > 0.0) {
+  if (dripLocn >= 0.0) {
     setRGBPal((int)dripLocn, colr, bri);
   }
 
-  if (dripLocn <= 0.0) {
+  if (dripLocn < 0.0) {
     dripLocn = NUM_LEDS - 1;
     dripSpd = 0.0;
   }
diff --git a/livescripts/Effects/Arti-FX/E_FireworkSparks.sc b/livescripts/Effects/Arti-FX/E_FireworkSparks.sc
@@ -25,6 +25,8 @@ void loop() {
 
     float sv = 1.0;
     if (spark) sv = 0.0;
-    setHSV(i, h * 255, sv * 255, ((sv + vout)) * 255);
+    float val = sv + vout;
+    if (val > 1.0) val = 1.0;
+    setHSV(i, h * 255, sv * 255, val * 255);
   }
 }
diff --git a/livescripts/Effects/Arti-FX/E_GlitchBands.sc b/livescripts/Effects/Arti-FX/E_GlitchBands.sc
@@ -49,10 +49,9 @@ void loop() {
     float st = s1 * s2;
     float stt = st * 2.0 - 1.0;
     if (stt < 0.0) stt = 0.0 - stt;
-    float s = 1.0 - (1.0 - stt);
 
     float v = 0.5;
     if (s1 > s2) v = 1.5;
-    setHSV(i, h * 255, s * 255, v * 170);
+    setHSV(i, h * 255, sst * 255, v * 170);
   }
 }
diff --git a/livescripts/Effects/Arti-FX/E_Mover.sc b/livescripts/Effects/Arti-FX/E_Mover.sc
@@ -2,9 +2,7 @@
 // Original: Mover.wled (idea by @Atuline)
 
 void loop() {
-  for (int i = 0; i < NUM_LEDS; i++) {
-    setRGB(i, CRGB(0, 0, 0));
-  }
+  fadeToBlackBy(255);  // instant clear
 
   int locn = millis() / 100;
   for (int i = 0; i < NUM_LEDS; i = i + 30) {
diff --git a/livescripts/Effects/Arti-FX/E_Opposites.sc b/livescripts/Effects/Arti-FX/E_Opposites.sc
@@ -26,6 +26,7 @@ void loop() {
 
     float v = (w1 + 0.1) * (w2 + 0.1) * (w3 + 0.1);
     v = v * 2.0;
+    if (v > 1.0) v = 1.0;
     setHSV(i, h * 255, 255, v * 255);
   }
 }
diff --git a/livescripts/Effects/Arti-FX/E_PerlinMove.sc b/livescripts/Effects/Arti-FX/E_PerlinMove.sc
@@ -12,7 +12,7 @@ void setup() {
 }
 
 void loop() {
-  fadeToBlackBy(255 - fade);
+  fadeToBlackBy(fade);
 
   for (int i = 0; i < intensity / 16 + 1; i++) {
     uint16_t y = millis() * 128 / (260 - speed);
diff --git a/livescripts/Effects/Arti-FX/E_RainbowFonts.sc b/livescripts/Effects/Arti-FX/E_RainbowFonts.sc
@@ -6,6 +6,7 @@
 void loop() {
   float t1 = (millis() % 6553) / 6553.0;
   int hl = NUM_LEDS / 2;
+  if (hl < 1) hl = 1;
 
   for (int i = 0; i < NUM_LEDS; i++) {
     float diff = i - hl;
diff --git a/livescripts/Effects/Arti-FX/E_RainbowFonts2.sc b/livescripts/Effects/Arti-FX/E_RainbowFonts2.sc
@@ -8,7 +8,6 @@ void loop() {
   int scale = NUM_LEDS / 2;
   float timeOff = (millis() % 13107) / 13107.0;
   float offset = sin(timeOff * PI2) * NUM_LEDS / 10.0;
-  float offsetL = offset / NUM_LEDS;
 
   for (int i = 0; i < NUM_LEDS; i++) {
     float diff = (i + offset) - scale;
diff --git a/livescripts/Effects/Arti-FX/E_RainbowMelt.sc b/livescripts/Effects/Arti-FX/E_RainbowMelt.sc
@@ -7,6 +7,7 @@ void loop() {
   float t1 = (millis() % 6553) / 6553.0;
   float t2 = (millis() % 8519) / 8519.0;
   int hl = NUM_LEDS / 2;
+  if (hl < 1) hl = 1;
 
   for (int i = 0; i < NUM_LEDS; i++) {
     float diff = i - hl;
diff --git a/livescripts/Effects/Arti-FX/E_Smiley.sc b/livescripts/Effects/Arti-FX/E_Smiley.sc
@@ -10,7 +10,9 @@ void loop() {
   // face circle
   int cx = width / 2;
   int cy = height / 2;
-  int radius = width * 2 / 5;
+  int minDim = width;
+  if (height < minDim) minDim = height;
+  int radius = minDim * 2 / 5;
   drawCircle(cx, cy, radius, faceColor);
 
   // left eye
diff --git a/livescripts/Effects/Arti-FX/E_SpinCycle.sc b/livescripts/Effects/Arti-FX/E_SpinCycle.sc
@@ -5,13 +5,11 @@
 
 void loop() {
   float t1 = (millis() % 6553) / 6553.0;
-  float t2 = (millis() % 6553) / 6553.0;
   float w1 = (1.0 + sin(t1 * PI2)) / 2.0;
-  float w2 = (1.0 + sin(t2 * PI2)) / 2.0;
 
   for (int i = 0; i < NUM_LEDS; i++) {
     float il = i * 1.0 / NUM_LEDS;
-    float h = il * (5.0 + w1 * 5.0) + w2 * 2.0;
+    float h = il * (5.0 + w1 * 5.0) + w1 * 2.0;
     float hf = h - (int)h;
     float hmod = hf - (int)(hf / 0.5) * 0.5;
     h = hmod + t1;
diff --git a/livescripts/Effects/Arti-FX/E_Subpixel.sc b/livescripts/Effects/Arti-FX/E_Subpixel.sc
@@ -18,6 +18,7 @@ void loop() {
     if (diff < 0.0) diff = 0.0 - diff;
     if (diff > 256 / reverseSlider) diff = 256 / reverseSlider;
     int bri = 256 - (int)(diff * reverseSlider);
+    if (bri > 255) bri = 255;
     if (bri < 0) bri = 0;
     setHSV(i, 0, 255, bri);
   }
diff --git a/livescripts/Effects/Arti-FX/E_WaveSins.sc b/livescripts/Effects/Arti-FX/E_WaveSins.sc
@@ -18,7 +18,8 @@ void setup() {
 void loop() {
   for (int i = 0; i < NUM_LEDS; i++) {
     float bri = sin(millis() / 4.0 + i * intensity) * 128.0 + 128.0;
-    uint8_t palIdx = beatsin8(speed, custom1, custom1 + custom2, 0, i * custom3);
+    uint8_t highest = (custom1 + custom2 > 255) ? 255 : custom1 + custom2;
+    uint8_t palIdx = beatsin8(speed, custom1, highest, 0, i * custom3);
     setRGBPal(i, palIdx, (int)bri);
   }
 }
diff --git a/misc/upstream-prs/ESPLiveScript-Coord3D.md b/misc/upstream-prs/ESPLiveScript-Coord3D.md
@@ -16,8 +16,8 @@ Fix A alone is sufficient to allow scripts to write helper functions with user-d
 
 ### Symptom
 
-```
-member  not foudn in Coord3D
+```text
+member  not found in Coord3D
 Guru Meditation Error: Core 0 panic'ed (LoadProhibited)
   #0 copyPrty(NodeToken*, NodeToken*) at NodeToken.h:1272
   #1 createNodeVariable(Token*, bool) at NodeToken.h:1544
diff --git a/src/MoonBase/LiveScriptNode.cpp b/src/MoonBase/LiveScriptNode.cpp
@@ -50,7 +50,7 @@ static void _addControl(uint8_t* var, char* name, char* type, uint8_t min = 0, u
   currentNode()->addControl(*var, name, type, min, max);
 }
 static void _nextPin() { layerP.nextPin(); }
-static void _addLight(uint8_t x, uint8_t y, uint8_t z) { layerP.addLight({x, y, z}); }
+static void _addLight(uint16_t x, uint16_t y, uint16_t z) { layerP.addLight({x, y, z}); }
 
 static void _modifySize() { currentNode()->modifySize(); }
 static void _modifyPosition(Coord3D& position) { currentNode()->modifyPosition(position); }  // need &position parameter
@@ -80,8 +80,8 @@ static uint8_t _lsMinute = 0;
 static uint8_t _lsSecond = 0;
 static void _updateTime() {
   time_t now = time(nullptr);
-  struct tm* t = localtime(&now);
-  if (t) { _lsHour = t->tm_hour; _lsMinute = t->tm_min; _lsSecond = t->tm_sec; }
+  struct tm t;
+  if (localtime_r(&now, &t)) { _lsHour = t.tm_hour; _lsMinute = t.tm_min; _lsSecond = t.tm_sec; }
 }
 
 volatile SemaphoreHandle_t WaitAnimationSync = xSemaphoreCreateCounting(4, 0);  // max 4 concurrent scripts
@@ -167,7 +167,7 @@ void LiveScriptNode::setup() {
   // MoonLight functions
   addExternal("void addControl(void*,char*,char*,uint8_t,uint8_t)", (void*)_addControl);
   addExternal("void nextPin()", (void*)_nextPin);
-  addExternal("void addLight(uint8_t,uint8_t,uint8_t)", (void*)_addLight);
+  addExternal("void addLight(uint16_t,uint16_t,uint16_t)", (void*)_addLight);
   addExternal("void modifySize()", (void*)_modifySize);
   //   addExternal(    "void modifyPosition(Coord3D &position)", (void *)_modifyPosition);
   //   addExternal(    "void modifyXYZ(uint16_t,uint16_t,uint16_t)", (void *)_modifyXYZ);
@@ -392,13 +392,7 @@ void LiveScriptNode::free() {
 
 void LiveScriptNode::killAndDelete() {
   EXT_LOGV(MB_TAG, "%s", animation.c_str());
-  // 🌙 Unregister task → node mapping before the task is deleted.
-  Executable* exec = scriptRuntime.findExecutable(animation.c_str());
-  if (exec && exec->__run_handle_index != 9999) {
-    TaskHandle_t h = *runningPrograms.getHandleByIndex(exec->__run_handle_index);
-    if (h) unregisterNodeForTask(h);
-  }
-  scriptRuntime.kill(animation.c_str());
+  kill();
   // scriptRuntime.free(animation.c_str());
   scriptRuntime.deleteExe(animation.c_str());
 };

Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,11 @@ void loop() {`
`21`	`21`	`dripSpd = dripSpd + grav;`
`22`	`22`	`dripLocn = dripLocn - dripSpd;`
`23`	`23`
`24`		`- if (dripLocn > 0.0) {`
	`24`	`+ if (dripLocn >= 0.0) {`
`25`	`25`	`setRGBPal((int)dripLocn, colr, bri);`
`26`	`26`	`}`
`27`	`27`
`28`		`- if (dripLocn <= 0.0) {`
	`28`	`+ if (dripLocn < 0.0) {`
`29`	`29`	`dripLocn = NUM_LEDS - 1;`
`30`	`30`	`dripSpd = 0.0;`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ void loop() {`
`25`	`25`
`26`	`26`	`float sv = 1.0;`
`27`	`27`	`if (spark) sv = 0.0;`
`28`		`- setHSV(i, h * 255, sv * 255, ((sv + vout)) * 255);`
	`28`	`+ float val = sv + vout;`
	`29`	`+ if (val > 1.0) val = 1.0;`
	`30`	`+ setHSV(i, h * 255, sv * 255, val * 255);`
`29`	`31`	`}`
`30`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,9 @@ void loop() {`
`49`	`49`	`float st = s1 * s2;`
`50`	`50`	`float stt = st * 2.0 - 1.0;`
`51`	`51`	`if (stt < 0.0) stt = 0.0 - stt;`
`52`		`- float s = 1.0 - (1.0 - stt);`
`53`	`52`
`54`	`53`	`float v = 0.5;`
`55`	`54`	`if (s1 > s2) v = 1.5;`
`56`		`- setHSV(i, h * 255, s * 255, v * 170);`
	`55`	`+ setHSV(i, h * 255, sst * 255, v * 170);`
`57`	`56`	`}`
`58`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ void loop() {`
`26`	`26`
`27`	`27`	`float v = (w1 + 0.1) * (w2 + 0.1) * (w3 + 0.1);`
`28`	`28`	`v = v * 2.0;`
	`29`	`+ if (v > 1.0) v = 1.0;`
`29`	`30`	`setHSV(i, h * 255, 255, v * 255);`
`30`	`31`	`}`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ void setup() {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`void loop() {`
`15`		`- fadeToBlackBy(255 - fade);`
	`15`	`+ fadeToBlackBy(fade);`
`16`	`16`
`17`	`17`	`for (int i = 0; i < intensity / 16 + 1; i++) {`
`18`	`18`	`uint16_t y = millis() * 128 / (260 - speed);`