nodejs-poolcontroller 7.5.1 → 7.7.0

package/controller/Equipment.ts

@@ -70,6 +70,7 @@ interface IPoolSystem {
 
 export class PoolSystem implements IPoolSystem {
     public _hasChanged: boolean = false;
+    public isReady: boolean = false;
     constructor() {
         this.cfgPath = path.posix.join(process.cwd(), '/data/poolConfig.json');
     }
@@ -142,6 +143,7 @@ export class PoolSystem implements IPoolSystem {
         }
         else
             this.initNixieController();
+        this.isReady = true;
     }
     public init() {
         let cfg = this.loadConfigFile(this.cfgPath, {});
@@ -202,7 +204,7 @@ export class PoolSystem implements IPoolSystem {
     }
 
     public resetSystem() {
-        conn.pause();
+        conn.pauseAll();
         this.resetData();
         state.resetData();
         this.data.controllerType === 'unknown';
@@ -210,7 +212,7 @@ export class PoolSystem implements IPoolSystem {
         this.controllerType = ControllerType.Unknown;
         state.status = 0;
         this.board = BoardFactory.fromControllerType(ControllerType.Unknown, this);
-        setTimeout(function () { state.status = 0; conn.resume(); }, 0);
+        setTimeout(function () { state.status = 0; conn.resumeAll(); }, 0);
     }
     public get controllerType(): ControllerType { return this.data.controllerType as ControllerType; }
     public set controllerType(val: ControllerType) {
@@ -537,7 +539,7 @@ class EqItemCollection<T> implements IEqItemCollection {
         return this.createItem(extend({}, { id: ndx + 1 }, data));
     }
     public getItemById(id: number | string, add?: boolean, data?: any): T {
-        let itm = this.find(elem => elem.id === id && typeof elem.id !== 'undefined');
+        let itm = this.find(elem => { return typeof (elem as { id?}).id !== 'undefined' && (elem as { id?}).id === id });
         if (typeof itm !== 'undefined') return itm;
         if (typeof add !== 'undefined' && add) return this.add(extend(true, { id: id }, data));
         return this.createItem(data || { id: id });
@@ -567,7 +569,7 @@ class EqItemCollection<T> implements IEqItemCollection {
         this.data.splice(ndx, 1);
     }
     // Finds an item and returns undefined if it doesn't exist.
-    public find(f: (value: any, index?: number, obj?: any) => boolean): T {
+    public find(f: (value: T, index?: number, obj?: any) => boolean): T {
         let itm = this.data.find(f);
         if (typeof itm !== 'undefined') return this.createItem(itm);
     }
@@ -612,7 +614,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 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++) {
             let eq = this.data.find(elem => elem.id === i);
@@ -724,6 +726,16 @@ export class Options extends EqItem {
         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)); }
@@ -740,10 +752,25 @@ export class Options extends EqItem {
     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); }
@@ -994,7 +1021,7 @@ export class BodyCollection extends EqItemCollection<Body> {
         let body = this.find(elem => {
             if (typeof obj.id !== 'undefined') return obj.id === elem.id;
             else if (typeof obj.circuit !== 'undefined') return obj.circuit === elem.circuit;
-            else if (typeof obj.name !== 'undefined') return obj.name === body.name;
+            else if (typeof obj.name !== 'undefined') return obj.name === elem.name;
             else return false;
         });
         return body;
@@ -1004,6 +1031,7 @@ export class Body extends EqItem {
     public dataName = 'bodyConfig';
     public initData() {
         if (typeof this.data.capacityUnits === 'undefined') this.data.capacityUnits = 1;
+        if (typeof this.data.showInDashboard === 'undefined') this.data.showInDashboard = true;
     }
     public get id(): number { return this.data.id; }
     public set id(val: number) { this.data.id = val; }
@@ -1029,6 +1057,8 @@ 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 showInDashboard(): boolean { return this.data.showInDashboard; }
+    public set showInDashboard(val: boolean) { this.setDataVal('showInDashboard', 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); }
@@ -1083,6 +1113,8 @@ export class Schedule extends EqItem {
     public set coolSetpoint(val: number) { this.setDataVal('coolSetpoint', val); }
     public get isActive(): boolean { return this.data.isActive; }
     public set isActive(val: boolean) { this.setDataVal('isActive', val); }
+    public get disabled(): boolean { return this.data.disabled; }
+    public set disabled(val: boolean) { this.setDataVal('disabled', val); }
     public get startMonth(): number { return this._startDate.getMonth() + 1; }
     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(); }
@@ -1129,6 +1161,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);
@@ -1185,7 +1220,35 @@ 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 [];
+    }
+    public getLightCommands() {
+        // 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 arrCommands = sys.board.valueMaps.lightCommands.toArray();
+            let cmds = [];
+            for (let i = 0; i < arrCommands.length; i++) {
+                let cmd = arrCommands[i];
+                if (typeof cmd.types !== 'undefined' && cmd.types.length > 0 && cmd.types.includes(cf.theme)) cmds.push(cmd);
+            }
+            return cmds;
+        }
+        else return [];
+    }
+
     public static getIdName(id: number) {
         // todo: adjust for intellitouch
         let defName = "Aux" + (id + 1).toString();
@@ -1197,6 +1260,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 {
@@ -1206,6 +1272,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; }
@@ -1246,6 +1313,7 @@ export interface ICircuit {
     showInFeatures?: boolean;
     macro?: boolean;
     getLightThemes?: (type?: number) => {};
+    getLightCommands?: (type?: number) => {};
     get(copy?: boolean);
     master: number;
 }
@@ -1266,9 +1334,12 @@ 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;
     }
     public get id(): number { return this.data.id; }
     public set id(val: number) { this.setDataVal('id', val); }
+    public get portId(): number { return this.data.portId; }
+    public set portId(val: number) { this.setDataVal('portId', val); }
     public get address(): number { return this.data.address || this.data.id + 95; }
     public set address(val: number) { this.setDataVal('address', val); }
     public get name(): string { return this.data.name; }
@@ -1412,6 +1483,13 @@ export class ChlorinatorCollection extends EqItemCollection<Chlorinator> {
             body === 32 && elem.body <= 2 ||
             elem.body === 32 && body <= 2);
     }
+    public getItemByPortId(portId: number, add?: boolean, data?: any): Chlorinator {
+        let itm = this.find(elem => { return typeof (elem as { portId?}).portId !== 'undefined' && (elem as { portId?}).portId === portId });
+        if (typeof itm !== 'undefined') return itm;
+        if (typeof add !== 'undefined' && add) return this.add(extend(true, { portId: portId }, data));
+        return this.createItem(extend(true, data, { portId: portId }));
+    }
+    public findItemByPortId(portId: number) { return this.find(elem => { return typeof (elem as { portId?}).portId !== 'undefined' && (elem as { portId?}).portId === portId }); }
 }
 export class Chlorinator extends EqItem {
     public dataName = 'chlorinatorConfig';
@@ -1419,9 +1497,12 @@ export class Chlorinator extends EqItem {
         if (typeof this.data.disabled === 'undefined') this.data.disabled = false;
         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;
     }
     public get id(): number { return this.data.id; }
     public set id(val: number) { this.setDataVal('id', val); }
+    public get portId(): number { return this.data.portId; }
+    public set portId(val: number) { this.setDataVal('portId', val); }
     public get type(): number | any { return this.data.type; }
     public set type(val: number | any) { this.setDataVal('type', sys.board.valueMaps.chlorinatorType.encode(val)); }
     public get body(): number | any { return this.data.body; }
@@ -1454,6 +1535,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';
@@ -1492,14 +1589,33 @@ 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';
     public initData() {
         if (typeof this.data.isActive === 'undefined') this.data.isActive = true;
+        if (typeof this.data.portId === 'undefined') this.data.portId = 0;
     }
     public get id(): number { return this.data.id; }
     public set id(val: number) { this.setDataVal('id', val); }
+    public get portId(): number { return this.data.portId; }
+    public set portId(val: number) { this.setDataVal('portId', val); }
     public get type(): number | any { return this.data.type; }
     public set type(val: number | any) { this.setDataVal('type', sys.board.valueMaps.heaterTypes.encode(val)); }
     public get name(): string { return this.data.name; }
@@ -1532,6 +1648,8 @@ export class Heater extends EqItem {
     public set economyTime(val: number) { this.setDataVal('economyTime', val); }
     public get connectionId(): string { return this.data.connectionId; }
     public set connectionId(val: string) { this.setDataVal('connectionId', val); }
+    public get minCycleTime(): number { return this.data.minCycleTime; }
+    public set minCycleTime(val: number) { this.setDataVal('minCycleTime', val); }
     public get deviceBinding(): string { return this.data.deviceBinding; }
     public set deviceBinding(val: string) { this.setDataVal('deviceBinding', val); }
 }
@@ -1664,7 +1782,61 @@ 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 getLightCommands() {
+        // 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.lightGroupCommands.toArray();
+        let ret = [];
+        for (let i = 0; i < t.length; i++) {
+            let cmd = t[i];
+            if (typeof cmd.types !== 'undefined' && cmd.types.length > 0) {
+                // Look in the themes array of the theme.
+                if (arrThemes.some(x => cmd.types.includes(x))) ret.push(cmd);
+            }
+        }
+        return ret;
+    }
+
     public getExtended() {
         let group = this.get(true);
         group.type = sys.board.valueMaps.circuitGroupTypes.transform(group.type);
@@ -1993,7 +2165,7 @@ export class ChemController extends EqItem {
     public getExtended() {
         let chem = this.get(true);
         chem.type = sys.board.valueMaps.chemControllerTypes.transform(this.type);
-        chem.siCalcType = sys.board.valueMaps.siCalcTypes.transform(this.type);
+        chem.siCalcType = sys.board.valueMaps.siCalcTypes.transform(this.siCalcType || 0);
         chem.body = sys.board.valueMaps.bodies.transform(this.body);
         chem.ph = this.ph.getExtended();
         chem.orp = this.orp.getExtended();
@@ -2038,11 +2210,14 @@ export class Chemical extends ChildEqItem {
         if (typeof this.data.flowReadingsOnly === 'undefined') this.data.flowReadingsOnly = true;
         if (typeof this.data.flowOnlyMixing === 'undefined') this.data.flowOnlyMixing = true;
         if (typeof this.data.maxDailyVolume === 'undefined') this.data.maxDailyVolume = 500;
+        if (typeof this.data.disableOnFreeze === 'undefined') this.data.disableOnFreeze = true;
         super.initData();
     }
     public get chemType(): string { return this.data.chemType; }
     public get enabled(): boolean { return utils.makeBool(this.data.enabled); }
     public set enabled(val: boolean) { this.setDataVal('enabled', val); }
+    public get disableOnFreeze(): boolean { return utils.makeBool(this.data.disableOnFreeze); }
+    public set disableOnFreeze(val: boolean) { this.setDataVal('disableOnFreeze', val); }
     public get maxDosingTime(): number { return this.data.maxDosingTime; }
     public set maxDosingTime(val: number) { this.setDataVal('maxDosingTime', val); }
     public get maxDosingVolume(): number { return this.data.maxDosingVolume; }
@@ -2083,6 +2258,7 @@ export class ChemicalPh extends Chemical {
         if (typeof this.data.acidType === 'undefined') this.data.acidType = 0;
         if (typeof this.data.tolerance === 'undefined') this.data.tolerance = { low: 7.2, high: 7.6, enabled: true };
         if (typeof this.data.dosePriority === 'undefined') this.data.dosePriority = true;
+        if (typeof this.data.doserType === 'undefined') this.data.doserType = 0;
         super.initData();
     }
     public get phSupply(): number | any { return this.data.phSupply; }
@@ -2091,11 +2267,14 @@ export class ChemicalPh extends Chemical {
     public set acidType(val: number | any) { this.setDataVal('acidType', sys.board.valueMaps.acidTypes.encode(val)); }
     public get dosePriority(): boolean { return this.data.dosePriority; }
     public set dosePriority(val: boolean) { this.setDataVal('dosePriority', val); }
+    public get doserType(): number | any { return this.data.doserType; }
+    public set doserType(val: number | any) { this.setDataVal('doserType', sys.board.valueMaps.phDoserTypes.encode(val)); }
     public get probe(): ChemicalPhProbe { return new ChemicalPhProbe(this.data, 'probe', this); }
     public getExtended() {
         let chem = super.getExtended();
         chem.probe = this.probe.getExtended();
         chem.phSupply = sys.board.valueMaps.phSupplyTypes.transform(this.phSupply);
+        chem.doserType = sys.board.valueMaps.phDoserTypes.transform(this.doserType);
         return chem;
     }
 }
@@ -2108,6 +2287,7 @@ export class ChemicalORP extends Chemical {
         if (typeof this.data.probe === 'undefined') this.data.probe = {};
         if (typeof this.data.tolerance === 'undefined') this.data.tolerance = { low: 650, high: 800, enabled: true };
         if (typeof this.data.phLockout === 'undefined') this.data.phLockout = 7.8;
+        if (typeof this.data.doserType === 'undefined') this.data.doserType = 0;
         super.initData();
     }
     public get useChlorinator(): boolean { return utils.makeBool(this.data.useChlorinator); }
@@ -2117,9 +2297,13 @@ export class ChemicalORP extends Chemical {
     public get probe(): ChemicalORPProbe { return new ChemicalORPProbe(this.data, 'probe', this); }
     public get chlorDosingMethod(): number | any { return this.data.chlorDosingMethod; }
     public set chlorDosingMethod(val: number | any) { this.setDataVal('chlorDosingMethod', sys.board.valueMaps.chemChlorDosingMethods.encode(val)); }
+    public get doserType(): number | any { return this.data.doserType; }
+    public set doserType(val: number | any) { this.setDataVal('doserType', sys.board.valueMaps.orpDoserTypes.encode(val)); }
+
     public getExtended() {
         let chem = super.getExtended();
         chem.probe = this.probe.getExtended();
+        chem.doserType = sys.board.valueMaps.orpDoserTypes.transform(this.doserType);
         return chem;
     }
 }

package/controller/Errors.ts

@@ -144,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);