nodejs-poolcontroller 7.7.0 → 8.0.1

package/controller/comms/messages/config/CircuitMessage.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
@@ -18,12 +19,13 @@ import { Inbound } from "../Messages";
 import { sys, Body, Circuit, ICircuit } from "../../../Equipment";
 import { state, BodyTempState } from "../../../State";
 import { logger } from "../../../../logger/Logger";
+import { ControllerType } from "../../../Constants";
 
 export class CircuitMessage {
     public static processTouch(msg: Inbound): void {
         switch (msg.action) {
             case 11: // IntelliTouch Circuits
-                CircuitMessage.processCircuitAttributes(msg);
+                sys.controllerType === ControllerType.SunTouch ? CircuitMessage.processSunTouchCircuit(msg) : CircuitMessage.processCircuitAttributes(msg);
                 break;
             case 39: // IntelliTouch Light Groups
             case 167:
@@ -153,7 +155,13 @@ export class CircuitMessage {
             let circuit: Circuit = sys.circuits.getItemById(circuitId++, true);
 
             // For some odd reason the circuit type for circuit 6 does not equal pool while circuit 1 does equal spa.
-            circuit.type = circuitId - 1 !== 6 ? msg.extractPayloadByte(i) : 12;
+            // Apparently in later versions, spa does not do this either
+            if (circuit.id === 1)
+                circuit.type = 13
+            else if (circuit.id == 6)
+                circuit.type = 12
+            else
+                circuit.type = msg.extractPayloadByte(i);
             circuit.isActive = true;
             circuit.master = 0;
         }
@@ -175,7 +183,8 @@ export class CircuitMessage {
         let maxCircuitId = sys.board.equipmentIds.circuits.end;
         for (let i = circuitId + 1; i < msg.payload.length && circuitId <= maxCircuitId; i++) {
             let circuit: Circuit = sys.circuits.getItemById(circuitId++, true);
-            circuit.showInFeatures = msg.extractPayloadByte(i) > 0;
+            let cstate = state.circuits.getItemById(circuit.id, true);
+            cstate.showInFeatures = circuit.showInFeatures = msg.extractPayloadByte(i) > 0;
         }
         msg.isProcessed = true;
     }
@@ -230,7 +239,49 @@ export class CircuitMessage {
         }
         msg.isProcessed = true;
     }
-
+    // SunTouch
+    private static processSunTouchCircuit(msg: Inbound) {
+        let id = msg.extractPayloadByte(0);
+        // We need to remap the SunTouch circuits because the features start with 5.
+        // SunTouch bit mapping for circuits and features
+        // Bit  Mask Circuit/Feature id msg
+        // 1 = 0x01  Spa             1  1
+        // 2 = 0x02  Aux 1           2  2
+        // 3 = 0x04  Aux 2           3  3
+        // 4 = 0x08  Aux 3           4  4
+        // 5 = 0x10  Feature 1       7  5 
+        // 6 = 0x20  Pool            6  6
+        // 7 = 0x40  Feature 2       8  7
+        // 8 = 0x80  Feature 3       9  8
+        // 9 = 0x01  Feature 4       10 9
+        if ([5, 7, 8, 9].includes(id)) {
+            id = id === 5 ? 7 : id + 1;
+            let feat = sys.features.getItemById(id, true);
+            let fstate = state.features.getItemById(id, true);
+            fstate.isActive = feat.isActive = true;
+            feat.master = 0;
+            fstate.nameId = feat.nameId = msg.extractPayloadByte(2);
+            fstate.type = feat.type = msg.extractPayloadByte(1) & 63;
+            feat.freeze = (msg.extractPayloadByte(1) & 64) > 0;
+            feat.showInFeatures = fstate.showInFeatures = typeof feat.showInFeatures === 'undefined' ? true : feat.showInFeatures;
+            if (typeof feat.eggTimer === 'undefined' || feat.eggTimer === 0) feat.eggTimer = 720;
+            if (typeof feat.dontStop === 'undefined') feat.dontStop = feat.eggTimer === 1620;
+            if (typeof feat.name === 'undefined') feat.name = fstate.name = sys.board.valueMaps.circuitNames.transform(feat.nameId).desc;
+        }
+        else if ([1, 2, 3, 4, 6].includes(id)) {
+            let circ = sys.circuits.getItemById(id, true);
+            let cstate = state.circuits.getItemById(id, true);
+            cstate.isActive = circ.isActive = true;
+            circ.master = 0;
+            cstate.nameId = circ.nameId = msg.extractPayloadByte(2);
+            cstate.type = circ.type = msg.extractPayloadByte(1) & 63;
+            circ.freeze = (msg.extractPayloadByte(1) & 64) > 0;
+            circ.showInFeatures = cstate.showInFeatures = typeof circ.showInFeatures === 'undefined' ? true : circ.showInFeatures;
+            if (typeof circ.eggTimer === 'undefined' || circ.eggTimer === 0) circ.eggTimer = 720;
+            if (typeof circ.dontStop === 'undefined') circ.dontStop = circ.eggTimer === 1620;
+            if (typeof circ.name === 'undefined') circ.name = cstate.name = sys.board.valueMaps.circuitNames.transform(circ.nameId).desc;
+        }
+    }
     // Intellitouch
     private static processCircuitAttributes(msg: Inbound) {
         // Sample packet
@@ -238,7 +289,7 @@ export class CircuitMessage {
         const id = msg.extractPayloadByte(0);
         const functionId = msg.extractPayloadByte(1);
         const nameId = msg.extractPayloadByte(2);
-        let _isActive = functionId !== sys.board.valueMaps.circuitFunctions.getValue('notused') && nameId !== 0;
+        let _isActive = functionId !== sys.board.valueMaps.circuitFunctions.getValue('notused') && (nameId !== 0 || sys.controllerType === ControllerType.SunTouch);
         if (!sys.board.equipmentIds.invalidIds.isValidId(id)) { _isActive = false; }
         if (_isActive) {
             const type = functionId & 63;
@@ -272,14 +323,14 @@ export class CircuitMessage {
                     case 6: // pool
                         body = sys.bodies.getItemById(1, sys.equipment.maxBodies > 0);
                         sbody = state.temps.bodies.getItemById(1, sys.equipment.maxBodies > 0);
-                        sbody.name = body.name = "Pool";
+                        if (typeof body.name === 'undefined') sbody.name = body.name = "Pool";
                         sbody.type = body.type = 0; // RKS: The body types were backwards here but correct everywhere else e.g. PumpMessage.
                         circuit.type === 2 ? body.isActive = true : body.isActive = false;
                         break;
                     case 1: // spa
                         body = sys.bodies.getItemById(2, sys.equipment.maxBodies > 1);
-                        sbody = state.temps.bodies.getItemById(1, sys.equipment.maxBodies > 1);
-                        sbody.name = body.name = "Spa";
+                        sbody = state.temps.bodies.getItemById(2, sys.equipment.maxBodies > 1);
+                        if(typeof body.name === 'undefined') sbody.name = body.name = "Spa";
                         sbody.type = body.type = 1;
                         // process bodies - there might be a better place to do this but without other comparison packets from pools with expansion packs it is hard to determine
                         // also, if we get this far spa should always be active.  not sure if would ever not be active if we are here.
@@ -303,11 +354,28 @@ export class CircuitMessage {
                 sys.lightGroups.removeItemById(sys.board.equipmentIds.circuitGroups.start);
                 state.lightGroups.removeItemById(sys.board.equipmentIds.circuitGroups.start);
             }
-            sys.features.removeItemById(id);
-            state.features.removeItemById(id);
-            sys.circuits.removeItemById(id);
-            state.circuits.removeItemById(id);
+            if (!sys.board.equipmentIds.circuits.isInRange(id)) {
+                sys.circuits.removeItemById(id);
+                state.circuits.removeItemById(id);
+            }
+            else {
+                let circuit = sys.circuits.getItemById(id, true);
+                let cstate = sys.circuits.getItemById(id, true);
+                cstate.showInFeatures = circuit.showInFeatures = false;
+                cstate.type = circuit.type = functionId & 63;
+                cstate.name = circuit.name = sys.board.circuits.getNameById(nameId || id);
+                cstate.nameId = circuit.nameId = nameId || id;
+                cstate.isActive = circuit.isActive = true;
+            }
+            if (!sys.board.equipmentIds.features.isInRange(id)) {
+                sys.features.removeItemById(id);
+                state.features.removeItemById(id);
+            }
             sys.circuitGroups.removeItemById(id);
+            //sys.features.removeItemById(id);
+            //state.features.removeItemById(id);
+            //sys.circuits.removeItemById(id);
+            //state.circuits.removeItemById(id);
         }
         msg.isProcessed = true;
     }

package/controller/comms/messages/config/ConfigMessage.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
@@ -103,6 +104,7 @@ export class ConfigMessage {
                 }
                 break;
             case ControllerType.EasyTouch:
+            case ControllerType.SunTouch:
             case ControllerType.IntelliCom:
             case ControllerType.IntelliTouch:
                 // switch (msg.action) { }

package/controller/comms/messages/config/CoverMessage.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/CustomNameMessage.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/EquipmentMessage.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
@@ -131,7 +132,9 @@ export class EquipmentMessage {
                             sys.bodies.removeItemById(bodyId);
                             state.temps.bodies.removeItemById(bodyId);
                         }
+                        state.equipment.single = sys.equipment.single = sys.equipment.shared == false && sys.equipment.dual === false;
                         state.equipment.shared = sys.equipment.shared;
+                        state.equipment.dual = sys.equipment.dual;
                         state.equipment.model = sys.equipment.model;
                         state.equipment.controllerType = sys.controllerType;
                         state.equipment.maxBodies = sys.equipment.maxBodies;
@@ -149,6 +152,7 @@ export class EquipmentMessage {
             case ControllerType.IntelliCom:
             case ControllerType.EasyTouch:
             case ControllerType.IntelliTouch:
+            case ControllerType.SunTouch:
                 switch (msg.action) {
                     case 252:
                         EquipmentMessage.processSoftwareVersion(msg);

package/controller/comms/messages/config/ExternalMessage.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,7 +17,7 @@ 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 } from "../../../State";
+import { state, ICircuitGroupState, LightGroupState, CircuitGroupState } from "../../../State";
 import { Timestamp, utils } from "../../../Constants";
 import { logger } from "../../../../logger/Logger";
 export class ExternalMessage {
@@ -208,6 +209,7 @@ export class ExternalMessage {
                             sgroup = state.circuitGroups.getItemById(groupId, true);
                             sgroup.type = group.type = type;
                             if (typeof group.showInFeatures === 'undefined') group.showInFeatures = sgroup.showInFeatures = true;
+                            sgroup.showInFeatures = group.showInFeatures;
                             sys.lightGroups.removeItemById(groupId);
                             state.lightGroups.removeItemById(groupId);
                             sgroup.isActive = group.isActive = true;
@@ -274,6 +276,8 @@ export class ExternalMessage {
     private static processHeater(msg: Inbound) {
         // So a user is changing the heater info.  Lets
         // hijack it and get it ourselves.
+        // Installing hybrid heater.
+        //[165, 63, 15, 16, 168, 30][10, 0, 2, 5, 32, 5, 6, 3, 0, 6, 112, 72, 121, 98, 114, 105, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 1][4, 230]
         let isActive = msg.extractPayloadByte(3) !== 0;
         let heaterId = msg.extractPayloadByte(2) + 1;
         if (isActive) {
@@ -406,6 +410,7 @@ export class ExternalMessage {
             for (let j = 0; j < 8; j++) {
                 let group = sys.circuitGroups.getInterfaceById(groupId);
                 let gstate = group.type === 1 ? state.lightGroups.getItemById(groupId, group.isActive) : state.circuitGroups.getItemById(groupId, group.isActive);
+          
                 if (group.isActive !== false) {
                     let isOn = ((byte & (1 << (j))) >> j) > 0;
                     sys.board.circuits.setEndTime(group, gstate, isOn);
@@ -442,6 +447,9 @@ export class ExternalMessage {
                                 break;
                         }
                     }
+                    else if(gstate.dataName === 'circuitGroup') {
+                        (gstate as CircuitGroupState).showInFeatures  = group.showInFeatures;
+                    }
                 }
                 else {
                     state.circuitGroups.removeItemById(groupId);
@@ -850,7 +858,7 @@ export class ExternalMessage {
                 // chlorinator.  These should be 0 anyway.
                 schlor.poolSetpoint = chlor.spaSetpoint = msg.extractPayloadByte(0) >> 1;
                 schlor.spaSetpoint = chlor.poolSetpoint = msg.extractPayloadByte(1);
-                chlor.address = chlor.id + 79;
+                if (typeof chlor.address === 'undefined') chlor.address = 80; // chlor.id + 79;
                 schlor.body = chlor.body = sys.equipment.maxBodies >= 1 || sys.equipment.shared === true ? 32 : 0;
             }
             schlor.superChlor = chlor.superChlor = msg.extractPayloadByte(2) - 128 > 0;
@@ -868,4 +876,26 @@ export class ExternalMessage {
             state.chlorinators.removeItemById(1);
         }
     }
+    public static processTouchSetHeatMode(msg: Inbound) {
+        // We get here because some other controller is setting the heat
+        // mode.  The OCP will emit an 8 later but it can be very slow
+        // in doing this. ScreenLogic also captures this message so it
+        // doesn't get behind.
+        //[165, 1, 16, 34, 136, 4][86, 100, 3, 0][2, 33]
+        //payload: [temp1, temp2, mode2 << 2 | mode1, setPoint],
+        let bstate1 = state.temps.bodies.getItemById(1);
+        let bstate2 = state.temps.bodies.getItemById(2);
+        let body1 = sys.bodies.getItemById(1);
+        let body2 = sys.bodies.getItemById(2);
+        let mode1 = msg.extractPayloadByte(2) & 0x03;
+        let mode2 = (msg.extractPayloadByte(2) & 0x0C) >> 2;
+        bstate1.setPoint = body1.heatSetpoint = msg.extractPayloadByte(0);
+        bstate1.coolSetpoint = body1.coolSetpoint = msg.extractPayloadByte(3);
+        bstate2.setPoint = body2.heatSetpoint = msg.extractPayloadByte(1);
+        bstate1.heatMode = body1.heatMode = mode1;
+        bstate2.heatMode = body2.heatMode = mode2;
+        msg.isProcessed = true;
+        state.emitEquipmentChanges();
+
+    }
 }

package/controller/comms/messages/config/FeatureMessage.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/GeneralMessage.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/HeaterMessage.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
@@ -63,6 +64,7 @@ export class HeaterMessage {
                 break;
             case ControllerType.IntelliTouch:
             case ControllerType.EasyTouch:
+            case ControllerType.SunTouch:
                 HeaterMessage.processIntelliTouch(msg);
                 break;
         }

package/controller/comms/messages/config/IntellichemMessage.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/OptionsMessage.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
@@ -25,6 +26,7 @@ export class OptionsMessage {
                 OptionsMessage.processIntelliCenter(msg);
                 break;
             case ControllerType.IntelliCom:
+            case ControllerType.SunTouch:
             case ControllerType.EasyTouch:
             case ControllerType.IntelliTouch:
                 OptionsMessage.processIntelliTouch(msg);
@@ -123,16 +125,18 @@ export class OptionsMessage {
                 // 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 <= 3; i++) {
+                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];
+                    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;
@@ -157,9 +161,11 @@ export class OptionsMessage {
                     
                 }
                 else {
-                    let chem = sys.chemControllers.getItemByAddress(144);
-                    state.chemControllers.removeItemById(chem.id);
-                    sys.chemControllers.removeItemById(chem.id);
+                    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;

package/controller/comms/messages/config/PumpMessage.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
@@ -25,6 +26,7 @@ export class PumpMessage {
             case ControllerType.IntelliCenter:
                 PumpMessage.processIntelliCenterPump(msg);
                 break;
+            case ControllerType.SunTouch:
             case ControllerType.IntelliCom:
             case ControllerType.EasyTouch:
             case ControllerType.IntelliTouch:
@@ -330,9 +332,8 @@ export class PumpMessage {
         // 18   | 3   | Big endian speed for the speed (1000 rpm with byte(28))
         // 19   | 0   | Circuit speed #8 = No circuit
         // 20   | 3   | Big endian speed for the speed (1000 rpm with byte(29))
-        // 21   | 3   | Big eniand speed for the priming speed (1000 rpm with byte(30))
+        // 21   | 3   | Big endian speed for the priming speed (1000 rpm with byte(30))
         // All 30 bytes on this message are accounted for except for byte 3 & 4.
-
         if (typeof pump.model === 'undefined') pump.model = 0;
         for (let circuitId = 1; circuitId <= sys.board.valueMaps.pumpTypes.get(pump.type).maxCircuits; circuitId++) {
             let _circuit = msg.extractPayloadByte(circuitId * 2 + 3); 
@@ -391,7 +392,8 @@ export class PumpMessage {
     }
     private static processVSF_IT(msg: Inbound) {
         // Sample packet
-        // [255, 0, 255], [165, 33, 15, 16, 27, 46], [2, 64, 0, 0, 2, 1, 33, 2, 4, 0, 30, 0, 30, 0, 30, 0, 30, 0, 30, 0, 30, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [2, 94]
+        //[255, 0, 255][165, 33, 15, 16, 27, 46][2, 64, 0, 0, 2, 1, 33, 2, 4, 0, 30, 0, 30, 0, 30, 0, 30, 0, 30, 0, 30, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [2, 94]
+        //[255, 0, 255][165,  1, 15, 16, 24, 31][1, 64, 0, 0, 0, 6, 5, 2, 8, 1, 11, 7, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 220, 152, 184, 122, 0, 0, 0, 0, 0][4, 24]
         const pumpId = msg.extractPayloadByte(0);
         const pump = sys.pumps.getItemById(pumpId);
         if (typeof pump.model === 'undefined') pump.model = 0;
@@ -400,14 +402,9 @@ export class PumpMessage {
             if (_circuit !== 0){
                 const circuit: PumpCircuit = pump.circuits.getItemById(circuitId, true);
                 circuit.circuit = _circuit;
-                circuit.units =
-                (msg.extractPayloadByte(4) >> circuitId - 1 & 1) === 0 ? 1 : 0;
-                if (circuit.units)
-                circuit.flow = msg.extractPayloadByte(circuitId * 2 + 4);
-                else
-                circuit.speed =
-                msg.extractPayloadByte(circuitId * 2 + 4) * 256 +
-                msg.extractPayloadByte(circuitId + 21);
+                circuit.units = (msg.extractPayloadByte(4) >> circuitId - 1 & 1) === 0 ? 1 : 0;
+                if (circuit.units) circuit.flow = msg.extractPayloadByte(circuitId * 2 + 4);
+                else circuit.speed = msg.extractPayloadByte(circuitId * 2 + 4) * 256 + msg.extractPayloadByte(circuitId + 21);
             }
             else {
                 pump.circuits.removeItemById(_circuit);

package/controller/comms/messages/config/RemoteMessage.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
@@ -15,7 +16,8 @@ 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, Remote} from "../../../Equipment";
+import { sys, Remote } from "../../../Equipment";
+import { state } from "../../../State";
 import {ControllerType} from "../../../Constants";
 export class RemoteMessage {
     private static maxCircuits: number=8;
@@ -58,7 +60,7 @@ export class RemoteMessage {
     public static processRemote_IT(msg: Inbound) {
         /*      process Spa-side remotes
                     for is4  [165,33,16,34,33,11],[id,button1,button2,button3,button4,5,6,7,8,9,10],[chkh,chkl]
-                    for is10:[165,33,16,34,323,11],[id,button1,button2,button3,button4,btn5,btn1bot,btn2bot,btn3bot,btn4bot,btn5bot],[chkh,chkl]
+                    for is10:[165,33,16,34,32,11],[id,button1,button2,button3,button4,btn5,btn1bot,btn2bot,btn3bot,btn4bot,btn5bot],[chkh,chkl]
                     [255, 0, 255], [165, 33, 15, 16, 32, 11], [0, 1, 5, 18, 13, 5, 6, 7, 8, 9, 10], [1, 98]
                     [255, 0, 255], [165, 33, 15, 16, 32, 11], [1, 8, 2, 7, 7, 5, 8, 9, 8, 9, 3], [1, 83]
                     for quicktouch:
@@ -73,17 +75,29 @@ export class RemoteMessage {
                     Note: For systems with four iS10/SpaCommand remotes, adding one or two iS4 remotes will affect button function assignments as follows: Assigned button functions 1 - 4 on iS4 #1 are linked with the same functions to buttons 1 - 4 (top row) of iS10 #4. Also, buttons 1 - 4 on iS4 #2 are linked to buttons 6 - 10 (bottom row) of iS10 #4. For example, button 6 on the bottom row of iS10 #4 is linked to button 1 of iS4 #2, button 7 on iS10 #4 is linked to button 2 of iS4 #2, etc.
 
                     Not sure how packets will come through with 6 controllers on it.
+                    
+                    // RSG 1.6.23 - Per Screenlogic Config, the IS10#4 shares the bytes with IS4#1/IS4#2.
+                    //  Byte 1 - IS10#1-1  IS4#1-1
+                    //  Byte 2 - IS10#1-2  IS4#1-2
+                    //  Byte 3 - IS10#1-3  IS4#1-3
+                    //  Byte 4 - IS10#1-4  IS4#1-4
+                    //  Byte 5 - IS10#1-5  
+                    //  Byte 6 - IS10#1-6  IS4#2-1
+                    //  Byte 7 - IS10#1-7  IS4#2-2
+                    //  Byte 8 - IS10#1-8  IS4#2-3
+                    //  Byte 9 - IS10#1-9  IS4#2-4
+                    //  Byte 10 - IS10#1-10  
 
                     Fixing ID's for lack of having better info.
-                    0-3 = is10
-                    4-5 = is4
-                    6 = QuickTouch
-                    7 = Spa Command (can multiple be present?  are these tied to is10?)
+                    1-4 = is10
+                    5-6 = is4 
+                    7 = QuickTouch
+                    8 = Spa Command
                     */
         switch (msg.action) {
             case 33: // quicktouch
                 {
-                    const remoteId = 6; // what determines 2nd is4?
+                    const remoteId = 7; // what determines 2nd is4?
                     const remote: Remote = sys.remotes.getItemById(remoteId, true);
                     remote.type = remoteId;
                     remote.button1 = msg.extractPayloadByte(0);
@@ -129,16 +143,69 @@ export class RemoteMessage {
                     // sample packet from EasyTouch
                     // [165,33,16,34,150,16],[0,1,7,8,0,2,250,10,1,144,13,122,15,130,0,0],[4,93]
                     // note: spa command may be tied to an already present is10.  Need to clarify.
-                    const remoteId = 7;
-                    const remote: Remote = sys.remotes.getItemById(remoteId, true);
-                    remote.pumpId = msg.extractPayloadByte(5);
-                    remote.stepSize = msg.extractPayloadByte(6);
-                    remote.type = 7;
+                    //const remoteId = 8;
+                    //const remote: Remote = sys.remotes.getItemById(remoteId, true);
+                    //remote.pumpId = msg.extractPayloadByte(5);
+                    //remote.stepSize = msg.extractPayloadByte(6);
+                    //remote.type = 8;
+                    RemoteMessage.processIntelliFlo4(msg);
                     msg.isProcessed = true;
                     break;
                 }
         }
     }
+    private static processIntelliFlo4(msg: Inbound) {
+        // RKS: 12-1-22 This message is a message that has been mis-interpreted for quite some time
+        // it appears that early versions of EasyTouch did not include the ability to add more than one pump and only 4 potential
+        // circuits could be set.  This comes as 3 bytes per pump setting.  If there are no circuits assigned then the pump is not installed.
+        let isActive = (msg.extractPayloadByte(1, 0) + msg.extractPayloadByte(4, 0) + msg.extractPayloadByte(7, 0) + msg.extractPayloadByte(10, 0)) > 0;
+        let pump = sys.pumps.find(x => x.address === 96 && (x.master || 0) === 0);
+        if (!isActive) {
+            if (typeof pump !== 'undefined') {
+                let spump = state.pumps.getItemById(pump.id, false);
+                spump.address = 96;
+                spump.isActive = false;
+                sys.pumps.removeItemById(pump.id);
+                state.pumps.removeItemById(pump.id);
+                spump.emitEquipmentChange();
+            }
+        }
+        else {
+            if (typeof pump === 'undefined') pump = sys.pumps.getPumpByAddress(96, true,
+                {
+                    id: sys.pumps.getNextEquipmentId(),
+                    master: 0,
+                    address: 96,
+                    type: 128,
+                    name: `Pump${sys.pumps.length + 1}`,
+                    flowStepSize: 1,
+                    primingTime: 0,
+                    primingSpeed: 450,
+                    minSpeed: 450,
+                    maxSpeed: 3450
+                }
+            );
+            let spump = state.pumps.getItemById(pump.id, true);
+            spump.name = pump.name;
+            spump.address = pump.address = 96;
+            spump.type = pump.type = 128;
+            pump.isActive = spump.isActive = true;
+            // Set the circuits on the pump.
+            let cid = 0;
+            for (let i = 1; i <= 10; i += 3) {
+                let circuitId = msg.extractPayloadByte(i, 0);
+                if (circuitId > 0) {
+                    cid++;
+                    let circ = pump.circuits.getItemById(cid, true);
+                    circ.circuit = circuitId;
+                    circ.speed = (msg.extractPayloadByte(i + 1, 0) * 256) + msg.extractPayloadByte(i + 2, 0);
+                    circ.units = 0;
+                }
+            }
+            if (cid < 4) for (let i = 4; i > cid && i > 0; i--) pump.circuits.removeItemById(i);
+            spump.emitEquipmentChange();
+        }
+    }
     private static processRemoteType(msg: Inbound) {
         let remoteId = 1;
         for (let i = 28; i < msg.payload.length && remoteId <= sys.equipment.maxRemotes; i++) {