node-red-contrib-dmx-for-ha 0.6.26 → 0.6.28

package/nodes/ha-mqtt-button.html

@@ -313,7 +313,7 @@
     </div>
 
     <div style="margin-top:16px; padding-top:8px; border-top:1px solid #444; color:#666; font-size:0.8em; text-align:right;">
-        node-red-contrib-dmx-for-ha &nbsp;v0.6.26
+        node-red-contrib-dmx-for-ha &nbsp;v0.6.28
     </div>
 
 </script>

package/nodes/ha-mqtt-dmx-group.html

@@ -317,7 +317,7 @@
     </div>
 
     <div style="margin-top:16px; padding-top:8px; border-top:1px solid #444; color:#666; font-size:0.8em; text-align:right;">
-        node-red-contrib-dmx-for-ha &nbsp;v0.6.26
+        node-red-contrib-dmx-for-ha &nbsp;v0.6.28
     </div>
 
 </script>

package/nodes/ha-mqtt-dmx.html

@@ -169,6 +169,7 @@
             defaultState:   { value: 'OFF' },
             // Advanced
             dmxLimiter:     { value: '255' },
+            dmxFloor:       { value: '' },
             minOutput:      { value: '1' },
             brightBump:     { value: '50' },
             ticksPerSec:    { value: '31' },
@@ -544,6 +545,15 @@
         <span style="margin-left:8px; color:#999; font-size:0.85em;">Caps all DMX channel values (0–255)</span>
     </div>
 
+    <div class="form-row">
+        <label for="node-input-dmxFloor">
+            <i class="fa fa-arrow-up"></i> DMX floor
+        </label>
+        <input type="number" id="node-input-dmxFloor"
+               min="0" max="20" step="1" style="width:70px" placeholder="config default" />
+        <span style="margin-left:8px; color:#999; font-size:0.85em;">Override config floor for this fixture (blank = use config default)</span>
+    </div>
+
     <div class="form-row">
         <label for="node-input-minOutput">
             <i class="fa fa-sort-numeric-asc"></i> Min output when ON
@@ -584,7 +594,7 @@
     </div>
 
     <div style="margin-top:16px; padding-top:8px; border-top:1px solid #444; color:#666; font-size:0.8em; text-align:right;">
-        node-red-contrib-dmx-for-ha &nbsp;v0.6.26
+        node-red-contrib-dmx-for-ha &nbsp;v0.6.28
     </div>
 
 </script>

package/nodes/ha-mqtt-dmx.js

@@ -164,7 +164,7 @@ module.exports = function (RED) {
             flashShort:    cfg.flashShort,
             flashLong:     cfg.flashLong,
             diskDelay:     cfg.diskDelay,
-            dmxFloor:      cfg.dmxFloor !== undefined ? cfg.dmxFloor : 3,
+            dmxFloor:      config.dmxFloor !== '' && config.dmxFloor !== undefined && config.dmxFloor !== null ? parseInt(config.dmxFloor) : (cfg.dmxFloor !== undefined ? cfg.dmxFloor : 3),
         };
 
         // ── Debug mode safeguards ─────────────────────────────────────────
@@ -250,6 +250,10 @@ module.exports = function (RED) {
         const _lastSent = {};
 
         function sendDmxChannels(channels) {
+            // Enforce DMX floor — no value between 1 and (floor-1) ever reaches controller
+            if (S.dmxFloor > 0) {
+                channels = channels.map(([ch, val]) => [ch, (val > 0 && val < S.dmxFloor) ? S.dmxFloor : val]);
+            }
             if (dmxProfile.batched) {
                 // ── Batched mode (etherten_v2) ─────────────────────────────
                 // Collect all changed channels → publish ONE message per tick
@@ -351,18 +355,11 @@ module.exports = function (RED) {
                 p.warmWhite  !== undefined ? p.warmWhite  : 0
             );
             sendDmxChannels(channels);
-            const br = p.brightness !== undefined ? p.brightness : 255;
             pubState({
                 state:      p.state || 'OFF',
                 color_mode: S.colorMode,
                 brightness: p.brightness,
-                color: {
-                    r: scaleToDmx(p.red   !== undefined ? p.red   : 255, br),
-                    g: scaleToDmx(p.green !== undefined ? p.green : 255, br),
-                    b: scaleToDmx(p.blue  !== undefined ? p.blue  : 255, br),
-                    w: scaleToDmx(p.white !== undefined ? p.white : 255, br),
-                    ww: p.warmWhite
-                }
+                color:      { r: p.red, g: p.green, b: p.blue, w: p.white, ww: p.warmWhite }
             });
             if (p.state === 'ON') {
                 setStatus('green', 'dot', `${fixtureId} ON  bright:${p.brightness}`);
@@ -498,12 +495,7 @@ module.exports = function (RED) {
             }
 
             saveState('ON', brightness, r, g, b, w, ww);
-            // Report floored DMX values back to HA so sub-floor bleed is never stored in state
-            const rPub = scaleToDmx(r, brightness);
-            const gPub = scaleToDmx(g, brightness);
-            const bPub = scaleToDmx(b, brightness);
-            const wPub = scaleToDmx(w, brightness);
-            pubState({ state: 'ON', color_mode: S.colorMode, brightness, color: { r: rPub, g: gPub, b: bPub, w: wPub, ww } });
+            pubState({ state: 'ON', color_mode: S.colorMode, brightness, color: { r, g, b, w, ww } });
             setStatus('green', 'dot', `${fixtureId} ON  bright:${brightness}`);
         }
 
@@ -810,12 +802,7 @@ module.exports = function (RED) {
                 } else {
                     sendDmxChannels(buildColorChannels(0, r, g, b, w, ww));
                 }
-                // Report floored values so HA never stores sub-floor values in state
-                const rPub = state === 'ON' ? scaleToDmx(r, brightness) : r;
-                const gPub = state === 'ON' ? scaleToDmx(g, brightness) : g;
-                const bPub = state === 'ON' ? scaleToDmx(b, brightness) : b;
-                const wPub = state === 'ON' ? scaleToDmx(w, brightness) : w;
-                pubState({ state, color_mode: S.colorMode, brightness, color: { r: rPub, g: gPub, b: bPub, w: wPub, ww } });
+                pubState({ state, color_mode: S.colorMode, brightness, color: { r, g, b, w, ww } });
                 if (state === 'ON') {
                     setStatus('green', 'dot', `${fixtureId} ON  bright:${brightness}`);
                 } else {

package/nodes/ha-mqtt-pir.html

@@ -318,7 +318,7 @@
     </div>
 
     <div style="margin-top:16px; padding-top:8px; border-top:1px solid #444; color:#666; font-size:0.8em; text-align:right;">
-        node-red-contrib-dmx-for-ha &nbsp;v0.6.26
+        node-red-contrib-dmx-for-ha &nbsp;v0.6.28
     </div>
 
 </script>

package/nodes/ha-mqtt-relay.html

@@ -301,7 +301,7 @@
     </div>
 
     <div style="margin-top:16px; padding-top:8px; border-top:1px solid #444; color:#666; font-size:0.8em; text-align:right;">
-        node-red-contrib-dmx-for-ha &nbsp;v0.6.26
+        node-red-contrib-dmx-for-ha &nbsp;v0.6.28
     </div>
 
 </script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-dmx-for-ha",
-  "version": "0.6.26",
+  "version": "0.6.28",
   "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",