nodejs-poolcontroller 7.6.1 → 8.0.0

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,7 +64,9 @@ export class HeaterMessage {
                 break;
             case ControllerType.IntelliTouch:
             case ControllerType.EasyTouch:
+            case ControllerType.SunTouch:
                 HeaterMessage.processIntelliTouch(msg);
+                break;
         }
     }
     private static processIntelliTouch(msg: Inbound) {
@@ -71,8 +74,22 @@ export class HeaterMessage {
         // Gas heater setup in EquipmentStateMessage upon *Touch discovery
         switch (msg.action) {
             // 1 = gas heater, 2 = solar, 3 = heat pump
-            case 34:
-            case 162:
+            case 34:   // Somebody requested the configuration
+            case 162:  // Somebody set the configuration
+                // Release any heaters that are tied to Nixie that should not be.
+                for (let i = sys.heaters.length - 1; i >= 0; i--) {
+                    let heater = sys.heaters.getItemByIndex(i);
+                    if (heater.id <= 4 && heater.master === 1) {
+                        // Return the heater control back to Touch
+                        (async function () {
+                            try {
+                                await ncp.heaters.deleteHeaterAsync(heater.id);
+                                logger.debug(`${heater.name} control returned to OCP.`);
+                            }
+                            catch (err) { logger.error(`Error with OCP reclaiming control over gas ${heater.name}: ${err}`) }
+                        })();
+                    }
+                }
                 // byte 0
                 // 21 = solar or heat pump disabled
                 // 23 = solar or heat pump enabled
@@ -94,6 +111,121 @@ export class HeaterMessage {
                 //             on/off (16) = solar as a heat pump
                 // bits 7,8 = stop temp delta
 
+
+
+                // Determine what type of heater should be in id number 1.  If this is a hybrid heater
+                // we will be installing it in id 1 although it will perform dual purpose.
+                let hasHeater = (msg.extractPayloadByte(0) & 0x01) === 0x01 || true;
+                let hasSolar = (msg.extractPayloadByte(0) & 0x02) === 0x02;
+                let hasHeatpump = (msg.extractPayloadByte(1) & 0x20) === 0x20;
+                let hasHybrid = !hasHeatpump && (msg.extractPayloadByte(1) & 0x10) === 0x10;
+
+                // Ok so it appears that the heater ids are as follows.
+                // 1 = Gas Heater
+                // 2 = Solar
+                // 3 = UltraTemp (HEATPUMPCOM)
+                // 4 = UltraTemp ETi (Hybrid)
+                // If an UltraTemp ETi is installed, no other heaters can be installed so they should be removed.  This is not
+                // an available option for IntelliTouch i10D so it does not apply to it.
+                if (!hasHeater) {
+                    sys.heaters.removeItemById(1);
+                    state.heaters.removeItemById(1);
+                    sys.heaters.removeItemById(2);
+                    state.heaters.removeItemById(2);
+                    sys.heaters.removeItemById(3);
+                    state.heaters.removeItemById(3);
+                    sys.heaters.removeItemById(4);
+                    state.heaters.removeItemById(4);
+                }
+                else {
+                    if (hasHybrid) {
+                        sys.heaters.removeItemById(1);
+                        state.heaters.removeItemById(1);
+                        sys.heaters.removeItemById(2);
+                        state.heaters.removeItemById(2);
+                        sys.heaters.removeItemById(3);
+                        state.heaters.removeItemById(3);
+                        let hybrid = sys.heaters.getItemById(4, true);
+                        let shybrid = state.heaters.getItemById(4, true);
+                        // [5, { name: 'hybrid', desc: 'Hybrid', hasAddress: true }],
+                        shybrid.type = hybrid.type = 5;
+                        hybrid.address = 112; // Touch only supports address 1.
+                        hybrid.isActive = true;
+                        hybrid.master = 0;
+                        hybrid.body = sys.equipment.shared ? 32 : 0;
+                        if (typeof hybrid.name === 'undefined') shybrid.name = hybrid.name = 'UltraTemp ETi';
+                        // The following 2 values need to come from somewhere.
+                        if (typeof hybrid.economyTime === 'undefined') hybrid.economyTime = 1;
+                        if (typeof hybrid.maxBoostTemp === 'undefined') hybrid.maxBoostTemp = 5;
+                        hasHeatpump = false; // You cannot have a heatpump and a hybrid heater.
+                    }
+                    else {
+                        // Hybrid heaters and gas heaters cannot co-exist but it appears you cannot disable the gas
+                        // heater on the touch panels.
+                        sys.heaters.removeItemById(4);
+                        state.heaters.removeItemById(4);
+                        let heater = sys.heaters.getItemById(1, true);
+                        let hstate = state.heaters.getItemById(1, true);
+                        heater.body = sys.equipment.shared ? 32 : 0;
+                        // [1, { name: 'gas', desc: 'Gas Heater', hasAddress: false }],
+                        heater.type = hstate.type = 1;
+                        heater.isActive = true;
+                        heater.master = 0;
+                        if (typeof heater.name === 'undefined') heater.name = hstate.name = 'Gas Heater';
+                        if (typeof heater.cooldownDelay === 'undefined') heater.cooldownDelay = 5;
+                    }
+                    // Check to see if a heatpump is installed.  This will replace the solar heater so they cannot coexist.
+                    if (hasHeatpump) {
+                        // Remove the solar heater.  This will be replaced with the heatpump.
+                        sys.heaters.removeItemById(2);
+                        state.heaters.removeItemById(2);
+                        let heatpump = sys.heaters.getItemById(3, true);
+                        let sheatpump = state.heaters.getItemById(3, true);
+                        // [3, { name: 'heatpump', desc: 'Heat Pump', hasAddress: true, hasPreference: true }],
+                        heatpump.type = sheatpump.type = 3;
+                        heatpump.body = sys.equipment.shared ? 32 : 0;
+                        heatpump.isActive = true;
+                        heatpump.master = 0;
+
+                        if (typeof heatpump.name === 'undefined') sheatpump.name = heatpump.name = 'UltraTemp';
+                        heatpump.heatingEnabled = (msg.extractPayloadByte(1) & 0x01) === 1;
+                        heatpump.coolingEnabled = (msg.extractPayloadByte(1) & 0x02) === 2;
+                        sys.board.equipmentIds.invalidIds.add(20); // exclude Aux Extra
+                    }
+                    else if (hasSolar) {
+                        sys.heaters.removeItemById(3);
+                        state.heaters.removeItemById(3);
+                        let solar = sys.heaters.getItemById(2, true);
+                        let ssolar = sys.heaters.getItemById(2, true);
+                        // [2, { name: 'solar', desc: 'Solar Heater', hasAddress: false, hasPreference: true }],
+                        solar.type = ssolar.type = 2;
+                        solar.body = sys.equipment.shared ? 32 : 0;
+                        solar.isActive = true;
+                        solar.master = 0;
+                        if (typeof solar.name === 'undefined') solar.name = ssolar.name = 'Solar Heater';
+                        solar.freeze = (msg.extractPayloadByte(1) & 0x80) >> 7 === 1;
+                        solar.coolingEnabled = (msg.extractPayloadByte(1) & 0x20) >> 5 === 1;
+                        solar.startTempDelta = ((msg.extractPayloadByte(2) & 0xE) >> 1) + 3;
+                        solar.stopTempDelta = ((msg.extractPayloadByte(2) & 0xC0) >> 6) + 2;
+                        sys.board.equipmentIds.invalidIds.add(20); // exclude Aux Extra
+                    }
+                    else {
+                        sys.board.equipmentIds.invalidIds.remove(20); // Allow access to Aux Extra
+                    }
+                }
+                sys.board.heaters.updateHeaterServices();
+                for (let i = 0; i < sys.bodies.length; i++) {
+                    let body = sys.bodies.getItemByIndex(i);
+                    let btemp = state.temps.bodies.getItemById(body.id, body.isActive !== false);
+                    let opts = sys.board.heaters.getInstalledHeaterTypes(body.id);
+                    btemp.heaterOptions = opts;
+                }
+                sys.board.heaters.syncHeaterStates();
+                sys.equipment.setEquipmentIds();
+                msg.isProcessed = true;
+
+
+                /*
                 // gas heater only; solar/heatpump/ultratemp disabled
                 if ((msg.extractPayloadByte(0) & 0x2) === 0) {
                     let heater = sys.heaters.getItemById(1);
@@ -112,14 +244,14 @@ export class HeaterMessage {
                     sys.heaters.getItemById(3).isActive = false;
                     sys.heaters.getItemById(4).isActive = false;
                     sys.board.equipmentIds.invalidIds.remove(20); // include Aux Extra
-/*                     sys.equipment.setEquipmentIds();
-                    for (let i = 0; i < sys.bodies.length; i++) {
-                        let body = sys.bodies.getItemByIndex(i);
-                        let btemp = state.temps.bodies.getItemById(body.id, body.isActive !== false);
-                        let opts = sys.board.heaters.getInstalledHeaterTypes(body.id);
-                        btemp.heaterOptions = opts;
-                    }
-                    return; */
+                    //sys.equipment.setEquipmentIds();
+                    //for (let i = 0; i < sys.bodies.length; i++) {
+                    //    let body = sys.bodies.getItemByIndex(i);
+                    //    let btemp = state.temps.bodies.getItemById(body.id, body.isActive !== false);
+                    //    let opts = sys.board.heaters.getInstalledHeaterTypes(body.id);
+                    //    btemp.heaterOptions = opts;
+                    //}
+                    return;
                 }
                 // Ultratemp (+ cooling?); 
                 else if ((msg.extractPayloadByte(2) & 0x30) === 0x30) {
@@ -220,7 +352,9 @@ export class HeaterMessage {
                 sys.board.heaters.syncHeaterStates();
                 sys.equipment.setEquipmentIds();
                 msg.isProcessed = true;
+                */
                 break;
+
         }
     }
     private static processCooldownDelay(msg: Inbound) {

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;
@@ -145,42 +149,27 @@ export class OptionsMessage {
                 // [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);
+                    //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 {
-                    let chem = sys.chemControllers.getItemByAddress(144);
-                    state.chemControllers.removeItemById(chem.id);
-                    sys.chemControllers.removeItemById(chem.id);
-                }
-                msg.isProcessed = true;
-                break;
-            }
-            /* case 168:
-                {
-                    // IntelliChem Installed
-                    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);
                     }
-                    // Spa Manual Heat on/off
-                    sys.general.options.manualHeat = msg.extractPayloadByte(4) === 1 ? true : false;
-                    msg.isProcessed = true;
-                } */
+                }
+                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:
@@ -36,43 +38,60 @@ export class PumpMessage {
         // packet 24/27/152/155 - Pump Config: IntelliTouch
         const pumpId = msg.extractPayloadByte(0);
         let type = msg.extractPayloadByte(1);  // Avoid setting this then setting it back if we are mapping to a different value.
+        let isActive = type !== 0 && pumpId <= sys.equipment.maxPumps;
         // RKS: 04-14-21 - Only create the pump if it is available.  If the pump was previously defined as another type
         // then it will be removed and recreated.
-        let pump: Pump = sys.pumps.getItemById(pumpId, pumpId <= sys.equipment.maxPumps && type !== 0);
-        if (pump.type !== type && type !== 0) {
-            sys.pumps.removeItemById(pumpId);
-            pump = sys.pumps.getItemById(pumpId, true);
-        }
-        pump.address = pumpId + 95;
-        switch (type) {
-            case 0: // none
-                pump.type = 0;
-                pump.isActive = false;
-                break;
-            case 64: // vsf
-                pump.type = type;
-                pump.isActive = true;
-                PumpMessage.processVSF_IT(msg);
-                break;
-            case 255: // vs 3050 on old panels.
-            case 128: // vs
-            case 134: // vs Ultra Efficiency
-                pump.type = 128;
-                pump.isActive = true;
-                PumpMessage.processVS_IT(msg);
-                break;
-            case 169: // vs+svrs
-                pump.type = 169;
-                pump.isActive = true;
-                PumpMessage.processVS_IT(msg);
-                break;
-            default: // vf - type is the background circuit
-                pump.type = 1; // force to type 1?
-                pump.isActive = true;
-                PumpMessage.processVF_IT(msg);
-                break;
-        }
-        if (pump.isActive) {
+        let pump: Pump = sys.pumps.getItemById(pumpId, isActive);
+        if(isActive) {
+            // Remap the combination pump types.
+            switch (type) {
+                case 0:
+                case 64:
+                case 169:
+                    break;
+                case 255:
+                case 128:
+                case 134:
+                    type = 128;
+                    break;
+                default:
+                    type = 1;
+                    break;
+            }
+            if (pump.type !== type) {
+                sys.pumps.removeItemById(pumpId);
+                pump = sys.pumps.getItemById(pumpId, isActive);
+            }
+            pump.address = pumpId + 95;
+            pump.master = 0;
+            switch (type) {
+                case 0: // none
+                    pump.type = 0;
+                    pump.isActive = false;
+                    break;
+                case 64: // vsf
+                    pump.type = type;
+                    pump.isActive = true;
+                    PumpMessage.processVSF_IT(msg);
+                    break;
+                case 255: // vs 3050 on old panels.
+                case 128: // vs
+                case 134: // vs Ultra Efficiency
+                    pump.type = 128;
+                    pump.isActive = true;
+                    PumpMessage.processVS_IT(msg);
+                    break;
+                case 169: // vs+svrs
+                    pump.type = 169;
+                    pump.isActive = true;
+                    PumpMessage.processVS_IT(msg);
+                    break;
+                default: // vf - type is the background circuit
+                    pump.type = 1; // force to type 1?
+                    pump.isActive = true;
+                    PumpMessage.processVF_IT(msg);
+                    break;
+            }
             if (typeof pump.name === 'undefined') pump.name = sys.board.valueMaps.pumpTypes.get(pump.type).desc;
             const spump = state.pumps.getItemById(pump.id, true);
             spump.name = pump.name;
@@ -224,6 +243,7 @@ export class PumpMessage {
                 }
                 if (typeof pump.model === 'undefined') pump.model = 0;
                 pump.type = type;
+                pump.master = 0;
                 let spump = state.pumps.getItemById(pump.id, true);
                 spump.type = pump.type;
                 spump.isActive = pump.isActive = true;
@@ -312,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); 
@@ -373,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;
@@ -382,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++) {