nodejs-poolcontroller 8.0.0 → 8.0.2

package/controller/comms/ScreenLogic.ts

@@ -1,7 +1,7 @@
 import { ControllerType, Timestamp, Utils, utils } from '../../controller/Constants';
 import { LightGroup, LightGroupCircuit, sys, Valve, Body, Pump, PumpCircuit, Remote} from '../../controller/Equipment';
 import { CircuitState, state, ValveState } from '../../controller/State';
-import { SLChemData, RemoteLogin, UnitConnection, FindUnits, SLEquipmentStateData, SLIntellichlorData, SLPumpStatusData, SLScheduleData, SLSystemTimeData, HeatModes, SLControllerConfigData, SLEquipmentConfigurationData, HeaterConfig, Valves } from 'node-screenlogic';
+import { RemoteLogin, UnitConnection, FindUnits, SLEquipmentStateData, SLIntellichlorData, SLPumpStatusData, SLScheduleData, SLSystemTimeData, HeatModes, SLControllerConfigData, SLEquipmentConfigurationData, HeaterConfig, Valves, SLChemData, SLGetCustomNamesData } from 'node-screenlogic';
 import * as Screenlogic from 'node-screenlogic';
 import { EasyTouchBoard } from '../../controller/boards/EasyTouchBoard';
 import { IntelliTouchBoard } from '../../controller/boards/IntelliTouchBoard';
