node-red-contrib-dmx-for-ha 0.6.14 → 0.6.16

package/README.md

@@ -226,6 +226,37 @@ Typical workflow: Remove → update node settings → Deploy → node auto-disco
 
 ---
 
+## System control topic
+
+All nodes subscribe to a system control topic for **bulk add/remove during commissioning**. No wiring needed — publish one MQTT message and all matching nodes respond.
+
+**Topic:** `{siteId}/system/control` (e.g. `MW3D/system/control`)
+
+**Payload:**
+```json
+{"cmd": "remove", "zone": "all",    "type": "all"}
+{"cmd": "add",    "zone": "Master", "type": "dmx"}
+{"cmd": "remove", "zone": "BnB",    "type": "button"}
+```
+
+| Field | Values | Description |
+|---|---|---|
+| `cmd` | `add`, `remove` | Add or remove HA discovery |
+| `zone` | `all`, `Master`, `BnB` | Matches config node zone |
+| `type` | `all`, `dmx`, `button`, `pir`, `relay` | Node type filter |
+
+**Commissioning workflow:**
+```
+1. ADD Master DMX    → test all lights
+2. REMOVE Master DMX → fix wrong names/channels
+3. ADD Master DMX    → verify clean
+4. Move to next type: Button → PIR → Relay
+```
+
+A **System Control flow** ships with the package (`system_control_flow.json`). Import it into Node-RED, connect the MQTT out node to your broker, and you have one-click bulk control per zone and type.
+
+---
+
 ## DMX Group Node
 
 Appears as a single light entity in HA. Commands fan out to all nodes on its **Link** output.

package/nodes/ha-mqtt-button.js

@@ -70,6 +70,23 @@ module.exports = function (RED) {
             handleDeviceAdd();
         }
 
