nodejs-poolcontroller 8.0.5 → 8.1.1

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.
@@ -62,8 +66,6 @@ If you don't know anything about NodeJS, these directions might be helpful.
 1. Run the app with `npm start`.
    * `npm start` will compile the Typescript code.  You should use this every time you download/clone/pull the latest code.
    * `npm run start:cached` will run the app without compiling the code which can be much faster.
-1. Running `npm start` will also create a `config.json` file for your installation.  If you need to modify any properties (e.g. the path to your serialport adapter, enabling socat, etc) then stop the app, edit the `config.json` per the [instructions](module_nodejs-poolController--config.json) below, and start the app again.
-1. Verify your pool equipment is correctly identified by inspecting the `/data/*.json` files.  
 1. Install a [webclient](module_nodejs-poolController--clients) for a browser experience and/or a [binding](module_nodejs-poolController--bindings) to have two way control with Home Automation systems.
 
 For a very thorough walk-through, see [this](https://www.troublefreepool.com/threads/pentair-intellicenter-pool-control-dashboard-instructional-guide.218514/) great thread on Trouble Free Pool.  Thanks @MyAZPool.
@@ -97,16 +99,13 @@ To do anything with this app, you need a client to connect to it.  A client can
 
 ## Web Clients
 1. [nodejs-poolController-dashPanel](https://github.com/rstrouse/nodejs-poolController-dashPanel).  Full compatibility with IntelliCenter, *Touch, REM (RelayEquipmentManager).
-1. Deprecated - ~~[nodejs-poolController-webClient](http://github.com/tagyoureit/nodejs-poolController-webClient).  Built primarily around EasyTouch/IntelliTouch but will work with other systems.~~
 
-* This app has the default to only listen to clients from localhost (127.0.0.1).  If you need to have clients connect from other machines you will need to change the [ip](#module_nodejs-poolController--config.json) in `config.json`.
 
 <a name="module_nodejs-poolController--bindings"></a>
 
 ## Home Automation Bindings (previously Integrations)
-**NOTE: Existing integrations built of 5.3 or earlier WILL NOT WORK.  They need to be upgraded to leverage 6.0.  **
 
-Available for 6.x:
+Available automations:
 * [Vera Home Automation Hub](https://github.com/rstrouse/nodejs-poolController-veraPlugin) - A plugin that integrates with nodejs-poolController.  [Bindings Directions](https://github.com/tagyoureit/nodejs-poolController/wiki/Bindings-Integrations-in-2.0#vera)
 * [Hubitat](https://github.com/bsileo/hubitat_poolcontroller) by @bsileo (prev help from @johnny2678, @donkarnag, @arrmo).  [Bindings Directions](https://github.com/tagyoureit/nodejs-poolController/wiki/Bindings-Integrations-in-2.0#smartthingshubitat)
 * [Homebridge/Siri/EVE](https://github.com/gadget-monk/homebridge-poolcontroller) by @gadget-monk, adopted from @leftyflip
@@ -114,31 +113,25 @@ Available for 6.x:
 * [MQTT](https://github.com/crsherman/nodejs-poolController-mqtt) original release by @crsherman, re-write by @kkzonie, testing by @baudfather and others.  [Bindings Directions](https://github.com/tagyoureit/nodejs-poolController/wiki/Bindings-Integrations-in-2.0#mqtt)
    * [Homeseer](https://github.com/tagyoureit/nodejs-poolController/wiki/Homeseer-Setup-Instructions) - Integration directions by @miamijerry to integrate Homeseer through MQTT
 
-Need to be updated:
+Outdated:
 * [Another SmartThings Controller](https://github.com/dhop90/pentair-pool-controller/blob/master/README.md) by @dhop90
 * [ISY](src/integrations/socketISY.js).  Original credit to @blueman2, enhancements by @mayermd
 * [ISY Polyglot NodeServer](https://github.com/brianmtreese/nodejs-pool-controller-polyglotv2) created by @brianmtreese
 
 # Support
-1. For discussions, recommendations, designs, and clarifications, we recommend you join the [Github discussions](https://github.com/tagyoureit/nodejs-poolController/discussions or [Gitter Chat room](https://gitter.im/pentair_pool/Lobby).
+1. For discussions, recommendations, designs, and clarifications, we recommend you join the [Github discussions](https://github.com/tagyoureit/nodejs-poolController/discussions.
 1. Check the [wiki](https://github.com/tagyoureit/nodejs-poolController/wiki) for tips, tricks and additional documentation.
 1. For bug reports you can open a [github issue](https://github.com/tagyoureit/nodejs-poolController/issues/new),
 
-### Virtual Controller
-v6 adds all new configuration and support for virtual pumps, chlorinators (and soon, Intellichem)
-
-* [Virtual Pump Directions](https://github.com/tagyoureit/nodejs-poolController/wiki/Virtual-Pump-Controller---v6)
-* [Virtual Chlorinator Directions](https://github.com/tagyoureit/nodejs-poolController/wiki/Virtual-Chlorinator-Controller-v6)
-* Virtual Chem Controller
 
 # Changes
 See [Changelog](https://github.com/tagyoureit/nodejs-poolController/blob/master/Changelog)
 
-
 <a name="module_nodejs-poolController--config.json"></a>
 # Config.json changes
 
 ## Controller section - changes to the communications for the app
+Most of these can be configured directly from the UI in dashPanel.
 * `rs485Port` - set to the name of you rs485 controller.  See [wiki](https://github.com/tagyoureit/nodejs-poolController/wiki/RS-485-Adapter-Details) for details and testing.
 * `portSettings` - should not need to be changed for RS485
 * `mockPort` - opens a "fake" port for this app to communicate on.  Can be used with [packet captures/replays](https://github.com/tagyoureit/nodejs-poolController/wiki/How-to-capture-all-packets-for-issue-resolution).
@@ -182,7 +175,7 @@ See [Changelog](https://github.com/tagyoureit/nodejs-poolController/blob/master/
 # License
 
 nodejs-poolController.  An application to control pool equipment.
-Copyright (C) 2016, 2017.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
+Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as

package/anslq25/MessagesMock.ts

@@ -196,7 +196,11 @@ export class MessagesMock {
             HeaterStateMessage.process(outboundMsg);
             break;*/
             case Protocol.Chlorinator:
-                mockChlor.process(msg);
+                // Only process outbound messages (commands from OCP to chlorinator)
+                // Inbound messages (responses from chlorinator to OCP) should not be processed by mock
+                if (msg.dest >= 80) {
+                    mockChlor.process(msg);
+                }
             /*
             case Protocol.Hayward:
                 PumpStateMessage.processHayward(msg);

package/anslq25/boards/MockSystemBoard.ts

@@ -50,7 +50,7 @@ export class MockSystemBoard {
     return await msg.sendAsync();
     // is the controller on a real/physical port or a mock port?
 /*     let port = conn.findPortById(sys.anslq25.portId);
-    if (port.mockPort) {
+    if (port.mock) {
       let inbound = new Inbound();
       inbound.protocol = msg.protocol;
       inbound.header = msg.header;

package/anslq25/chemistry/MockChlorinator.ts

@@ -15,13 +15,16 @@ export class MockChlorinator {
     switch (inbound.action){
       case 0: // Set control OCP->Chlorinator: [16,2,80,0][0][98,16,3]
         this.chlorSetControl(inbound, response);
+        break;
       case 17: // OCP->Chlorinator set output. [16,2,80,17][15][130,16,3]
         this.chlorSetOutput(inbound, response);
-        case 19: // iChlor keep alive(?) [16, 2, 80, 19][117, 16, 3]
-        // need response   
+        break;
+      case 19: // iChlor keep alive(?) [16, 2, 80, 19][117, 16, 3]
+        this.chlorKeepAlive(inbound, response);
         break;
       case 20: // OCP->Chlorinator Get model [16,2,80,20][0][118,16,3]
         this.chlorGetModel(inbound, response);
+        break;
       default:
         logger.info(`No mock chlorinator response for ${inbound.toShortPacket()} `);
     }
@@ -45,13 +48,34 @@ export class MockChlorinator {
     /*     
     {"port":0,"id":42639,"valid":true,"dir":"out","proto":"chlorinator","pkt":[[],[], [16,2,80,17], [100],[215,16,3]],"ts":"2022-07-19T21:46:00.302-0700"}
     {"port":0,"id":42640,"valid":true,"dir":"in","proto":"chlorinator","for":[42639],"pkt":[[],[],[16,2,0,18],[78,128],[242,16,3]],"ts": "2022-07-19T21:46:00.341-0700"} */
-      response.action = 18;
-      response.appendPayloadBytes(0, 2);
-      // ideal high = 4500 = 90 * 50; ideal low = 2800 = 56 * 50
-      response.setPayloadByte(0, this.random(90-56, true)+56, 75)
-      response.setPayloadByte(1, 128); 
-      conn.queueSendMessage(response);
+    // Simulate a response from the chlorinator (inbound message)
+    const payload = [Math.floor(this.random(90-56, true))+56, 128];
+    const header = [16, 2, 0, 18];
+    const term = [242, 16, 3];
+    let responseMsg = new Inbound();
+    responseMsg.protocol = inbound.protocol;
+    responseMsg.portId = inbound.portId;
+    responseMsg.header = header;
+    responseMsg.payload = payload;
+    responseMsg.term = term;
+    // The Inbound class will parse header/payload/action/source/dest automatically
+    setTimeout(() => {
+      let port = conn.findPortById(inbound.portId);
+      if (port) {
+        port.pushIn(Buffer.from(responseMsg.toPacket()));
+      }
+    }, 50);
   }
+  public chlorKeepAlive(inbound: Inbound, response: Outbound){
+    /*  
+    {"port":0,"id":42647,"valid":true,"dir":"out","proto":"chlorinator","pkt":[[],[], [16,2,80,19],[117,16,3]],"ts":"2022-07-19T21:46:00.645-0700"}   
+    {"port":0,"id":42648,"valid":true,"dir":"in","proto":"chlorinator","for":[42647],"pkt":[[],[],[16,2,0,20],[0],[118,16,3]],"ts":"2022-07-19T21:46:00.700-0700"}   */
+    response.action = 20;
+    response.appendPayloadBytes(0, 1);
+    response.setPayloadByte(0, 0);
+    conn.queueSendMessage(response);
+  }
+
   public chlorGetModel(inbound: Inbound, response: Outbound){
     /*  
     {"port":0,"id":42645,"valid":true,"dir":"out","proto":"chlorinator","pkt":[[],[], [16,2,80,20], [0],[118,16,3]],"ts":"2022-07-19T21:46:00.645-0700"}   

package/app.ts

@@ -25,7 +25,7 @@ import { conn } from "./controller/comms/Comms";
 import { sys } from "./controller/Equipment";
 
 import { state } from "./controller/State";
-import { webApp } from "./web/Server";
+import { webApp, REMInterfaceServer } from "./web/Server";
 import * as readline from 'readline';
 import { sl } from './controller/comms/ScreenLogic'
 
@@ -52,6 +52,9 @@ export async function startPacketCapture(bResetLogs: boolean) {
         if (bResetLogs){
             sys.resetSystem();
         }
+        
+        // Start packet capture on the REM server
+        await REMInterfaceServer.startPacketCaptureOnRemServer();
     }
     catch (err) {
         console.error(`Error starting replay: ${ err.message }`);
@@ -61,7 +64,12 @@ export async function stopPacketCaptureAsync() {
     let log = config.getSection('log');
     log.app.captureForReplay = false;
     config.setSection('log', log);
-    return logger.stopCaptureForReplayAsync();
+    
+    // Stop packet capture on the REM server and collect its logs
+    let remLogs = await REMInterfaceServer.stopPacketCaptureOnRemServer();
+    
+    // Pass REM logs to the logger for inclusion in the backup
+    return logger.stopCaptureForReplayAsync(remLogs);
 }
 export async function stopAsync(): Promise<void> {
     try {

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

@@ -1096,7 +1096,7 @@ export class ScheduleStateCollection extends EqStateCollection<ScheduleState> {
             }
             st.calcSchedule(state.time, sys.schedules.getItemById(ssched.id));
             if (typeof st.startTime === 'undefined') continue;
-            if (ssched.isOn || st.shouldBeOn || st.startTime.getTime() > new Date().getTime()) activeScheds.push(ssched);
+            if (ssched.isOn || st.shouldBeOn || (st.startTime && st.startTime.getTime() > new Date().getTime())) activeScheds.push(ssched);
         }
         return activeScheds;
     }
@@ -1256,7 +1256,7 @@ export class ScheduleTime extends ChildEqState {
             let dtCalc = typeof this.calculatedDate !== 'undefined' && typeof this.calculatedDate.getTime === 'function' ? new Date(this.calculatedDate.getTime()).setHours(0, 0, 0, 0) : new Date(1970, 0, 1, 0, 0).getTime();
             let recalc = !this.calculated;
             if (!recalc && sod.getTime() !== dtCalc) recalc = true;
-            if (!recalc && (this.endTime.getTime() < new Date().getTime() && this.startTime.getTime() < dtCalc)) {
+            if (!recalc && (this.endTime && this.endTime.getTime() < new Date().getTime() && this.startTime && this.startTime.getTime() < dtCalc)) {
                 recalc = true;
                 logger.info(`Recalculating expired schedule ${sched.id}`);
             }
@@ -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/boards/SystemBoard.ts

@@ -3656,8 +3656,12 @@ export class ScheduleCommands extends BoardCommands {
         ssched.display = sched.display = display;
         ssched.startTimeOffset = sched.startTimeOffset = startTimeOffset;
         ssched.endTimeOffset = sched.endTimeOffset = endTimeOffset;
-        if (typeof sched.startDate === 'undefined')
+        // Nixie controller managing schedules (master = 1), physical OCP (master = 0)
+        if (sys.controllerType === ControllerType.Nixie) {
             sched.master = 1;
+        } else {
+            sched.master = 0;
+        }
         await ncp.schedules.setScheduleAsync(sched, data);
         // update end time in case sched is changed while circuit is on
         let cstate = state.circuits.getInterfaceById(sched.circuit);

package/controller/comms/Comms.ts

@@ -198,7 +198,7 @@ export class Connection {
                     let c = cfg[section];
                     if (typeof c.type === 'undefined') {
                         let type = 'local';
-                        if (c.mockPort) type = 'mock';
+                        if (c.mock) type = 'mock';
                         else if (c.netConnect) type = 'network';
                         config.setSection(`controller.${section}`, c);
                         console.log(section);
@@ -260,7 +260,7 @@ export class Connection {
         if (anslq25port >= 0) {
             let ports = this.rs485Ports;
             for (let i = 0; i < ports.length; i++) {
-                // if (ports[i].mockPort) continue;
+                // if (ports[i].mock) continue;
                 if (ports[i].portId === currPort.portId) continue;
                 if (ports[i].portId === anslq25port) continue; // don't resend
                 if (!ports[i].isOpen) continue;
@@ -380,7 +380,8 @@ export class Connection {
             let msgs = [];
             // conn.queueInboundToBroadcast(msg);
             conn.queueOutboundToBroadcast(msg);
-            /* if (msgs.length > 0) {
+            /* if (msgs.le
+            ngth > 0) {
                 msgs.push(msg);
                 let promises: Promise<boolean>[] = [];
                 for (let i = 0; i < msgs.length; i++) {
@@ -511,7 +512,7 @@ export class RS485Port {
     public reconnects: number = 0;
     public emitter: EventEmitter;
     public get portId() { return typeof this._cfg !== 'undefined' && typeof this._cfg.portId !== 'undefined' ? this._cfg.portId : 0; }
-    public get type() { return typeof this._cfg.type !== 'undefined' ? this._cfg.type : this._cfg.netConnect ? 'netConnect' : this._cfg.mockPort || this._cfg.mock ? 'mock' : 'local' };
+    public get type() { return typeof this._cfg.type !== 'undefined' ? this._cfg.type : this._cfg.netConnect ? 'netConnect' : this._cfg.mock ? 'mock' : 'local' };
     public isOpen: boolean = false;
     public closing: boolean = false;
     private _cfg: any;
@@ -682,7 +683,7 @@ export class RS485Port {
                 // be open if a hardware interface is used and this method returns.
                 sp.open((err) => {
                     if (err) {
-                        this.resetConnTimer();
+                        if (!this.mock) this.resetConnTimer();
                         this.isOpen = false;
                         logger.error(`Error opening port ${this.portId}: ${err.message}. ${this._cfg.inactivityRetry > 0 && !this.mock ? `Retry in ${this._cfg.inactivityRetry} seconds` : `Never retrying; (fwiw, inactivityRetry set to ${this._cfg.inactivityRetry})`}`);
                         resolve(false);
@@ -712,7 +713,7 @@ export class RS485Port {
                         if (!this.mock && !this.isPaused) this.resetConnTimer();
                         this.pushIn(data);
                     });
-                    this.resetConnTimer();
+                    if (!this.mock) this.resetConnTimer();
                     this.emitPortStats();
                 });
                 sp.on('close', (err) => {
@@ -730,7 +731,7 @@ export class RS485Port {
                     if (typeof this.writeTimer !== 'undefined') { clearTimeout(this.writeTimer); this.writeTimer = null; }
                     this.isOpen = false;
                     if (sp.isOpen) sp.close((err) => { }); // call this with the error callback so that it doesn't emit to the error again.
-                    this.resetConnTimer();
+                    if (!this.mock) this.resetConnTimer();
                     logger.error(`Serial Port ${this.portId}: An error occurred : ${this._cfg.rs485Port}: ${JSON.stringify(err)}`);
                     this.emitPortStats();
 
@@ -823,7 +824,7 @@ export class RS485Port {
     protected resetConnTimer(...args) {
         //console.log(`resetting connection timer`);
         if (this.connTimer !== null) clearTimeout(this.connTimer);
-        if (!this._cfg.mockPort && this._cfg.inactivityRetry > 0 && !this.closing) this.connTimer = setTimeout(async () => {
+        if (!this._cfg.mock && this._cfg.inactivityRetry > 0 && !this.closing) this.connTimer = setTimeout(async () => {
             try {
                 if (this._cfg.netConnect)
                     logger.warn(`Inactivity timeout for ${this.portId} serial port ${this._cfg.netHost}:${this._cfg.netPort}/${this._cfg.rs485Port} after ${this._cfg.inactivityRetry} seconds`);

package/controller/comms/messages/Messages.ts

@@ -873,7 +873,7 @@ class OutboundCommon extends Message {
             case Protocol.Heater:
             case Protocol.Hayward:
                 this.chkHi = Math.floor(sum / 256);
-                this.chkLo = (sum - (super.chkHi * 256));
+                this.chkLo = (sum - (this.chkHi * 256));
                 break;
             case Protocol.AquaLink:
             case Protocol.Chlorinator: