nodejs-poolcontroller 7.2.0 → 7.5.1

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

@@ -63,8 +63,9 @@ 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.
-                    if (typeof chlor.name === 'undefined' || chlor.name === '') chlor.name = msg.extractPayloadString(1, 16);
-                    cstate.name = chlor.name;
+                    let name = msg.extractPayloadString(1, 16);
+                    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;
@@ -73,9 +74,12 @@ export class ChlorinatorStateMessage {
                     // If the chlorinator is no longer talking to us then clear the current output.
                     if (cstate.status === 128) cstate.currentOutput = 0;
                     cstate.targetOutput = msg.extractPayloadByte(0);
-                    if (chlor.disabled && cstate.targetOutput !== 0) {
+                    if (chlor.disabled && (cstate.targetOutput !== 0 || cstate.superChlor || cstate.superChlorHours > 0)) {
                         // Some dumbass is trying to change our output.  We need to set it back to 0.
-                        sys.board.chlorinator.setChlorAsync({ id: chlor.id, disabled: true });
+                        sys.board.chlorinator.setChlorAsync({ id: chlor.id, disabled: chlor.disabled, superChlor: false, superChlorHours: 0 });
+                    }
+                    else if (chlor.isDosing && cstate.targetOutput !== 100){
+                        sys.board.chlorinator.setChlorAsync({ id: chlor.id, isDosing: chlor.isDosing });
                     }
                     state.emitEquipmentChanges();
                     break;
@@ -87,8 +91,12 @@ export class ChlorinatorStateMessage {
                     // The current output here is not correct.  The reason that is is because this is a request from the OCP to the Chlorinator.
                     //cstate.currentOutput = msg.action === 17 ? msg.extractPayloadByte(0) : msg.extractPayloadByte(0) / 10;
                     cstate.targetOutput = msg.extractPayloadByte(0) / 10;
-                    if (chlor.disabled && cstate.targetOutput !== 0) {
-                        sys.board.chlorinator.setChlorAsync({ id: chlor.id, disabled: true });
+                    if (chlor.disabled && (cstate.targetOutput !== 0 || cstate.superChlor || cstate.superChlorHours > 0)) {
+                        // Some dumbass is trying to change our output.  We need to set it back to 0.
+                        sys.board.chlorinator.setChlorAsync({ id: chlor.id, disabled: chlor.disabled, superChlor: false, superChlorHours: 0 });
+                    }
+                    else if (chlor.isDosing && cstate.targetOutput !== 100){
+                        sys.board.chlorinator.setChlorAsync({ id: chlor.id, isDosing: chlor.isDosing });
                     }
                     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) {

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

@@ -31,13 +31,33 @@ export class HeaterStateMessage {
         }
     }
     public static processHeaterStatus(msg: Inbound) {
-        let heater: Heater;
-        heater = sys.heaters.getItemByAddress(msg.source);
-
-        // 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]
+        // 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 (always seems to be 160 for response)
+        // 1    Unknown (always 1)
+        // 2    Current heater status 0=off, 1=heat, 2=cool
+        // 3-9  Unknown
+        
+        // 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;
+        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,16 +198,34 @@ 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
         schem.warnings.waterChemistry = msg.extractPayloadByte(38);
         if (typeof chem.body === 'undefined') chem.body = schem.body = 0;
+        if (state.equipment.controllerType === 'nixie') {
+            if (chem.ph.probe.feedBodyTemp) {
+                let temps: any = {};
+                let body = state.temps.bodies.getBodyIsOn();
+                if (typeof body !== 'undefined') {
+                    if (body.id === 1 && (schem.body === 0 || schem.body === 32)) {
+                        temps.waterSensor1 = schem.ph.probe.temperature;
+                    }
+                    else if (body.id === 2 && (schem.body === 2 || schem.body === 32)) {
+                        temps.waterSensor1 = schem.ph.probe.temperature;
+                    }
+                    else if (body.id === 2 && chem.body === 1) {
+                        temps.waterSensor2 = schem.ph.probe.temperature;
+                    }
+                }
+                sys.board.system.setTempsAsync(temps).catch(err => logger.error(err))
+            }
+        }
         schem.ph.pump.isDosing = schem.ph.dosingStatus === 0 && chem.ph.enabled;
         schem.orp.pump.isDosing = schem.orp.dosingStatus === 0 && chem.orp.enabled;
         schem.calculateSaturationIndex();
@@ -212,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}`);
@@ -228,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/NixieEquipment.ts

@@ -93,12 +93,12 @@ export class NixieEquipmentCollection<T> extends Array<NixieEquipment> {
         catch (err) { return Promise.reject(err); }
     }
 }
-export class NixieRelay extends NixieEquipment {
+//export class NixieRelay extends NixieEquipment {
 
-}
-export class NixieCircuit extends NixieRelay {
+//}
+//export class NixieCircuit extends NixieRelay {
 
-}
-export class NixieValve extends NixieRelay {
+//}
+//export class NixieValve extends NixieRelay {
 
-}
+//}

package/controller/nixie/bodies/Body.ts

@@ -33,9 +33,11 @@ export class NixieBodyCollection extends NixieEquipmentCollection<NixieBody> {
             for (let i = 0; i < bodies.length; i++) {
                 let body = bodies.getItemByIndex(i);
                 if (body.master === 1) {
-                    logger.info(`Initializing body ${body.name}`);
-                    let nbody = new NixieBody(this.controlPanel, body);
-                    this.push(nbody);
+                    if (typeof this.find(elem => elem.id === body.id) === 'undefined') {
+                        logger.info(`Initializing Nixie body ${body.name}`);
+                        let nbody = new NixieBody(this.controlPanel, body);
+                        this.push(nbody);
+                    }
                 }
             }
         }
@@ -81,13 +83,14 @@ export class NixieBody extends NixieEquipment {
     }
 
     public async pollEquipmentAsync() {
+        let self = this;
         try {
             if (typeof this._pollTimer !== 'undefined' || this._pollTimer) clearTimeout(this._pollTimer);
             this._pollTimer = null;
             let success = false;
         }
         catch (err) { logger.error(`Nixie Error polling body - ${err}`); }
-        finally { this._pollTimer = setTimeout(async () => await this.pollEquipmentAsync(), this.pollingInterval || 10000); }
+        finally { this._pollTimer = setTimeout(async () => await self.pollEquipmentAsync(), this.pollingInterval || 10000); }
     }
     private async checkHardwareStatusAsync(connectionId: string, deviceBinding: string) {
         try {

package/controller/nixie/bodies/Filter.ts

@@ -42,9 +42,11 @@ export class NixieFilterCollection extends NixieEquipmentCollection<NixieFilter>
             for (let i = 0; i < filters.length; i++) {
                 let filter = filters.getItemByIndex(i);
                 if (filter.master === 1) {
-                    logger.info(`Initializing Filter ${Filter.name}`);
-                    let nFilter = new NixieFilter(this.controlPanel, filter);
-                    this.push(nFilter);
+                    if (typeof this.find(elem => elem.id === filter.id) === 'undefined') {
+                        logger.info(`Initializing Filter ${Filter.name}`);
+                        let nFilter = new NixieFilter(this.controlPanel, filter);
+                        this.push(nFilter);
+                    }
                 }
             }
         }
@@ -98,13 +100,14 @@ export class NixieFilter extends NixieEquipment {
     }
 
     public async pollEquipmentAsync() {
+        let self = this;
         try {
             if (typeof this._pollTimer !== 'undefined' || this._pollTimer) clearTimeout(this._pollTimer);
             this._pollTimer = null;
             let success = false;
         }
         catch (err) { logger.error(`Nixie Error polling Filter - ${err}`); }
-        finally { this._pollTimer = setTimeout(async () => await this.pollEquipmentAsync(), this.pollingInterval || 10000); }
+        finally { this._pollTimer = setTimeout(async () => await self.pollEquipmentAsync(), this.pollingInterval || 10000); }
     }
     private async checkHardwareStatusAsync(connectionId: string, deviceBinding: string) {
         try {