+        // ── System control topic ─────────────────────────────────
+        const systemTopic = `${cfg.siteId}/system/control`;
+        broker.subscribe(systemTopic, 0, function (topic, rawPayload) {
+            let msg;
+            try { msg = JSON.parse(rawPayload.toString()); } catch(e) { return; }
+            if (!msg.cmd) return;
+            const zone = (msg.zone || 'all').toLowerCase();
+            if (zone !== 'all' && zone !== cfg.zone.toLowerCase()) return;
+            const type = (msg.type || 'all').toLowerCase();
+            if (type !== 'all' && type !== 'button') return;
+            if (msg.cmd === 'remove') {
+                handleDeviceRemove();
+            } else if (msg.cmd === 'add') {
+                _tryDiscover();
+            }
+        }, node.id + '_sys');
+
         // Auto-discover if broker already connected on deploy
         if (broker.connected) {
             _tryDiscover();
@@ -268,6 +285,7 @@ module.exports = function (RED) {
 
         // ── Device remove ─────────────────────────────────────────
         function handleDeviceRemove() {
+            _discovered = false; // Allow re-discovery after remove
             unregisterFixtureId();
             pub(cfgTopic,      '', true);
             pub(uiBtnCfgTopic, '', true);

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

@@ -70,6 +70,24 @@ module.exports = function (RED) {
             handleDeviceAdd();
         }
 
+        // ── System control topic ─────────────────────────────────
+        const systemTopic = `${cfg.siteId}/system/control`;
+        broker.subscribe(systemTopic, 0, function (topic, rawPayload) {
+            let msg;
+            try { msg = JSON.parse(rawPayload.toString()); } catch(e) { return; }
+            if (!msg.cmd) return;
+            const zone = (msg.zone || 'all').toLowerCase();
+            if (zone !== 'all' && zone !== cfg.zone.toLowerCase()) return;
+            const type = (msg.type || 'all').toLowerCase();
+            if (type !== 'all' && type !== 'dmx') return;
+            if (msg.cmd === 'remove') {
+                _discovered = false;
+                handleDeviceRemove(null);
+            } else if (msg.cmd === 'add') {
+                _tryDiscover();
+            }
+        }, node.id + '_sys');
+
         // Auto-discover if broker already connected on deploy
         if (broker.connected) {
             _tryDiscover();
@@ -347,6 +365,7 @@ module.exports = function (RED) {
 
         // ── Device remove ─────────────────────────────────────────
         function handleDeviceRemove(incomingTrace) {
+            _discovered = false; // Allow re-discovery after remove
             if (diskTimer) { clearTimeout(diskTimer); diskTimer = null; }
             // No flush needed on remove — state is cleared below
             // Keep disk state on remove — state survives remove/add cycles

package/nodes/ha-mqtt-dmx.js

@@ -78,6 +78,28 @@ module.exports = function (RED) {
             handleDeviceAdd();
         }
 
+        // ── System control topic ─────────────────────────────────
+        // Subscribes to: {siteId}/system/control
+        // Payload: {"cmd":"remove","zone":"all"} or {"cmd":"add","zone":"Master"}
+        const systemTopic = `${cfg.siteId}/system/control`;
+        broker.subscribe(systemTopic, 0, function (topic, rawPayload) {
+            let msg;
+            try { msg = JSON.parse(rawPayload.toString()); } catch(e) { return; }
+            if (!msg.cmd) return;
+            // Zone filter — "all" or match config zone
+            const zone = (msg.zone || 'all').toLowerCase();
+            if (zone !== 'all' && zone !== cfg.zone.toLowerCase()) return;
+            // Type filter — "all" or match node type
+            const type = (msg.type || 'all').toLowerCase();
+            if (type !== 'all' && type !== 'dmx') return;
+            // Execute command
+            if (msg.cmd === 'remove') {
+                handleDeviceRemove();
+            } else if (msg.cmd === 'add') {
+                _tryDiscover();
+            }
+        }, node.id + '_sys');
+
         // Auto-discover if broker already connected on deploy
         if (broker.connected) {
             _tryDiscover();
@@ -775,6 +797,7 @@ module.exports = function (RED) {
 
         // ── Device remove ─────────────────────────────────────────
         function handleDeviceRemove() {
+            _discovered = false; // Allow re-discovery after remove
             unregisterFixtureId();
             clearChannelRegistry();
             stopEffect();

package/nodes/ha-mqtt-pir.js

@@ -67,6 +67,23 @@ module.exports = function (RED) {
             handleDeviceAdd();
         }
 
+        // ── System control topic ─────────────────────────────────
+        const systemTopic = `${cfg.siteId}/system/control`;
+        broker.subscribe(systemTopic, 0, function (topic, rawPayload) {
+            let msg;
+            try { msg = JSON.parse(rawPayload.toString()); } catch(e) { return; }
+            if (!msg.cmd) return;
+            const zone = (msg.zone || 'all').toLowerCase();
+            if (zone !== 'all' && zone !== cfg.zone.toLowerCase()) return;
+            const type = (msg.type || 'all').toLowerCase();
+            if (type !== 'all' && type !== 'pir') return;
+            if (msg.cmd === 'remove') {
+                handleDeviceRemove();
+            } else if (msg.cmd === 'add') {
+                _tryDiscover();
+            }
+        }, node.id + '_sys');
+
         // Auto-discover if broker already connected on deploy
         if (broker.connected) {
             _tryDiscover();
@@ -301,6 +318,7 @@ module.exports = function (RED) {
 
         // ── Device remove ─────────────────────────────────────────
         function handleDeviceRemove() {
+            _discovered = false; // Allow re-discovery after remove
             unregisterFixtureId();
             cancelWarmup();
             pub(avtyTopic, 'offline', true);

package/nodes/ha-mqtt-relay.js

@@ -70,6 +70,23 @@ module.exports = function (RED) {
             handleDeviceAdd();
         }
 
+        // ── System control topic ─────────────────────────────────
+        const systemTopic = `${cfg.siteId}/system/control`;
+        broker.subscribe(systemTopic, 0, function (topic, rawPayload) {
+            let msg;
+            try { msg = JSON.parse(rawPayload.toString()); } catch(e) { return; }
+            if (!msg.cmd) return;
+            const zone = (msg.zone || 'all').toLowerCase();
+            if (zone !== 'all' && zone !== cfg.zone.toLowerCase()) return;
+            const type = (msg.type || 'all').toLowerCase();
+            if (type !== 'all' && type !== 'relay') return;
+            if (msg.cmd === 'remove') {
+                handleDeviceRemove();
+            } else if (msg.cmd === 'add') {
+                _tryDiscover();
+            }
+        }, node.id + '_sys');
+
         // Auto-discover if broker already connected on deploy
         if (broker.connected) {
             _tryDiscover();
@@ -388,6 +405,7 @@ module.exports = function (RED) {
 
         // ── Device remove ─────────────────────────────────────────
         function handleDeviceRemove() {
+            _discovered = false; // Allow re-discovery after remove
             unregisterFixtureId();
             stopEffect();
             if (diskTimer) { clearTimeout(diskTimer); diskTimer = null; }

package/package.json

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