nodejs-poolcontroller 8.1.2 → 8.4.0

package/controller/comms/messages/config/ExternalMessage.ts

@@ -18,10 +18,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { Inbound } from "../Messages";
 import { sys, Body, ICircuitGroup, LightGroup, CircuitGroup } from "../../../Equipment";
 import { state, ICircuitGroupState, LightGroupState, CircuitGroupState } from "../../../State";
-import { Timestamp, utils } from "../../../Constants";
+import { ControllerType, Timestamp, utils } from "../../../Constants";
 import { logger } from "../../../../logger/Logger";
 export class ExternalMessage {
     public static processIntelliCenter(msg: Inbound): void {
+        // IntelliCenter v3.x: treat Wireless/ICP/Indoor -> OCP packets as requests, not source-of-truth.
+        // We are a bus listener, so we will see traffic not addressed to us; do not apply those requests to state.
+        // Only accept OCP-originated messages here. If/when OCP applies a request, it will broadcast authoritative
+        // state/config via other message types (e.g., Action 30 / 204).
+        if (sys.equipment.isIntellicenterV3 && msg.dest === 16 && msg.source !== 16) {
+            msg.isProcessed = true;
+            return;
+        }
         switch (msg.extractPayloadByte(0)) {
             case 0: // Setpoints/HeatMode
                 ExternalMessage.processTempSettings(msg);
@@ -268,10 +276,23 @@ export class ExternalMessage {
         }
     }
     public static processIntelliCenterState(msg) {
-        ExternalMessage.processCircuitState(2, msg);
-        ExternalMessage.processFeatureState(8, msg);
-        ExternalMessage.processScheduleState(14, msg);
-        ExternalMessage.processCircuitGroupState(12, msg);
+        // This is called from Action 30 case 15 (config message) - NOT Action 168 case 15 (wireless message).
+        // Action 30 and Action 168 have different payload structures!
+        // 
+        // v1.x: Original offsets (2, 8, 14, 12) - in place since Oct 2019, working.
+        // v3.004+: Different structure, requires offsets (3, 9, 15, 13) to match wireless message layout.
+        if (sys.equipment.isIntellicenterV3) {
+            ExternalMessage.processCircuitState(3, msg);
+            ExternalMessage.processFeatureState(9, msg);
+            ExternalMessage.processScheduleState(15, msg);
+            ExternalMessage.processCircuitGroupState(13, msg);
+        } else {
+            // v1.x offsets - preserve original behavior since Oct 2019
+            ExternalMessage.processCircuitState(2, msg);
+            ExternalMessage.processFeatureState(8, msg);
+            ExternalMessage.processScheduleState(14, msg);
+            ExternalMessage.processCircuitGroupState(12, msg);
+        }
     }
     private static processHeater(msg: Inbound) {
         // So a user is changing the heater info.  Lets
@@ -508,8 +529,17 @@ export class ExternalMessage {
     }
     private static processSchedules(msg: Inbound) {
         let schedId = msg.extractPayloadByte(2) + 1;
-        let startTime = msg.extractPayloadInt(3);
-        let endTime = msg.extractPayloadInt(5);
+        // v3.004+: schedule times are big-endian (hi,lo) in Action 168 payloads.
+        // v1.x: schedule times are little-endian (lo,hi).
+        let startTime: number;
+        let endTime: number;
+        if (sys.controllerType === ControllerType.IntelliCenter && sys.equipment.isIntellicenterV3) {
+            startTime = msg.extractPayloadIntBE(3);
+            endTime = msg.extractPayloadIntBE(5);
+        } else {
+            startTime = msg.extractPayloadInt(3);
+            endTime = msg.extractPayloadInt(5);
+        }
         let circuit = msg.extractPayloadByte(7) + 1;
         let isActive = (msg.extractPayloadByte(8) & 128) === 128; // Inactive schedules do not have bit 8 set.
         let cfg = sys.schedules.getItemById(schedId, isActive);
@@ -702,9 +732,65 @@ export class ExternalMessage {
     }
     private static processTempSettings(msg: Inbound) {
         let fnTranslateByte = (byte: number) => { return (byte & 0x007F) * (((byte & 0x0080) > 0) ? -1 : 1); }
-        // What the developers did is supply an offset index into the payload for the byte that is
-        // changing.  I suppose this may have been easier but we are not using that logic.  We want the
-        // information to remain decoded so that we aren't guessing which byte does what.
+        
+        // v3.004+: Wireless sends the FULL options block, not a single-field notification.
+        // v1.x: Used byte[2] as a pivot/index indicating which field changed, then byte[byte[2]+3] = new value.
+        // 
+        // IMPORTANT: v3 Action 168 from Wireless has DIFFERENT offsets than Action 30 type 0!
+        // - Action 30 type 0:    poolHeatNdx=19, spaHeatNdx=21, poolModeNdx=23, spaModeNdx=24
+        // - Action 168 Wireless: poolHeatNdx=20, spaHeatNdx=22, poolModeNdx=24, spaModeNdx=25
+        // The Wireless payload has an extra byte at position 4, shifting everything by +1.
+        const isIntellicenterV3 = (sys.controllerType === ControllerType.IntelliCenter && sys.equipment.isIntellicenterV3);
+        
+        // Detect v3 full-block format by payload length (v3 sends 41 bytes for msgType 0)
+        if (isIntellicenterV3 && msg.payload.length >= 27) {
+            // v3.004+ Wireless full options block - different offsets than Action 30!
+            // Verified from replay 48: Pool setpoint at byte 20, Spa setpoint at byte 22
+            const poolHeatNdx = 20;
+            const poolCoolNdx = 21;
+            const spaHeatNdx = 22;
+            const spaCoolNdx = 23;
+            const poolModeNdx = 24;
+            const spaModeNdx = 25;
+            
+            // Update Body 1 (Pool)
+            let body = sys.bodies.getItemById(1, sys.equipment.maxBodies > 0);
+            let sbody = state.temps.bodies.getItemById(1);
+            if (body.isActive) {
+                const newPoolHeat = msg.extractPayloadByte(poolHeatNdx);
+                const newPoolCool = msg.extractPayloadByte(poolCoolNdx);
+                const newPoolMode = msg.extractPayloadByte(poolModeNdx);
+                logger.silly(`v3.004+ Action 168: Pool setpoint ${body.heatSetpoint} → ${newPoolHeat}, coolSetpoint ${body.coolSetpoint} → ${newPoolCool}, mode ${body.heatMode} → ${newPoolMode}`);
+                body.heatSetpoint = newPoolHeat;
+                body.coolSetpoint = newPoolCool;
+                body.heatMode = newPoolMode;
+                sbody.heatSetpoint = body.heatSetpoint;
+                sbody.coolSetpoint = body.coolSetpoint;
+                sbody.heatMode = body.heatMode;
+            }
+            
+            // Update Body 2 (Spa)
+            body = sys.bodies.getItemById(2, sys.equipment.maxBodies > 1);
+            sbody = state.temps.bodies.getItemById(2);
+            if (body.isActive) {
+                const newSpaHeat = msg.extractPayloadByte(spaHeatNdx);
+                const newSpaCool = msg.extractPayloadByte(spaCoolNdx);
+                const newSpaMode = msg.extractPayloadByte(spaModeNdx);
+                logger.silly(`v3.004+ Action 168: Spa setpoint ${body.heatSetpoint} → ${newSpaHeat}, coolSetpoint ${body.coolSetpoint} → ${newSpaCool}, mode ${body.heatMode} → ${newSpaMode}`);
+                body.heatSetpoint = newSpaHeat;
+                body.coolSetpoint = newSpaCool;
+                body.heatMode = newSpaMode;
+                sbody.heatSetpoint = body.heatSetpoint;
+                sbody.coolSetpoint = body.coolSetpoint;
+                sbody.heatMode = body.heatMode;
+            }
+            
+            state.emitEquipmentChanges();
+            msg.isProcessed = true;
+            return;
+        }
+        
+        // v1.x: Single-field-changed notification using byte[2] as pivot index.
         // payLoadIndex = byte(2) + 3 where the first 3 bytes indicate what value changed.
         let body: Body = null;
         switch (msg.extractPayloadByte(2)) {

package/controller/comms/messages/config/OptionsMessage.ts

@@ -1,175 +1,195 @@
-/*  nodejs-poolController.  An application to control pool equipment.
-Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022.  
-Russell Goldin, tagyoureit.  russ.goldin@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-import { Inbound } from "../Messages";
-import { sys } from "../../../Equipment";
-import { state } from "../../../State";
-import { ControllerType } from "../../../Constants";
-export class OptionsMessage {
-    public static process(msg: Inbound): void {
-        switch (sys.controllerType) {
-            case ControllerType.IntelliCenter:
-                OptionsMessage.processIntelliCenter(msg);
-                break;
-            case ControllerType.IntelliCom:
-            case ControllerType.SunTouch:
-            case ControllerType.EasyTouch:
-            case ControllerType.IntelliTouch:
-                OptionsMessage.processIntelliTouch(msg);
-                break;
-        }
-    }
-    private static processIntelliCenter(msg: Inbound) {
-        switch (msg.action) {
-            case 30:
-                switch (msg.extractPayloadByte(1)) {
-                    case 0:
-                        {
-                            if ((msg.extractPayloadByte(13) & 32) === 32)
-                                sys.general.options.clockSource = 'internet';
-                            else if (sys.general.options.clockSource !== 'server')
-                                sys.general.options.clockSource = 'manual';
-                            sys.general.options.clockMode = (msg.extractPayloadByte(13) & 64) === 64 ? 24 : 12;
-                            if (sys.general.options.clockSource !== 'server' || typeof sys.general.options.adjustDST === 'undefined') sys.general.options.adjustDST = (msg.extractPayloadByte(13) & 128) === 128;
-                            // No pumpDelay
-                            //[255, 0, 255][165, 63, 15, 16, 30, 40][0, 0, 1, 129, 0, 0, 0, 0, 0, 0, 0, 0, 0, 176, 149, 29, 35, 3, 0, 0, 92, 81, 91, 81, 3, 3, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0][4, 193]
-                            // pumpDelay                                                                                                                                       
-                            //[255, 0, 255][165, 63, 15, 16, 30, 40][0, 0, 1, 129, 0, 0, 0, 0, 0, 0, 0, 0, 0, 176, 149, 29, 35, 3, 0, 0, 92, 81, 91, 81, 3, 3, 0, 0, 15, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0][4, 194]
-                            sys.general.options.pumpDelay = msg.extractPayloadByte(29) === 1;
-                            // No cooldownDelay
-                            //[255, 0, 255][165, 63, 15, 16, 30, 40][0, 0, 1, 129, 0, 0, 0, 0, 0, 0, 0, 0, 0, 176, 149, 29, 35, 3, 0, 0, 92, 81, 91, 81, 3, 3, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0][4, 193]
-                            // cooldownDelay
-                            //[255, 0, 255][165, 63, 15, 16, 30, 40][0, 0, 1, 129, 0, 0, 0, 0, 0, 0, 0, 0, 0, 176, 149, 29, 35, 3, 0, 0, 92, 81, 91, 81, 3, 3, 0, 0, 15, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0][4, 194]
-                            sys.general.options.cooldownDelay = msg.extractPayloadByte(30) === 1;
-                            sys.general.options.manualPriority = msg.extractPayloadByte(38) === 1;
-                            sys.general.options.manualHeat = msg.extractPayloadByte(39) === 1;
-                            let fnTranslateByte = (byte):number => { return (byte & 0x007F) * (((byte & 0x0080) > 0) ? -1 : 1); }
-                            sys.equipment.tempSensors.setCalibration('water1', fnTranslateByte(msg.extractPayloadByte(3)));
-                            sys.equipment.tempSensors.setCalibration('solar1', fnTranslateByte(msg.extractPayloadByte(4)));
-                            sys.equipment.tempSensors.setCalibration('air',    fnTranslateByte(msg.extractPayloadByte(5)));
-                            sys.equipment.tempSensors.setCalibration('water2', fnTranslateByte(msg.extractPayloadByte(6)));
-                            sys.equipment.tempSensors.setCalibration('solar2', fnTranslateByte(msg.extractPayloadByte(7)));
-                            sys.equipment.tempSensors.setCalibration('water3', fnTranslateByte(msg.extractPayloadByte(8)));
-                            sys.equipment.tempSensors.setCalibration('solar3', fnTranslateByte(msg.extractPayloadByte(9)));
-                            sys.equipment.tempSensors.setCalibration('water4', fnTranslateByte(msg.extractPayloadByte(10)));
-                            sys.equipment.tempSensors.setCalibration('solar4', fnTranslateByte(msg.extractPayloadByte(11)));
-
-                            // When we complete our transition for the calibration make this go away.
-                            //sys.general.options.waterTempAdj2 = (msg.extractPayloadByte(2) & 0x007F) * (((msg.extractPayloadByte(2) & 0x0080) > 0) ? -1 : 1);
-                            //sys.general.options.waterTempAdj1 = (msg.extractPayloadByte(3) & 0x007F) * (((msg.extractPayloadByte(3) & 0x0080) > 0) ? -1 : 1);
-                            //sys.general.options.solarTempAdj1 = (msg.extractPayloadByte(4) & 0x007F) * (((msg.extractPayloadByte(4) & 0x0080) > 0) ? -1 : 1);
-                            //sys.general.options.airTempAdj = (msg.extractPayloadByte(5) & 0x007F) * (((msg.extractPayloadByte(5) & 0x0080) > 0) ? -1 : 1);
-                            //sys.general.options.waterTempAdj2 = (msg.extractPayloadByte(6) & 0x007F) * (((msg.extractPayloadByte(6) & 0x0080) > 0) ? -1 : 1);
-
-                            // Somewhere in here are the units.
-
-                            let body = sys.bodies.getItemById(1, sys.equipment.maxBodies > 0);
-                            body.heatMode = msg.extractPayloadByte(24);
-                            body.heatSetpoint = msg.extractPayloadByte(20);
-                            body.coolSetpoint = msg.extractPayloadByte(21);
-
-                            body = sys.bodies.getItemById(2, sys.equipment.maxBodies > 1);
-                            body.heatMode = msg.extractPayloadByte(25);
-                            body.heatSetpoint = msg.extractPayloadByte(22);
-                            body.coolSetpoint = msg.extractPayloadByte(23);
-
-                            //body = sys.bodies.getItemById(3, sys.equipment.maxBodies > 2);
-                            //body.heatMode = msg.extractPayloadByte(26);
-                            //body.heatSetpoint = msg.extractPayloadByte(21);
-                            //body.manualHeat = sys.general.options.manualHeat;
-                            //body = sys.bodies.getItemById(4, sys.equipment.maxBodies > 3);
-                            //body.heatMode = msg.extractPayloadByte(27);
-                            //body.heatSetpoint = msg.extractPayloadByte(23);
-                            msg.isProcessed = true;
-                            break;
-                        }
-                    case 1: // Vacation mode
-                        let yy = msg.extractPayloadByte(4) + 2000;
-                        let mm = msg.extractPayloadByte(5);
-                        let dd = msg.extractPayloadByte(6);
-                        sys.general.options.vacation.startDate = new Date(yy, mm - 1, dd);
-                        yy = msg.extractPayloadByte(7) + 2000;
-                        mm = msg.extractPayloadByte(8);
-                        dd = msg.extractPayloadByte(9);
-                        sys.general.options.vacation.endDate = new Date(yy, mm - 1, dd);
-                        sys.general.options.vacation.enabled = msg.extractPayloadByte(2) > 0;
-                        sys.general.options.vacation.useTimeframe = msg.extractPayloadByte(3) > 0;
-                        msg.isProcessed = true;
-                        break;
-                }
-                msg.isProcessed = true;
-                break;
-        }
-    }
-    private static processIntelliTouch(msg: Inbound) {
-        switch (msg.action) {
-            case 30: {
-                // sample packet
-                // [165,33,15,16,30,16],[4,9,16,0,1,72,0,0,16,205,0,0,0,2,0,0],[2,88]
-                // this is (I believe) to assign circuits that require high speed mode with a dual speed pump
-
-                // We don't want the dual speed pump to even exist unless there are no circuit controlling it.
-                // It should not be showing up in our pumps list or emitting state unless the user has defined
-                // circuits to it on *Touch interfaces.
-                // RSG 1/5/23 - Intellitouch (and Dual Body) accept 8 high speed circuits
-                let maxCircuits = sys.controllerType === ControllerType.IntelliTouch ? 8 : 4;
-                let arrCircuits = [];
-                let pump = sys.pumps.getDualSpeed(true);
-                for (let i = 0; i < maxCircuits; i++) {
-                    let val = msg.extractPayloadByte(i);
-                    if (val > 0) arrCircuits.push(val);
-                    else pump.circuits.removeItemById(i);
-                }
-                if (arrCircuits.length > 0) {
-                    let pump = sys.pumps.getDualSpeed(true);
-                    for (let j = 1; j <= arrCircuits.length; j++) pump.circuits.getItemById(j, true).circuit = arrCircuits[j-1];
-                }
-                else sys.pumps.removeItemById(10);
-                msg.isProcessed = true;
-                break;
-            }
-            case 40:
-            case 168:    
-            {
-
-                // [165,33,16,34,168,10],[0,0,0,254,0,0,0,0,0,0],[2,168 = manual heat mode off
-                // [165,33,16,34,168,10],[0,0,0,254,1,0,0,0,0,0],[2,169] = manual heat mode on
-                sys.general.options.manualHeat = msg.extractPayloadByte(4) === 1;
-                // From https://github.com/tagyoureit/nodejs-poolController/issues/362 = Intellitouch
-                // [0,0,0,0,1,x,0,0,0,0]  x=0 Manual OP heat Off; x=1 Manual OP heat On 
-                sys.general.options.manualPriority = msg.extractPayloadByte(5) === 1;
-                if ((msg.extractPayloadByte(3) & 0x01) === 1) {
-                    // only support for 1 ic with EasyTouch
-                    let chem = sys.chemControllers.getItemByAddress(144, true);
-                    //let schem = state.chemControllers.getItemById(chem.id, true);
-                    chem.ph.tank.capacity = chem.orp.tank.capacity = 6;
-                    chem.ph.tank.units = chem.orp.tank.units = '';
-                    
-                }
-                else {
-                    if (sys.controllerType !== ControllerType.SunTouch) {
-                        let chem = sys.chemControllers.getItemByAddress(144);
-                        state.chemControllers.removeItemById(chem.id);
-                        sys.chemControllers.removeItemById(chem.id);
-                    }
-                }
-                msg.isProcessed = true;
-                break;
-            }
-        }
-    }
+/*  nodejs-poolController.  An application to control pool equipment.
+Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022.  
+Russell Goldin, tagyoureit.  russ.goldin@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import { Inbound } from "../Messages";
+import { sys } from "../../../Equipment";
+import { state } from "../../../State";
+import { ControllerType } from "../../../Constants";
+export class OptionsMessage {
+    public static process(msg: Inbound): void {
+        switch (sys.controllerType) {
+            case ControllerType.IntelliCenter:
+                OptionsMessage.processIntelliCenter(msg);
+                break;
+            case ControllerType.IntelliCom:
+            case ControllerType.SunTouch:
+            case ControllerType.EasyTouch:
+            case ControllerType.IntelliTouch:
+                OptionsMessage.processIntelliTouch(msg);
+                break;
+        }
+    }
+    private static processIntelliCenter(msg: Inbound) {
+        switch (msg.action) {
+            case 30:
+                switch (msg.extractPayloadByte(1)) {
+                    case 0:
+                        {
+                            if ((msg.extractPayloadByte(13) & 32) === 32)
+                                sys.general.options.clockSource = 'internet';
+                            else if (sys.general.options.clockSource !== 'server')
+                                sys.general.options.clockSource = 'manual';
+                            sys.general.options.clockMode = (msg.extractPayloadByte(13) & 64) === 64 ? 24 : 12;
+                            if (sys.general.options.clockSource !== 'server' || typeof sys.general.options.adjustDST === 'undefined') sys.general.options.adjustDST = (msg.extractPayloadByte(13) & 128) === 128;
+                            // No pumpDelay
+                            //[255, 0, 255][165, 63, 15, 16, 30, 40][0, 0, 1, 129, 0, 0, 0, 0, 0, 0, 0, 0, 0, 176, 149, 29, 35, 3, 0, 0, 92, 81, 91, 81, 3, 3, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0][4, 193]
+                            // pumpDelay                                                                                                                                       
+                            //[255, 0, 255][165, 63, 15, 16, 30, 40][0, 0, 1, 129, 0, 0, 0, 0, 0, 0, 0, 0, 0, 176, 149, 29, 35, 3, 0, 0, 92, 81, 91, 81, 3, 3, 0, 0, 15, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0][4, 194]
+                            sys.general.options.pumpDelay = msg.extractPayloadByte(29) === 1;
+                            // No cooldownDelay
+                            //[255, 0, 255][165, 63, 15, 16, 30, 40][0, 0, 1, 129, 0, 0, 0, 0, 0, 0, 0, 0, 0, 176, 149, 29, 35, 3, 0, 0, 92, 81, 91, 81, 3, 3, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0][4, 193]
+                            // cooldownDelay
+                            //[255, 0, 255][165, 63, 15, 16, 30, 40][0, 0, 1, 129, 0, 0, 0, 0, 0, 0, 0, 0, 0, 176, 149, 29, 35, 3, 0, 0, 92, 81, 91, 81, 3, 3, 0, 0, 15, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0][4, 194]
+                            sys.general.options.cooldownDelay = msg.extractPayloadByte(30) === 1;
+                            sys.general.options.manualPriority = msg.extractPayloadByte(38) === 1;
+                            sys.general.options.manualHeat = msg.extractPayloadByte(39) === 1;
+                            let fnTranslateByte = (byte):number => { return (byte & 0x007F) * (((byte & 0x0080) > 0) ? -1 : 1); }
+                            sys.equipment.tempSensors.setCalibration('water1', fnTranslateByte(msg.extractPayloadByte(3)));
+                            sys.equipment.tempSensors.setCalibration('solar1', fnTranslateByte(msg.extractPayloadByte(4)));
+                            sys.equipment.tempSensors.setCalibration('air',    fnTranslateByte(msg.extractPayloadByte(5)));
+                            sys.equipment.tempSensors.setCalibration('water2', fnTranslateByte(msg.extractPayloadByte(6)));
+                            sys.equipment.tempSensors.setCalibration('solar2', fnTranslateByte(msg.extractPayloadByte(7)));
+                            sys.equipment.tempSensors.setCalibration('water3', fnTranslateByte(msg.extractPayloadByte(8)));
+                            sys.equipment.tempSensors.setCalibration('solar3', fnTranslateByte(msg.extractPayloadByte(9)));
+                            sys.equipment.tempSensors.setCalibration('water4', fnTranslateByte(msg.extractPayloadByte(10)));
+                            sys.equipment.tempSensors.setCalibration('solar4', fnTranslateByte(msg.extractPayloadByte(11)));
+
+                            // When we complete our transition for the calibration make this go away.
+                            //sys.general.options.waterTempAdj2 = (msg.extractPayloadByte(2) & 0x007F) * (((msg.extractPayloadByte(2) & 0x0080) > 0) ? -1 : 1);
+                            //sys.general.options.waterTempAdj1 = (msg.extractPayloadByte(3) & 0x007F) * (((msg.extractPayloadByte(3) & 0x0080) > 0) ? -1 : 1);
+                            //sys.general.options.solarTempAdj1 = (msg.extractPayloadByte(4) & 0x007F) * (((msg.extractPayloadByte(4) & 0x0080) > 0) ? -1 : 1);
+                            //sys.general.options.airTempAdj = (msg.extractPayloadByte(5) & 0x007F) * (((msg.extractPayloadByte(5) & 0x0080) > 0) ? -1 : 1);
+                            //sys.general.options.waterTempAdj2 = (msg.extractPayloadByte(6) & 0x007F) * (((msg.extractPayloadByte(6) & 0x0080) > 0) ? -1 : 1);
+
+                            // Somewhere in here are the units.
+
+                            // v3.004+: payload layout shifted by 1 byte vs v1.x (timestamp insertion earlier in the packet).
+                            // Evidence: replay.21 Action 30 type 0 has [.., 85,100,94,103, 3,3 ..] at bytes 19-24.
+                            const isIntellicenterV3 = (sys.controllerType === ControllerType.IntelliCenter && sys.equipment.isIntellicenterV3);
+                            const poolHeatNdx = isIntellicenterV3 ? 19 : 20;
+                            const poolCoolNdx = isIntellicenterV3 ? 20 : 21;
+                            const spaHeatNdx = isIntellicenterV3 ? 21 : 22;
+                            const spaCoolNdx = isIntellicenterV3 ? 22 : 23;
+                            const poolModeNdx = isIntellicenterV3 ? 23 : 24;
+                            const spaModeNdx = isIntellicenterV3 ? 24 : 25;
+
+                            let body = sys.bodies.getItemById(1, sys.equipment.maxBodies > 0);
+                            body.heatMode = msg.extractPayloadByte(poolModeNdx);
+                            body.heatSetpoint = msg.extractPayloadByte(poolHeatNdx);
+                            body.coolSetpoint = msg.extractPayloadByte(poolCoolNdx);
+                            // Keep runtime state in sync with config values so UIs (dashPanel/MQTT/etc) reflect
+                            // authoritative OCP updates, including changes initiated by other panels (Wireless/OP).
+                            let sbody = state.temps.bodies.getItemById(1, true);
+                            sbody.heatMode = body.heatMode;
+                            sbody.heatSetpoint = body.heatSetpoint;
+                            sbody.coolSetpoint = body.coolSetpoint;
+
+                            body = sys.bodies.getItemById(2, sys.equipment.maxBodies > 1);
+                            body.heatMode = msg.extractPayloadByte(spaModeNdx);
+                            body.heatSetpoint = msg.extractPayloadByte(spaHeatNdx);
+                            body.coolSetpoint = msg.extractPayloadByte(spaCoolNdx);
+                            sbody = state.temps.bodies.getItemById(2, true);
+                            sbody.heatMode = body.heatMode;
+                            sbody.heatSetpoint = body.heatSetpoint;
+                            sbody.coolSetpoint = body.coolSetpoint;
+
+                            //body = sys.bodies.getItemById(3, sys.equipment.maxBodies > 2);
+                            //body.heatMode = msg.extractPayloadByte(26);
+                            //body.heatSetpoint = msg.extractPayloadByte(21);
+                            //body.manualHeat = sys.general.options.manualHeat;
+                            //body = sys.bodies.getItemById(4, sys.equipment.maxBodies > 3);
+                            //body.heatMode = msg.extractPayloadByte(27);
+                            //body.heatSetpoint = msg.extractPayloadByte(23);
+                            msg.isProcessed = true;
+                            break;
+                        }
+                    case 1: // Vacation mode
+                        let yy = msg.extractPayloadByte(4) + 2000;
+                        let mm = msg.extractPayloadByte(5);
+                        let dd = msg.extractPayloadByte(6);
+                        sys.general.options.vacation.startDate = new Date(yy, mm - 1, dd);
+                        yy = msg.extractPayloadByte(7) + 2000;
+                        mm = msg.extractPayloadByte(8);
+                        dd = msg.extractPayloadByte(9);
+                        sys.general.options.vacation.endDate = new Date(yy, mm - 1, dd);
+                        sys.general.options.vacation.enabled = msg.extractPayloadByte(2) > 0;
+                        sys.general.options.vacation.useTimeframe = msg.extractPayloadByte(3) > 0;
+                        msg.isProcessed = true;
+                        break;
+                }
+                msg.isProcessed = true;
+                break;
+        }
+    }
+    private static processIntelliTouch(msg: Inbound) {
+        switch (msg.action) {
+            case 30: {
+                // sample packet
+                // [165,33,15,16,30,16],[4,9,16,0,1,72,0,0,16,205,0,0,0,2,0,0],[2,88]
+                // this is (I believe) to assign circuits that require high speed mode with a dual speed pump
+
+                // We don't want the dual speed pump to even exist unless there are no circuit controlling it.
+                // It should not be showing up in our pumps list or emitting state unless the user has defined
+                // circuits to it on *Touch interfaces.
+                // RSG 1/5/23 - Intellitouch (and Dual Body) accept 8 high speed circuits
+                let maxCircuits = sys.controllerType === ControllerType.IntelliTouch ? 8 : 4;
+                let arrCircuits = [];
+                let pump = sys.pumps.getDualSpeed(true);
+                for (let i = 0; i < maxCircuits; i++) {
+                    let val = msg.extractPayloadByte(i);
+                    if (val > 0) arrCircuits.push(val);
+                    else pump.circuits.removeItemById(i);
+                }
+                if (arrCircuits.length > 0) {
+                    let pump = sys.pumps.getDualSpeed(true);
+                    for (let j = 1; j <= arrCircuits.length; j++) pump.circuits.getItemById(j, true).circuit = arrCircuits[j-1];
+                }
+                else sys.pumps.removeItemById(10);
+                msg.isProcessed = true;
+                break;
+            }
+            case 40:
+            case 168:    
+            {
+
+                // [165,33,16,34,168,10],[0,0,0,254,0,0,0,0,0,0],[2,168 = manual heat mode off
+                // [165,33,16,34,168,10],[0,0,0,254,1,0,0,0,0,0],[2,169] = manual heat mode on
+                sys.general.options.manualHeat = msg.extractPayloadByte(4) === 1;
+                // From https://github.com/tagyoureit/nodejs-poolController/issues/362 = Intellitouch
+                // [0,0,0,0,1,x,0,0,0,0]  x=0 Manual OP heat Off; x=1 Manual OP heat On 
+                sys.general.options.manualPriority = msg.extractPayloadByte(5) === 1;
+                if ((msg.extractPayloadByte(3) & 0x01) === 1) {
+                    // only support for 1 ic with EasyTouch
+                    let chem = sys.chemControllers.getItemByAddress(144, true);
+                    //let schem = state.chemControllers.getItemById(chem.id, true);
+                    chem.ph.tank.capacity = chem.orp.tank.capacity = 6;
+                    chem.ph.tank.units = chem.orp.tank.units = '';
+                    
+                }
+                else {
+                    if (sys.controllerType !== ControllerType.SunTouch) {
+                        let chem = sys.chemControllers.getItemByAddress(144);
+                        state.chemControllers.removeItemById(chem.id);
+                        sys.chemControllers.removeItemById(chem.id);
+                    }
+                }
+                msg.isProcessed = true;
+                break;
+            }
+        }
+    }
 }