nodejs-poolcontroller 7.6.0 → 7.6.1

package/controller/State.ts

@@ -498,6 +498,7 @@ export interface ICircuitState {
     startTime?: Timestamp;
     endTime: Timestamp;
     lightingTheme?: number;
+    action?: number;
     emitEquipmentChange();
     get(bCopy?: boolean);
     showInFeatures?: boolean;
@@ -1022,9 +1023,9 @@ export class ScheduleState extends EqState {
         if (typeof this.data.startDate === 'undefined') this._startDate = new Date();
         else this._startDate = new Date(this.data.startDate);
         if (isNaN(this._startDate.getTime())) this._startDate = new Date();
-        if (typeof this.data.startTimeType === 'undefined') this.data.startTimeType = 0;
-        if (typeof this.data.endTimeType === 'undefined') this.data.endTimeType = 0;
-        if (typeof this.data.display === 'undefined') this.display = 0;
+        if (typeof this.data.startTimeType === 'undefined') this.data.startTimeType = sys.board.valueMaps.scheduleTimeTypes.transform(0);
+        if (typeof this.data.endTimeType === 'undefined') this.data.endTimeType = sys.board.valueMaps.scheduleTimeTypes.transform(0);
+        if (typeof this.data.display === 'undefined') this.data.display = sys.board.valueMaps.scheduleDisplayTypes.transform(0);
     }
     private _startDate: Date = new Date();
     public get startDate(): Date { return this._startDate; }
@@ -1236,7 +1237,7 @@ export class LightGroupState extends EqState implements ICircuitGroupState, ICir
     public get action(): number { return typeof this.data.action !== 'undefined' ? this.data.action.val : 0; }
     public set action(val: number) {
         if (this.action !== val || typeof this.data.action === 'undefined') {
-            this.data.action = sys.board.valueMaps.intellibriteActions.transform(val);
+            this.data.action = sys.board.valueMaps.circuitActions.transform(val);
             this.hasChanged = true;
         }
     }
@@ -1268,7 +1269,7 @@ export class LightGroupState extends EqState implements ICircuitGroupState, ICir
         let sgrp = this.get(true); // Always operate on a copy.
         sgrp.circuits = [];
         if (typeof sgrp.lightingTheme === 'undefined') sgrp.lightingTheme = sys.board.valueMaps.lightThemes.transformByName('white');
-        if (typeof sgrp.action === 'undefined') sgrp.action = sys.board.valueMaps.intellibriteActions.transform(0);
+        if (typeof sgrp.action === 'undefined') sgrp.action = sys.board.valueMaps.circuitActions.transform(0);
         let cgrp = sys.circuitGroups.getItemById(this.id);
         for (let i = 0; i < cgrp.circuits.length; i++) {
             let lgc = cgrp.circuits.getItemByIndex(i).get(true);
@@ -1410,7 +1411,7 @@ export class BodyTempState extends EqState {
 }
 export class TemperatureState extends EqState {
     public initData() {
-        if (typeof this.data.units === 'undefined') this.units = 0;
+        if (typeof this.data.units === 'undefined') this.data.units = sys.board.valueMaps.tempUnits.transform(0);
     }
     public get waterSensor1(): number { return this.data.waterSensor1; }
     public set waterSensor1(val: number) { this.setDataVal('waterSensor1', val); }
@@ -1647,6 +1648,8 @@ export class CircuitState extends EqState implements ICircuitState {
     public dataName = 'circuit';
     public initData() {
         if (typeof this.data.freezeProtect === 'undefined') this.data.freezeProtect = false;
+        if (typeof this.data.action === 'undefined') this.data.action = sys.board.valueMaps.circuitActions.transform(0);
+        if (typeof this.data.type === 'undefined') this.data.type = sys.board.valueMaps.circuitFunctions.transform(0);
     }
     public get id(): number { return this.data.id; }
     public set id(val: number) { this.data.id = val; }
@@ -1654,6 +1657,13 @@ export class CircuitState extends EqState implements ICircuitState {
     public set name(val: string) { this.setDataVal('name', val); }
     public get nameId(): number { return this.data.nameId; }
     public set nameId(val: number) { this.setDataVal('nameId', val); }
+    public get action(): number { return typeof this.data.action !== 'undefined' ? this.data.action.val : 0; }
+    public set action(val: number) {
+        if (this.action !== val || typeof this.data.action === 'undefined') {
+            this.data.action = sys.board.valueMaps.circuitActions.transform(val);
+            this.hasChanged = true;
+        }
+    }
     public get showInFeatures(): boolean { return this.data.showInFeatures; }
     public set showInFeatures(val: boolean) { this.setDataVal('showInFeatures', val); }
     public get isOn(): boolean { return this.data.isOn; }
@@ -1974,7 +1984,9 @@ export class ChemControllerState extends EqState {
         if (typeof this.data.orp === 'undefined') this.data.orp = {};
         if (typeof this.data.ph === 'undefined') this.data.ph = {};
         if (typeof this.data.flowSensor === 'undefined') this.data.flowSensor = {};
-        if (typeof this.data.type === 'undefined') { this.type = 1; }
+        if (typeof this.data.type === 'undefined') {
+            this.data.type = sys.board.valueMaps.chemControllerTypes.transform(1);
+        }
         else if (typeof this.data.type.ph === 'undefined') {
             this.data.type = sys.board.valueMaps.chemControllerTypes.transform(this.type);
         }
@@ -2190,7 +2202,7 @@ export class ChemControllerState extends EqState {
     public get flowSensor(): ChemicalFlowSensorState { return new ChemicalFlowSensorState(this.data, 'flowSensor', this); }
     public get warnings(): ChemControllerStateWarnings { return new ChemControllerStateWarnings(this.data, 'warnings', this); }
     public get alarms(): ChemControllerStateAlarms { return new ChemControllerStateAlarms(this.data, 'alarms', this); }
-    public get siCalcType(): number { return this.data.siCalcType; }
+    public get siCalcType(): number { return typeof this.data.siCalcType === 'undefined' ? 0 : this.data.siCalcType.val; }
     public set siCalcType(val: number) {
         if (this.siCalcType !== val) {
             this.data.siCalcType = sys.board.valueMaps.siCalcTypes.transform(val);
@@ -2230,6 +2242,7 @@ export class ChemicalState extends ChildEqState {
         if (typeof this.data.flowDelay === 'undefined') this.data.flowDelay = false;
         if (typeof this.data.dosingStatus === 'undefined') this.dosingStatus = 2;
         if (typeof this.data.enabled === 'undefined') this.data.enabled = true;
+        if (typeof this.data.freezeProtect === 'undefined') this.data.freezeProtect = false;
     }
     public getConfig(): Chemical { return; }
     public calcDoseHistory(): number {
@@ -2336,6 +2349,8 @@ export class ChemicalState extends ChildEqState {
     public get demandHistory() { return new ChemicalDemandState(this.data, 'demandHistory', this) };
     public get enabled(): boolean { return this.data.enabled; }
     public set enabled(val: boolean) { this.data.enabled = val; }
+    public get freezeProtect(): boolean { return this.data.freezeProtect; }
+    public set freezeProtect(val: boolean) { this.data.freezeProtect = val; }
     public get level(): number { return this.data.level; }
     public set level(val: number) { this.setDataVal('level', val); }
     public get setpoint(): number { return this.data.setpoint; }
@@ -2393,8 +2408,8 @@ export class ChemicalState extends ChildEqState {
 }
 export class ChemicalPhState extends ChemicalState {
     public initData() {
-        // if (typeof this.data.chemType === 'undefined') this.data.chemType === 'acid';  // RSG 10-23-21 - Only a getter; don't need to set this.
         super.initData();
+        if (typeof this.data.chemType === 'undefined') this.data.chemType = 'none';
     }
     public getConfig() {
         let schem = this.chemController;
@@ -2403,7 +2418,8 @@ export class ChemicalPhState extends ChemicalState {
             return typeof chem !== 'undefined' ? chem.ph : undefined;
         }
     }
-    public get chemType() { return 'acid'; }
+    public get chemType() { return this.data.chemType; }
+    public set chemType(val: string) { this.setDataVal('chemType', val); }
     public get probe(): ChemicalProbePHState { return new ChemicalProbePHState(this.data, 'probe', this); }
     public getExtended() {
         let chem = super.getExtended();
@@ -2452,7 +2468,7 @@ export class ChemicalPhState extends ChemicalState {
 export class ChemicalORPState extends ChemicalState {
     public initData() {
         if (typeof this.data.probe === 'undefined') this.data.probe = {};
-        if (typeof this.data.chemType === 'undefined') this.data.chemType === 'orp';
+        if (typeof this.data.chemType === 'undefined') this.data.chemType = 'none';
         if (typeof this.data.useChlorinator === 'undefined') this.data.useChlorinator = false;
         super.initData();
         // Load up the 24 hours doseHistory.
@@ -2465,6 +2481,7 @@ export class ChemicalORPState extends ChemicalState {
         //});
     }
     public get chemType() { return 'orp'; }
+    public set chemType(val) { this.setDataVal('chemType', val); }
     public get probe() { return new ChemicalProbeORPState(this.data, 'probe', this); }
     public get useChlorinator(): boolean { return utils.makeBool(this.data.useChlorinator); }
     public set useChlorinator(val: boolean) { this.setDataVal('useChlorinator', val); }
@@ -2743,20 +2760,21 @@ export class ChemControllerStateAlarms extends ChildEqState {
     //ctor(data): ChemControllerStateWarnings { return new ChemControllerStateWarnings(data, name || 'alarms'); }
     public dataName = 'chemControllerAlarms';
     public initData() {
-        if (typeof this.data.flow === 'undefined') this.flow = 0;
-        if (typeof this.data.pH === 'undefined') this.pH = 0;
-        if (typeof this.data.orp === 'undefined') this.orp = 0;
-        if (typeof this.data.pHTank === 'undefined') this.pHTank = 0;
-        if (typeof this.data.orpTank === 'undefined') this.orpTank = 0;
-        if (typeof this.data.probeFault === 'undefined') this.probeFault = 0;
-        if (typeof this.data.pHProbeFault === 'undefined') this.pHProbeFault = 0;
-        if (typeof this.data.orpProbeFault === 'undefined') this.orpProbeFault = 0;
-        if (typeof this.data.pHPumpFault === 'undefined') this.pHPumpFault = 0;
-        if (typeof this.data.orpPumpFault === 'undefined') this.orpPumpFault = 0;
-        if (typeof this.data.chlorFault === 'undefined') this.chlorFault = 0;
-        if (typeof this.data.bodyFault === 'undefined') this.bodyFault = 0;
-        if (typeof this.data.flowSensorFault === 'undefined') this.flowSensorFault = 0;
-        if (typeof this.data.comms === 'undefined') this.comms = 0;
+        if (typeof this.data.flow === 'undefined') this.data.flow = sys.board.valueMaps.chemControllerAlarms.transform(0);
+        if (typeof this.data.pH === 'undefined') this.data.pH = sys.board.valueMaps.chemControllerAlarms.transform(0);
+        if (typeof this.data.orp === 'undefined') this.data.orp = sys.board.valueMaps.chemControllerAlarms.transform(0);
+        if (typeof this.data.pHTank === 'undefined') this.data.pHTank = sys.board.valueMaps.chemControllerAlarms.transform(0);
+        if (typeof this.data.orpTank === 'undefined') this.data.orpTank = sys.board.valueMaps.chemControllerAlarms.transform(0);
+        if (typeof this.data.probeFault === 'undefined') this.data.probeFault = sys.board.valueMaps.chemControllerAlarms.transform(0);
+        if (typeof this.data.pHProbeFault === 'undefined') this.data.pHProbeFault = sys.board.valueMaps.chemControllerAlarms.transform(0);
+        if (typeof this.data.orpProbeFault === 'undefined') this.data.orpProbeFault = sys.board.valueMaps.chemControllerAlarms.transform(0);
+        if (typeof this.data.pHPumpFault === 'undefined') this.data.pHPumpFault = sys.board.valueMaps.chemControllerHardwareFaults.transform(0);
+        if (typeof this.data.orpPumpFault === 'undefined') this.data.orpPumpFault = sys.board.valueMaps.chemControllerHardwareFaults.transform(0);
+        if (typeof this.data.chlorFault === 'undefined') this.data.chlorFault = sys.board.valueMaps.chemControllerHardwareFaults.transform(0);
+        if (typeof this.data.bodyFault === 'undefined') this.data.bodyFault = sys.board.valueMaps.chemControllerHardwareFaults.transform(0);
+        if (typeof this.data.flowSensorFault === 'undefined') this.data.flowSensorFault = sys.board.valueMaps.chemControllerHardwareFaults.transform(0);
+        if (typeof this.data.comms === 'undefined') this.data.comms = sys.board.valueMaps.chemControllerStatus.transform(0);
+        if (typeof this.data.freezeProtect === 'undefined') this.data.freezeProtect = sys.board.valueMaps.chemControllerAlarms.transform(0);
     }
     public get flow(): number { return typeof this.data.flow === 'undefined' ? undefined : this.data.flow.val; }
     public set flow(val: number) {
@@ -2849,7 +2867,6 @@ export class ChemControllerStateAlarms extends ChildEqState {
             this.hasChanged = true;
         }
     }
-
     public get comms(): number { return typeof this.data.comms === 'undefined' ? undefined : this.data.comms.val; }
     public set comms(val: number) {
         if (this.comms !== val) {
@@ -2857,6 +2874,14 @@ export class ChemControllerStateAlarms extends ChildEqState {
             this.hasChanged = true;
         }
     }
+    public get freezeProtect(): number { return typeof this.data.freezeProtect === 'undefined' ? undefined : this.data.freezeProtect.val; }
+    public set freezeProtect(val: number) {
+        if (this.freezeProtect !== val) {
+            this.data.freezeProtect = sys.board.valueMaps.chemControllerAlarms.transform(val);
+            this.hasChanged = true;
+        }
+    }
+
 }
 export class AppVersionState extends EqState {
     public get nextCheckTime(): string { return this.data.nextCheckTime; }

package/controller/boards/BoardFactory.ts

@@ -1,45 +1,45 @@
-/*  nodejs-poolController.  An application to control pool equipment.
-Copyright (C) 2016, 2017, 2018, 2019, 2020.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-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 { IntelliCenterBoard } from './IntelliCenterBoard';
-import { IntelliTouchBoard } from './IntelliTouchBoard';
-import { IntelliComBoard } from './IntelliComBoard';
-import { EasyTouchBoard } from './EasyTouchBoard';
-import { SystemBoard } from './SystemBoard';
-import { ControllerType } from '../Constants';
-import { PoolSystem } from '../Equipment';
-import { NixieBoard } from './NixieBoard';
-
-export class BoardFactory {
-    // Factory create the system board from the controller type.  Resist storing
-    // the pool system as this can cause a leak.  The PoolSystem object already has a reference to this.
-    public static fromControllerType(ct: ControllerType, system: PoolSystem) {
-        switch (ct) {
-            case ControllerType.IntelliCenter:
-                return new IntelliCenterBoard(system);
-            case ControllerType.IntelliTouch:
-                return new IntelliTouchBoard(system);
-            case ControllerType.IntelliCom:
-                return new IntelliComBoard(system);
-            case ControllerType.EasyTouch:
-                return new EasyTouchBoard(system);
-            case ControllerType.Nixie:
-                return new NixieBoard(system);
-        }
-        return new SystemBoard(system);
-    }
-
-}
+/*  nodejs-poolController.  An application to control pool equipment.
+Copyright (C) 2016, 2017, 2018, 2019, 2020.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+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 { IntelliCenterBoard } from './IntelliCenterBoard';
+import { IntelliTouchBoard } from './IntelliTouchBoard';
+import { IntelliComBoard } from './IntelliComBoard';
+import { EasyTouchBoard } from './EasyTouchBoard';
+import { SystemBoard } from './SystemBoard';
+import { ControllerType } from '../Constants';
+import { PoolSystem } from '../Equipment';
+import { NixieBoard } from './NixieBoard';
+
+export class BoardFactory {
+    // Factory create the system board from the controller type.  Resist storing
+    // the pool system as this can cause a leak.  The PoolSystem object already has a reference to this.
+    public static fromControllerType(ct: ControllerType, system: PoolSystem) {
+        switch (ct) {
+            case ControllerType.IntelliCenter:
+                return new IntelliCenterBoard(system);
+            case ControllerType.IntelliTouch:
+                return new IntelliTouchBoard(system);
+            case ControllerType.IntelliCom:
+                return new IntelliComBoard(system);
+            case ControllerType.EasyTouch:
+                return new EasyTouchBoard(system);
+            case ControllerType.Nixie:
+                return new NixieBoard(system);
+        }
+        return new SystemBoard(system);
+    }
+
+}