node-red-contrib-dmx-for-ha 0.6.9 → 0.6.11

package/nodes/ha-mqtt-dmx.js

@@ -207,8 +207,9 @@ module.exports = function (RED) {
             const gamma   = GAMMA_TABLE[Math.max(0, Math.min(255, limited))];
             // DMX floor — if source is ON but output is below floor, snap up
             // Prevents flickering at low DMX values that decoders can't handle cleanly
-            // Exception: if colorValue is 0, light is intentionally OFF — send 0
-            if (colorValue > 0 && gamma < S.dmxFloor) return S.dmxFloor;
+            // colorValue AND brightness both > 0 = light intentionally on
+            // brightness = 0 means light is OFF — always send 0
+            if (colorValue > 0 && brightness > 0 && gamma < S.dmxFloor) return S.dmxFloor;
             return gamma;
         }
 
@@ -396,8 +397,8 @@ module.exports = function (RED) {
                         const to  = toChannels[i] ? toChannels[i][1] : 0;
                         const raw = Math.round(from + (to - from) * progress);
                         // Apply floor during transition — never send flicker values
-                        // Exception: if target is 0, allow 0 (light intentionally off)
-                        const floored = (raw > 0 && raw < S.dmxFloor) ? S.dmxFloor : raw;
+                        // Exception: if target is 0 (intentionally off) allow it to reach 0
+                        const floored = (raw > 0 && raw < S.dmxFloor && to > 0) ? S.dmxFloor : raw;
                         return [ch, floored];
                     });
                     sendDmxChannels(channels);
@@ -433,7 +434,12 @@ module.exports = function (RED) {
             const r  = color.r !== undefined ? color.r : recall('red',      'red_disk',      255);
             const g  = color.g !== undefined ? color.g : recall('green',    'green_disk',    255);
             const b  = color.b !== undefined ? color.b : recall('blue',     'blue_disk',     255);
-            const w  = color.w !== undefined ? color.w : recall('white',    'white_disk',    255);
+            // Colour wheel sends RGB only — no white value means white should be 0
+            // If no colour sent at all (brightness/scene cmd) — keep stored white value
+            const w  = color.w !== undefined ? color.w
+                     : (color.r !== undefined || color.g !== undefined || color.b !== undefined)
+                       ? 0
+                       : recall('white', 'white_disk', 255);
             const ww = color.ww!== undefined ? color.ww: recall('warmWhite','warmWhite_disk', 0);
 
             const toChannels = buildColorChannels(brightness, r, g, b, w, ww);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-dmx-for-ha",
-  "version": "0.6.9",
+  "version": "0.6.11",
   "description": "DMX lighting control for Home Assistant via Node-RED and MQTT. Place a node, fill in the settings, deploy. Full HA device registry integration with RGBW/RGBWW/CCT/brightness colour modes, transitions, effects, and group control.",
   "keywords": [
     "node-red",