nodejs-poolcontroller 7.7.0 → 8.0.1

package/controller/Equipment.ts

@@ -1,5 +1,6 @@
 /*  nodejs-poolController.  An application to control pool equipment.
-Copyright (C) 2016, 2017, 2018, 2019, 2020.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
+Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022.  
+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
@@ -31,13 +32,16 @@ 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";
+import { MockSystemBoard } from "../anslq25/boards/MockSystemBoard";
+import { MockBoardFactory } from "../anslq25/boards/MockBoardFactory";
+import { ScreenLogicComms } from "./comms/ScreenLogic";
 
 interface IPoolSystem {
     cfgPath: string;
     data: any;
     stopAsync(): void;
     persist(): void;
+    anslq25: Anslq25;
     general: General;
     equipment: Equipment;
     configVersion: ConfigVersion;
@@ -74,9 +78,9 @@ export class PoolSystem implements IPoolSystem {
     constructor() {
         this.cfgPath = path.posix.join(process.cwd(), '/data/poolConfig.json');
     }
-    public getAvailableControllerTypes() {
+    public getAvailableControllerTypes(include:string[] = ['easytouch', 'intellitouch', 'intellicenter', 'nixie']) {
         let arr = [];
-        arr.push({
+        if (include.indexOf('easytouch')>=0) arr.push({
             type: 'easytouch', name: 'EasyTouch',
             models: [
                 { val: 0, name: 'ET28', part: 'ET2-8', desc: 'EasyTouch2 8', circuits: 8, bodies: 2, shared: true },
@@ -89,10 +93,10 @@ export class PoolSystem implements IPoolSystem {
                 { val: 128, name: 'ET8', part: 'ET-8', desc: 'EasyTouch 8', circuits: 8, bodies: 2, shared: true },
                 { val: 129, name: 'ET8P', part: 'ET-8P', desc: 'EasyTouch 8', circuits: 8, bodies: 1, shared: false },
                 { val: 130, name: 'ET4', part: 'ET-4', desc: 'EasyTouch 4', circuits: 4, bodies: 2, shared: true },
-                { val: 129, name: 'ET4P', part: 'ET-4P', desc: 'EasyTouch 4P', circuits: 4, bodies: 1, shared: false }
+                { val: 131, name: 'ET4P', part: 'ET-4P', desc: 'EasyTouch 4P', circuits: 4, bodies: 1, shared: false }
             ]
         });
-        arr.push({
+        if (include.indexOf('intellitouch')>=0) arr.push({
             type: 'intellitouch', name: 'IntelliTouch',
             models: [
                 { val: 0, name: 'IT5', part: 'i5+3', desc: 'IntelliTouch i5+3', bodies: 2, circuits: 6, shared: true },
@@ -108,7 +112,7 @@ export class PoolSystem implements IPoolSystem {
             ]
 
         });
-        arr.push({
+        if (include.indexOf('intellicenter')>=0) arr.push({
             type: 'intellicenter', name: 'IntelliCenter',
             models: [
                 { val: 0, name: 'i5P', part: '523125Z', desc: 'IntelliCenter i5P', bodies: 1, valves: 2, circuits: 5, shared: false, dual: false, chlorinators: 1, chemControllers: 1 },
@@ -120,7 +124,7 @@ export class PoolSystem implements IPoolSystem {
                 { 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({
+        if (include.indexOf('nixie')>=0) arr.push({
             type: 'nixie', name: 'Nixie', canChange: true,
             models: [
                 { val: 0, name: 'nxp', part: 'NXP', desc: 'Nixie Single Body', bodies: 1, shared: false, dual: false },
@@ -163,8 +167,15 @@ export class PoolSystem implements IPoolSystem {
         EqItemCollection.removeNullIds(cfg.lightGroups);
         EqItemCollection.removeNullIds(cfg.remotes);
         EqItemCollection.removeNullIds(cfg.chemControllers);
+        EqItemCollection.removeNullIds(cfg.chemDosers);
         EqItemCollection.removeNullIds(cfg.filters);
+        if (typeof cfg.pumps !== 'undefined') {
+            for (let i = 0; i < cfg.pumps.length; i++) {
+                EqItemCollection.removeNullIds(cfg.pumps[i].circuits);
+            }
+        }
         this.data = this.onchange(cfg, function () { sys.dirty = true; });
+        this.anslq25 = new Anslq25(this.data, 'anslq25');
         this.general = new General(this.data, 'pool');
         this.equipment = new Equipment(this.data, 'equipment');
         this.configVersion = new ConfigVersion(this.data, 'configVersion');
@@ -184,8 +195,10 @@ export class PoolSystem implements IPoolSystem {
         this.customNames = new CustomNameCollection(this.data, 'customNames');
         this.eggTimers = new EggTimerCollection(this.data, 'eggTimers');
         this.chemControllers = new ChemControllerCollection(this.data, 'chemControllers');
+        this.chemDosers = new ChemDoserCollection(this.data, 'chemDosers');
         this.filters = new FilterCollection(this.data, 'filters');
         this.board = BoardFactory.fromControllerType(this.controllerType, this);
+        this.anslq25Board = MockBoardFactory.fromControllerType(this.data.anslq25.controllerType, this);
     }
     // This performs a safe load of the config file.  If the file gets corrupt or actually does not exist
     // it will not break the overall system and allow hardened recovery.
@@ -214,11 +227,26 @@ export class PoolSystem implements IPoolSystem {
         this.board = BoardFactory.fromControllerType(ControllerType.Unknown, this);
         setTimeout(function () { state.status = 0; conn.resumeAll(); }, 0);
     }
+    public get anslq25ControllerType(): ControllerType { return this.data.anslq25.controllerType as ControllerType; }
+    public set anslq25ControllerType(val: ControllerType) {
+        //let self = this;
+        if (this.anslq25ControllerType !== val) {
+            console.log(`Mock Controller type changed from ${this.anslq25.controllerType} to ${val}`);
+            // Only go in here if there is a change to the controller type.
+            //this.resetData(); // Clear the configuration data.
+            //state.resetData(); // Clear the state data.
+            this.data.anslq25.controllerType = val;
+            //EquipmentStateMessage.initDefaults();
+            // We are actually changing the config so lets clear out all the data.
+            this.anslq25Board = MockBoardFactory.fromControllerType(val, this);
+            //if (this.data.anslq25.controllerType === ControllerType.Unknown) setTimeout(() => { self.initNixieController(); }, 7500);
+        }
+    }
     public get controllerType(): ControllerType { return this.data.controllerType as ControllerType; }
     public set controllerType(val: ControllerType) {
         let self = this;
-        if (this.controllerType !== val || this.controllerType === ControllerType.Virtual) {
-            console.log('RESETTING DATA -- Data files backed up to ./logs directory.');
+        if (this.controllerType !== val) {
+            console.log(`RESETTING DATA -- Controller type changed from ${this.controllerType} to ${val}`);
             // Only go in here if there is a change to the controller type.
             this.resetData(); // Clear the configuration data.
             state.resetData(); // Clear the state data.
@@ -226,11 +254,11 @@ export class PoolSystem implements IPoolSystem {
             EquipmentStateMessage.initDefaults();
             // We are actually changing the config so lets clear out all the data.
             this.board = BoardFactory.fromControllerType(val, this);
-            if (this.data.controllerType === ControllerType.Unknown || this.controllerType === ControllerType.Virtual) setTimeout(() => { self.initNixieController(); }, 7500);
+            if (this.data.controllerType === ControllerType.Unknown) setTimeout(() => { self.initNixieController(); }, 7500);
         }
     }
     public resetData() {
-        if (sys.controllerType !== ControllerType.Virtual && sys.controllerType !== ControllerType.Nixie) {
+        if (sys.controllerType !== ControllerType.Nixie) {
             // Do not clear this out if it is a virtual controller this causes problems.
             this.equipment.reset();
             this.circuitGroups.clear(0);
@@ -259,7 +287,7 @@ export class PoolSystem implements IPoolSystem {
     public async stopAsync() {
         if (this._timerChanges) clearTimeout(this._timerChanges);
         if (this._timerDirty) clearTimeout(this._timerDirty);
-        logger.info(`Shut down sys (config) object timers`);
+        logger.info(`Shut down sys (config) object timers`); 
         return this.board.stopAsync();
     }
     public initNixieController() {
@@ -267,7 +295,6 @@ export class PoolSystem implements IPoolSystem {
         switch (sys.controllerType || ControllerType.Unknown) {
             case ControllerType.Unknown:
             case ControllerType.Nixie:
-            case ControllerType.Virtual:
                 state.equipment.controllerType = sys.controllerType = ControllerType.Nixie;
                 let board = sys.board as NixieBoard;
                 (async () => { await board.initNixieBoard(); })();
@@ -275,6 +302,7 @@ export class PoolSystem implements IPoolSystem {
         }
     }
     public board: SystemBoard = new SystemBoard(this);
+    public anslq25Board: MockSystemBoard; // = new MockSystemBoard(this);
     public ncp: NixieControlPanel = new NixieControlPanel();
     public processVersionChanges(ver: ConfigVersion) { this.board.requestConfiguration(ver); }
     public checkConfiguration() { this.board.checkConfiguration(); }
@@ -286,6 +314,7 @@ export class PoolSystem implements IPoolSystem {
     protected _timerChanges: NodeJS.Timeout;
     protected _needsChanges: boolean;
     // All the equipment items below.
+    public anslq25: Anslq25;
     public general: General;
     public equipment: Equipment;
     public configVersion: ConfigVersion;
@@ -305,7 +334,9 @@ export class PoolSystem implements IPoolSystem {
     public security: Security;
     public customNames: CustomNameCollection;
     public chemControllers: ChemControllerCollection;
+    public chemDosers: ChemDoserCollection;
     public filters: FilterCollection;
+    public screenlogic: ScreenLogicComms;
     public appVersion: string;
     public get dirty(): boolean { return this._isDirty; }
     public set dirty(val) {
@@ -527,7 +558,9 @@ class EqItemCollection<T> implements IEqItemCollection {
     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);
+                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);
             }
         }
@@ -601,7 +634,9 @@ class EqItemCollection<T> implements IEqItemCollection {
     public get length(): number { return typeof this.data !== 'undefined' ? this.data.length : 0; }
     public set length(val: number) { if (typeof val !== 'undefined' && typeof this.data !== 'undefined') this.data.length = val; }
     public add(obj: any): T { this.data.push(obj); return this.createItem(obj); }
-    public get(): any { return this.data; }
+    public get(bCopy?: boolean): any {
+        return bCopy ? JSON.parse(JSON.stringify(this.data)) : this.data;
+    }
     public emitEquipmentChange() { webApp.emitToClients(this.name, this.data); }
     public sortByName() {
         this.sort((a, b) => {
@@ -615,8 +650,11 @@ class EqItemCollection<T> implements IEqItemCollection {
     }
     public sort(fn: (a, b) => number) { this.data.sort(fn); }
     public count(fn: (value: T, index?: any, array?: any[]) => boolean): number { return this.data.filter(fn).length; }
-    public getNextEquipmentId(range: EquipmentIdRange, exclude?: number[]): number {
-        for (let i = range.start; i <= range.end; i++) {
+    public getNextEquipmentId(range?: EquipmentIdRange, exclude?: number[]): number {
+        // RG 12-4-22 for some reason extend(true, {...}, range) was not evaluating the accessors 
+        // for range.start & range.end
+        let r = extend(true, { start: 1, end: 255 }, {start: range.start }, {end: range.end});  
+        for (let i = r.start; i <= r.end; i++) {
             let eq = this.data.find(elem => elem.id === i);
             if (typeof eq === 'undefined') {
                 if (typeof exclude !== 'undefined' && exclude.indexOf(i) !== -1) continue;
@@ -645,6 +683,23 @@ class EqItemCollection<T> implements IEqItemCollection {
         return typeof minId !== 'undefined' ? minId : defId;
     }
 }
+export class Anslq25 extends EqItem {
+    ctor(data: any, name?: any): Anslq25 { return new Anslq25(data, name || 'anslq25'); }
+    public initData(){
+        if (typeof this.data.isActive === 'undefined') this.data.isActive = false;
+    }
+    public get controllerType(): ControllerType { return this.data.controllerType; }
+    public set controllerType(val: ControllerType) { this.setDataVal('controllerType', val); }
+    public get model(): number { return this.data.model; }
+    public set model(val: number) { this.setDataVal('model', val); }
+    public get isActive(): boolean { return this.data.isActive; }
+    public set isActive(val: boolean) { this.setDataVal('isActive', val); }
+    public get portId(): number { return this.data.portId; }
+    public set portId(val: number) { this.setDataVal('portId', val); }
+    public get broadcastComms(): boolean { return this.data.broadcastComms; }
+    public set broadcastComms(val: boolean) { this.setDataVal('broadcastComms', val); }
+    public get modules(): ExpansionModuleCollection { return new ExpansionModuleCollection(this.data, "modules"); }
+}
 export class General extends EqItem {
     ctor(data: any, name?: any): General { return new General(data, name || 'pool'); }
     public get alias(): string { return this.data.alias; }
@@ -771,17 +826,6 @@ export class Options extends EqItem {
     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; }
-    //public set waterTempAdj1(val: number) { this.setDataVal('waterTempAdj1', val); }
-    //public get solarTempAdj1(): number { return typeof this.data.solarTempAdj1 === 'undefined' ? 0 : this.data.solarTempAdj1; }
-    //public set solarTempAdj1(val: number) { this.setDataVal('solarTempAdj1', val); }
-    //public get waterTempAdj2(): number { return typeof this.data.waterTempAdj2 === 'undefined' ? 0 : this.data.waterTempAdj2; }
-    //public set waterTempAdj2(val: number) { this.setDataVal('waterTempAdj2', val); }
-    //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() {
@@ -874,11 +918,20 @@ export class ExpansionPanel extends EqItem {
 export class Equipment extends EqItem {
     public dataName = 'equipmentConfig';
     public initData() {
+        if (typeof this.data.single === 'undefined') {
+            if (this.data.dual === true || this.data.shared === true) this.data.single = false;
+            else if (sys.controllerType !== ControllerType.IntelliTouch) this.data.single = true;
+        }
+        if (typeof this.data.softwareVersion === 'undefined') this.data.softwareVersion = '';
+        if (typeof this.data.bootloaderVersion === 'undefined') this.data.bootloaderVersion = '';
+        if (typeof this.data.maxChemDosers === 'undefined') this.data.maxChemDosers = 10;
     }
     public get name(): string { return this.data.name; }
     public set name(val: string) { this.setDataVal('name', val); }
     public get type(): number { return this.data.type; }
     public set type(val: number) { this.setDataVal('type', val); }
+    public get single(): boolean { return this.data.single; }
+    public set single(val: boolean) { this.setDataVal('single', val); }
     public get shared(): boolean { return this.data.shared; }
     public set shared(val: boolean) { this.setDataVal('shared', val); }
     public get dual(): boolean { return this.data.dual; }
@@ -913,6 +966,8 @@ export class Equipment extends EqItem {
     public set maxIntelliBrites(val: number) { this.setDataVal('maxIntelliBrites', val); }
     public get maxChemControllers(): number { return this.data.maxChemControllers; }
     public set maxChemControllers(val: number) { this.setDataVal('maxChemControllers', val); }
+    public get maxChemDosers(): number { return this.data.maxChemDosers; }
+    public set maxChemDosers(val: number) { this.setDataVal('maxChemDosers', val); }
     public get expansions(): ExpansionPanelCollection { return new ExpansionPanelCollection(this.data, "expansions"); }
     public get modules(): ExpansionModuleCollection { return new ExpansionModuleCollection(this.data, "modules"); }
     public get maxCustomNames(): number { return this.data.maxCustomNames || 10; }
@@ -1032,6 +1087,7 @@ export class Body extends EqItem {
     public initData() {
         if (typeof this.data.capacityUnits === 'undefined') this.data.capacityUnits = 1;
         if (typeof this.data.showInDashboard === 'undefined') this.data.showInDashboard = true;
+        if (typeof this.data.heatMode === 'undefined') this.data.heatMode = 0;
     }
     public get id(): number { return this.data.id; }
     public set id(val: number) { this.data.id = val; }
@@ -1248,13 +1304,26 @@ export class Circuit extends EqItem implements ICircuit {
         }
         else return [];
     }
-
     public static getIdName(id: number) {
-        // todo: adjust for intellitouch
-        let defName = "Aux" + (id + 1).toString();
-        if (id === 0) defName = "Spa";
-        else if (id === 5) defName = "Pool";
-        else if (id < 5) defName = "Aux" + id.toString();
+        let defName;
+        // RKS: 07-19-22 I think this is some sort of artifact.  The system should not be creating this data as a default because
+        // the board itself should be coming up with these names.
+        switch (sys.controllerType) {
+            case ControllerType.SunTouch:
+                break;
+            default:
+                if (sys.board.equipmentIds.circuitGroups.isInRange(id))
+                    defName = `Group ${id - sys.board.equipmentIds.circuitGroups.start + 1}`;
+                else if (sys.board.equipmentIds.features.isInRange(id))
+                    defName = `Feature ${id - sys.board.equipmentIds.features.start + 1}`;
+                else if (sys.board.equipmentIds.circuits.isInRange(id)) {
+                    if (id <= 1) defName = 'Spa';
+                    else if (id === 6) defName = 'Pool';
+                    else if (id < 6) defName = `Aux ${id - 1}`;
+                    else defName = `Aux ${id - 2}`;
+                }
+                break;
+        }
         return defName;
     }
 }
@@ -1329,12 +1398,23 @@ export class PumpCollection extends EqItemCollection<Pump> {
         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 getNextEquipmentId(range?: EquipmentIdRange, exclude?: number[]): number { return super.getNextEquipmentId(typeof range === 'undefined' ? sys.board.equipmentIds.pumps : range, exclude); }
 }
 export class Pump extends EqItem {
     public dataName = 'pumpConfig';
     public initData() {
         if (typeof this.data.isVirtual !== 'undefined') delete this.data.isVirtual;
         if (typeof this.data.portId === 'undefined') this.data.portId = 0;
+        if (typeof this.data.body === 'number' && this.data.model === 2 && this.data.master === 1){
+            // convert SS from body types to circuit arrays
+            if (this.data.body === 255 || this.data.body === 0 && !this.data.circuits.find(el => el.circuit === 6)) {
+                this.data.circuits.push({"circuit": 6, "relay": 1, "units": 0, "id": this.data.circuits.length + 1, "master": 1})
+            }
+            if (this.data.body === 255 || this.data.body === 101 && !this.data.circuits.find(el => el.circuit === 1)) {
+                this.data.circuits.push({"circuit": 1, "relay": 1, "units": 0, "id": this.data.circuits.length + 1, "master": 1})
+            }
+            this.data.body = undefined;
+        }
     }
     public get id(): number { return this.data.id; }
     public set id(val: number) { this.setDataVal('id', val); }
@@ -1409,9 +1489,9 @@ export class Pump extends EqItem {
     public deletePumpCircuit(pumpCircuitId: number) {
         return sys.board.pumps.deletePumpCircuit(this, pumpCircuitId);
     }
-    public setType(pumpType: number) {
-        sys.board.pumps.setType(this, pumpType);
-    }
+    //public setType(pumpType: number) {
+    //    sys.board.pumps.setType(this, pumpType);
+    //}
     public nextAvailablePumpCircuit(): number {
         let pumpCircuits = this.circuits;
         for (let i = 1; i <= 8; i++) {
@@ -1498,6 +1578,7 @@ export class Chlorinator extends EqItem {
         if (typeof this.data.ignoreSaltReading === 'undefined') this.data.ignoreSaltReading = false;
         if (typeof this.data.isVirtual !== 'undefined') delete this.data.isVirtual;
         if (typeof this.data.portId === 'undefined') this.data.portId = 0;
+        if (typeof this.data.saltTarget === 'undefined') this.data.saltTarget = 3400;
     }
     public get id(): number { return this.data.id; }
     public set id(val: number) { this.setDataVal('id', val); }
@@ -1513,6 +1594,14 @@ export class Chlorinator extends EqItem {
     public set spaSetpoint(val: number) { this.setDataVal('spaSetpoint', val); }
     public get superChlorHours(): number { return this.data.superChlorHours; }
     public set superChlorHours(val: number) { this.setDataVal('superChlorHours', val); }
+    public get saltTarget(): number { return this.data.saltTarget; }
+    public set saltTarget(val: number) {
+        if (this.data.saltTarget !== val) {
+            this.setDataVal('saltTarget', val);
+            let cstate = state.chlorinators.getItemById(this.id, true);
+            cstate.calcSaltRequired(this.saltTarget);
+        }
+    }
     public get isActive(): boolean { return this.data.isActive; }
     public set isActive(val: boolean) { this.setDataVal('isActive', val); }
     public get address(): number { return this.data.address; }
@@ -1899,6 +1988,9 @@ export class CircuitGroupCollection extends EqItemCollection<CircuitGroup> {
 }
 export class CircuitGroup extends EqItem implements ICircuitGroup, ICircuit {
     public dataName = 'circuitGroupConfig';
+    public initData() {
+        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; }
@@ -2003,7 +2095,7 @@ export class Security extends EqItem {
     public get roles(): SecurityRoleCollection { return new SecurityRoleCollection(this.data, "roles"); }
 }
 export class ChemControllerCollection extends EqItemCollection<ChemController> {
-    constructor(data: any, name?: string) { super(data, name || "chemcontrollers"); }
+    constructor(data: any, name?: string) { super(data, name || "chemControllers"); }
     public createItem(data: any): ChemController { return new ChemController(data); }
     public getItemByAddress(address: number, add?: boolean, data?: any): ChemController {
         let itm = this.find(elem => elem.address === address && typeof elem.address !== 'undefined');
@@ -2027,6 +2119,11 @@ export class ChemControllerCollection extends EqItemCollection<ChemController> {
         return id + 1;
     }
 }
+export class ChemDoserCollection extends EqItemCollection<ChemDoser> {
+    constructor(data: any, name?: string) { super(data, name || "chemDosers"); }
+    public createItem(data: any): ChemDoser { return new ChemDoser(data); }
+}
+
 export class FlowSensor extends ChildEqItem {
     public dataName = 'flowSensorConfig';
     public initData() {
@@ -2048,7 +2145,9 @@ export class FlowSensor extends ChildEqItem {
         return sensor;
     }
 }
-export class ChemController extends EqItem {
+export interface IChemController {
+}
+export class ChemController extends EqItem implements IChemController {
     public initData() {
         //var chemController = {
         //    id: 'number',               // Id of the controller
@@ -2184,6 +2283,68 @@ export class ChemController extends EqItem {
     // ORP
     // 1. Chlorinator Comms Lost.
 }
+export class ChemDoser extends EqItem implements IChemical {
+    public dataName = 'chemDoserConfig';
+    public initData() {
+        if (typeof this.data.pump === 'undefined') this.data.pump = {};
+        if (typeof this.data.tank === 'undefined') this.data.tank = {};
+        if (typeof this.data.flowSensor === 'undefined') this.data.flowSensor = {};
+        if (typeof this.data.enabled === 'undefined') this.data.enabled = true;
+        if (typeof this.data.dosingMethod === 'undefined') this.data.dosingMethod = 0;
+        if (typeof this.data.startDelay === 'undefined') this.data.startDelay = 1.5;
+        if (typeof this.data.maxDailyVolume === 'undefined') this.data.maxDailyVolume = 500;
+        if (typeof this.data.disableOnFreeze === 'undefined') this.data.disableOnFreeze = true; 
+        if (typeof this.data.disableChlorinator === 'undefined') this.data.disableChlorinator = true;
+        if (typeof this.mixingTime === 'undefined') this.data.mixingTime = 3600;
+        if (typeof this.data.setpoint === 'undefined') this.data.setpoint = 100;
+        if (typeof this.data.type === 'undefined') this.data.type = 0;
+        super.initData();
+    }
+    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; }
+    public set name(val: string) { this.setDataVal('name', val); }
+    public get setpoint(): number { return this.data.setpoint; }
+    public set setpoint(val: number) { this.setDataVal('setpoint', val); }
+    public get body(): number | any { return this.data.body; }
+    public set body(val: number | any) { this.setDataVal('body', sys.board.valueMaps.bodies.encode(val)); }
+    public get isActive(): boolean { return this.data.isActive; }
+    public set isActive(val: boolean) { this.setDataVal('isActive', val); }
+    public get chemType(): string { return this.data.chemType; }
+    public get type(): number | any { return this.data.type; }
+    public set type(val: number | any) {
+        this.setDataVal('type', sys.board.valueMaps.chemDoserTypes.encode(val));
+        let t = sys.board.valueMaps.chemDoserTypes.findItem(val) || { val: 0, name: 'acid', desc: 'Acid' };
+        this.setDataVal('chemType', t.desc);
+    }
+    public get enabled(): boolean { return utils.makeBool(this.data.enabled); }
+    public set enabled(val: boolean) { this.setDataVal('enabled', val); }
+    public get disableChlorinator(): boolean { return utils.makeBool(this.data.disableChlorinator); }
+    public set disableChlorinator(val: boolean) { this.setDataVal('disableChlorinator', val); }
+    public get disableOnFreeze(): boolean { return utils.makeBool(this.data.disableOnFreeze); }
+    public set disableOnFreeze(val: boolean) { this.setDataVal('disableOnFreeze', val); }
+    public get dosingVolume(): number { return this.data.dosingVolume; }
+    public set dosingVolume(val: number) { this.setDataVal('dosingVolume', val); }
+    public get mixingTime(): number { return this.data.mixingTime; }
+    public set mixingTime(val: number) { this.setDataVal('mixingTime', val); }
+    public get maxDailyVolume(): number { return this.data.maxDailyVolume; }
+    public set maxDailyVolume(val: number) { this.setDataVal('maxDailyVolume', val); }
+    public get dosingMethod(): number | any { return this.data.dosingMethod; }
+    public set dosingMethod(val: number | any) { this.setDataVal('dosingMethod', sys.board.valueMaps.chemDosingMethods.encode(val)); }
+    public get startDelay(): number { return this.data.startDelay; }
+    public set startDelay(val: number) { this.setDataVal('startDelay', val); }
+    public get flowSensor(): ChemFlowSensor { return new ChemFlowSensor(this.data, 'flowSensor', this); }
+    public get flowOnlyMixing(): boolean { return utils.makeBool(this.data.flowOnlyMixing); }
+    public set flowOnlyMixing(val: boolean) { this.setDataVal('flowOnlyMixing', val); }
+    public get pump(): ChemicalPump { return new ChemicalPump(this.data, 'pump', this); }
+    public get tank(): ChemicalTank { return new ChemicalTank(this.data, 'tank', this); }
+    public getExtended() {
+        let chem = this.get(true);
+        chem.tank = this.tank.getExtended();
+        chem.pump = this.pump.getExtended();
+        return chem;
+    }
+}
 export class ChemFlowSensor extends FlowSensor {
     public dataName = 'flowSensorConfig';
     public initData() {
@@ -2199,7 +2360,13 @@ export class ChemFlowSensor extends FlowSensor {
         return sensor;
     }
 }
-export class Chemical extends ChildEqItem {
+export interface IChemical {
+    dosingMethod: number;
+    startDelay: number;
+    maxDosingTime?: number;
+    maxDosingVolume?: number;
+}
+export class Chemical extends ChildEqItem implements IChemical {
     public dataName = 'chemicalConfig';
     public initData() {
         if (typeof this.data.pump === 'undefined') this.data.pump = {};
@@ -2482,4 +2649,21 @@ export class AlarmSetting extends ChildEqItem {
     public get high(): number { return this.data.high; }
     public set high(val: number) { this.setDataVal('high', val); }
 }
+export class Screenlogic extends EqItem {
+    ctor(data: any, name?: any): General { return new General(data, name || 'pool'); }
+    public get enabled(): boolean { return this.data.enabled; }
+    public set enabled(val: boolean) { this.setDataVal('enabled', val); }
+    public get type(): 'local'|'remote' { return this.data.type; }
+    public set type(val: 'local'|'remote') { this.setDataVal('type', val); }
+    public get systemName(): string { return this.data.systemName; }
+    public set systemName(val: string) { this.setDataVal('systemName', val); }
+    public get password(): string { return this.data.password; }
+    public set password(val: string) { this.setDataVal('password', val); }
+
+    public clear(master: number = -1) {
+        if (master === -1)
+            super.clear();
+    }
+
+}
 export let sys = new PoolSystem();

package/controller/Errors.ts

@@ -1,5 +1,6 @@
 /*  nodejs-poolController.  An application to control pool equipment.
-Copyright (C) 2016, 2017, 2018, 2019, 2020.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
+Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022.  
+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

package/controller/Lockouts.ts

@@ -1,5 +1,6 @@
 /*  nodejs-poolController.  An application to control pool equipment.
-Copyright (C) 2016, 2017, 2018, 2019, 2020.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
+Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022.  
+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
@@ -133,6 +134,7 @@ export class ManualPriorityDelay extends EquipmentDelay {
         if (typeof this._delayTimer !== 'undefined') clearTimeout(this._delayTimer);
         logger.info(`Manual Operation Priority cancelled for ${this.circuitState.name}`);
         this._delayTimer = undefined;
+        this.circuitState.manualPriorityActive = false;
         delayMgr.deleteDelay(this.id);
     }
     public clearDelay() {
@@ -197,6 +199,13 @@ export class HeaterStartupDelay extends EquipmentDelay {
         this._delayTimer = undefined;
         delayMgr.deleteDelay(this.id);
     }
+    public clearDelay() {
+        this.heaterState.startupDelay = false;
+        if (typeof this._delayTimer !== 'undefined') clearTimeout(this._delayTimer);
+        logger.info(`Heater Startup delay cancelled for ${this.heaterState.name}`);
+        this._delayTimer = undefined;
+        delayMgr.deleteDelay(this.id);
+    }
 }
 export class HeaterCooldownDelay extends EquipmentDelay {
     public constructor(bsoff: BodyTempState, bson?: BodyTempState, delay?: number) {
@@ -267,7 +276,24 @@ export class HeaterCooldownDelay extends EquipmentDelay {
         delayMgr.deleteDelay(this.id);
         state.emitEquipmentChanges();
     }
-
+    public clearDelay() {
+        let cstateOff = state.circuits.getItemById(this.bodyStateOff.circuit);
+        cstateOff.stopDelay = false;
+        (async () => {
+            await sys.board.circuits.setCircuitStateAsync(cstateOff.id, false);
+            if (typeof this.bodyStateOn !== 'undefined') {
+                this.bodyStateOn.startDelay = state.circuits.getItemById(this.bodyStateOn.circuit).startDelay = false;
+                await sys.board.circuits.setCircuitStateAsync(this.bodyStateOn.circuit, true);
+            }
+        })();
+        this.bodyStateOff.stopDelay = this.bodyStateOff.heaterCooldownDelay = false;
+        this.bodyStateOff.heatStatus = sys.board.valueMaps.heatStatus.getValue('off');
+        if (typeof this._delayTimer !== 'undefined') clearTimeout(this._delayTimer);
+        logger.info(`Heater Cooldown delay cleared for ${this.bodyStateOff.name}`);
+        this._delayTimer = undefined;
+        delayMgr.deleteDelay(this.id);
+        state.emitEquipmentChanges();
+    }
 }
 interface ICleanerDelay {
     cleanerState: ICircuitState,
@@ -351,6 +377,12 @@ export class DelayManager extends Array<EquipmentDelay> {
         let del = this.find(x => x.id === id);
         if (typeof del !== 'undefined') del.cancelDelay();
     }
+    public clearAllDelays() {
+        for (let i = this.length - 1; i >= 0; i--) {
+            let del = this[i];
+            del.clearDelay();
+        }
+    }
     public setManualPriorityDelay(cs: ICircuitState) {
         let cds = this.filter(x => x.type === 'manualOperationPriorityDelay');
         for (let i = 0; i < cds.length; i++) {