nodejs-poolcontroller 7.3.0 → 7.6.0

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

@@ -107,6 +107,7 @@ export class HeaterMessage {
                             catch (err) { logger.error(`Error with OCP reclaiming control over gas heater: ${err}`) }
                         })();
                     }
+                    heater.master = 0;
                     sys.heaters.getItemById(2).isActive = false;
                     sys.heaters.getItemById(3).isActive = false;
                     sys.heaters.getItemById(4).isActive = false;
@@ -133,6 +134,7 @@ export class HeaterMessage {
                             catch (err) { logger.error(`Error with OCP reclaiming control over Ultratemp: ${err}`) }
                         })();
                     }
+                    heatPump.master = 0;
                     heatPump.name = 'Ultratemp';
                     heatPump.body = 32;
                     heatPump.type = 4;
@@ -158,6 +160,7 @@ export class HeaterMessage {
                             catch (err) { logger.error(`Error with OCP reclaiming control over heat pump: ${err}`) }
                         })();
                     }
+                    heatPump.master = 0;
                     heatPump.name = 'Heat Pump';
                     heatPump.body = 32;
                     heatPump.type = 3;
@@ -184,6 +187,7 @@ export class HeaterMessage {
                             catch (err) { logger.error(`Error with OCP reclaiming control over solar heater: ${err}`) }
                         })();
                     }
+                    solar.master = 0;
                     solar.name = 'Solar Heater';
                     solar.type = 2;
                     solar.isActive = true;
@@ -215,13 +219,7 @@ export class HeaterMessage {
                 }
                 sys.board.heaters.syncHeaterStates();
                 sys.equipment.setEquipmentIds();
-                break;
-            case 114:
-                // something to do with heat pumps... need equipment or other packets to decipher
-                // [ 255, 0, 255], [165, 0, 112, 16, 114, 10], [144, 2, 0, 0, 0, 0, 0, 0, 0, 0], [2, 51 ]heat + cool
-                // [165,0,112,16,114,10][144,0,0,0,0,0,0,0,0,0][2,49] == no Heater, no cool
-                // [165,0,112,16,114,10][144,2,0,0,0,0,0,0,0,0][2,51] == no heat, cooling
-                // this might be heatStatus not heatMode?
+                msg.isProcessed = true;
                 break;
             case 168:
                 {
@@ -241,7 +239,7 @@ export class HeaterMessage {
                     }
                     // Spa Manual Heat on/off
                     sys.general.options.manualHeat = msg.extractPayloadByte(4) === 1 ? true : false;
-
+                    msg.isProcessed = true;
                 }
         }
     }
@@ -261,6 +259,7 @@ export class HeaterMessage {
                 })();
             }
         }
+        msg.isProcessed = true;
     }
 
     //private static processBody(msg: Inbound) {
@@ -293,6 +292,7 @@ export class HeaterMessage {
                         catch (err) { logger.error(`Error with OCP reclaiming control over heater: ${err}`) }
                     })();
                 }
+                heater.master = 0;
                 let hstate = state.heaters.getItemById(i);
                 // hstate.isVirtual = false;
                 hstate.name = heater.name;
@@ -300,12 +300,14 @@ export class HeaterMessage {
 
         }
         sys.board.heaters.updateHeaterServices();
