nodejs-poolcontroller 8.4.0 → 8.4.1

package/controller/boards/IntelliCenterBoard.ts

@@ -23,7 +23,7 @@ import { Protocol, Outbound, Inbound, Message, Response } from '../comms/message
 import { conn } from '../comms/Comms';
 import { logger } from '../../logger/Logger';
 import { state, ChlorinatorState, LightGroupState, VirtualCircuitState, ICircuitState, BodyTempState, CircuitGroupState, ICircuitGroupState, ChemControllerState } from '../State';
-import { utils } from '../../controller/Constants';
+import { utils, ControllerType } from '../../controller/Constants';
 import { InvalidEquipmentIdError, InvalidEquipmentDataError, EquipmentNotFoundError, MessageError, InvalidOperationError } from '../Errors';
 import { ncp } from '../nixie/Nixie';
 import { Timestamp } from "../Constants"
@@ -340,6 +340,7 @@ export class IntelliCenterBoard extends SystemBoard {
         const out: Outbound = Outbound.create({
             dest: 16,  // MUST send to OCP (16), not broadcast (15)
             action: 251,
+            scope: 'v3Registration',
             payload: [
                 Message.pluginAddress,  // [0] Device address (33)
                 0,                      // [1] Reserved
@@ -351,7 +352,8 @@ export class IntelliCenterBoard extends SystemBoard {
                 1, 7, 11               // [19-21] Unknown (copied from wireless remote)
             ],
             retries: 3,
-            response: Response.create({ source: 15, dest: 16, action: 253 })
+            // Action 253 comes from OCP (src=16) to broadcast (dest=15).
+            response: Response.create({ source: 16, dest: 15, action: 253 })
         });
         await out.sendAsync();
         logger.silly('Device registration request sent, awaiting confirmation via Action 217');
@@ -389,6 +391,9 @@ export class IntelliCenterBoard extends SystemBoard {
             logger.warn(`checkConfiguration failed (port may not be open yet): ${err.message}`);
         }
     }
+    public isConfigQueueProcessing(): boolean {
+        return this._configQueue._processing;
+    }
     public requestConfiguration(ver: ConfigVersion) {
         if (this.needsConfigChanges) {
             logger.info(`Requesting IntelliCenter configuration`);
@@ -419,9 +424,13 @@ export class IntelliCenterBoard extends SystemBoard {
         const verReq = Outbound.create({
             dest,
             action: 228,
+            scope: sys.equipment.isIntellicenterV3 ? 'v3VersionSync' : undefined,
             payload: [0],
             retries: 3,
-            response: Response.create({ action: 164 })
+            // v3.004+: require the version response (164) to be addressed to us (not to Wireless).
+            response: sys.equipment.isIntellicenterV3
+                ? Response.create({ dest: Message.pluginAddress, action: 164 })
+                : Response.create({ action: 164 })
         });
         await verReq.sendAsync();
         if (sys.equipment.isIntellicenterV3) {
@@ -776,7 +785,7 @@ export class IntelliCenterBoard extends SystemBoard {
         }
     }
     public get commandSourceAddress(): number { return Message.pluginAddress; }
-    public get commandDestAddress(): number { return 15; }
+    public get commandDestAddress(): number { return sys.equipment.isIntellicenterV3 ? 16 : 15; }
     public static getAckResponse(action: number, source?: number, dest?: number): Response { return Response.create({ source: source, dest: dest || sys.board.commandSourceAddress, action: 1, payload: [action] }); }
 }
 class IntelliCenterConfigRequest extends ConfigRequest {
@@ -793,10 +802,53 @@ class IntelliCenterConfigQueue extends ConfigQueue {
     public _processing: boolean = false;
     public _newRequest: boolean = false;
     public _failed: boolean = false;
+    private static readonly WATCHDOG_TIMEOUT_MS = 120000;
+    private static readonly WATCHDOG_POLL_MS = 5000;
+    private _watchdogTimer?: NodeJS.Timeout;
+    private _lastProgressMs: number = 0;
+    public close() {
+        this.stopWatchdog();
+        this._processing = false;
+        super.close();
+    }
+    private markProgress(): void {
+        if (!this._processing) return;
+        this._lastProgressMs = Date.now();
+        if (!this._watchdogTimer) {
+            this._watchdogTimer = setInterval(() => this.checkWatchdog(), IntelliCenterConfigQueue.WATCHDOG_POLL_MS);
+        }
+    }
+    private stopWatchdog(): void {
+        if (this._watchdogTimer) {
+            clearInterval(this._watchdogTimer);
+            this._watchdogTimer = undefined;
+        }
+        this._lastProgressMs = 0;
+    }
+    private checkWatchdog(): void {
+        if (!this._processing || this.closed) {
+            this.stopWatchdog();
+            return;
+        }
+        const elapsed = Date.now() - this._lastProgressMs;
+        if (elapsed < IntelliCenterConfigQueue.WATCHDOG_TIMEOUT_MS) return;
+        logger.warn(`Config queue watchdog timed out after ${elapsed}ms; forcing recovery (${this.remainingItems} items remaining)`);
+        this.queue.length = 0;
+        this.curr = null;
+        this.totalItems = 0;
+        this._processing = false;
+        this._failed = false;
+        this._newRequest = false;
+        this.stopWatchdog();
+        state.status = 1;
+        state.emitControllerChange();
+        setTimeout(() => { sys.board.checkConfiguration(); }, 250);
+    }
     public processNext(msg?: Outbound) {
         if (this.closed) return;
         let self = this;
         if (typeof msg !== 'undefined' && msg !== null) {
+            this.markProgress();
             if (!msg.failed) {
                 // Remove all references to future items. We got it so we don't need it again.
                 this.removeItem(msg.payload[0], msg.payload[1]);
@@ -847,14 +899,16 @@ class IntelliCenterConfigQueue extends ConfigQueue {
             let out = Outbound.create({
                 // v1: broadcast (15). v3: wireless/ICP unicasts to OCP (16).
                 dest,
+                scope: sys.equipment.isIntellicenterV3 ? 'v3ConfigQueue' : undefined,
                 action: 222, payload: [this.curr.category, itm], retries: 5,
                 // v3.004+: some config requests can yield an Action 30 with an empty payload (length=0).
                 // Those packets still indicate "done" for the requested item, but cannot be matched by payload prefix.
                 response: sys.equipment.isIntellicenterV3
-                    ? Response.create({ dest: -1, action: 30 })
+                    ? Response.create({ dest: Message.pluginAddress, action: 30 })
                     : Response.create({ dest: -1, action: 30, payload: [this.curr.category, itm] })
             });
             logger.verbose(`Requesting config for: ${ConfigCategories[this.curr.category]} - Item: ${itm}`);
+            this.markProgress();
             // setTimeout(() => { conn.queueSendMessage(out) }, 50);
             out.sendAsync()
                 .then(() => {
@@ -872,6 +926,7 @@ class IntelliCenterConfigQueue extends ConfigQueue {
             state.status = 1;
             this.curr = null;
             this._processing = false;
+            this.stopWatchdog();
             if (this._failed) setTimeout(() => { sys.checkConfiguration(); }, 100);
             logger.info(`Configuration Complete`);
             sys.board.heaters.updateHeaterServices();
@@ -903,14 +958,34 @@ class IntelliCenterConfigQueue extends ConfigQueue {
                 console.log('WE ARE ALREADY PROCESSING CHANGES...')
             return;
         }
+        // IMPORTANT: Only enter "processing" mode if there are actual version changes.
+        // If we set `_processing=true` and then return early, the UI can get stuck showing a partial
+        // percent (e.g., 87%) because no further progress/completion events will be emitted.
+        if (!curr.hasChanges(ver)) {
+            // Ensure controller status returns to ready and queue state is not wedged.
+            this._processing = false;
+            this._failed = false;
+            this._newRequest = false;
+            this.stopWatchdog();
+            state.status = 1;
+            state.emitControllerChange();
+            return;
+        }
+
+        // New run: reset per-run accounting so percent reflects ONLY this run.
+        // Do NOT call `ConfigQueue.reset()` here because it also mutates `closed`.
+        // We only want to reset per-run counters/queues.
+        this.queue.length = 0;
+        this.curr = null;
+        this.totalItems = 0;
         this._processing = true;
         this._failed = false;
+        this.markProgress();
         let self = this;
-        if (!curr.hasChanges(ver)) return;
         sys.configVersion.lastUpdated = new Date();
         // Tell the system we are loading.
         state.status = sys.board.valueMaps.controllerStatus.transform(2, 0);
-        this.maybeQueueItems(curr.equipment, ver.equipment, ConfigCategories.equipment, [0, 1, 2, 3]);
+        this.maybeQueueItems(curr.equipment, ver.equipment, ConfigCategories.equipment, [0, 1, 2, 3, 12, 13, 14, 15]);
         this.maybeQueueItems(curr.options, ver.options, ConfigCategories.options, [0, 1]);
         if (this.compareVersions(curr.circuits, ver.circuits)) {
             let req = new IntelliCenterConfigRequest(ConfigCategories.circuits, ver.circuits, [0, 1, 2],
@@ -1028,6 +1103,7 @@ class IntelliCenterConfigQueue extends ConfigQueue {
         if (this.remainingItems > 0) setTimeout(() => { self.processNext(); }, 50);
         else {
             this._processing = false;
+            this.stopWatchdog();
             if (this._newRequest) {
                 this._newRequest = false;
                 setTimeout(() => { sys.board.checkConfiguration(); }, 250);
@@ -1112,6 +1188,21 @@ class IntelliCenterSystemCommands extends SystemCommands {
     }
     public async setOptionsAsync(obj?: any): Promise<Options> {
         let fnToByte = function (num) { return num < 0 ? Math.abs(num) | 0x80 : Math.abs(num) || 0; }
+        const isIntellicenterV3 = (sys.controllerType === ControllerType.IntelliCenter && sys.equipment.isIntellicenterV3);
+        const encodeFreezeOverride = (minutes: number): number => {
+            if (isNaN(minutes)) return 0;
+            // v3.008 appears to encode Frz Override as compact steps: 30 + (raw * 60).
+            if (minutes <= 30) return 0;
+            return Math.max(0, Math.min(3, Math.round((minutes - 30) / 60)));
+        };
+        const freezeCycleTime = parseInt((sys.general.options.freezeCycleTime || 15).toString(), 10) || 15;
+        const freezeOverrideRaw = encodeFreezeOverride(parseInt((sys.general.options.freezeOverride || 30).toString(), 10) || 30);
+        const pool = sys.bodies.getItemById(1, false);
+        const spa = sys.bodies.getItemById(2, false);
+        const manualPriorityPayloadIndex = isIntellicenterV3 ? 28 : 39;
+        const manualHeatPayloadIndex = isIntellicenterV3 ? 31 : 40;
+        const pumpDelayPayloadIndex = isIntellicenterV3 ? 29 : 30;
+        const cooldownDelayPayloadIndex = isIntellicenterV3 ? 30 : 31;
 
         let payload = [0, 0, 0,
             fnToByte(sys.equipment.tempSensors.getCalibration('water2')),
@@ -1130,20 +1221,36 @@ class IntelliCenterSystemCommands extends SystemCommands {
             0, 0,
             sys.general.options.clockSource === 'internet' ? 1 : 0, // 17
             3, 0, 0,
-            sys.bodies.getItemById(1, false).setPoint || 100, // 21
-            sys.bodies.getItemById(3, false).setPoint || 100,
-            sys.bodies.getItemById(2, false).setPoint || 100,
-            sys.bodies.getItemById(4, false).setPoint || 100,
-            sys.bodies.getItemById(1, false).heatMode || 0,
-            sys.bodies.getItemById(2, false).heatMode || 0,
-            sys.bodies.getItemById(3, false).heatMode || 0,
-            sys.bodies.getItemById(4, false).heatMode || 0,
-            15,
-            sys.general.options.pumpDelay ? 1 : 0,  // 30
-            sys.general.options.cooldownDelay ? 1 : 0,
-            0, 0, 100, 0, 0, 0, 0,
-            sys.general.options.manualPriority ? 1 : 0, // 39
-            sys.general.options.manualHeat ? 1 : 0];
+            // For v3.008+, Action 168 full options blocks place pool/spa setpoints at [20..23]
+            // and modes at [24..25]. Keep legacy layout for pre-v3 controllers.
+            ...(isIntellicenterV3
+                ? [
+                    pool.setPoint || 100, pool.coolSetpoint || (pool.setPoint || 100),
+                    spa.setPoint || 100, spa.coolSetpoint || (spa.setPoint || 100),
+                    pool.heatMode || 0, spa.heatMode || 0,
+                    freezeCycleTime, freezeOverrideRaw,
+                    sys.general.options.manualPriority ? 1 : 0,
+                    sys.general.options.pumpDelay ? 1 : 0,
+                    sys.general.options.cooldownDelay ? 1 : 0,
+                    sys.general.options.manualHeat ? 1 : 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0
+                ]
+                : [
+                    sys.bodies.getItemById(1, false).setPoint || 100, // 21
+                    sys.bodies.getItemById(3, false).setPoint || 100,
+                    sys.bodies.getItemById(2, false).setPoint || 100,
+                    sys.bodies.getItemById(4, false).setPoint || 100,
+                    sys.bodies.getItemById(1, false).heatMode || 0,
+                    sys.bodies.getItemById(2, false).heatMode || 0,
+                    sys.bodies.getItemById(3, false).heatMode || 0,
+                    sys.bodies.getItemById(4, false).heatMode || 0,
+                    15,
+                    sys.general.options.pumpDelay ? 1 : 0,  // 30
+                    sys.general.options.cooldownDelay ? 1 : 0,
+                    0, 0, 100, 0, 0, 0, 0,
+                    sys.general.options.manualPriority ? 1 : 0, // 39
+                    sys.general.options.manualHeat ? 1 : 0
+                ])];
         let arr = [];
         try {
             if (typeof obj.waterTempAdj1 != 'undefined' && obj.waterTempAdj1 !== sys.equipment.tempSensors.getCalibration('water1')) {
@@ -1257,12 +1364,13 @@ class IntelliCenterSystemCommands extends SystemCommands {
             }
             if ((typeof obj.clockMode !== 'undefined' && obj.clockMode !== sys.general.options.clockMode) ||
                 (typeof obj.adjustDST !== 'undefined' && obj.adjustDST !== sys.general.options.adjustDST)) {
-                let byte = 0x30; // These bits are always set.
+                const effectiveClockSource = (typeof obj.clockSource === 'string') ? obj.clockSource : sys.general.options.clockSource;
+                let byte = 0x10 | (effectiveClockSource === 'internet' ? 0x20 : 0x00);
                 if (typeof obj.clockMode === 'undefined') byte |= sys.general.options.clockMode === 24 ? 0x40 : 0x00;
                 else byte |= obj.clockMode === 24 ? 0x40 : 0x00;
                 if (typeof obj.adjustDST === 'undefined') byte |= sys.general.options.adjustDST ? 0x80 : 0x00;
                 else byte |= obj.adjustDST ? 0x80 : 0x00;
-                payload[2] = 11;
+                payload[2] = isIntellicenterV3 ? 0 : 11;
                 payload[14] = byte;
                 let out = Outbound.create({
                     action: 168,
@@ -1272,11 +1380,11 @@ class IntelliCenterSystemCommands extends SystemCommands {
                 });
                 await out.sendAsync();
                 if (typeof obj.clockMode !== 'undefined') sys.general.options.clockMode = obj.clockMode === 24 ? 24 : 12;
-                if (typeof obj.adjustDST !== 'undefined' || sys.general.options.clockSource !== 'server') sys.general.options.adjustDST = obj.adjustDST ? true : false;
+                if (typeof obj.adjustDST !== 'undefined') sys.general.options.adjustDST = obj.adjustDST ? true : false;
             }
 
             if (typeof obj.clockSource != 'undefined' && obj.clockSource !== sys.general.options.clockSource) {
-                payload[2] = 11;
+                payload[2] = isIntellicenterV3 ? 0 : 11;
                 payload[17] = obj.clockSource === 'internet' ? 0x01 : 0x00;
                 let out = Outbound.create({
                     action: 168,
@@ -1289,9 +1397,41 @@ class IntelliCenterSystemCommands extends SystemCommands {
                     sys.general.options.clockSource = obj.clockSource;
                 sys.board.system.setTZ();
             }
+            if (isIntellicenterV3) {
+                const requestedFreezeCycleTime = typeof obj.freezeCycleTime !== 'undefined'
+                    ? parseInt(obj.freezeCycleTime, 10)
+                    : (typeof obj.frzCycleTime !== 'undefined' ? parseInt(obj.frzCycleTime, 10) : undefined);
+                if (typeof requestedFreezeCycleTime !== 'undefined' && !isNaN(requestedFreezeCycleTime) && requestedFreezeCycleTime !== sys.general.options.freezeCycleTime) {
+                    payload[2] = isIntellicenterV3 ? 0 : 26;
+                    payload[26] = Math.max(0, Math.min(255, requestedFreezeCycleTime));
+                    let out = Outbound.create({
+                        action: 168,
+                        retries: 5,
+                        payload: payload,
+                        response: IntelliCenterBoard.getAckResponse(168)
+                    });
+                    await out.sendAsync();
+                    sys.general.options.freezeCycleTime = payload[26];
+                }
+                const requestedFreezeOverride = typeof obj.freezeOverride !== 'undefined'
+                    ? parseInt(obj.freezeOverride, 10)
+                    : (typeof obj.frzOverride !== 'undefined' ? parseInt(obj.frzOverride, 10) : undefined);
+                if (typeof requestedFreezeOverride !== 'undefined' && !isNaN(requestedFreezeOverride) && requestedFreezeOverride !== sys.general.options.freezeOverride) {
+                    payload[2] = isIntellicenterV3 ? 0 : 27;
+                    payload[27] = encodeFreezeOverride(requestedFreezeOverride);
+                    let out = Outbound.create({
+                        action: 168,
+                        retries: 5,
+                        payload: payload,
+                        response: IntelliCenterBoard.getAckResponse(168)
+                    });
+                    await out.sendAsync();
+                    sys.general.options.freezeOverride = requestedFreezeOverride;
+                }
+            }
             if (typeof obj.pumpDelay !== 'undefined' && obj.pumpDelay !== sys.general.options.pumpDelay) {
-                payload[2] = 27;
-                payload[30] = obj.pumpDelay ? 0x01 : 0x00;
+                payload[2] = isIntellicenterV3 ? 0 : 27;
+                payload[pumpDelayPayloadIndex] = obj.pumpDelay ? 0x01 : 0x00;
                 let out = Outbound.create({
                     action: 168,
                     retries: 5,
@@ -1302,8 +1442,8 @@ class IntelliCenterSystemCommands extends SystemCommands {
                 sys.general.options.pumpDelay = obj.pumpDelay ? true : false;
             }
             if (typeof obj.cooldownDelay !== 'undefined' && obj.cooldownDelay !== sys.general.options.cooldownDelay) {
-                payload[2] = 28;
-                payload[31] = obj.cooldownDelay ? 0x01 : 0x00;
+                payload[2] = isIntellicenterV3 ? 0 : 28;
+                payload[cooldownDelayPayloadIndex] = obj.cooldownDelay ? 0x01 : 0x00;
                 let out = Outbound.create({
                     action: 168,
                     retries: 5,
@@ -1314,8 +1454,8 @@ class IntelliCenterSystemCommands extends SystemCommands {
                 sys.general.options.cooldownDelay = obj.cooldownDelay ? true : false;
             }
             if (typeof obj.manualPriority !== 'undefined' && obj.manualPriority !== sys.general.options.manualPriority) {
-                payload[2] = 36;
-                payload[39] = obj.manualPriority ? 0x01 : 0x00;
+                payload[2] = isIntellicenterV3 ? 0 : 36;
+                payload[manualPriorityPayloadIndex] = obj.manualPriority ? 0x01 : 0x00;
                 let out = Outbound.create({
                     action: 168,
                     retries: 5,
@@ -1326,8 +1466,8 @@ class IntelliCenterSystemCommands extends SystemCommands {
                 sys.general.options.manualPriority = obj.manualPriority ? true : false;
             }
             if (typeof obj.manualHeat !== 'undefined' && obj.manualHeat !== sys.general.options.manualHeat) {
-                payload[2] = 37;
-                payload[40] = obj.manualHeat ? 0x01 : 0x00;
+                payload[2] = isIntellicenterV3 ? 0 : 37;
+                payload[manualHeatPayloadIndex] = obj.manualHeat ? 0x01 : 0x00;
                 let out = Outbound.create({
                     action: 168,
                     retries: 5,
@@ -1406,12 +1546,12 @@ class IntelliCenterSystemCommands extends SystemCommands {
                     action: 168,
                     retries: 5,
                     payload: [12, 0, 11,
-                        Math.floor(lat / 256),
-                        lat - Math.floor(lat / 256)],
+                        lat % 256,
+                        Math.floor(lat / 256)],
                     response: IntelliCenterBoard.getAckResponse(168)
                 });
                 await out.sendAsync();
-                sys.general.location.longitude = lat / 100;
+                sys.general.location.latitude = Math.round(obj.latitude * 100) / 100;
             }
             if (typeof obj.longitude === 'number' && obj.longitude !== sys.general.location.longitude) {
                 let lon = Math.round(Math.abs(obj.longitude) * 100);
@@ -1419,12 +1559,12 @@ class IntelliCenterSystemCommands extends SystemCommands {
                     action: 168,
                     retries: 5,
                     payload: [12, 0, 12,
-                        Math.floor(lon / 256),
-                        lon - Math.floor(lon / 256)],
+                        lon % 256,
+                        Math.floor(lon / 256)],
                     response: IntelliCenterBoard.getAckResponse(168)
                 });
                 await out.sendAsync();
-                sys.general.location.longitude = -(lon / 100);
+                sys.general.location.longitude = Math.round(obj.longitude * 100) / 100;
             }
             if (typeof obj.timeZone === 'number' && obj.timeZone !== sys.general.location.timeZone) {
                 let out = Outbound.create({
@@ -1510,47 +1650,6 @@ class IntelliCenterCircuitCommands extends CircuitCommands {
     // Key: circuit/feature ID, Value: intended state (true=on, false=off)
     private pendingStates: Map<number, boolean> = new Map();
 
-    private findActiveTargetIdOwners(targetId: number, excludeCircuitId?: number): ICircuit[] {
-        const owners: ICircuit[] = [];
-        if (typeof targetId !== 'number' || targetId <= 0) return owners;
-        for (let i = 0; i < sys.circuits.length; i++) {
-            const circ = sys.circuits.getItemByIndex(i);
-            if (!circ || !circ.isActive) continue;
-            if (typeof excludeCircuitId === 'number' && circ.id === excludeCircuitId) continue;
-            // targetId may be undefined if not learned yet
-            if (typeof (circ as any).targetId === 'number' && (circ as any).targetId === targetId) owners.push(circ);
-        }
-        return owners;
-    }
-
-    public seedKnownV3TargetIds(): void {
-        if (!sys.equipment.isIntellicenterV3) return;
-        // Known fixed body circuits on IntelliCenter:
-        // - Circuit ID 1 = Spa
-        // - Circuit ID 6 = Pool
-        //
-        // We seed these as defaults ONLY when missing, and we never overwrite an existing learned value.
-        // This also has a safety benefit: it prevents other circuits from accidentally learning/reusing
-        // the Spa/Pool targetIds.
-        // Additional observed mapping (NOT guaranteed across all installations):
-        // - Circuit ID 2 targetId observed as 0xC490 in captures. We seed it as a best-effort default
-        //   for users without a Wireless/indoor panel, but it will be overridden when we learn the real
-        //   mapping from the bus (and cleared quickly if readback indicates it’s wrong).
-        const seeds: Array<{ circuitId: number, targetId: number }> = [
-            { circuitId: 1, targetId: 0xA8ED }, // 168,237
-            { circuitId: 6, targetId: 0x6CE1 }, // 108,225
-            { circuitId: 2, targetId: 0xC490 }  // 196,144
-        ];
-        for (const s of seeds) {
-            const circ = sys.circuits.getItemById(s.circuitId, false, { isActive: false });
-            if (!circ || circ.isActive === false) continue;
-            if (typeof (circ as any).targetId === 'number' && (circ as any).targetId > 0) continue;
-            const owners = this.findActiveTargetIdOwners(s.targetId, s.circuitId);
-            if (owners.length > 0) continue; // don't introduce duplicates
-            (circ as any).targetId = s.targetId;
-            logger.debug(`v3.004+ seedKnownV3TargetIds: Seeded circuitId=${s.circuitId} (index=${s.circuitId - 1}) with targetId=${s.targetId}`);
-        }
-    }
     
     // Add a pending state change (called before sending command)
     public addPendingState(id: number, isOn: boolean): void {
@@ -1600,6 +1699,7 @@ class IntelliCenterCircuitCommands extends CircuitCommands {
             let eggHrs = Math.floor(eggTimer / 60);
             let eggMins = eggTimer - (eggHrs * 60);
             let type = typeof data.type !== 'undefined' ? parseInt(data.type, 10) : circuit.type;
+            this.assertSinglePoolSpaType(id, type);
             let theme = typeof data.lightingTheme !== 'undefined' ? data.lightingTheme : circuit.lightingTheme;
             if (circuit.type === 9) theme = typeof data.level !== 'undefined' ? data.level : circuit.level;
             if (typeof theme === 'undefined') theme = 0;
@@ -2200,6 +2300,7 @@ class IntelliCenterCircuitCommands extends CircuitCommands {
         let out = Outbound.create({
             dest,
             action: 222,
+            scope: sys.equipment.isIntellicenterV3 ? 'v3CommandReadback' : undefined,
             retries: 3,
             payload: payload,
             response: Response.create({ dest: -1, action: 30, payload: payload })
@@ -2210,6 +2311,12 @@ class IntelliCenterCircuitCommands extends CircuitCommands {
 
     }
     public async setCircuitStateAsync(id: number, val: boolean, ignoreDelays?: boolean): Promise<ICircuitState> {
+        // v3.004+ features: dashPanel (and other callers) may route feature toggles through the "circuit" path.
+        // IntelliCenter features live in a different Action 184 channel (0xE89D), so delegate feature IDs here.
+        if (sys.equipment.isIntellicenterV3 && sys.board.equipmentIds.features.isInRange(id)) {
+            logger.info(`v3.004+ setCircuitStateAsync: ID ${id} is a feature; delegating to setFeatureStateAsync -> ${val ? 'ON' : 'OFF'}`);
+            return await this.board.features.setFeatureStateAsync(id, val, ignoreDelays);
+        }
         let c = sys.circuits.getInterfaceById(id);
         if (c.master !== 0) return await super.setCircuitStateAsync(id, val);
         // As of 1.047 there is a sequence to this.
@@ -2256,42 +2363,41 @@ class IntelliCenterCircuitCommands extends CircuitCommands {
                 return circ;
             }
 
-            // v3.004+: Use Action 184 if we have a learned targetId for this circuit.
-            // Action 184 is the native circuit control message that the Wireless remote uses.
-            // OCP accepts this format and doesn't revert the state like it does with Action 168.
-            const circuit = sys.circuits.getItemById(id, false);
-            if (sys.equipment.isIntellicenterV3 && circuit && typeof circuit.targetId === 'number' && circuit.targetId > 0) {
-                // Safety: A targetId must be unique per circuit. If duplicates exist, Action 184 could toggle the wrong circuit.
-                const dupOwners = this.findActiveTargetIdOwners(circuit.targetId, id);
-                if (dupOwners.length > 0) {
-                    logger.error(
-                        `v3.004+ setCircuitStateAsync: Circuit ${id} (${circuit.name || 'unnamed'}) has duplicate targetId ${circuit.targetId} also used by ` +
-                        dupOwners.map(o => `${o.id}(${o.name || 'unnamed'})`).join(', ') +
-                        `. Clearing targetId and falling back to Action 168.`
-                    );
-                    circuit.targetId = 0;
-                } else {
-                    logger.info(`v3.004+ setCircuitStateAsync: Using Action 184 with targetId ${circuit.targetId} for circuit ${id} (${circuit.name || 'unnamed'})`);
-                    let out = this.createAction184Message(circuit.targetId, val);
-                    out.dest = 16;  // Send to OCP
-                    out.scope = `circuitState${id}`;
-                    out.retries = 5;
-                    out.response = IntelliCenterBoard.getAckResponse(184);
-                    await out.sendAsync();
-                    // Request updated config to confirm state change
-                    await this.getConfigAsync([15, 0]);
-                    let circ = state.circuits.getInterfaceById(id);
-                    // If readback doesn't match, assume this targetId is incorrect (or rejected) and clear it to prevent repeats.
-                    if (typeof circ?.isOn === 'boolean' && circ.isOn !== val) {
-                        logger.warn(
-                            `v3.004+ setCircuitStateAsync: Action 184 readback mismatch for circuit ${id} (${circuit.name || 'unnamed'}). ` +
-                            `Requested ${val ? 'ON' : 'OFF'} but OCP reports ${circ.isOn ? 'ON' : 'OFF'}. Clearing targetId ${circuit.targetId}.`
-                        );
-                        circuit.targetId = 0;
-                    }
-                    state.emitEquipmentChanges();
-                    return circ;
-                }
+            // v3.004+ non-body circuits: Use indexed Action 184 (Wireless-style)
+            if (sys.equipment.isIntellicenterV3) {
+                const circuit = sys.circuits.getItemById(id, false);
+                logger.info(`v3.004+ setCircuitStateAsync: Using indexed Action 184 for circuit ${id} (${circuit?.name || 'unnamed'}) -> ${val ? 'ON' : 'OFF'}`);
+                /**
+                 * v3.004+ Indexed Circuit Control (Wireless-style).
+                 * Action 184 is the native circuit control message used by the Wireless remote.
+                 *
+                 * Payload structure (10 bytes):
+                 *   Bytes 0-1: Channel (0x688F for circuits)
+                 *   Byte 2: Index (circuitId - 1 or featureId - 1)
+                 *   Byte 3: Format (255 = command mode)
+                 *   Bytes 4-5: Target (0xA8ED = control primitive)
+                 *   Byte 6: State (0=OFF, 1=ON)
+                 *   Bytes 7-9: Reserved (0,0,0)
+                 */
+                const idx = Math.max(0, Math.min(255, (id | 0) - 1));
+                const out = Outbound.createMessage(184, [
+                    104, 143,        // Channel 0x688F (circuits)
+                    idx,             // Index (circuitId - 1)
+                    255,             // Format (command)
+                    168, 237,        // Target 0xA8ED (control primitive)
+                    val ? 1 : 0,     // State
+                    0, 0, 0
+                ], 3);
+                out.dest = 16;  // Send to OCP
+                out.scope = `circuitState${id}`;
+                out.retries = 5;
+                out.response = IntelliCenterBoard.getAckResponse(184);
+                await out.sendAsync();
+                // Request updated config to confirm state change
+                await this.getConfigAsync([15, 0]);
+                let circ = state.circuits.getInterfaceById(id);
+                state.emitEquipmentChanges();
+                return circ;
             }
             
             // v1.x or v3.004+ without known targetId: Use Action 168 (original method)
@@ -2672,37 +2778,6 @@ class IntelliCenterCircuitCommands extends CircuitCommands {
         }
         return out;
     }
-    /**
-     * Creates an Action 184 message for v3.004+ IntelliCenter circuit control.
-     * Action 184 is the native circuit control message used by the Wireless remote.
-     * 
-     * Payload structure (10 bytes):
-     *   Bytes 0-1: Channel ID (104,143 = 0x688F = default channel)
-     *   Byte 2: Sequence number (0)
-     *   Byte 3: Format (255 = command mode)
-     *   Bytes 4-5: Target ID (circuit's unique identifier, learned from OCP broadcasts)
-     *   Byte 6: State (0=OFF, 1=ON)
-     *   Bytes 7-9: Reserved (0,0,0)
-     * 
-     * @param targetId The circuit's unique Target ID (hi*256 + lo)
-     * @param isOn True to turn circuit ON, false for OFF
-     * @returns Outbound message ready to send
-     */
-    public createAction184Message(targetId: number, isOn: boolean): Outbound {
-        const targetIdHi = Math.floor(targetId / 256);
-        const targetIdLo = targetId % 256;
-        // Default channel 104,143 (0x688F), seq=0, format=255 (command)
-        let out = Outbound.createMessage(184, [
-            104, 143,       // Channel ID (default)
-            0,              // Sequence number
-            255,            // Format (command mode)
-            targetIdHi,     // Target ID high byte
-            targetIdLo,     // Target ID low byte
-            isOn ? 1 : 0,   // State (1=ON, 0=OFF)
-            0, 0, 0         // Reserved
-        ], 3);
-        return out;
-    }
 
     public async setDimmerLevelAsync(id: number, level: number): Promise<ICircuitState> {
         let circuit = sys.circuits.getItemById(id);
@@ -2729,14 +2804,84 @@ class IntelliCenterCircuitCommands extends CircuitCommands {
         catch (err) { return Promise.reject(err); }
     }
     public async toggleCircuitStateAsync(id: number): Promise<ICircuitState> {
+        // v3.004+ features: dashPanel may attempt to toggle features via the circuit endpoint.
+        if (sys.equipment.isIntellicenterV3 && sys.board.equipmentIds.features.isInRange(id)) {
+            return await this.board.features.toggleFeatureStateAsync(id);
+        }
         let circ = state.circuits.getInterfaceById(id);
         return sys.board.circuits.setCircuitStateAsync(id, !circ.isOn);
     }
 }
 class IntelliCenterFeatureCommands extends FeatureCommands {
     declare board: IntelliCenterBoard;
-    public async setFeatureStateAsync(id, val): Promise<ICircuitState> { return sys.board.circuits.setCircuitStateAsync(id, val); }
-    public async toggleFeatureStateAsync(id): Promise<ICircuitState> { return sys.board.circuits.toggleCircuitStateAsync(id); }
+
+    private async getConfigAsync(payload: number[]): Promise<boolean> {
+        const dest = sys.equipment.isIntellicenterV3 ? 16 : 15;
+        let out = Outbound.create({
+            dest,
+            action: 222,
+            scope: sys.equipment.isIntellicenterV3 ? 'v3CommandReadback' : undefined,
+            retries: 3,
+            payload: payload,
+            response: Response.create({ dest: -1, action: 30, payload: payload })
+        });
+        await out.sendAsync();
+        // Do NOT ACK(30). Wireless captures show config succeeds without ACK(30), and v1 queue avoids ACK(30).
+        return true;
+    }
+
+    public async setFeatureStateAsync(id: number, val: boolean, ignoreDelays?: boolean): Promise<ICircuitState> {
+        // v3.004+: Features are controlled via Action 184 channel 0xE89D (232,157), not the circuits channel.
+        if (sys.equipment.isIntellicenterV3) {
+            if (isNaN(id)) return Promise.reject(new InvalidEquipmentIdError(`Invalid feature id: ${id}`, id, 'Feature'));
+            if (!sys.board.equipmentIds.features.isInRange(id)) return Promise.reject(new InvalidEquipmentIdError(`Invalid feature id: ${id}`, id, 'Feature'));
+
+            const feature = sys.features.getItemById(id, false, { isActive: false });
+            logger.info(`v3.004+ setFeatureStateAsync: Using indexed Action 184 for feature ${id} (${feature?.name || 'unnamed'}) -> ${val ? 'ON' : 'OFF'}`);
+
+            /**
+             * v3.004+ Indexed Feature Control (Wireless-style).
+             * Action 184 is the native feature control message used by the Wireless remote (channel 0xE89D).
+             *
+             * Payload structure (10 bytes):
+             *   Bytes 0-1: Channel (0xE89D for features)
+             *   Byte 2: Index (featureId - 1)
+             *   Byte 3: Format/mode (observed 0 in replays 132/138 feature toggles)
+             *   Bytes 4-5: Target (0xA8ED = control primitive)
+             *   Byte 6: State (0=OFF, 1=ON)
+             *   Bytes 7-9: Reserved (0,0,0)
+             */
+            const idx = Math.max(0, Math.min(255, (id | 0) - 1));
+            const out = Outbound.createMessage(184, [
+                232, 157,        // Channel 0xE89D (features)
+                idx,             // Index (featureId - 1)
+                0,               // Format/mode (observed)
+                168, 237,        // Target 0xA8ED (control primitive)
+                val ? 1 : 0,     // State
+                0, 0, 0
+            ], 3);
+            out.dest = 16;  // Send to OCP
+            out.scope = `featureState${id}`;
+            out.retries = 5;
+            out.response = IntelliCenterBoard.getAckResponse(184);
+            await out.sendAsync();
+
+            // Request updated system state to confirm feature change (authoritative source for v3 features).
+            await this.getConfigAsync([15, 0]);
+
+            const fstate = state.features.getItemById(id, true);
+            state.emitEquipmentChanges();
+            return fstate;
+        }
+
+        // Legacy behavior (v1.x): delegate to circuit state setter.
+        return sys.board.circuits.setCircuitStateAsync(id, val);
+    }
+
+    public async toggleFeatureStateAsync(id: number): Promise<ICircuitState> {
+        const feat = state.features.getItemById(id);
+        return this.setFeatureStateAsync(id, !(feat.isOn || false));
+    }
     public syncGroupStates() { } // Do nothing and let IntelliCenter do it.
     public async setFeatureAsync(data: any): Promise<Feature> {
 
@@ -3010,42 +3155,64 @@ class IntelliCenterPumpCommands extends PumpCommands {
             // supplied then we will use what we already have.  This will make sure the information is valid and any change can be applied without the complete
             // definition of the pump.  This is important since additional attributes may be added in the future and this keeps us current no matter what
             // the endpoint capability is.
-            let outc = Outbound.create({ action: 168, payload: [4, 0, id - 1, ntype, 0] });
+            const isV3 = sys.equipment.isIntellicenterV3;
+            const dest = isV3 ? 16 : 15;
+            let outc = Outbound.create({ dest, action: 168, payload: [4, 0, id - 1, ntype, 0] });
             outc.appendPayloadByte(parseInt(data.address, 10), id + 95);        // 5
-            outc.appendPayloadInt(parseInt(data.minSpeed, 10), pump.minSpeed);  // 6
-            outc.appendPayloadInt(parseInt(data.maxSpeed, 10), pump.maxSpeed);  // 8
+            // v3.004+ uses big-endian for 16-bit speed/flow values
+            if (isV3) {
+                outc.appendPayloadIntBE(parseInt(data.minSpeed, 10), pump.minSpeed);  // 6
+                outc.appendPayloadIntBE(parseInt(data.maxSpeed, 10), pump.maxSpeed);  // 8
+            } else {
+                outc.appendPayloadInt(parseInt(data.minSpeed, 10), pump.minSpeed);  // 6
+                outc.appendPayloadInt(parseInt(data.maxSpeed, 10), pump.maxSpeed);  // 8
+            }
             outc.appendPayloadByte(parseInt(data.minFlow, 10), pump.minFlow);   // 10
             outc.appendPayloadByte(parseInt(data.maxFlow, 10), pump.maxFlow);   // 11
             outc.appendPayloadByte(parseInt(data.flowStepSize, 10), pump.flowStepSize || 1); // 12
-            outc.appendPayloadInt(parseInt(data.primingSpeed, 10), pump.primingSpeed || 2500); // 13
+            if (isV3) {
+                outc.appendPayloadIntBE(parseInt(data.primingSpeed, 10), pump.primingSpeed || 2500); // 13
+            } else {
+                outc.appendPayloadInt(parseInt(data.primingSpeed, 10), pump.primingSpeed || 2500); // 13
+            }
             outc.appendPayloadByte(typeof data.speedStepSize !== 'undefined' ? parseInt(data.speedStepSize, 10) / 10 : pump.speedStepSize / 10, 1); // 15
             outc.appendPayloadByte(parseInt(data.primingTime, 10), pump.primingTime || 0); // 17
             outc.appendPayloadByte(255); //
             outc.appendPayloadBytes(255, 8);    // 18
             outc.appendPayloadBytes(0, 8);      // 26
-            let outn = Outbound.create({ action: 168, payload: [4, 1, id - 1] });
+            let outn = Outbound.create({ dest, action: 168, payload: [4, 1, id - 1] });
             outn.appendPayloadBytes(0, 16);
             outn.appendPayloadString(data.name, 16, pump.name || type.name);
             if (type.name === 'ss') {
                 outc.setPayloadByte(5, 0); // Clear the pump address
 
                 // At some point we may add these to the pump model.
-                outc.setPayloadInt(6, type.minSpeed, 450);
-                outc.setPayloadInt(8, type.maxSpeed, 3450);
+                // v3.004+ uses big-endian for 16-bit speed/flow values
+                if (isV3) {
+                    outc.setPayloadIntBE(6, type.minSpeed, 450);
+                    outc.setPayloadIntBE(8, type.maxSpeed, 3450);
+                } else {
+                    outc.setPayloadInt(6, type.minSpeed, 450);
+                    outc.setPayloadInt(8, type.maxSpeed, 3450);
+                }
                 outc.setPayloadByte(10, type.minFlow, 0);
                 outc.setPayloadByte(11, type.maxFlow, 130);
                 outc.setPayloadByte(12, 1);
-                outc.setPayloadInt(13, type.primingSpeed, 2500);
+                if (isV3) {
+                    outc.setPayloadIntBE(13, type.primingSpeed, 2500);
+                } else {
+                    outc.setPayloadInt(13, type.primingSpeed, 2500);
+                }
                 outc.setPayloadByte(15, 10);
                 outc.setPayloadByte(16, 1);
                 outc.setPayloadByte(17, 5);
                 outc.setPayloadByte(18, data.body, pump.body);
                 outc.setPayloadByte(26, 0);
-                outn.setPayloadInt(3, 0);
+                if (isV3) outn.setPayloadIntBE(3, 0); else outn.setPayloadInt(3, 0);
                 for (let i = 1; i < 8; i++) {
                     outc.setPayloadByte(i + 18, 255);
                     outc.setPayloadByte(i + 26, 0);
-                    outn.setPayloadInt((i * 2) + 3, 1000);
+                    if (isV3) outn.setPayloadIntBE((i * 2) + 3, 1000); else outn.setPayloadInt((i * 2) + 3, 1000);
                 }
             }
             else {
@@ -3067,13 +3234,13 @@ class IntelliCenterPumpCommands extends PumpCommands {
                                 // The incoming data does not include this circuit so we will set it to 255.
                                 outc.setPayloadByte(i + 18, 255);
                                 if (typeof type.minSpeed !== 'undefined')
-                                    outn.setPayloadInt((i * 2) + 3, type.minSpeed);
+                                    isV3 ? outn.setPayloadIntBE((i * 2) + 3, type.minSpeed) : outn.setPayloadInt((i * 2) + 3, type.minSpeed);
                                 else if (typeof type.minFlow !== 'undefined') {
-                                    outn.setPayloadInt((i * 2) + 3, type.minFlow);
+                                    isV3 ? outn.setPayloadIntBE((i * 2) + 3, type.minFlow) : outn.setPayloadInt((i * 2) + 3, type.minFlow);
                                     outc.setPayloadByte(i + 26, 1);
                                 }
                                 else
-                                    outn.setPayloadInt((i * 2) + 3, 0);
+                                    isV3 ? outn.setPayloadIntBE((i * 2) + 3, 0) : outn.setPayloadInt((i * 2) + 3, 0);
                             }
                             else {
                                 let c = data.circuits[i];
@@ -3088,11 +3255,11 @@ class IntelliCenterPumpCommands extends PumpCommands {
                                 outc.setPayloadByte(i + 18, circuit - 1, circ.circuit - 1);
                                 if (typeof type.minSpeed !== 'undefined' && (parseInt(c.units, 10) === 0 || isNaN(parseInt(c.units, 10)))) {
                                     outc.setPayloadByte(i + 26, 0); // Set to rpm
-                                    outn.setPayloadInt((i * 2) + 3, Math.max(speed, type.minSpeed), circ.speed);
+                                    isV3 ? outn.setPayloadIntBE((i * 2) + 3, Math.max(speed, type.minSpeed), circ.speed) : outn.setPayloadInt((i * 2) + 3, Math.max(speed, type.minSpeed), circ.speed);
                                 }
                                 else if (typeof type.minFlow !== 'undefined' && (parseInt(c.units, 10) === 1 || isNaN(parseInt(c.units, 10)))) {
                                     outc.setPayloadByte(i + 26, 1); // Set to gpm
-                                    outn.setPayloadInt((i * 2) + 3, Math.max(flow, type.minFlow), circ.flow);
+                                    isV3 ? outn.setPayloadIntBE((i * 2) + 3, Math.max(flow, type.minFlow), circ.flow) : outn.setPayloadInt((i * 2) + 3, Math.max(flow, type.minFlow), circ.flow);
                                 }
                             }
                         }
@@ -3212,14 +3379,25 @@ class IntelliCenterPumpCommands extends PumpCommands {
         if (pump.master === 1) return super.deletePumpAsync(data);
 
         if (typeof pump.type === 'undefined') return Promise.reject(new InvalidEquipmentIdError(`Pump #${data.id} does not exist in configuration`, data.id, 'Schedule'));
+        const isV3 = sys.equipment.isIntellicenterV3;
         let outc = Outbound.create({ action: 168, payload: [4, 0, id - 1, 0, 0, id + 95] });
-        outc.appendPayloadInt(450);  // 6
-        outc.appendPayloadInt(3450);  // 8
+        if (isV3) {
+            outc.appendPayloadIntBE(450);  // 6
+            outc.appendPayloadIntBE(3450);  // 8
+        } else {
+            outc.appendPayloadInt(450);  // 6
+            outc.appendPayloadInt(3450);  // 8
+        }
         outc.appendPayloadByte(15);   // 10
         outc.appendPayloadByte(130);   // 11
         outc.appendPayloadByte(1); // 12
-        outc.appendPayloadInt(1000);  // 13
-        outc.appendPayloadInt(10);   // 15
+        if (isV3) {
+            outc.appendPayloadIntBE(1000);  // 13
+            outc.appendPayloadIntBE(10);   // 15
+        } else {
+            outc.appendPayloadInt(1000);  // 13
+            outc.appendPayloadInt(10);   // 15
+        }
         outc.appendPayloadByte(5);   // 17
         outc.appendPayloadBytes(255, 8);    // 18
         outc.appendPayloadBytes(0, 8);      // 26
@@ -3686,14 +3864,20 @@ class IntelliCenterScheduleCommands extends ScheduleCommands {
             if (endTimeType !== 0) runOnce |= (1 << (endTimeType + 3));
             // This was always the cooling setpoint for ultratemp.
             //let flags = (circuit === 1 || circuit === 6) ? 81 : 100;
+            // v3.004+ uses big-endian for 16-bit time values
+            let startTimeLo = startTime - Math.floor(startTime / 256) * 256;
+            let startTimeHi = Math.floor(startTime / 256);
+            let endTimeLo = endTime - Math.floor(endTime / 256) * 256;
+            let endTimeHi = Math.floor(endTime / 256);
+            let isV3 = sys.equipment.isIntellicenterV3;
             let out = Outbound.createMessage(168, [
                 3
                 , 0
                 , id - 1 // IntelliCenter schedules start at 0.
-                , startTime - Math.floor(startTime / 256) * 256
-                , Math.floor(startTime / 256)
-                , endTime - Math.floor(endTime / 256) * 256
-                , Math.floor(endTime / 256)
+                , isV3 ? startTimeHi : startTimeLo
+                , isV3 ? startTimeLo : startTimeHi
+                , isV3 ? endTimeHi : endTimeLo
+                , isV3 ? endTimeLo : endTimeHi
                 , circuit - 1
                 , runOnce
                 , schedDays
@@ -4149,6 +4333,9 @@ export class IntelliCenterChemControllerCommands extends ChemControllerCommands
         let cyanuricAcid = typeof data.cyanuricAcid !== 'undefined' ? parseInt(data.cyanuricAcid, 10) : chem.cyanuricAcid;
         let alkalinity = typeof data.alkalinity !== 'undefined' ? parseInt(data.alkalinity, 10) : chem.alkalinity;
         let borates = typeof data.borates !== 'undefined' ? parseInt(data.borates, 10) : chem.borates || 0;
+        let intellichemStandalone = sys.controllerType === ControllerType.Nixie
+            ? (typeof data.intellichemStandalone !== 'undefined' ? utils.makeBool(data.intellichemStandalone) : chem.intellichemStandalone)
+            : false;
         let body = sys.board.bodies.mapBodyAssociation(typeof data.body === 'undefined' ? chem.body : data.body);
         if (typeof body === 'undefined') return Promise.reject(new InvalidEquipmentDataError(`Invalid body assignment`, 'chemController', data.body || chem.body));
         // Do a final validation pass so we dont send this off in a mess.
@@ -4237,6 +4424,7 @@ export class IntelliCenterChemControllerCommands extends ChemControllerCommands
         chem.alkalinity = alkalinity;
         chem.borates = borates;
         chem.body = schem.body = body;
+        chem.intellichemStandalone = intellichemStandalone;
         schem.isActive = chem.isActive = true;
         chem.lsiRange.enabled = lsiRange.enabled;
         chem.lsiRange.low = lsiRange.low;