nodejs-poolcontroller 7.6.1 → 7.7.0

package/controller/State.ts

@@ -505,6 +505,8 @@ export interface ICircuitState {
     isActive?: boolean;
     startDelay?: boolean;
     stopDelay?: boolean;
+    manualPriorityActive?: boolean;
+    dataName?: string;
 }
 
 interface IEqStateCreator<T> { ctor(data: any, name: string, parent?): T; }
@@ -913,6 +915,8 @@ export class PumpState extends EqState {
     public set rpm(val: number) { this.setDataVal('rpm', val, this.exceedsThreshold(this.data.rpm, val)); }
     public get relay(): number { return this.data.relay; }
     public set relay(val: number) { this.setDataVal('relay', val); }
+    public get program(): number { return this.data.program; }
+    public set program(val: number) { this.setDataVal('program', val); }
     public get watts(): number { return this.data.watts; }
     public set watts(val: number) { this.setDataVal('watts', val, this.exceedsThreshold(this.data.watts, val)); }
     public get flow(): number { return this.data.flow; }
@@ -985,23 +989,43 @@ export class PumpState extends EqState {
         pump.speedStepSize = cpump.speedStepSize;
         pump.flowStepSize = cpump.flowStepSize;
         pump.circuits = [];
-        for (let i = 0; i < 8; i++) {
+        for (let i = 0; i < cpump.circuits.length; i++) {
             let c = cpump.circuits.getItemByIndex(i).get(true);
             c.circuit = state.circuits.getInterfaceById(c.circuit).get(true);
-            if (typeof c.circuit.id === 'undefined' || typeof c.circuit.name === 'undefined') {
-                // return "blank" circuit if none defined
-                c.circuit.id = 0;
-                c.circuit.name = 'Not Used';
-                if (sys.board.valueMaps.pumpTypes.getName(cpump.type) === 'vf') {
-                    c.units = sys.board.valueMaps.pumpUnits.getValue('gpm');
-                    c.circuit.flow = 0;
-                }
-                else {
-                    c.units = sys.board.valueMaps.pumpUnits.getValue('rpm');
-                    c.circuit.speed = 0;
-                }
+            switch (pump.type.name) {
+                case 'vf':
+                    c.units = sys.board.valueMaps.pumpUnits.transformByName('gpm');
+                    break;
+                case 'hwvs':
+                case 'vssvrs':
+                case 'vs':
+                    c.units = sys.board.valueMaps.pumpUnits.transformByName('rpm');
+                    break;
+                case 'ss':
+                case 'ds':
+                case 'sf':
+                case 'hwrly':
+                    c.units = 'undefined';
+                    break;
+                default:
+                    c.units = sys.board.valueMaps.pumpUnits.transform(c.units || 0);
+                    break;
             }
-            c.units = sys.board.valueMaps.pumpUnits.transform(c.units);
+            // RKS: 04-08-22 - This is just wrong.  If the user did not define circuits then they should not be sent down and it creates a whole host of issues.
+            //if (typeof c.circuit.id === 'undefined' || typeof c.circuit.name === 'undefined') {
+            //    // return "blank" circuit if none defined
+            //    c.circuit.id = 0;
+            //    c.circuit.name = 'Not Used';
+            //    if (sys.board.valueMaps.pumpTypes.getName(cpump.type) === 'vf') {
+            //        c.units = sys.board.valueMaps.pumpUnits.getValue('gpm');
+            //        c.circuit.flow = 0;
+            //    }
+            //    else {
+            //        c.units = sys.board.valueMaps.pumpUnits.getValue('rpm');
+            //        c.circuit.speed = 0;
+            //    }
+            //}
+            //c.units = sys.board.valueMaps.pumpUnits.transform(c.units);
             pump.circuits.push(c);
         }
         pump.circuits.sort((a, b) => { return a.id > b.id ? 1 : -1; });
@@ -1046,6 +1070,8 @@ export class ScheduleState extends EqState {
     public set endTime(val: number) { this.setDataVal('endTime', val); }
     public get circuit(): number { return this.data.circuit; }
     public set circuit(val: number) { this.setDataVal('circuit', val); }
+    public get disabled(): boolean { return this.data.disabled; }
+    public set disabled(val: boolean) { this.setDataVal('disabled', val); }
     public get scheduleType(): number { return typeof (this.data.scheduleType) !== 'undefined' ? this.data.scheduleType.val : undefined; }
     public set scheduleType(val: number) {
         if (this.scheduleType !== val) {
@@ -1097,6 +1123,8 @@ export class ScheduleState extends EqState {
     public set coolSetpoint(val: number) { this.setDataVal('coolSetpoint', val); }
     public get isOn(): boolean { return this.data.isOn; }
     public set isOn(val: boolean) { this.setDataVal('isOn', val); }
+    public get manualPriorityActive(): boolean { return this.data.manualPriorityActive; }
+    public set manualPriorityActive(val: boolean) { this.setDataVal('manualPriorityActive', val); }
     public getExtended() {
         let sched = this.get(true); // Always operate on a copy.
         //if (typeof this.circuit !== 'undefined')
@@ -1124,6 +1152,7 @@ export interface ICircuitGroupState {
     dataName: string;
     lightingTheme?: number;
     showInFeatures?: boolean;
+    manualPriorityActive?: boolean;
     get(bCopy?: boolean);
     emitEquipmentChange();
 }
@@ -1180,6 +1209,8 @@ export class CircuitGroupState extends EqState implements ICircuitGroupState, IC
     public set isActive(val: boolean) { this.setDataVal('isActive', val); }
     public get showInFeatures(): boolean { return typeof this.data.showInFeatures === 'undefined' ? true : this.data.showInFeatures; }
     public set showInFeatures(val: boolean) { this.setDataVal('showInFeatures', val); }
+    public get manualPriorityActive(): boolean { return this.data.manualPriorityActive; }
+    public set manualPriorityActive(val: boolean) { this.setDataVal('manualPriorityActive', val); }
     public getExtended() {
         let sgrp = this.get(true); // Always operate on a copy.
         if (typeof sgrp.showInFeatures === 'undefined') sgrp.showInFeatures = true;
@@ -1264,6 +1295,8 @@ export class LightGroupState extends EqState implements ICircuitGroupState, ICir
     public set isOn(val: boolean) { this.setDataVal('isOn', val); }
     public get isActive(): boolean { return this.data.isActive; }
     public set isActive(val: boolean) { this.setDataVal('isActive', val); }
+    public get manualPriorityActive(): boolean { return this.data.manualPriorityActive; }
+    public set manualPriorityActive(val: boolean) { this.setDataVal('manualPriorityActive', val); }
     public async setThemeAsync(val: number) { return sys.board.circuits.setLightThemeAsync; }
     public getExtended() {
         let sgrp = this.get(true); // Always operate on a copy.
@@ -1334,6 +1367,7 @@ export class BodyTempState extends EqState {
         if (typeof this.heaterCooldownDelay === 'undefined') this.data.heaterCooldownDelay = false;
         if (typeof this.data.startDelay === 'undefined') this.data.startDelay = false;
         if (typeof this.data.stopDelay === 'undefined') this.data.stopDelay = false;
+        if (typeof this.data.showInDashboard === 'undefined') this.data.showInDashboard = true;
     }
     public get id(): number { return this.data.id; }
     public set id(val: number) { this.setDataVal('id', val); }
@@ -1376,6 +1410,8 @@ export class BodyTempState extends EqState {
     public set startDelay(val: boolean) { this.setDataVal('startDelay', val); }
     public get stopDelay(): boolean { return this.data.stopDelay; }
     public set stopDelay(val: boolean) { this.setDataVal('stopDelay', val); }
+    public get showInDashboard(): boolean { return this.data.showInDashboard; }
+    public set showInDashboard(val: boolean) { this.setDataVal('showInDashboard', val); }
 
     public get isCovered(): boolean { return this.data.isCovered; }
     public set isCovered(val: boolean) { this.setDataVal('isCovered', val); }
@@ -1578,6 +1614,8 @@ export class FeatureState extends EqState implements ICircuitState {
     public set freezeProtect(val: boolean) { this.setDataVal('freezeProtect', val); }
     public get isActive(): boolean { return this.data.isActive; }
     public set isActive(val: boolean) { this.setDataVal('isActive', val); }
+    public get manualPriorityActive(): boolean { return this.data.manualPriorityActive; }
+    public set manualPriorityActive(val: boolean) { this.setDataVal('manualPriorityActive', val); }
 }
 export class VirtualCircuitState extends EqState implements ICircuitState {
     public dataName: string = 'virtualCircuit';
@@ -1724,6 +1762,8 @@ export class CircuitState extends EqState implements ICircuitState {
     public set lockoutOn(val: boolean) { this.setDataVal('lockoutOn', val); }
     public get lockoutOff(): boolean { return this.data.lockoutOff; }
     public set lockoutOff(val: boolean) { this.setDataVal('lockoutOff', val); }
+    public get manualPriorityActive(): boolean { return this.data.manualPriorityActive; }
+    public set manualPriorityActive(val: boolean) { this.setDataVal('manualPriorityActive', val); }
 }
 export class ValveStateCollection extends EqStateCollection<ValveState> {
     public createItem(data: any): ValveState { return new ValveState(data); }
@@ -1800,9 +1840,16 @@ export class CoverState extends EqState {
     public set isClosed(val: boolean) { this.setDataVal('isClosed', val); }
 }
 export class ChlorinatorStateCollection extends EqStateCollection<ChlorinatorState> {
+    public superChlor: { id:number, lastDispatch: number, reference: number }[] = [];
+    public getSuperChlor(id: number): { id: number, lastDispatch: number, reference: number } {
+        let sc = this.superChlor.find(elem => id === elem.id);
+        if (typeof sc === 'undefined') {
+            sc = { id: id, lastDispatch: 0, reference: 0 };
+            this.superChlor.push(sc);
+        }
+        return sc;
+    }
     public createItem(data: any): ChlorinatorState { return new ChlorinatorState(data); }
-    public superChlorReference: number = 0;
-    public lastDispatchSuperChlor: number = 0;
     public cleanupState() {
         for (let i = this.data.length - 1; i >= 0; i--) {
             if (isNaN(this.data[i].id)) this.data.splice(i, 1);
@@ -1815,10 +1862,10 @@ export class ChlorinatorStateCollection extends EqStateCollection<ChlorinatorSta
             let c = cfg[i];
             let s = this.getItemById(cfg[i].id, true);
             s.type = c.type;
+            s.model = c.model;
             s.name = c.name;
             s.isActive = c.isActive;
         }
-
     }
 }
 export class ChlorinatorState extends EqState {
@@ -1868,6 +1915,13 @@ export class ChlorinatorState extends EqState {
             this.hasChanged = true;
         }
     }
+    public get model(): number { return typeof (this.data.model) !== 'undefined' ? this.data.model.val : 0; }
+    public set model(val: number) {
+        if (this.model !== val) {
+            this.data.model = sys.board.valueMaps.chlorinatorModel.transform(val);
+            this.hasChanged = true;
+        }
+    }
     public get body(): number { return typeof (this.data.body) !== 'undefined' ? this.data.body.val : -1; }
     public set body(val: number) {
         if (this.body !== val) {
@@ -1915,37 +1969,59 @@ export class ChlorinatorState extends EqState {
     }
     public get superChlorRemaining(): number { return this.data.superChlorRemaining || 0; }
     public set superChlorRemaining(val: number) {
+        if (val === this.data.superChlorRemaining) return;
         let remaining: number;
-        if (sys.controllerType === 'nixie') {
-            remaining = Math.max(0, val);
+        let sc = state.chlorinators.getSuperChlor(this.id);
+        let chlor = sys.chlorinators.getItemById(this.id);
+        if (chlor.master === 1) {
+            // If we are 10 seconds different then we need to send it off and save the data.
+            if (Math.floor(val / 10) !== Math.floor(this.superChlorRemaining / 10)) {
+                this.hasChanged = true;
+                remaining = val;
+                sc.reference = Math.floor(new Date().getTime() / 1000);
+                this.setDataVal('superChlorRemaining', remaining);
+            }
+            else if (val <= 0)
+                remaining = 0;
+            else
+                remaining = this.superChlorRemaining;
+        }
+        else if (chlor.master === 2) {
+            // If we are 10 seconds different then we need to send it off and save the data.
+            if (Math.floor(val / 10) !== Math.floor(this.superChlorRemaining / 10)) {
+                this.hasChanged = true;
+                remaining = val;
+                sc.reference = Math.floor(new Date().getTime() / 1000);
+                this.setDataVal('superChlorRemaining', remaining);
+            }
         }
         else if (sys.controllerType === 'intellicenter') {
             // Trim the seconds off both of these as we will be keeping the seconds separately since this
             // only reports in minutes.  That way our seconds become self healing.
             if (Math.ceil(this.superChlorRemaining / 60) * 60 !== val) {
-                state.chlorinators.superChlorReference = Math.floor(new Date().getTime() / 1000); // Get the epoc and strip the milliseconds.
+                sc.reference = Math.floor(new Date().getTime() / 1000); // Get the epoc and strip the milliseconds.
                 this.hasChanged = true;
             }
-            let secs = Math.floor(new Date().getTime() / 1000) - state.chlorinators.superChlorReference;
+            let secs = Math.floor(new Date().getTime() / 1000) - sc.reference;
             remaining = Math.max(0, val - Math.min(secs, 60));
+            if (sc.lastDispatch - 5 > remaining) this.hasChanged = true;
+            this.data.superChlorRemaining = remaining;
         }
         else {
             // *Touch only reports superchlor hours remaining. 
             // If we have the same hours as existing, retain the mins + secs
             if (Math.ceil(this.superChlorRemaining / 3600) * 60 !== val / 60) {
-                state.chlorinators.superChlorReference = Math.floor(new Date().getTime() / 1000); // Get the epoc and strip the milliseconds.
+                sc.reference = Math.floor(new Date().getTime() / 1000); // Get the epoc and strip the milliseconds.
                 this.hasChanged = true;
             }
-            let secs = Math.floor(new Date().getTime() / 1000) - state.chlorinators.superChlorReference;
+            let secs = Math.floor(new Date().getTime() / 1000) - sc.reference;
             remaining = Math.max(0, val - Math.min(secs, 3600));
+            if (sc.lastDispatch - 5 > remaining) this.hasChanged = true;
+            this.data.superChlorRemaining = remaining;
         }
-        if (state.chlorinators.lastDispatchSuperChlor - 5 > remaining) this.hasChanged = true;
-        if (this.hasChanged) state.chlorinators.lastDispatchSuperChlor = remaining;
-        this.data.superChlorRemaining = remaining;
-        if (remaining > 0)
-            this.setDataVal('superChlor', true);
-        else
-            this.setDataVal('superChlor', false);
+        if (this.hasChanged) sc.lastDispatch = remaining;
+        this.setDataVal('superChlor', remaining > 0);
+        chlor.superChlor = remaining > 0;
     }
     public getExtended(): any {
         let schlor = this.get(true);