+        msg.isProcessed = true;
     }
     private static processMaxBoostTemp(msg: Inbound) {
         for (let i = 0; i < msg.payload.length - 1 && i < sys.equipment.maxHeaters; i++) {
             var heater: Heater = sys.heaters.getItemById(i + 1);
             heater.maxBoostTemp = msg.extractPayloadByte(i + 2);
         }
+        msg.isProcessed = true;
     }
     private static processStartStopDelta(msg: Inbound) {
         for (let i = 1; i < msg.payload.length - 1 && i <= sys.equipment.maxHeaters; i++) {
@@ -313,6 +315,7 @@ export class HeaterMessage {
             heater.startTempDelta = msg.extractPayloadByte(i + 1);
             heater.stopTempDelta = msg.extractPayloadByte(i + 18);
         }
+        msg.isProcessed = true;
     }
     private static processCoolingSetTemp(msg: Inbound) {
         for (let i = 1; i < msg.payload.length - 1 && i <= sys.equipment.maxHeaters; i++) {
@@ -320,20 +323,22 @@ export class HeaterMessage {
             heater.coolingEnabled = msg.extractPayloadByte(i + 1) > 0;
             heater.differentialTemp = msg.extractPayloadByte(i + 18);
         }
+        msg.isProcessed = true;
     }
     private static processAddress(msg: Inbound) {
         for (let i = 1; i < msg.payload.length - 1 && i <= sys.equipment.maxHeaters; i++) {
             var heater: Heater = sys.heaters.getItemById(i);
             heater.address = msg.extractPayloadByte(i + 1);
         }
+        msg.isProcessed = true;
     }
     private static processEfficiencyMode(msg: Inbound) {
         for (let i = 1; i < msg.payload.length - 1 && i <= sys.equipment.maxHeaters; i++) {
             var heater: Heater = sys.heaters.getItemById(i);
             heater.efficiencyMode = msg.extractPayloadByte(i + 1);
         }
+        msg.isProcessed = true;
     }
-
     private static processHeaterNames(msg: Inbound) {
         var heaterId = ((msg.extractPayloadByte(1) - 5) * 2) + 1;
         if (heaterId <= sys.equipment.maxHeaters) {
@@ -344,5 +349,6 @@ export class HeaterMessage {
             let hstate = state.heaters.getItemById(heaterId);
             hstate.name = sys.heaters.getItemById(heaterId++).name = msg.extractPayloadString(18, 16);
         }
+        msg.isProcessed = true;
     }
 }

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

@@ -138,7 +138,8 @@ export class IntellichemMessage {
                         let controller = sys.chemControllers.getItemById(id, isActive, { id: i + 1, type: 1 });
                         let scontroller = state.chemControllers.getItemById(controller.id, isActive);
                         scontroller.isActive = controller.isActive = true;
-                        controller.isVirtual = false;
+                        // controller.isVirtual = false;
+                        controller.master = 0;
                         if (!controller.isActive) {
                             sys.chemControllers.removeItemById(controller.id);
                             state.chemControllers.removeItemById(controller.id);
@@ -163,6 +164,7 @@ export class IntellichemMessage {
                         }
                     }
                 }
+                msg.isProcessed = true;
                 break;
             case 1:
                 for (let i = 0; i < 4; i++) {
@@ -175,6 +177,7 @@ export class IntellichemMessage {
                         controller.alkalinity = msg.extractPayloadInt((i * 2) + 26);
                     }
                 }
+                msg.isProcessed = true;
                 break;
         }
     }

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

@@ -92,9 +92,21 @@ export class OptionsMessage {
                             //body = sys.bodies.getItemById(4, sys.equipment.maxBodies > 3);
                             //body.heatMode = msg.extractPayloadByte(27);
                             //body.heatSetpoint = msg.extractPayloadByte(23);
+                            msg.isProcessed = true;
                             break;
                         }
-                    case 1: // Unknown
+                    case 1: // Vacation mode
+                        let yy = msg.extractPayloadByte(4) + 2000;
+                        let mm = msg.extractPayloadByte(5);
+                        let dd = msg.extractPayloadByte(6);
+                        sys.general.options.vacation.startDate = new Date(yy, mm - 1, dd);
+                        yy = msg.extractPayloadByte(7) + 2000;
+                        mm = msg.extractPayloadByte(8);
+                        dd = msg.extractPayloadByte(9);
+                        sys.general.options.vacation.endDate = new Date(yy, mm - 1, dd);
+                        sys.general.options.vacation.enabled = msg.extractPayloadByte(2) > 0;
+                        sys.general.options.vacation.useTimeframe = msg.extractPayloadByte(3) > 0;
+                        msg.isProcessed = true;
                         break;
                 }
                 msg.isProcessed = true;

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

@@ -132,8 +132,10 @@ export class PumpMessage {
                 }
             }
         }
