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

package/nodes/ha-mqtt-config.html

@@ -212,12 +212,12 @@
     </div>
     <div class="form-row">
         <label for="node-config-input-dmxFloor">
-            <i class="fa fa-arrow-up"></i> DMX Floor
+            <i class="fa fa-arrow-down"></i> DMX Floor
         </label>
         <input type="number" id="node-config-input-dmxFloor"
-               min="0" max="50" step="1" style="width:70px" />
+               min="0" max="20" step="1" style="width:70px" />
         <span style="margin-left:8px; color:#999; font-size:0.85em;">
-            Minimum DMX value sent when light is ON. Values below floor snap up to floor. 0 = disabled. Default: 3
+            Min DMX value sent — below this snaps up (0=OFF always OFF). Default: 3
         </span>
     </div>
 </script>

package/nodes/ha-mqtt-dmx.html

@@ -169,6 +169,7 @@
             defaultState:   { value: 'OFF' },
             // Advanced
             dmxLimiter:     { value: '255' },
+            minOutput:      { value: '1' },
             brightBump:     { value: '50' },
             ticksPerSec:    { value: '31' },
             debugMode:      { value: false },
@@ -542,6 +543,16 @@
                min="0" max="255" style="width:70px" />
         <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-minOutput">
+            <i class="fa fa-sort-numeric-asc"></i> Min output when ON
+        </label>
+        <input type="number" id="node-input-minOutput"
+               min="0" max="255" style="width:70px" />
+        <span style="margin-left:8px; color:#999; font-size:0.85em;">0 = pure gamma</span>
+    </div>
+
     <div class="form-row">
         <label for="node-input-brightBump">
             <i class="fa fa-sort-numeric-asc"></i> Brightness bump

package/nodes/ha-mqtt-dmx.js

@@ -132,7 +132,7 @@ module.exports = function (RED) {
             groupSync:     config.groupSync       === true,
             defaultState:  config.defaultState    || 'OFF',
             dmxLimiter:    parseInt(config.dmxLimiter)  || 255,
-            // minOutput removed v0.6.2 — use dmxFloor instead
+            minOutput:     parseInt(config.minOutput)   || 1,
             brightBump:    parseInt(config.brightBump)  || 50,
             ticksPerSec:   parseInt(config.ticksPerSec) || 31,
             debugMode:     config.debugMode === true,
@@ -205,11 +205,13 @@ module.exports = function (RED) {
             brightness = brightness !== undefined ? brightness : 255;
             const limited = Math.round((colorValue / 255) * (brightness / 255) * S.dmxLimiter);
             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
-            // 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;
+            // Min output floor — only apply when both inputs are non-zero (intentionally on)
+            if (gamma === 0 && colorValue > 0 && brightness > 0 && S.minOutput > 0) {
+                return S.minOutput;
+            }
+            // DMX floor — snap up if above 0 but below hardware stable threshold
+            if (gamma > 0 && gamma < S.dmxFloor) return S.dmxFloor;
+            // Note: ceiling is handled by S.dmxLimiter in scaleToDmx above
             return gamma;
         }
 
@@ -395,11 +397,7 @@ module.exports = function (RED) {
                     const progress = Math.min(1, tick / totalTicks);
                     const channels = fromChannels.map(function ([ch, from], i) {
                         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 (intentionally off) allow it to reach 0
-                        const floored = (raw > 0 && raw < S.dmxFloor && to > 0) ? S.dmxFloor : raw;
-                        return [ch, floored];
+                        return [ch, Math.round(from + (to - from) * progress)];
                     });
                     sendDmxChannels(channels);
                     if (tick >= totalTicks) {
@@ -434,12 +432,7 @@ 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);
-            // 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 w  = color.w !== undefined ? color.w : 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.11",
+  "version": "0.6.13",
   "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",