nodejs-poolcontroller 7.2.0 → 7.5.1

package/controller/boards/EasyTouchBoard.ts

@@ -15,15 +15,15 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 import * as extend from 'extend';
-import { SystemBoard, byteValueMap, ConfigQueue, ConfigRequest, BodyCommands, PumpCommands, HeaterCommands, SystemCommands, CircuitCommands, FeatureCommands, ChlorinatorCommands, EquipmentIdRange, ScheduleCommands, ChemControllerCommands } from './SystemBoard';
-import { PoolSystem, Body, Pump, sys, ConfigVersion, Heater, Schedule, EggTimer, ICircuit, CustomNameCollection, CustomName, LightGroup, LightGroupCircuit, Feature, ChemController, Circuit, ScheduleCollection } from '../Equipment';
-import { Protocol, Outbound, Message, Response } from '../comms/messages/Messages';
-import { state, ChlorinatorState, CommsState, State, ICircuitState, ICircuitGroupState, LightGroupState, BodyTempState, FilterState, ScheduleState } from '../State';
 import { logger } from '../../logger/Logger';
 import { conn } from '../comms/Comms';
-import { MessageError, InvalidEquipmentIdError, InvalidEquipmentDataError, InvalidOperationError } from '../Errors';
+import { Message, Outbound, Protocol, Response } from '../comms/messages/Messages';
 import { utils } from '../Constants';
+import { Body, ChemController, ConfigVersion, CustomName, EggTimer, Feature, Heater, ICircuit, LightGroup, LightGroupCircuit, PoolSystem, Pump, Schedule, sys } from '../Equipment';
+import { EquipmentTimeoutError, InvalidEquipmentDataError, InvalidEquipmentIdError } from '../Errors';
 import { ncp } from "../nixie/Nixie";
+import { BodyTempState, ChlorinatorState, ICircuitGroupState, ICircuitState, LightGroupState, state } from '../State';
+import { BodyCommands, byteValueMap, ChemControllerCommands, ChlorinatorCommands, CircuitCommands, ConfigQueue, ConfigRequest, EquipmentIdRange, FeatureCommands, HeaterCommands, PumpCommands, ScheduleCommands, SystemBoard, SystemCommands } from './SystemBoard';
 
 export class EasyTouchBoard extends SystemBoard {
     public needsConfigChanges: boolean = false;
@@ -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 }],
@@ -328,7 +336,7 @@ export class EasyTouchBoard extends SystemBoard {
         let sheater = state.heaters.getItemById(1, true);
         sheater.type = heater.type;
         sheater.name = heater.name;
-        sheater.isVirtual = heater.isVirtual = false;
+        //sheater.isVirtual = heater.isVirtual = false;
         sys.equipment.shared ? heater.body = 32 : heater.body = 0;
     }
     public initBodyDefaults() {
@@ -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);
         }
@@ -374,7 +383,7 @@ export class EasyTouchBoard extends SystemBoard {
         let md = mod.get();
         eq.maxBodies = md.bodies = typeof mt.bodies !== 'undefined' ? mt.bodies : mt.shared ? 2 : 1;
         eq.maxCircuits = md.circuits = typeof mt.circuits !== 'undefined' ? mt.circuits : 8;
-        eq.maxFeatures = md.features = typeof mt.features !== 'undefined' ? mt.features : 10
+        eq.maxFeatures = md.features = typeof mt.features !== 'undefined' ? mt.features : 8;
         eq.maxValves = md.valves = typeof mt.valves !== 'undefined' ? mt.valves : mt.shared ? 4 : 2;
         eq.maxPumps = md.maxPumps = typeof mt.pumps !== 'undefined' ? mt.pumps : 2;
         eq.shared = mt.shared;
@@ -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]);
@@ -454,8 +464,8 @@ export class TouchConfigRequest extends ConfigRequest {
         if (typeof items !== 'undefined') this.items.push(...items);
         this.oncomplete = oncomplete;
     }
-    public category: TouchConfigCategories;
-    public setcategory: GetTouchConfigCategories;
+    declare category: TouchConfigCategories;
+    declare setcategory: GetTouchConfigCategories;
 }
 export class TouchConfigQueue extends ConfigQueue {
     //protected _configQueueTimer: NodeJS.Timeout;
@@ -543,7 +553,7 @@ export class TouchConfigQueue extends ConfigQueue {
                 action: this.curr.setcategory,
                 payload: [itm],
                 retries: 3,
-                response: Response.create({response: true, callback: () => {self.processNext(out);}})
+                response: Response.create({ response: true, callback: () => { self.processNext(out); } })
                 // response: true,
                 // onResponseProcessed: function () { self.processNext(out); }
             });