+        msg.isProcessed = true;
         switch (msgId) {
             case 0:
+                msg.isProcessed = true;
                 break;
             case 1:
                 PumpMessage.processFlowStepSize(msg);
@@ -347,38 +349,20 @@ export class PumpMessage {
                 circuit.circuit = _circuit;
                 circuit.flow = msg.extractPayloadByte(circuitId * 2 + 4);
                 circuit.units = 1;
-                switch (circuit.circuit) {
-                    case 1:
-                        {
-                            let body = sys.bodies.getItemById(2, sys.equipment.maxBodies >= 2);
-                            let sbody = state.temps.bodies.getItemById(2, sys.equipment.maxBodies >= 2);
-                            sbody.type = body.type = 1; // spa
-                            body.isActive = true;
-                            break;
-                        }
-                    case 6:
-                        {
-                            let body = sys.bodies.getItemById(1, sys.equipment.maxBodies >= 1);
-                            let sbody = state.temps.bodies.getItemById(1, sys.equipment.maxBodies >= 1);
-                            sbody.type = body.type = 0; // pool
-                            body.isActive = true;
-                            body.capacity = msg.extractPayloadByte(6) * 1000;
-                            break;
-                        }
-                }
             }
             else {
                 pump.circuits.removeItemById(_circuit);
             }
         }
         pump.backgroundCircuit = msg.extractPayloadByte(1);
+        pump.filterSize = msg.extractPayloadByte(2) * 1000;
         pump.turnovers = msg.extractPayloadByte(3);
+        pump.manualFilterGPM = msg.extractPayloadByte(21);
         pump.primingSpeed = msg.extractPayloadByte(22);
         pump.primingTime = (msg.extractPayloadByte(23) & 0xf);
         pump.minFlow = sys.board.valueMaps.pumpTypes.get(pump.type).minFlow;
         pump.maxFlow = sys.board.valueMaps.pumpTypes.get(pump.type).maxFlow;
         pump.flowStepSize = sys.board.valueMaps.pumpTypes.get(pump.type).flowStepSize;
-        pump.manualFilterGPM = msg.extractPayloadByte(21);
         pump.maxSystemTime = msg.extractPayloadByte(23) >> 4;
         pump.maxPressureIncrease = msg.extractPayloadByte(24);
         pump.backwashFlow = msg.extractPayloadByte(25);

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

@@ -93,6 +93,7 @@ export class RemoteMessage {
                     if (!remote.button1 && !remote.button2 && !remote.button3 && !remote.button4) remote.isActive = false;
                     else remote.isActive = true;
                     remote.name = "QuickTouch";
+                    msg.isProcessed = true;
                     break;
                 }
             case 32: // is4/is10
@@ -120,6 +121,7 @@ export class RemoteMessage {
                         remote.type = 1;
                         remote.name = "is4";
                     }
+                    msg.isProcessed = true;
                     break;
                 }
             case 22: // Spa Command spa side remote additional config
@@ -132,6 +134,7 @@ export class RemoteMessage {
                     remote.pumpId = msg.extractPayloadByte(5);
                     remote.stepSize = msg.extractPayloadByte(6);
                     remote.type = 7;
+                    msg.isProcessed = true;
                     break;
                 }
         }
@@ -187,5 +190,6 @@ export class RemoteMessage {
             }
             remote["button" + (i + 1)] = msg.extractPayloadByte(i + 2);
         }
+        msg.isProcessed = true;
     }
 }

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

@@ -187,6 +187,7 @@ export class ScheduleMessage {
             const schedule: Schedule = sys.schedules.getItemById(schedId++, false, { isActive: false });
             if (schedule.isActive !== false) schedule.startMonth = msg.extractPayloadByte(i + 1);
         }
+        msg.isProcessed = true;
     }
     private static processStartDay(msg: Inbound) {
         let schedId = (msg.extractPayloadByte(1) - 17) * 40 + 1;
@@ -198,6 +199,7 @@ export class ScheduleMessage {
                 csched.startTime = schedule.startTime;
             }
         }
+        msg.isProcessed = true;
     }
     private static processStartYear(msg: Inbound) {
         let schedId = (msg.extractPayloadByte(1) - 20) * 40 + 1;
@@ -207,6 +209,7 @@ export class ScheduleMessage {
                 schedule.startYear = msg.extractPayloadByte(i + 1);
             }
         }
+        msg.isProcessed = true;
     }
     private static processStartTimes(msg: Inbound) {
         let schedId = msg.extractPayloadByte(1) * 20 + 1;
@@ -226,6 +229,7 @@ export class ScheduleMessage {
             i += 2;
         }
         ScheduleMessage._maxSchedId = sys.schedules.getMaxId(true, 0);
+        msg.isProcessed = true;
     }
     private static processEndTimes(msg: Inbound) {
         let schedId = (msg.extractPayloadByte(1) - 23) * 20 + 1;
@@ -239,6 +243,7 @@ export class ScheduleMessage {
             }
             i += 2;
         }
