nodejs-poolcontroller 7.4.0 → 7.5.1

package/controller/boards/NixieBoard.ts

@@ -260,7 +260,8 @@ export class NixieBoard extends SystemBoard {
             sys.equipment.maxCustomNames = 0;
             state.equipment.model = type.desc;
             state.equipment.maxBodies = sys.equipment.maxBodies = type.bodies;
-            
+            let bodyUnits = sys.general.options.units === 0 ? 1 : 2;
+
             if (typeof state.temps.units === 'undefined' || state.temps.units < 0) state.temps.units = sys.general.options.units;
             if (type.bodies > 0) {
                 let pool = sys.bodies.getItemById(1, true);
@@ -272,6 +273,7 @@ export class NixieBoard extends SystemBoard {
                 pool.circuit = 6;
                 pool.isActive = true;
                 pool.master = 1;
+                pool.capacityUnits = bodyUnits;
                 sbody.name = pool.name;
                 sbody.setPoint = pool.setPoint;
                 sbody.circuit = pool.circuit;
@@ -307,6 +309,7 @@ export class NixieBoard extends SystemBoard {
                     sbody.setPoint = spa.setPoint;
                     sbody.circuit = spa.circuit;
                     sbody.type = spa.type;
+                    spa.capacityUnits = bodyUnits;
                     scirc = state.circuits.getItemById(1, true);
                     scirc.showInFeatures = circ.showInFeatures;
                     scirc.type = circ.type;
@@ -330,6 +333,7 @@ export class NixieBoard extends SystemBoard {
                 sys.circuits.removeItemById(6);
                 state.circuits.removeItemById(6);
             }
+            
             sys.equipment.setEquipmentIds();
             sys.board.bodies.initFilters();
             state.status = sys.board.valueMaps.controllerStatus.transform(2, 0);
@@ -637,8 +641,14 @@ export class NixieCircuitCommands extends CircuitCommands {
         let group: CircuitGroup = null;
         let id = typeof obj.id !== 'undefined' ? parseInt(obj.id, 10) : -1;
         if (id <= 0) {
-            // We are adding a circuit group.
-            id = sys.circuitGroups.getNextEquipmentId(sys.board.equipmentIds.circuitGroups);
+            // We are adding a circuit group so we need to get the next equipment id.  For circuit groups and light groups, they share ids.
+            let range = sys.board.equipmentIds.circuitGroups;
+            for (let i = range.start; i <= range.end; i++) {
+                if (!sys.lightGroups.find(elem => elem.id === i) && !sys.circuitGroups.find(elem => elem.id === i)) {
+                    id = i;
+                    break;
+                }
+            }
         }
         if (typeof id === 'undefined') return Promise.reject(new InvalidEquipmentIdError(`Max circuit group id exceeded`, id, 'CircuitGroup'));
         if (isNaN(id) || !sys.board.equipmentIds.circuitGroups.isInRange(id)) return Promise.reject(new InvalidEquipmentIdError(`Invalid circuit group id: ${obj.id}`, obj.id, 'CircuitGroup'));
@@ -670,7 +680,7 @@ export class NixieCircuitCommands extends CircuitCommands {
                     //RKS: 09-26-20 There is no such thing as a lighting theme on a circuit group circuit.  That is what lighGroups are for.
                     //if (typeof cobj.lightingTheme !== 'undefined') c.lightingTheme = parseInt(cobj.lightingTheme, 10);
                 }
-                // group.circuits.length = obj.circuits.length;  // RSG - removed as this will delete circuits that were not changed
+                group.circuits.length = obj.circuits.length;  // RSG - removed as this will delete circuits that were not changed
             }
             resolve(group);
         });
@@ -680,14 +690,21 @@ export class NixieCircuitCommands extends CircuitCommands {
         let group: LightGroup = null;
         let id = typeof obj.id !== 'undefined' ? parseInt(obj.id, 10) : -1;
         if (id <= 0) {
-            // We are adding a circuit group.
-            id = sys.circuitGroups.getNextEquipmentId(sys.board.equipmentIds.circuitGroups);
+            // We are adding a circuit group so we need to get the next equipment id.  For circuit groups and light groups, they share ids.
+            let range = sys.board.equipmentIds.circuitGroups;
+            for (let i = range.start; i <= range.end; i++) {
+                if (!sys.lightGroups.find(elem => elem.id === i) && !sys.circuitGroups.find(elem => elem.id === i)) {
+                    id = i;
+                    break;
+                }
+            }
         }
         if (typeof id === 'undefined') return Promise.reject(new InvalidEquipmentIdError(`Max circuit light group id exceeded`, id, 'LightGroup'));
         if (isNaN(id) || !sys.board.equipmentIds.circuitGroups.isInRange(id)) return Promise.reject(new InvalidEquipmentIdError(`Invalid circuit group id: ${obj.id}`, obj.id, 'LightGroup'));
         group = sys.lightGroups.getItemById(id, true);
+        let sgroup = state.lightGroups.getItemById(id, true);
         return new Promise<LightGroup>((resolve, reject) => {
-            if (typeof obj.name !== 'undefined') group.name = obj.name;
+            if (typeof obj.name !== 'undefined') sgroup.name = group.name = obj.name;
             if (typeof obj.dontStop !== 'undefined' && utils.makeBool(obj.dontStop) === true) obj.eggTimer = 1440;
             if (typeof obj.eggTimer !== 'undefined') group.eggTimer = Math.min(Math.max(parseInt(obj.eggTimer, 10), 0), 1440);
             group.dontStop = group.eggTimer === 1440;
@@ -705,7 +722,11 @@ export class NixieCircuitCommands extends CircuitCommands {
                     if (typeof cobj.swimDelay !== 'undefined') c.swimDelay = parseInt(cobj.swimDelay, 10);
                     if (typeof cobj.position !== 'undefined') c.position = parseInt(cobj.position, 10);
                 }
+                // RKS: 09-25-21 - This has to be here.  Not sure the goal of not setting the entire circuit array when saving the group.
                 // group.circuits.length = obj.circuits.length; // RSG - removed as this will delete circuits that were not changed
+                group.circuits.length = obj.circuits.length;
+                sgroup.emitEquipmentChange();
+                
             }
             resolve(group);
         });
@@ -857,13 +878,21 @@ export class NixieCircuitCommands extends CircuitCommands {
     }
     public async setCircuitGroupStateAsync(id: number, val: boolean): Promise<ICircuitGroupState> {
         let grp = sys.circuitGroups.getItemById(id, false, { isActive: false });
-        let gstate = (grp.dataName === 'circuitGroupConfig') ? state.circuitGroups.getItemById(grp.id, grp.isActive !== false) : state.lightGroups.getItemById(grp.id, grp.isActive !== false);
+        if (grp.dataName !== 'circuitGroupConfig') return await sys.board.circuits.setLightGroupStateAsync(id, val);
+        let gstate = state.circuitGroups.getItemById(grp.id, grp.isActive !== false);
         let circuits = grp.circuits.toArray();
+        sys.board.circuits.setEndTime(sys.circuits.getInterfaceById(gstate.id), gstate, val);
         gstate.isOn = val;
         let arr = [];
         for (let i = 0; i < circuits.length; i++) {
             let circuit = circuits[i];
-            arr.push(sys.board.circuits.setCircuitStateAsync(circuit.circuit, val));
+            // The desiredState will be as follows.
+            // 1 = on, 2 = off, 3 = ignore.
+            let cval = true;
+            if (circuit.desiredState === 1) cval = val ? true : false;
+            else if (circuit.desiredState === 2) cval = val ? false : true;
+            else continue;
+            arr.push(sys.board.circuits.setCircuitStateAsync(circuit.circuit, cval));
         }
         return new Promise<ICircuitGroupState>(async (resolve, reject) => {
             await Promise.all(arr).catch((err) => { reject(err) });
@@ -871,7 +900,21 @@ export class NixieCircuitCommands extends CircuitCommands {
         });
     }
     public async setLightGroupStateAsync(id: number, val: boolean): Promise<ICircuitGroupState> {
-        return sys.board.circuits.setCircuitGroupStateAsync(id, val);
+        let grp = sys.circuitGroups.getItemById(id, false, { isActive: false });
+        if (grp.dataName === 'circuitGroupConfig') return await sys.board.circuits.setCircuitGroupStateAsync(id, val);
+        let gstate = state.lightGroups.getItemById(grp.id, grp.isActive !== false);
+        let circuits = grp.circuits.toArray();
+        sys.board.circuits.setEndTime(sys.circuits.getInterfaceById(gstate.id), gstate, val);
+        gstate.isOn = val;
+        let arr = [];
+        for (let i = 0; i < circuits.length; i++) {
+            let circuit = circuits[i];
+            arr.push(sys.board.circuits.setCircuitStateAsync(circuit.circuit, val));
+        }
+        return new Promise<ICircuitGroupState>(async (resolve, reject) => {
+            await Promise.all(arr).catch((err) => { reject(err) });
+            resolve(gstate);
+        });
     }
 }
 export class NixieFeatureCommands extends FeatureCommands {
@@ -939,39 +982,48 @@ export class NixieFeatureCommands extends FeatureCommands {
         return this.setFeatureStateAsync(id, !(feat.isOn || false));
     }
     public syncGroupStates() {
+        // The way this should work is that when all of the states are met
+        // the group should be on.  Otherwise it should be off.  That means that if
+        // you turned on all the group circuits that should be on individually then
+        // the group should be on.
         for (let i = 0; i < sys.circuitGroups.length; i++) {
             let grp: CircuitGroup = sys.circuitGroups.getItemByIndex(i);
             let circuits = grp.circuits.toArray();
-            let bIsOn = false;
             if (grp.isActive) {
-                for (let j = 0; j < circuits.length; j++) {
-                    let circuit: CircuitGroupCircuit = grp.circuits.getItemById(j);
+                let bIsOn = true;
+                // Iterate the circuits and break out should we find a condition
+                // where the group should be off.
+                for (let j = 0; j < circuits.length && bIsOn === true; j++) {
+                    let circuit: CircuitGroupCircuit = grp.circuits.getItemByIndex(j);
                     let cstate = state.circuits.getInterfaceById(circuit.circuit);
-                    if (circuit.desiredState === 1 || circuit.desiredState === 0) {
-                        if (cstate.isOn === utils.makeBool(circuit.desiredState)) bIsOn = true;
+                    if (circuit.desiredState === 1) { // The circuit should be on.
+                        if (!utils.makeBool(cstate.isOn)) bIsOn = false;
+                    }
+                    else if (circuit.desiredState === 0) { // The circuit should be off.
+                        if (utils.makeBool(cstate.isOn)) bIsOn = false;
                     }
                 }
+                let sgrp = state.circuitGroups.getItemById(grp.id);
+                sgrp.isOn = bIsOn;
             }
-            let sgrp = state.circuitGroups.getItemById(grp.id);
-            sgrp.isOn = bIsOn && grp.isActive;
-
             sys.board.valves.syncValveStates();
         }
         // I am guessing that there will only be one here but iterate
         // just in case we expand.
         for (let i = 0; i < sys.lightGroups.length; i++) {
             let grp: LightGroup = sys.lightGroups.getItemByIndex(i);
-            let bIsOn = false;
+            let circuits = grp.circuits.toArray();
             if (grp.isActive) {
-                let circuits = grp.circuits.toArray();
-                for (let j = 0; j < circuits.length; j++) {
-                    let circuit = grp.circuits.getItemByIndex(j).circuit;
-                    let cstate = state.circuits.getInterfaceById(circuit);
-                    if (cstate.isOn) bIsOn = true;
+                let bIsOn = true;
+                for (let j = 0; j < circuits.length && bIsOn === true; j++) {
+                    let circuit: LightGroupCircuit = grp.circuits.getItemByIndex(j);
+                    let cstate = state.circuits.getInterfaceById(circuit.circuit);
+                    if (!utils.makeBool(cstate.isOn)) bIsOn = false;
                 }
+                let sgrp = state.lightGroups.getItemById(grp.id);
+                sgrp.isOn = bIsOn;
             }
-            let sgrp = state.lightGroups.getItemById(grp.id);
-            sgrp.isOn = bIsOn;
+            sys.board.valves.syncValveStates();
         }
         state.emitEquipmentChanges();
     }
@@ -1032,7 +1084,7 @@ export class NixieHeaterCommands extends HeaterCommands {
             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 === true);
+                let vheaters = sys.heaters.filter(h => h.master === 1);
                 id = vheaters.length + 256;
             }
             heater = sys.heaters.getItemById(id, true);