node-red-contrib-dmx-for-ha 0.6.21 → 0.6.23

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.21
+        node-red-contrib-dmx-for-ha &nbsp;v0.6.23
     </div>
 
 </script>

package/nodes/ha-mqtt-button.js

@@ -22,7 +22,6 @@ module.exports = function (RED) {
         if (!broker) { node.error('Button: no MQTT broker in config'); return; }
 
         broker.register(node);
-        if (broker.client && broker.client.setMaxListeners) broker.client.setMaxListeners(0);
 
         // ── Auto-discovery based on Discovery Mode ────────────────────
         const discoveryMode = config.discoveryMode || 'enabled';
@@ -316,7 +315,6 @@ module.exports = function (RED) {
 
         // ── Cleanup ───────────────────────────────────────────────
         node.on('close', function (done) {
-            unregisterFixtureId();
             broker.unsubscribe(S._activeBtnTopic || S.subscribeTopic, node.id);
             broker.unsubscribe(uiBtnCmdTopic,    node.id);
             broker.deregister(node, done);

package/nodes/ha-mqtt-config.html

@@ -23,7 +23,8 @@
             enabledDefault:  { value: 'true' },
             diskDelay:            { value: '10' },
             transitionRateLimit:  { value: '1' },
-            transitionHaUiTime:   { value: '1' },
+            transitionHaUiTime:   { value: 1, validate: RED.validators.number() },
+            offTransition:        { value: 1, validate: RED.validators.number() },
             flashShort:      { value: '1' },
             flashLong:       { value: '10' },
             dmxFloor:        { value: '3' },
@@ -205,6 +206,28 @@
                min="1" style="width:70px" />
     </div>
 
+    <div class="form-row">
+        <label for="node-config-input-transitionHaUiTime">
+            <i class="fa fa-clock-o"></i> Default ON transition
+        </label>
+        <input type="number" id="node-config-input-transitionHaUiTime"
+               min="0" max="60" step="0.1" style="width:70px" />
+        <span style="margin-left:8px; color:#999; font-size:0.85em;">
+            Seconds. Applied when HA sends ON without a transition time. 0 = snap on. Default: 1
+        </span>
+    </div>
+
+    <div class="form-row">
+        <label for="node-config-input-offTransition">
+            <i class="fa fa-clock-o"></i> Default OFF transition
+        </label>
+        <input type="number" id="node-config-input-offTransition"
+               min="0" max="60" step="0.1" style="width:70px" />
+        <span style="margin-left:8px; color:#999; font-size:0.85em;">
+            Seconds. Applied when HA sends OFF without a transition time. 0 = snap off. Default: 1
+        </span>
+    </div>
+
     <div class="form-row">
         <label style="width:100%; font-weight:bold; color:#999; font-size:0.85em; text-transform:uppercase; letter-spacing:0.05em;">
             <i class="fa fa-sliders"></i> DMX Channel Limits

package/nodes/ha-mqtt-config.js

@@ -63,7 +63,8 @@ module.exports = function (RED) {
         this.transitionHaUiTime  = parseFloat(config.transitionHaUiTime)  || 1;
 
         // DMX channel limits
-        this.dmxFloor = parseInt(config.dmxFloor) >= 0 ? parseInt(config.dmxFloor) : 3;
+        this.dmxFloor     = parseInt(config.dmxFloor)     >= 0 ? parseInt(config.dmxFloor)     : 3;
+        this.offTransition = parseFloat(config.offTransition) >= 0 ? parseFloat(config.offTransition) : 1;
 
         // ── Topic builder — omits empty zone segment ─────────────────────────
         this.buildTopic = function() {
@@ -92,6 +93,7 @@ module.exports = function (RED) {
             transitionRateLimit:  this.transitionRateLimit,
             transitionHaUiTime:   this.transitionHaUiTime,
             dmxFloor:             this.dmxFloor,
+            offTransition:        this.offTransition,
         };
     }
 

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.21
+        node-red-contrib-dmx-for-ha &nbsp;v0.6.23
     </div>
 
 </script>

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

@@ -25,7 +25,6 @@ module.exports = function (RED) {
         if (!broker) { node.error('DMX Group: no MQTT broker in config'); return; }
 
         broker.register(node);
-        if (broker.client && broker.client.setMaxListeners) broker.client.setMaxListeners(0);
 
         // ── Auto-discovery based on Discovery Mode ────────────────────
         const discoveryMode = config.discoveryMode || 'enabled';
@@ -418,7 +417,6 @@ module.exports = function (RED) {
 
         // ── Cleanup ───────────────────────────────────────────────
         node.on('close', function (done) {
-            unregisterFixtureId();
             if (diskTimer) clearTimeout(diskTimer);
             broker.unsubscribe(cmdTopic, node.id);
             broker.deregister(node, done);

package/nodes/ha-mqtt-dmx.html

@@ -584,7 +584,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.21
+        node-red-contrib-dmx-for-ha &nbsp;v0.6.23
     </div>
 
 </script>

package/nodes/ha-mqtt-dmx.js

@@ -32,7 +32,6 @@ module.exports = function (RED) {
         if (!broker) { node.error('DMX: no MQTT broker in config'); return; }
 
         broker.register(node);
-        if (broker.client && broker.client.setMaxListeners) broker.client.setMaxListeners(0);
 
         // ── Auto-discovery based on Discovery Mode ────────────────────
         const discoveryMode = config.discoveryMode || 'enabled';
@@ -226,16 +225,15 @@ module.exports = function (RED) {
         // ── DMX helpers ───────────────────────────────────────────
         function scaleToDmx(colorValue, brightness) {
             brightness = brightness !== undefined ? brightness : 255;
-            // Hard zero — never apply any floor when brightness is 0 (OFF)
-            if (brightness === 0) return 0;
             const limited = Math.round((colorValue / 255) * (brightness / 255) * S.dmxLimiter);
             const gamma   = GAMMA_TABLE[Math.max(0, Math.min(255, limited))];
             // 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 (colorValue > 0 && gamma < S.dmxFloor) return S.dmxFloor;
+            // DMX floor — snap up if intentionally on (colorValue >= 3) and below floor
+            // colorValue 1-2 is HA colour wheel bleed — allow to go to 0
+            if (colorValue >= 3 && gamma < S.dmxFloor) return S.dmxFloor;
             // Note: ceiling is handled by S.dmxLimiter in scaleToDmx above
             return gamma;
         }
@@ -422,7 +420,13 @@ 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;
-                        return [ch, Math.round(from + (to - from) * progress)];
+                        const raw = Math.round(from + (to - from) * progress);
+                        // Floor: if target is ON, snap low values up to floor
+                        //        if target is OFF, jump from floor directly to 0
+                        const floored = raw <= 0 ? 0
+                                      : raw < S.dmxFloor ? (to <= 0 ? 0 : S.dmxFloor)
+                                      : raw;
+                        return [ch, floored];
                     });
                     sendDmxChannels(channels);
                     if (tick >= totalTicks) {
@@ -501,9 +505,13 @@ module.exports = function (RED) {
 
             const toChannels   = buildColorChannels(0, r, g, b, w, ww);
 
-            if (S.transitions && payload && payload.transition && payload.transition > 0) {
+            // OFF transition: use HA payload time, or config offTransition default
+            const offDuration = (payload && payload.transition && payload.transition > 0)
+                ? payload.transition
+                : (cfg.offTransition || 0);
+            if (S.transitions && offDuration > 0) {
                 const fromChannels = buildColorChannels(brightness, r, g, b, w, ww);
-                runTransition(fromChannels, toChannels, transitionDuration);
+                runTransition(fromChannels, toChannels, offDuration);
             } else {
                 sendDmxChannels(toChannels);
             }
@@ -867,7 +875,6 @@ module.exports = function (RED) {
 
         // ── Cleanup ───────────────────────────────────────────────
         node.on('close', function (done) {
-            unregisterFixtureId();
             clearChannelRegistry();
             stopEffect();
             if (diskTimer) clearTimeout(diskTimer);

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.21
+        node-red-contrib-dmx-for-ha &nbsp;v0.6.23
     </div>
 
 </script>

package/nodes/ha-mqtt-pir.js

@@ -22,7 +22,6 @@ module.exports = function (RED) {
         if (!broker) { node.error('PIR: no MQTT broker in config'); return; }
 
         broker.register(node);
-        if (broker.client && broker.client.setMaxListeners) broker.client.setMaxListeners(0);
 
         // ── Auto-discovery based on Discovery Mode ────────────────────
         const discoveryMode = config.discoveryMode || 'enabled';
@@ -350,7 +349,6 @@ module.exports = function (RED) {
 
         // ── Cleanup ───────────────────────────────────────────────
         node.on('close', function (done) {
-            unregisterFixtureId();
             cancelWarmup();
             broker.unsubscribe(S._activePirTopic || S.subscribeTopic, node.id);
             broker.deregister(node, done);

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.21
+        node-red-contrib-dmx-for-ha &nbsp;v0.6.23
     </div>
 
 </script>

package/nodes/ha-mqtt-relay.js

@@ -25,7 +25,6 @@ module.exports = function (RED) {
         if (!broker) { node.error('Relay: no MQTT broker in config'); return; }
 
         broker.register(node);
-        if (broker.client && broker.client.setMaxListeners) broker.client.setMaxListeners(0);
 
         // ── Auto-discovery based on Discovery Mode ────────────────────
         const discoveryMode = config.discoveryMode || 'enabled';
@@ -454,7 +453,6 @@ module.exports = function (RED) {
 
         // ── Cleanup ───────────────────────────────────────────────
         node.on('close', function (done) {
-            unregisterFixtureId();
             stopEffect();
             if (diskTimer) clearTimeout(diskTimer);
             broker.unsubscribe(cmdTopic, node.id);

package/package.json

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