@@ -15,7 +15,7 @@ import { Message } from './messages/Messages';
 
 export class ScreenLogicComms {
   constructor() {
-    this._client = Screenlogic.screenlogic;
+    this._client = new Screenlogic.UnitConnection();
   };
   public a: SLChemData;
   public counter: SLCounter = new SLCounter();
@@ -47,11 +47,10 @@ export class ScreenLogicComms {
     this.controller = new SLController(this._client);
     let cfg = config.getSection('controller.comms');
     if (typeof cfg !== 'undefined') this._cfg = cfg;
-    this.enabled = this._cfg.enabled;
+    this.enabled = this._cfg.enabled && this._cfg.type === 'screenlogic';
     if (!this._cfg.enabled || this._cfg.type !== 'screenlogic') {
       return;
     }
-
     let systemName = this._cfg.screenlogic.systemName; // 'Pentair: 00-00-00';
     let password = this._cfg.screenlogic.password.toString(); // '1111';
 
@@ -766,11 +765,11 @@ class Controller {
       logger.error(`Caught error in decodeEquipmentState: ${err.message}`);
     }
   }
-  public static async decodeCustomNames(customNames: string[]) {
+  public static async decodeCustomNames(customNames: SLGetCustomNamesData) {
     for (let i = 0; i < sys.equipment.maxCustomNames; i++) {
       let data = {
         id: i,
-        name: customNames[i]
+        name: customNames.names[i]
       }
       try {
 
@@ -913,21 +912,21 @@ class Controller {
           }
         ], */
   }
-  public static decodeHighSpeed(highSpeed: number[]) {
-    let maxCircuits = sys.controllerType === ControllerType.IntelliTouch ? 8 : 4;
-    let arrCircuits = [];
-    let pump = sys.pumps.getDualSpeed(true);
-    for (let i = 0; i < maxCircuits && i < highSpeed.length; i++) {
-      let val = highSpeed[i];
-      if (val > 0) arrCircuits.push(val);
-      else pump.circuits.removeItemById(i);
-    }
-    if (arrCircuits.length > 0) {
-      let pump = sys.pumps.getDualSpeed(true);
-      for (let j = 1; j <= arrCircuits.length; j++) pump.circuits.getItemById(j, true).circuit = arrCircuits[j - 1];
-    }
-    else sys.pumps.removeItemById(10);
-  }
+    public static decodeHighSpeed(highSpeed: number[]) {
+        let maxCircuits = sys.controllerType === ControllerType.IntelliTouch ? 8 : 4;
+        let arrCircuits = [];
+        let pump = sys.pumps.find(x => { return x.master !== 1 && x.type === 65 });
+        for (let i = 0; i < maxCircuits && i < highSpeed.length; i++) {
+            let val = highSpeed[i];
+            if (val > 0) arrCircuits.push(val);
+            else if (typeof pump !== 'undefined') pump.circuits.removeItemById(i);
+        }
+        if (arrCircuits.length > 0) {
+            let pump = sys.pumps.getDualSpeed(true);
+            for (let j = 1; j <= arrCircuits.length; j++) pump.circuits.getItemById(j, true).circuit = arrCircuits[j - 1];
+        }
+        else if (typeof pump !== 'undefined') sys.pumps.removeItemById(pump.id);
+    }
   public static decodeRemote(remoteDataArray) {
     if (sys.controllerType === ControllerType.EasyTouch) {
 
@@ -1072,43 +1071,46 @@ class Controller {
       await sys.board.pumps.setPumpAsync(pData, false);
     })
   }
-  public static async decodePumpStatusAsync(id: number, slpump: SLPumpStatusData) {
-    /*   {
-        pumpCircuits: [
-          { circuitId: 6,speed: 2000,isRPMs: true, },
-          { circuitId: 8, speed:2700,isRPMs: true, },
-          { circuitId: 2,speed: 2710,isRPMs: true, },
-          { circuitId: 2,speed:1000, isRPMs: true,},
-          { circuitId: 5,speed:2830, isRPMs: true,},
-          { circuitId: 0,speed: 30,isRPMs: false,},
-          { circuitId: 0,speed: 30,isRPMs: false,},
-          { circuitId: 0,speed: 30,isRPMs: false,},
-        ],
-        pumpType: 4,
-        isRunning: false,
-        pumpWatts: 0,
-        pumpRPMs: 0,
-        pumpUnknown1: 0,
-        pumpGPMs: 0,
-        pumpUnknown2: 255,
-      }
-    */
-  
-    let pstate = state.pumps.getItemById(id);
-    pstate.watts = slpump.pumpWatts;
-    pstate.rpm = slpump.pumpRPMs;
-    pstate.flow = slpump.pumpGPMs === 255 ? 0 : slpump.pumpGPMs;
-    pstate.command = (pstate.rpm > 0 || pstate.watts > 0) ? 10 : 0;
-    state.emitEquipmentChanges();
-  }
-  public static async decodeSchedules(slrecurring: SLScheduleData[], slrunonce: SLScheduleData[]) {
+    public static async decodePumpStatusAsync(id: number, slpump: SLPumpStatusData) {
+        /*   {
+            pumpCircuits: [
+              { circuitId: 6,speed: 2000,isRPMs: true, },
+              { circuitId: 8, speed:2700,isRPMs: true, },
+              { circuitId: 2,speed: 2710,isRPMs: true, },
+              { circuitId: 2,speed:1000, isRPMs: true,},
+              { circuitId: 5,speed:2830, isRPMs: true,},
+              { circuitId: 0,speed: 30,isRPMs: false,},
+              { circuitId: 0,speed: 30,isRPMs: false,},
+              { circuitId: 0,speed: 30,isRPMs: false,},
+            ],
+            pumpType: 4,
+            isRunning: false,
+            pumpWatts: 0,
+            pumpRPMs: 0,
+            pumpUnknown1: 0,
+            pumpGPMs: 0,
+            pumpUnknown2: 255,
+          }
+        */
+        // RKS: 05-07-23 - This process of getting the pump by its id is flawed.  We need to pull this information by its address.
+        //let pstate = state.pumps.getItemById(id);
+        let pstate = state.pumps.find(x => x.address === 95 + id);
+        if (typeof pstate !== 'undefined') {
+            pstate.watts = slpump.pumpWatts;
+            pstate.rpm = slpump.pumpRPMs;
+            pstate.flow = slpump.pumpGPMs === 255 ? 0 : slpump.pumpGPMs;
+            pstate.command = (pstate.rpm > 0 || pstate.watts > 0) ? 10 : 0;
+            state.emitEquipmentChanges();
+        }
+    }
+  public static async decodeSchedules(slrecurring: SLScheduleData, slrunonce: SLScheduleData) {
     /*     reccuring schedules: [{"scheduleId":1,"circuitId":6,"startTime":"1800","stopTime":"0700","dayMask":127,"flags":0,"heatCmd":4,"heatSetPoint":70,"days":["Mon","Tue","Wed","Thu","Fri","Sat","Sun"]},
     
     {"scheduleId":4,"circuitId":2,"startTime":"1800","stopTime":"2300","dayMask":127,"flags":0,"heatCmd":0,"heatSetPoint":0,"days":["Mon","Tue","Wed","Thu","Fri","Sat","Sun"]},{"scheduleId":11,"circuitId":6,"startTime":"0800","stopTime":"1700","dayMask":127,"flags":0,"heatCmd":4,"heatSetPoint":70,"days":["Mon","Tue","Wed","Thu","Fri","Sat","Sun"]}]
     
         Run once schedules: [{"scheduleId":12,"circuitId":6,"startTime":"0800","stopTime":"1100","dayMask":1,"flags":1,"heatCmd":4,"heatSetPoint":70,"days":["Mon"]},{"scheduleId":13,"circuitId":6,"startTime":"0800","stopTime":"1100","dayMask":1,"flags":1,"heatCmd":4,"heatSetPoint":70,"days":["Mon"]}] */
 
-    for (let i = 0; i < slrecurring.length; i++) {
+    for (let i = 0; i < slrecurring.data.length; i++) {
       let slsched = slrecurring[i];
       let data = {
         id: slsched.scheduleId,
@@ -1126,13 +1128,14 @@ class Controller {
         logger.error(`Error setting schedule ${slsched.scheduleId}.  ${err.message}`);
       }
     }
-    for (let i = 0; i < slrunonce.length; i++) {
-      let slsched = slrunonce[i];
+    for (let i = 0; i < slrunonce.data.length; i++) {
+      let slsched = slrunonce.data[i];
       let data = {
         id: slsched.scheduleId,
         circuit: slsched.circuitId,
-        startTime: Math.floor(slsched.startTime / 100) * 60 + slsched.startTime % 100,
-        endTime: Math.floor(slsched.stopTime / 100) * 60 + slsched.stopTime % 100,
+        // start and stop come in as military time string
+        startTime: parseInt(slsched.startTime, 10),
+        endTime: parseInt(slsched.stopTime, 10),
         scheduleDays: slsched.dayMask,
         changeHeatSetPoint: slsched.heatCmd > 0,
         heatSetPoint: slsched.heatSetPoint,
@@ -1654,7 +1657,7 @@ export class SLController extends SLCommands {
   public async setCustomName(idx: number, name: string){
     try {
       let ack = await this._unit.equipment.setCustomNameAsync(idx, name);
-      logger.silly(`Screenlogic:set custom name result: ${ack}`);
+      logger.silly(`Screenlogic:set custom name result: ${JSON.stringify(ack)}`);
     } catch (error) {
       return Promise.reject(new InvalidOperationError('Unable to set custom name.', error.message));
     }

package/controller/comms/messages/Messages.ts

@@ -75,7 +75,7 @@ export class Message {
     private static _messageId: number = 0;
     public static get nextMessageId(): number { 
         let i = this._messageId < 80000 ? ++this._messageId : this._messageId = 0;
-        logger.debug(`Assigning message id ${i}`)
+        //logger.debug(`Assigning message id ${i}`)
         return i; }
     public portId = 0; // This will be the target or source port for the message.  If this is from or to an Aux RS485 port the value will be > 0.
     public timestamp: Date = new Date();
@@ -507,7 +507,7 @@ export class Inbound extends Message {
                     ndx = bytes.length - 5;
                     let arr = bytes.slice(0, ndx);
                     // Remove all but the last 4 bytes.  This will result in nothing anyway.
-                    logger.verbose(`Tossed Inbound Bytes ${arr} due to an unrecoverable collision.`);
+                    logger.verbose(`[Port ${this.portId}] Tossed Inbound Bytes ${arr} due to an unrecoverable collision.`);
                 }
                 this.padding = [];
                 break;
@@ -1169,12 +1169,12 @@ export class Response extends OutboundCommon {
                     // Scenario 1.  Request for pump status.
                     // Msg In:     [165,0,16, 96, 7,15], [4,0,0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0,17,31], [1,95]
                     // Msg Out:    [165,0,96, 16, 7, 0],[1,28]
-                    if (msgIn.source !== msgOut.dest || msgIn.dest !== msgOut.source) { return false; }
+                    if (msgIn.source !== msgOut.dest || (msgIn.dest !== msgOut.source && msgIn.dest != 16)) { return false; }
                     if (msgIn.action === 7 && msgOut.action === 7) { return true; }
                     return false;
                 default:
                     //Scenario 2, pump messages are mimics of each other but the dest/src are swapped
-                    if (msgIn.source !== msgOut.dest || msgIn.dest !== msgOut.source) { return false; }
+                    if (msgIn.source !== msgOut.dest || (msgIn.dest !== msgOut.source && msgIn.dest != 16)) { return false; }
                     // sub-case                           
                     // Msg In:     [165,0,16, 96, 1, 2], [3,32],[1,59]
                     // Msg Out:    [165,0,96,16, 1,4],[3,39, 3,32], [1,103]

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

@@ -80,6 +80,7 @@ export class ChlorinatorMessage {
         if (isActive) {
             let chlor = sys.chlorinators.getItemById(1, true);
             let schlor = state.chlorinators.getItemById(1, true);
+            chlor.master = 0;
             chlor.isActive = schlor.isActive = isActive;
             if (!chlor.disabled) {
                 // RKS: We don't want these setpoints if our chem controller disabled the
@@ -87,10 +88,16 @@ export class ChlorinatorMessage {
                 schlor.spaSetpoint = chlor.spaSetpoint = msg.extractPayloadByte(0) >> 1;
                 schlor.poolSetpoint = chlor.poolSetpoint = msg.extractPayloadByte(1);
                 chlor.address = msg.dest;
-                schlor.body = chlor.body = sys.equipment.maxBodies >= 1 || sys.equipment.shared === true ? 32 : 0;
+                schlor.body = chlor.body = sys.equipment.shared === true ? 32 : 0;
+            }
+            let name = msg.extractPayloadString(6, 16).trimEnd();
+            if (typeof chlor.name === 'undefined') schlor.name = chlor.name = name;
+            if (typeof chlor.model === 'undefined') {
+                chlor.model = sys.board.valueMaps.chlorinatorModel.getValue(schlor.name.toLowerCase());
+                if (typeof chlor.model === 'undefined') {
+                    if (name.startsWith('iChlor')) chlor.model = sys.board.valueMaps.chlorinatorModel.getValue('ichlor-ic30');
+                }
             }
-            if (typeof chlor.name === 'undefined') schlor.name = chlor.name = msg.extractPayloadString(6, 16);
-            if (typeof chlor.model === 'undefined') chlor.model  = sys.board.valueMaps.chlorinatorModel.getValue(schlor.name.toLowerCase()); 
             if (typeof chlor.type === 'undefined') chlor.type = schlor.type = 0; 
             schlor.saltLevel = msg.extractPayloadByte(3) * 50 || schlor.saltLevel;
             schlor.status = msg.extractPayloadByte(4) & 0x007F; // Strip off the high bit.  The chlorinator does not actually report this.;

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

@@ -329,6 +329,7 @@ export class ExternalMessage {
                         case 8: // Intellibrite
                         case 10: // Colorcascade
                             cstate.lightingTheme = circuit.lightingTheme;
+                            if (!isOn) cstate.action = 0;
                             break;
                         case 9: // Dimmer
                             cstate.level = circuit.level;
@@ -354,7 +355,8 @@ export class ExternalMessage {
                 if (schedule.isActive) {
                     if (schedule.circuit > 0) { // Don't get the schedule state if we haven't determined the entire config for it yet.
                         let sstate = state.schedules.getItemById(scheduleId, schedule.isActive);
-                        sstate.isOn = ((byte & (1 << (j))) >> j) > 0;
+                        let isOn = ((byte & (1 << (j))) >> j) > 0;
+                        sstate.isOn = isOn;
                         sstate.circuit = schedule.circuit;
                         sstate.endTime = schedule.endTime;
                         sstate.startDate = schedule.startDate;
@@ -365,6 +367,7 @@ export class ExternalMessage {
                         sstate.heatSource = schedule.heatSource;
                         sstate.startTimeType = schedule.startTimeType;
                         sstate.endTimeType = schedule.endTimeType;
+                        sstate.startDate = schedule.startDate;
                     }
                 }
                 else

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

@@ -35,13 +35,14 @@ export class PumpMessage {
         }
     }
     public static processPumpConfig_IT(msg: Inbound) {
-        // packet 24/27/152/155 - Pump Config: IntelliTouch
+        // packet 24/27/152/155 - Pump Config: IntelliTouch.  These will always be addressable pumps ds & ss are not included.
         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, isActive);
+        // RKS: 05-06-23 - The original code did not search for the pump by its address.  This is not correct.
+        let pump: Pump = sys.pumps.getPumpByAddress(95 + pumpId, isActive);
         if(isActive) {
             // Remap the combination pump types.
             switch (type) {
@@ -59,8 +60,8 @@ export class PumpMessage {
                     break;
             }
             if (pump.type !== type) {
-                sys.pumps.removeItemById(pumpId);
-                pump = sys.pumps.getItemById(pumpId, isActive);
+                sys.pumps.removePumpByAddress(95 + pumpId);
+                if (isActive) pump = sys.pumps.getPumpByAddress(95 + pumpId, isActive);
             }
             pump.address = pumpId + 95;
             pump.master = 0;
@@ -308,7 +309,7 @@ export class PumpMessage {
         // Sample Packet
         // [255, 0, 255], [165, 33, 15, 16, 27, 46], [1, 128, 1, 2, 0, 1, 6, 2, 12, 4, 9, 11, 7, 6, 7, 128, 8, 132, 3, 15, 5, 3, 234, 128, 46, 108, 58, 2, 232, 220, 232, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [8, 5]
         const pumpId = msg.extractPayloadByte(0);
-        const pump = sys.pumps.getItemById(pumpId);
+        const pump = sys.pumps.getPumpByAddress(95 + pumpId);
         // [1, 128, 0, 2, 0, 6, 5, 1, 5, 158, 9, 2, 10, 0, 3, 0, 3, 0, 3, 0, 3, 3, 120, 20, 146, 240, 232, 232, 232, 232, 232]
         // byte | val |
         // 0    | 1   | PumpId = 1
@@ -359,7 +360,7 @@ export class PumpMessage {
         // Sample Packet
         // [255, 0, 255], [165, 33, 15, 16, 27, 46], [2, 6, 15, 2, 0, 1, 29, 11, 35, 0, 30, 0, 30, 0, 30, 0, 30, 0, 30, 0, 30, 30, 55, 5, 10, 60, 5, 1, 50, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [3, 41]
         const pumpId = msg.extractPayloadByte(0);
-        const pump = sys.pumps.getItemById(pumpId);
+        const pump = sys.pumps.getPumpByAddress(95 + pumpId);
         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);
@@ -395,7 +396,7 @@ export class PumpMessage {
         //[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);
+        const pump = sys.pumps.getPumpByAddress(95 + pumpId);
         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);

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

@@ -158,52 +158,57 @@ export class RemoteMessage {
         // 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
+        // RKS: 05-13-23 - As it turns out ScreenLogic always asks for this bullshit and all panels return it.  However, if the firmware version is
+        // greater than 1.6 it should be ignored.
+        let fwVersion = parseFloat(sys.equipment.controllerFirmware);
+        if (!isNaN(fwVersion) && fwVersion <= 1.6) {
+            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();
                 }
-            );
-            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;
+            }
+            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();
             }
-            if (cid < 4) for (let i = 4; i > cid && i > 0; i--) pump.circuits.removeItemById(i);
-            spump.emitEquipmentChange();
         }
     }
     private static processRemoteType(msg: Inbound) {

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

@@ -67,9 +67,15 @@ export class ChlorinatorStateMessage {
                     //                  I   n    t    e    l    l    i    c   h    l    o    r    -   -   4   0
                     //[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);
+                    let name = msg.extractPayloadString(1, 16).trimEnd();
                     if (typeof chlor.name === 'undefined' || chlor.name === '') chlor.name = cstate.name = name;
-                    if (typeof chlor.model === 'undefined' || chlor.model === 0) chlor.model = sys.board.valueMaps.chlorinatorModel.getValue(name.toLowerCase());
+                    if (typeof chlor.model === 'undefined' || chlor.model === 0) {
+                        chlor.model = sys.board.valueMaps.chlorinatorModel.getValue(name.toLowerCase());
+                        // With iChlor it does not report the model.
+                        if (typeof chlor.model === 'undefined') {
+                            if (name.startsWith('iChlor')) chlor.model = sys.board.valueMaps.chlorinatorModel.getValue('ichlor-ic30');
+                        }
+                    }
                     cstate.isActive = chlor.isActive;
                     state.emitEquipmentChanges();
                     break;

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

@@ -121,8 +121,12 @@ export class EquipmentStateMessage {
             // 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;
+            (async () => {
+                await sys.board.closeAsync();
+                logger.info(`Closed ${sys.controllerType} board`);
+                sys.controllerType = ControllerType.Unknown;
+                state.status = 0;
+            })();
         }
         if (!state.isInitialized) {
             msg.isProcessed = true;
@@ -592,9 +596,9 @@ export class EquipmentStateMessage {
             case 204: // IntelliCenter only.
                 state.batteryVoltage = msg.extractPayloadByte(2) / 50;
                 state.comms.keepAlives = msg.extractPayloadInt(4);
-                state.time.date = msg.extractPayloadByte(6);
-                state.time.month = msg.extractPayloadByte(7);
                 state.time.year = msg.extractPayloadByte(8);
+                state.time.month = msg.extractPayloadByte(7);
+                state.time.date = msg.extractPayloadByte(6);
                 sys.equipment.controllerFirmware = (msg.extractPayloadByte(42) + (msg.extractPayloadByte(43) / 1000)).toString();
                 if (sys.chlorinators.length > 0) {
                     if (msg.extractPayloadByte(37, 255) !== 255) {
@@ -637,6 +641,7 @@ export class EquipmentStateMessage {
                     scover2.name = cover2.name;
                     state.temps.bodies.getItemById(cover2.body + 1).isCovered = scover2.isClosed = (msg.extractPayloadByte(30) & 0x0002) > 0;
                 }
+                sys.board.schedules.syncScheduleStates();
                 msg.isProcessed = true;
                 state.emitEquipmentChanges();
                 break;

package/controller/nixie/NixieEquipment.ts

@@ -62,7 +62,7 @@ export class NixieEquipment {
     public async closeAsync() {
         try {
         }
-        catch (err) { logger.error(err); }
+        catch (err) { logger.error(`Error closing Nixie Equipment: ${err.message}`); }
     }
 }
 export class NixieChildEquipment extends NixieEquipment {

package/controller/nixie/bodies/Body.ts

@@ -79,7 +79,7 @@ export class NixieBody extends NixieEquipment {
         try {
             // Here we go we need to set the valve state.
             if (bstate.isOn !== isOn) {
-                logger.info(`Nixie: Set Body ${bstate.id}-${bstate.name} to ${isOn}`);
+                logger.info(`Nixie: Set Body ${bstate.id}-${bstate.name} to ${isOn}`); 
             }
             bstate.isOn = isOn;
         } catch (err) { logger.error(`Nixie Error setting body state ${bstate.id}-${bstate.name}: ${err.message}`); }