nodejs-poolcontroller 7.5.1 → 7.6.0

package/controller/State.ts

@@ -7,7 +7,7 @@ published by the Free Software Foundation, either version 3 of the
 License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
+but WITHOUT ANY WARRANTY; without even the implied warranty of1
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Affero General Public License for more details.
 
@@ -26,7 +26,7 @@ import { sys, Chemical, ChemController } from './Equipment';
 import { versionCheck } from '../config/VersionCheck';
 import { EquipmentStateMessage } from './comms/messages/status/EquipmentStateMessage';
 import { DataLogger, DataLoggerEntry, IDataLoggerEntry } from '../logger/DataLogger';
-
+import { delayMgr } from './Lockouts';
 
 export class State implements IState {
     statePath: string;
@@ -140,6 +140,7 @@ export class State implements IState {
             _state.filters = this.filters.getExtended();
             _state.schedules = this.schedules.getExtended();
             _state.chemControllers = this.chemControllers.getExtended();
+            _state.delays = delayMgr.serialize();
             return _state;
         }
         else {
@@ -153,7 +154,6 @@ export class State implements IState {
                     return extend(true, [], this.data[section] || []);
                 else
                     return extend(true, {}, this.data[section] || {});
-
         }
     }
     public async stopAsync() {
@@ -212,7 +212,8 @@ export class State implements IState {
             sunrise: self.data.sunrise || '',
             sunset: self.data.sunset || '',
             alias: sys.general.alias,
-            freeze: utils.makeBool(self.data.freeze)
+            freeze: utils.makeBool(self.data.freeze),
+            valveMode: self.data.valveMode || {},
         };
     }
     public emitAllEquipmentChanges() {
@@ -287,6 +288,14 @@ export class State implements IState {
             this.hasChanged = true;
         }
     }
+    public get valveMode(): number { return typeof this.data.valveMode !== 'undefined' ? this.data.valveMode.val : 0; }
+    public set valveMode(val: number) {
+        let m = sys.board.valueMaps.valveModes.transform(val);
+        if (m.val !== this.valveMode) {
+            this.data.valveMode = m;
+            this.hasChanged = true;
+        }
+    }
     public get freeze(): boolean { return this.data.freeze === true; }
     public set freeze(val: boolean) {
         if (this.data.freeze !== val) {
@@ -486,12 +495,15 @@ export interface ICircuitState {
     name: string;
     nameId?: number;
     isOn: boolean;
+    startTime?: Timestamp;
     endTime: Timestamp;
     lightingTheme?: number;
     emitEquipmentChange();
     get(bCopy?: boolean);
     showInFeatures?: boolean;
     isActive?: boolean;
+    startDelay?: boolean;
+    stopDelay?: boolean;
 }
 
 interface IEqStateCreator<T> { ctor(data: any, name: string, parent?): T; }
@@ -883,7 +895,9 @@ export class PumpState extends EqState {
         if (typeof this.data.status === 'undefined') {
             this.data.status = { name: 'ok', desc: 'Ok', val: 0 };
         }
+        if (typeof this.data.pumpOnDelay === 'undefined') this.data.pumpOnDelay = false;
     }
+    private _pumpOnDelayTimer: NodeJS.Timeout;
     private _threshold = 0.05;
     private exceedsThreshold(origVal: number, newVal: number) {
         return Math.abs((newVal - origVal) / origVal) > this._threshold;
@@ -943,6 +957,23 @@ export class PumpState extends EqState {
     }
     public get time(): number { return this.data.time; }
     public set time(val: number) { this.setDataVal('time', val, false); }
+    public get pumpOnDelay() { return this.data.pumpOnDelay; }
+    public set pumpOnDelay(val: boolean) {
+        if (val === false) {
+            if (typeof this._pumpOnDelayTimer !== 'undefined') clearTimeout(this._pumpOnDelayTimer);
+            this._pumpOnDelayTimer = undefined;
+        }
+        this.setDataVal('pumpOnDelay', val);
+    }
+    public setPumpOnDelayTimeout(delay: number) {
+        this.pumpOnDelay = true;
+        logger.info(`Pump ON Delay ${this.name} for ${delay / 1000} seconds`);
+        this._pumpOnDelayTimer = setTimeout(() => {
+            logger.info(`Pump ON Delay ${this.name} expired`);
+            this.pumpOnDelay = false;
+        }, delay);
+    }
+   
     public getExtended() {
         let pump = this.get(true);
         let cpump = sys.pumps.getItemById(pump.id);
@@ -1262,6 +1293,16 @@ export class BodyTempStateCollection extends EqStateCollection<BodyTempState> {
         }
         return undefined;
     }
+    public getBodyByCircuitId(circuitId: number) {
+        let b = this.data.find(x => x.circuit === circuitId);
+        if (typeof b === 'undefined') {
+            let circ = sys.circuits.getItemById(circuitId);
+            // Find our body by circuit function.
+            let cfn = sys.board.valueMaps.circuitFunctions.get(circ.type);
+            if (typeof cfn.body !== 'undefined') b = this.data.find(x => x.id === cfn.body);
+        }
+        return typeof b !== 'undefined' ? this.createItem(b) : undefined;
+    }
     public cleanupState() {
         for (let i = this.data.length - 1; i >= 0; i--) {
             if (isNaN(this.data[i].id)) this.data.splice(i, 1);
@@ -1289,6 +1330,9 @@ export class BodyTempState extends EqState {
     public initData() {
         if (typeof this.data.heaterOptions === 'undefined') this.data.heaterOptions = { total: 0 };
         if (typeof this.data.isCovered === 'undefined') this.data.isCovered = false;
+        if (typeof this.heaterCooldownDelay === 'undefined') this.data.heaterCooldownDelay = false;
+        if (typeof this.data.startDelay === 'undefined') this.data.startDelay = false;
+        if (typeof this.data.stopDelay === 'undefined') this.data.stopDelay = false;
     }
     public get id(): number { return this.data.id; }
     public set id(val: number) { this.setDataVal('id', val); }
@@ -1327,8 +1371,19 @@ export class BodyTempState extends EqState {
     public set coolSetpoint(val: number) { this.setDataVal('coolSetpoint', val); }
     public get isOn(): boolean { return this.data.isOn; }
     public set isOn(val: boolean) { this.setDataVal('isOn', val); }
+    public get startDelay(): boolean { return this.data.startDelay; }
+    public set startDelay(val: boolean) { this.setDataVal('startDelay', val); }
+    public get stopDelay(): boolean { return this.data.stopDelay; }
+    public set stopDelay(val: boolean) { this.setDataVal('stopDelay', val); }
+
     public get isCovered(): boolean { return this.data.isCovered; }
     public set isCovered(val: boolean) { this.setDataVal('isCovered', val); }
+    // RKS: Heater cooldown delays force the current valve and body configuration until the
+    // heater cooldown expires.  This occurs at the pool level but it is triggered by the heater attached
+    // to the body.  Unfortunately, I think we can only detect this condition in Nixie as there really isn't an
+    // indicator with Pentair OCPs.  This is triggered in NixieBoard and managed by the delayMgr.
+    public get heaterCooldownDelay(): boolean { return this.data.heaterCooldownDelay; }
+    public set heaterCooldownDelay(val: boolean) { this.setDataVal('heaterCooldownDelay', val); }
     public emitData(name: string, data: any) { webApp.emitToClients('body', this.data); }
     // RKS: This is a very interesting object because we have a varied object.  Type safety rules should not apply
     // here as the heater types are specific to the installed equipment.  The reason is because it has no meaning without the body and the calculation of it should
@@ -1414,16 +1469,36 @@ export class HeaterStateCollection extends EqStateCollection<HeaterState> {
 }
 export class HeaterState extends EqState {
     public dataName: string = 'heater';
+    public initData() {
+        if (typeof this.data.startupDelay === 'undefined') this.data.startupDelay = false;
+        if (typeof this.data.shutdownDelay === 'undefined') this.data.shutdownDelay = false;
+    }
     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; }
     public set name(val: string) { this.setDataVal('name', val); }
     public get isOn(): boolean { return this.data.isOn; }
-    public set isOn(val: boolean) { this.setDataVal('isOn', val); }
+    public set isOn(val: boolean) {
+        if (val !== this.data.isOn) {
+            if (val) this.startTime = new Timestamp();
+            else this.endTime = new Timestamp();
+        }
+        this.setDataVal('isOn', val);
+    }
+    public get startTime(): Timestamp {
+        if (typeof this.data.startTime === 'undefined') return undefined;
+        return new Timestamp(this.data.startTime);
+    }
+    public set startTime(val: Timestamp) { typeof val !== 'undefined' ? this.setDataVal('startTime', Timestamp.toISOLocal(val.toDate())) : this.setDataVal('startTime', undefined); }
+
+    public get endTime(): Timestamp {
+        if (typeof this.data.endTime === 'undefined') return undefined;
+        return new Timestamp(this.data.endTime);
+    }
+    public set endTime(val: Timestamp) { typeof val !== 'undefined' ? this.setDataVal('endTime', Timestamp.toISOLocal(val.toDate())) : this.setDataVal('endTime', undefined); }
+
     public get isCooling(): boolean { return this.data.isCooling; }
     public set isCooling(val: boolean) { this.setDataVal('isCooling', val); }
-    //public get isVirtual(): boolean { return this.data.isVirtual; }
-    //public set isVirtual(val: boolean) { this.setDataVal('isVirtual', val); }
     public get type(): number | any { return typeof this.data.type !== 'undefined' ? this.data.type.val : 0; }
     public set type(val: number | any) {
         if (this.type !== val) {
@@ -1438,6 +1513,13 @@ export class HeaterState extends EqState {
             this.hasChanged = true;
         }
     }
+    public get startupDelay(): boolean { return this.data.startupDelay; }
+    public set startupDelay(val: boolean) { this.setDataVal('startupDelay', val); }
+    public get shutdownDelay(): boolean { return this.data.shutdownDelay; }
+    public set shutdownDelay(val: boolean) { this.setDataVal('shutdownDelay', val); }
+    public get bodyId(): number { return this.data.bodyId || 0 }
+    public set bodyId(val: number) { this.setDataVal('bodyId', val); }
+
 }
 export class FeatureStateCollection extends EqStateCollection<FeatureState> {
     public createItem(data: any): FeatureState { return new FeatureState(data); }
@@ -1518,6 +1600,8 @@ export class VirtualCircuitState extends EqState implements ICircuitState {
         return new Timestamp(this.data.endTime);
     }
     public set endTime(val: Timestamp) { typeof val !== 'undefined' ? this.setDataVal('endTime', Timestamp.toISOLocal(val.toDate())) : this.setDataVal('endTime', undefined); }
+    public get isActive(): boolean { return this.data.isActive; }
+    public set isActive(val: boolean) { this.setDataVal('isActive', val); }
 }
 export class VirtualCircuitStateCollection extends EqStateCollection<VirtualCircuitState> {
     public createItem(data: any): VirtualCircuitState { return new VirtualCircuitState(data); }
@@ -1573,7 +1657,11 @@ export class CircuitState extends EqState implements ICircuitState {
     public get showInFeatures(): boolean { return this.data.showInFeatures; }
     public set showInFeatures(val: boolean) { this.setDataVal('showInFeatures', val); }
     public get isOn(): boolean { return this.data.isOn; }
-    public set isOn(val: boolean) { this.setDataVal('isOn', val); }
+    public set isOn(val: boolean) {
+        if (val && !this.data.isOn) this.startTime = new Timestamp();
+        else if (!val) this.startTime = undefined;
+        this.setDataVal('isOn', val);
+    }
     public get type() { return typeof (this.data.type) !== 'undefined' ? this.data.type.val : -1; }
     public set type(val: number) {
         if (this.type !== val) {
@@ -1599,6 +1687,12 @@ export class CircuitState extends EqState implements ICircuitState {
             this.hasChanged = true;
         }
     }
+    public get startTime(): Timestamp {
+        if (typeof this.data.startTime === 'undefined') return undefined;
+        return new Timestamp(this.data.startTime);
+    }
+    public set startTime(val: Timestamp) { typeof val !== 'undefined' ? this.setDataVal('startTime', Timestamp.toISOLocal(val.toDate())) : this.setDataVal('startTime', undefined); }
+
     public get endTime(): Timestamp {
         if (typeof this.data.endTime === 'undefined') return undefined;
         return new Timestamp(this.data.endTime);
@@ -1610,6 +1704,16 @@ export class CircuitState extends EqState implements ICircuitState {
     public set freezeProtect(val: boolean) { this.setDataVal('freezeProtect', val); }
     public get isActive(): boolean { return this.data.isActive; }
     public set isActive(val: boolean) { this.setDataVal('isActive', val); }
+    // The properties below are for delays and lockouts.  Manual or scheduled
+    // actions cannot be performed when the flags below are set.
+    public get startDelay(): boolean { return this.data.startDelay; }
+    public set startDelay(val: boolean) { this.setDataVal('startDelay', val); }
+    public get stopDelay(): boolean { return this.data.stopDelay; }
+    public set stopDelay(val: boolean) { this.setDataVal('stopDelay', val); }
+    public get lockoutOn(): boolean { return this.data.lockoutOn; }
+    public set lockoutOn(val: boolean) { this.setDataVal('lockoutOn', val); }
+    public get lockoutOff(): boolean { return this.data.lockoutOff; }
+    public set lockoutOff(val: boolean) { this.setDataVal('lockoutOff', val); }
 }
 export class ValveStateCollection extends EqStateCollection<ValveState> {
     public createItem(data: any): ValveState { return new ValveState(data); }

package/controller/boards/EasyTouchBoard.ts

@@ -1253,18 +1253,20 @@ class TouchBodyCommands extends BodyCommands {
     }
 }
 export class TouchCircuitCommands extends CircuitCommands {
-    public getLightThemes(type?: number): any[] {
-        let themes = sys.board.valueMaps.lightThemes.toArray();
-        if (typeof type === 'undefined') return themes;
-        switch (type) {
-            case 8: // Magicstream
-                return themes.filter(theme => theme.type === 'magicstream');
-            case 16: // Intellibrite
-                return themes.filter(theme => theme.type === 'intellibrite');
-            default:
-                return [];
-        }
-    }
+    // RKS: 12-01-2021 This has been deprecated we are now driving this through metadata on the valuemaps.  This allows
+    // for multiple types of standardized on/off sequences with nixie controllers.
+    //public getLightThemes(type?: number): any[] {
+    //    let themes = sys.board.valueMaps.lightThemes.toArray();
+    //    if (typeof type === 'undefined') return themes;
+    //    switch (type) {
+    //        case 8: // Magicstream
+    //            return themes.filter(theme => theme.types.includes('magicstream'));
+    //        case 16: // Intellibrite
+    //            return themes.filter(theme => theme.types.includes('intellibrite'));
+    //        default:
+    //            return [];
+    //    }
+    //}
     public async setCircuitAsync(data: any): Promise<ICircuit> {
         try {
             // example [255,0,255][165,33,16,34,139,5][17,14,209,0,0][2,120]
@@ -1336,7 +1338,7 @@ export class TouchCircuitCommands extends CircuitCommands {
         data.functionId = sys.board.valueMaps.circuitFunctions.getValue('notused');
         return this.setCircuitAsync(data);
     }
-    public async setCircuitStateAsync(id: number, val: boolean): Promise<ICircuitState> {
+    public async setCircuitStateAsync(id: number, val: boolean, ignoreDelays?: boolean): Promise<ICircuitState> {
         if (isNaN(id)) return Promise.reject(new InvalidEquipmentIdError('Circuit or Feature id not valid', id, 'Circuit'));
         let c = sys.circuits.getInterfaceById(id);
         if (c.master !== 0) return await super.setCircuitStateAsync(id, val);

package/controller/boards/IntelliCenterBoard.ts

@@ -47,18 +47,18 @@ export class IntelliCenterBoard extends SystemBoard {
         this.valueMaps.circuitFunctions = new byteValueMap([
             [0, { name: 'generic', desc: 'Generic' }],
             [1, { name: 'spillway', desc: 'Spillway' }],
-            [2, { name: 'mastercleaner', desc: 'Master Cleaner' }],
+            [2, { name: 'mastercleaner', desc: 'Master Cleaner', body: 1 }],
             [3, { name: 'chemrelay', desc: 'Chem Relay' }],
             [4, { name: 'light', desc: 'Light', isLight: true }],
-            [5, { name: 'intellibrite', desc: 'Intellibrite', isLight: true }],
-            [6, { name: 'globrite', desc: 'GloBrite', isLight: true }],
+            [5, { name: 'intellibrite', desc: 'Intellibrite', isLight: true, theme: 'intellibrite' }],
+            [6, { name: 'globrite', desc: 'GloBrite', isLight: true, themes: 'intellibrite' }],
             [7, { name: 'globritewhite', desc: 'GloBrite White', isLight: true }],
-            [8, { name: 'magicstream', desc: 'Magicstream', isLight: true }],
+            [8, { name: 'magicstream', desc: 'Magicstream', isLight: true, theme: 'intellibrite' }],
             [9, { name: 'dimmer', desc: 'Dimmer', isLight: true }],
-            [10, { name: 'colorcascade', desc: 'ColorCascade', isLight: true }],
-            [11, { name: 'mastercleaner2', desc: 'Master Cleaner 2' }],
-            [12, { name: 'pool', desc: 'Pool', hasHeatSource: true }],
-            [13, { name: 'spa', desc: 'Spa', hasHeatSource: true }]
+            [10, { name: 'colorcascade', desc: 'ColorCascade', isLight: true, theme: 'intellibrite' }],
+            [11, { name: 'mastercleaner2', desc: 'Master Cleaner 2', body: 2 }],
+            [12, { name: 'pool', desc: 'Pool', hasHeatSource: true, body: 1 }],
+            [13, { name: 'spa', desc: 'Spa', hasHeatSource: true, body: 2 }]
         ]);
         this.valueMaps.pumpTypes = new byteValueMap([
             [1, { name: 'ss', desc: 'Single Speed', maxCircuits: 0, hasAddress: false, hasBody:true }],
@@ -95,8 +95,8 @@ export class IntelliCenterBoard extends SystemBoard {
             [3, { name: 'heatpump', desc: 'Heat Pump', hasAddress: true }],
             [4, { name: 'ultratemp', desc: 'UltraTemp', hasAddress: true, hasCoolSetpoint: true }],
             [5, { name: 'hybrid', desc: 'Hybrid', hasAddress: true }],
-            [6, { name: 'maxetherm', desc: 'Max-E-Therm', hasAddress: true }],
-            [7, { name: 'mastertemp', desc: 'MasterTemp', hasAddress: true }]
+            [6, { name: 'mastertemp', desc: 'MasterTemp', hasAddress: true }],
+            [7, { name: 'maxetherm', desc: 'Max-E-Therm', hasAddress: true }],
         ]);
 
 
@@ -173,18 +173,18 @@ export class IntelliCenterBoard extends SystemBoard {
             [2, { name: 'sunset', desc: 'Sunset' }]
         ]);
         this.valueMaps.lightThemes = new byteValueMap([
-            [0, { name: 'white', desc: 'White', sequence: 11 }],
-            [1, { name: 'green', desc: 'Green', sequence: 9 }],
-            [2, { name: 'blue', desc: 'Blue', sequence: 8 }],
-            [3, { name: 'magenta', desc: 'Magenta', sequence: 12 }],
-            [4, { name: 'red', desc: 'Red', sequence: 10 }],
-            [5, { name: 'sam', desc: 'SAm Mode', sequence: 1 }],
-            [6, { name: 'party', desc: 'Party', sequence: 2 }],
-            [7, { name: 'romance', desc: 'Romance', sequence: 3 }],
-            [8, { name: 'caribbean', desc: 'Caribbean', sequence: 4 }],
-            [9, { name: 'american', desc: 'American', sequence: 5 }],
-            [10, { name: 'sunset', desc: 'Sunset', sequence: 6 }],
-            [11, { name: 'royal', desc: 'Royal', sequence: 7 }],
+            [0, { name: 'white', desc: 'White', sequence: 11, types:['intellibrite', 'magicstream'] }],
+            [1, { name: 'green', desc: 'Green', sequence: 9, types: ['intellibrite', 'magicstream'] }],
+            [2, { name: 'blue', desc: 'Blue', sequence: 8, types: ['intellibrite', 'magicstream'] }],
+            [3, { name: 'magenta', desc: 'Magenta', sequence: 12, types: ['intellibrite', 'magicstream'] }],
+            [4, { name: 'red', desc: 'Red', sequence: 10, types: ['intellibrite', 'magicstream'] }],
+            [5, { name: 'sam', desc: 'SAm Mode', sequence: 1, types: ['intellibrite', 'magicstream'] }],
+            [6, { name: 'party', desc: 'Party', sequence: 2, types: ['intellibrite', 'magicstream'] }],
+            [7, { name: 'romance', desc: 'Romance', sequence: 3, types: ['intellibrite', 'magicstream'] }],
+            [8, { name: 'caribbean', desc: 'Caribbean', sequence: 4, types: ['intellibrite', 'magicstream'] }],
+            [9, { name: 'american', desc: 'American', sequence: 5, types: ['intellibrite', 'magicstream'] }],
+            [10, { name: 'sunset', desc: 'Sunset', sequence: 6, types: ['intellibrite', 'magicstream'] }],
+            [11, { name: 'royal', desc: 'Royal', sequence: 7, types: ['intellibrite', 'magicstream'] }],
             [255, { name: 'none', desc: 'None' }]
         ]);
         this.valueMaps.lightColors = new byteValueMap([
@@ -1292,7 +1292,7 @@ class IntelliCenterSystemCommands extends SystemCommands {
                     let out = Outbound.create({
                         action: 168,
                         retries: 5,
-                        payload: [12, 0, 10, parseInt(obj.timeZone, 10)],
+                        payload: [12, 0, 13, parseInt(obj.timeZone, 10)],
                         response: IntelliCenterBoard.getAckResponse(168),
                         onComplete: (err, msg) => {
                             if (err) reject(err);
@@ -2002,17 +2002,18 @@ class IntelliCenterCircuitCommands extends CircuitCommands {
         }
         return Promise.resolve(sgroup);
     }
-    public getLightThemes(type: number): any[] {
-        switch (type) {
-            case 5: // Intellibrite
-            case 6: // Globrite
-            case 8: // Magicstream
-            case 10: // ColorCascade
-                return sys.board.valueMaps.lightThemes.toArray();
-            default:
-                return [];
-        }
-    }
+    // 12-01-21 RKS: This has been deprecated.  This allows for multiple vendor light themes driven by the metadata on the valuemaps.
+    //public getLightThemes(type: number): any[] {
+    //    switch (type) {
+    //        case 5: // Intellibrite
+    //        case 6: // Globrite
+    //        case 8: // Magicstream
+    //        case 10: // ColorCascade
+    //            return sys.board.valueMaps.lightThemes.toArray();
+    //        default:
+    //            return [];
+    //    }
+    //}
     private async verifyVersionAsync(): Promise<boolean> {
         return new Promise<boolean>((resolve, reject) => {
             let out = Outbound.create({
@@ -2072,7 +2073,7 @@ class IntelliCenterCircuitCommands extends CircuitCommands {
             conn.queueSendMessage(out);
         });
     }
-    public async setCircuitStateAsync(id: number, val: boolean): Promise<ICircuitState> {
+    public async setCircuitStateAsync(id: number, val: boolean, ignoreDelays?: boolean): Promise<ICircuitState> {
         let c = sys.circuits.getInterfaceById(id);
         if (c.master !== 0) return await super.setCircuitStateAsync(id, val);
         // As of 1.047 there is a sequence to this.
@@ -2523,7 +2524,7 @@ class IntelliCenterChlorinatorCommands extends ChlorinatorCommands {
         if (typeof obj.disabled !== 'undefined') chlor.disabled = utils.makeBool(obj.disabled);
         if (typeof chlor.body === 'undefined') chlor.body = obj.body || 32;
         // Verify the data.
-        let body = sys.board.bodies.mapBodyAssociation(chlor.body);
+        let body = sys.board.bodies.mapBodyAssociation(typeof obj.body === 'undefined' ? chlor.body || 0 : obj.body);
         if (typeof body === 'undefined') return Promise.reject(new InvalidEquipmentDataError(`Chlorinator body association is not valid: ${chlor.body}`, 'chlorinator', chlor.body));
         if (poolSetpoint > 100 || poolSetpoint < 0) return Promise.reject(new InvalidEquipmentDataError(`Chlorinator poolSetpoint is out of range: ${chlor.poolSetpoint}`, 'chlorinator', chlor.poolSetpoint));
         if (spaSetpoint > 100 || spaSetpoint < 0) return Promise.reject(new InvalidEquipmentDataError(`Chlorinator spaSetpoint is out of range: ${chlor.poolSetpoint}`, 'chlorinator', chlor.spaSetpoint));
@@ -2542,6 +2543,7 @@ class IntelliCenterChlorinatorCommands extends ChlorinatorCommands {
                     else {
                         let schlor = state.chlorinators.getItemById(id, true);
                         let cchlor = sys.chlorinators.getItemById(id, true);
+                        schlor.body = chlor.body = body.val;
                         chlor.disabled = disabled;
                         chlor.model = model;
                         schlor.type = chlor.type = chlorType;
@@ -3020,11 +3022,22 @@ class IntelliCenterBodyCommands extends BodyCommands {
     public async setHeatModeAsync(body: Body, mode: number): Promise<BodyTempState> {
         return new Promise<BodyTempState>((resolve, reject) => {
             const self = this;
-            let byte2 = 18;
-            let mode1 = sys.bodies.getItemById(1).setPoint || 100;
-            let mode2 = sys.bodies.getItemById(2).setPoint || 100;
-            let mode3 = sys.bodies.getItemById(3).setPoint || 100;
-            let mode4 = sys.bodies.getItemById(4).setPoint || 100;
+            let byte2 = 22;
+            let body1 = sys.bodies.getItemById(1);
+            let body2 = sys.bodies.getItemById(2);
+
+            let heat1 = body1.heatSetpoint || 78;
+            let cool1 = body1.coolSetpoint || 100;
+            let heat2 = body2.heatSetpoint || 78;
+            let cool2 = body2.coolSetpoint || 103;
+
+            let mode1 = body1.heatMode || 1;
+            let mode2 = body2.heatMode || 1;
+            let bitopts = 0;
+            if (sys.general.options.clockSource) bitopts += 32;
+            if (sys.general.options.clockMode === 24) bitopts += 64;
+            if (sys.general.options.adjustDST) bitopts += 128;
+
             switch (body.id) {
                 case 1:
                     byte2 = 22;
@@ -3034,19 +3047,12 @@ class IntelliCenterBodyCommands extends BodyCommands {
                     byte2 = 23;
                     mode2 = mode;
                     break;
-                case 3:
-                    byte2 = 24;
-                    mode3 = mode;
-                    break;
-                case 4:
-                    byte2 = 25;
-                    mode4 = mode;
-                    break;
             }
             let out = Outbound.create({
                 action: 168,
-                payload: [0, 0, byte2, 1, 0, 0, 129, 0, 0, 0, 0, 0, 0, 0, 176, 89, 27, 110, 3, 0, 0, 100, 100, 100, 100, mode1, mode2, mode3, mode4, 15, 0
-                    , 0, 0, 0, 100, 0, 0, 0, 0, 0, 0],
+                payload: [0, 0, byte2, 1, 0, 0, 129, 0, 0, 0, 0, 0, 0, 0, bitopts, 89, 27, 110, 3, 0, 0,
+                    heat1, cool1, heat2, cool2, mode1, mode2, 0, 0, 15,
+                    sys.general.options.pumpDelay ? 1 : 0, sys.general.options.cooldownDelay ? 1 : 0, 0, 100, 0, 0, 0, 0, sys.general.options.manualPriority ? 1 : 0, sys.general.options.manualHeat ? 1 : 0, 0],
                 retries: 5,
                 response: IntelliCenterBoard.getAckResponse(168),
                 onComplete: (err, msg) => {
@@ -3067,31 +3073,25 @@ class IntelliCenterBodyCommands extends BodyCommands {
         let byte2 = 18;
         let body1 = sys.bodies.getItemById(1);
         let body2 = sys.bodies.getItemById(2);
-        let body3 = sys.bodies.getItemById(3);
-        let body4 = sys.bodies.getItemById(4);
 
-        let temp1 = sys.bodies.getItemById(1).setPoint || 100;
-        let temp2 = sys.bodies.getItemById(2).setPoint || 100;
-        let temp3 = sys.bodies.getItemById(3).setPoint || 100;
-        let temp4 = sys.bodies.getItemById(4).setPoint || 100;
+        let heat1 = body1.heatSetpoint || 78;
+        let cool1 = body1.coolSetpoint || 100;
+        let heat2 = body2.heatSetpoint || 78;
+        let cool2 = body2.coolSetpoint || 103;
         switch (body.id) {
             case 1:
                 byte2 = 18;
-                temp1 = setPoint;
+                heat1 = setPoint;
                 break;
             case 2:
                 byte2 = 20;
-                temp2 = setPoint;
-                break;
-            case 3:
-                byte2 = 19;
-                temp3 = setPoint;
-                break;
-            case 4:
-                byte2 = 21;
-                temp4 = setPoint;
+                heat2 = setPoint;
                 break;
         }
+        let bitopts = 0;
+        if (sys.general.options.clockSource) bitopts += 32;
+        if (sys.general.options.clockMode === 24) bitopts += 64;
+        if (sys.general.options.adjustDST) bitopts += 128;
         //                                                             6                             15       17 18        21   22       24 25 
         //[255, 0, 255][165, 63, 15, 16, 168, 41][0, 0, 18, 1, 0, 0, 129, 0, 0, 0, 0, 0, 0, 0, 176,  89, 27, 110, 3, 0, 0, 89, 100, 98, 100, 0, 0, 0, 0, 15, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0][5, 243]
         //[255, 0, 255][165, 63, 15, 16, 168, 41][0, 0, 18, 1, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 176, 235, 27, 167, 1, 0, 0, 89,  81, 98, 103, 5, 0, 0, 0, 15, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0][6, 48]
@@ -3099,8 +3099,8 @@ class IntelliCenterBodyCommands extends BodyCommands {
             action: 168,
             response: IntelliCenterBoard.getAckResponse(168),
             retries: 5,
-            payload: [0, 0, byte2, 1, 0, 0, 129, 0, 0, 0, 0, 0, 0, 0, 176, 89, 27, 110, 3, 0, 0,
-                temp1, temp3, temp2, temp4, body1.heatMode || 0, body2.heatMode || 0, body3.heatMode || 0, body4.heatMode || 0, 15,
+            payload: [0, 0, byte2, 1, 0, 0, 129, 0, 0, 0, 0, 0, 0, 0, bitopts, 89, 27, 110, 3, 0, 0,
+                heat1, cool1, heat2, cool2, body1.heatMode || 1, body2.heatMode || 1, 0, 0, 15,
                 sys.general.options.pumpDelay ? 1 : 0, sys.general.options.cooldownDelay ? 1 : 0, 0, 100, 0, 0, 0, 0, sys.general.options.manualPriority ? 1 : 0, sys.general.options.manualHeat ? 1 : 0, 0]
         });
         return new Promise<BodyTempState>((resolve, reject) => {
@@ -3116,23 +3116,14 @@ class IntelliCenterBodyCommands extends BodyCommands {
         });
     }
     public async setCoolSetpointAsync(body: Body, setPoint: number): Promise<BodyTempState> {
-        //[165, 1, 15, 16, 168, 41][0, 0, 19, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 176, 110, 30, 188, 3, 0, 0, 76, 99, 78, 100, 5, 5, 0, 0, 15, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0][5, 33]
-        let byte2 = 19;
+        let byte2 = 18;
         let body1 = sys.bodies.getItemById(1);
         let body2 = sys.bodies.getItemById(2);
-        let body3 = sys.bodies.getItemById(3);
-        let body4 = sys.bodies.getItemById(3);
 
-        let temp1 = sys.bodies.getItemById(1).setPoint || 100;
-        let cool1 = sys.bodies.getItemById(1).coolSetpoint || 100;
-        let temp2 = sys.bodies.getItemById(2).setPoint || 100;
-        let cool2 = sys.bodies.getItemById(2).coolSetpoint || 100;
-
-        //Them
-        //[165, 63, 15, 16, 168, 41][0, 0, 19, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 176, 59, 30, 5, 5, 0, 0, 90, 102, 98, 81, 3, 1, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0][4, 129]
-        //Us
-        //[165, 63, 15, 33, 168, 40][0, 0, 19, 1, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 176, 89, 27, 5, 5, 0, 0, 90, 103, 98, 81, 3, 1, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0][5, 249]
-        //[165, 63, 15, 33, 168, 40][0, 0, 19, 1, 0, 0, 129, 0, 0, 0, 0, 0, 0, 0, 176, 89, 27, 110, 3, 0, 0, 90, 103, 98, 81, 3, 1, 0, 0, 15, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0][5, 249]
+        let heat1 = body1.heatSetpoint || 78;
+        let cool1 = body1.coolSetpoint || 100;
+        let heat2 = body2.heatSetpoint || 78;
+        let cool2 = body2.coolSetpoint || 103;
         switch (body.id) {
             case 1:
                 byte2 = 19;
@@ -3143,6 +3134,10 @@ class IntelliCenterBodyCommands extends BodyCommands {
                 cool2 = setPoint;
                 break;
         }
+        let bitopts = 0;
+        if (sys.general.options.clockSource) bitopts += 32;
+        if (sys.general.options.clockMode === 24) bitopts += 64;
+        if (sys.general.options.adjustDST) bitopts += 128;
         //                                                             6                             15       17 18        21   22       24 25 
         //[255, 0, 255][165, 63, 15, 16, 168, 41][0, 0, 18, 1, 0, 0, 129, 0, 0, 0, 0, 0, 0, 0, 176,  89, 27, 110, 3, 0, 0, 89, 100, 98, 100, 0, 0, 0, 0, 15, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0][5, 243]
         //[255, 0, 255][165, 63, 15, 16, 168, 41][0, 0, 18, 1, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 176, 235, 27, 167, 1, 0, 0, 89,  81, 98, 103, 5, 0, 0, 0, 15, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0][6, 48]
@@ -3150,8 +3145,8 @@ class IntelliCenterBodyCommands extends BodyCommands {
             action: 168,
             response: IntelliCenterBoard.getAckResponse(168),
             retries: 5,
-            payload: [0, 0, byte2, 1, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 176, 89, 27, 110, 3, 0, 0,
-                temp1, cool1, temp2, cool2, body1.heatMode || 0, body2.heatMode || 0, body3.heatMode || 0, body4.heatMode || 0, 15,
+            payload: [0, 0, byte2, 1, 0, 0, 129, 0, 0, 0, 0, 0, 0, 0, bitopts, 89, 27, 110, 3, 0, 0,
+                heat1, cool1, heat2, cool2, body1.heatMode || 1, body2.heatMode || 1, 0, 0, 15,
                 sys.general.options.pumpDelay ? 1 : 0, sys.general.options.cooldownDelay ? 1 : 0, 0, 100, 0, 0, 0, 0, sys.general.options.manualPriority ? 1 : 0, sys.general.options.manualHeat ? 1 : 0, 0]
         });
         return new Promise<BodyTempState>((resolve, reject) => {
@@ -3159,7 +3154,7 @@ class IntelliCenterBodyCommands extends BodyCommands {
                 if (err) reject(err);
                 else {
                     let bstate = state.temps.bodies.getItemById(body.id);
-                    body.coolSetpoint = bstate.coolSetpoint = setPoint;
+                    body.heatSetpoint = bstate.heatSetpoint = setPoint;
                     resolve(bstate);
                 }
             };
@@ -3551,7 +3546,7 @@ class IntelliCenterHeaterCommands extends HeaterCommands {
 
             sys.board.valueMaps.heatModes = new byteValueMap([[1, { name: 'off', desc: 'Off' }]]);
             if (gasHeaterInstalled) sys.board.valueMaps.heatModes.merge([[2, { name: 'heater', desc: 'Heater' }]]);
-            if (mastertempInstalled) sys.board.valueMaps.heatModes.merge([11, { name: 'mtheater', desc: 'MasterTemp' }]);
+            if (mastertempInstalled) sys.board.valueMaps.heatModes.merge([[11, { name: 'mtheater', desc: 'MasterTemp' }]]);
             if (solarInstalled && (gasHeaterInstalled || heatPumpInstalled || mastertempInstalled)) sys.board.valueMaps.heatModes.merge([[3, { name: 'solar', desc: 'Solar Only' }], [4, { name: 'solarpref', desc: 'Solar Preferred' }]]);
             else if (solarInstalled) sys.board.valueMaps.heatModes.merge([[3, { name: 'solar', desc: 'Solar' }]]);
             if (ultratempInstalled && (gasHeaterInstalled || heatPumpInstalled || mastertempInstalled)) sys.board.valueMaps.heatModes.merge([[5, { name: 'ultratemp', desc: 'UltraTemp Only' }], [6, { name: 'ultratemppref', desc: 'UltraTemp Pref' }]]);