nodejs-poolcontroller 8.0.5 → 8.1.0

package/Changelog

@@ -1,5 +1,20 @@
 # Changelog
 
+## 8.1.0
+1. Support for dual chlorinators with REM chem controllers.  It is now possible to have two separate chlorinators controlled in 'dynamic' mode by two separate REM chems.  Note: In order for REM chem to control each chlorinator, each needs to be on a dedicated RS-485 port (not shared with an OCP or any other chlorinator).
+
+## 8.0.1-8.0.5
+1. Bug fixes including:
+   a. schedule end time errors
+   b. manual priority
+   c. screenlogic recurring schedules
+   d. VF pump message sequences
+   e. intellibrite themes
+   f. schedules are evaluated by bodies first and then everything else
+   g. solar stop/start delta logic
+2. Jandy WaterColors support
+3. Initial docker support (github docker actions)
+
 ## 8.0.0
 1. Refactor comms code to Async
 2. Update dependencies and Node >16

package/README.md

@@ -1,7 +1,7 @@
 ```diff
 - INTELLICENTER USERS: Do not upgrade Intellicenter to 2.006.  Rollback to 1.064 to use this application. 
 ```
-# nodejs-poolController - Version 8.0
+# nodejs-poolController - Version 8.1
 
 ## What is nodejs-poolController
 
@@ -26,6 +26,10 @@ Equipment supported
 ## Latest Changes
 See [Changelog](https://github.com/tagyoureit/nodejs-poolController/blob/master/Changelog)
 
+## What's new in 8.1?
+
+Support for dual chlorinators with REM chem controllers.  It is now possible to have two separate chlorinators controlled in 'dynamic' mode by two separate REM chems.  Note: In order for REM chem to control each chlorinator, each needs to be on a dedicated RS-485 port (not shared with an OCP or any other chlorinator).
+
 ## What's new in 8.0?
 
 Screenlogic can now be used as a direct connection point.  If you feel that integrating an RS-485 adapter is a bit too much, then this is an option for you.  The preferred method is still RS-485 as it is more fully featured.

package/controller/Equipment.ts

@@ -1678,6 +1678,10 @@ export class Chlorinator extends EqItem {
     public set ignoreSaltReading(val: boolean) { this.setDataVal('ignoreSaltReading', val); }
     public get model() { return this.data.model; }
     public set model(val: number | any) { this.setDataVal('model', sys.board.valueMaps.chlorinatorModel.encode(val)); }
+    public get ratedLbs(): number {
+        let model = sys.board.valueMaps.chlorinatorModel.get(this.model);
+        return typeof model.chlorinePerSec !== 'undefined' ? model.chlorinePerSec : 0;
+    }
 }
 export class ValveCollection extends EqItemCollection<Valve> {
     constructor(data: any, name?: string) { super(data, name || "valves"); }
@@ -2207,80 +2211,6 @@ export interface IChemController {
 }
 export class ChemController extends EqItem implements IChemController {
     public initData() {
-        //var chemController = {
-        //    id: 'number',               // Id of the controller
-        //    name: 'string',             // Name assigned to the controller
-        //    type: 'valueMap',           // intellichem, rem -- There is an unknown but that should probably go away.
-        //    body: 'valueMap',           // Body assigned to the chem controller.
-        //    address: 'number',          // Address for IntelliChem controller only.
-        //    isActive: 'booean',
-        //    isVirtual: 'boolean',       // False if controlled by OCP.
-        //    calciumHardness: 'number',
-        //    cyanuricAcid: 'number',
-        //    alkalinity: 'number',
-        //    HMIAdvancedDisplay: 'boolean', // This is related to IntelliChem and determines what is displayed on the controller.
-        //    ph: {                           // pH chemical structure
-        //        chemType: 'string',         // Constant ph
-        //        enabled: 'boolean',         // Allows disabling the functions without deleting the settings.
-        //        dosingMethod: 'valueMap',   // manual, volume, volumeTime.
-        //        //  manual = The dosing pump is not triggered.
-        //        //  volume = Time is not considered as a limit to the dosing.
-        //        //  time = The only limit to the dose is the amount of time.
-        //        //  volumeTime = Limit the dose by volume or time whichever is sooner.
-        //        maxDosingTime: 'number',    // The maximum amount of time a dose can occur before mixing.
-        //        maxDosingVolume: 'number',  // The maximum volume for a dose in mL.
-        //        mixingTime: 'number',       // Amount of time between in seconds doses that the pump must run before adding another dose.
-        //        startDelay: 'number',       // The number of seconds that the pump must be running prior to considering a dose.
-        //        setpoint: 'number',         // Target setpoint for pH
-        //        phSupply: 'valueMap',       // base or acid.
-        //        pump: {
-        //            type: 'valueMap',           // none, relay, ezo-pmp
-        //            connectionId: 'uuid',       // Unique identifier for njspc external connections.
-        //            deviceBinding: 'string',    // Binding value for REM to tell it what device is involved.
-        //            ratedFlow: 'number',        // The standard flow rate for the pump in mL/min.
-        //        },
-        //        tank: {
-        //            capacity: 'number',         // Capacity of the tank in the units provided.
-        //            units: 'valueMap'           // gal, mL, cL, L, oz, pt, qt.
-        //        },
-        //        probe: {
-        //            connectionId: 'uuid',       // A unique identifier that has been generated for connections in njspc.
-        //            deviceBinding: 'string',    // A mapping value that is used by REM to determine which device is used.
-        //            type: 'valueMap'            // none, ezo-ph, other.
-        //        }
-
-        //    },
-        //    orp: {                          // ORP chemical structure
-        //        chemType: 'string',         // Constant orp
-        //        enabled: 'boolean',         // Allows disabling the functions without deleting the settings.
-        //        dosingMethod: 'valueMap',   // manual, volume, volumeTime.
-        //        //  manual = The dosing pump is not triggered.
-        //        //  volume = Time is not considered as a limit to the dosing.
-        //        //  time = The only limit to the dose is the amount of time.
-        //        //  volumeTime = Limit the dose by volume or time whichever is sooner.
-        //        maxDosingTime: 'number',    // The maximum amount of time a dose can occur before mixing.
-        //        maxDosingVolume: 'number',  // The maximum volume for a dose in mL.
-        //        mixingTime: 'number',       // Amount of time between in seconds doses that the pump must run before adding another dose.
-        //        startDelay: 'number',       // The number of seconds that the pump must be running prior to considering a dose.
-        //        setpoint: 'number',         // Target setpoint for ORP
-        //        useChlorinator: 'boolean',  // Indicates whether the chlorinator will be used for dosing.
-        //        pump: {
-        //            type: 'valueMap',           // none, relay, ezo-pmp
-        //            connectionId: 'uuid',       // Unique identifier for njspc external connections.
-        //            deviceBinding: 'string',    // Binding value for REM to tell it what device is involved.
-        //            ratedFlow: 'number',        // The standard flow rate for the pump in mL/min.
-        //        },
-        //        tank: {
-        //            capacity: 'number',         // Capacity of the tank in the units provided.
-        //            units: 'valueMap'           // gal, mL, cL, L, oz, pt, qt.
-        //        },
-        //        probe: {
-        //            connectionId: 'uuid',       // A unique identifier that has been generated for connections in njspc.
-        //            deviceBinding: 'string',    // A mapping value that is used by REM to determine which device is used.
-        //            type: 'valueMap'            // none, ezo-orp, other.
-        //        }
-        //    }
-        //}
         if (typeof this.data.lsiRange === 'undefined') this.data.lsiRange = { low: -.5, high: .5, enabled: true };
         if (typeof this.data.borates === 'undefined') this.data.borates = 0;
         if (typeof this.data.siCalcType === 'undefined') this.data.siCalcType = 0;
@@ -2299,8 +2229,6 @@ export class ChemController extends EqItem implements IChemController {
     public set address(val: number) { this.setDataVal('address', val); }
     public get isActive(): boolean { return this.data.isActive; }
     public set isActive(val: boolean) { this.setDataVal('isActive', val); }
-    // public get isVirtual(): boolean { return this.data.isVirtual; }
-    // public set isVirtual(val: boolean) { this.setDataVal('isVirtual', val); }
     public get calciumHardness(): number { return this.data.calciumHardness; }
     public set calciumHardness(val: number) { this.setDataVal('calciumHardness', val); }
     public get cyanuricAcid(): number { return this.data.cyanuricAcid; }
@@ -2460,7 +2388,7 @@ export class Chemical extends ChildEqItem implements IChemical {
     public set startDelay(val: number) { this.setDataVal('startDelay', val); }
     public get pump(): ChemicalPump { return new ChemicalPump(this.data, 'pump', this); }
     public get tank(): ChemicalTank { return new ChemicalTank(this.data, 'tank', this); }
-    public get chlor(): ChemicalChlor { return new ChemicalChlor(this.data, 'chlor', this); }
+    // public get chlor(): Chlorinator { return new ChemicalChlor(this.data, 'chlor', this); }
     public get setpoint(): number { return this.data.setpoint; }
     public set setpoint(val: number) { this.setDataVal('setpoint', val); }
     public get tolerance(): AlarmSetting { return new AlarmSetting(this.data, 'tolerance', this); }
@@ -2518,6 +2446,14 @@ export class ChemicalORP extends Chemical {
     }
     public get useChlorinator(): boolean { return utils.makeBool(this.data.useChlorinator); }
     public set useChlorinator(val: boolean) { this.setDataVal('useChlorinator', val); }
+    public get chlorId(): number {
+        if (typeof this.data.chlorId === 'undefined'){
+            // default to 1st chlorinator if not set; this is a backwards compatibility item when upgrading to 8.1
+            return sys.chlorinators.getItemByIndex(0).id;
+        }
+        return this.data.chlorId; 
+    }
+    public set chlorId(val: number) { this.setDataVal('chlorId', val); }
     public get phLockout(): number { return this.data.phLockout; }
     public set phLockout(val: number) { this.setDataVal('phLockout', val); }
     public get probe(): ChemicalORPProbe { return new ChemicalORPProbe(this.data, 'probe', this); }
@@ -2661,7 +2597,7 @@ export class ChemicalTank extends ChildEqItem {
         return tank;
     }
 }
-export class ChemicalChlor extends ChildEqItem {
+/* export class ChemicalChlor extends ChildEqItem {
     // This whole class is a reference to the first chlorinator.
     // This may not follow a best practice
     // and certainly won't work for multiple chlors
@@ -2695,7 +2631,7 @@ export class ChemicalChlor extends ChildEqItem {
         chlor.model = sys.board.valueMaps.chlorinatorModel.transform(this.model);
         return chlor;
     }
-}
+} */
 export class AlarmSetting extends ChildEqItem {
     public dataName = 'AlarmSettingConfig';
     public initData() {

package/controller/State.ts

@@ -2658,74 +2658,6 @@ export class ChemControllerState extends EqState implements IChemControllerState
         if (typeof this.data.siCalcType === 'undefined') {
             this.data.siCalcType = sys.board.valueMaps.siCalcTypes.transform(0);
         }
-        //var chemControllerState = {
-        //    lastComm: 'number',             // The unix time the chem controller sent its status.
-        //    id: 'number',                   // Id of the chemController.
-        //    type: 'valueMap',               // intellichem, rem.
-        //    address: 'number',              // Assigned address if IntelliChem.
-        //    name: 'string',                 // Name assigned to the controller.
-        //    status: 'valueMap',             // ok, nocomms, setupError
-        //    body: 'valueMap',               // Body that the chemController is assigned to.
-        //    flowDetected: 'boolean',        // True if there is currently sufficient flow to read and dose.
-        //    flowDelay: 'boolean',           // True of the controller is currently under a flow delay.
-        //    firmware: 'string',             // Firmware version from IntelliChem (this should be in config)
-        //    saturationIndex: 'number',      // Calculated LSI for the body.
-        //    isActive: 'boolean',    
-        //    alarms: {},                     // This has not changed although additional alarms will be added.
-        //    warnings: {},                   // This has not changed although additional warnings will be added.
-        //    chemistryStatus: 'valueMap',    // Current water quality status.
-        //    ph: {
-        //        chemType: 'string',                 // Constant ph.
-        //        dosingTimeRemaining: 'number',      // The number of seconds remaining for the current dose.
-        //        dosingVolumeRemaining: 'number',    // Remaining volume for the current dose in mL.
-        //        mixTimeRemaining: 'number',         // The number of seconds remaining in the current mix cycle.
-        //        dosingStatus: 'valueMap',           // dosing, monitoring, mixing.
-        //        level: 'number',                    // The current pH level.
-        //        lockout: 'boolean',                 // True if an attempt to dose was thwarted by error.
-        //        manualDosing: 'boolean',            // True if the pump is running outside of a dosing command.
-        //        dailyLimitReached: 'boolean',       // True if the calculated daily limit has been reached based upon body volume.
-        //        pump: {
-        //            type: 'valueMap',               // The defined pump type.
-        //            isDosing: 'boolean',            // True if the pump is running.
-        //        },
-        //        tank: {
-        //            level: 'number',                // The current level for the tank.
-        //            capacity: 'number',             // Total capacity for the tank.
-        //            units: 'valueMap',              // nounits, gal, mL, cL, L, oz, pt, qt.
-        //        },
-        //        probe: {
-        //            level: 'number',                // Current ph level as measured by the probe.
-        //            temperature: 'number',          // The temperature used to calculate the adjusted probe level.
-        //            tempUnits: 'valueMap'           // Units for the temperature C or F.
-        //        }
-        //    },
-        //    orp: {
-        //        chemType: 'string',                 // Constant orp.
-        //        dosingTimeRemaining: 'number',      // The number of seconds remaining for the current dose.
-        //        dosingVolumeRemaining: 'number',    // Remaining volume for the current dose in mL.
-        //        mixTimeRemaining: 'number',         // The number of seconds remaining in the current mix cycle.
-        //        dosingStatus: 'valueMap',           // dosing, monitoring, mixing.
-        //        level: 'number',                    // The current ORP level.
-        //        lockout: 'boolean',                 // True if an attempt to dose was thwarted by error.
-        //        manualDosing: 'boolean',            // True if the pump is running outside of a dosing command.
-        //        dailyLimitReached: 'boolean',       // True if the calculated daily limit has been reached based upon body volume.
-        //        pump: {
-        //            type: 'valueMap',               // The defined pump type.
-        //            isDosing: 'boolean',            // True if the pump is running.
-        //        },
-        //        tank: {
-        //            level: 'number',                // The current level for the tank.
-        //            capacity: 'number',             // Total capacity for the tank.
-        //            units: 'valueMap',              // nounits, gal, mL, cL, L, oz, pt, qt.
-        //        },
-        //        probe: {
-        //            level: 'number',                // Current ORP level as measured by the probe.
-        //            temperature: 'number',          // The temperature used to calculate the adjusted probe level.
-        //            tempUnits: 'valueMap'           // Units for the temperature C or F.
-        //        }
-        //    }
-        //}
-
     }
     public dataName: string = 'chemController';
     public get lastComm(): number { return this.data.lastComm || 0; }
@@ -3175,8 +3107,8 @@ export class ChemicalORPState extends ChemicalState {
     public get chemType() { return 'orp'; }
     public set chemType(val) { this.setDataVal('chemType', val); }
     public get probe() { return new ChemicalProbeORPState(this.data, 'probe', this); }
-    public get useChlorinator(): boolean { return utils.makeBool(this.data.useChlorinator); }
-    public set useChlorinator(val: boolean) { this.setDataVal('useChlorinator', val); }
+    // public get useChlorinator(): boolean { return utils.makeBool(this.data.useChlorinator); }
+    // public set useChlorinator(val: boolean) { this.setDataVal('useChlorinator', val); }
     public get suspendDosing(): boolean {
         let cc = this.chemController;
         return cc.alarms.comms !== 0 || cc.alarms.orpProbeFault !== 0 || cc.alarms.orpPumpFault !== 0 || cc.alarms.bodyFault !== 0;

package/controller/boards/NixieBoard.ts

@@ -73,6 +73,7 @@ export class NixieBoard extends SystemBoard {
             [14, { name: 'colorlogic', desc: 'ColorLogic', isLight: true, theme: 'colorlogic' }],
             [15, { name: 'spadrain', desc: 'Spa Drain' }],
             [16, { name: 'pooltone', desc: 'Pool Tone', isLight: true, theme: 'pooltone' }],
+            [17, { name: 'watercolors', desc: 'WaterColors', isLight: true, theme: 'watercolors' }],
         ]);
         this.valueMaps.pumpTypes = new byteValueMap([
             [1, { name: 'ss', desc: 'Single Speed', maxCircuits: 8, hasAddress: false, hasBody: false, maxRelays: 1, relays: [{ id: 1, name: 'Pump On/Off' }]}],

package/controller/nixie/chemistry/ChemController.ts

@@ -1,7 +1,7 @@
 import { clearTimeout, setTimeout } from 'timers';
 import { conn } from '../../../controller/comms/Comms';
 import { Outbound, Protocol, Response } from '../../../controller/comms/messages/Messages';
-import { IChemical, IChemController, Chlorinator, ChemController, ChemControllerCollection, ChemFlowSensor, Chemical, ChemicalChlor, ChemicalORP, ChemicalORPProbe, ChemicalPh, ChemicalPhProbe, ChemicalProbe, ChemicalPump, ChemicalTank, sys } from "../../../controller/Equipment";
+import { IChemical, IChemController, Chlorinator, ChemController, ChemControllerCollection, ChemFlowSensor, Chemical, ChemicalORP, ChemicalORPProbe, ChemicalPh, ChemicalPhProbe, ChemicalProbe, ChemicalPump, ChemicalTank, sys } from "../../../controller/Equipment";
 import { logger } from '../../../logger/Logger';
 import { InterfaceServerResponse, webApp } from "../../../web/Server";
 import { Timestamp, utils } from '../../Constants';
@@ -727,11 +727,16 @@ export class NixieChemController extends NixieChemControllerBase {
                     else schem.alarms.orp = 0;
                     let chlorErr = 0;
                     if (useChlorinator && schem.isBodyOn) {
-                        let chlors = sys.chlorinators.getByBody(schem.activeBodyId);
-                        let chlor = chlors.getItemByIndex(0);
-                        let schlor = state.chlorinators.getItemById(chlor.id);
-                        this.orp.chlor.chlorId = chlor.id;
-                        if (schlor.status & 0xF0) chlorErr = 16;
+                        const chlorCollection = sys.chlorinators.getByBody(schem.activeBodyId);
+                        if (chlorCollection.length > 0) {
+                            for (let chlor of chlorCollection.toArray()) {
+                                let schlor = state.chlorinators.getItemById(chlor.id);
+                                if (schlor.status & 0xF0) {
+                                    chlorErr = 16;
+                                    break;
+                                }
+                            }
+                        }
                     }
                     schem.warnings.chlorinatorCommError = chlorErr;
                     schem.warnings.pHLockout = useChlorinator === false && probeType !== 0 && pumpType !== 0 && schem.ph.level >= chem.orp.phLockout ? 1 : 0;
@@ -1067,7 +1072,7 @@ class NixieChemical extends NixieChildEquipment implements INixieChemical {
             schem.chlor.isDosing = schem.pump.isDosing = false;
             if (!this.chemical.flowOnlyMixing || (schem.chemController.isBodyOn && this.chemController.flowDetected && !schem.freezeProtect)) {
                 if (this.chemType === 'orp' && typeof this.chemController.orp.orp.useChlorinator !== 'undefined' && this.chemController.orp.orp.useChlorinator && this.chemController.orp.orp.chlorDosingMethod > 0) {
-                    if (state.chlorinators.getItemById(this.chemController.orp.chlor.chlorId).currentOutput !== 0) {
+                    if (state.chlorinators.getItemById(this.chlor.id).currentOutput !== 0) {
                         logger.debug(`Chem mixing ORP (chlorinator) paused waiting for chlor current output to be 0%.  Mix time remaining: ${utils.formatDuration(schem.mixTimeRemaining)} `);
                         return;
                     }
@@ -1422,24 +1427,25 @@ export class NixieChemPump extends NixieChildEquipment {
     }
 }
 export class NixieChemChlor extends NixieChildEquipment {
-    public chlor: ChemicalChlor;
-    public isOn: boolean;
-    public chlorId = 0;
+    public get chlor(): Chlorinator { return sys.chlorinators.getItemById((this.getParent() as NixieChemicalORP).orp.chlorId); }
+    public isOn: boolean; // can this just be chlor.isOn?
     public _lastOnStatus: number;
     protected _dosingTimer: NodeJS.Timeout;
     private _isStopping = false;
     public chlorInterval = 15;
-    constructor(chemical: NixieChemical, chlor: ChemicalChlor) { super(chemical); this.chlor = chlor; }
+    // constructor(chemical: NixieChemical, chlor: ChemicalChlor) { super(chemical); this.chlor = chlor; }
+    constructor(chemical: NixieChemical) { super(chemical); }
     public get chemical(): NixieChemical { return this.getParent() as NixieChemical; }
     public async setChlorAsync(schlor: ChemicalChlorState, data: any) {
         try {
             if (typeof data.chlorDosingMethod !== 'undefined' && data.chlorDosingMethod === 0) {
                 if (schlor.chemical.dosingStatus === 0) { await this.chemical.cancelDosing(schlor.chemController.orp, 'dosing method changed'); }
                 if (schlor.chemical.dosingStatus === 1) { await this.chemical.cancelMixing(schlor.chemController.orp); }
-                let chlor = sys.chlorinators.getItemById(this.chlorId);
+                let chlor = sys.chlorinators.getItemById((this.getParent() as NixieChemicalORP).orp.chlorId);
                 chlor.disabled = false;
                 chlor.isDosing = false;
             }
+            let c = sys.chlorinators.toArray
         } catch (err) { logger.error(`setChlorAsync: ${err.message}`); return Promise.reject(err); }
     }
     public async stopDosing(schem: IChemicalState, reason: string): Promise<void> {
@@ -1479,7 +1485,8 @@ export class NixieChemChlor extends NixieChildEquipment {
                 await this.chemical.cancelDosing(schem, 'undefined dose');
                 return;
             }
-            if (this.chlor.ratedLbs === 0) {
+            let chlor = sys.chlorinators.getItemById((this.getParent() as NixieChemicalORP).orp.chlorId);
+            if (chlor.ratedLbs === 0) {
                 // We aren't going to do anything.
                 logger.verbose(`Chem dose ignore chlor because it doesn't have a dosing rating.`);
             }
@@ -1488,7 +1495,7 @@ export class NixieChemChlor extends NixieChildEquipment {
                 let isBodyOn = schem.chemController.flowDetected;
                 await this.chemical.initDose(schem);
                 let chemController = schem.getParent()
-                let schlor = state.chlorinators.getItemById(this.chlorId);
+                let schlor = state.chlorinators.getItemById(chlor.id);
                 if (!isBodyOn) {
                     // Make sure the chlor is off.
                     logger.info(`Chem chlor flow not detected. Body is not running.`);
@@ -1501,7 +1508,7 @@ export class NixieChemChlor extends NixieChildEquipment {
                     if (chem.ph.dosePriority)
                         await this.chemical.cancelDosing(schem, 'ph dose priority');
                 }
-                else if (this.chlor.superChlor) {
+                else if (chlor.superChlor) {
                     // if superchlor is active, it may be to boost the ORP and we should respect that
                     await this.chemical.cancelDosing(schem, 'superchlor');
                 }
@@ -1518,7 +1525,7 @@ export class NixieChemChlor extends NixieChildEquipment {
                         else {
                             if (typeof dose._lastLatch !== 'undefined') {
                                 let time = new Date().getTime() - (dose._lastLatch || new Date().getTime());
-                                let vol = this.chlor.ratedLbs * time / 1000;
+                                let vol = chlor.ratedLbs * time / 1000;
                                 schem.appendDose(vol, time);
                             }
                             logger.info(`Chem Controller ${dose.chem} chlorinated ${Math.round(dose.volumeDosed * 1000000) / 1000000}lbs of ${Math.round(dose.volume * 1000000) / 1000000}lbs - ${utils.formatDuration(dose.timeRemaining)} remaining`);
@@ -1565,14 +1572,15 @@ export class NixieChemChlor extends NixieChildEquipment {
     public async turnOff(schem: IChemicalState): Promise<ChlorinatorState> {
         try {
             //logger.info(`Turning off the chlorinator`);
-            let chlor = sys.chlorinators.getItemById(this.chlorId);
+            let chemORP = this.getParent() as NixieChemicalORP;
+            let chlor = sys.chlorinators.getItemById(chemORP.orp.chlorId);
             let schlor = state.chlorinators.getItemById(chlor.id);
             if (schlor.currentOutput === 0 && schlor.targetOutput === 0 && !schlor.superChlor && chlor.disabled && !chlor.isDosing) {
                 this.isOn = schem.chlor.isDosing = false;
                 return schlor;
             }
             let cstate = await sys.board.chlorinator.setChlorAsync({
-                id: 1,
+                id: chlor.id,
                 disabled: true,
                 isDosing: false
             })
@@ -1583,14 +1591,15 @@ export class NixieChemChlor extends NixieChildEquipment {
     }
     public async turnOn(schem: ChemicalState, latchTimeout?: number): Promise<ChlorinatorState> {
         try {
-            let chlor = sys.chlorinators.getItemById(this.chlorId);
+            let chemORP = this.getParent() as NixieChemicalORP;
+            let chlor = sys.chlorinators.getItemById(chemORP.orp.chlorId);
             let schlor = state.chlorinators.getItemById(chlor.id);
             if (schlor.currentOutput === 100 && schlor.targetOutput === 100 && !schlor.superChlor && !chlor.disabled && chlor.isDosing) {
                 this.isOn = schem.chlor.isDosing = true;
                 return schlor;
             }
             let cstate = await sys.board.chlorinator.setChlorAsync({
-                id: 1,
+                id: chlor.id,
                 disabled: false,
                 isDosing: true
             })
@@ -1939,13 +1948,14 @@ export class NixieChemicalORP extends NixieChemical {
         this.chemType = 'orp';
         this.orp = chemical;
         this.probe = new NixieChemProbeORP(this, chemical.probe);
-        this.chlor = new NixieChemChlor(this, chemical.chlor);
+        // this.chlor = new NixieChemChlor(this, chemical.chlor);
+        this.chlor = new NixieChemChlor(this);
         let sorp = state.chemControllers.getItemById(controller.id).orp;
         if (!this.orp.enabled) {
             this.orp.doserType = 0;
             sorp.chemType = 'none';
         }
-        else if (sorp.useChlorinator) {
+        else if (this.orp.useChlorinator) {
             this.orp.doserType = 2;
             sorp.chemType = 'chlorine';
         }
@@ -1962,14 +1972,38 @@ export class NixieChemicalORP extends NixieChemical {
     public async setORPAsync(sorp: ChemicalORPState, data: any) {
         try {
             if (typeof data !== 'undefined') {
-                sorp.useChlorinator = this.orp.useChlorinator = typeof data.useChlorinator !== 'undefined' ? utils.makeBool(data.useChlorinator) : this.orp.useChlorinator;
+                this.orp.useChlorinator = typeof data.useChlorinator !== 'undefined' ? utils.makeBool(data.useChlorinator) : this.orp.useChlorinator;
+                if (this.orp.useChlorinator) {
+                    if (typeof data.chlorId === 'undefined') {
+                        return Promise.reject(new InvalidEquipmentDataError(`Chlorinator ID must be provided when useChlorinator is true`, 'chemController', data.chlorId));
+                    }
+                    let chlor = sys.chlorinators.getItemById(data.chlorId);
+                    if (typeof chlor === 'undefined') {
+                        return Promise.reject(new InvalidEquipmentDataError(`Chlorinator with ID ${data.chlorId} not found`, 'chemController', data.chlorId));
+                    }
+                    if (chlor.body !== this.chemController.chem.body && chlor.body !== 32) {
+                        return Promise.reject(new InvalidEquipmentDataError(`Chlorinator body does not match the chem controller body`, 'chemController', data.chlorId));
+                    }
+                    let assignedChemController = sys.chemControllers.get().find((cc: ChemController) => 
+                        {
+                            return cc.orp.chlorId === data.chlorId && cc.id !== this.chemController.id;
+                        });
+                    if (assignedChemController) {
+                        return Promise.reject(new InvalidEquipmentDataError(`Chlorinator is already assigned to another chem controller`, 'chemController', data.chlorId));
+                    }
+                    this.orp.chlorId = data.chlorId;
+                    if (typeof data.chlorDosingMethod !== 'undefined') { this.orp.chlorDosingMethod = data.chlorDosingMethod; }
+                } else {
+                    this.orp.chlorId = undefined;
+                    this.orp.chlorDosingMethod = undefined; 
+                }
                 sorp.enabled = this.orp.enabled = typeof data.enabled !== 'undefined' ? utils.makeBool(data.enabled) : this.orp.enabled;
                 sorp.level = typeof data.level !== 'undefined' && !isNaN(parseFloat(data.level)) ? parseFloat(data.level) : sorp.level;
                 this.orp.phLockout = typeof data.phLockout !== 'undefined' && !isNaN(parseFloat(data.phLockout)) ? parseFloat(data.phLockout) : this.orp.phLockout;
                 this.orp.flowReadingsOnly = typeof data.flowReadingsOnly !== 'undefined' ? utils.makeBool(data.flowReadingsOnly) : this.orp.flowReadingsOnly;
                 this.orp.disableOnFreeze = typeof data.disableOnFreeze !== 'undefined' ? utils.makeBool(data.disableOnFreeze) : this.orp.disableOnFreeze;
                 if (!this.orp.disableOnFreeze) sorp.freezeProtect = false;
-                if (typeof data.chlorDosingMethod !== 'undefined') { this.orp.chlorDosingMethod = data.chlorDosingMethod; }
+
                 await this.setDosing(this.orp, data);
                 await this.setMixing(this.orp, data);
                 await this.probe.setProbeORPAsync(sorp.probe, data.probe);
@@ -1980,7 +2014,7 @@ export class NixieChemicalORP extends NixieChemical {
                     this.orp.doserType = 0;
                     sorp.chemType = 'none';
                 }
-                else if (sorp.useChlorinator) {
+                else if (this.orp.useChlorinator) {
                     this.orp.doserType = 2;
                     sorp.chemType = 'chlorine';
                 }
@@ -2069,7 +2103,7 @@ export class NixieChemicalORP extends NixieChemical {
 
     public async cancelDosing(sorp: ChemicalORPState, reason: string): Promise<void> {
         try {
-            if (typeof sorp.useChlorinator !== 'undefined' && sorp.useChlorinator && this.chemController.orp.orp.chlorDosingMethod > 0) {
+            if (typeof this.orp.useChlorinator !== 'undefined' && this.orp.useChlorinator && this.chemController.orp.orp.chlorDosingMethod > 0) {
                 await this.chlor.stopDosing(sorp, reason);
                 // for chlor, we want 15 minute intervals
                 if (sorp.doseHistory.length) {
@@ -2104,7 +2138,7 @@ export class NixieChemicalORP extends NixieChemical {
                 if (typeof mixingTime !== 'undefined') {
                     // This is a manual mix so we need to make sure the pump is not dosing.
                     logger.info(`Clearing any possible ${schem.chemType} dosing or existing mix for mixingTime: ${mixingTime}`);
-                    if (schem.chemController.orp.useChlorinator) await this.chlor.stopDosing(schem, 'mix override');
+                    if (this.orp.useChlorinator) await this.chlor.stopDosing(schem, 'mix override');
                     else await this.pump.stopDosing(schem, 'mix override');
                     await this.stopMixing(schem);
                 }
@@ -2274,9 +2308,8 @@ export class NixieChemicalORP extends NixieChemical {
                                 return;
                             }
                         }
-
-
-                        let chlor = sys.chlorinators.getItemById(this.chlor.chlorId); // Still haven't seen any systems with 2+ chlors
+                        let chlor = this.chlor.chlor; // Still haven't seen any systems with 2+ chlors.  
+                        // 2024.12.25 RSG - Oh really?  See https://github.com/tagyoureit/nodejs-poolController/discussions/896
                         let schlor = state.chlorinators.getItemById(chlor.id);
                         // If someone or something is superchloring the pool, let it be
                         if (schlor.superChlor) return;
@@ -2429,7 +2462,7 @@ export class NixieChemicalORP extends NixieChemical {
         logger.info(`Removing chlor ${chlor.id} from Chem Controller ${this.getParent().id}`);
         let schem = state.chemControllers.getItemById(this.getParent().id);
         this.orp.useChlorinator = false;
-        schem.orp.useChlorinator = false;
+        // schem.orp.useChlorinator = false;
         if (schem.orp.dosingStatus === 0) { await this.cancelDosing(schem.orp, 'deleting chlorinator'); }
         if (schem.orp.dosingStatus === 1) { await this.cancelMixing(schem.orp); }
     }

package/controller/nixie/circuits/Circuit.ts

@@ -45,7 +45,7 @@ export class NixieCircuitCollection extends NixieEquipmentCollection<NixieCircui
         } catch (err) { return logger.error(`NCP: setServiceModeAsync: ${err.message}`); }
     }
     public async setLightThemeAsync(id: number, theme: any) {
-            let c: NixieCircuit = this.find(elem => elem.id === id) as NixieCircuit;
+        let c: NixieCircuit = this.find(elem => elem.id === id) as NixieCircuit;
         if (typeof c === 'undefined') return Promise.reject(new Error(`NCP: Circuit ${id} could not be found to set light theme ${theme.name}.`));
         await c.setLightThemeAsync(theme);
     } catch(err) { return logger.error(`NCP: sendOnOffSequence: ${err.message}`); }
@@ -75,10 +75,10 @@ export class NixieCircuitCollection extends NixieEquipmentCollection<NixieCircui
         catch (err) { logger.error(`setCircuitAsync: ${err.message}`); return Promise.reject(err); }
     }
     public async checkCircuitEggTimerExpirationAsync(cstate: ICircuitState) {
-     try {
-        let c: NixieCircuit = this.find(elem => elem.id === cstate.id) as NixieCircuit;
-        await c.checkCircuitEggTimerExpirationAsync(cstate);
-    } catch (err) { logger.error(`NCP: Error synching circuit states: ${err}`); }
+        try {
+            let c: NixieCircuit = this.find(elem => elem.id === cstate.id) as NixieCircuit;
+            await c.checkCircuitEggTimerExpirationAsync(cstate);
+        } catch (err) { logger.error(`NCP: Error synching circuit states: ${err}`); }
     }
     public async initAsync(circuits: CircuitCollection) {
         try {
@@ -159,21 +159,21 @@ export class NixieCircuit extends NixieEquipment {
     protected async setIntelliBriteThemeAsync(cstate: CircuitState, theme: any): Promise<InterfaceServerResponse> {
         let arr = [];
         let count = typeof theme !== 'undefined' && theme.sequence ? theme.sequence : 0;
-		
-		// Removing this. No need to turn the light off first.  We actually need it on to start the sequence for theme setting to work correctly when the light is starting from the off state.
-		// if (cstate.isOn) arr.push({ isOn: false, timeout: 1000 });
-		
-		// Start the sequence of off/on after the light is on.
+
+        // Removing this. No need to turn the light off first.  We actually need it on to start the sequence for theme setting to work correctly when the light is starting from the off state.
+        // if (cstate.isOn) arr.push({ isOn: false, timeout: 1000 });
+
+        // Start the sequence of off/on after the light is on.
         arr.push({ isOn: true, timeout: 100 });
         for (let i = 0; i < count; i++) {
-			arr.push({ isOn: false, timeout: 100 });
-			arr.push({ isOn: true, timeout: 100 });     
+            arr.push({ isOn: false, timeout: 100 });
+            arr.push({ isOn: true, timeout: 100 });
         }
-		// Ensure light stays on long enough for the theme to stick (required for light group theme setting to function correctly).
-		// 2s was too short.
-		arr.push({ isOn: true, timeout: 3000 });
-        
-		logger.debug(arr);
+        // Ensure light stays on long enough for the theme to stick (required for light group theme setting to function correctly).
+        // 2s was too short.
+        arr.push({ isOn: true, timeout: 3000 });
+
+        logger.debug(arr);
         let res = await NixieEquipment.putDeviceService(this.circuit.connectionId, `/state/device/${this.circuit.deviceBinding}`, arr, 60000);
         // Even though we ended with on we need to make sure that the relay stays on now that we are done.
         if (!res.error) {
@@ -182,7 +182,7 @@ export class NixieCircuit extends NixieEquipment {
         }
         return res;
     }
-    protected async setWaterColorsThemeAsync(cstate: CircuitState, theme: any): Promise<InterfaceServerResponse> {
+    protected async setPoolToneThemeAsync(cstate: CircuitState, theme: any): Promise<InterfaceServerResponse> {
         let ptheme = sys.board.valueMaps.lightThemes.findItem(cstate.lightingTheme) || { val: 0, sequence: 0 };
         // First check to see if we are on.  If we are not then we need to emit our status as if we are initializing and busy.
         let arr = [];
@@ -196,7 +196,40 @@ export class NixieCircuit extends NixieEquipment {
         let count = theme.sequence - ptheme.sequence;
         if (count < 0) count = count + 16;
         for (let i = 0; i < count; i++) {
-            arr.push({ isOn: true, timeout: 200 }); 
+            arr.push({ isOn: true, timeout: 200 });
+            arr.push({ isOn: false, timeout: 200 });
+        }
+        console.log(arr);
+        if (arr.length === 0) return new InterfaceServerResponse(200, 'Success');
+        let res = await NixieEquipment.putDeviceService(this.circuit.connectionId, `/state/device/${this.circuit.deviceBinding}`, arr, 60000);
+        // Even though we ended with on we need to make sure that the relay stays on now that we are done.
+        if (!res.error) {
+            cstate.lightingTheme = ptheme.val;
+            cstate.isOn = true; // At this point the relay will be off but we want the process
+            // to assume that the relay state is not actually changing.
+            this._sequencing = false;
+            await this.setCircuitStateAsync(cstate, true, false);
+        }
+        return res;
+    }
+    protected async setWaterColorsThemeAsync(cstate: CircuitState, theme: any): Promise<InterfaceServerResponse> {
+        // RSG 2024.12.24 - This logic was aligned with the Pool Tone themes.  I haven't checked if that 
+        // logic is correct, but made a copy and adjusted for the watercolors themes.
+        
+        let ptheme = sys.board.valueMaps.lightThemes.findItem(cstate.lightingTheme) || { val: 0, sequence: 0 };
+        // First check to see if we are on.  If we are not then we need to emit our status as if we are initializing and busy.
+        let arr = [];
+        if (ptheme.val === 0) {
+            // We don't know our previous theme so we are going to sync the lights to get a starting point.
+            arr.push({ isOn: true, timeout: 1000 }); // Turn on for 1 second
+            arr.push({ isOn: false, timeout: 5000 }); // Turn off for 5 seconds
+            arr.push({ isOn: true, timeout: 1000 });
+            ptheme = sys.board.valueMaps.lightThemes.findItem('alpinewhite');
+        }
+        let count = theme.sequence - ptheme.sequence;
+        if (count < 0) count = count + 14;
+        for (let i = 0; i < count; i++) {
+            arr.push({ isOn: true, timeout: 200 });
             arr.push({ isOn: false, timeout: 200 });
         }
         console.log(arr);
@@ -206,7 +239,7 @@ export class NixieCircuit extends NixieEquipment {
         if (!res.error) {
             cstate.lightingTheme = ptheme.val;
             cstate.isOn = true; // At this point the relay will be off but we want the process
-                                // to assume that the relay state is not actually changing.
+            // to assume that the relay state is not actually changing.
             this._sequencing = false;
             await this.setCircuitStateAsync(cstate, true, false);
         }
@@ -243,7 +276,7 @@ export class NixieCircuit extends NixieEquipment {
         if (!res.error) {
             cstate.lightingTheme = ptheme.val;
             cstate.isOn = true; // At this point the relay will be off but we want the process
-                                // to assume that the relay state is not actually changing.
+            // to assume that the relay state is not actually changing.
             this._sequencing = false;
             await this.setCircuitStateAsync(cstate, true, false);
         }
@@ -264,7 +297,6 @@ export class NixieCircuit extends NixieEquipment {
             switch (type.name) {
                 case 'colorcascade':
                 case 'globrite':
-                case 'pooltone':
                 case 'magicstream':
                 case 'intellibrite':
                     res = await this.setIntelliBriteThemeAsync(cstate, theme);
@@ -275,6 +307,9 @@ export class NixieCircuit extends NixieEquipment {
                 case 'watercolors':
                     res = await this.setWaterColorsThemeAsync(cstate, theme);
                     break;
+                case 'pooltone':
+                    res = await this.setPoolToneThemeAsync(cstate, theme);
+                    break;
             }
             cstate.action = 0;
             // Make sure clients know that we are done.
@@ -285,11 +320,11 @@ export class NixieCircuit extends NixieEquipment {
     }
     public async sendOnOffSequenceAsync(count: number | { isOn: boolean, timeout: number }[], timeout?: number): Promise<InterfaceServerResponse> {
         try {
-           
+
             this._sequencing = true;
             let arr = [];
             let cstate = state.circuits.getItemById(this.circuit.id);
-            
+
             if (typeof count === 'number') {
                 if (cstate.isOn) arr.push({ isOn: false, timeout: 1000 });
                 let t = typeof timeout === 'undefined' ? 100 : timeout;
@@ -339,21 +374,21 @@ export class NixieCircuit extends NixieEquipment {
                 // Check to see if we should be on by poking the schedules.
             }
             if (utils.isNullOrEmpty(this.circuit.connectionId) || utils.isNullOrEmpty(this.circuit.deviceBinding)) {
-                if (val && val !== cstate.isOn){
+                if (val && val !== cstate.isOn) {
                     sys.board.circuits.setEndTime(sys.circuits.getInterfaceById(cstate.id), cstate, val);
                 }
-                else if (!val){
+                else if (!val) {
                     if (cstate.manualPriorityActive) delayMgr.cancelManualPriorityDelay(cstate.id);
                     cstate.manualPriorityActive = false; // if the delay was previously cancelled, still need to turn this off
-                } 
-                cstate.isOn = val; 
+                }
+                cstate.isOn = val;
                 return new InterfaceServerResponse(200, 'Success');
             }
             if (this._sequencing) return new InterfaceServerResponse(200, 'Success');
             let res = await NixieEquipment.putDeviceService(this.circuit.connectionId, `/state/device/${this.circuit.deviceBinding}`, { isOn: val, latch: val ? 10000 : undefined });
             if (res.status.code === 200) {
                 // Set this up so we can process our egg timer.
-                if (val && val !== cstate.isOn){
+                if (val && val !== cstate.isOn) {
                     sys.board.circuits.setEndTime(sys.circuits.getInterfaceById(cstate.id), cstate, val);
                     switch (sys.board.valueMaps.circuitFunctions.getName(this.circuit.type)) {
                         case 'colorlogic':
@@ -385,7 +420,7 @@ export class NixieCircuit extends NixieEquipment {
                             break;
                     }
                 }
-                else if (!val){
+                else if (!val) {
                     delayMgr.cancelManualPriorityDelays();
                     cstate.manualPriorityActive = false; // if the delay was previously cancelled, still need to turn this off
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nodejs-poolcontroller",
-    "version": "8.0.5",
+    "version": "8.1.0",
     "description": "nodejs-poolController",
     "main": "app.js",
     "author": {

package/web/services/config/Config.ts

@@ -301,7 +301,8 @@ export class ConfigRoute {
                     // waterFlow: sys.board.valueMaps.chemControllerWaterFlow.toArray(), // remove
                     controllers: sys.chemControllers.get(),
                     maxChemControllers: sys.equipment.maxChemControllers,
-                    doserTypes: sys.board.valueMaps.chemDoserTypes.toArray()
+                    doserTypes: sys.board.valueMaps.chemDoserTypes.toArray(),
+                    chlorinators: sys.chlorinators.get(),
                 };
                 return res.status(200).send(opts);
             }