nodejs-poolcontroller 7.3.0 → 7.6.0

package/controller/Equipment.ts

@@ -31,6 +31,7 @@ import { conn } from './comms/Comms';
 import { versionCheck } from "../config/VersionCheck";
 import { NixieControlPanel } from "./nixie/Nixie";
 import { NixieBoard } from 'controller/boards/NixieBoard';
+import { child } from "winston";
 
 interface IPoolSystem {
     cfgPath: string;
@@ -68,7 +69,7 @@ interface IPoolSystem {
 }
 
 export class PoolSystem implements IPoolSystem {
-    public _hasChanged: boolean=false;
+    public _hasChanged: boolean = false;
     constructor() {
         this.cfgPath = path.posix.join(process.cwd(), '/data/poolConfig.json');
     }
@@ -99,7 +100,12 @@ export class PoolSystem implements IPoolSystem {
                 { val: 3, name: 'IT5S', part: 'i5+3S', desc: 'IntelliTouch i5+3S', bodies: 1, circuits: 6, shared: false },
                 { val: 4, name: 'IT9S', part: 'i9+3S', desc: 'IntelliTouch i9+3S', bodies: 1, circuits: 9, shared: false },
                 { val: 5, name: 'IT10D', part: 'i10D', desc: 'IntelliTouch i10D', bodies: 1, circuits: 10, shared: false, dual: true }
+            ],
+            expansionModules: [
+                { val: 32, name: 'IT5X', part: 'i5X', desc: 'IntelliTouch i5X', circuits: 5, shared: false },
+                { val: 33, name: 'IT10X', part: 'i10X', desc: 'IntelliTouch i10X', circuits: 10, shared: false }
             ]
+
         });
         arr.push({
             type: 'intellicenter', name: 'IntelliCenter',
@@ -109,7 +115,8 @@ export class PoolSystem implements IPoolSystem {
                 { val: 2, name: 'i8P', part: '521977Z', desc: 'IntelliCenter i8P', bodies: 1, valves: 2, circuits: 8, shared: false, dual: false, chlorinators: 1, chemControllers: 1 },
                 { val: 3, name: 'i8PS', part: '521968Z', desc: 'IntelliCenter i8PS', bodies: 2, valves: 4, circuits: 9, shared: true, dual: false, chlorinators: 1, chemControllers: 1 },
                 { val: 4, name: 'i10P', part: '521993Z', desc: 'IntelliCenter i10P', bodies: 1, valves: 2, circuits: 10, shared: false, dual: false, chlorinators: 1, chemControllers: 1 }, // This is a guess
-                { val: 5, name: 'i10PS', part: '521873Z', desc: 'IntelliCenter i10PS', bodies: 2, valves: 4, circuits: 11, shared: true, dual: false, chlorinators: 1, chemControllers: 1 }
+                { val: 5, name: 'i10PS', part: '521873Z', desc: 'IntelliCenter i10PS', bodies: 2, valves: 4, circuits: 11, shared: true, dual: false, chlorinators: 1, chemControllers: 1 },
+                { val: 7, name: 'i10D', part: '523029Z', desc: 'IntelliCenter i10D', bodies: 2, valves: 2, circuits: 11, shared: false, dual: true, chlorinators: 2, chemControllers: 2 },
             ]
         });
         arr.push({
@@ -140,7 +147,22 @@ export class PoolSystem implements IPoolSystem {
         let cfg = this.loadConfigFile(this.cfgPath, {});
         let cfgDefault = this.loadConfigFile(path.posix.join(process.cwd(), '/defaultPool.json'), {});
         cfg = extend(true, {}, cfgDefault, cfg);
-        this.data = this.onchange(cfg, function() { sys.dirty = true; });
+        // First lets remove all the null ids.
+        EqItemCollection.removeNullIds(cfg.bodies);
+        EqItemCollection.removeNullIds(cfg.schedules);
+        EqItemCollection.removeNullIds(cfg.features);
+        EqItemCollection.removeNullIds(cfg.circuits);
+        EqItemCollection.removeNullIds(cfg.pumps);
+        EqItemCollection.removeNullIds(cfg.chlorinators);
+        EqItemCollection.removeNullIds(cfg.valves);
+        EqItemCollection.removeNullIds(cfg.heaters);
+        EqItemCollection.removeNullIds(cfg.covers);
+        EqItemCollection.removeNullIds(cfg.circuitGroups);
+        EqItemCollection.removeNullIds(cfg.lightGroups);
+        EqItemCollection.removeNullIds(cfg.remotes);
+        EqItemCollection.removeNullIds(cfg.chemControllers);
+        EqItemCollection.removeNullIds(cfg.filters);
+        this.data = this.onchange(cfg, function () { sys.dirty = true; });
         this.general = new General(this.data, 'pool');
         this.equipment = new Equipment(this.data, 'equipment');
         this.configVersion = new ConfigVersion(this.data, 'configVersion');
@@ -250,43 +272,6 @@ export class PoolSystem implements IPoolSystem {
                 break;
         }
     }
-    /*  public searchForAdditionalDevices() {
-         if (this.controllerType === ControllerType.Unknown || typeof this.controllerType === 'undefined' && !conn.mockPort) {
-             //logger.info("Searching chlorinators, pumps and chem controllers");
-             //EquipmentStateMessage.initVirtual();
-             //sys.board.virtualChlorinatorController.search();
-             //sys.board.virtualPumpControllers.search();
-             //sys.board.virtualChemControllers.search();
-             state.equipment.controllerType = sys.controllerType = ControllerType.Nixie;
-             let board = sys.board as NixieBoard;
-             (async () => { await board.initNixieBoard(); })();
-         }
-         else {
-             if (this.controllerType === ControllerType.Virtual) {
-                 state.mode = 0;
-                 state.status = 1;
-                 sys.equipment.setEquipmentIds();
-                 state.emitControllerChange();
-                 sys.board.processStatusAsync();
-             }
-             else {
-                 let board = sys.board as NixieBoard;
-                 (async () => { await board.initNixieBoard(); })();
-             }
- 
-             // if the app crashes while the pumps are running we need to reset the 'virtualControllerStatus' to stopped so it can start again
-             sys.board.virtualPumpControllers.softStop();
-             //sys.board.virtualChlorinatorController.stop();
-             sys.board.virtualChemControllers.stop();
-             // try to start any virtual controllers that are present irregardless of overall controller virtual status
-             sys.board.virtualPumpControllers.start();
-             //sys.board.virtualChlorinatorController.start();
-             sys.board.virtualChemControllers.start();
-             sys.board.heaters.initTempSensors();
-             sys.board.heaters.updateHeaterServices();
-             state.cleanupState();
-         }
-     } */
     public board: SystemBoard = new SystemBoard(this);
     public ncp: NixieControlPanel = new NixieControlPanel();
     public processVersionChanges(ver: ConfigVersion) { this.board.requestConfiguration(ver); }
@@ -537,6 +522,14 @@ class EqItemCollection<T> implements IEqItemCollection {
             this.name = name;
         }
     }
+    public static removeNullIds(data: any) {
+        if (typeof data !== 'undefined' && Array.isArray(data) && typeof data.length === 'number') {
+            for (let i = data.length - 1; i >= 0; i--) {
+                if (typeof data[i].id !== 'number') data.splice(i, 1);
+                else if (typeof data[i].id === 'undefined' || isNaN(data[i].id)) data.splice(i, 1);
+            }
+        }
+    }
     public getItemByIndex(ndx: number, add?: boolean, data?: any): T {
         if (this.data.length > ndx) return this.createItem(this.data[ndx]);
         if (typeof add !== 'undefined' && add)
@@ -620,7 +613,7 @@ class EqItemCollection<T> implements IEqItemCollection {
     }
     public sort(fn: (a, b) => number) { this.data.sort(fn); }
     public count(fn: () => boolean): number { return this.data.filter(fn).length; }
-    public getNextEquipmentId(range: EquipmentIdRange, exclude?:number[]): number {
+    public getNextEquipmentId(range: EquipmentIdRange, exclude?: number[]): number {
         for (let i = range.start; i <= range.end; i++) {
             let eq = this.data.find(elem => elem.id === i);
             if (typeof eq === 'undefined') {
@@ -661,6 +654,7 @@ export class General extends EqItem {
         if (master === -1)
             super.clear();
     }
+
 }
 // Custom Names are IntelliTouch Only
 export class CustomNameCollection extends EqItemCollection<CustomName> {
@@ -729,25 +723,53 @@ export class Options extends EqItem {
         if (typeof this.data.units === 'undefined') this.data.units = 0;
         if (typeof this.data.clockMode === 'undefined') this.data.clockMode = 12;
         if (typeof this.data.adjustDST === 'undefined') this.data.adjustDST = true;
+        if (typeof this.data.freezeThreshold === 'undefined') this.data.freezeThreshold = 35;
+        if (typeof this.data.pumpDelay === 'undefined') this.data.pumpDelay = false;
+        if (typeof this.data.valveDelayTime === 'undefined') this.data.valveDelayTime = 30;
+        // RKS: 12-04-21 If you are reading this in a few months delete the line below.
+        if (this.data.valveDelayTime > 1000) this.data.valveDelayTime = this.data.valveDelayTime / 1000;
+        if (typeof this.data.heaterStartDelay === 'undefined') this.data.heaterStartDelay = true;
+        if (typeof this.data.cleanerStartDelay === 'undefined') this.data.cleanerStartDelay = true;
+        if (typeof this.data.cleanerSolarDelay === 'undefined') this.data.cleanerSolarDelay = true;
+        if (typeof this.data.heaterStartDelayTime === 'undefined') this.data.heaterStartDelayTime = 10;
+        if (typeof this.data.cleanerStartDelayTime === 'undefined') this.data.cleanerStartDelayTime = 300; // 5min
+        if (typeof this.data.cleanerSolarDelayTime === 'undefined') this.data.cleanerSolarDelayTime = 300; // 5min
     }
     public get clockMode(): number | any { return this.data.clockMode; }
     public set clockMode(val: number | any) { this.setDataVal('clockMode', sys.board.valueMaps.clockModes.encode(val)); }
     public get units(): number | any { return this.data.units; }
-    public set units(val: number | any) { this.setDataVal('units', sys.board.valueMaps.tempUnits.encode(val)); }
+    public set units(val: number | any) { this.setDataVal('units', sys.board.valueMaps.systemUnits.encode(val)); }
     public get clockSource(): string { return this.data.clockSource; }
     public set clockSource(val: string) { this.setDataVal('clockSource', val); }
     public get adjustDST(): boolean { return this.data.adjustDST; }
     public set adjustDST(val: boolean) { this.setDataVal('adjustDST', val); }
     public get manualPriority(): boolean { return this.data.manualPriority; }
     public set manualPriority(val: boolean) { this.setDataVal('manualPriority', val); }
-    public get vacationMode(): boolean { return this.data.vacationMode; }
-    public set vacationMode(val: boolean) { this.setDataVal('vacationMode', val); }
+    public get vacation(): VacationOptions { return new VacationOptions(this.data, 'vacation', this); }
     public get manualHeat(): boolean { return this.data.manualHeat; }
     public set manualHeat(val: boolean) { this.setDataVal('manualHeat', val); }
     public get pumpDelay(): boolean { return this.data.pumpDelay; }
     public set pumpDelay(val: boolean) { this.setDataVal('pumpDelay', val); }
+    public get valveDelayTime(): number { return this.data.valveDelayTime; }
+    public set valveDelayTime(val: number) { this.setDataVal('valveDelayTime', val); }
     public get cooldownDelay(): boolean { return this.data.cooldownDelay; }
     public set cooldownDelay(val: boolean) { this.setDataVal('cooldownDelay', val); }
+    public get freezeThreshold(): number { return this.data.freezeThreshold; }
+    public set freezeThreshold(val: number) { this.setDataVal('freezeThreshold', val); }
+    public get heaterStartDelay(): boolean { return this.data.heaterStartDelay; }
+    public set heaterStartDelay(val: boolean) { this.setDataVal('heaterStartDelay', val); }
+    public get heaterStartDelayTime(): number { return this.data.heaterStartDelayTime; }
+    public set heaterStartDelayTime(val: number) { this.setDataVal('heaterStartDelayTime', val); }
+
+    public get cleanerStartDelay(): boolean { return this.data.cleanerStartDelay; }
+    public set cleanerStartDelay(val: boolean) { this.setDataVal('cleanerStartDelay', val); }
+    public get cleanerStartDelayTime(): number { return this.data.cleanerStartDelayTime; }
+    public set cleanerStartDelayTime(val: number) { this.setDataVal('cleanerStartDelayTime', val); }
+    public get cleanerSolarDelay(): boolean { return this.data.cleanerSolarDelay; }
+    public set cleanerSolarDelay(val: boolean) { this.setDataVal('cleanerSolarDelay', val); }
+    public get cleanerSolarDelayTime(): number { return this.data.cleanerSolarDelayTime; }
+    public set cleanerSolarDelayTime(val: number) { this.setDataVal('cleanerSolarDelayTime', val); }
+
     //public get airTempAdj(): number { return typeof this.data.airTempAdj === 'undefined' ? 0 : this.data.airTempAdj; }
     //public set airTempAdj(val: number) { this.setDataVal('airTempAdj', val); }
     //public get waterTempAdj1(): number { return typeof this.data.waterTempAdj1 === 'undefined' ? 0 : this.data.waterTempAdj1; }
@@ -759,6 +781,42 @@ export class Options extends EqItem {
     //public get solarTempAdj2(): number { return typeof this.data.solarTempAdj2 === 'undefined' ? 0 : this.data.solarTempAdj2; }
     //public set solarTempAdj2(val: number) { this.setDataVal('solarTempAd2', val); }
 }
+export class VacationOptions extends ChildEqItem {
+    public initData() {
+        if (typeof this.data.enabled === 'undefined') this.data.enabled = false;
+        if (typeof this.data.useTimeframe === 'undefined') this.data.useTimeframe = false;
+    }
+    private _startDate: Date;
+    private _endDate: Date;
+    public get enabled(): boolean { return this.data.enabled; }
+    public set enabled(val: boolean) { this.setDataVal('enabled', val); }
+    public get useTimeframe(): boolean { return this.data.useTimeframe; }
+    public set useTimeframe(val: boolean) { this.setDataVal('useTimeframe', val); }
+    public get startDate() {
+        if (typeof this._startDate === 'undefined') this._startDate = typeof this.data.startDate === 'string' ? new Date(this.data.startDate) : undefined;
+        return this._startDate;
+    }
+    public set startDate(val: Date | string | number) {
+        this._startDate = new Date(val);
+        this._saveDate('startDate', this._startDate);
+    }
+    public get endDate() {
+        if (typeof this._endDate === 'undefined') this._endDate = typeof this.data.endDate === 'string' ? new Date(this.data.endDate) : undefined;
+        return this._endDate;
+    }
+    public set endDate(val: Date | string | number) {
+        this._endDate = new Date(val);
+        this._saveDate('endDate', this._endDate);
+    }
+
+    private _saveDate(prop: string, dt: Date) {
+        if (typeof dt !== 'undefined' && !isNaN(dt.getTime())) {
+            dt.setHours(0, 0, 0, 0);
+            this.setDataVal(prop, Timestamp.toISOLocal(dt));
+        }
+        else this.setDataVal(prop, undefined);
+    }
+}
 export class Location extends EqItem {
     public dataName = 'locationConfig';
     public get address(): string { return this.data.address; }
@@ -823,6 +881,8 @@ export class Equipment extends EqItem {
     public set shared(val: boolean) { this.setDataVal('shared', val); }
     public get dual(): boolean { return this.data.dual; }
     public set dual(val: boolean) { this.setDataVal('dual', val); }
+    public get intakeReturnValves(): boolean { return this.data.intakeReturnValves; }
+    public set intakeReturnValves(val: boolean) { this.setDataVal('intakeReturnValves', val); }
     public get maxBodies(): number { return this.data.maxBodies || 4; }
     public set maxBodies(val: number) { this.setDataVal('maxBodies', val); }
     public get maxValves(): number { return this.data.maxValves || 26; }
@@ -944,7 +1004,6 @@ export class ConfigVersion extends EqItem {
             if (prop === 'lastUpdated') continue;
             this.data[prop] = 0;
         }
-
     }
 }
 
@@ -968,6 +1027,9 @@ export class BodyCollection extends EqItemCollection<Body> {
 }
 export class Body extends EqItem {
     public dataName = 'bodyConfig';
+    public initData() {
+        if (typeof this.data.capacityUnits === 'undefined') this.data.capacityUnits = 1;
+    }
     public get id(): number { return this.data.id; }
     public set id(val: number) { this.data.id = val; }
     public get name(): string { return this.data.name; }
@@ -992,7 +1054,14 @@ export class Body extends EqItem {
     public set heatSetpoint(val: number) { this.setDataVal('setPoint', val); }
     public get coolSetpoint(): number { return this.data.coolSetpoint; }
     public set coolSetpoint(val: number) { this.setDataVal('coolSetpoint', val); }
+    public get capacityUnits(): number | any { return this.data.capacityUnits; }
+    public set capacityUnits(val: number | any) { this.setDataVal('capacityUnits', sys.board.valueMaps.volumeUnits.encode(val)); }
     public getHeatModes() { return sys.board.bodies.getHeatModes(this.id); }
+    public getExtended() {
+        let body = this.get(true);
+        body.capacityUnits = sys.board.valueMaps.volumeUnits.transform(this.capacityUnits || 1);
+        return body;
+    }
 }
 export class ScheduleCollection extends EqItemCollection<Schedule> {
     constructor(data: any, name?: string) { super(data, name || "schedules"); }
@@ -1040,12 +1109,12 @@ export class Schedule extends EqItem {
     public get isActive(): boolean { return this.data.isActive; }
     public set isActive(val: boolean) { this.setDataVal('isActive', val); }
     public get startMonth(): number { return this._startDate.getMonth() + 1; }
-    public set startMonth(val: number) { this._startDate.setMonth(val - 1); this._saveStartDate(); }
-    public get startDay(): number { return this._startDate.getDate(); }
-    public set startDay(val: number) { this._startDate.setDate(val); this._saveStartDate(); }
-    public get startYear(): number { return this._startDate.getFullYear(); }
-    public set startYear(val: number) { this._startDate.setFullYear(val < 100 ? val + 2000 : val); this._saveStartDate(); }
-    public get startDate(): Date { return this._startDate; }
+    public set startMonth(val: number) { if (typeof this._startDate === 'undefined') this._startDate = new Date(); this._startDate.setMonth(val - 1); this._saveStartDate(); }
+    public get startDay(): number { if (typeof this._startDate === 'undefined') this._startDate = new Date(); return this._startDate.getDate(); }
+    public set startDay(val: number) { if (typeof this._startDate === 'undefined') this._startDate = new Date(); this._startDate.setDate(val); this._saveStartDate(); }
+    public get startYear(): number { if (typeof this._startDate === 'undefined') this._startDate = new Date(); return this._startDate.getFullYear(); }
+    public set startYear(val: number) { if (typeof this._startDate === 'undefined') this._startDate = new Date(); this._startDate.setFullYear(val < 100 ? val + 2000 : val); this._saveStartDate(); }
+    public get startDate(): Date { return typeof this._startDate === 'undefined' ? this._startDate = new Date() : this._startDate; }
     public set startDate(val: Date) { this._startDate = val; }
     public get scheduleType(): number | any { return this.data.scheduleType; }
     public set scheduleType(val: number | any) { this.setDataVal('scheduleType', sys.board.valueMaps.scheduleTypes.encode(val)); }
@@ -1085,6 +1154,9 @@ export class EggTimer extends EqItem {
 }
 export class CircuitCollection extends EqItemCollection<Circuit> {
     constructor(data: any, name?: string) { super(data, name || "circuits"); }
+    public filter(f: (value: Circuit, index?: any, array?: any[]) => boolean): CircuitCollection {
+        return new CircuitCollection({ circuits: this.data.filter(f) });
+    }
     public createItem(data: any): Circuit { return new Circuit(data); }
     public add(obj: any): Circuit {
         this.data.push(obj);
@@ -1103,6 +1175,13 @@ export class CircuitCollection extends EqItemCollection<Circuit> {
 }
 export class Circuit extends EqItem implements ICircuit {
     public dataName = 'circuitConfig';
+    public initData() {
+        if (typeof this.data.freeze === 'undefined') this.data.freeze = false;
+        if (typeof this.data.type === 'undefined') this.data.type = 0;
+        if (typeof this.data.isActive === 'undefined') this.data.isActive = false;
+        if (typeof this.data.eggTimer === 'undefined') this.data.eggTimer = 720;
+        if (typeof this.data.showInFeatures === 'undefined') this.data.showInFeatures = true;
+    }
     public get id(): number { return this.data.id; }
     public set id(val: number) { this.setDataVal('id', val); }
     public get name(): string { return this.data.name; }
@@ -1134,7 +1213,22 @@ export class Circuit extends EqItem implements ICircuit {
     public get deviceBinding(): string { return this.data.deviceBinding; }
     public set deviceBinding(val: string) { this.setDataVal('deviceBinding', val); }
     public get hasHeatSource() { return typeof sys.board.valueMaps.circuitFunctions.get(this.type || 0).hasHeatSource !== 'undefined' ? sys.board.valueMaps.circuitFunctions.get(this.type || 0).hasHeatSource : false };
-    public getLightThemes() { return sys.board.circuits.getLightThemes(this.type); }
+    public getLightThemes() {
+        // Lets do this universally driven by the metadata.
+        let cf = sys.board.valueMaps.circuitFunctions.transform(this.type);
+        if (cf.isLight && typeof cf.theme !== 'undefined') {
+            let arrThemes = sys.board.valueMaps.lightThemes.toArray();
+            let themes = [];
+            for (let i = 0; i < arrThemes.length; i++) {
+                let thm = arrThemes[i];
+                if (typeof thm.types !== 'undefined' && thm.types.length > 0 && thm.types.includes(cf.theme)) themes.push(thm);
+            }
+            return themes;
+        }
+        else return [];
+
+        //return sys.board.circuits.getLightThemes(this.type);
+    }
     public static getIdName(id: number) {
         // todo: adjust for intellitouch
         let defName = "Aux" + (id + 1).toString();
@@ -1146,6 +1240,9 @@ export class Circuit extends EqItem implements ICircuit {
 }
 export class FeatureCollection extends EqItemCollection<Feature> {
     constructor(data: any, name?: string) { super(data, name || "features"); }
+    public filter(f: (value: Circuit, index?: any, array?: any[]) => boolean): FeatureCollection {
+        return new FeatureCollection({ features: this.data.filter(f) });
+    }
     public createItem(data: any): Feature { return new Feature(data); }
 }
 export class Feature extends EqItem implements ICircuit {
@@ -1155,6 +1252,7 @@ export class Feature extends EqItem implements ICircuit {
         if (typeof this.data.isActive === 'undefined') this.data.isActive = true;
         if (typeof this.data.eggTimer === 'undefined') this.data.eggTimer = 720;
         if (typeof this.data.showInFeatures === 'undefined') this.data.showInFeatures = true;
+        if (typeof this.data.master === 'undefined') this.data.master = sys.board.equipmentMaster; 
     }
     public dataName = 'featureConfig';
     public get id(): number { return this.data.id; }
@@ -1194,7 +1292,7 @@ export interface ICircuit {
     //showInCircuits?: boolean;
     showInFeatures?: boolean;
     macro?: boolean;
-    getLightThemes?: () => {};
+    getLightThemes?: (type?: number) => {};
     get(copy?: boolean);
     master: number;
 }
@@ -1213,6 +1311,9 @@ export class PumpCollection extends EqItemCollection<Pump> {
 }
 export class Pump extends EqItem {
     public dataName = 'pumpConfig';
+    public initData() {
+        if (typeof this.data.isVirtual !== 'undefined') delete this.data.isVirtual;
+    }
     public get id(): number { return this.data.id; }
     public set id(val: number) { this.setDataVal('id', val); }
     public get address(): number { return this.data.address || this.data.id + 95; }
@@ -1259,8 +1360,10 @@ export class Pump extends EqItem {
     public set vacuumTime(val: number) { this.setDataVal('vacuumTime', val); }
     public get backgroundCircuit() { return this.data.backgroundCircuit; }
     public set backgroundCircuit(val: number) { this.setDataVal('backgroundCircuit', val); }
-    public get isVirtual() { return this.data.isVirtual; }
-    public set isVirtual(val: boolean) { this.setDataVal('isVirtual', val); }
+    public get filterSize() { return this.data.filterSize; }
+    public set filterSize(val: number) { this.setDataVal('filterSize', val); }
+    // public get isVirtual() { return this.data.isVirtual; }
+    // public set isVirtual(val: boolean) { this.setDataVal('isVirtual', val); }
     public get connectionId(): string { return this.data.connectionId; }
     public set connectionId(val: string) { this.setDataVal('connectionId', val); }
     public get deviceBinding(): string { return this.data.deviceBinding; }
@@ -1398,6 +1501,22 @@ export class Chlorinator extends EqItem {
 export class ValveCollection extends EqItemCollection<Valve> {
     constructor(data: any, name?: string) { super(data, name || "valves"); }
     public createItem(data: any): Valve { return new Valve(data); }
+    public getIntake(): Valve[] {
+        let valves = this.data.filter(x => x.isIntake === true);
+        let ret = [];
+        for (let i = 0; i < valves.length; i++) {
+            ret.push(this.getItemById(valves[i].id));
+        }
+        return ret;
+    }
+    public getReturn(): Valve[] {
+        let valves = this.data.filter(x => x.isReturn === true);
+        let ret = [];
+        for (let i = 0; i < valves.length; i++) {
+            ret.push(this.getItemById(valves[i].id));
+        }
+        return ret;
+    }
 }
 export class Valve extends EqItem {
     public dataName = 'valveConfig';
@@ -1416,8 +1535,8 @@ export class Valve extends EqItem {
     public set isIntake(val: boolean) { this.setDataVal('isIntake', val); }
     public get isReturn(): boolean { return utils.makeBool(this.data.isReturn); }
     public set isReturn(val: boolean) { this.setDataVal('isReturn', val); }
-    public get isVirtual(): boolean { return utils.makeBool(this.data.isVirtual); }
-    public set isVirtual(val: boolean) { this.setDataVal('isVirtual', val); }
+    // public get isVirtual(): boolean { return utils.makeBool(this.data.isVirtual); }
+    // public set isVirtual(val: boolean) { this.setDataVal('isVirtual', val); }
     public get pinId(): number { return this.data.pinId || 0; }
     public set pinId(val: number) { this.setDataVal('pinId', val); }
     public get isActive(): boolean { return this.data.isActive; }
@@ -1436,6 +1555,22 @@ export class HeaterCollection extends EqItemCollection<Heater> {
         if (typeof add !== 'undefined' && add) return this.add(data || { id: this.data.length + 1, address: address });
         return this.createItem(data || { id: this.data.length + 1, address: address });
     }
+    public filter(f: (value: Heater, index?: any, array?: any[]) => boolean): HeaterCollection {
+        return new HeaterCollection({ heaters: this.data.filter(f) });
+    }
+
+    public getSolarHeaters(bodyId?: number): EqItemCollection<Heater> {
+        let htype = sys.board.valueMaps.heaterTypes.getValue('solar');
+        return new HeaterCollection(this.data.filter(x => {
+            if (x.type === htype) {
+                if (typeof bodyId !== 'undefined') {
+                    if (!x.isActive) return false;
+                    return (bodyId === x.body || (sys.equipment.shared && x.body === 32)) ? true : false;
+                }
+            }
+            return false;
+        }));
+    }
 }
 export class Heater extends EqItem {
     public dataName = 'heaterConfig';
@@ -1464,8 +1599,6 @@ export class Heater extends EqItem {
     public set efficiencyMode(val: number) { this.setDataVal('efficiencyMode', val); }
     public get isActive(): boolean { return this.data.isActive; }
     public set isActive(val: boolean) { this.setDataVal('isActive', val); }
-    public get isVirtual(): boolean { return this.data.isVirtual; }
-    public set isVirtual(val: boolean) { this.setDataVal('isVirtual', val); }
     public get coolingEnabled(): boolean { return this.data.coolingEnabled; }
     public set coolingEnabled(val: boolean) { this.setDataVal('coolingEnabled', val); }
     public get heatingEnabled(): boolean { return this.data.heatingEnabled; }
@@ -1502,6 +1635,10 @@ export class Cover extends EqItem {
     public set normallyOn(val: boolean) { this.setDataVal('normallyOn', val); }
     public get circuits(): number[] { return this.data.circuits; }
     public set circuits(val: number[]) { this.setDataVal('circuits', val); }
+    public get chlorActive(): boolean { return this.data.chlorActive; }
+    public set chlorActive(val: boolean) { this.setDataVal('chlorActive', val); }
+    public get chlorOutput(): boolean { return this.data.chlorOutput; }
+    public set chlorOutput(val: boolean) { this.setDataVal('chlorOutput', val); }
 }
 export interface ICircuitGroup {
     id: number;
@@ -1606,7 +1743,33 @@ export class LightGroup extends EqItem implements ICircuitGroup, ICircuit {
     public get lightingTheme(): number | any { return this.data.lightingTheme; }
     public set lightingTheme(val: number | any) { this.setDataVal('lightingTheme', sys.board.valueMaps.lightThemes.encode(val)); }
     public get circuits(): LightGroupCircuitCollection { return new LightGroupCircuitCollection(this.data, "circuits"); }
-    public getLightThemes() { return sys.board.valueMaps.lightThemes.toArray(); }
+    public getLightThemes() {
+        // Go through the circuits and gather the themes.
+        // This method first looks at the circuits to determine their type (function)
+        // then it filters the list by the types associated with the circuits.  It does this because
+        // there can be combined ColorLogic and IntelliBrite lights.  The themes array has
+        // the circuit function.
+        let arrThemes = [];
+        for (let i = 0; i < this.circuits.length; i++) {
+            let circ = this.circuits.getItemByIndex(i);
+            let c = sys.circuits.getInterfaceById(circ.circuit);
+            let cf = sys.board.valueMaps.circuitFunctions.transform(c.type);
+            if (cf.isLight && typeof cf.theme !== 'undefined') {
+                if (!arrThemes.includes(cf.theme)) arrThemes.push(cf.theme);
+            }
+        }
+        // Alright now we need to get a listing of the themes.
+        let t = sys.board.valueMaps.lightThemes.toArray();
+        let ret = [];
+        for (let i = 0; i < t.length; i++) {
+            let thm = t[i];
+            if (typeof thm.types !== 'undefined' && thm.types.length > 0) {
+                // Look in the themes array of the theme.
+                if (arrThemes.some(x => thm.types.includes(x))) ret.push(thm);
+            }
+        }
+        return ret;
+    }
     public getExtended() {
         let group = this.get(true);
         group.type = sys.board.valueMaps.circuitGroupTypes.transform(group.type);
@@ -1823,7 +1986,7 @@ export class ChemController extends EqItem {
         //var chemController = {
         //    id: 'number',               // Id of the controller
         //    name: 'string',             // Name assigned to the controller
-        //    type: 'valueMap',           // intellichem, homegrown, rem -- There is an unknown but that should probably go away.
+        //    type: 'valueMap',           // intellichem, rem -- There is an unknown but that should probably go away.
         //    body: 'valueMap',           // Body assigned to the chem controller.
         //    address: 'number',          // Address for IntelliChem controller only.
         //    isActive: 'booean',
@@ -1912,8 +2075,8 @@ export class ChemController extends EqItem {
     public set address(val: number) { this.setDataVal('address', val); }
     public get isActive(): boolean { return this.data.isActive; }
     public set isActive(val: boolean) { this.setDataVal('isActive', val); }
-    public get isVirtual(): boolean { return this.data.isVirtual; }
-    public set isVirtual(val: boolean) { this.setDataVal('isVirtual', val); }
+    // public get isVirtual(): boolean { return this.data.isVirtual; }
+    // public set isVirtual(val: boolean) { this.setDataVal('isVirtual', val); }
     public get calciumHardness(): number { return this.data.calciumHardness; }
     public set calciumHardness(val: number) { this.setDataVal('calciumHardness', val); }
     public get cyanuricAcid(): number { return this.data.cyanuricAcid; }
@@ -2075,6 +2238,11 @@ export class Filter extends EqItem {
         if (typeof this.data.filterType === 'undefined') this.data.filterType = 3;
         if (typeof this.data.capacity === 'undefined') this.data.capacity = 0;
         if (typeof this.data.capacityUnits === 'undefined') this.data.capacityUnits = 0;
+        if (typeof this.data.cleanPressure === 'undefined') this.data.cleanPressure = 0;
+        if (typeof this.data.dirtyPressure === 'undefined') this.data.dirtyPressure = 0;
+        if (typeof this.data.pressureUnits === 'undefined') this.data.pressureUnits = 0;
+        // Start this out at pool and let the user switch it around if necessary.
+        if (typeof this.data.pressureCircuitId === 'undefined') this.data.pressureCircuitId = 6;
     }
     public get id(): number { return this.data.id; }
     public set id(val: number) { this.setDataVal('id', val); }
@@ -2090,10 +2258,22 @@ export class Filter extends EqItem {
     public set isActive(val: boolean) { this.setDataVal('isActive', val); }
     public get name(): string { return this.data.name; }
     public set name(val: string) { this.setDataVal('name', val); }
+
+    public get showPressure(): boolean { return this.data.showPressure; }
+    public set showPressure(val: boolean) { this.setDataVal('showPressure', val); }
     public get lastCleanDate(): Timestamp { return this.data.lastCleanDate; }
     public set lastCleanDate(val: Timestamp) { this.setDataVal('lastCleanDate', val); }
     public get needsCleaning(): number { return this.data.needsCleaning; }
     public set needsCleaning(val: number) { this.setDataVal('needsCleaning', val); }
+    public get pressureUnits(): number { return this.data.pressureUnits; }
+    public set pressureUnits(val: number) { this.setDataVal('pressureUnits', val); }
+    public get pressureCircuitId(): number { return this.data.pressureCircuitId; }
+    public set pressureCircuitId(val: number) { this.setDataVal('pressureCircuitId', val); }
+    public get cleanPressure(): number { return this.data.cleanPressure; }
+    public set cleanPressure(val: number) { this.setDataVal('cleanPressure', val); }
+    public get dirtyPressure(): number { return this.data.dirtyPressure; }
+    public set dirtyPressure(val: number) { this.setDataVal('dirtyPressure', val); }
+
     public get connectionId(): string { return this.data.connectionId; }
     public set connectionId(val: string) { this.setDataVal('connectionId', val); }
     public get deviceBinding(): string { return this.data.deviceBinding; }
@@ -2183,7 +2363,7 @@ export class ChemicalChlor extends ChildEqItem {
     public initData() {
         super.initData();
     }
-    public get enabled(): boolean { 
+    public get enabled(): boolean {
         let chlor = sys.chlorinators.getItemById(1);
         return chlor.isActive;
     }
@@ -2200,10 +2380,10 @@ export class ChemicalChlor extends ChildEqItem {
         return typeof model.chlorinePerSec !== 'undefined' ? model.chlorinePerSec : 0;
     }
     public set ratedLbs(val: number) { this.setDataVal('ratedLbs', val); }
-    public get superChlor() { 
+    public get superChlor() {
         let chlor = sys.chlorinators.getItemById(1);
         return typeof chlor.superChlor !== 'undefined' ? chlor.superChlor : false;
-     }
+    }
     public getExtended() {
         let chlor = this.get(true);
         chlor.model = sys.board.valueMaps.chlorinatorModel.transform(this.model);

package/controller/Errors.ts

@@ -96,15 +96,28 @@ export class InvalidEquipmentDataError extends EquipmentError {
     }
     public eqData;
 }
+export class ServiceProcessError extends ApiError {
+    constructor(message: string, serviceName: string, process?: string) {
+        super(message, 290, 400);
+        this.name = 'ServiceProcessError';
+        this.service = serviceName;
+        this.process = process;
+    }
+    public process: string;
+    public service: string;
+}
 export class ServiceParameterError extends ApiError {
     constructor(message: string, serviceName: string, paramName: string, value) {
         super(message, 280, 400);
         this.name = 'InvalidServiceParameter';
+        
         this.value = value;
-        this.parameter = value;
+        this.parameter = paramName;
+        this.service = serviceName;
     }
     public value;
     public parameter: string;
+    public service: string;
 }
 export class InvalidOperationError extends ApiError {
     constructor(message: string, operation: string) {
@@ -131,6 +144,16 @@ export class ParameterOutOfRangeError extends InvalidOperationError {
     public value;
     public parameter: string;
 }
+export class BoardProcessError extends ApiError {
+    constructor(message: string, process?: string) {
+        super(message, 300, 400);
+        this.name = 'ProcessingError';
+        this.process = process;
+    }
+    public process: string;
+    
+}
+
 export class MessageError extends ApiError {
     constructor(msg: Message, message: string, code?: number, httpCode?: number) {
         super(message, code, httpCode);