nodejs-poolcontroller 7.3.0 → 7.6.0

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

@@ -22,28 +22,42 @@ export class HeaterStateMessage {
     public static process(msg: Inbound) {
         if (msg.protocol === Protocol.Heater) {
             switch (msg.action) {
-                case 114: // This is a message from a master controlling the heater
+                case 112: // This is a message from a master controlling MasterTemp
+                case 114: // This is a message from a master controlling UltraTemp
+                    msg.isProcessed = true;
+                    break;
+                case 116:
+                    HeaterStateMessage.processMasterTempStatus(msg);
                     break;
                 case 115:
-                    HeaterStateMessage.processHeaterStatus(msg);
+                    HeaterStateMessage.processUltraTempStatus(msg);
                     break;
             }
         }
     }
-    public static processHeaterStatus(msg: Inbound) {
+    public static processUltraTempStatus(msg: Inbound) {
         // RKS: 07-03-21 - We only know byte 2 at this point for Ultratemp for the 115 message we are processing here.  The 
         // byte  description
         // ------------------------------------------------
-        // 0    Unknown
-        // 1    Unknown
+        // 0    Unknown (always seems to be 160 for response)
+        // 1    Unknown (always 1)
         // 2    Current heater status 0=off, 1=heat, 2=cool
         // 3-9  Unknown
-        let heater: Heater = sys.heaters.getItemByAddress(msg.source);
-        let sheater = state.heaters.getItemById(heater.id);
-        // We need to decode the message.  For a 2 of
-        //[165, 1, 15, 16, 2, 29][16, 42, 3, 0, 0, 0, 0, 0, 0, 32, 0, 0, 2, 0, 88, 88, 0, 241, 95, 100, 24, 246, 0, 0, 0, 0, 0, 40, 0][4, 221]
+        
+        // 114 message - outbound response
         //[165, 0, 112, 16, 114, 10][144, 0, 0, 0, 0, 0, 0, 0, 0, 0][2, 49] // OCP to Heater
+        // byte  description
+        // ------------------------------------------------
+        // 0    Unknown (always seems to be 144 for request)
+        // 1    Current heater status 0=off, 1=heat, 2=cool
+        // 3    Believed to be ofset temp
+        // 4-9  Unknown
+        
+        //   byto 0: always seems to be 144 for outbound
+        //   byte 1: Sets heater mode to 0 = Off 1 = Heat 2 = Cool
         //[165, 0, 16, 112, 115, 10][160, 1, 0, 3, 0, 0, 0, 0, 0, 0][2, 70] // Heater Reply
+        let heater: Heater = sys.heaters.getItemByAddress(msg.source);
+        let sheater = state.heaters.getItemById(heater.id);
         let byte = msg.extractPayloadByte(2);
         sheater.isOn = byte >= 1;
         sheater.isCooling = byte === 2;
@@ -51,4 +65,23 @@ export class HeaterStateMessage {
         state.equipment.messages.removeItemByCode(`heater:${heater.id}:comms`);
         msg.isProcessed = true;
     }
+    public static processMasterTempStatus(msg: Inbound) {
+        //[255, 0, 255][165, 0, 16, 112, 116, 23][67, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 10, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0][2, 66]
+        // Byte 1 is the indicator to which setpoint it is heating to.
+        // Byte 8 increments over time when the heater is on.
+        // Byte 13 looks like the mode the heater is in for instance it is in cooldown mode.
+        //  0 = Normal
+        //  2 = ??????
+        //  6 = Cooldown
+        // Byte 14 looks like the cooldown delay in minutes.
+        let heater: Heater = sys.heaters.getItemByAddress(msg.source);
+        let sheater = state.heaters.getItemById(heater.id);
+        let byte = msg.extractPayloadByte(1);
+        sheater.isOn = byte >= 1;
+        sheater.isCooling = false;
+        sheater.commStatus = 0;
+        state.equipment.messages.removeItemByCode(`heater:${heater.id}:comms`);
+        msg.isProcessed = true;
+    }
+
 }

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

@@ -23,15 +23,25 @@ import { Timestamp, utils } from "../../../Constants"
 export class IntelliChemStateMessage {
     public static process(msg: Inbound) {
         if (sys.controllerType === ControllerType.Unknown) return;
-        if (msg.source < 144 || msg.source > 158) return;
+        let address = (msg.dest >= 144 && msg.dest <= 158) ? msg.dest : msg.source;
+        if (address < 144 || address > 158) return;
+        let controller = sys.chemControllers.getItemByAddress(address);
+        if (!controller.isActive) {
+            msg.isProcessed = true;
+            return;
+        }
         switch (msg.action) {
-
             // ---------- IntelliChem Control panel is spitting out its status ----------- //
             case 18: // IntelliChem is sending us it's status.
                 IntelliChemStateMessage.processState(msg);
                 break;
             case 210: // OCP is asking IntelliChem controller for it's current status info.
                 // [165,0,144,16,210,1],[210],[2,234]
+                let schem = state.chemControllers.getItemById(controller.id);
+                if (schem.lastComm + (30 * 1000) < new Date().getTime()) {
+                    // We have not talked to the chem controller in 30 seconds so we have lost communication.
+                    schem.status = schem.alarms.comms = 1;
+                }
                 msg.isProcessed = true;
                 break;
             // ---------- End IntelliChem set get ----------- //
@@ -43,7 +53,7 @@ export class IntelliChemStateMessage {
 
             /* RKS: This is processed in the IntellichemMessage.processTouch() and is the results of asking for the IntelliChem configuration.
             case 147: // OCP is broadcasting it's known ic values...  Need to change our settings if virtual.
-                // 147 is a proto:broadcast message; 
+                // 147 is a proto:broadcast message;
                 // it has exactly the same format as 18 but there is payload[0] which is inserted at the beginning.  Likely the chem controller id.
                 if (msg.dest < 144 || msg.dest > 158) return;
                 IntelliChemStateMessage.processControllerChange(msg);
@@ -57,14 +67,11 @@ export class IntelliChemStateMessage {
                 msg.isProcessed = true;
                 break;
             case 146: // OCP is telling IntelliChem that it needs to change its settings to...
-                let address = msg.dest;
-                // The address is king here.  The id is not.
-                let controller = sys.chemControllers.getItemByAddress(address, true);
-                let scontroller = state.chemControllers.getItemById(controller.id, true);
-                if (scontroller.lastComm + (30 * 1000) < new Date().getTime()) {
-                    // We have not talked to the chem controller in 30 seconds so we have lost communication.
-                    scontroller.status = scontroller.alarms.comms = 1;                   
-                }
+                //let scontroller = state.chemControllers.getItemById(controller.id, true);
+                //if (scontroller.lastComm + (30 * 1000) < new Date().getTime()) {
+                //    // We have not talked to the chem controller in 30 seconds so we have lost communication.
+                //    scontroller.status = scontroller.alarms.comms = 1;
+                //}
                 controller.ph.tank.capacity = controller.orp.tank.capacity = 6;
                 controller.ph.tank.units = controller.orp.tank.units = '';
                 msg.isProcessed = true;
@@ -89,8 +96,8 @@ export class IntelliChemStateMessage {
         //      6-7 : ORP Setpoint : byte(6) x 256 + byte(7)
         //      8 : Unknown = 0
         //      9 : Unknown = 0
-        //      10 : Unknown = 0
-        //      11-12 : pH Dose time seconds. The number of seconds since the dose started. byte(11) x 256 + byte(12)
+        //      10-11 : pH Dose time seconds. The number of seconds since the dose started. byte(10) x 256 + byte(11)
+        //      12: Unknown
         //      13 : Unknown
         //      14-15 : ORP Dose time seconds.  The number of seconds since the dose started. byte(14) x 256 + byte(15)
         //      16-17 : pH Dose volume (unknown units) - These appear to be mL.
@@ -122,10 +129,13 @@ export class IntelliChemStateMessage {
         schem.type = chem.type = sys.board.valueMaps.chemControllerTypes.getValue('intellichem');
         chem.name = chem.name || `IntelliChem ${chem.address - 143}`; // default to true id if no name is set
         schem.lastComm = new Date().getTime();
-        schem.status = schem.alarms.comms = 0; 
+        schem.status = schem.alarms.comms = 0;
         chem.ph.tank.capacity = chem.orp.tank.capacity = 6;
         chem.ph.tank.units = chem.orp.tank.units = '';
-        
+        chem.ph.tank.alarmEmptyEnabled = false;
+        chem.ph.tank.alarmEmptyLevel = 1;
+        chem.orp.tank.alarmEmptyEnabled = false;
+        chem.orp.tank.alarmEmptyLevel = 1;
         schem.address = chem.address;
         schem.ph.level = schem.ph.probe.level = msg.extractPayloadIntBE(0) / 100;
         schem.orp.level = schem.orp.probe.level = msg.extractPayloadIntBE(2);
@@ -133,11 +143,11 @@ export class IntelliChemStateMessage {
         chem.orp.setpoint = msg.extractPayloadIntBE(6);
         // Missing information on the related bytes.
         // Bytes 8-14 (Probably Total Dissolved Solids in here if no IntelliChlor)
-        let phPrev = { status: schem.orp.dosingStatus, time: schem.ph.timeDosed || 0, vol: schem.ph.volumeDosed };
+        let phPrev = { status: schem.ph.dosingStatus, time: schem.ph.timeDosed || 0, vol: schem.ph.volumeDosed };
         let orpPrev = { status: schem.orp.dosingStatus, time: schem.orp.timeDosed || 0, vol: schem.orp.volumeDosed };
         // IntelliChem never tells us what the dose time or volume is so we will let that dog lie.
-        //      11-12 : pH Dose time
-        schem.ph.timeDosed = (msg.extractPayloadByte(11) * 256) + msg.extractPayloadByte(12);
+        //      10-11 : pH Dose time
+        schem.ph.timeDosed = (msg.extractPayloadByte(10) * 256) + msg.extractPayloadByte(11);
         //      14-15 : ORP Dose time seconds.  The number of seconds since the dose started.
         schem.orp.timeDosed = (msg.extractPayloadByte(14) * 256) + msg.extractPayloadByte(15);
         //      16-17 : pH Dose volume (unknown units) = 35
@@ -157,7 +167,7 @@ export class IntelliChemStateMessage {
         chem.cyanuricAcid = msg.extractPayloadByte(26);
         //      27-28 : Alkalinity
         chem.alkalinity = (msg.extractPayloadByte(27) * 256) + msg.extractPayloadByte(28);
-        //      29 : Salt level = 20 
+        //      29 : Salt level = 20
         if (sys.chlorinators.length > 0) {
             let chlor = state.chlorinators.find(elem => elem.id === 1);
             schem.orp.probe.saltLevel = (typeof chlor !== 'undefined') ? chlor.saltLevel : msg.extractPayloadByte(29) * 50;
@@ -169,6 +179,7 @@ export class IntelliChemStateMessage {
         //      32 : Alarms = 8 = (no alarm)
         const alarms = schem.alarms;
         alarms.flow = msg.extractPayloadByte(32) & 0x01;
+        if (alarms.flow === 0) schem.flowDetected = true;
         alarms.pH = msg.extractPayloadByte(32) & 0x06;
         alarms.orp = msg.extractPayloadByte(32) & 0x18;
         alarms.pHTank = msg.extractPayloadByte(32) & 0x20;
@@ -187,11 +198,11 @@ export class IntelliChemStateMessage {
         schem.ph.dosingStatus = (msg.extractPayloadByte(34) & 0x30) >> 4; // mask 00xx0000 and shift bit 5 & 6
         schem.orp.dosingStatus = (msg.extractPayloadByte(34) & 0xC0) >> 6; // mask xx000000 and shift bit 7 & 8
         //      35 : Delays = 0
-        schem.status = msg.extractPayloadByte(35) & 0x80 >> 7; // to be verified as comms lost
+        schem.status = (msg.extractPayloadByte(35) & 0x80) >> 7; // to be verified as comms lost
         schem.ph.manualDosing = (msg.extractPayloadByte(35) & 0x08) === 1 ? true : false;
         chem.orp.useChlorinator = (msg.extractPayloadByte(35) & 0x10) === 1 ? true : false;
         chem.HMIAdvancedDisplay = (msg.extractPayloadByte(35) & 0x20) === 1 ? true : false;
-        chem.ph.phSupply = (msg.extractPayloadByte(35) & 0x40) === 1 ? true : false; // acid pH dosing = 1; base pH dosing = 0;
+        chem.ph.phSupply = (msg.extractPayloadByte(35) & 0x40) === 1 ? 'acid' : 'base'; // acid pH dosing = 1; base pH dosing = 0;
         //      36-37 : Firmware = 80,1 = 1.080
         chem.firmware = `${msg.extractPayloadByte(37)}.${msg.extractPayloadByte(36).toString().padStart(3, '0')}`
         //      38 : Water Chemistry Warning
@@ -230,12 +241,12 @@ export class IntelliChemStateMessage {
             if (typeof schem.ph.currentDose !== 'undefined') {
                 // We just ended a dose so write it out to the chem logs.
                 schem.ph.endDose(Timestamp.now.addSeconds(-(schem.ph.doseTime - phPrev.time)).toDate(), 'completed',
-                    schem.ph.volumeDosed - phPrev.vol, (schem.ph.doseTime - phPrev.time) * 1000);
+                    schem.ph.volumeDosed - phPrev.vol, (schem.ph.timeDosed - phPrev.time) * 1000);
             }
         }
         else if (schem.ph.dosingStatus === 0) {
             // We are still dosing so add the time and volume to the dose.
-            schem.ph.appendDose(schem.ph.doseVolume - phPrev.vol, (schem.ph.doseTime - phPrev.time) * 1000);
+            schem.ph.appendDose(schem.ph.doseVolume - phPrev.vol, (schem.ph.timeDosed - phPrev.time) * 1000);
         }
         else {
             console.log(`DOSING STATUS === ${schem.ph.dosingStatus}`);
@@ -246,19 +257,19 @@ export class IntelliChemStateMessage {
         if (schem.orp.dosingStatus === 0 && orpPrev.status !== 0) {
             if (schem.orp.dosingStatus === 0) {
                 // We are starting a dose so we need to set the current dose.
-                schem.orp.startDose(Timestamp.now.addSeconds(-schem.orp.doseTime).toDate(), schem.orp.manualDosing ? 'manual' : 'auto', 0, schem.orp.volumeDosed, schem.orp.timeDosed * 1000);
+                schem.orp.startDose(Timestamp.now.addSeconds(-schem.orp.doseTime).toDate(), schem.orp.manualDosing ? 'manual' : 'auto', 0, schem.orp.volumeDosed, 0, schem.orp.timeDosed * 1000);
             }
         }
         else if (schem.orp.dosingStatus !== 0 && orpPrev.status === 0) {
             if (typeof schem.orp.currentDose !== 'undefined') {
                 // We just ended a dose so write it out to the chem logs.
                 schem.orp.endDose(Timestamp.now.addSeconds(-(schem.orp.doseTime - orpPrev.time)).toDate(), 'completed',
-                    schem.orp.volumeDosed - orpPrev.vol, schem.orp.doseTime - orpPrev.time);
+                    schem.orp.volumeDosed - orpPrev.vol, (schem.orp.timeDosed - orpPrev.time) * 1000);
             }
         }
         else if (schem.orp.dosingStatus === 0) {
             // We are still dosing so add the time and volume to the dose.
-            schem.orp.appendDose(schem.orp.doseTime - orpPrev.time, schem.orp.doseVolume - orpPrev.vol);
+            schem.orp.appendDose(schem.orp.doseVolume - orpPrev.vol, (schem.orp.timeDosed - orpPrev.time) * 1000);
         }
         else {
             // Make sure we don't have a current dose going.

package/controller/nixie/Nixie.ts

@@ -136,23 +136,25 @@ export class NixieControlPanel implements INixieControlPanel {
         try {
             let srv = [];
             let servers = webApp.findServersByType('rem');
-            for (let i = 0; i < servers.length; i++) {
-                let server = servers[i];
-                // Sometimes I hate type safety.
-                let devices = typeof server['getDevices'] === 'function' ? await server['getDevices']() : [];
-                let int = config.getInterfaceByUuid(servers[i].uuid);
-                srv.push({
-                    uuid: servers[i].uuid,
-                    name: servers[i].name,
-                    type: servers[i].type,
-                    isRunning: servers[i].isRunning,
-                    isConnected: servers[i].isConnected,
-                    devices: devices,
-                    remoteConnectionId: servers[i].remoteConnectionId,
-                    interface: int
-                });
+            if (typeof servers !== 'undefined') {
+                for (let i = 0; i < servers.length; i++) {
+                    let server = servers[i];
+                    // Sometimes I hate type safety.
+                    let devices = typeof server['getDevices'] === 'function' ? await server['getDevices']() : [];
+                    let int = config.getInterfaceByUuid(servers[i].uuid);
+                    srv.push({
+                        uuid: servers[i].uuid,
+                        name: servers[i].name,
+                        type: servers[i].type,
+                        isRunning: servers[i].isRunning,
+                        isConnected: servers[i].isConnected,
+                        devices: devices,
+                        remoteConnectionId: servers[i].remoteConnectionId,
+                        interface: int
+                    });
+                }
+                await ncp.chemControllers.syncRemoteREMFeeds(srv);
             }
-            await ncp.chemControllers.syncRemoteREMFeeds(srv);
             return srv;
         } catch (err) { logger.error(err); }
     }

package/controller/nixie/bodies/Body.ts

@@ -34,7 +34,7 @@ export class NixieBodyCollection extends NixieEquipmentCollection<NixieBody> {
                 let body = bodies.getItemByIndex(i);
                 if (body.master === 1) {
                     if (typeof this.find(elem => elem.id === body.id) === 'undefined') {
-                        logger.info(`Initializing body ${body.name}`);
+                        logger.info(`Initializing Nixie body ${body.name}`);
                         let nbody = new NixieBody(this.controlPanel, body);
                         this.push(nbody);
                     }
@@ -64,6 +64,9 @@ export class NixieBody extends NixieEquipment {
         super(ncp);
         this.body = body;
         this.pollEquipmentAsync();
+        let bs = state.temps.bodies.getItemById(body.id);
+        bs.heaterCooldownDelay = false;
+        bs.heatStatus = 0;
     }
     public get id(): number { return typeof this.body !== 'undefined' ? this.body.id : -1; }
     public async setBodyAsync(data: any) {