node-red-contrib-dmx-for-ha 0.5.2 → 0.6.1

package/nodes/ha-mqtt-button.html

@@ -41,8 +41,9 @@
             subLocation:    { value: '' },
             // Button specifics
             buttonPosition: { value: '' },
-            buttonPayload:  { value: '', required: true },
-            subscribeTopic: { value: '', required: true },
+            buttonPayload:      { value: '', required: true },
+            subscribeTopic:     { value: '', required: true },
+            controllerProfile:  { value: 'mw3d_v1' },
             // Options
             haIcon:         { value: 'mdi:gesture-tap-button' },
             ledColor:       { value: 'Blue' },
@@ -239,12 +240,35 @@
     </div>
 
     <div class="form-row">
+        <label for="node-input-controllerProfile"><i class="fa fa-microchip"></i> Profile</label>
+        <select id="node-input-controllerProfile" style="width:65%" onchange="
+            var v = this.value;
+            document.getElementById('btn-payload-row').style.display = (v === 'mw3d_v1' || v === 'custom') ? '' : 'none';
+            document.getElementById('btn-topic-row').style.display   = (v === 'mw3d_v1' || v === 'custom') ? '' : 'none';
+            document.getElementById('btn-v2-note').style.display     = (v === 'mw3d_v2') ? '' : 'none';
+        ">
+            <option value="mw3d_v1">MW3D v1 — Legacy (panelId-GPIO payload)</option>
+            <option value="mw3d_v2">MW3D v2 — JSON (fixture ID payload)</option>
+            <option value="custom">Custom</option>
+        </select>
+    </div>
+
+    <div class="form-row" id="btn-v2-note" style="display:none">
+        <label></label>
+        <span style="color:#999; font-size:0.85em;">
+            <i class="fa fa-info-circle"></i>
+            v2 firmware — topic and payload auto-configured from zone + fixture ID.
+            No manual payload or topic needed.
+        </span>
+    </div>
+
+    <div class="form-row" id="btn-payload-row">
         <label for="node-input-buttonPayload"><i class="fa fa-hand-pointer-o"></i> Payload</label>
         <input type="text" id="node-input-buttonPayload" placeholder="Required — e.g. 10-54" style="width:120px" />
         <span style="margin-left:8px; color:#999; font-size:0.85em;">panelId-GPIOpin</span>
     </div>
 
-    <div class="form-row">
+    <div class="form-row" id="btn-topic-row">
         <label for="node-input-subscribeTopic"><i class="fa fa-exchange"></i> Subscribe topic</label>
         <input type="text" id="node-input-subscribeTopic" placeholder="Required — e.g. buttons or home/zone/buttons" style="width:55%" />
     </div>
@@ -289,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.5.2
+        node-red-contrib-dmx-for-ha &nbsp;v0.6.1
     </div>
 
 </script>

package/nodes/ha-mqtt-button.js

