nodejs-poolcontroller 7.4.0 → 7.5.1

package/controller/State.ts

@@ -36,6 +36,7 @@ export class State implements IState {
     private _isDirty: boolean;
     private _timerDirty: NodeJS.Timeout;
     protected _dt: Timestamp;
+    protected _startTime: Timestamp;
     protected _controllerType: ControllerType;
     protected onchange = (obj, fn) => {
         const handler = {
@@ -191,6 +192,8 @@ export class State implements IState {
     public get controllerState() {
         var self = this;
         return {
+            systemUnits: sys.board.valueMaps.systemUnits.transform(sys.general.options.units),
+            startTime: self.data.startTime || '',
             time: self.data.time || '',
             // body: self.data.body || {},
             valve: self.data.valve || 0,
@@ -305,7 +308,6 @@ export class State implements IState {
                 this.hasChanged = true;
             }
         }
-
     }
     public get valve(): number { return this.data.valve; }
     public set valve(val: number) {
@@ -386,6 +388,7 @@ export class State implements IState {
         this.comms = new CommsState();
         this.heliotrope = new Heliotrope();
         this.appVersion = new AppVersionState(this.data, 'appVersion');
+        this.data.startTime = Timestamp.toISOLocal(new Date());
         versionCheck.checkGitLocal();
     }
     public resetData() {
@@ -876,6 +879,11 @@ export class PumpStateCollection extends EqStateCollection<PumpState> {
 }
 export class PumpState extends EqState {
     public dataName: string = 'pump';
+    public initData() {
+        if (typeof this.data.status === 'undefined') {
+            this.data.status = { name: 'ok', desc: 'Ok', val: 0 };
+        }
+    }
     private _threshold = 0.05;
     private exceedsThreshold(origVal: number, newVal: number) {
         return Math.abs((newVal - origVal) / origVal) > this._threshold;
@@ -909,7 +917,7 @@ export class PumpState extends EqState {
         // quick fix for #172
         if (this.status !== val) {
             if (sys.board.valueMaps.pumpTypes.getName(this.type) === 'vsf' && val === 0) {
-                this.data.status = { name: 'ok', desc: 'Ok', val };
+                this.data.status = { name: 'ok', desc: 'Ok', val: 0 };
             }
             else this.data.status = sys.board.valueMaps.pumpStatus.transform(val);
             this.hasChanged = true;
@@ -991,6 +999,7 @@ export class ScheduleState extends EqState {
     public get startDate(): Date { return this._startDate; }
     public set startDate(val: Date) { this._startDate = val; this._saveStartDate(); }
     private _saveStartDate() {
+        if (typeof this._startDate === 'undefined') this._startDate = new Date();
         this.startDate.setHours(0, 0, 0, 0);
         this.setDataVal('startDate', Timestamp.toISOLocal(this.startDate));
     }
@@ -1097,7 +1106,7 @@ export class CircuitGroupStateCollection extends EqStateCollection<CircuitGroupS
         for (let i = this.data.length - 1; i >= 0; i--) {
             if (isNaN(this.data[i].id)) this.data.splice(i, 1);
             else {
-                if (typeof sys.pumps.find(elem => elem.id === this.data[i].id) === 'undefined') this.removeItemById(this.data[i].id);
+                if (typeof sys.circuitGroups.find(elem => elem.id === this.data[i].id) === 'undefined') this.removeItemById(this.data[i].id);
             }
         }
         let cfg = sys.circuitGroups.toArray();
@@ -1173,7 +1182,7 @@ export class LightGroupStateCollection extends EqStateCollection<LightGroupState
         for (let i = this.data.length - 1; i >= 0; i--) {
             if (isNaN(this.data[i].id)) this.data.splice(i, 1);
             else {
-                if (typeof sys.pumps.find(elem => elem.id === this.data[i].id) === 'undefined') this.removeItemById(this.data[i].id);
+                if (typeof sys.lightGroups.find(elem => elem.id === this.data[i].id) === 'undefined') this.removeItemById(this.data[i].id);
             }
         }
         let cfg = sys.lightGroups.toArray();
@@ -1279,6 +1288,7 @@ export class BodyTempState extends EqState {
     public dataName = 'bodyTempState';
     public initData() {
         if (typeof this.data.heaterOptions === 'undefined') this.data.heaterOptions = { total: 0 };
+        if (typeof this.data.isCovered === 'undefined') this.data.isCovered = false;
     }
     public get id(): number { return this.data.id; }
     public set id(val: number) { this.setDataVal('id', val); }
@@ -1317,6 +1327,8 @@ export class BodyTempState extends EqState {
     public set coolSetpoint(val: number) { this.setDataVal('coolSetpoint', val); }
     public get isOn(): boolean { return this.data.isOn; }
     public set isOn(val: boolean) { this.setDataVal('isOn', val); }
+    public get isCovered(): boolean { return this.data.isCovered; }
+    public set isCovered(val: boolean) { this.setDataVal('isCovered', val); }
     public emitData(name: string, data: any) { webApp.emitToClients('body', this.data); }
     // RKS: This is a very interesting object because we have a varied object.  Type safety rules should not apply
     // here as the heater types are specific to the installed equipment.  The reason is because it has no meaning without the body and the calculation of it should
@@ -1388,7 +1400,7 @@ export class HeaterStateCollection extends EqStateCollection<HeaterState> {
                 this.data.splice(i, 1);
             }
             else {
-                if (typeof sys.pumps.find(elem => elem.id === this.data[i].id) === 'undefined') this.removeItemById(this.data[i].id);
+                if (typeof sys.heaters.find(elem => elem.id === this.data[i].id) === 'undefined') this.removeItemById(this.data[i].id);
             }
         }
         let cfg = sys.heaters.toArray();
@@ -1435,7 +1447,7 @@ export class FeatureStateCollection extends EqStateCollection<FeatureState> {
         for (let i = this.data.length - 1; i >= 0; i--) {
             if (isNaN(this.data[i].id)) this.data.splice(i, 1);
             else {
-                if (typeof sys.pumps.find(elem => elem.id === this.data[i].id) === 'undefined') this.removeItemById(this.data[i].id);
+                if (typeof sys.features.find(elem => elem.id === this.data[i].id) === 'undefined') this.removeItemById(this.data[i].id);
             }
         }
         let cfg = sys.features.toArray();
@@ -1532,7 +1544,7 @@ export class CircuitStateCollection extends EqStateCollection<CircuitState> {
         for (let i = this.data.length - 1; i >= 0; i--) {
             if (isNaN(this.data[i].id)) this.data.splice(i, 1);
             else {
-                if (typeof sys.pumps.find(elem => elem.id === this.data[i].id) === 'undefined') this.removeItemById(this.data[i].id);
+                if (typeof sys.circuits.find(elem => elem.id === this.data[i].id) === 'undefined') this.removeItemById(this.data[i].id);
             }
         }
         let cfg = sys.circuits.toArray();
@@ -1569,10 +1581,12 @@ export class CircuitState extends EqState implements ICircuitState {
             this.hasChanged = true;
         }
     }
-    public get lightingTheme(): number { return typeof (this.data.lightingTheme) !== 'undefined' ? this.data.lightingTheme.val : 255; }
+    public get lightingTheme(): number { return typeof this.data.lightingTheme !== 'undefined' ? this.data.lightingTheme.val : 255; }
     public set lightingTheme(val: number) {
         if (this.lightingTheme !== val) {
-            this.data.lightingTheme = sys.board.valueMaps.lightThemes.transform(val);
+            // Force this to undefined when we are a circuit without a theme.
+            if (typeof val === 'undefined') this.data.lightingTheme = undefined;
+            else this.data.lightingTheme = sys.board.valueMaps.lightThemes.transform(val);
             this.hasChanged = true;
         }
     }
@@ -1603,7 +1617,7 @@ export class ValveStateCollection extends EqStateCollection<ValveState> {
         for (let i = this.data.length - 1; i >= 0; i--) {
             if (isNaN(this.data[i].id)) this.data.splice(i, 1);
             else {
-                if (typeof sys.pumps.find(elem => elem.id === this.data[i].id) === 'undefined') this.removeItemById(this.data[i].id);
+                if (typeof sys.valves.find(elem => elem.id === this.data[i].id) === 'undefined') this.removeItemById(this.data[i].id);
             }
         }
         let cfg = sys.valves.toArray();
@@ -1643,7 +1657,7 @@ export class ValveState extends EqState {
         if (valve.circuit !== 256) vstate.circuit = state.circuits.getInterfaceById(valve.circuit).get(true);
         vstate.isIntake = utils.makeBool(valve.isIntake);
         vstate.isReturn = utils.makeBool(valve.isReturn);
-        vstate.isVirtual = utils.makeBool(valve.isVirtual);
+        // vstate.isVirtual = utils.makeBool(valve.isVirtual);
         vstate.isActive = utils.makeBool(valve.isActive);
         vstate.pinId = valve.pinId;
         return vstate;
@@ -1661,12 +1675,15 @@ export class CoverStateCollection extends EqStateCollection<CoverState> {
 }
 export class CoverState extends EqState {
     public dataName: string = 'cover';
+    public initData() {
+        if (typeof this.data.isClosed === 'undefined') this.data.isClosed = false;
+    }
     public get id(): number { return this.data.id; }
     public set id(val: number) { this.data.id = val; }
     public get name(): string { return this.data.name; }
     public set name(val: string) { this.setDataVal('name', val); }
-    public get isOpen(): boolean { return this.data.isOpen; }
-    public set isOpen(val: boolean) { this.setDataVal('isOpen', val); }
+    public get isClosed(): boolean { return this.data.isClosed; }
+    public set isClosed(val: boolean) { this.setDataVal('isClosed', val); }
 }
 export class ChlorinatorStateCollection extends EqStateCollection<ChlorinatorState> {
     public createItem(data: any): ChlorinatorState { return new ChlorinatorState(data); }
@@ -1676,7 +1693,7 @@ export class ChlorinatorStateCollection extends EqStateCollection<ChlorinatorSta
         for (let i = this.data.length - 1; i >= 0; i--) {
             if (isNaN(this.data[i].id)) this.data.splice(i, 1);
             else {
-                if (typeof sys.pumps.find(elem => elem.id === this.data[i].id) === 'undefined') this.removeItemById(this.data[i].id);
+                if (typeof sys.chlorinators.find(elem => elem.id === this.data[i].id) === 'undefined') this.removeItemById(this.data[i].id);
             }
         }
         let cfg = sys.chlorinators.toArray();
@@ -1730,16 +1747,6 @@ export class ChlorinatorState extends EqState {
             this.hasChanged = true;
         }
     }
-    //public get virtualControllerStatus(): number {
-    //    return typeof (this.data.virtualControllerStatus) !== 'undefined' ? this.data.virtualControllerStatus.val : -1;
-    //}
-    //public set virtualControllerStatus(val: number) {
-    //    if (this.virtualControllerStatus !== val) {
-    //        this.data.virtualControllerStatus = sys.board.valueMaps.virtualControllerStatus.transform(val);
-    //        this.hasChanged = true;
-
-    //    }
-    //}
     public get type(): number { return typeof (this.data.type) !== 'undefined' ? this.data.type.val : -1; }
     public set type(val: number) {
         if (this.type !== val) {
@@ -1826,6 +1833,12 @@ export class ChlorinatorState extends EqState {
         else
             this.setDataVal('superChlor', false);
     }
+    public getExtended(): any {
+        let schlor = this.get(true);
+        let chlor = sys.chlorinators.getItemById(this.id, false);
+        schlor.lockSetpoints = chlor.disabled || chlor.isDosing;
+        return schlor;
+    }
 }
 export class ChemControllerStateCollection extends EqStateCollection<ChemControllerState> {
     public createItem(data: any): ChemControllerState { return new ChemControllerState(data); }
@@ -1833,7 +1846,7 @@ export class ChemControllerStateCollection extends EqStateCollection<ChemControl
         for (let i = this.data.length - 1; i >= 0; i--) {
             if (isNaN(this.data[i].id)) this.data.splice(i, 1);
             else {
-                if (typeof sys.pumps.find(elem => elem.id === this.data[i].id) === 'undefined') this.removeItemById(this.data[i].id);
+                if (typeof sys.chemControllers.find(elem => elem.id === this.data[i].id) === 'undefined') this.removeItemById(this.data[i].id);
             }
         }
         // Make sure we have at least the items that exist in the config.
@@ -1874,7 +1887,7 @@ export class ChemControllerState extends EqState {
         //var chemControllerState = {
         //    lastComm: 'number',             // The unix time the chem controller sent its status.
         //    id: 'number',                   // Id of the chemController.
-        //    type: 'valueMap',               // intellichem, homegrown, rem.
+        //    type: 'valueMap',               // intellichem, rem.
         //    address: 'number',              // Assigned address if IntelliChem.
         //    name: 'string',                 // Name assigned to the controller.
         //    status: 'valueMap',             // ok, nocomms, setupError
@@ -2113,7 +2126,6 @@ export class ChemicalState extends ChildEqState {
         if (typeof this.data.flowDelay === 'undefined') this.data.flowDelay = false;
         if (typeof this.data.dosingStatus === 'undefined') this.dosingStatus = 2;
         if (typeof this.data.enabled === 'undefined') this.data.enabled = true;
-        if (typeof this.data.level === 'undefined') this.data.level = 0;
     }
     public getConfig(): Chemical { return; }
     public calcDoseHistory(): number {
@@ -2277,7 +2289,7 @@ export class ChemicalState extends ChildEqState {
 }
 export class ChemicalPhState extends ChemicalState {
     public initData() {
-        if (typeof this.data.chemType === 'undefined') this.data.chemType === 'acid';
+        // if (typeof this.data.chemType === 'undefined') this.data.chemType === 'acid';  // RSG 10-23-21 - Only a getter; don't need to set this.
         super.initData();
     }
     public getConfig() {
@@ -2482,14 +2494,16 @@ export class ChemicalDoseState extends DataLoggerEntry {
     public _isManual: boolean;
 
     constructor(entry?: string | object) {
-        super(entry);
+        super();
+        if (typeof entry === 'object') entry = JSON.stringify(entry);
+        if (typeof entry === 'string') this.parse(entry);
         // Javascript is idiotic in that the initialization of variables
         // do not happen before the assignment so some of the values can be undefined.
         if (typeof this.volumeDosed === 'undefined' || !this.volumeDosed) this.volumeDosed = 0;
         if (typeof this.volume === 'undefined' || !this.volume) this.volume = 0;
         if (typeof this._isManual === 'undefined') this._isManual = this.method === 'manual';
         if (typeof this.timeDosed === 'undefined' || !this.timeDosed) this.timeDosed = 0;
-        if (typeof this._timeDosed === 'undefined') this.timeDosed * 1000;
+        if (typeof this._timeDosed === 'undefined') this._timeDosed = this.timeDosed * 1000;
         if (typeof this.time === 'undefined' || !this.time) this.time = 0;
     }
     public id: number;
@@ -2506,10 +2520,40 @@ export class ChemicalDoseState extends DataLoggerEntry {
     public time: number;
     public timeDosed: number;
 
-    public createInstance(entry?: string): ChemicalDoseState { return new ChemicalDoseState(entry); }
+    public static createInstance(entry?: string): ChemicalDoseState { return new ChemicalDoseState(entry); }
     public save() { DataLogger.writeEnd(`chemDosage_${this.chem}.log`, this); }
     public get timeRemaining(): number { return Math.floor(Math.max(0, this.time - (this._timeDosed / 1000))); }
     public get volumeRemaining(): number { return Math.max(0, this.volume - this.volumeDosed); }
+    public parse(entry: string) {
+        // let obj = typeof entry !== 'undefined' ? JSON.parse(entry, this.dateParser) : {};
+        let obj = typeof entry !== 'undefined' ? JSON.parse(entry) : {};
+        for (const prop in obj) {obj[prop] = this.dateParser(prop, obj[prop])}
+        if (typeof obj.setpoint !== 'undefined') this.setpoint = obj.setpoint;
+        if (typeof obj.method !== 'undefined') this.method = obj.method;
+        if (typeof obj.start !== 'undefined') this.start = obj.start;
+        if (typeof obj.end !== 'undefined') this.end = obj.end;
+        if (typeof obj.chem !== 'undefined') this.chem = obj.chem;
+        if (typeof obj.demand !== 'undefined') this.demand = obj.demand;
+        if (typeof obj.id !== 'undefined') this.id = obj.id;
+        if (typeof obj.level !== 'undefined') this.level = obj.level;
+        if (typeof obj.volume !== 'undefined') this.volume = obj.volume;
+        if (typeof obj.status !== 'undefined') this.status = obj.status;
+        if (typeof obj.volumeDosed !== 'undefined') this.volumeDosed = obj.volumeDosed;
+        if (typeof obj.time !== 'undefined') this.time = obj.time;
+        if (typeof obj.timeDosed !== 'undefined') this.timeDosed = obj.timeDosed;
+        // this.setProperties(obj);
+    }
+    protected setProperties(data: any) {
+        let op = Object.getOwnPropertyNames(Object.getPrototypeOf(this));
+        for (let i in op) {
+            let prop = op[i];
+            if (typeof this[prop] === 'function') continue;
+            if (typeof data[prop] !== 'undefined') {
+                if (typeof this[prop] === null || typeof data[prop] === null) continue;
+                this[prop] = data[prop];
+            }
+        }
+    }
 }
 
 export class ChemicalDemandState extends ChildEqState {

package/controller/boards/EasyTouchBoard.ts

@@ -162,10 +162,10 @@ export class EasyTouchBoard extends SystemBoard {
         // We need this because there is a no-pump thing in *Touch.
         // RKS: 05-04-21 The no-pump item was removed as this was only required for -webClient.  deletePumpAsync should remove the pump from operation.
         this.valueMaps.pumpTypes = new byteValueMap([
-            [1, { name: 'vf', desc: 'Intelliflo VF', minFlow: 15, maxFlow: 130, flowStepSize: 1, maxCircuits: 8, hasAddress: true }],
+            [1, { name: 'vf', desc: 'Intelliflo VF', maxPrimingTime: 6, minFlow: 15, maxFlow: 130, flowStepSize: 1, maxCircuits: 8, hasAddress: true }],
             [64, { name: 'vsf', desc: 'Intelliflo VSF', minSpeed: 450, maxSpeed: 3450, speedStepSize: 10, minFlow: 15, maxFlow: 130, flowStepSize: 1, maxCircuits: 8, hasAddress: true }],
             [65, { name: 'ds', desc: 'Two-Speed', maxCircuits: 40, hasAddress: false, hasBody: true }],
-            [128, { name: 'vs', desc: 'Intelliflo VS', maxPrimingTime: 6, minSpeed: 450, maxSpeed: 3450, speedStepSize: 10, maxCircuits: 8, hasAddress: true }],
+            [128, { name: 'vs', desc: 'Intelliflo VS', maxPrimingTime: 10, minSpeed: 450, maxSpeed: 3450, speedStepSize: 10, maxCircuits: 8, hasAddress: true }],
             [169, { name: 'vssvrs', desc: 'IntelliFlo VS+SVRS', maxPrimingTime: 6, minSpeed: 450, maxSpeed: 3450, speedStepSize: 10, maxCircuits: 8, hasAddress: true }],
             [257, { name: 'ss', desc: 'Single Speed', maxCircuits: 0, hasAddress: false, hasBody: true, equipmentMaster: 1 }],
             [256, { name: 'sf', desc: 'SuperFlo VS', hasAddress: false, maxCircuits: 8, maxRelays: 4, equipmentMaster: 1 }]
@@ -306,6 +306,14 @@ export class EasyTouchBoard extends SystemBoard {
                 return extend(true, {}, { val: byte, desc: customName.name, name: customName.name });
             }
         };
+        this.valueMaps.panelModes = new byteValueMap([
+            [0, { val: 0, name: 'auto', desc: 'Auto' }],
+            [1, { val: 1, name: 'service', desc: 'Service' }],
+            [8, { val: 8, name: 'freeze', desc: 'Freeze' }],
+            [128, { val: 128, name: 'timeout', desc: 'Timeout' }],
+            [129, { val: 129, name: 'service-timeout', desc: 'Service/Timeout' }],
+            [255, { name: 'error', desc: 'System Error' }]
+          ]);
         this.valueMaps.expansionBoards = new byteValueMap([
             [0, { name: 'ET28', part: 'ET2-8', desc: 'EasyTouch2 8', circuits: 8, shared: true }],
             [1, { name: 'ET28P', part: 'ET2-8P', desc: 'EasyTouch2 8P', circuits: 8, shared: false }],
@@ -337,15 +345,16 @@ export class EasyTouchBoard extends SystemBoard {
             // Add in the bodies for the configuration.  These need to be set.
             let cbody = sys.bodies.getItemById(i, true);
             let tbody = state.temps.bodies.getItemById(i, true);
-            // If the body doesn't represent a spa then we set the type.
-            tbody.type = cbody.type = i > 1 && !sys.equipment.shared ? 1 : 0;
             cbody.isActive = true;
+            // If the body doesn't represent a spa then we set the type.
+            // RSG - 10-5-21: If a single body IT (i5+3s/i9+3s) the bodies are the same; set to pool
+            tbody.type = cbody.type = i > 1 && !sys.equipment.shared && sys.equipment.intakeReturnValves ? 1 : 0;
             if (typeof cbody.name === 'undefined') {
                 let bt = sys.board.valueMaps.bodyTypes.transform(cbody.type);
                 tbody.name = cbody.name = bt.name;
             }
         }
-        if (!sys.equipment.shared && !sys.equipment.dual) {
+        if (!sys.equipment.shared && !sys.equipment.dual && state.equipment.controllerType !== 'intellitouch') {
             sys.bodies.removeItemById(2);
             state.temps.bodies.removeItemById(2);
         }
@@ -382,6 +391,7 @@ export class EasyTouchBoard extends SystemBoard {
         eq.maxChlorinators = md.chlorinators = 1;
         eq.maxChemControllers = md.chemControllers = 1;
         eq.maxCustomNames = 10;
+        eq.intakeReturnValves = md.intakeReturnValves = typeof mt.intakeReturnValves !== 'undefined' ? mt.intakeReturnValves : false;
         // Calculate out the invalid ids.
         sys.board.equipmentIds.invalidIds.set([]);
         if (!eq.shared) sys.board.equipmentIds.invalidIds.merge([1]);
@@ -1262,6 +1272,7 @@ export class TouchCircuitCommands extends CircuitCommands {
             // response: [255,0,255][165,33,34,16,1,1][139][1,133]
             let id = parseInt(data.id, 10);
             if (isNaN(id)) return Promise.reject(new InvalidEquipmentIdError('Circuit Id is invalid', data.id, 'Feature'));
+            if (id >= 255 || data.master === 1) return super.setCircuitAsync(data);
             let circuit = sys.circuits.getInterfaceById(id);
             // Alright check to see if we are adding a nixie circuit.
             if (id === -1 || circuit.master !== 0) {
@@ -1292,6 +1303,7 @@ export class TouchCircuitCommands extends CircuitCommands {
                             circuit.eggTimer = typeof data.eggTimer !== 'undefined' ? parseInt(data.eggTimer, 10) : circuit.eggTimer || 720;
                             circuit.dontStop = (typeof data.dontStop !== 'undefined') ? utils.makeBool(data.dontStop) : circuit.eggTimer === 1620;
                             cstate.isActive = circuit.isActive = true;
+                            circuit.master = 0;
                             let eggTimer = sys.eggTimers.find(elem => elem.circuit === parseInt(data.id, 10));
                             try {
                                 if (circuit.eggTimer === 720) {
@@ -1657,28 +1669,26 @@ class TouchChlorinatorCommands extends ChlorinatorCommands {
     public async setChlorAsync(obj: any): Promise<ChlorinatorState> {
         let id = parseInt(obj.id, 10);
         let isAdd = false;
-        let isVirtual = false;
-        if (id <= 0 || isNaN(id)) id = 1;
         let chlor = sys.chlorinators.getItemById(id);
-        if (id < 0 || isNaN(id)) {
+        if (id <= 0 || isNaN(id)) {
             isAdd = true;
-            chlor.master = utils.makeBool(obj.isVirtual) ? 0 : 1;
+            chlor.master = utils.makeBool(obj.master) ? 1 : 0;
             // Calculate an id for the chlorinator.  The messed up part is that if a chlorinator is not attached to the OCP, its address
             // cannot be set by the MUX.  This will have to wait.
             id = 1;
-        }
-        //let chlor = extend(true, {}, sys.chlorinators.getItemById(id).get(), obj);
-        // If this is a virtual chlorinator then go to the base class and handle it from there.
+        }        
+        // If this is a Nixie chlorinator then go to the base class and handle it from there.
+        if (chlor.master === 1) return super.setChlorAsync(obj);
         // RKS: I am not even sure this can be done with Touch as the master on the RS485 bus.
-        if (chlor.master === 1 || isVirtual) return super.setChlorAsync(obj);
+        if (typeof chlor.master === 'undefined') chlor.master = 0;
         let name = obj.name || chlor.name || 'IntelliChlor' + id;
-        let poolSetpoint = parseInt(obj.poolSetpoint, 10);
-        let spaSetpoint = parseInt(obj.spaSetpoint, 10);
         let superChlorHours = parseInt(obj.superChlorHours, 10);
         if (typeof obj.superChlorinate !== 'undefined') obj.superChlor = utils.makeBool(obj.superChlorinate);
         let superChlorinate = typeof obj.superChlor === 'undefined' ? undefined : utils.makeBool(obj.superChlor);
-        let disabled = typeof obj.disabled !== 'undefined' ? utils.makeBool(obj.disabled) : chlor.disabled;
         let isDosing = typeof obj.isDosing !== 'undefined' ? utils.makeBool(obj.isDosing) : chlor.isDosing;
+        let disabled = typeof obj.disabled !== 'undefined' ? utils.makeBool(obj.disabled) : chlor.disabled;
+        let poolSetpoint = typeof obj.poolSetpoint !== 'undefined' ? parseInt(obj.poolSetpoint, 10) : chlor.poolSetpoint;
+        let spaSetpoint = typeof obj.spaSetpoint !== 'undefined' ? parseInt(obj.spaSetpoint, 10) : chlor.spaSetpoint;
         let model = typeof obj.model !== 'undefined' ? obj.model : chlor.model;
         let chlorType = typeof obj.type !== 'undefined' ? sys.board.valueMaps.chlorinatorType.encode(obj.type) : chlor.type || 0;
         if (isAdd) {
@@ -1705,6 +1715,7 @@ class TouchChlorinatorCommands extends ChlorinatorCommands {
         if (poolSetpoint > 100 || poolSetpoint < 0) return Promise.reject(new InvalidEquipmentDataError(`Chlorinator poolSetpoint is out of range: ${chlor.poolSetpoint}`, 'chlorinator', chlor.poolSetpoint));
         if (spaSetpoint > 100 || spaSetpoint < 0) return Promise.reject(new InvalidEquipmentDataError(`Chlorinator spaSetpoint is out of range: ${chlor.poolSetpoint}`, 'chlorinator', chlor.spaSetpoint));
         if (typeof obj.ignoreSaltReading !== 'undefined') chlor.ignoreSaltReading = utils.makeBool(obj.ignoreSaltReading);
+
         let _timeout: NodeJS.Timeout;
         try {
             let request153packet = new Promise<void>((resolve, reject) => {
@@ -1726,7 +1737,6 @@ class TouchChlorinatorCommands extends ChlorinatorCommands {
                             reject = undefined;
                         }
                         else {
-                            logger.debug(`chlor response 153`);
                             resolve();
                             resolve = undefined;
                         }
@@ -1772,7 +1782,6 @@ class TouchChlorinatorCommands extends ChlorinatorCommands {
                             reject(err);
                         }
                         else{
-                            logger.debug(`chlor resolve 217`);
                             resolve();
                         }
                     }
@@ -1793,7 +1802,9 @@ class TouchChlorinatorCommands extends ChlorinatorCommands {
     }
     public async deleteChlorAsync(obj: any): Promise<ChlorinatorState> {
         let id = parseInt(obj.id, 10);
-        if (isNaN(id)) obj.id = 1;
+        if (isNaN(id)) return Promise.reject(new InvalidEquipmentDataError(`Chlorinator id is not valid: ${obj.id}`, 'chlorinator', obj.id));
+        let chlor = sys.chlorinators.getItemById(id);
+        if (chlor.master === 1) return await super.deleteChlorAsync(obj);
         return new Promise<ChlorinatorState>((resolve, reject) => {
             let out = Outbound.create({
                 dest: 16,
@@ -1807,8 +1818,9 @@ class TouchChlorinatorCommands extends ChlorinatorCommands {
                         reject(err);
                     }
                     else {
-                        let cstate = state.chlorinators.getItemById(id);
-                        let chlor = sys.chlorinators.getItemById(id);
+                        ncp.chlorinators.deleteChlorinatorAsync(id).then(()=>{});
+                        let cstate = state.chlorinators.getItemById(id, true);
+                        chlor = sys.chlorinators.getItemById(id, true);
                         chlor.isActive = cstate.isActive = false;
                         sys.chlorinators.removeItemById(id);
                         state.chlorinators.removeItemById(id);
@@ -1950,10 +1962,11 @@ class TouchPumpCommands extends PumpCommands {
                 }
             }
             isAdd = true;
+            pump = sys.pumps.getItemById(id, true);
         }
         else {
             pump = sys.pumps.getItemById(id, false);
-            if (data.master > 0 || pump.master > 0 || pump.isVirtual) return await super.setPumpAsync(data);
+            if (data.master > 0 || pump.master > 0) return await super.setPumpAsync(data);
             ntype = typeof data.type === 'undefined' ? pump.type : parseInt(data.type, 10);
             if (isNaN(ntype)) return Promise.reject(new InvalidEquipmentDataError(`Pump type ${data.type} is not valid`, 'Pump', data));
             type = sys.board.valueMaps.pumpTypes.transform(ntype);
@@ -1984,7 +1997,6 @@ class TouchPumpCommands extends PumpCommands {
         if (type.name === 'ss') {
             // The OCP doesn't deal with single speed pumps.  Simply add it to the config.
             data.circuits = [];
-            pump = sys.pumps.getItemById(id, true);
             pump.set(pump);
             let spump = state.pumps.getItemById(id, true);
             for (let prop in spump) {
@@ -2016,21 +2028,25 @@ class TouchPumpCommands extends PumpCommands {
                 retries: 2,
                 response: Response.create({ action: 1, payload: [155] })
             });
-            outc.appendPayloadByte(typeof type.maxPrimingTime !== 'undefined' ? data.primingTime : 0, pump.primingTime | 0);
             outc.appendPayloadBytes(0, 44);
-            if (typeof type.maxPrimingTime !== 'undefined' && type.maxPrimingTime > 0) {
+            if (type.val === 128){
+                outc.setPayloadByte(3, 2);
+            }
+            if (typeof type.maxPrimingTime !== 'undefined' && type.maxPrimingTime > 0 && type.val >=64) {
+                outc.setPayloadByte(2, parseInt(data.primingTime, 10), pump.primingTime || 1);
                 let primingSpeed = typeof data.primingSpeed !== 'undefined' ? parseInt(data.primingSpeed, 10) : pump.primingSpeed || type.minSpeed;
                 outc.setPayloadByte(21, Math.floor(primingSpeed / 256));
-                outc.setPayloadByte(30, primingSpeed - (Math.floor(primingSpeed / 256) * 256));
+                outc.setPayloadByte(30, primingSpeed % 256);
             }
-            if (type.val > 1 && type.val < 64) { // Any VF pump.  It probably only goes up to Circuit 40 because that's how many circuits *Touch can support.
+            if (type.val === 1) { // Any VF pump. 
                 outc.setPayloadByte(1, parseInt(data.backgroundCircuit, 10), pump.backgroundCircuit || 6);
+                outc.setPayloadByte(2, parseInt(data.filterSize, 10) / 1000, pump.filterSize / 1000 || 15);
+                // outc.setPayloadByte(2, body.capacity / 1000, 15);  RSG - This is filter size, which may or may not equal the body size.
                 outc.setPayloadByte(3, parseInt(data.turnovers, 10), pump.turnovers || 2);
                 let body = sys.bodies.getItemById(1, sys.equipment.maxBodies >= 1);
-                outc.setPayloadByte(2, body.capacity / 1000, 15);
                 outc.setPayloadByte(21, parseInt(data.manualFilterGPM, 10), pump.manualFilterGPM || 30);
                 outc.setPayloadByte(22, parseInt(data.primingSpeed, 10), pump.primingSpeed || 55);
-                let primingTime = typeof data.primingTime !== 'undefined' ? parseInt(data.primingTime, 10) : pump.primingTime;
+                let primingTime = typeof data.primingTime !== 'undefined' ? parseInt(data.primingTime, 10) : pump.primingTime || 0;
                 let maxSystemTime = typeof data.maxSystemTime !== 'undefined' ? parseInt(data.maxSystemTime, 10) : pump.maxSystemTime;
                 outc.setPayloadByte(23, primingTime | maxSystemTime << 4, 5);
                 outc.setPayloadByte(24, parseInt(data.maxPressureIncrease, 10), pump.maxPressureIncrease || 10);
@@ -2038,7 +2054,7 @@ class TouchPumpCommands extends PumpCommands {
                 outc.setPayloadByte(26, parseInt(data.backwashTime, 10), pump.backwashTime || 5);
                 outc.setPayloadByte(27, parseInt(data.rinseTime, 10), pump.rinseTime || 1);
                 outc.setPayloadByte(28, parseInt(data.vacuumFlow, 10), pump.vacuumFlow || 50);
-                outc.setPayloadByte(28, parseInt(data.vacuumTime, 10), pump.vacuumTime || 10);
+                outc.setPayloadByte(30, parseInt(data.vacuumTime, 10), pump.vacuumTime || 10);
             }
             if (typeof type.maxCircuits !== 'undefined' && type.maxCircuits > 0 && typeof data.circuits !== 'undefined') { // This pump type supports circuits
                 for (let i = 1; i <= data.circuits.length && i <= type.maxCircuits; i++) {
@@ -2051,7 +2067,7 @@ class TouchPumpCommands extends PumpCommands {
                     c.units = parseInt(c.units, 10) || type.name === 'vf' ? sys.board.valueMaps.pumpUnits.getValue('gpm') : sys.board.valueMaps.pumpUnits.getValue('rpm');
                     if (typeof type.minSpeed !== 'undefined' && c.units === sys.board.valueMaps.pumpUnits.getValue('rpm')) {
                         outc.setPayloadByte(i * 2 + 4, Math.floor(speed / 256)); // Set to rpm
-                        outc.setPayloadByte(i + 21, speed - (Math.floor(speed / 256) * 256));
+                        outc.setPayloadByte(i + 21, speed % 256);
                         c.speed = speed;
                     }
                     else if (typeof type.minFlow !== 'undefined' && c.units === sys.board.valueMaps.pumpUnits.getValue('gpm')) {
@@ -2088,7 +2104,7 @@ class TouchPumpCommands extends PumpCommands {
         // [165,33,16,34,155,46],[1,128,0,2,0,16,12,6,7,1,9,4,11,11,3,128,8,0,2,18,2,3,128,8,196,184,232,152,188,238,232,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[9,75]
         const setPumpConfig = Outbound.create({
             action: 155,
-            payload: [pump.id, pump.type, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+            payload: [pump.id, pump.type, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
             retries: 2,
             response: true
         });
@@ -2164,6 +2180,34 @@ class TouchPumpCommands extends PumpCommands {
         spump.type = pump.type;
         spump.status = 0;
     }
+    public async deletePumpAsync(pump: Pump):Promise<Pump>{
+        let id = pump.id;
+        if (isNaN(id)) return Promise.reject(new InvalidEquipmentIdError(`DeletePumpAsync: Pump ${id} is not valid.`, 0, `pump`))
+        const outc = Outbound.create({
+            action: 155,
+            payload: [id, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+            retries: 2,
+            response: true
+        });
+        return new Promise<Pump>((resolve, reject) => {
+            outc.onComplete = (err, msg) => {
+                if (err) reject(err);
+                else {
+                    sys.pumps.removeItemById(id);
+                    state.pumps.removeItemById(id);
+                    resolve(sys.pumps.getItemById(id,false));
+                    const pumpConfigRequest = Outbound.create({
+                        action: 216,
+                        payload: [id],
+                        retries: 2,
+                        response: true
+                    });
+                    conn.queueSendMessage(pumpConfigRequest);
+                }
+            };
+            conn.queueSendMessage(outc);
+        });
+    }
 }
 class TouchHeaterCommands extends HeaterCommands {
     public getInstalledHeaterTypes(body?: number): any {
@@ -2224,13 +2268,14 @@ class TouchHeaterCommands extends HeaterCommands {
     }
     // RKS: Not sure what to do with this as the heater data for Touch isn't actually processed anywhere.
     public async setHeaterAsync(obj: any): Promise<Heater> {
+        if (obj.master === 1 || parseInt(obj.id, 10) > 255) return super.setHeaterAsync(obj);
         return new Promise<Heater>((resolve, reject) => {
             let id = typeof obj.id === 'undefined' ? -1 : parseInt(obj.id, 10);
             if (isNaN(id)) return reject(new InvalidEquipmentIdError('Heater Id is not valid.', obj.id, 'Heater'));
             let heater: Heater;
             if (id <= 0) {
                 // We are adding a heater.  In this case all heaters are virtual.
-                let heaters = sys.heaters.filter(h => h.isVirtual === false);
+                let heaters = sys.heaters.filter(h => h.master === 1);
                 id = heaters.getMaxId() + 1;
             }
             heater = sys.heaters.getItemById(id, true);
@@ -2241,7 +2286,7 @@ class TouchHeaterCommands extends HeaterCommands {
                 }
             }
             let hstate = state.heaters.getItemById(id, true);
-            //hstate.isVirtual = heater.isVirtual = true;
+
             hstate.name = heater.name;
             hstate.type = heater.type;
             heater.master = 1;
@@ -2251,7 +2296,7 @@ class TouchHeaterCommands extends HeaterCommands {
         });
     }
     public async deleteHeaterAsync(obj: any): Promise<Heater> {
-        if (utils.makeBool(obj.isVirtual) || obj.master === 1 || parseInt(obj.id, 10) > 255) return await super.deleteHeaterAsync(obj);
+        if (utils.makeBool(obj.master === 1 || parseInt(obj.id, 10) > 255)) return super.deleteHeaterAsync(obj);
         return new Promise<Heater>((resolve, reject) => {
             let id = parseInt(obj.id, 10);
             if (isNaN(id)) return reject(new InvalidEquipmentIdError('Cannot delete.  Heater Id is not valid.', obj.id, 'Heater'));
@@ -2337,7 +2382,7 @@ class TouchChemControllerCommands extends ChemControllerCommands {
         // Now lets do all our validation to the incoming chem controller data.
         let name = typeof data.name !== 'undefined' ? data.name : chem.name || `IntelliChem - ${address - 143}`;
         let type = sys.board.valueMaps.chemControllerTypes.transformByName('intellichem');
-        // So now we are down to the nitty gritty setting the data for the REM or Homegrown Chem controller.
+        // So now we are down to the nitty gritty setting the data for the REM Chem controller.
         let calciumHardness = typeof data.calciumHardness !== 'undefined' ? parseInt(data.calciumHardness, 10) : chem.calciumHardness;
         let cyanuricAcid = typeof data.cyanuricAcid !== 'undefined' ? parseInt(data.cyanuricAcid, 10) : chem.cyanuricAcid;
         let alkalinity = typeof data.alkalinity !== 'undefined' ? parseInt(data.alkalinity, 10) : chem.alkalinity;