nodejs-poolcontroller 7.2.0 → 7.5.1

package/controller/boards/IntelliCenterBoard.ts

@@ -38,6 +38,12 @@ export class IntelliCenterBoard extends SystemBoard {
         this.equipmentIds.features.start = 129;
         this.equipmentIds.circuitGroups.start = 193;
         this.equipmentIds.virtualCircuits.start = 237;
+        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' }],
+            [255, { name: 'error', desc: 'System Error' }]
+        ]);
         this.valueMaps.circuitFunctions = new byteValueMap([
             [0, { name: 'generic', desc: 'Generic' }],
             [1, { name: 'spillway', desc: 'Spillway' }],
@@ -59,12 +65,12 @@ export class IntelliCenterBoard extends SystemBoard {
             [2, { name: 'ds', desc: 'Two Speed', maxCircuits: 8, hasAddress: false, hasBody:true }],
             [3, { name: 'vs', desc: 'Intelliflo VS', maxPrimingTime: 6, minSpeed: 450, maxSpeed: 3450, maxCircuits: 8, hasAddress: true }],
             [4, { name: 'vsf', desc: 'Intelliflo VSF', minSpeed: 450, maxSpeed: 3450, minFlow: 15, maxFlow: 130, maxCircuits: 8, hasAddress: true }],
-            [5, { name: 'vf', desc: 'Intelliflo VF', minFlow: 15, maxFlow: 130, maxCircuits: 8, hasAddress: true }],
+            [5, { name: 'vf', desc: 'Intelliflo VF', maxPrimingTime: 6, minFlow: 15, maxFlow: 130, maxCircuits: 8, hasAddress: true }],
             [100, {name: 'sf', desc: 'SuperFlo VS', hasAddress: false, maxCircuits: 8, maxRelays: 4, equipmentMaster: 1}]
         ]);
         // RSG - same as systemBoard definition; can delete.
         this.valueMaps.heatModes = new byteValueMap([
-            [0, { name: 'off', desc: 'Off' }],
+            [1, { name: 'off', desc: 'Off' }],
             [3, { name: 'heater', desc: 'Heater' }],
             [5, { name: 'solar', desc: 'Solar Only' }],
             [12, { name: 'solarpref', desc: 'Solar Preferred' }]
@@ -129,8 +135,8 @@ export class IntelliCenterBoard extends SystemBoard {
             [6, { name: 'i10x', part: '522997Z', desc: 'i10x Expansion Module', circuits: 10 }],
             [7, { name: 'i10D', part: '523029Z', desc: 'i10D Personality Card', bodies: 2, valves: 2, circuits: 11, shared: false, dual: true, chlorinators: 1, chemControllers: 1 }], // We have witnessed this in the wild
             [8, { name: 'Valve Exp', part: '522440', desc: 'Valve Expansion Module', valves: 6 }],
-            [9, { name: 'iChlor Mux', part: '522719', desc: 'iChlor MUX Card', chlorinators: 3 }], // This is a guess
-            [10, { name: 'A/D Module', part: '522039', desc: 'A/D Cover Module', covers: 2 }], // This is a guess
+            [9, { name: 'A/D Module', part: '522039', desc: 'A/D Cover Module', covers: 2 }], // Finally have a user with one of these
+            [10, { name: 'iChlor Mux', part: '522719', desc: 'iChlor MUX Card', chlorinators: 3 }], // This is a guess
             [255, {name: 'i5x', part: '522033', desc: 'i5x Expansion Module', circuits: 5}] // This does not actually map to a known value at this point but we do know it will be > 6.
         ]);
 
@@ -207,8 +213,9 @@ export class IntelliCenterBoard extends SystemBoard {
             [1, { name: 'heater', desc: 'Heater' }],
             [2, { name: 'solar', desc: 'Solar' }],
             [3, { name: 'cooling', desc: 'Cooling' }],
+            [6, { name: 'mtheat', desc: 'Heater' }],
             [4, { name: 'hpheat', desc: 'Heating' }],
-            [8, { name: 'hpcool', desc: 'Cooling'}]
+            [8, { name: 'hpcool', desc: 'Cooling' }]
         ]);
         this.valueMaps.scheduleTypes = new byteValueMap([
             [0, { name: 'runonce', desc: 'Run Once', startDate: true, startTime: true, endTime: true, days: false, heatSource: true, heatSetpoint: true }],
@@ -572,7 +579,7 @@ class IntelliCenterConfigRequest extends ConfigRequest {
         if (typeof items !== 'undefined') this.items.push(...items);
         this.oncomplete = oncomplete;
     }
-    public category: ConfigCategories;
+    declare category: ConfigCategories;
 }
 class IntelliCenterConfigQueue extends ConfigQueue {
     public _processing: boolean = false;
@@ -1388,7 +1395,20 @@ class IntelliCenterSystemCommands extends SystemCommands {
     }
 }
 class IntelliCenterCircuitCommands extends CircuitCommands {
-    public board: IntelliCenterBoard;
+    declare board: IntelliCenterBoard;
+    // Need to override this as IntelliCenter manages all the egg timers for all circuit types.
+    public async checkEggTimerExpirationAsync() {
+        try {
+            for (let i = 0; i < sys.circuits.length; i++) {
+                let c = sys.circuits.getItemByIndex(i);
+                let cstate = state.circuits.getItemByIndex(i);
+                if (!cstate.isActive || !cstate.isOn) continue;
+                if (c.master === 1) {
+                    await ncp.circuits.checkCircuitEggTimerExpirationAsync(cstate);
+                }
+            }
+        } catch (err) { logger.error(`checkEggTimerExpiration: Error synchronizing circuit relays ${err.message}`); }
+    }
     public async setCircuitAsync(data: any): Promise<ICircuit> {
         let id = parseInt(data.id, 10);
         let circuit = sys.circuits.getItemById(id, false);
@@ -1405,7 +1425,7 @@ class IntelliCenterCircuitCommands extends CircuitCommands {
             let eggHrs = Math.floor(eggTimer / 60);
             let eggMins = eggTimer - (eggHrs * 60);
             let type = typeof data.type !== 'undefined' ? parseInt(data.type, 10) : circuit.type;
-            let theme = typeof data.lightingTheme !== 'undefined' ? data.ligthingTheme : circuit.lightingTheme;
+            let theme = typeof data.lightingTheme !== 'undefined' ? data.lightingTheme : circuit.lightingTheme;
             if (circuit.type === 9) theme = typeof data.level !== 'undefined' ? data.level : circuit.level;
             if (typeof theme === 'undefined') theme = 0;
             let out = Outbound.create({
@@ -1419,14 +1439,24 @@ class IntelliCenterCircuitCommands extends CircuitCommands {
                 onComplete: (err, msg) => {
                     if (err) reject(err);
                     else {
+                        let scircuit = state.circuits.getItemById(circuit.id, true);
                         circuit.eggTimer = eggTimer;
                         circuit.dontStop = data.dontStop;
                         circuit.freeze = (typeof data.freeze !== 'undefined' ? utils.makeBool(data.freeze) : circuit.freeze);
                         circuit.showInFeatures = (typeof data.showInFeatures !== 'undefined' ? utils.makeBool(data.showInFeatures) : circuit.showInFeatures);
-                        if (type === 9) circuit.level = theme;
-                        else circuit.lightingTheme = theme;
-                        circuit.name = typeof data.name !== 'undefined' ? data.name.toString().substring(0, 16) : circuit.name;
-                        circuit.type = type;
+                        if (type === 9) scircuit.level = circuit.level = theme;
+                        else {
+                            let t = sys.board.valueMaps.circuitFunctions.transform(type);
+                            if (t.isLight == true) scircuit.lightingTheme = circuit.lightingTheme = theme;
+                            else {
+                                scircuit.lightingTheme = undefined;
+                                circuit.lightingTheme = 0;
+                            }
+                        }
+                        scircuit.name = circuit.name = typeof data.name !== 'undefined' ? data.name.toString().substring(0, 16) : circuit.name;
+                        scircuit.type = circuit.type = type;
+                        scircuit.isActive = circuit.isActive = true;
+                        circuit.master = 0;
                         resolve(circuit);
                     }
                 }
@@ -2055,6 +2085,14 @@ class IntelliCenterCircuitCommands extends CircuitCommands {
         // NOT SURE IF COINCIDENTAL: The ICP seems to respond immediately after action 2.
         // 7. ICP Sends 168[15,0,... new options, 0,0,0,0]
         // 8. OCP responds ACK(168)
+        // i10D turn on pool
+        // OCP
+        // Schedule on
+        // [255, 0, 255][165, 1, 15, 16, 168, 36][15, 0, 0, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 1][5, 226]
+        // No schedules
+        // [255, 0, 255][165, 1, 15, 16, 168, 36][15, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 1, 0][5, 195]
+        // njsPC
+        // [255, 0, 255][165, 1, 15, 33, 168, 36][15, 0, 0, 33, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0,  8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0][5, 216]
 
         // The previous sequence is just additional noise on the bus. There is no need for it.  We just
         // need to send the set circuit message.  It will reliably work 100% of the time but the ICP
@@ -2064,6 +2102,9 @@ class IntelliCenterCircuitCommands extends CircuitCommands {
             //if (b) b = await this.getConfigAsync([15, 0]);
             return new Promise<ICircuitState>((resolve, reject) => {
                 let out = this.createCircuitStateMessage(id, val);
+                //if (sys.equipment.dual && id === 6) out.setPayloadByte(35, 1);
+                out.setPayloadByte(34, 1);
+                out.source = 16;
                 out.onComplete = async (err, msg: Inbound) => {
                     if (err) reject(err);
                     else {
@@ -2297,7 +2338,19 @@ class IntelliCenterCircuitCommands extends CircuitCommands {
             let ndx = Math.floor(ordinal / 8);
             let byte = out.payload[ndx + 15];
             let bit = ordinal - (ndx * 8);
-            if (sched.isOn) byte = byte | (1 << bit);
+            // Lets determine if this schedule should be on.
+            if (sched.circuit === id) {
+                if (isOn) {
+                    let dt = state.time.toDate();
+                    let dow = dt.getDay();
+                    // Convert the dow to the bit value.
+                    let sd = sys.board.valueMaps.scheduleDays.toArray().find(elem => elem.dow === dow);
+                    let dayVal = sd.bitVal || sd.val;  // The bitval allows mask overrides.
+                    let ts = dt.getHours() * 60 + dt.getMinutes();
+                    if ((sched.scheduleDays & dayVal) > 0 && ts >= sched.startTime && ts <= sched.endTime) byte = byte | (1 << bit);
+                }
+            }
+            else if (sched.isOn) byte = byte | (1 << bit);
             out.payload[ndx + 15] = byte;
         }
         return out;
@@ -2340,7 +2393,7 @@ class IntelliCenterCircuitCommands extends CircuitCommands {
     }
 }
 class IntelliCenterFeatureCommands extends FeatureCommands {
-    public board: IntelliCenterBoard;
+    declare board: IntelliCenterBoard;
     public async setFeatureStateAsync(id, val): Promise<ICircuitState> { return sys.board.circuits.setCircuitStateAsync(id, val); }
     public async toggleFeatureStateAsync(id): Promise<ICircuitState> { return sys.board.circuits.toggleCircuitStateAsync(id); }
     public syncGroupStates() { } // Do nothing and let IntelliCenter do it.
@@ -2427,12 +2480,10 @@ class IntelliCenterChlorinatorCommands 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;
@@ -2441,13 +2492,22 @@ class IntelliCenterChlorinatorCommands extends ChlorinatorCommands {
         //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 (chlor.master === 1) 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;
+        // This should never never never modify the setpoints based upon the disabled or isDosing flags.
+        //let poolSetpoint = isDosing ? 100 : disabled ? 0 : parseInt(obj.poolSetpoint, 10);
+        //let spaSetpoint = isDosing ? 100 : disabled ? 0 : parseInt(obj.spaSetpoint, 10);
+        let poolSetpoint = typeof obj.poolSetpoint !== 'undefined' ? parseInt(obj.poolSetpoint, 10) : chlor.poolSetpoint;
+        let spaSetpoint = typeof obj.spaSetpoint !== 'undefined' ? parseInt(obj.spaSetpoint, 10) : chlor.spaSetpoint;
+        if (poolSetpoint === 0) console.log(obj);
+
+        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;
@@ -2455,8 +2515,8 @@ class IntelliCenterChlorinatorCommands 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);
         }
@@ -2471,7 +2531,10 @@ class IntelliCenterChlorinatorCommands extends ChlorinatorCommands {
         return new Promise<ChlorinatorState>((resolve, reject) => {
             let out = Outbound.create({
                 action: 168,
-                payload: [7, 0, id - 1, body.val, 1, disabled ? 0 : poolSetpoint, disabled ? 0 : spaSetpoint, superChlorinate ? 1 : 0, superChlorHours, 0, 1],
+                payload: [7, 0, id - 1, body.val, 1,
+                    disabled ? 0 : isDosing ? 100 : poolSetpoint,
+                    disabled ? 0 : isDosing ? 100 : spaSetpoint,
+                    superChlorinate ? 1 : 0, superChlorHours, 0, 1],
                 response: IntelliCenterBoard.getAckResponse(168),
                 retries: 5,
                 onComplete: (err, msg) => {
@@ -2480,6 +2543,10 @@ class IntelliCenterChlorinatorCommands extends ChlorinatorCommands {
                         let schlor = state.chlorinators.getItemById(id, true);
                         let cchlor = sys.chlorinators.getItemById(id, true);
                         chlor.disabled = disabled;
+                        chlor.model = model;
+                        schlor.type = chlor.type = chlorType;
+                        chlor.name = schlor.name = name;
+                        chlor.isDosing = isDosing;
                         schlor.isActive = cchlor.isActive = true;
                         schlor.poolSetpoint = cchlor.poolSetpoint = poolSetpoint;
                         schlor.spaSetpoint = cchlor.spaSetpoint = spaSetpoint;
@@ -2495,21 +2562,22 @@ class IntelliCenterChlorinatorCommands extends ChlorinatorCommands {
     }
     public async deleteChlorAsync(obj: any): Promise<ChlorinatorState> {
         let id = parseInt(obj.id, 10);
-        if (isNaN(id)) obj.id = 1;
-
-        // Merge all the information.
-        let chlor = state.chlorinators.getItemById(id);
+        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);
+        let schlor = state.chlorinators.getItemById(id);
         // Verify the data.
         return new Promise<ChlorinatorState>((resolve, reject) => {
             let out = Outbound.create({
                 action: 168,
-                payload: [7, 0, id - 1, chlor.body || 0, 0, chlor.poolSetpoint || 0, chlor.spaSetpoint || 0, 0, chlor.superChlorHours || 0, 0, 0],
+                payload: [7, 0, id - 1, schlor.body || 0, 0, schlor.poolSetpoint || 0, schlor.spaSetpoint || 0, 0, schlor.superChlorHours || 0, 0, 0],
                 response: IntelliCenterBoard.getAckResponse(168),
                 retries: 5,
                 onComplete: (err, msg) => {
                     if (err) reject(err);
                     else {
-                        let schlor = state.chlorinators.getItemById(id, true);
+                        ncp.chlorinators.deleteChlorinatorAsync(id).then(()=>{});
+                        schlor = state.chlorinators.getItemById(id, true);
                         state.chlorinators.removeItemById(id);
                         sys.chlorinators.removeItemById(id);
                         resolve(schlor);
@@ -2598,7 +2666,7 @@ class IntelliCenterPumpCommands extends PumpCommands {
         let id = (typeof data.id === 'undefined' || data.id <= 0) ? sys.pumps.getNextEquipmentId(sys.board.equipmentIds.pumps) : parseInt(data.id, 10);
         if (isNaN(id)) return Promise.reject(new Error(`Invalid pump id: ${data.id}`));
         let 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);
 
         //                                        0                    6              10   11  12           15
         //[255, 0, 255][165, 63, 15, 16, 168, 34][4, 0, 0, 3, 0, 96, 194, 1, 122, 13, 15, 130,  1, 196, 9, 128,   2, 255, 5, 0, 251, 128, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0][11, 218]
@@ -3177,6 +3245,8 @@ class IntelliCenterScheduleCommands extends ScheduleCommands {
                 out.retries = 5;
                 out.onComplete = (err, msg) => {
                     if (!err) {
+                        sched = sys.schedules.getItemById(id, true);
+                        ssched = state.schedules.getItemById(id, true);
                         sched.circuit = ssched.circuit = circuit;
                         sched.scheduleDays = ssched.scheduleDays = schedDays;
                         sched.scheduleType = ssched.scheduleType = schedType;
@@ -3273,14 +3343,14 @@ class IntelliCenterHeaterCommands extends HeaterCommands {
         conn.queueSendMessage(out);
     }
     public async setHeaterAsync(obj: any): Promise<Heater> {
-        if (utils.makeBool(obj.isVirtual) || parseInt(obj.id, 10) > 255) return super.setHeaterAsync(obj);
+        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 vheaters = sys.heaters.filter(h => h.isVirtual);
+                let vheaters = sys.heaters.filter(h => h.master === 1);
                 id = vheaters.length + 1;
             }
             heater = sys.heaters.getItemById(id, false);
@@ -3388,7 +3458,6 @@ class IntelliCenterHeaterCommands extends HeaterCommands {
                     heater.economyTime = economyTime;
                     heater.startTempDelta = startTempDelta;
                     heater.stopTempDelta = stopTempDelta;
-                    hstate.isVirtual = heater.isVirtual = false;
                     heater.cooldownDelay = cooldownDelay;
                     sys.board.heaters.updateHeaterServices();
                     sys.board.heaters.syncHeaterStates();
@@ -3401,7 +3470,7 @@ class IntelliCenterHeaterCommands extends HeaterCommands {
         });
     }
     public async deleteHeaterAsync(obj): Promise<Heater> {
-        if (utils.makeBool(obj.isVirtual) || obj.master === 1 || parseInt(obj.id, 10) > 255) return await super.deleteHeaterAsync(obj);
+        if (obj.master === 1 || parseInt(obj.id, 10) > 255) return await super.deleteHeaterAsync(obj);
         return new Promise<Heater>((resolve, reject) => {
             let id = parseInt(obj.id, 10);
             if (isNaN(id)) return Promise.reject(new InvalidEquipmentIdError('Cannot delete.  Heater Id is not valid.', obj.id, 'Heater'));
@@ -3443,6 +3512,8 @@ class IntelliCenterHeaterCommands extends HeaterCommands {
         let heatPumpInstalled = htypes.heatpump > 0;
         let gasHeaterInstalled = htypes.gas > 0;
         let ultratempInstalled = htypes.ultratemp > 0;
+        let mastertempInstalled = htypes.mastertemp > 0;
+
 
         // RKS: 09-26-20 This is a hack to maintain backward compatability with fw versions 1.04 and below.  Ultratemp is not
         // supported on 1.04 and below.
@@ -3466,9 +3537,10 @@ class IntelliCenterHeaterCommands extends HeaterCommands {
             // 3 = Solar Heater
             // 4 = Solar Preferred
             // 5 = Heat Pump
-           
+
             if (sys.heaters.length > 0) sys.board.valueMaps.heatSources = new byteValueMap([[1, { name: 'off', desc: 'Off' }]]);
             if (gasHeaterInstalled) sys.board.valueMaps.heatSources.merge([[2, { name: 'heater', desc: 'Heater' }]]);
+            if (mastertempInstalled) sys.board.valueMaps.heatSources.merge([[11, { name: 'mtheater', desc: 'MasterTemp' }]]);
             if (solarInstalled && (gasHeaterInstalled || heatPumpInstalled)) sys.board.valueMaps.heatSources.merge([[3, { name: 'solar', desc: 'Solar Only', hasCoolSetpoint: htypes.hasCoolSetpoint }], [4, { name: 'solarpref', desc: 'Solar Preferred', hasCoolSetpoint: htypes.hasCoolSetpoint }]]);
             else if (solarInstalled) sys.board.valueMaps.heatSources.merge([[3, { name: 'solar', desc: 'Solar', hasCoolsetpoint: htypes.hasCoolSetpoint }]]);
             if (heatPumpInstalled && (gasHeaterInstalled || solarInstalled)) sys.board.valueMaps.heatSources.merge([[9, { name: 'heatpump', desc: 'Heatpump Only' }], [25, { name: 'heatpumppref', desc: 'Heat Pump Pref' }]]);
@@ -3479,11 +3551,12 @@ class IntelliCenterHeaterCommands extends HeaterCommands {
 
             sys.board.valueMaps.heatModes = new byteValueMap([[1, { name: 'off', desc: 'Off' }]]);
             if (gasHeaterInstalled) sys.board.valueMaps.heatModes.merge([[2, { name: 'heater', desc: 'Heater' }]]);
-            if (solarInstalled && (gasHeaterInstalled || heatPumpInstalled)) sys.board.valueMaps.heatModes.merge([[3, { name: 'solar', desc: 'Solar Only' }], [4, { name: 'solarpref', desc: 'Solar Preferred' }]]);
+            if (mastertempInstalled) sys.board.valueMaps.heatModes.merge([11, { name: 'mtheater', desc: 'MasterTemp' }]);
+            if (solarInstalled && (gasHeaterInstalled || heatPumpInstalled || mastertempInstalled)) sys.board.valueMaps.heatModes.merge([[3, { name: 'solar', desc: 'Solar Only' }], [4, { name: 'solarpref', desc: 'Solar Preferred' }]]);
             else if (solarInstalled) sys.board.valueMaps.heatModes.merge([[3, { name: 'solar', desc: 'Solar' }]]);
-            if (ultratempInstalled && (gasHeaterInstalled || heatPumpInstalled)) sys.board.valueMaps.heatModes.merge([[5, { name: 'ultratemp', desc: 'UltraTemp Only'}], [6, { name: 'ultratemppref', desc: 'UltraTemp Pref' }]]);
+            if (ultratempInstalled && (gasHeaterInstalled || heatPumpInstalled || mastertempInstalled)) sys.board.valueMaps.heatModes.merge([[5, { name: 'ultratemp', desc: 'UltraTemp Only' }], [6, { name: 'ultratemppref', desc: 'UltraTemp Pref' }]]);
             else if (ultratempInstalled) sys.board.valueMaps.heatModes.merge([[5, { name: 'ultratemp', desc: 'UltraTemp' }]]);
-            if (heatPumpInstalled && (gasHeaterInstalled || solarInstalled)) sys.board.valueMaps.heatModes.merge([[9, { name: 'heatpump', desc: 'Heatpump Only' }], [25, { name: 'heatpumppref', desc: 'Heat Pump Preferred' }]]);
+            if (heatPumpInstalled && (gasHeaterInstalled || solarInstalled || mastertempInstalled)) sys.board.valueMaps.heatModes.merge([[9, { name: 'heatpump', desc: 'Heatpump Only' }], [25, { name: 'heatpumppref', desc: 'Heat Pump Preferred' }]]);
             else if (heatPumpInstalled) sys.board.valueMaps.heatModes.merge([[9, { name: 'heatpump', desc: 'Heat Pump' }]]);
         }
         else {
@@ -3515,7 +3588,7 @@ class IntelliCenterHeaterCommands extends HeaterCommands {
 }
 class IntelliCenterValveCommands extends ValveCommands {
     public async setValveAsync(obj?: any): Promise<Valve> {
-        if (obj.isVirtual || obj.master === 1) return super.setValveAsync(obj);
+        if (obj.master === 1) return super.setValveAsync(obj);
         let id = parseInt(obj.id, 10);
         if (isNaN(id)) return Promise.reject(new InvalidEquipmentIdError('Valve Id has not been defined', obj.id, 'Valve'));
         let valve = sys.valves.getItemById(id);
@@ -3565,7 +3638,7 @@ export class IntelliCenterChemControllerCommands 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;
@@ -3647,7 +3720,7 @@ export class IntelliCenterChemControllerCommands 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;

package/controller/boards/IntelliTouchBoard.ts

@@ -14,16 +14,17 @@ GNU Affero General Public License for more details.
 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 {byteValueMap} from './SystemBoard';
-import {logger} from '../../logger/Logger';
+import { byteValueMap } from './SystemBoard';
+import { logger } from '../../logger/Logger';
 import { EasyTouchBoard, TouchConfigQueue, GetTouchConfigCategories, TouchCircuitCommands } from './EasyTouchBoard';
 import { state, ICircuitGroupState } from '../State';
-import { PoolSystem, sys, ExpansionPanel, ExpansionModule } from '../Equipment';
-import { Protocol, Outbound, Message, Response } from '../comms/messages/Messages';
+import { PoolSystem, sys, ExpansionPanel, Equipment } from '../Equipment';
+
+import { conn } from '../comms/Comms';
+import { InvalidEquipmentDataError } from '../Errors';
 
-import {conn} from '../comms/Comms';
 export class IntelliTouchBoard extends EasyTouchBoard {
-    constructor (system: PoolSystem){
+    constructor(system: PoolSystem) {
         super(system);
         this.equipmentIds.features.start = 41;
         this.equipmentIds.features.end = 50;
@@ -32,10 +33,11 @@ export class IntelliTouchBoard extends EasyTouchBoard {
             [0, { name: 'IT5', part: 'i5+3', desc: 'IntelliTouch i5+3', circuits: 6, shared: true }],
             [1, { name: 'IT7', part: 'i7+3', desc: 'IntelliTouch i7+3', circuits: 8, shared: true }],
             [2, { name: 'IT9', part: 'i9+3', desc: 'IntelliTouch i9+3', circuits: 10, shared: true }],
-            [3, { name: 'IT5S', part: 'i5+3S', desc: 'IntelliTouch i5+3S', circuits: 5, shared: false }],
-            [4, { name: 'IT9S', part: 'i9+3S', desc: 'IntelliTouch i9+3S', circuits: 9, shared: false }],
+            [3, { name: 'IT5S', part: 'i5+3S', desc: 'IntelliTouch i5+3S', circuits: 5, shared: false, bodies: 1, intakeReturnValves: false }],
+            [4, { name: 'IT9S', part: 'i9+3S', desc: 'IntelliTouch i9+3S', circuits: 9, shared: false, bodies: 1, intakeReturnValves: false }],
             [5, { name: 'IT10D', part: 'i10D', desc: 'IntelliTouch i10D', circuits: 10, shared: false, dual: true }],
-            [32, { name: 'IT10X', part: 'i10X', desc: 'IntelliTouch i10X', circuits: 10, shared: false }]
+            [32, { name: 'IT5X', part: 'i5X', desc: 'IntelliTouch i5X', circuits: 5 }],
+            [33, { name: 'IT10X', part: 'i10X', desc: 'IntelliTouch i10X', circuits: 10 }]
         ]);
     }
     public initExpansionModules(byte1: number, byte2: number) {
@@ -48,25 +50,28 @@ export class IntelliTouchBoard extends EasyTouchBoard {
         mod.type = byte1;
         mod.part = mt.part;
         let eq = sys.equipment;
+        let bd = sys.board;
         let md = mod.get();
 
         eq.maxBodies = md.bodies = typeof mt.bodies !== 'undefined' ? mt.bodies : mt.shared || mt.dual ? 2 : 1;
         eq.maxCircuits = md.circuits = typeof mt.circuits !== 'undefined' ? mt.circuits : 6;
-        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 : 8;
         eq.shared = mt.shared;
         eq.dual = typeof mt.dual !== 'undefined' ? mt.dual : false;
+        eq.intakeReturnValves = md.intakeReturnValves = typeof mt.intakeReturnValves !== 'undefined' ? mt.intakeReturnValves : false;
         eq.maxChlorinators = md.chlorinators = 1;
         eq.maxChemControllers = md.chemControllers = 1;
         eq.maxCustomNames = 20;
         eq.maxCircuitGroups = 10; // Not sure why this is 10 other than to allow for those that we are in control of.
 
         // Calculate out the invalid ids.
-        sys.board.equipmentIds.invalidIds.set([]);
-        if (!eq.shared) sys.board.equipmentIds.invalidIds.merge([1]);
+        // sys.board.equipmentIds.invalidIds.set([]);
         // Add in all the invalid ids from the base personality board.
         sys.board.equipmentIds.invalidIds.set([16, 17, 18]); // These appear to alway be invalid in IntelliTouch.
+        // RGS 10-7-21: Since single bodies have hi-temp/lo-temp we will always want ID 1.
+        // if (!eq.shared) sys.board.equipmentIds.invalidIds.merge([1]);
         //if (eq.maxCircuits < 9) sys.board.equipmentIds.invalidIds.merge([9]);
         for (let i = 7; i <= 10; i++) {
             // This will add all the invalid ids between 7 and 10 that are omitted for IntelliTouch models.
@@ -74,26 +79,42 @@ export class IntelliTouchBoard extends EasyTouchBoard {
             if (i > eq.maxCircuits) sys.board.equipmentIds.invalidIds.merge([i]);
         }
         // This code should be repeated if we ever see a panel with more than one expansion panel.
-        let pnl: ExpansionPanel;
-        pnl = sys.equipment.expansions.getItemById(1, true);
-        pnl.type = byte2 & 0x20;
-        pnl.name = pnl.type === 32 ? 'i10X' : 'none';
-        pnl.isActive = pnl.type !== 0;
-        // if type is i9 or i10 we can have up to 3 expansion boards.  These expansion boards only add
-        // circuits.
-        if (pnl.isActive) {
-            let emt = this.valueMaps.expansionBoards.transform(pnl.type);
-            let emd = pnl.modules.getItemById(1, true).get();
-            eq.maxCircuits += emd.circuits = typeof emt.circuits !== 'undefined' ? emt.circuits : 0;
+        let pnl1: ExpansionPanel;
+        if ((byte2 & 0x40) === 64) {
+            // 64 indicates one expansion panel; SL defaults to i10x but it could also be i5x until we know better
+            pnl1 = sys.equipment.expansions.getItemById(1, true);
+            pnl1.type = 32;
+            let emt = this.valueMaps.expansionBoards.transform(pnl1.type);
+            pnl1.name = emt.desc;
+            pnl1.isActive = true;
+            eq.maxCircuits += emt.circuits;
         }
-        else pnl.modules.removeItemById(1);
-
+        else sys.equipment.expansions.removeItemById(1);
+        let pnl2: ExpansionPanel;
+        if ((byte2 & 0x80) === 128) {
+            // SL defaults to i5x but it could also be i10x until we know better
+            pnl2 = sys.equipment.expansions.getItemById(2, true);
+            pnl2.type = 32;
+            let emt = this.valueMaps.expansionBoards.transform(pnl2.type);
+            pnl2.name = emt.desc;
+            pnl2.isActive = true;
+            eq.maxCircuits += emt.circuits;
+        }
+        else sys.equipment.expansions.removeItemById(2);
+        let pnl3: ExpansionPanel;
+        if ((byte2 & 0xC0) === 192) {
+            // SL defaults to i5x but it could also be i10x until we know better
+            pnl3 = sys.equipment.expansions.getItemById(3, true);
+            pnl3.type = 32;
+            let emt = this.valueMaps.expansionBoards.transform(pnl3.type);
+            pnl3.name = emt.desc;
+            pnl3.isActive = true;
+            eq.maxCircuits += emt.circuits;
+        }
+        else sys.equipment.expansions.removeItemById(3);
         if (byte1 !== 14) sys.board.equipmentIds.invalidIds.merge([10, 19]);
         state.equipment.model = sys.equipment.model = mt.desc;
         state.equipment.controllerType = 'intellitouch';
-        // The code above should be repeated if we ever see a panel with more than one expansion panel.
-        sys.equipment.expansions.getItemById(2, true).isActive = false;
-        sys.equipment.expansions.getItemById(3, true).isActive = false;
         sys.equipment.shared ? sys.board.equipmentIds.circuits.start = 1 : sys.board.equipmentIds.circuits.start = 2;
         this.initBodyDefaults();
         this.initHeaterDefaults();
@@ -117,6 +138,59 @@ export class IntelliTouchBoard extends EasyTouchBoard {
         state.emitControllerChange();
     }
     public circuits: ITTouchCircuitCommands = new ITTouchCircuitCommands(this);
+    public async setControllerType(obj): Promise<Equipment> {
+        try {
+            if (obj.controllerType !== sys.controllerType) {
+                return Promise.reject(new InvalidEquipmentDataError(`You may not change the controller type data for ${sys.controllerType} controllers`, 'controllerType', obj.controllerType));
+            }
+
+            let mod = sys.equipment.modules.getItemById(0);
+            let mt = this.valueMaps.expansionBoards.get(mod.type);
+            let _circuits = mt.circuits;
+            let pnl1 = sys.equipment.expansions.getItemById(1);
+            if (typeof obj.expansion1 !== 'undefined' && obj.expansion1 !== pnl1.type) {
+                let emt = this.valueMaps.expansionBoards.transform(obj.expansion1);
+                logger.info(`Changing expansion 1 to ${emt.desc}.`);
+                pnl1.type = emt.val;
+                pnl1.name = emt.desc;
+                pnl1.isActive = true;
+            }
+            let pnl2 = sys.equipment.expansions.getItemById(2);
+            if (typeof obj.expansion2 !== 'undefined' && obj.expansion2 !== pnl2.type) {
+                let emt = this.valueMaps.expansionBoards.transform(obj.expansion2);
+                logger.info(`Changing expansion 2 to ${emt.desc}.`);
+                pnl2.type = emt.val;
+                pnl2.name = emt.desc;
+                pnl2.isActive = true;
+            }
+            let pnl3 = sys.equipment.expansions.getItemById(3);
+            if (typeof obj.expansion3 !== 'undefined' && obj.expansion3 !== pnl3.type) {
+                let emt = this.valueMaps.expansionBoards.transform(obj.expansion3);
+                logger.info(`Changing expansion 3 to ${emt.desc}.`);
+                pnl3.type = emt.val;
+                pnl3.name = emt.desc;
+                pnl3.isActive = true;
+            }
+            let prevMaxCircuits = sys.equipment.maxCircuits;
+            if (pnl1.isActive) _circuits += this.valueMaps.expansionBoards.get(pnl1.type).circuits;
+            if (pnl2.isActive) _circuits += this.valueMaps.expansionBoards.get(pnl2.type).circuits;
+            if (pnl3.isActive) _circuits += this.valueMaps.expansionBoards.get(pnl3.type).circuits;
+            if (_circuits < prevMaxCircuits) {
+                // if we downsize expansions, remove circuits
+                for (let i = _circuits + 1; i <= prevMaxCircuits; i++) {
+                    sys.circuits.removeItemById(i);
+                    state.circuits.removeItemById(i);
+                }
+            }
+            else if (_circuits > prevMaxCircuits) {
+                this._configQueue.queueChanges();
+            }
+            sys.equipment.maxCircuits = _circuits;
+            return sys.equipment;
+        } catch (err) {
+            logger.error(`Error setting expansion panels: ${err.message}`);
+        }
+    }
 }
 class ITTouchConfigQueue extends TouchConfigQueue {
     public queueChanges() {
@@ -148,7 +222,7 @@ class ITTouchConfigQueue extends TouchConfigQueue {
         }
         if (this.remainingItems > 0) {
             var self = this;
-            setTimeout(() => {self.processNext();}, 50);
+            setTimeout(() => { self.processNext(); }, 50);
         } else state.status = 1;
         state.emitControllerChange();
     }
@@ -164,5 +238,5 @@ class ITTouchCircuitCommands extends TouchCircuitCommands {
             }
             catch (err) { reject(err); }
         });
-    } 
+    }
 }