node-red-contrib-dmx-for-ha 0.6.15 → 0.6.17

package/README.md

@@ -228,7 +228,9 @@ 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.
+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 instantly.
+
+This is one of the most useful commissioning features in the package. On large installations with hundreds of entities, the ability to wipe and rediscover a specific zone or type in one click saves hours of manual work.
 
 **Topic:** `{siteId}/system/control` (e.g. `MW3D/system/control`)
 
@@ -242,18 +244,66 @@ All nodes subscribe to a system control topic for **bulk add/remove during commi
 | 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 |
+| `zone` | `all`, or any zone name e.g. `Master`, `BnB` | Matches config node Zone field — case insensitive |
+| `type` | `all`, `dmx`, `group`, `button`, `pir`, `relay` | Node type filter |
+
+**Type reference:**
+
+| Type | Node | Description |
+|---|---|---|
+| `dmx` | ha-mqtt-dmx | Individual DMX fixtures |
+| `group` | ha-mqtt-dmx-group | DMX group nodes |
+| `button` | ha-mqtt-button | Wall button inputs |
+| `pir` | ha-mqtt-pir | PIR / motion sensors |
+| `relay` | ha-mqtt-relay | Relay / power outputs |
+| `all` | all of the above | Everything in the zone |
+
+**Commissioning workflow — roll out one type at a time:**
+```
+Day 1 — DMX lights:
+  ADD Master DMX    → all lights appear in HA
+  Test each light
+  REMOVE Master DMX → wipe and fix any wrong names/channels
+  ADD Master DMX    → rediscover clean
+
+Day 2 — Buttons:
+  ADD Master Button → all buttons appear in HA
+  Test each button
+  etc.
+```
+
+**How to send the command:**
+
+Option A — from anywhere on the network (MQTT Explorer, HA automation, script):
+```
+Topic:   MW3D/system/control
+Payload: {"cmd":"add","zone":"all","type":"all"}
+```
+
+Option B — from Node-RED using the included System Control flow:
+
+Import `system_control_flow.json` into Node-RED. Connect the MQTT out node to your broker. You get a dedicated tab with one-click buttons for every zone and type combination:
+
+```
+🗑 REMOVE ALL          ✅ ADD ALL
+
+🗑 REMOVE Master DMX   ✅ ADD Master DMX
+🗑 REMOVE Master Group ✅ ADD Master Group
+🗑 REMOVE Master Button ✅ ADD Master Button
+🗑 REMOVE Master PIR   ✅ ADD Master PIR
+🗑 REMOVE Master Relay ✅ ADD Master Relay
+
+🗑 REMOVE BnB DMX      ✅ ADD BnB DMX
+... etc.
+```
 
-**Commissioning workflow:**
+Option C — wire an inject node directly to any ha-mqtt node input:
 ```
-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
+msg.device = "add"     → add that node only
+msg.device = "remove"  → remove that node only
 ```
 
-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.
+> **Tip:** The system control topic is zone and type filtered — sending `REMOVE BnB DMX` only affects BnB DMX fixtures. Master lights, buttons, relays are completely unaffected. This makes it safe to use on a live installation with clients present.
 
 ---
 

package/nodes/ha-mqtt-button.js

@@ -285,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 !== 'group') 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

@@ -797,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

@@ -318,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

@@ -405,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.15",
+  "version": "0.6.17",
   "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",