node-red-contrib-dmx-for-ha 0.6.2 → 0.6.4

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;
+            // Both colorValue AND brightness must be > 0 (light intentionally on)
+            // Exception: brightness = 0 means light is OFF — always allow 0
+            if (colorValue > 0 && brightness > 0 && gamma < S.dmxFloor) return S.dmxFloor;
             return gamma;
         }
 
@@ -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);
+            // If HA sent RGB colour but NO white value → colour wheel in use → white = 0
+            // If HA sent nothing at all → keep stored white value (scene/brightness change)
+            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.2",
+  "version": "0.6.4",
   "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",
@@ -24,7 +24,7 @@
   "license": "GPL-3.0",
   "main": "nodes/ha-mqtt-config.js",
   "node-red": {
-    "version": ">=3.0.0",
+    "version": "0.6.4",
     "nodes": {
       "ha-mqtt-config":     "nodes/ha-mqtt-config.js",
       "ha-mqtt-dmx":        "nodes/ha-mqtt-dmx.js",