nodejs-poolcontroller 7.3.0 → 7.6.0

package/controller/nixie/pumps/Pump.ts

@@ -215,8 +215,8 @@ export class NixiePump extends NixieEquipment {
             if (typeof this._pollTimer !== 'undefined' || this._pollTimer) clearTimeout(this._pollTimer);
             this._pollTimer = null;
             // let success = false;
-            this.setTargetSpeed();
             let pstate = state.pumps.getItemById(this.pump.id);
+            this.setTargetSpeed(pstate);
             await this.setPumpStateAsync(pstate);
         }
         catch (err) { logger.error(`Nixie Error running pump sequence - ${err}`); }
@@ -239,7 +239,10 @@ export class NixiePump extends NixieEquipment {
             this._pollTimer = null;
             this._targetSpeed = 0;
             let pstate = state.pumps.getItemById(this.pump.id);
-            await this.setPumpStateAsync(pstate);
+            try {
+                await this.setPumpStateAsync(pstate);
+                // Since we are closing we need to not reject.
+            } catch (err) { logger.error(`Nixie Closing pump closeAsync: ${err.message}`); }
             // This will make sure the timer is dead and we are completely closed.
             this.closing = true;
             if (typeof this._pollTimer !== 'undefined' || this._pollTimer) clearTimeout(this._pollTimer);
@@ -248,19 +251,43 @@ export class NixiePump extends NixieEquipment {
         catch (err) { logger.error(`Nixie Pump closeAsync: ${err.message}`); return Promise.reject(err); }
     }
     public logData(filename: string, data: any) { this.controlPanel.logData(filename, data); }
-    protected setTargetSpeed() { };
+    protected setTargetSpeed(pstate: PumpState) { };
+    protected isBodyOn(bodyCode: number) {
+        let assoc = sys.board.valueMaps.pumpBodies.transform(bodyCode);
+        switch (assoc.name) {
+            case 'body1':
+            case 'pool':
+                return state.temps.bodies.getItemById(1).isOn;
+            case 'body2':
+            case 'spa':
+                return state.temps.bodies.getItemById(2).isOn;
+            case 'body3':
+                return state.temps.bodies.getItemById(3).isOn;
+            case 'body4':
+                return state.temps.bodies.getItemById(4).isOn;
+            case 'poolspa':
+                if (sys.equipment.shared && sys.equipment.maxBodies >= 2) {
+                    return state.temps.bodies.getItemById(1).isOn === true || state.temps.bodies.getItemById(2).isOn === true;
+                }
+                else
+                    return state.temps.bodies.getItemById(1).isOn;
+        }
+        return false;
+    }
 }
 export class NixiePumpSS extends NixiePump {
-    public setTargetSpeed() {
+    public setTargetSpeed(pState: PumpState) {
         // Turn on ss pumps.
         let _newSpeed = 0;
-        let pt = sys.board.valueMaps.pumpTypes.get(this.pump.type);
-        if (pt.hasBody) _newSpeed = sys.board.bodies.isBodyOn(this.pump.body) ? 1 : 0;
-        if (this._targetSpeed !== _newSpeed) logger.info(`NCP: Setting Pump ${this.pump.name} to ${_newSpeed > 0 ? 'on' : 'off'}.`);
+        if (!pState.pumpOnDelay) {
+            let pt = sys.board.valueMaps.pumpTypes.get(this.pump.type);
+            if (pt.hasBody) _newSpeed = this.isBodyOn(this.pump.body) ? 1 : 0;
+            //console.log(`BODY: ${sys.board.bodies.isBodyOn(this.pump.body)} CODE: ${this.pump.body}`);
+        }
+        if (this._targetSpeed !== _newSpeed) logger.info(`NCP: Setting Pump ${this.pump.name} to ${_newSpeed > 0 ? 'on' : 'off'}. ${sys.board.bodies.isBodyOn(this.pump.body)}`);
         if (isNaN(_newSpeed)) _newSpeed = 0;
         this._targetSpeed = _newSpeed;
     }
-
     public async setPumpStateAsync(pstate: PumpState) {
         let relays: PumpRelay[] = this.pump.relays.get();
         let relayState = 0;
@@ -301,16 +328,20 @@ export class NixiePumpSS extends NixiePump {
     }
 }
 export class NixiePumpDS extends NixiePumpSS {
-    public setTargetSpeed() {
+    public setTargetSpeed(pState: PumpState) {
         // Turn on sf pumps.  The new speed will be the relays associated with the pump.  I believe when this comes out in the final
         // wash it should engage all the relays for all speeds associated with the pump.  The pump logic will determine which program is
         // the one to engage.
         let _newSpeed = 0;
-        let pumpCircuits: PumpCircuit[] = this.pump.circuits.get();
-        for (let i = 0; i < pumpCircuits.length; i++) {
-            let circ = state.circuits.getInterfaceById(pumpCircuits[i].circuit);
-            // relay speeds are bit-shifted 'or' based on 1,2,4,8
-            if (circ.isOn) _newSpeed |= (1 << pumpCircuits[i].relay - 1);
+        if (!pState.pumpOnDelay) {
+            let pumpCircuits: PumpCircuit[] = this.pump.circuits.get();
+            if (!pState.pumpOnDelay) {
+                for (let i = 0; i < pumpCircuits.length; i++) {
+                    let circ = state.circuits.getInterfaceById(pumpCircuits[i].circuit);
+                    // relay speeds are bit-shifted 'or' based on 1,2,4,8
+                    if (circ.isOn) _newSpeed |= (1 << pumpCircuits[i].relay - 1);
+                }
+            }
         }
         if (isNaN(_newSpeed)) _newSpeed = 0;
         this.logSpeed(_newSpeed);
@@ -335,15 +366,16 @@ export class NixiePumpRS485 extends NixiePump {
             let pt = sys.board.valueMaps.pumpTypes.get(this.pump.type);
             // Since these process are async the closing flag can be set
             // between calls.  We need to check it in between each call.
-            if (!this.closing) await this.setDriveStateAsync(pstate);
-            if (!this.closing) {
-                if (this._targetSpeed >= pt.minFlow && this._targetSpeed <= pt.maxFlow) await this.setPumpGPMAsync(pstate);
-                else if (this._targetSpeed >= pt.minSpeed && this._targetSpeed <= pt.maxSpeed) await this.setPumpRPMAsync(pstate);  
-            }
+            try { if (!this.closing) await this.setDriveStateAsync(); } catch (err) {}
+            try { if (!this.closing) {
+                if (this._targetSpeed >= pt.minFlow && this._targetSpeed <= pt.maxFlow) await this.setPumpGPMAsync();
+                else if (this._targetSpeed >= pt.minSpeed && this._targetSpeed <= pt.maxSpeed) await this.setPumpRPMAsync();  
+            } } catch (err) {}
            
-            if(!this.closing) await utils.sleep(2000);
-            if(!this.closing) await this.requestPumpStatus(pstate);
-            if(!this.closing) await this.setPumpToRemoteControl(pstate);
+            try { if(!this.closing) await this.setPumpFeature(6);  } catch (err) {};
+            try { if(!this.closing) await utils.sleep(1000); } catch (err) {};
+            try { if(!this.closing) await this.requestPumpStatus();  } catch (err) {};
+            try { if(!this.closing) await this.setPumpToRemoteControl();  } catch (err) {};
             return new InterfaceServerResponse(200, 'Success');
         }
         catch (err) {
@@ -351,9 +383,8 @@ export class NixiePumpRS485 extends NixiePump {
             return Promise.reject(err);
         }
         finally { this.suspendPolling = false; }
-    
     };
-    protected async setDriveStateAsync(pstate: PumpState, running: boolean = true) {
+    protected async setDriveStateAsync(running: boolean = true) {
         return new Promise<void>((resolve, reject) => {
             let out = Outbound.create({
                 protocol: Protocol.Pump,
@@ -373,7 +404,7 @@ export class NixiePumpRS485 extends NixiePump {
             conn.queueSendMessage(out);
         });
     };
-    protected async requestPumpStatus(pstate: PumpState) {
+    protected async requestPumpStatus() {
         return new Promise<void>((resolve, reject) => {
             let out = Outbound.create({
                 protocol: Protocol.Pump,
@@ -393,7 +424,7 @@ export class NixiePumpRS485 extends NixiePump {
             conn.queueSendMessage(out);
         })
     };
-    protected setPumpToRemoteControl(spump: PumpState, running: boolean = true) {
+    protected setPumpToRemoteControl(running: boolean = true) {
         return new Promise<void>((resolve, reject) => {
             let out = Outbound.create({
                 protocol: Protocol.Pump,
@@ -414,13 +445,15 @@ export class NixiePumpRS485 extends NixiePump {
             conn.queueSendMessage(out);
         });
     }
-    protected setPumpManual(pstate: PumpState) {
+    protected setPumpFeature(feature?: number) {
+        // empty payload (possibly 0?, too) is no feature
+        // 6: Feature 1
         return new Promise<void>((resolve, reject) => {
             let out = Outbound.create({
                 protocol: Protocol.Pump,
                 dest: this.pump.address,
                 action: 5,
-                payload: [],
+                payload: typeof feature === 'undefined' ? [] : [ feature ],
                 retries: 2,
                 repsonse: true,
                 onComplete: (err, msg: Outbound) => {
@@ -434,7 +467,7 @@ export class NixiePumpRS485 extends NixiePump {
             conn.queueSendMessage(out);
         });
     };
-    protected async setPumpRPMAsync(pstate: PumpState) {
+    protected async setPumpRPMAsync() {
         return new Promise<void>((resolve, reject) => {
             let out = Outbound.create({
                 protocol: Protocol.Pump,
@@ -455,14 +488,14 @@ export class NixiePumpRS485 extends NixiePump {
             conn.queueSendMessage(out);
         });
     };
-    protected async setPumpGPMAsync(pstate: PumpState) {
+    protected async setPumpGPMAsync() {
         // packet for vf; vsf will override
         return new Promise<void>((resolve, reject) => {
             let out = Outbound.create({
                 protocol: Protocol.Pump,
                 dest: this.pump.address,
-                action: 10,
-                payload: [1, 4, 2, 228, this._targetSpeed, 0],
+                action: 1,
+                payload: [2, 228, 0, this._targetSpeed],
                 retries: 1,
                 response: true,
                 onComplete: (err, msg) => {
@@ -484,10 +517,10 @@ export class NixiePumpRS485 extends NixiePump {
             this._pollTimer = null;
             let pstate = state.pumps.getItemById(this.pump.id);
             this._targetSpeed = 0;
-            try { await this.setDriveStateAsync(pstate, false); } catch (err) { logger.error(`Error closing pump ${this.pump.name}: ${err.message}`) }
-            try { await this.setPumpManual(pstate); } catch (err) { logger.error(`Error closing pump ${this.pump.name}: ${err.message}`) }
-            try { await this.setDriveStateAsync(pstate, false); } catch (err) { logger.error(`Error closing pump ${this.pump.name}: ${err.message}`) }
-            try { await this.setPumpToRemoteControl(pstate, false); } catch (err) { logger.error(`Error closing pump ${this.pump.name}: ${err.message}`) }
+            try { await this.setDriveStateAsync(false); } catch (err) { logger.error(`Error closing pump ${this.pump.name}: ${err.message}`) }
+            try { await this.setPumpFeature(); } catch (err) { logger.error(`Error closing pump ${this.pump.name}: ${err.message}`) }
+            try { await this.setDriveStateAsync(false); } catch (err) { logger.error(`Error closing pump ${this.pump.name}: ${err.message}`) }
+            try { await this.setPumpToRemoteControl(false); } catch (err) { logger.error(`Error closing pump ${this.pump.name}: ${err.message}`) }
             this.closing = true;
             // Make sure the polling timer is dead after we have closted this all off.  That way we do not
             // have another process that revives it from the dead.
@@ -500,88 +533,117 @@ export class NixiePumpRS485 extends NixiePump {
     }
 }
 export class NixiePumpVS extends NixiePumpRS485 {
-    public setTargetSpeed() {
+    public setTargetSpeed(pState: PumpState) {
         let _newSpeed = 0;
-        let pumpCircuits = this.pump.circuits.get();
-        for (let i = 0; i < pumpCircuits.length; i++) {
-            let circ = state.circuits.getInterfaceById(pumpCircuits[i].circuit);
-            let pc = pumpCircuits[i];
-            if (circ.isOn) _newSpeed = Math.max(_newSpeed, pc.speed);
+        if (!pState.pumpOnDelay) {
+            let pumpCircuits = this.pump.circuits.get();
+
+            for (let i = 0; i < pumpCircuits.length; i++) {
+                let circ = state.circuits.getInterfaceById(pumpCircuits[i].circuit);
+                let pc = pumpCircuits[i];
+                if (circ.isOn) _newSpeed = Math.max(_newSpeed, pc.speed);
+            }
         }
         if (isNaN(_newSpeed)) _newSpeed = 0;
+        this._targetSpeed = _newSpeed;
         if (this._targetSpeed !== 0) Math.min(Math.max(this.pump.minSpeed, this._targetSpeed), this.pump.maxSpeed);
         if (this._targetSpeed !== _newSpeed) logger.info(`NCP: Setting Pump ${this.pump.name} to ${_newSpeed} RPM.`);
-        this._targetSpeed = _newSpeed;
     }
 }
 export class NixiePumpVF extends NixiePumpRS485 {
-    public setTargetSpeed() {
+    public setTargetSpeed(pState: PumpState) {
         let _newSpeed = 0;
-        let pumpCircuits = this.pump.circuits.get();
-        for (let i = 0; i < pumpCircuits.length; i++) {
-            let circ = state.circuits.getInterfaceById(pumpCircuits[i].circuit);
-            let pc = pumpCircuits[i];
-            if (circ.isOn) _newSpeed = Math.max(_newSpeed, pc.flow);
+        if (!pState.pumpOnDelay) {
+            let pumpCircuits = this.pump.circuits.get();
+            for (let i = 0; i < pumpCircuits.length; i++) {
+                let circ = state.circuits.getInterfaceById(pumpCircuits[i].circuit);
+                let pc = pumpCircuits[i];
+                if (circ.isOn) _newSpeed = Math.max(_newSpeed, pc.flow);
+            }
         }
         if (isNaN(_newSpeed)) _newSpeed = 0;
+        this._targetSpeed = _newSpeed;
         if (this._targetSpeed !== 0) Math.min(Math.max(this.pump.minFlow, this._targetSpeed), this.pump.maxFlow);
         if (this._targetSpeed !== _newSpeed) logger.info(`NCP: Setting Pump ${this.pump.name} to ${_newSpeed} GPM.`);
-        this._targetSpeed = _newSpeed;
     }
 }
 export class NixiePumpVSF extends NixiePumpRS485 {
-    public setTargetSpeed() {
+    public setTargetSpeed(pState: PumpState) {
         let _newSpeed = 0;
-        let pumpCircuits = this.pump.circuits.get();
-        let pt = sys.board.valueMaps.pumpTypes.get(this.pump.type);
-        // VSF pumps present a problem.  In fact they do not currently operate properly on Touch panels.  On touch these need to either be all in RPM or GPM
-        // if there is a mix in the circuit array then they will not work.  In IntelliCenter if there is an RPM setting in the mix it will use RPM by converting
-        // the GPM to RPM but if there is none then it will use GPM.
         let maxRPM = 0;
         let maxGPM = 0;
         let flows = 0;
         let speeds = 0;
-        let toRPM = (flowRate: number, minSpeed: number = 450, maxSpeed: number = 3450) => {
-            let eff = .03317 * maxSpeed;
-            let rpm = Math.min((flowRate * maxSpeed) / eff, maxSpeed);
-            return rpm > 0 ? Math.max(rpm, minSpeed) : 0;
-        };
-        let toGPM = (speed: number, maxSpeed: number = 3450, minFlow: number = 15, maxFlow: number = 140) => {
-            let eff = .03317 * maxSpeed;
-            let gpm = Math.min((eff * speed) / maxSpeed, maxFlow);
-            return gpm > 0 ? Math.max(gpm, minFlow) : 0;
-        }
-        for (let i = 0; i < pumpCircuits.length; i++) {
-            let circ = state.circuits.getInterfaceById(pumpCircuits[i].circuit);
-            let pc = pumpCircuits[i];
-            if (circ.isOn) {
-                if (pc.units > 0) {
-                    maxGPM = Math.max(maxGPM, pc.flow);
-                    // Calculate an RPM from this flow.
-                    maxRPM = Math.max(maxGPM, toRPM(pc.flow, pt.minSpeed, pt.maxSpeed));
-                    flows++;
-                }
-                else {
-                    maxRPM = Math.max(maxRPM, pc.speed);
-                    maxGPM = Math.max(maxGPM, toGPM(pc.speed, pt.maxSpeed, pt.minFlow, pt.maxFlow));
-                    speeds++;
+        if (!pState.pumpOnDelay) {
+            let pumpCircuits = this.pump.circuits.get();
+            let pt = sys.board.valueMaps.pumpTypes.get(this.pump.type);
+            // VSF pumps present a problem.  In fact they do not currently operate properly on Touch panels.  On touch these need to either be all in RPM or GPM
+            // if there is a mix in the circuit array then they will not work.  In IntelliCenter if there is an RPM setting in the mix it will use RPM by converting
+            // the GPM to RPM but if there is none then it will use GPM.
+            let toRPM = (flowRate: number, minSpeed: number = 450, maxSpeed: number = 3450) => {
+                let eff = .03317 * maxSpeed;
+                let rpm = Math.min((flowRate * maxSpeed) / eff, maxSpeed);
+                return rpm > 0 ? Math.max(rpm, minSpeed) : 0;
+            };
+            let toGPM = (speed: number, maxSpeed: number = 3450, minFlow: number = 15, maxFlow: number = 140) => {
+                let eff = .03317 * maxSpeed;
+                let gpm = Math.min((eff * speed) / maxSpeed, maxFlow);
+                return gpm > 0 ? Math.max(gpm, minFlow) : 0;
+            }
+            for (let i = 0; i < pumpCircuits.length; i++) {
+                let circ = state.circuits.getInterfaceById(pumpCircuits[i].circuit);
+                let pc = pumpCircuits[i];
+                if (circ.isOn) {
+                    if (pc.units > 0) {
+                        maxGPM = Math.max(maxGPM, pc.flow);
+                        // Calculate an RPM from this flow.
+                        maxRPM = Math.max(maxGPM, toRPM(pc.flow, pt.minSpeed, pt.maxSpeed));
+                        flows++;
+                    }
+                    else {
+                        maxRPM = Math.max(maxRPM, pc.speed);
+                        maxGPM = Math.max(maxGPM, toGPM(pc.speed, pt.maxSpeed, pt.minFlow, pt.maxFlow));
+                        speeds++;
+                    }
                 }
             }
+            _newSpeed = speeds > 0 || flows === 0 ? maxRPM : maxGPM;
         }
-        _newSpeed = speeds > 0 || flows === 0 ? maxRPM : maxGPM;
         if (isNaN(_newSpeed)) _newSpeed = 0;
         // Send the flow message if it is flow and the rpm message if it is rpm.
         if (this._targetSpeed !== _newSpeed) logger.info(`NCP: Setting Pump ${this.pump.name} to ${_newSpeed} ${flows > 0 ? 'GPM' : 'RPM'}.`);
         this._targetSpeed = _newSpeed;
     }
-    protected async setPumpGPMAsync(pstate: PumpState) {
-        // vsf payload; different from vf payload
+    protected async setPumpRPMAsync() {
+        // vsf action is 10 for rpm
         return new Promise<void>((resolve, reject) => {
             let out = Outbound.create({
                 protocol: Protocol.Pump,
                 dest: this.pump.address,
                 action: 10,
-                payload: [1, 4, 2, 196, this._targetSpeed, 0],
+                payload: [2, 196, Math.floor(this._targetSpeed / 256), this._targetSpeed % 256],
+                retries: 1,
+                // timeout: 250,
+                response: true,
+                onComplete: (err, msg) => {
+                    if (err) {
+                        logger.error(`Error sending setPumpRPMAsync for ${this.pump.name}: ${err.message}`);
+                        reject(err);
+                    }
+                    else resolve();
+                }
+            });
+            conn.queueSendMessage(out);
+        });
+    };
+    protected async setPumpGPMAsync() {
+        // vsf payload; different from vf payload
+        return new Promise<void>((resolve, reject) => {
+            let out = Outbound.create({
+                protocol: Protocol.Pump,
+                dest: this.pump.address,
+                action: 9,
+                payload: [2, 196, 0, this._targetSpeed],
                 retries: 1,
                 response: true,
                 onComplete: (err, msg) => {

package/controller/nixie/schedules/Schedule.ts

@@ -141,8 +141,9 @@ export class NixieSchedule extends NixieEquipment {
                 let body = sys.bodies.find(elem => elem.circuit === circuit.id);
                 if (typeof body !== 'undefined') {
                     let heatSource = sys.board.valueMaps.heatSources.transform(this.schedule.heatSource);
-                    if (heatSource !== 'nochange') {
+                    if (heatSource.name !== 'nochange') {
                         switch (heatSource.name) {
+                            case 'nochange':
                             case 'dontchange':
                                 break;
                             case 'off':
@@ -233,7 +234,7 @@ export class NixieSchedule extends NixieEquipment {
     }
     public logData(filename: string, data: any) { this.controlPanel.logData(filename, data); }
 }
-class NixieScheduleContext {
+class   NixieScheduleContext {
     constructor() {
 
     }

package/controller/nixie/valves/Valve.ts

@@ -102,7 +102,7 @@ export class NixieValve extends NixieEquipment {
         try {
             // Here we go we need to set the valve state.
             if (vstate.isDiverted !== isDiverted) {
-                logger.info(`Nixie: Set valve ${vstate.id}-${vstate.name} to ${isDiverted}`);
+                logger.verbose(`Nixie: Set valve ${vstate.id}-${vstate.name} to ${isDiverted}`);
             }
             if (utils.isNullOrEmpty(this.valve.connectionId) || utils.isNullOrEmpty(this.valve.deviceBinding)) {
                 vstate.isDiverted = isDiverted;

package/defaultConfig.json

@@ -17,7 +17,18 @@
         "autoOpen": false,
         "lock": false
       }
+    },
+    "backups": {
+      "automatic": false,
+      "interval": {
+        "days": 30,
+        "hours": 0
+      },
+      "keepCount": 5,
+      "njsPC":  true,
+      "servers": []
     }
+
   },
   "web": {
     "servers": {
@@ -52,6 +63,7 @@
     "interfaces": {
       "smartThings": {
         "name": "SmartThings",
+        "type": "rest",
         "enabled": false,
         "fileName": "smartThings-Hubitat.json",
         "globals": {},
@@ -62,6 +74,7 @@
       },
       "hubitat": {
         "name": "Hubitat",
+        "type": "rest",
         "enabled": false,
         "fileName": "smartThings-Hubitat.json",
         "globals": {},
@@ -72,6 +85,7 @@
       },
       "vera": {
         "name": "Vera",
+        "type": "rest",
         "enabled": false,
         "fileName": "vera.json",
         "vars": {
@@ -83,6 +97,7 @@
         }
       },
       "valveRelay": {
+        "type": "rest",
         "name": "Valve Relays",
         "enabled": false,
         "fileName": "valveRelays.json",
@@ -100,15 +115,31 @@
         "enabled": false,
         "fileName": "influxDB.json",
         "options": {
+          "version": 1,
           "protocol": "http",
           "host": "192.168.0.1",
-          "port": 32770,
+          "port": 9999,
           "username": "",
           "password": "",
           "database": "pool",
           "retentionPolicy": "autogen"
         }
       },
+      "influxDBv2": {
+        "name": "InfluxDBv2",
+        "type": "influx",
+        "enabled": false,
+        "fileName": "influxDB.json",
+        "options": {
+          "version": 2,
+          "protocol": "http",
+          "host": "192.168.0.1",
+          "port": 9999,
+          "token": "...LuyM84JJx93Qvc7tfaXPbI_mFFjRBjaA==",
+          "org": "example-org",
+          "bucket": "57ec4eed2d90a50b"
+        }
+      },
       "mqtt": {
         "name": "MQTT",
         "type": "mqtt",

package/issue_template.md

@@ -33,7 +33,7 @@ Follow the instructions to complete a [packet capture](https://github.com/tagyou
  - Pump(s) manufacturer and model: [e.g. IntelliFlow 2 VST 011056]
  - Chlorinator: [e.g. iChlor, IntelliChlor-40]
  - Heater(s): [e.g. gas, solar, heatpump, ultratemp]
- - Chemical controller: [e.g. IntelliChem, homegrown]
+ - Chemical controller: [e.g. IntelliChem, Relay Equipment Manager (REM)]
  - Valves: [e.g. Intellivalve]
  - Any other relevant equipment:
 

package/logger/DataLogger.ts

@@ -29,8 +29,10 @@ export class DataLogger {
             }
             let arr: T[] = [];
             for (let i = 0; i < lines.length; i++) {
-                let entry = DataLogger.createEntry<T>(type, lines[i]);
-                arr.push(entry);
+                try {
+                    let entry = DataLogger.createEntry<T>(type, lines[i]);
+                    arr.push(entry);
+                } catch (err) { logger.error(`Skipping invalid dose history entry: ${err.message}`); }
             }
             return arr;
         } catch (err) { logger.error(err); }
@@ -47,6 +49,7 @@ export class DataLogger {
             let newLines = ['\r', '\n'];
             let arr: T[] = [];
             if (fs.existsSync(logPath)) {
+                console.log(`Reading logfile ${logPath}`);
                 // Alright what we have created here is a method to read the data from the end of 
                 // a log file in reverse order (tail) that works for all os implementations.  It is
                 // really dumb that this isn't part of the actual file processing.
@@ -81,15 +84,16 @@ export class DataLogger {
                                 // record then we shoud save off the line and read the next record.
                                 if (newLines.includes(char) || pos === 0) {
                                     if (chars.length > 0) {
-                                        let entry = DataLogger.createEntry<T>(type, chars.join(''));
-                                        if (typeof fn === 'function') {
-                                            let rc = fn(arr.length + 1, entry, arr);
-                                            console.log(rc);
-                                            if (rc === true) arr.push(entry);
-                                            else if (rc === false) break;
-                                        }
-                                        else
-                                            arr.push(entry);
+                                        try {
+                                            let entry = DataLogger.createEntry<T>(type, chars.join(''));
+                                            if (typeof fn === 'function') {
+                                                let rc = fn(arr.length + 1, entry, arr);
+                                                if (rc === true) arr.push(entry);
+                                                else if (rc === false) break;
+                                            }
+                                            else
+                                                arr.push(entry);
+                                        } catch (err) { logger.error(`Skipping invalid dose history entry: ${err.message}`); }
                                     }
                                     chars = [];
                                 }
@@ -142,14 +146,16 @@ export class DataLogger {
                                     // record then we shoud save off the line and read the next record.
                                     if (newLines.includes(char) || pos === 0) {
                                         if (chars.length > 0) {
-                                            let entry = DataLogger.createEntry<T>(type, chars.join(''));
-                                            if (typeof fn === 'function') {
-                                                let rc = fn(arr.length + 1, entry, arr);
-                                                if (rc === true) arr.push(entry);
-                                                else if (rc === false) break;
-                                            }
-                                            else
-                                                arr.push(entry);
+                                            try {
+                                                let entry = DataLogger.createEntry<T>(type, chars.join(''));
+                                                if (typeof fn === 'function') {
+                                                    let rc = fn(arr.length + 1, entry, arr);
+                                                    if (rc === true) arr.push(entry);
+                                                    else if (rc === false) break;
+                                                }
+                                                else
+                                                    arr.push(entry);
+                                            } catch (err) { logger.error(`Skipping invalid dose history entry: ${err.message}`); }
                                         }
                                         chars = [];
                                     }
@@ -276,7 +282,6 @@ export class DataLogger {
                                             let entry = DataLogger.createEntry<T>(type, chars.join(''));
                                             if (typeof fn === 'function') {
                                                 let rc = fn(arr.length + 1, entry, arr);
-                                                console.log(rc);
                                                 if (rc === true) arr.push(entry);
                                                 else if (rc === false) break;
                                             }
@@ -399,11 +404,21 @@ export class DataLoggerEntry {
         // Parse the data from the log entry if it exists.
         if (typeof entry === 'object') entry = JSON.stringify(entry);
         if (typeof entry === 'string') this.parse(entry);
+        else {
+            //console.log(`A DATALOGGER ENTRY DOES NOT HAVE A PROPER TYPE ${typeof entry} *************************************`);
+            //console.log(entry);
+        }
     }
-    public createInstance(entry?: string) { return new DataLoggerEntry(entry); }
+    public static createInstance(entry?: string) { return new DataLoggerEntry(entry); }
     public parse(entry: string) {
         let obj = typeof entry !== 'undefined' ? JSON.parse(entry, this.dateParser) : {};
-        extend(true, this, obj);
+        if (typeof entry === 'undefined') {
+            console.log(`A DATALOGGER ENTRY WAS NOT DEFINED *************************`);
+        }
+        else if (entry === '') {
+            console.log(`THE INCOMING DATALOGGER ENTRY WAS EMPTY ***************************`)
+        }
+        let o = extend(true, this, obj);
     }
     protected dateParser(key, value) {
         if (typeof value === 'string') {