+        msg.isProcessed = true;
     }
     private static processCircuit(msg: Inbound) {
         let schedId = (msg.extractPayloadByte(1) - 5) * 40 + 1;
@@ -258,6 +263,7 @@ export class ScheduleMessage {
                     csched.circuit = schedule.circuit;
             }
         }
+        msg.isProcessed = true;
     }
     private static processRunOnce(msg: Inbound) {
         let schedId = (msg.extractPayloadByte(1) - 8) * 40 + 1;
@@ -280,6 +286,7 @@ export class ScheduleMessage {
                 csched.scheduleType = schedule.scheduleType;
             }
         }
+        msg.isProcessed = true;
     }
     private static processDays(msg: Inbound) {
         let schedId = (msg.extractPayloadByte(1) - 11) * 40 + 1;
@@ -291,6 +298,7 @@ export class ScheduleMessage {
                 csched.scheduleDays = csched.scheduleType === 128 ? schedule.scheduleDays : 0;
             }
         }
+        msg.isProcessed = true;
     }
     private static processHeatSource(msg: Inbound) {
         let schedId = (msg.extractPayloadByte(1) - 28) * 40 + 1;
@@ -305,6 +313,7 @@ export class ScheduleMessage {
                 csched.heatSource = schedule.heatSource;
             }
         }
+        msg.isProcessed = true;
     }
     private static processHeatSetpoint(msg: Inbound) {
         let schedId = (msg.extractPayloadByte(1) - 31) * 40 + 1;
@@ -316,6 +325,7 @@ export class ScheduleMessage {
                 csched.heatSetpoint = schedule.heatSetpoint;
             }
         }
+        msg.isProcessed = true;
     }
     private static processCoolSetpoint(msg: Inbound) {
         let schedId = (msg.extractPayloadByte(1) - 34) * 40 + 1;
@@ -327,5 +337,6 @@ export class ScheduleMessage {
                 csched.coolSetpoint = schedule.coolSetpoint;
             }
         }
+        msg.isProcessed = true;
     }
 }

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

@@ -34,5 +34,6 @@ export class SecurityMessage {
             role.flag2 = msg.extractPayloadByte(3);
             role.pin = msg.extractPayloadByte(21).toString() + msg.extractPayloadByte(22).toString() + msg.extractPayloadByte(23).toString() + msg.extractPayloadByte(24).toString();
         }
+        msg.isProcessed = true;
     }
 }

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