@@ -106,8 +106,9 @@ module.exports = function (RED) {
             situation:      config.situation         || 'in',
             subLocation:    config.subLocation       || '',
             buttonPosition: config.buttonPosition    || 'Single',
-            buttonPayload:  String(config.buttonPayload || ''),
-            subscribeTopic: config.subscribeTopic    || 'buttons',
+            buttonPayload:     String(config.buttonPayload || ''),
+            subscribeTopic:   config.subscribeTopic    || 'buttons',
+            controllerProfile: config.controllerProfile || 'mw3d_v1',
             haIcon:         config.haIcon            || 'mdi:gesture-tap-button',
             ledColor:       config.ledColor          || 'Blue',
             holdTime:       parseFloat(config.holdTime) || 0.5,
@@ -129,8 +130,49 @@ module.exports = function (RED) {
         }
 
 
+        // ── Controller profile ────────────────────────────────────────────
+        let _btnProfile;
+        try {
+            const _profiles = require('../profiles/index');
+            _btnProfile = (_profiles.button || []).find(p => p.id === S.controllerProfile)
+                       || _profiles.button[0];
+        } catch(e) {
+            _btnProfile = {
+                id: 'mw3d_v1',
+                buildTopic: () => null,
+                parsePayload: (raw, fid, exp) => raw === exp ? { match: true, state: 'on' } : null,
+                hasOffEvent: false
+            };
+        }
+        const btnProfile = _btnProfile;
+
         // ── Fixture identity and topics ───────────────────────────────────────
         const fixtureId     = `S-${S.uid}${S.uidPostfix}`;
+        // ── Fixture ID duplicate detection ──────────────────────────────────
+        function registerFixtureId() {
+            const globalCtx = node.context().global;
+            const regKey = `dmx_fixture_ids_${cfg.siteId}`;
+            let reg = {};
+            try { reg = globalCtx.get(regKey) || {}; } catch(e) {}
+            if (reg[fixtureId] && reg[fixtureId] !== node.id) {
+                node.warn(`${fixtureId} ⚠ DUPLICATE FIXTURE ID — already registered by node ${reg[fixtureId]}`);
+                setStatus('red', 'dot', `DUPLICATE ID: ${fixtureId}`);
+            } else {
+                reg[fixtureId] = node.id;
+                try { globalCtx.set(regKey, reg); } catch(e) {}
+            }
+        }
+        function unregisterFixtureId() {
+            const globalCtx = node.context().global;
+            const regKey = `dmx_fixture_ids_${cfg.siteId}`;
+            let reg = {};
+            try { reg = globalCtx.get(regKey) || {}; } catch(e) {}
+            if (reg[fixtureId] === node.id) {
+                delete reg[fixtureId];
+                try { globalCtx.set(regKey, reg); } catch(e) {}
+            }
+        }
+
         const objectId      = `s_${S.uid}${S.uidPostfix}`.toLowerCase().replace(/[^a-z0-9_]/g, '_');
         const fixtureTopic  = cfg.buildTopic(cfg.discoveryPrefix, 'binary_sensor', fixtureId);
         const uiBtnTopic    = cfg.buildTopic(cfg.discoveryPrefix, 'button', fixtureId + '-BTN');
@@ -164,6 +206,7 @@ module.exports = function (RED) {
 
         // ── Device add ────────────────────────────────────────────
         function handleDeviceAdd() {
+            registerFixtureId();
             // Binary sensor discovery
             const bsDiscovery = {
                 unique_id:          fixtureId,
@@ -201,9 +244,16 @@ module.exports = function (RED) {
             pub(cfgTopic,     bsDiscovery, true);
             pub(uiBtnCfgTopic, uiDiscovery, cfg.retainDiscovery);
 
-            // Subscribe to controller topic (physical presses)
-            broker.subscribe(S.subscribeTopic, cfg.qos, function (topic, payload) {
-                if (String(payload) === S.buttonPayload) handlePress('physical');
+            // Subscribe to controller topic — topic and matching via profile
+            const _btnSubTopic = btnProfile.buildTopic ? btnProfile.buildTopic(cfg) : null;
+            const activeBtnTopic = _btnSubTopic || S.subscribeTopic;
+            S._activeBtnTopic = activeBtnTopic;
+
+            broker.subscribe(activeBtnTopic, cfg.qos, function (topic, payload) {
+                const result = btnProfile.parsePayload(
+                    String(payload), fixtureId, S.buttonPayload
+                );
+                if (result && result.match && result.state === 'on') handlePress('physical');
             }, node.id);
 
             // Subscribe to HA UI button cmd topic
@@ -218,9 +268,10 @@ module.exports = function (RED) {
 
         // ── Device remove ─────────────────────────────────────────
         function handleDeviceRemove() {
+            unregisterFixtureId();
             pub(cfgTopic,      '', true);
             pub(uiBtnCfgTopic, '', true);
-            broker.unsubscribe(S.subscribeTopic, node.id);
+            broker.unsubscribe(S._activeBtnTopic || S.subscribeTopic, node.id);
             broker.unsubscribe(uiBtnCmdTopic,    node.id);
             setStatus('red', 'ring', `${fixtureId} removed`);
             node.log(`${fixtureId} device removed`);
@@ -246,7 +297,7 @@ module.exports = function (RED) {
 
         // ── Cleanup ───────────────────────────────────────────────
         node.on('close', function (done) {
-            broker.unsubscribe(S.subscribeTopic, node.id);
+            broker.unsubscribe(S._activeBtnTopic || S.subscribeTopic, node.id);
             broker.unsubscribe(uiBtnCmdTopic,    node.id);
             broker.deregister(node, done);
         });

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

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

@@ -136,6 +136,31 @@ module.exports = function (RED) {
 
         // ── Group identity and topics ─────────────────────────────────────────
         const groupId    = `LG-${S.uid}${S.uidPostfix}`;
+        // ── Fixture ID duplicate detection ──────────────────────────────────
+        function registerFixtureId() {
+            const globalCtx = node.context().global;
+            const regKey = `dmx_fixture_ids_${cfg.siteId}`;
+            let reg = {};
+            try { reg = globalCtx.get(regKey) || {}; } catch(e) {}
+            if (reg[groupId] && reg[groupId] !== node.id) {
+                node.warn(`${groupId} ⚠ DUPLICATE FIXTURE ID — already registered by node ${reg[groupId]}`);
+                setStatus('red', 'dot', `DUPLICATE ID: ${groupId}`);
+            } else {
+                reg[groupId] = node.id;
+                try { globalCtx.set(regKey, reg); } catch(e) {}
+            }
+        }
+        function unregisterFixtureId() {
+            const globalCtx = node.context().global;
+            const regKey = `dmx_fixture_ids_${cfg.siteId}`;
+            let reg = {};
+            try { reg = globalCtx.get(regKey) || {}; } catch(e) {}
+            if (reg[groupId] === node.id) {
+                delete reg[groupId];
+                try { globalCtx.set(regKey, reg); } catch(e) {}
+            }
+        }
+
         const objectId   = `lg_${S.uid}${S.uidPostfix}`.toLowerCase().replace(/[^a-z0-9_]/g, '_');
         const groupTopic = cfg.buildTopic(cfg.discoveryPrefix, 'light', groupId);
         const cfgTopic   = `${groupTopic}/${cfg.configTopic}`;
@@ -252,6 +277,7 @@ module.exports = function (RED) {
 
         // ── Device add ────────────────────────────────────────────
         function handleDeviceAdd(incomingTrace) {
+            registerFixtureId();
             if (!ctxGet('state') && !ctxGet('state', 'disk_values')) {
                 ctxSet('state', S.defaultState);
             }

package/nodes/ha-mqtt-dmx.html

@@ -158,8 +158,9 @@
             chWhite:        { value: '' },
             chWarmWhite:    { value: '' },
             // DMX controller
-            controllerNum:  { value: '1' },
-            universe:       { value: '1' },
+            controllerNum:     { value: '1' },
+            universe:          { value: '1' },
+            controllerProfile: { value: 'etherten_v1' },
             // Options
             haIcon:         { value: 'mdi:lightbulb' },
             showEffects:    { value: true },
@@ -378,6 +379,36 @@
         </label>
     </div>
 
+    <div class="form-row">
+        <label for="node-input-controllerProfile"><i class="fa fa-microchip"></i> Profile</label>
+        <select id="node-input-controllerProfile" style="width:65%" onchange="
+            var v = this.value;
+            document.getElementById('dmx-v2-note').style.display = (v === 'etherten_v2') ? '' : 'none';
+            document.getElementById('dmx-custom-row').style.display = (v === 'custom') ? '' : 'none';
+        ">
+            <option value="etherten_v1">EtherTen v1 — Legacy "212255" (one msg per channel)</option>
+            <option value="etherten_v2">EtherTen v2 — Batched [[212,255],...] (one msg per tick)</option>
+            <option value="mqtt_json">MQTT JSON — {"channel":212,"value":255}</option>
+            <option value="custom">Custom payload</option>
+        </select>
+    </div>
+
+    <div class="form-row" id="dmx-v2-note" style="display:none">
+        <label></label>
+        <span style="color:#999; font-size:0.85em;">
+            <i class="fa fa-info-circle"></i>
+            v2 batches all channel changes into one MQTT message per tick.
+            Requires MW3D DMXController firmware v3.0+.
+            Significantly reduces MQTT traffic during effects and transitions.
+        </span>
+    </div>
+
+    <div class="form-row" id="dmx-custom-row" style="display:none">
+        <label for="node-input-customTopic"><i class="fa fa-exchange"></i> Custom topic</label>
+        <input type="text" id="node-input-customTopic"
+               placeholder="{siteId}/{zone}/dmx/{universe}" style="width:55%" />
+    </div>
+
     <div class="form-row">
         <label for="node-input-controllerNum">
             <i class="fa fa-sort-numeric-asc"></i> Controller
@@ -553,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.5.2
+        node-red-contrib-dmx-for-ha &nbsp;v0.6.1
     </div>
 
 </script>

package/nodes/ha-mqtt-dmx.js

@@ -124,7 +124,8 @@ module.exports = function (RED) {
                 warmWhite:parseInt(config.chWarmWhite)|| 0,
             },
             controllerNum: config.controllerNum  || '1',
-            universe:      config.universe        || '1',
+            universe:          config.universe           || '1',
+            controllerProfile: config.controllerProfile  || 'etherten_v1',
             haIcon:        config.haIcon          || 'mdi:lightbulb',
             showEffects:   config.showEffects     !== false,
             transitions:   config.transitions     !== false,
@@ -224,18 +225,41 @@ module.exports = function (RED) {
         const _lastSent = {};
 
         function sendDmxChannels(channels) {
-            channels.forEach(function ([ch, val]) {
-                const payload = buildDmxPayload(ch, val);
-                if (payload === null) return;
-                // Skip if value unchanged since last publish
-                if (_lastSent[ch] === val) {
-                    if (S.debugMode) node.warn(`[DEBUG] ${fixtureId} → SKIP ch${ch}=${val} (unchanged)`);
-                    return;
+            if (dmxProfile.batched) {
+                // ── Batched mode (etherten_v2) ─────────────────────────────
+                // Collect all changed channels → publish ONE message per tick
+                const batch = [];
+                channels.forEach(function ([ch, val]) {
+                    if (!ch || ch <= 0 || val == null) return;
+                    if (_lastSent[ch] === val) {
+                        if (S.debugMode) node.warn(`[DEBUG] ${fixtureId} → SKIP ch${ch}=${val} (unchanged)`);
+                        return;
+                    }
+                    _lastSent[ch] = val;
+                    batch.push([ch, val]);
+                });
+                if (batch.length > 0) {
+                    const payload = dmxProfile.buildPayload(null, null, batch);
+                    broker.publish({ topic: dmxTopic, payload, qos: cfg.qos, retain: false });
+                    if (S.debugMode) node.warn(`[DEBUG] ${fixtureId} → ${dmxTopic} batch[${batch.length}] ${payload}`);
                 }
-                _lastSent[ch] = val;
-                broker.publish({ topic: dmxTopic, payload, qos: cfg.qos, retain: false });
-                if (S.debugMode) node.warn(`[DEBUG] ${fixtureId} → ${dmxTopic}  "${payload}"`);
-            });
+            } else {
+                // ── Single message per channel (etherten_v1 legacy) ────────
+                channels.forEach(function ([ch, val]) {
+                    if (!ch || ch <= 0 || val == null) return;
+                    if (_lastSent[ch] === val) {
+                        if (S.debugMode) node.warn(`[DEBUG] ${fixtureId} → SKIP ch${ch}=${val} (unchanged)`);
+                        return;
+                    }
+                    _lastSent[ch] = val;
+                    const payload = dmxProfile.buildPayload
+                        ? dmxProfile.buildPayload(ch, val, null)
+                        : buildDmxPayload(ch, val);
+                    if (payload === null) return;
+                    broker.publish({ topic: dmxTopic, payload, qos: cfg.qos, retain: false });
+                    if (S.debugMode) node.warn(`[DEBUG] ${fixtureId} → ${dmxTopic}  "${payload}"`);
+                });
+            }
         }
 
         function resetLastSent() {
@@ -561,14 +585,61 @@ module.exports = function (RED) {
 
 
 
-        // ── Fixture identity and topics ───────────────────────────────────────
+
+        // ── DMX Controller profile ────────────────────────────────────────
+        let _dmxProfile;
+        try {
+            const _profiles = require('../profiles/index');
+            _dmxProfile = (_profiles.dmx || []).find(p => p.id === S.controllerProfile)
+                       || _profiles.dmx[0];
+        } catch(e) {
+            // Fallback to etherten_v1 if profiles not found
+            _dmxProfile = {
+                id:      'etherten_v1',
+                batched: false,
+                buildPayload: (ch, val) =>
+                    String(ch).padStart(3,'0') + String(val).padStart(3,'0'),
+                buildTopic: (cfg, universe) =>
+                    cfg.buildTopic(cfg.siteId, cfg.zone, 'dmx', universe)
+            };
+        }
+        const dmxProfile = _dmxProfile;
+
+                // ── Fixture identity and topics ───────────────────────────────────────
         const fixtureId    = `${S.uidPrefix}-${S.uid}${S.uidPostfix}`;
+
+        // ── Fixture ID duplicate detection ──────────────────────────────────
+        function registerFixtureId() {
+            const globalCtx = node.context().global;
+            const regKey = `dmx_fixture_ids_${cfg.siteId}`;
+            let reg = {};
+            try { reg = globalCtx.get(regKey) || {}; } catch(e) {}
+            if (reg[fixtureId] && reg[fixtureId] !== node.id) {
+                node.warn(`${fixtureId} ⚠ DUPLICATE FIXTURE ID — already registered by node ${reg[fixtureId]}`);
+                setStatus('red', 'dot', `DUPLICATE ID: ${fixtureId}`);
+            } else {
+                reg[fixtureId] = node.id;
+                try { globalCtx.set(regKey, reg); } catch(e) {}
+            }
+        }
+        function unregisterFixtureId() {
+            const globalCtx = node.context().global;
+            const regKey = `dmx_fixture_ids_${cfg.siteId}`;
+            let reg = {};
+            try { reg = globalCtx.get(regKey) || {}; } catch(e) {}
+            if (reg[fixtureId] === node.id) {
+                delete reg[fixtureId];
+                try { globalCtx.set(regKey, reg); } catch(e) {}
+            }
+        }
         const objectId     = `${S.uidPrefix}_${S.uid}${S.uidPostfix}`.toLowerCase().replace(/[^a-z0-9_]/g, '_');
         const fixtureTopic = cfg.buildTopic(cfg.discoveryPrefix, 'light', fixtureId);
         const cfgTopic     = `${fixtureTopic}/${cfg.configTopic}`;
         const statTopic    = `${fixtureTopic}/${cfg.stateTopic}`;
         const cmdTopic     = `${fixtureTopic}/${cfg.commandTopic}`;
-        const dmxTopic     = cfg.buildTopic(cfg.siteId, cfg.zone, 'dmx', S.universe);
+        const dmxTopic     = dmxProfile.buildTopic
+            ? dmxProfile.buildTopic(cfg, S.universe)
+            : cfg.buildTopic(cfg.siteId, cfg.zone, 'dmx', S.universe);
 
         // ── DMX channel conflict detection ───────────────────────────────────
         function checkChannelConflicts() {
@@ -613,6 +684,7 @@ module.exports = function (RED) {
 
         // ── Device add ────────────────────────────────────────────
         function handleDeviceAdd() {
+            registerFixtureId();
             if (ctxGet('state') === undefined && ctxGet('state', 'disk_values') === undefined) {
                 ctxSet('state', S.defaultState);
             }
@@ -703,6 +775,7 @@ module.exports = function (RED) {
 
         // ── Device remove ─────────────────────────────────────────
         function handleDeviceRemove() {
+            unregisterFixtureId();
             clearChannelRegistry();
             stopEffect();
             if (diskTimer) {

package/nodes/ha-mqtt-pir.html

@@ -41,8 +41,9 @@
             subLocation:    { value: '' },
             // PIR specifics
             pirType:        { value: 'Ceiling' },
-            pirPayload:     { value: '',    required: true },
-            subscribeTopic: { value: '', required: true },
+            pirPayload:        { value: '',    required: true },
+            subscribeTopic:    { value: '', required: true },
+            controllerProfile: { value: 'mw3d_v1' },
             // Options
             haIcon:         { value: 'mdi:motion-sensor' },
             cableColor:     { value: 'Purple' },
@@ -237,14 +238,37 @@
     </div>
 
     <div class="form-row">
+        <label for="node-input-controllerProfile"><i class="fa fa-microchip"></i> Profile</label>
+        <select id="node-input-controllerProfile" style="width:65%" onchange="
+            var v = this.value;
+            document.getElementById('pir-payload-row').style.display = (v === 'mw3d_v1' || v === 'custom') ? '' : 'none';
+            document.getElementById('pir-topic-row').style.display   = (v === 'mw3d_v1' || v === 'custom') ? '' : 'none';
+            document.getElementById('pir-v2-note').style.display     = (v === 'mw3d_v2') ? '' : 'none';
+        ">
+            <option value="mw3d_v1">MW3D v1 — Legacy (panelId-GPIO, motion only)</option>
+            <option value="mw3d_v2">MW3D v2 — JSON (fixture ID + clear event)</option>
+            <option value="custom">Custom</option>
+        </select>
+    </div>
+
+    <div class="form-row" id="pir-v2-note" style="display:none">
+        <label></label>
+        <span style="color:#999; font-size:0.85em;">
+            <i class="fa fa-info-circle"></i>
+            v2 firmware — topic and payload auto-configured. Includes motion clear event
+            (hold timer optional). No manual payload or topic needed.
+        </span>
+    </div>
+
+    <div class="form-row" id="pir-payload-row">
         <label for="node-input-pirPayload"><i class="fa fa-podcast"></i> Payload</label>
-        <input type="text" id="node-input-pirPayload" placeholder="Required — e.g. home/Master/PIR_Sensors" style="width:120px" />
+        <input type="text" id="node-input-pirPayload" placeholder="Required — e.g. 21-62" style="width:120px" />
         <span style="margin-left:8px; color:#999; font-size:0.85em;">panelId-GPIOpin</span>
     </div>
 
-    <div class="form-row">
+    <div class="form-row" id="pir-topic-row">
         <label for="node-input-subscribeTopic"><i class="fa fa-exchange"></i> Subscribe topic</label>
-        <input type="text" id="node-input-subscribeTopic" placeholder="Required — e.g. home/Master/PIR_Sensors" style="width:55%" />
+        <input type="text" id="node-input-subscribeTopic" placeholder="Required — e.g. MW3D/Master/PIR_Sensors" style="width:55%" />
     </div>
 
     <hr/>
@@ -294,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.5.2
+        node-red-contrib-dmx-for-ha &nbsp;v0.6.1
     </div>
 
 </script>

package/nodes/ha-mqtt-pir.js

@@ -100,8 +100,9 @@ module.exports = function (RED) {
             uid:            config.uid            || '',
             uidPostfix:     config.uidPostfix      || '',
             pirType:        config.pirType         || 'Ceiling',
-            pirPayload:     String(config.pirPayload || ''),
-            subscribeTopic: config.subscribeTopic  || '',
+            pirPayload:        String(config.pirPayload || ''),
+            subscribeTopic:    config.subscribeTopic  || '',
+            controllerProfile: config.controllerProfile || 'mw3d_v1',
             area:           config.area            || '',
             situation:      config.situation        || 'in',
             subLocation:    config.subLocation      || '',
@@ -127,8 +128,50 @@ module.exports = function (RED) {
         }
 
 
-        // ── Fixture identity and topics ───────────────────────────────────────
+
+        // ── Controller profile ────────────────────────────────────────────
+        let _pirProfile;
+        try {
+            const _profiles = require('../profiles/index');
+            _pirProfile = (_profiles.pir || []).find(p => p.id === S.controllerProfile)
+                       || _profiles.pir[0];
+        } catch(e) {
+            _pirProfile = {
+                id: 'mw3d_v1',
+                buildTopic: () => null,
+                parsePayload: (raw, fid, exp) => raw === exp ? { match: true, state: 'on' } : null,
+                hasOffEvent: false
+            };
+        }
+        const pirProfile = _pirProfile;
+
+                // ── Fixture identity and topics ───────────────────────────────────────
         const fixtureId    = `S-${S.uid}${S.uidPostfix}`;
+
+        // ── Fixture ID duplicate detection ──────────────────────────────────
+        function registerFixtureId() {
+            const globalCtx = node.context().global;
+            const regKey = `dmx_fixture_ids_${cfg.siteId}`;
+            let reg = {};
+            try { reg = globalCtx.get(regKey) || {}; } catch(e) {}
+            if (reg[fixtureId] && reg[fixtureId] !== node.id) {
+                node.warn(`${fixtureId} ⚠ DUPLICATE FIXTURE ID — already registered by node ${reg[fixtureId]}`);
+                setStatus('red', 'dot', `DUPLICATE ID: ${fixtureId}`);
+            } else {
+                reg[fixtureId] = node.id;
+                try { globalCtx.set(regKey, reg); } catch(e) {}
+            }
+        }
+        function unregisterFixtureId() {
+            const globalCtx = node.context().global;
+            const regKey = `dmx_fixture_ids_${cfg.siteId}`;
+            let reg = {};
+            try { reg = globalCtx.get(regKey) || {}; } catch(e) {}
+            if (reg[fixtureId] === node.id) {
+                delete reg[fixtureId];
+                try { globalCtx.set(regKey, reg); } catch(e) {}
+            }
+        }
         const objectId     = `s_${S.uid}${S.uidPostfix}`.toLowerCase().replace(/[^a-z0-9_]/g, '_');
         const fixtureTopic = cfg.buildTopic(cfg.discoveryPrefix, 'binary_sensor', fixtureId);
         const cfgTopic     = `${fixtureTopic}/${cfg.configTopic}`;
@@ -183,6 +226,14 @@ module.exports = function (RED) {
             node.log(`${fixtureId} motion detected`);
         }
 
+        function handleClear() {
+            // Explicit motion clear from v2 firmware
+            lastTrigger = 0;
+            pub(statTopic, 'OFF', false);
+            setStatus('green', 'ring', `${fixtureId} motion cleared`);
+            node.log(`${fixtureId} motion cleared`);
+        }
+
         // ── Availability ──────────────────────────────────────────
         function handleAvailability(payload) {
             const status = String(payload || '').toLowerCase();
@@ -199,6 +250,7 @@ module.exports = function (RED) {
 
         // ── Device add ────────────────────────────────────────────
         function handleDeviceAdd() {
+            registerFixtureId();
             const discovery = {
                 unique_id:          fixtureId,
                 object_id:          objectId,
@@ -226,10 +278,20 @@ module.exports = function (RED) {
 
             pub(cfgTopic, discovery, cfg.retainDiscovery);
 
-            // Subscribe to controller topic
-            broker.subscribe(S.subscribeTopic, cfg.qos, function (topic, payload) {
-                const str = payload.toString();
-                if (str === S.pirPayload) handleTrigger();
+            // Subscribe to controller topic — topic and matching via profile
+            const _pirSubTopic = pirProfile.buildTopic ? pirProfile.buildTopic(cfg) : null;
+            const activePirTopic = _pirSubTopic || S.subscribeTopic;
+            S._activePirTopic = activePirTopic;
+
+            broker.subscribe(activePirTopic, cfg.qos, function (topic, payload) {
+                const result = pirProfile.parsePayload(
+                    payload.toString(), fixtureId, S.pirPayload
+                );
+                if (result && result.match) {
+                    if (result.state === 'on') handleTrigger();
+                    // v2 firmware sends explicit off — handle motion clear
+                    else if (result.state === 'off' && pirProfile.hasOffEvent) handleClear();
+                }
             }, node.id);
 
             setStatus('green', 'ring', `${fixtureId} discovery sent`);
@@ -239,10 +301,11 @@ module.exports = function (RED) {
 
         // ── Device remove ─────────────────────────────────────────
         function handleDeviceRemove() {
+            unregisterFixtureId();
             cancelWarmup();
             pub(avtyTopic, 'offline', true);
             pub(cfgTopic, '', true);
-            broker.unsubscribe(S.subscribeTopic, node.id);
+            broker.unsubscribe(S._activePirTopic || S.subscribeTopic, node.id);
             setStatus('red', 'ring', `${fixtureId} removed`);
             node.log(`${fixtureId} device removed`);
         }
@@ -269,7 +332,7 @@ module.exports = function (RED) {
         // ── Cleanup ───────────────────────────────────────────────
         node.on('close', function (done) {
             cancelWarmup();
-            broker.unsubscribe(S.subscribeTopic, node.id);
+            broker.unsubscribe(S._activePirTopic || S.subscribeTopic, node.id);
             broker.deregister(node, done);
         });
     }