nodejs-poolcontroller 7.7.0 → 8.0.0

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

@@ -1,5 +1,6 @@
 /*  nodejs-poolController.  An application to control pool equipment.
-Copyright (C) 2016, 2017, 2018, 2019, 2020.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
+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
@@ -100,9 +101,48 @@ export class ScheduleMessage {
                     break;
 
             }
-        else if (sys.controllerType !== ControllerType.Unknown)
+        else if (sys.controllerType !== ControllerType.Unknown && sys.controllerType !== ControllerType.SunTouch)
             ScheduleMessage.processScheduleDetails(msg);
     }
+    public static processSunTouch(msg: Inbound): void {
+        //[255, 0, 255][165, 1, 15, 16, 30, 16][0, 0, 0, 0, 2, 0, 1, 224, 1, 239, 6, 1, 1, 224, 3, 132][4, 53]
+        // Bytes 0-3 contain no data.
+        for (let i = 0; i < 2; i++) {
+            let schedId = i + 1;
+            let pos = (i * 6) + 4;
+            let cid = msg.extractPayloadByte(pos);
+            if (cid === 5) cid = 7;
+            else if (cid > 6) cid = cid + 1;
+            let start = (msg.extractPayloadByte(pos + 2) * 256) + msg.extractPayloadByte(pos + 3);
+            let end = (msg.extractPayloadByte(pos + 4) * 256) + msg.extractPayloadByte(pos + 5);
+            let circ = cid > 0 && start < end ? sys.circuits.getInterfaceById(cid, false) : undefined;
+            if (typeof circ !== 'undefined' && circ.isActive) {
+                let sched = sys.schedules.getItemById(schedId, true);
+                let ssched = state.schedules.getItemById(schedId, true);
+                sched.master = 0;
+                ssched.circuit = sched.circuit = circ.id;
+                ssched.scheduleDays = sched.scheduleDays = 127;  // SunTouch does not allow you to set the days.
+                ssched.startTime = sched.startTime = start;
+                ssched.endTime = sched.endTime = end;
+                ssched.startTimeType = sched.startTimeType = 0;
+                ssched.endTimeType = sched.endTimeType = 0;
+                ssched.isActive = sched.isActive = true;
+                ssched.scheduleType = sched.scheduleType = sys.board.valueMaps.scheduleTypes.getValue('repeat');
+                if (sys.circuits.getItemById(circ.id).hasHeatSource && typeof sched.heatSource === 'undefined') ssched.heatSource = sched.heatSource = sys.board.valueMaps.heatSources.getValue('nochange');
+                if (typeof sched.heatSetpoint === 'undefined') sched.heatSetpoint = 78;
+                ssched.emitEquipmentChange();
+            }
+            else {
+                let ssched = state.schedules.find(elem => elem.id === schedId);
+                if (typeof ssched !== 'undefined') {
+                    ssched.isActive = false;
+                    ssched.emitEquipmentChange();
+                    state.schedules.removeItemById(schedId);
+                }
+                sys.schedules.removeItemById(schedId);
+            }
+        }
+    }
     public static processScheduleDetails(msg: Inbound) {
         // Sample packet
         // [165,33,15,16,17,7][6,12,25,0,6,30,0][1,76]
@@ -119,7 +159,7 @@ export class ScheduleMessage {
             eggTimer.isActive = eggTimerActive;
             const circuit = sys.circuits.getInterfaceById(circuitId);
             circuit.eggTimer = eggTimer.runTime;
-            circuit.eggTimer === 720;
+            //circuit.eggTimer === 720;
             circuit.dontStop = circuit.eggTimer === 1620;
             // When eggTimers are found go back and check existing schedules to see if a runOnce schedule already exists.
              // It is possible that the runOnce schedule will be discovered before the eggTimer so we need to adjust the endTime 

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

@@ -1,5 +1,6 @@
 /*  nodejs-poolController.  An application to control pool equipment.
-Copyright (C) 2016, 2017, 2018, 2019, 2020.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
+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

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

@@ -1,5 +1,6 @@
 /*  nodejs-poolController.  An application to control pool equipment.
-Copyright (C) 2016, 2017, 2018, 2019, 2020.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
+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
@@ -56,9 +57,10 @@ export class ValveMessage {
             case ControllerType.IntelliCom:
             case ControllerType.EasyTouch:
             case ControllerType.IntelliTouch:
+            case ControllerType.SunTouch:
                 switch (msg.action) {
                     case 29:
-                        ValveMessage.process_ValveAssignment_IT(msg);
+                        sys.controllerType === ControllerType.SunTouch ? ValveMessage.process_ValveAssignment_ST(msg) : ValveMessage.process_ValveAssignment_IT(msg);
                         break;
                     case 35:
                         ValveMessage.process_ValveOptions_IT(msg);
@@ -73,19 +75,38 @@ export class ValveMessage {
         sys.general.options.pumpDelay = msg.extractPayloadByte(0) >> 7 === 1;
         msg.isProcessed = true;
     }
+    private static process_ValveAssignment_ST(msg: Inbound) {
+        // SunTouch example
+        //[165,1,15,16,29,24][2,0,0,0,20,255,255,1,2,3,4,1,72,0,0,0,3,0,0,63,4,0,0,0][3,167]
+        let vA = sys.valves.getItemById(1, true);
+        let vB = sys.valves.getItemById(2, true);
+        let vC = sys.valves.getItemById(3, true);
+        if (sys.equipment.shared && !sys.equipment.single) {
+            vA.name = 'Intake';
+            vB.circuit = vA.circuit = sys.board.valueMaps.virtualCircuits.encode('poolspa');
+            vB.name = 'Return';
+        }
+        else {
+            vA.name = 'Valve A';
+            vB.name = 'Valve B';
+            vA.circuit = msg.extractPayloadByte(1);
+            vB.circuit = msg.extractPayloadByte(2);
+        }
+        vC.circuit = msg.extractPayloadByte(4);
+        vC.name = 'Valve C'
+    }
     private static process_ValveAssignment_IT(msg: Inbound) {
         // sample packet
-        // 165,33,16,34,157,6,0,0,1,255,255,255,4,153  [set]
+        // [165,33,16,34,157,6],[0,0,1,255,255,255],[4,153]  [set]
+        // [165,33,16,34,157,6],[0,0,7,255,255,255],[4,159]] [set]
         // [165,33,15,16,29,24],[2,0,0,0,128,1,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[4,154] [get]
-        // [[][255,0,255][165,33,16,34,157,6][0,0,7,255,255,255][4,159]] [set]
         // what is payload[0]?
         for (let ndx = 4, id = 1; id <= sys.equipment.maxValves; ndx++) {
-            let valve: Valve = sys.valves.getItemById(id);
             if (id === 3) {
-                if (sys.equipment.shared) {
-                    valve = sys.valves.getItemById(id, true);
+                if (sys.equipment.shared && !sys.equipment.single) {
+                    let valve: Valve = sys.valves.getItemById(id);
                     valve.circuit = 6; // pool/spa -- fix
-                    valve.name = ValveMessage.getName(id, valve.circuit);
+                    valve.name = 'Intake';
                     valve.isIntake = true;
                     valve.isReturn = false;
                     valve.isActive = true;
@@ -99,13 +120,12 @@ export class ValveMessage {
                     sys.valves.removeItemById(id);
                     state.valves.removeItemById(id);
                 }
-                id++;
             }
             else if (id === 4) {
-                if (sys.equipment.shared) {
-                    valve = sys.valves.getItemById(id, true);
+                if (sys.equipment.shared && !sys.equipment.single) {
+                    let valve: Valve = sys.valves.getItemById(id);
                     valve.circuit = 6; // pool/spa -- fix
-                    valve.name = ValveMessage.getName(id, valve.circuit);
+                    valve.name = 'Return';
                     valve.isIntake = false;
                     valve.isReturn = true;
                     valve.isActive = true;
@@ -119,13 +139,12 @@ export class ValveMessage {
                     sys.valves.removeItemById(id);
                     state.valves.removeItemById(id);
                 }
-                id++;
             }
             else {
-                valve = sys.valves.getItemById(id, true);
+                let valve: Valve = sys.valves.getItemById(id);
                 let circ = msg.extractPayloadByte(ndx);
                 valve.circuit = circ > 0 && circ < 255 ? circ : 0;
-                valve.circuit = msg.extractPayloadByte(ndx);
+                //valve.circuit = msg.extractPayloadByte(ndx);
                 //valve.isActive = valve.circuit > 0 && valve.circuit < 255;
                 // RKS: 04-14-21 -- Valves should always be active but shown with no assignment when
                 // there is no circuit.  The circuitry for the valve always exists although I am not sure
@@ -134,25 +153,23 @@ export class ValveMessage {
                 valve.isReturn = false;
                 valve.isIntake = false;
                 valve.type = 0;
+                valve.master = 0;
                 // Allow users to name the valve whatever they want.  *Touch apparently only allows the valve to be named the same
                 // as the circuit but this should be fine if we allow the user to edit it.
                 valve.name = (typeof valve.name === 'undefined') ? ValveMessage.getName(id, valve.circuit) : valve.name;
                 let svalve = state.valves.getItemById(id, true);
                 svalve.name = valve.name;
-                svalve.type = valve.type;
-                valve.master = 0;
-            }
-            if (!valve.isActive) {
-                sys.valves.removeItemById(id);
-                state.valves.removeItemById(id);
-            }
-            else {
-                valve.master = 0;
-                // valve.isVirtual = false;
-                valve.type = 0;
             }
             id++;
         }
+        // Clean up any valves that are leftovers from previous configs.
+        for (let i = sys.valves.length - 1; i >= 0; i--) {
+            let v = sys.valves.getItemByIndex(i);
+            if (v.master === 0 && v.id > sys.equipment.maxValves) {
+                sys.valves.removeItemByIndex(i);
+                state.valves.removeItemById(v.id);
+            }
+        }
         msg.isProcessed = true;
     }
     private static getName(id: number, cir: number) {

package/controller/comms/messages/status/ChlorinatorStateMessage.ts

@@ -1,5 +1,6 @@
 /*  nodejs-poolController.  An application to control pool equipment.
-Copyright (C) 2016, 2017, 2018, 2019, 2020.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
+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
@@ -31,7 +32,7 @@ export class ChlorinatorStateMessage {
             let chlor: Chlorinator = sys.chlorinators.findItemByPortId(msg.portId || 0);
             if (typeof chlor === 'undefined' || chlor.isActive === false) return; // Bail out of here if we don't find an active chlorinator.
             let cstate: ChlorinatorState = state.chlorinators.getItemById(chlor.id, true);
-            if (msg.dest >= 1 && msg.dest <= 4) {
+            if (msg.dest >= 80 && msg.dest <= 83) {
                 // RKS: This message is from the OCP to the chlorinator.  NOTE: We will not see these messages when the communication is coming from njsPC on any
                 // comms port.  The processing for no comms is done in the Nixe control when the message is sent.
                 if (typeof cstate.lastComm === 'undefined') cstate.lastComm = new Date(1970, 0, 1, 0, 0, 0, 0).getTime();
@@ -40,8 +41,8 @@ export class ChlorinatorStateMessage {
                     // We have not talked to the chlorinator in 30 seconds so we have lost communication.
                     cstate.status = 128;
                 }
-                chlor = sys.chlorinators.getItemById(msg.dest, true);
-                chlor.address = msg.dest + 79; // Theoretically, this will always be 80.
+                // chlor = sys.chlorinators.getItemById(msg.dest - 79, true); chlor is retrieved above; don't get in incorrectly here.
+                chlor.address = msg.dest; // Theoretically, this will always be 80.
                 if (typeof chlor.isActive === 'undefined') cstate.isActive = chlor.isActive = true;
             }
             else {
@@ -68,7 +69,7 @@ export class ChlorinatorStateMessage {
                     // This is the model number of the chlorinator and the address is actually the second byte.
                     let name = msg.extractPayloadString(1, 16);
                     if (typeof chlor.name === 'undefined' || chlor.name === '') chlor.name = cstate.name = name;
-                    if (typeof chlor.model === 'undefined') chlor.model = sys.board.valueMaps.chlorinatorModel.getValue(name.toLowerCase());
+                    if (typeof chlor.model === 'undefined' || chlor.model === 0) chlor.model = sys.board.valueMaps.chlorinatorModel.getValue(name.toLowerCase());
                     cstate.isActive = chlor.isActive;
                     state.emitEquipmentChanges();
                     break;
@@ -136,8 +137,8 @@ export class ChlorinatorStateMessage {
                         // Set it back to disabled.  Some asshole is futzing with the chlorinator output.
                         sys.board.chlorinator.setChlorAsync({ id: chlor.id, disabled: true });
                     }
-                    if (sys.controllerType === ControllerType.Virtual) {
-                        // This lets the iChlor use the temp probe from the 
+                    if (sys.controllerType === ControllerType.Nixie) {
+                        // This lets the current body use the iChlor temp probe 
                         let tbody: BodyTempState = sys.pumps.length > 0 ? state.temps.bodies.getBodyIsOn() : state.temps.bodies.getItemById(1, true);
                         if (msg.extractPayloadByte(2) >= 40 && typeof tbody !== 'undefined') tbody.temp = msg.extractPayloadByte(2);
                     }

package/controller/comms/messages/status/EquipmentStateMessage.ts

@@ -1,5 +1,6 @@
 /*  nodejs-poolController.  An application to control pool equipment.
-Copyright (C) 2016, 2017, 2018, 2019, 2020.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
+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
@@ -16,6 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 import { IntelliCenterBoard } from 'controller/boards/IntelliCenterBoard';
 import { EasyTouchBoard } from 'controller/boards/EasyTouchBoard';
+import { IntelliTouchBoard } from 'controller/boards/IntelliTouchBoard';
+import { SunTouchBoard } from "controller/boards/SunTouchBoard";
 
 import { logger } from '../../../../logger/Logger';
 import { ControllerType } from '../../../Constants';
@@ -59,23 +62,29 @@ export class EquipmentStateMessage {
             case 3:
             case 4:
             case 5:
+                logger.info(`Found IntelliTouch Controller`);
                 sys.controllerType = ControllerType.IntelliTouch;
                 model1 = msg.extractPayloadByte(28);
                 model2 = msg.extractPayloadByte(9);
+                (sys.board as IntelliTouchBoard).initExpansionModules(model1, model2);
                 break;
             case 11:
-                sys.controllerType = ControllerType.IntelliCom;
+                logger.info(`Found SunTouch Controller`);
+                sys.controllerType = ControllerType.SunTouch;
+                (sys.board as SunTouchBoard).initExpansionModules(model1, model2);
                 break;
             case 13:
             case 14:
+                logger.info(`Found EasyTouch Controller`);
                 sys.controllerType = ControllerType.EasyTouch;
+                (sys.board as EasyTouchBoard).initExpansionModules(model1, model2);
                 break;
             default:
                 logger.error(`Unknown Touch Controller ${msg.extractPayloadByte(28)}:${msg.extractPayloadByte(27)}`);
                 break;
         }
-        let board = sys.board as EasyTouchBoard;
-        board.initExpansionModules(model1, model2);
+        //let board = sys.board as EasyTouchBoard;
+        //board.initExpansionModules(model1, model2);
     }
     private static initController(msg: Inbound) {
         state.status = 1;
@@ -83,7 +92,16 @@ export class EquipmentStateMessage {
         const model2 = msg.extractPayloadByte(28);
         // RKS: 06-15-20 -- While this works for now the way we are detecting seems a bit dubious.  First, the 2 status message
         // contains two model bytes.  Right now the ones witness in the wild include 23 = fw1.023, 40 = fw1.040, 47 = fw1.047.
-        if (model2 === 0 && (model1 === 23 || model1 >= 40)) {
+        // RKS: 07-21-22 -- Pentair is about to release fw1.232.  Unfortunately, the byte mapping for this has changed such that
+        // the bytes [27,28] are [0,2] respectively.  This looks like it might be in conflict with IntelliTouch but it is not.  Below
+        // are the combinations of 27,28 we have seen for IntelliTouch
+        // [1,0] = i5+3
+        // [0,1] = i7+3
+        // [1,3] = i5+3s
+        // [1,4] = i9+3s
+        // [1,5] = i10+3d
+        if ((model2 === 0 && (model1 === 23 || model1 >= 40)) ||
+            (model2 === 2 && model1 == 0)) {
             state.equipment.controllerType = 'intellicenter';
             sys.board.modulesAcquired = false;
             sys.controllerType = ControllerType.IntelliCenter;
@@ -92,7 +110,6 @@ export class EquipmentStateMessage {
         }
         else {
             EquipmentStateMessage.initTouch(msg);
-            logger.info(`Found Controller Board ${state.equipment.model}`);
             sys.board.needsConfigChanges = true;
             setTimeout(function () { sys.checkConfiguration(); }, 300);
         }
@@ -165,7 +182,12 @@ export class EquipmentStateMessage {
 
                     // RSG - added 7/8/2020
                     // Every 30 mins, check the timezone and adjust DST settings
-                    if (dt.getMinutes() % 30 === 0) sys.board.system.setTZ();
+                    if (dt.getMinutes() % 30 === 0) {
+                        sys.board.system.setTZ();
+                        sys.board.schedules.updateSunriseSunsetAsync().then((updated: boolean)=>{
+                            if (updated) {logger.debug(`Sunrise/sunset times updated on schedules.`);}
+                        });
+                    }
                     // Check and update clock when it is off by >5 mins (just for a small buffer) and:
                     // 1. IntelliCenter has "manual" time set (Internet will automatically adjust) and autoAdjustDST is enabled
                     // 2. *Touch is "manual" (only option) and autoAdjustDST is enabled - (same as #1)
@@ -374,13 +396,15 @@ export class EquipmentStateMessage {
                                     // the primary is a heatpump and the secondary is gas.  In the case of gas + solar or gas + heatpump
                                     // the gas heater is the primary and solar or heatpump is the secondary.   So we need to dance a little bit
                                     // here.  We do this by checking the heater options.
-
-                                    // This can be the only heater solar cannot be installed with this.
-                                    let byte = msg.extractPayloadByte(10);
-                                    // Either the primary, secondary, or both is engaged.
-                                    if ((byte & 0x14) === 0x14) heatStatus = sys.board.valueMaps.heatStatus.getValue('dual');
-                                    else if (byte & 0x10) heatStatus = sys.board.valueMaps.heatStatus.getValue('heater');
-                                    else if (byte & 0x04) heatStatus = sys.board.valueMaps.heatStatus.getValue('hpheat');
+                                    if (tbody.heatMode > 0) { // Turns out that ET sometimes reports the last heat status when off.
+                                        // This can be the only heater solar cannot be installed with this.
+                                        let byte = msg.extractPayloadByte(10);
+                                        // Either the primary, secondary, or both is engaged.
+                                        if ((byte & 0x14) === 0x14) heatStatus = sys.board.valueMaps.heatStatus.getValue('dual');
+                                        // else if ((byte & 0x0c) === 0x0c) heatStatus = sys.board.valueMaps.heatStatus.getValue('off'); // don't need since we test for heatMode>0
+                                        else if (byte & 0x10) heatStatus = sys.board.valueMaps.heatStatus.getValue('heater');
+                                        else if (byte & 0x04) heatStatus = sys.board.valueMaps.heatStatus.getValue('hpheat');
+                                    }
                                 }
                                 else {
                                     //const heaterActive = (msg.extractPayloadByte(10) & 0x0C) === 12;
@@ -414,11 +438,13 @@ export class EquipmentStateMessage {
                             if (tbody.isOn) {
                                 if (tbody.heaterOptions.hybrid > 0) {
                                     // This can be the only heater solar cannot be installed with this.
-                                    let byte = msg.extractPayloadByte(10);
-                                    // Either the primary, secondary, or both is engaged.
-                                    if ((byte & 0x28) === 0x28) heatStatus = sys.board.valueMaps.heatStatus.getValue('dual');
-                                    else if (byte & 0x20) heatStatus = sys.board.valueMaps.heatStatus.getValue('heater');
-                                    else if (byte & 0x08) heatStatus = sys.board.valueMaps.heatStatus.getValue('hpheat');
+                                    if (tbody.heatMode > 0) {
+                                        let byte = msg.extractPayloadByte(10);
+                                        // Either the primary, secondary, or both is engaged.
+                                        if ((byte & 0x28) === 0x28) heatStatus = sys.board.valueMaps.heatStatus.getValue('dual');
+                                        else if (byte & 0x20) heatStatus = sys.board.valueMaps.heatStatus.getValue('heater');
+                                        else if (byte & 0x08) heatStatus = sys.board.valueMaps.heatStatus.getValue('hpheat');
+                                    }
                                 }
                                 else {
                                     //const heaterActive = (msg.extractPayloadByte(10) & 0x0C) === 12;
@@ -453,6 +479,18 @@ export class EquipmentStateMessage {
                                 sys.board.heaters.syncHeaterStates();
                                 break;
                             }
+                        case ControllerType.SunTouch:
+                            EquipmentStateMessage.processSunTouchCircuits(msg);
+                            sys.board.circuits.syncCircuitRelayStates();
+                            sys.board.features.syncGroupStates();
+                            sys.board.circuits.syncVirtualCircuitStates();
+                            sys.board.valves.syncValveStates();
+                            sys.board.filters.syncFilterStates();
+                            state.emitControllerChange();
+                            state.emitEquipmentChanges();
+                            sys.board.heaters.syncHeaterStates();
+                            sys.board.schedules.syncScheduleStates();
+                            break;
                         case ControllerType.EasyTouch:
                         case ControllerType.IntelliCom:
                         case ControllerType.IntelliTouch:
@@ -513,7 +551,9 @@ export class EquipmentStateMessage {
                 state.temps.waterSensor1 = msg.extractPayloadByte(0);
                 state.temps.air = msg.extractPayloadByte(2);
                 let solar: Heater = sys.heaters.getItemById(2);
-                if (solar.isActive) state.temps.solar = msg.extractPayloadByte(8);
+                // RKS: 05-18-22 - This is not correct the solar temp is not stored on this message.  It is always 0
+                // on an intelliTouch system with solar.
+                //if (solar.isActive) state.temps.solar = msg.extractPayloadByte(8);
                 // pool
                 let tbody: BodyTempState = state.temps.bodies.getItemById(1, true);
                 let cbody: Body = sys.bodies.getItemById(1);
@@ -645,6 +685,39 @@ export class EquipmentStateMessage {
         }
         msg.isProcessed = true;
     }
+    private static processSunTouchCircuits(msg: Inbound) {
+        // SunTouch has really twisted bit mapping for its
+        // circuit states.  Features are intertwined within the
+        // features.
+        let byte = msg.extractPayloadByte(2);
+        for (let i = 0; i < 8; i++) {
+            let id = i === 4 ? 7 : i > 5 ? i + 2 : i + 1;
+            let circ = sys.circuits.getInterfaceById(id, false, { isActive: false });
+            if (circ.isActive) {
+                let isOn = ((1 << i) & byte) > 0;
+                let cstate = state.circuits.getInterfaceById(id, circ.isActive);
+                if (isOn !== cstate.isOn) {
+                    sys.board.circuits.setEndTime(circ, cstate, isOn);
+                    cstate.isOn = isOn;
+                }
+            }
+        }
+        byte = msg.extractPayloadByte(3);
+        {
+            let circ = sys.circuits.getInterfaceById(10, false, { isActive: false });
+            if (circ.isActive) {
+                let isOn = (byte & 1) > 0;
+                let cstate = state.circuits.getInterfaceById(circ.id, circ.isActive);
+                if (isOn !== cstate.isOn) {
+                    sys.board.circuits.setEndTime(circ, cstate, isOn);
+                    cstate.isOn = isOn;
+                }
+            }
+        }
+        state.emitEquipmentChanges();
+        msg.isProcessed = true;
+    }
+
     private static processTouchCircuits(msg: Inbound) {
         let circuitId = 1;
         let maxCircuitId = sys.board.equipmentIds.features.end;

package/controller/comms/messages/status/HeaterStateMessage.ts

@@ -1,5 +1,6 @@
 /*  nodejs-poolController.  An application to control pool equipment.
-Copyright (C) 2016, 2017, 2018, 2019, 2020.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
+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
@@ -57,10 +58,28 @@ export class HeaterStateMessage {
         let heater: Heater = sys.heaters.getItemByAddress(msg.source);
         let sheater = state.heaters.getItemById(heater.id);
         sheater.isOn = msg.extractPayloadByte(0) > 0;
-
-        let byte = msg.extractPayloadByte(2);
-        //sheater.isOn = byte >= 1;
-        //sheater.isCooling = byte === 2;
+        if (heater.master > 0) {
+            let sbody = sheater.bodyId > 0 ? state.temps.bodies.getItemById(sheater.bodyId) : undefined;
+            if (typeof sbody !== 'undefined') {
+                switch (msg.extractPayloadByte(1)) {
+                    case 1:
+                        sbody.heatStatus = sys.board.valueMaps.heatStatus.getValue('hpheat');
+                        break;
+                    case 2:
+                        sbody.heatStatus = sys.board.valueMaps.heatStatus.getValue('heater');
+                        break;
+                    case 3:
+                        sbody.heatStatus = sys.board.valueMaps.heatStatus.getValue('dual');
+                        break;
+                    case 4:
+                        sbody.heatStatus = sys.board.valueMaps.heatStatus.getValue('dual');
+                        break;
+                    default:
+                        sbody.heatStatus = sys.board.valueMaps.heatStatus.getValue('off');
+                        break;
+                }
+            }
+        }
         sheater.commStatus = 0;
         state.equipment.messages.removeItemByCode(`heater:${heater.id}:comms`);
         msg.isProcessed = true;

package/controller/comms/messages/status/IntelliChemStateMessage.ts

@@ -1,5 +1,6 @@
 /*  nodejs-poolController.  An application to control pool equipment.
-Copyright (C) 2016, 2017, 2018, 2019, 2020.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
+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
@@ -26,7 +27,9 @@ export class IntelliChemStateMessage {
         let address = (msg.dest >= 144 && msg.dest <= 158) ? msg.dest : msg.source;
         if (address < 144 || address > 158) return;
         let controller = sys.chemControllers.getItemByAddress(address);
-        if (!controller.isActive) {
+        // RKS: 07-13-22 Lets just assume that SunTouch doesn't report its IntelliChem at this point.  The action 40 return
+        // does not contain the IntelliChem bit when it is returned for this controller.
+        if (!controller.isActive && sys.controllerType !== ControllerType.SunTouch) {
             msg.isProcessed = true;
             return;
         }
@@ -272,7 +275,7 @@ export class IntelliChemStateMessage {
                         temps.waterSensor2 = schem.ph.probe.temperature;
                     }
                 }
-                sys.board.system.setTempsAsync(temps).catch(err => logger.error(err))
+                sys.board.system.setTempsAsync(temps).catch(err => logger.error(`Error setting temp compensation for IntelliChem State: ${err.message}`))
             }
         }
         schem.ph.pump.isDosing = schem.ph.dosingStatus === 0 && chem.ph.enabled;
@@ -297,7 +300,7 @@ export class IntelliChemStateMessage {
             schem.ph.appendDose(schem.ph.doseVolume - phPrev.vol, (schem.ph.timeDosed - phPrev.time) * 1000);
         }
         else {
-            console.log(`DOSING STATUS === ${schem.ph.dosingStatus}`);
+            //console.log(`DOSING STATUS === ${schem.ph.dosingStatus}`);
             // Make sure we don't have a current dose going.
             schem.ph.currentDose = undefined;
         }

package/controller/comms/messages/status/IntelliValveStateMessage.ts

@@ -1,5 +1,6 @@
 /*  nodejs-poolController.  An application to control pool equipment.
-Copyright (C) 2016, 2017, 2018, 2019, 2020.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
+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