nodejs-poolcontroller 7.3.0 → 7.6.0

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);
         }
@@ -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;
@@ -1243,18 +1253,20 @@ class TouchBodyCommands extends BodyCommands {
     }
 }
 export class TouchCircuitCommands extends CircuitCommands {
-    public getLightThemes(type?: number): any[] {
-        let themes = sys.board.valueMaps.lightThemes.toArray();
-        if (typeof type === 'undefined') return themes;
-        switch (type) {
-            case 8: // Magicstream
-                return themes.filter(theme => theme.type === 'magicstream');
-            case 16: // Intellibrite
-                return themes.filter(theme => theme.type === 'intellibrite');
-            default:
-                return [];
-        }
-    }
+    // RKS: 12-01-2021 This has been deprecated we are now driving this through metadata on the valuemaps.  This allows
+    // for multiple types of standardized on/off sequences with nixie controllers.
+    //public getLightThemes(type?: number): any[] {
+    //    let themes = sys.board.valueMaps.lightThemes.toArray();
+    //    if (typeof type === 'undefined') return themes;
+    //    switch (type) {
+    //        case 8: // Magicstream
+    //            return themes.filter(theme => theme.types.includes('magicstream'));
+    //        case 16: // Intellibrite
+    //            return themes.filter(theme => theme.types.includes('intellibrite'));
+    //        default:
+    //            return [];
+    //    }
+    //}
     public async setCircuitAsync(data: any): Promise<ICircuit> {
         try {
             // example [255,0,255][165,33,16,34,139,5][17,14,209,0,0][2,120]
@@ -1262,6 +1274,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 +1304,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) {
@@ -1323,7 +1338,7 @@ export class TouchCircuitCommands extends CircuitCommands {
         data.functionId = sys.board.valueMaps.circuitFunctions.getValue('notused');
         return this.setCircuitAsync(data);
     }
-    public async setCircuitStateAsync(id: number, val: boolean): Promise<ICircuitState> {
+    public async setCircuitStateAsync(id: number, val: boolean, ignoreDelays?: boolean): Promise<ICircuitState> {
         if (isNaN(id)) return Promise.reject(new InvalidEquipmentIdError('Circuit or Feature id not valid', id, 'Circuit'));
         let c = sys.circuits.getInterfaceById(id);
         if (c.master !== 0) return await super.setCircuitStateAsync(id, val);
@@ -1656,28 +1671,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) {
@@ -1704,20 +1717,15 @@ 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) => {
-                _timeout = setTimeout(()=>{
-                        if (typeof reject === 'undefined' || typeof resolve === 'undefined') return;
-                        reject(new EquipmentTimeoutError(`no chlor response in 7 seconds`, `chlorTimeOut`));
-                        reject = undefined;
-
-                }, 3000);
                 let out = Outbound.create({
                     dest: 16,
                     action: 153,
                     // removed disable ? 0 : (spaSetpoint << 1) + 1 because only deleteChlorAsync should remove it from the OCP
-                    payload: [(spaSetpoint << 1) + 1, disabled ? 0 : poolSetpoint,
+                    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,
@@ -1731,13 +1739,18 @@ class TouchChlorinatorCommands extends ChlorinatorCommands {
                             reject = undefined;
                         }
                         else {
-                            logger.debug(`chlor response 153`);
                             resolve();
                             resolve = undefined;
                         }
                     }
                 });
                 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);
@@ -1771,7 +1784,6 @@ class TouchChlorinatorCommands extends ChlorinatorCommands {
                             reject(err);
                         }
                         else{
-                            logger.debug(`chlor resolve 217`);
                             resolve();
                         }
                     }
@@ -1792,7 +1804,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,
@@ -1806,8 +1820,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);
@@ -1949,10 +1964,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);
@@ -1983,7 +1999,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) {
@@ -2015,21 +2030,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);
@@ -2037,7 +2056,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++) {
@@ -2050,7 +2069,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')) {
@@ -2087,7 +2106,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
         });
@@ -2163,6 +2182,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 {
@@ -2223,13 +2270,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);
@@ -2240,7 +2288,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;
@@ -2250,7 +2298,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'));
@@ -2336,7 +2384,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;