@@ -32,6 +32,7 @@ export class ValveMessage {
                         ValveMessage.processValveNames(msg);
                         break;
                     case 3: // Skip the secondary intake/return
+                        msg.isProcessed = true;
                         break;
                     case 4:
                     case 5:
@@ -70,6 +71,7 @@ export class ValveMessage {
         // [165,33,15,16,35,2],[132,0],[1,142]
         //                      ^^^ 128 = Pump off during valve operation
         sys.general.options.pumpDelay = msg.extractPayloadByte(0) >> 7 === 1;
+        msg.isProcessed = true;
     }
     private static process_ValveAssignment_IT(msg: Inbound) {
         // sample packet
@@ -91,6 +93,7 @@ export class ValveMessage {
                     let svalve = state.valves.getItemById(id, true);
                     svalve.name = valve.name;
                     svalve.type = valve.type;
+                    valve.master = 0;
                 }
                 else {
                     sys.valves.removeItemById(id);
@@ -110,6 +113,7 @@ export class ValveMessage {
                     let svalve = state.valves.getItemById(id, true);
                     svalve.name = valve.name;
                     svalve.type = valve.type;
+                    valve.master = 0;
                 }
                 else {
                     sys.valves.removeItemById(id);
@@ -136,17 +140,20 @@ export class ValveMessage {
                 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.isVirtual = false;
+                valve.master = 0;
+                // valve.isVirtual = false;
                 valve.type = 0;
             }
             id++;
         }
+        msg.isProcessed = true;
     }
     private static getName(id: number, cir: number) {
         if (cir <= 0 || cir >= 255 || cir === 6) {
@@ -167,7 +174,7 @@ export class ValveMessage {
         // for i10d.
         let ndx: number = 2;
         let id = 1;
-        for (let i = 0; i < sys.equipment.maxValves - 1; i++) {
+        for (let i = 0; i < sys.equipment.maxValves; i++) {
             if (id === 3 && !sys.equipment.shared) {
                 // The intake/return valves are skipped for non-shared systems.
                 sys.valves.removeItemById(3);
@@ -187,7 +194,8 @@ export class ValveMessage {
                 ndx += 2;
             }
             let valve: Valve = sys.valves.getItemById(id, true);
-            valve.isVirtual = false;
+            valve.master = 0;
+            // valve.isVirtual = false;
             if (id === 3 || id === 5) {
                 valve.circuit = 247; // Hardcode the intake/return to pool/spa;
                 valve.isIntake = true;
@@ -214,6 +222,7 @@ export class ValveMessage {
         }
         // Sort them so they are in valve id order.  This will ensure any OCP valves come first in the list.  Valves ids > 50 are virtual valves.
         sys.valves.sortById();
+        msg.isProcessed = true;
     }
     private static processValveNames(msg: Inbound) {
         let byte = msg.extractPayloadByte(1);
@@ -228,5 +237,6 @@ export class ValveMessage {
         if (typeof sys.valves.find(elem => elem.id === valveId) !== 'undefined') {
             state.valves.getItemById(valveId).name = sys.valves.getItemById(valveId++).name = msg.extractPayloadString(18, 16);
         }
+        msg.isProcessed = true;
     }
 }

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

@@ -64,9 +64,8 @@ export class ChlorinatorStateMessage {
                     //[16, 2, 0, 3][0, 73, 110, 116, 101, 108, 108, 105, 99, 104, 108, 111, 114, 45, 45, 52, 48][188, 16, 3]
                     // This is the model number of the chlorinator and the address is actually the second byte.
                     let name = msg.extractPayloadString(1, 16);
-                    chlor.model = name;
-                    if (typeof chlor.name === 'undefined' || chlor.name === '') chlor.name = name;
-                    cstate.name = chlor.name;
+                    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()); 
                     cstate.isActive = chlor.isActive;
                     state.emitEquipmentChanges();
                     break;

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

@@ -101,7 +101,9 @@ export class EquipmentStateMessage {
         Message.headerSubByte = msg.header[1];
         //console.log(process.memoryUsage());
         if (msg.action === 2 && state.isInitialized && sys.controllerType === ControllerType.Nixie) {
-            // Start over because we didn't have communication before but we now do.
+            // Start over because we didn't have communication before but we now do.  This will fall into the if
+            // below so that it goes through the intialization process.  In this case we didn't see an OCP when we started
+            // but there clearly is one now.
             sys.controllerType = ControllerType.Unknown;
             state.status = 0;
         }
@@ -139,19 +141,24 @@ export class EquipmentStateMessage {
 
                     // Shared
                     let dt = new Date();
-                    if (state.chemControllers.length > 0) {
-                        // TODO: move this to chemController when we understand the packets better
-                        for (let i = 0; i < state.chemControllers.length; i++) {
-                            let ccontroller = state.chemControllers.getItemByIndex(i);
-                            if (sys.board.valueMaps.chemControllerTypes.getName(ccontroller.type) === 'intellichem') {
-                                if (dt.getTime() - ccontroller.lastComm > 60000) ccontroller.status = 1;
-                            }
-                        }
-                    }
+                    // RKS: This was moved to the ChemControllerState message.  This is flawed in that it incorrectly sets IntelliChem to no comms.
+                    //if (state.chemControllers.length > 0) {
+                    //    // TODO: move this to chemController when we understand the packets better
+                    //    for (let i = 0; i < state.chemControllers.length; i++) {
+                    //        let ccontroller = state.chemControllers.getItemByIndex(i);
+                    //        if (sys.board.valueMaps.chemControllerTypes.getName(ccontroller.type) === 'intellichem') {
+                    //            if (dt.getTime() - ccontroller.lastComm > 60000) ccontroller.status = 1;
+                    //        }
+                    //    }
+                    //}
                     state.time.hours = msg.extractPayloadByte(0);
                     state.time.minutes = msg.extractPayloadByte(1);
                     state.time.seconds = dt.getSeconds();
-                    state.mode = msg.extractPayloadByte(9) & 0x81;
+                    state.mode = sys.controllerType !== ControllerType.IntelliCenter ? (msg.extractPayloadByte(9) & 0x81) : (msg.extractPayloadByte(9) & 0x01);
+
+                    // RKS: The units have been normalized for English and Metric for the overall panel.  It is important that the val numbers match for at least the temp units since
+                    // the only unit of measure native to the Touch controllers is temperature they chose to name these C or F.  However, with the njsPC extensions this is non-semantic
+                    // since pressure, volume, and length have been introduced.
                     sys.general.options.units = state.temps.units = msg.extractPayloadByte(9) & 0x04;
                     state.valve = msg.extractPayloadByte(10);
 
@@ -163,8 +170,8 @@ export class EquipmentStateMessage {
                     // 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)
                     // 3. clock source is "server" isn't an OCP option but can be enabled on the clients 
-                    if (dt.getMinutes() % 5 === 0 && sys.general.options.clockSource === 'server') {
-                        if ((Math.abs(dt.getTime() - state.time.getTime()) > 60 * 5 * 1000) && !state.time.isUpdating) {
+                    if (dt.getMinutes() % 5 === 0 && dt.getSeconds() <= 10 && sys.general.options.clockSource === 'server') {
+                        if ((Math.abs(dt.getTime() - state.time.getTime()) > 60 * 2 * 1000) && !state.time.isUpdating) {
                             state.time.isUpdating = true;
                             sys.board.system.setDateTimeAsync({ dt, dst: sys.general.options.adjustDST || 0, })
                                 .then(() => {
@@ -197,10 +204,19 @@ export class EquipmentStateMessage {
                             tbody.name = cbody.name;
                             tbody.circuit = cbody.circuit = 6;
                             tbody.heatStatus = msg.extractPayloadByte(11) & 0x0F;
-                            if ((msg.extractPayloadByte(2) & 0x20) === 32) {
+                            // With the IntelliCenter i10D, bit 6 is not reliable.  It is not set properly and requires the 204 message
+                            // to process the data.
+                            if (!sys.equipment.dual) {
+                                if ((msg.extractPayloadByte(2) & 0x20) === 32) {
+                                    tbody.temp = state.temps.waterSensor1;
+                                    tbody.isOn = true;
+                                } else tbody.isOn = false;
+                            }
+                            else if (state.circuits.getItemById(6).isOn === true) {
                                 tbody.temp = state.temps.waterSensor1;
                                 tbody.isOn = true;
-                            } else tbody.isOn = false;
+                            }
+                            else tbody.isOn = false;
                         }
                         if (sys.bodies.length > 1) {
                             const tbody: BodyTempState = state.temps.bodies.getItemById(2, true);
@@ -210,10 +226,16 @@ export class EquipmentStateMessage {
                             tbody.name = cbody.name;
                             tbody.circuit = cbody.circuit = 1;
                             tbody.heatStatus = (msg.extractPayloadByte(11) & 0xF0) >> 4;
-                            if ((msg.extractPayloadByte(2) & 0x01) === 1) {
+                            if (!sys.equipment.dual) {
+                                if ((msg.extractPayloadByte(2) & 0x01) === 1) {
+                                    tbody.temp = sys.equipment.shared ? state.temps.waterSensor1 : state.temps.waterSensor2;
+                                    tbody.isOn = true;
+                                } else tbody.isOn = false;
+                            } else if (state.circuits.getItemById(1).isOn === true) {
                                 tbody.temp = sys.equipment.shared ? state.temps.waterSensor1 : state.temps.waterSensor2;
                                 tbody.isOn = true;
-                            } else tbody.isOn = false;
+                            }
+                            else tbody.isOn = false;
                         }
                         if (sys.bodies.length > 2) {
                             state.temps.waterSensor3 = fnTempFromByte(msg.extractPayloadByte(20));
@@ -390,13 +412,14 @@ export class EquipmentStateMessage {
                                 sys.board.circuits.syncCircuitRelayStates();
                                 sys.board.circuits.syncVirtualCircuitStates();
                                 sys.board.valves.syncValveStates();
+                                sys.board.filters.syncFilterStates();
                                 state.emitControllerChange();
                                 state.emitEquipmentChanges();
                                 sys.board.heaters.syncHeaterStates();
                                 break;
                             }
-                        case ControllerType.IntelliCom:
                         case ControllerType.EasyTouch:
+                        case ControllerType.IntelliCom:
                         case ControllerType.IntelliTouch:
                             {
                                 EquipmentStateMessage.processTouchCircuits(msg);
@@ -405,6 +428,7 @@ export class EquipmentStateMessage {
                                 sys.board.features.syncGroupStates();
                                 sys.board.circuits.syncVirtualCircuitStates();
                                 sys.board.valves.syncValveStates();
+                                sys.board.filters.syncFilterStates();
                                 state.emitControllerChange();
                                 state.emitEquipmentChanges();
                                 sys.board.heaters.syncHeaterStates();
@@ -495,8 +519,7 @@ export class EquipmentStateMessage {
                 state.time.date = msg.extractPayloadByte(6);
                 state.time.month = msg.extractPayloadByte(7);
                 state.time.year = msg.extractPayloadByte(8);
-                sys.equipment.controllerFirmware = (msg.extractPayloadByte(42)
-                    + (msg.extractPayloadByte(43) / 1000)).toString();
+                sys.equipment.controllerFirmware = (msg.extractPayloadByte(42) + (msg.extractPayloadByte(43) / 1000)).toString();
                 if (sys.chlorinators.length > 0) {
                     if (msg.extractPayloadByte(37, 255) !== 255) {
                         const chlor = state.chlorinators.getItemById(1);
@@ -508,9 +531,38 @@ export class EquipmentStateMessage {
                     }
                 }
                 ExternalMessage.processFeatureState(9, msg);
+                //if (sys.equipment.dual === true) {
+                //    // For IntelliCenter i10D the body state is on byte 26 of the 204.  This impacts circuit 6.
+                //    let byte = msg.extractPayloadByte(26);
+                //    let pstate = state.circuits.getItemById(6, true);
+                //    let oldstate = pstate.isOn;
+                //    pstate.isOn = ((byte & 0x0010) === 0x0010);
+                //    logger.info(`Checking i10D pool state ${byte} old:${oldstate} new: ${pstate.isOn}`);
+                //    //if (oldstate !== pstate.isOn) {
+                //        state.temps.bodies.getItemById(1, true).isOn = pstate.isOn;
+                //        sys.board.circuits.syncCircuitRelayStates();
+                //        sys.board.circuits.syncVirtualCircuitStates();
+                //        sys.board.valves.syncValveStates();
+                //        sys.board.filters.syncFilterStates();
+                //        sys.board.heaters.syncHeaterStates();
+                //    //}
+                //    if (oldstate !== pstate.isOn) pstate.emitEquipmentChange();
+                //}
+                // At this point normally on is ignored.  Not sure what this does.
+                let cover1 = sys.covers.getItemById(1);
+                let cover2 = sys.covers.getItemById(2);
+                if (cover1.isActive) {
+                    let scover1 = state.covers.getItemById(1, true);
+                    scover1.name = cover1.name;
+                    state.temps.bodies.getItemById(cover1.body + 1).isCovered = scover1.isClosed = (msg.extractPayloadByte(30) & 0x0001) > 0;
+                }
+                if (cover2.isActive) {
+                    let scover2 = state.covers.getItemById(2, true);
+                    scover2.name = cover2.name;
+                    state.temps.bodies.getItemById(cover2.body + 1).isCovered = scover2.isClosed = (msg.extractPayloadByte(30) & 0x0002) > 0;
+                }
                 msg.isProcessed = true;
-                // state.emitControllerChange();
-                // state.emitEquipmentChanges();
+                state.emitEquipmentChanges();
                 break;
         }
     }
@@ -528,13 +580,15 @@ export class EquipmentStateMessage {
                 let circuit = sys.circuits.getItemById(circuitId, false, { isActive: false });
                 if (circuit.isActive !== false) {
                     let cstate = state.circuits.getItemById(circuitId, circuit.isActive);
-                    let isOn = (byte & (1 << j)) > 0;
-                    sys.board.circuits.setEndTime(circuit, cstate, isOn);
+                    // For IntelliCenter i10D body circuits are not reported here.
+                    let isOn = ((circuitId === 6 || circuitId === 1) && sys.equipment.dual === true) ? cstate.isOn : (byte & (1 << j)) > 0;
+                    //let isOn = (byte & (1 << j)) > 0;
                     cstate.isOn = isOn;
                     cstate.name = circuit.name;
                     cstate.nameId = circuit.nameId;
                     cstate.showInFeatures = circuit.showInFeatures;
                     cstate.type = circuit.type;
+                    sys.board.circuits.setEndTime(circuit, cstate, isOn);
                     if (sys.controllerType === ControllerType.IntelliCenter) {
                         // intellitouch sends a separate msg with themes
                         switch (circuit.type) {