@@ -985,7 +995,7 @@ class TouchSystemCommands extends SystemCommands {
                             if (circ.nameId === data.id + 200) {
                                 let cstate = state.circuits.getItemById(circ.id);
                                 cstate.name = circ.name = data.name;
-                                for (let j = 0; j < state.schedules.length; j++){
+                                for (let j = 0; j < state.schedules.length; j++) {
                                     let ssched = state.schedules.getItemByIndex(j);
                                     if (ssched.circuit === cstate.id) {
                                         ssched.hasChanged = true;
@@ -999,7 +1009,7 @@ class TouchSystemCommands extends SystemCommands {
                             if (cg.nameId === data.id + 200) {
                                 let cgstate = state.circuitGroups.getItemById(cg.id);
                                 cgstate.name = cg.name = data.name;
-                                for (let j = 0; j < state.schedules.length; j++){
+                                for (let j = 0; j < state.schedules.length; j++) {
                                     let ssched = state.schedules.getItemByIndex(j);
                                     if (ssched.circuit === cgstate.id) {
                                         ssched.hasChanged = true;
@@ -1013,7 +1023,7 @@ class TouchSystemCommands extends SystemCommands {
                             if (lg.nameId === data.id + 200) {
                                 let lgstate = state.lightGroups.getItemById(lg.id);
                                 lgstate.name = lg.name = data.name;
-                                for (let j = 0; j < state.schedules.length; j++){
+                                for (let j = 0; j < state.schedules.length; j++) {
                                     let ssched = state.schedules.getItemByIndex(j);
                                     if (ssched.circuit === lgstate.id) {
                                         ssched.hasChanged = true;
@@ -1027,7 +1037,7 @@ class TouchSystemCommands extends SystemCommands {
                             if (f.nameId === data.id + 200) {
                                 let fstate = state.features.getItemById(f.id);
                                 fstate.name = f.name = data.name;
-                                for (let j = 0; j < state.schedules.length; j++){
+                                for (let j = 0; j < state.schedules.length; j++) {
                                     let ssched = state.schedules.getItemByIndex(j);
                                     if (ssched.circuit === fstate.id) {
                                         ssched.hasChanged = true;
@@ -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) {
@@ -1291,6 +1302,8 @@ export class TouchCircuitCommands extends CircuitCommands {
                             circuit.type = cstate.type = typeByte;
                             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) {
@@ -1329,6 +1342,15 @@ export class TouchCircuitCommands extends CircuitCommands {
         if (c.master !== 0) return await super.setCircuitStateAsync(id, val);
         if (id === 192 || c.type === 3) return await sys.board.circuits.setLightGroupThemeAsync(id - 191, val ? 1 : 0);
         if (id >= 192) return await sys.board.circuits.setCircuitGroupStateAsync(id, val);
+
+        // for some dumb reason, if the spa is on and the pool circuit is desired to be on,
+        // it will ignore the packet.
+        // We can override that by emulating a click to turn off the spa instead of turning
+        // on the pool
+        if (sys.equipment.maxBodies > 1 && id === 6 && val && state.circuits.getItemById(1).isOn) {
+            id = 1;
+            val = false;
+        }
         return new Promise<ICircuitState>((resolve, reject) => {
             let cstate = state.circuits.getInterfaceById(id);
             let out = Outbound.create({
@@ -1349,6 +1371,7 @@ export class TouchCircuitCommands extends CircuitCommands {
             });
             conn.queueSendMessage(out);
         });
+
     }
     public async setLightGroupStateAsync(id: number, val: boolean): Promise<ICircuitGroupState> { return this.setCircuitGroupStateAsync(id, val); }
     public async toggleCircuitStateAsync(id: number) {
@@ -1529,7 +1552,7 @@ export class TouchCircuitCommands extends CircuitCommands {
                                 else if (!cstate.isOn && sys.board.valueMaps.lightThemes.getName(theme) !== 'off') await sys.board.circuits.setCircuitStateAsync(c.circuit, true);
                             }
                             let isOn = sys.board.valueMaps.lightThemes.getName(theme) === 'off' ? false : true;
-                            sys.board.circuits.setEndTime(grp, sgrp, isOn); 
+                            sys.board.circuits.setEndTime(grp, sgrp, isOn);
                             sgrp.isOn = isOn;
                             switch (theme) {
                                 case 0: // off
@@ -1643,30 +1666,31 @@ class TouchFeatureCommands extends FeatureCommands {
 
 }
 class TouchChlorinatorCommands extends ChlorinatorCommands {
-    public setChlorAsync(obj: any): Promise<ChlorinatorState> {
+    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);
-        let name = obj.name || 'IntelliChlor' + id;
-        let poolSetpoint = parseInt(obj.poolSetpoint, 10);
-        let spaSetpoint = parseInt(obj.spaSetpoint, 10);
+        if (typeof chlor.master === 'undefined') chlor.master = 0;
+        let name = obj.name || chlor.name || 'IntelliChlor' + id;
         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 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) {
             if (isNaN(poolSetpoint)) poolSetpoint = 50;
             if (isNaN(spaSetpoint)) spaSetpoint = 10;
@@ -1674,8 +1698,8 @@ class TouchChlorinatorCommands extends ChlorinatorCommands {
             if (typeof superChlorinate === 'undefined') superChlorinate = false;
         }
         else {
-            if (isNaN(poolSetpoint)) poolSetpoint = chlor.poolSetpoint;
-            if (isNaN(spaSetpoint)) spaSetpoint = chlor.spaSetpoint;
+            if (isNaN(poolSetpoint)) poolSetpoint = chlor.poolSetpoint || 0;
+            if (isNaN(spaSetpoint)) spaSetpoint = chlor.spaSetpoint || 0;
             if (isNaN(superChlorHours)) superChlorHours = chlor.superChlorHours;
             if (typeof superChlorinate === 'undefined') superChlorinate = utils.makeBool(chlor.superChlor);
         }
@@ -1691,55 +1715,96 @@ 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);
-        return new Promise<ChlorinatorState>((resolve, reject) => {
-            let out = Outbound.create({
-                dest: 16,
-                action: 153,
-                payload: [disabled ? 0 : (spaSetpoint << 1) + 1, disabled ? 0 : poolSetpoint,
-                utils.makeBool(superChlorinate) && superChlorHours > 0 ? superChlorHours + 128 : 0,  // We only want to set the superChlor when the user sends superChlor = true
-                    0, 0, 0, 0, 0, 0, 0],
-                retries: 3,
-                response: true,
-                onComplete: (err) => {
-                    if (err) {
-                        logger.error(`Error setting Chlorinator values: ${err.message}`);
-                        reject(err);
+
+        let _timeout: NodeJS.Timeout;
+        try {
+            let request153packet = new Promise<void>((resolve, reject) => {
+                let out = Outbound.create({
+                    dest: 16,
+                    action: 153,
+                    // removed disable ? 0 : (spaSetpoint << 1) + 1 because only deleteChlorAsync should remove it from the OCP
+                    payload: [(disabled ? 0 : isDosing ? 100 << 1: spaSetpoint << 1) + 1, disabled ? 0 : isDosing ? 100 : poolSetpoint,
+                    utils.makeBool(superChlorinate) && superChlorHours > 0 ? superChlorHours + 128 : 0,  // We only want to set the superChlor when the user sends superChlor = true
+                        0, 0, 0, 0, 0, 0, 0],
+                    retries: 3,
+                    response: true, 
+                    // scope: Math.random(),
+                    onComplete: (err)=>{
+                        if (err) {
+                            logger.error(`Error setting Chlorinator values: ${err.message}`);
+                            // in case of race condition
+                            if (typeof reject !== 'undefined') reject(err);
+                            reject = undefined;
+                        }
+                        else {
+                            resolve();
+                            resolve = undefined;
+                        }
                     }
-                    let schlor = state.chlorinators.getItemById(id, true);
-                    let cchlor = sys.chlorinators.getItemById(id, true);
-                    schlor.isActive = cchlor.isActive = true;
-                    schlor.superChlor = cchlor.superChlor = superChlorinate;
-                    schlor.poolSetpoint = cchlor.poolSetpoint = poolSetpoint;
-                    schlor.spaSetpoint = cchlor.spaSetpoint = spaSetpoint;
-                    schlor.superChlorHours = cchlor.superChlorHours = superChlorHours;
-                    schlor.body = cchlor.body = body;
-                    cchlor.address = 79 + id;
+                });
+                conn.queueSendMessage(out);
+                _timeout = setTimeout(()=>{
+                    if (typeof reject === 'undefined' || typeof resolve === 'undefined') return;
+                    reject(new EquipmentTimeoutError(`no chlor response in 7 seconds`, `chlorTimeOut`));
+                    reject = undefined;
+                    
+                }, 3000);
+            });
+            await request153packet;
+            let schlor = state.chlorinators.getItemById(id, true);
+            chlor.disabled = disabled;
+            schlor.isActive = chlor.isActive = true;
+            schlor.superChlor = chlor.superChlor = superChlorinate;
+            schlor.poolSetpoint = chlor.poolSetpoint = poolSetpoint;
+            schlor.spaSetpoint = chlor.spaSetpoint = spaSetpoint;
+            schlor.superChlorHours = chlor.superChlorHours = superChlorHours;
+            schlor.body = chlor.body = body;
+            chlor.address = 79 + id;
+            chlor.name = schlor.name = name;
+            chlor.model = model;
+            schlor.type = chlor.type = chlorType;
+            chlor.isDosing = isDosing;
 
-                    let request25Packet = Outbound.create({
-                        dest: 16,
-                        action: 217,
-                        payload: [0],
-                        retries: 3,
-                        response: true,
-                        onComplete: (err) => {
-                            if (err) {
-                                logger.error(`Error requesting chlor status: ${err.message}`);
-                                reject(err);
-                            }
-                            else
-                                resolve(state.chlorinators.getItemById(id));
-                            state.emitEquipmentChanges();
+            let request217Packet = new Promise<void>((resolve, reject) => {
+                let out = Outbound.create({
+                    dest: 16,
+                    action: 217,
+                    payload: [0],
+                    retries: 3,
+                    // scope: Math.random(),
+                    response: true,
+                    onComplete: (err) => {
+                        // if (typeof reject === 'undefined') {
+                        //     logger.error(`reject chlor already called.`)
+                        // }
+                        if (err) {
+                            logger.error(`Error requesting chlor status: ${err.message}`);
+                            reject(err);
                         }
-                    });
-                    conn.queueSendMessage(request25Packet);
-                }
+                        else{
+                            resolve();
+                        }
+                    }
+                })
+                conn.queueSendMessage(out);
             });
-            conn.queueSendMessage(out);
-        });
+            await request217Packet;
+            if (typeof _timeout !== 'undefined'){
+                clearTimeout(_timeout);
+                _timeout = undefined;
+            } 
+            state.emitEquipmentChanges();
+            return state.chlorinators.getItemById(id);
+        } catch (err) {
+            logger.error(`*Touch setChlorAsync Error: ${err.message}`);
+            return Promise.reject(err);
+        }
     }
     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,
@@ -1753,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);
@@ -1896,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);
@@ -1930,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) {
@@ -1962,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);
@@ -1984,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++) {
@@ -1997,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')) {
@@ -2034,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
         });
@@ -2110,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 {
@@ -2170,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);
@@ -2187,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;
@@ -2197,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'));
@@ -2283,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;
@@ -2336,7 +2435,7 @@ class TouchChemControllerCommands extends ChemControllerCommands {
                 action: 211,
                 payload: [],
                 retries: 3, // We are going to try 4 times.
-                response: Response.create({ protocol: Protocol.IntelliChem, action: 1, payload:[211] }),
+                response: Response.create({ protocol: Protocol.IntelliChem, action: 1, payload: [211] }),
                 onAbort: () => { },
                 onComplete: (err) => {
                     if (err) reject(err);
@@ -2364,7 +2463,7 @@ class TouchChemControllerCommands extends ChemControllerCommands {
                         chem.orp.tolerance.high = orpTolerance.high;
                         chem.ph.setpoint = pHSetpoint;
                         chem.orp.setpoint = orpSetpoint;
-                        chem.siCalcType = siCalcType;
+                        schem.siCalcType = chem.siCalcType = siCalcType;
                         chem.address = schem.address = address;
                         chem.name = schem.name = name;
                         chem.flowSensor.enabled = false;