nodejs-poolcontroller 7.5.1 → 7.7.0

package/controller/comms/messages/Messages.ts

@@ -42,6 +42,8 @@ import { TouchScheduleCommands } from "controller/boards/EasyTouchBoard";
 import { IntelliValveStateMessage } from "./status/IntelliValveStateMessage";
 import { IntelliChemStateMessage } from "./status/IntelliChemStateMessage";
 import { OutboundMessageError } from "../../Errors";
+import { prototype } from "events";
+import extend = require("extend");
 export enum Direction {
     In = 'in',
     Out = 'out'
@@ -54,6 +56,8 @@ export enum Protocol {
     IntelliChem = 'intellichem',
     IntelliValve = 'intellivalve',
     Heater = 'heater',
+    AquaLink = 'aqualink',
+    Hayward = 'hayward',
     Unidentified = 'unidentified'
 }
 export class Message {
@@ -67,7 +71,7 @@ export class Message {
     // Fields
     private static _messageId: number = 0;
     public static get nextMessageId(): number { return this._messageId < 80000 ? ++this._messageId : this._messageId = 0; }
-
+    public portId = 0; // This will be the target or source port for the message.  If this is from or to an Aux RS485 port the value will be > 0.
     public timestamp: Date = new Date();
     public direction: Direction = Direction.In;
     public protocol: Protocol = Protocol.Unknown;
@@ -85,32 +89,56 @@ export class Message {
     public get isComplete(): boolean { return this._complete; }
     public get sub(): number { return this.header.length > 1 ? this.header[1] : -1; }
     public get dest(): number {
-        if (this.protocol === Protocol.Chlorinator) {
-            return this.header[2] >= 80 ? this.header[2] - 79 : 0;
+        if (this.header.length > 2) {
+            if (this.protocol === Protocol.Chlorinator || this.protocol === Protocol.AquaLink) {
+                return this.header.length > 2 ? (this.header[2] >= 80 ? this.header[2] - 79 : 0) : -1;
+            }
+            else if (this.protocol === Protocol.Hayward) {
+                //            src   act   dest             
+                //0x10, 0x02, 0x00, 0x0C, 0x00, 0x00, 0x2D, 0x02, 0x36, 0x00, 0x83, 0x10, 0x03 -- Response from pump
+                return this.header.length > 4 ? this.header[4] : -1;
+            }
+            else return this.header.length > 2 ? this.header[2] : -1;
         }
-        if (this.header.length > 2) return this.header[2];
         else return -1;
     }
     public get source(): number {
         if (this.protocol === Protocol.Chlorinator) {
-            return this.header[2] >= 80 ? 0 : 1;
+            return this.header.length > 2 ? (this.header[2] >= 80 ? 0 : 1) : -1;
             // have to assume incoming packets with header[2] >= 80 (sent to a chlorinator)
             // are from controller (0);
             // likewise, if the destination is 0 (controller) we
             // have to assume it was sent from the 1st chlorinator (1)
             // until we learn otherwise.  
         }
+        else if (this.protocol === Protocol.AquaLink) {
+            // Once we decode the devices we will be able to tell where it came from based upon the commands.
+            return 0;
+        }
+        else if (this.protocol === Protocol.Hayward) {
+            //            src   act   dest             
+            //0x10, 0x02, 0x00, 0x0C, 0x00, 0x00, 0x2D, 0x02, 0x36, 0x00, 0x83, 0x10, 0x03 -- Response from pump
+            //0x10, 0x02, 0x0C, 0x01, 0x02, 0x2D, 0x00, 0x4E, 0x10, 0x03 -- Command to AUX2 Pump
+            return this.header.length > 2 ? this.header[2] : -1;
+        }
         if (this.header.length > 3) return this.header[3];
         else return -1;
     }
     public get action(): number {
-        if (this.protocol === Protocol.Chlorinator) return this.header[3];
-        if (this.header.length > 5) return this.header[4];
+        // The action byte is actually the 4th byte in the header the destination address is the 5th byte.
+        if (this.protocol === Protocol.Chlorinator || this.protocol === Protocol.AquaLink) return this.header.length > 3 ? this.header[3] : -1;
+        else if (this.protocol === Protocol.Hayward) {
+            //            src   act   dest             
+            //0x10, 0x02, 0x00, 0x0C, 0x00, 0x00, 0x2D, 0x02, 0x36, 0x00, 0x83, 0x10, 0x03 -- Response from pump
+            //0x10, 0x02, 0x0C, 0x01, 0x02, 0x2D, 0x00, 0x4E, 0x10, 0x03 -- Command to AUX2 Pump
+            this.header.length > 3 ? this.header[3] : -1;
+        }
+        if (this.header.length > 4) return this.header[4];
         else return -1;
     }
-    public get datalen(): number { return this.protocol === Protocol.Chlorinator ? this.payload.length : this.header.length > 5 ? this.header[5] : -1; }
-    public get chkHi(): number { return this.protocol === Protocol.Chlorinator ? 0 : this.term.length > 0 ? this.term[0] : -1; }
-    public get chkLo(): number { return this.protocol === Protocol.Chlorinator ? this.term[0] : this.term[1]; }
+    public get datalen(): number { return this.protocol === Protocol.Chlorinator || this.protocol === Protocol.AquaLink || this.protocol === Protocol.Hayward ? this.payload.length : this.header.length > 5 ? this.header[5] : -1; }
+    public get chkHi(): number { return this.protocol === Protocol.Chlorinator || this.protocol === Protocol.AquaLink ? 0 : this.term.length > 0 ? this.term[0] : -1; }
+    public get chkLo(): number { return this.protocol === Protocol.Chlorinator || this.protocol === Protocol.AquaLink ? this.term[0] : this.term[1]; }
     public get checksum(): number {
         var sum = 0;
         for (let i = 0; i < this.header.length; i++) sum += this.header[i];
@@ -136,7 +164,7 @@ export class Message {
         return pkt;
     }
     public toLog(): string {
-        return `{"id":${this.id},"valid":${this.isValid},"dir":"${this.direction}","proto":"${this.protocol}","pkt":[${JSON.stringify(this.padding)},${JSON.stringify(this.preamble)},${JSON.stringify(this.header)},${JSON.stringify(this.payload)},${JSON.stringify(this.term)}],"ts":"${Timestamp.toISOLocal(this.timestamp)}"}`;
+        return `{"port":${this.portId},"id":${ this.id },"valid":${ this.isValid },"dir":"${this.direction}","proto":"${this.protocol}","pkt":[${JSON.stringify(this.padding)},${JSON.stringify(this.preamble)}, ${JSON.stringify(this.header)}, ${JSON.stringify(this.payload)},${JSON.stringify(this.term)}],"ts":"${Timestamp.toISOLocal(this.timestamp)}"}`;
     }
 }
 export class Inbound extends Message {
@@ -158,26 +186,41 @@ export class Inbound extends Message {
     public responseFor: number[] = [];
     public isProcessed: boolean = false;
     public collisions: number = 0;
+    public rewinds: number = 0;
     // Private methods
     private isValidChecksum(): boolean {
-        if (this.protocol === Protocol.Chlorinator) return this.checksum % 256 === this.chkLo;
+        if (this.protocol === Protocol.Chlorinator || this.protocol === Protocol.AquaLink) return this.checksum % 256 === this.chkLo;
         return (this.chkHi * 256) + this.chkLo === this.checksum;
     }
     public toLog() {
         if (this.responseFor.length > 0)
-            return `{"id":${this.id},"valid":${this.isValid},"dir":"${this.direction}","proto":"${this.protocol}","for":${JSON.stringify(this.responseFor)},"pkt":[${JSON.stringify(this.padding)},${JSON.stringify(this.preamble)},${JSON.stringify(this.header)},${JSON.stringify(this.payload)},${JSON.stringify(this.term)}],"ts": "${Timestamp.toISOLocal(this.timestamp)}"}`;
-        return `{"id":${this.id},"valid":${this.isValid},"dir":"${this.direction}","proto":"${this.protocol}","pkt":[${JSON.stringify(this.padding)},${JSON.stringify(this.preamble)},${JSON.stringify(this.header)},${JSON.stringify(this.payload)},${JSON.stringify(this.term)}],"ts": "${Timestamp.toISOLocal(this.timestamp)}"}`;
+            return `{"port":${this.portId || 0},"id":${this.id},"valid":${this.isValid},"dir":"${ this.direction }","proto":"${ this.protocol }","for":${JSON.stringify(this.responseFor)},"pkt":[${JSON.stringify(this.padding)},${JSON.stringify(this.preamble)},${JSON.stringify(this.header)},${JSON.stringify(this.payload)},${JSON.stringify(this.term)}],"ts": "${ Timestamp.toISOLocal(this.timestamp) }"}`;
+        return `{"port":${this.portId || 0},"id":${this.id},"valid":${this.isValid},"dir":"${this.direction}","proto":"${this.protocol}","pkt":[${JSON.stringify(this.padding)},${JSON.stringify(this.preamble)},${JSON.stringify(this.header)},${JSON.stringify(this.payload)},${JSON.stringify(this.term)}],"ts": "${Timestamp.toISOLocal(this.timestamp)}"}`;
     }
     private testChlorHeader(bytes: number[], ndx: number): boolean {
         // if packets have 16,2 (eg status=16,2,29) in them and they come as partial packets, they would have
         // prev been detected as chlor packets;
         // valid chlor packets should have 16,2,0 or 16,2,[80-96];
         // this should reduce the number of false chlor packets
-        return (ndx + 2 < bytes.length && bytes[ndx] === 16 && bytes[ndx + 1] === 2 && (bytes[ndx + 2] === 0 || (bytes[ndx + 2] >= 80 && bytes[ndx + 2] <= 96)))
+        return (ndx + 3 < bytes.length && bytes[ndx] === 16 && bytes[ndx + 1] === 2 && (bytes[ndx + 2] === 0 || (bytes[ndx + 2] >= 80 && bytes[ndx + 2] <= 96)))
+    }
+    private testAquaLinkHeader(bytes: number[], ndx: number): boolean {
+        return (sys.controllerType === 'aqualink' && ndx + 3 < bytes.length && bytes[ndx] === 16 && bytes[ndx + 1] === 2);
     }
+    private testHaywardHeader(bytes: number[], ndx: number): boolean {
+        //0x10, 0x02, 0x0C, 0x01, 0x00, 0x2D, 0x00, 0x4C, 0x10, 0x03 -- Command to pump
+        //0x10, 0x02, 0x0C, 0x01, 0x00, 0x2D, 0x00, 0x4C, 0x10, 0x03 -- Command to Filter Pump
+        //0x10, 0x02, 0x0C, 0x01, 0x02, 0x2D, 0x00, 0x4E, 0x10, 0x03 -- Command to AUX2 Pump
+        //            src   act   dest             
+        //0x10, 0x02, 0x00, 0x0C, 0x00, 0x00, 0x2D, 0x02, 0x36, 0x00, 0x83, 0x10, 0x03 -- Response from pump
+        return (sys.controllerType === 'nixie' && ndx + 4 < bytes.length && bytes[ndx] === 16 && bytes[ndx + 1] === 2 && (bytes[ndx + 2] === 12 && bytes[ndx + 3] === 12));
+    }
+
     private testBroadcastHeader(bytes: number[], ndx: number): boolean { return ndx < bytes.length - 3 && bytes[ndx] === 255 && bytes[ndx + 1] === 0 && bytes[ndx + 2] === 255 && bytes[ndx + 3] === 165; }
     private testUnidentifiedHeader(bytes: number[], ndx: number): boolean { return ndx < bytes.length - 3 && bytes[ndx] === 255 && bytes[ndx + 1] === 0 && bytes[ndx + 2] === 255 && bytes[ndx + 3] !== 165; }
-    private testChlorTerm(bytes: number[], ndx: number): boolean { return ndx < bytes.length - 2 && bytes[ndx + 1] === 16 && bytes[ndx + 2] === 3; }
+    private testChlorTerm(bytes: number[], ndx: number): boolean { return ndx + 2 < bytes.length && bytes[ndx + 1] === 16 && bytes[ndx + 2] === 3; }
+    private testAquaLinkTerm(bytes: number[], ndx: number): boolean { return ndx + 2 < bytes.length && bytes[ndx + 1] === 16 && bytes[ndx + 2] === 3; }
+    private testHaywardTerm(bytes: number[], ndx: number): boolean { return ndx + 3 < bytes.length && bytes[ndx + 2] === 16 && bytes[ndx + 3] === 3; }
     private pushBytes(target: number[], bytes: number[], ndx: number, length: number): number {
         let end = ndx + length;
         while (ndx < bytes.length && ndx < end)
@@ -205,6 +248,7 @@ export class Inbound extends Message {
         this.isValid = true;
 
         this.collisions++;
+        this.rewinds++;
         logger.info(`rewinding message collision ${this.collisions} ${ndx} ${bytes.length} ${JSON.stringify(buff)}`);
         this.readPacket(buff);
         return ndx;
@@ -233,6 +277,14 @@ export class Inbound extends Message {
                 this.protocol = Protocol.Chlorinator;
                 break;
             }
+            if (this.testAquaLinkHeader(bytes, ndx)) {
+                this.protocol = Protocol.AquaLink;
+                break;
+            }
+            if (this.testHaywardHeader(bytes, ndx)) {
+                this.protocol = Protocol.Hayward;
+                break;
+            }
             if (this.testBroadcastHeader(bytes, ndx)) {
                 this.protocol = Protocol.Broadcast;
                 break;
@@ -277,6 +329,7 @@ export class Inbound extends Message {
                     this.preamble = [];
                     this.header = [];
                     this.collisions++;
+                    this.rewinds++;
                     return ndxHeader + 1;
                 }
                 break;
@@ -298,6 +351,28 @@ export class Inbound extends Message {
                     return ndxHeader;
                 }
                 break;
+            case Protocol.Hayward:
+                ndx = this.pushBytes(this.header, bytes, ndx, 4);
+                if (this.header.length < 4) {
+                    // We actually don't have a complete header yet so just return.
+                    // we will pick it up next go around.
+                    logger.debug(`We have an incoming AquaLink message but the serial port hasn't given a complete header. [${this.padding}][${this.preamble}][${this.header}]`);
+                    this.preamble = [];
+                    this.header = [];
+                    return ndxHeader;
+                }
+                break;
+            case Protocol.AquaLink:
+                ndx = this.pushBytes(this.header, bytes, ndx, 5);
+                if (this.header.length < 5) {
+                    // We actually don't have a complete header yet so just return.
+                    // we will pick it up next go around.
+                    logger.debug(`We have an incoming AquaLink message but the serial port hasn't given a complete header. [${this.padding}][${this.preamble}][${this.header}]`);
+                    this.preamble = [];
+                    this.header = [];
+                    return ndxHeader;
+                }
+                break;
             default:
                 // We didn't get a message signature. don't do anything with it.
                 ndx = ndxStart;
@@ -341,6 +416,31 @@ export class Inbound extends Message {
                     }
                 }
                 break;
+            case Protocol.AquaLink:
+                // We need to deal with AquaLink packets where the terminator is actually split meaning only the first byte or
+                // two of the total payload is provided for the term.  We need at least 3 bytes to make this determination.
+                while (ndx + 3 <= bytes.length && !this.testAquaLinkTerm(bytes, ndx)) {
+                    this.payload.push(bytes[ndx++]);
+                    if (this.payload.length > 25) {
+                        this.isValid = false; // We have a runaway packet.  Some collision occurred so lets preserve future packets.
+                        logger.debug(`AquaLink message marked as invalid after not finding 16,3 in payload after ${this.payload.length} bytes`);
+                        break;
+                    }
+                }
+                break;
+            case Protocol.Hayward:
+                // We need to deal with AquaLink packets where the terminator is actually split meaning only the first byte or
+                // two of the total payload is provided for the term.  We need at least 3 bytes to make this determination.
+                while (ndx + 4 <= bytes.length && !this.testHaywardTerm(bytes, ndx)) {
+                    this.payload.push(bytes[ndx++]);
+                    if (this.payload.length > 25) {
+                        this.isValid = false; // We have a runaway packet.  Some collision occurred so lets preserve future packets.
+                        logger.debug(`Hayward message marked as invalid after not finding 16,3 in payload after ${this.payload.length} bytes`);
+                        break;
+                    }
+                }
+                break;
+
         }
         return ndx;
     }
@@ -369,6 +469,21 @@ export class Inbound extends Message {
                     this.isValid = this.isValidChecksum();
                 }
                 break;
+            case Protocol.AquaLink:
+                if (ndx + 3 <= bytes.length && this.testAquaLinkTerm(bytes, ndx)) {
+                    this._complete = true;
+                    ndx = this.pushBytes(this.term, bytes, ndx, 3);
+                    this.isValid = this.isValidChecksum();
+                }
+                break;
+            case Protocol.Hayward:
+                if (ndx + 4 <= bytes.length && this.testHaywardTerm(bytes, ndx)) {
+                    this._complete = true;
+                    ndx = this.pushBytes(this.term, bytes, ndx, 4);
+                    this.isValid = this.isValidChecksum();
+                }
+                break;
+
         }
         return ndx;
     }
@@ -487,14 +602,12 @@ export class Inbound extends Message {
                         CircuitMessage.processTouch(this);
                         break;
                     case 40:
+                    case 168:
                         OptionsMessage.process(this);
                         break;
                     case 41:
                         CircuitGroupMessage.process(this);
                         break;
-                    case 168:
-                        if (sys.controllerType !== ControllerType.Unknown) HeaterMessage.process(this);
-                        break;
                     case 197:
                         EquipmentStateMessage.process(this);    // Date/Time request
                         break;
@@ -548,6 +661,9 @@ export class Inbound extends Message {
             case Protocol.Chlorinator:
                 ChlorinatorStateMessage.process(this);
                 break;
+            case Protocol.Hayward:
+                PumpStateMessage.processHayward(this);
+                break;
             default:
                 logger.debug(`Unprocessed Message ${this.toPacket()}`)
                 break;
@@ -555,15 +671,24 @@ export class Inbound extends Message {
     }
 }
 class OutboundCommon extends Message {
-    public set sub(val: number) { if (this.protocol !== Protocol.Chlorinator) this.header[1] = val; }
+    public set sub(val: number) { if (this.protocol !== Protocol.Chlorinator && this.protocol !== Protocol.AquaLink) this.header[1] = val; }
     public get sub() { return super.sub; }
-    public set dest(val: number) { this.protocol !== Protocol.Chlorinator ? this.header[2] = val : this.header[2] = val + 79; }
+    public set dest(val: number) {
+        if (this.protocol === Protocol.Chlorinator) this.header[2] = val + 79;
+        else if (this.protocol === Protocol.Hayward) this.header[4] = val;
+        else this.header[2] = val;
+    }
     public get dest() { return super.dest; }
-    public set source(val: number) { if (this.protocol !== Protocol.Chlorinator) this.header[3] = val; }
+    public set source(val: number) {
+        if (this.protocol === Protocol.Hayward) this.header[2] = val;
+        else if (this.protocol !== Protocol.Chlorinator) this.header[3] = val;
+    }
     public get source() { return super.source; }
-    public set action(val: number) { (this.protocol !== Protocol.Chlorinator) ? this.header[4] = val : this.header[3] = val; }
+    public set action(val: number) {
+        (this.protocol !== Protocol.Chlorinator && this.protocol !== Protocol.Hayward) ? this.header[4] = val : this.header[3] = val;
+    }
     public get action() { return super.action; }
-    public set datalen(val: number) { if (this.protocol !== Protocol.Chlorinator) this.header[5] = val; }
+    public set datalen(val: number) { if (this.protocol !== Protocol.Chlorinator && this.protocol !== Protocol.Hayward) this.header[5] = val; }
     public get datalen() { return super.datalen; }
     public set chkHi(val: number) { if (this.protocol !== Protocol.Chlorinator) this.term[0] = val; }
     public get chkHi() { return super.chkHi; }
@@ -583,9 +708,14 @@ class OutboundCommon extends Message {
                 this.chkHi = Math.floor(sum / 256);
                 this.chkLo = (sum - (super.chkHi * 256));
                 break;
+            case Protocol.AquaLink:
             case Protocol.Chlorinator:
                 this.term[0] = sum;
                 break;
+            case Protocol.Hayward:
+                this.chkHi = Math.floor(sum / 256);
+                this.chkLo = (sum - (super.chkHi * 256));
+                break;
         }
     }
 }
@@ -600,7 +730,7 @@ export class Outbound extends OutboundCommon {
         this.header.length = 0;
         this.term.length = 0;
         this.payload.length = 0;
-        if (proto === Protocol.Chlorinator) {
+        if (proto === Protocol.Chlorinator || proto === Protocol.AquaLink) {
             this.header.push.apply(this.header, [16, 2, 0, 0]);
             this.term.push.apply(this.term, [0, 16, 3]);
         }
@@ -614,6 +744,10 @@ export class Outbound extends OutboundCommon {
             this.header.push.apply(this.header, [165, 0, 15, Message.pluginAddress, 0, 0]);
             this.term.push.apply(this.term, [0, 0]);
         }
+        else if (proto === Protocol.Hayward) {
+            this.header.push.apply(this.header, [16, 2, 0, 0, 0]);
+            this.term.push.apply(this.term, [0, 0, 16, 3]);
+        }
         this.scope = scope;
         this.source = source;
         this.dest = dest;
@@ -627,16 +761,27 @@ export class Outbound extends OutboundCommon {
     }
     // Factory
     public static create(obj?: any) {
-        let out = new Outbound(obj.protocol || Protocol.Broadcast,
-            obj.source || sys.board.commandSourceAddress || Message.pluginAddress, obj.dest || sys.board.commandDestAddress || 16, obj.action || 0, obj.payload || [], obj.retries || 0, obj.response || false, obj.scope || undefined);
+        let o = extend({
+            protocol: Protocol.Broadcast,
+            source: sys.board.commandSourceAddress || Message.pluginAddress,
+            dest: sys.board.commandDestAddress || 16,
+            action: 0,
+            payload: [],
+            retries: 0,
+            response: false,
+        }, obj, true);
+        let out = new Outbound(o.protocol, o.source, o.dest, o.action, o.payload, o.retries, o.response, o.scope);
+        //let out = new Outbound(obj.protocol || Protocol.Broadcast,
+        //    obj.source || sys.board.commandSourceAddress || Message.pluginAddress, obj.dest || sys.board.commandDestAddress || 16, obj.action || 0, obj.payload || [], obj.retries || 0, obj.response || false, obj.scope || undefined);
+        out.portId = obj.portId || 0;
         out.onComplete = obj.onComplete;
         out.onAbort = obj.onAbort;
         out.timeout = obj.timeout;
-        for (let i = 0; i < out.header.length; i++){
+        for (let i = 0; i < out.header.length; i++) {
             if (out.header[i] >= 0 && out.header[i] <= 255 && out.header[i] !== null && typeof out.header[i] !== 'undefined') continue;
             throw new OutboundMessageError(out, `Invalid header detected: ${out.toShortPacket()}`);
         }
-        for (let i = 0; i < out.payload.length; i++){
+        for (let i = 0; i < out.payload.length; i++) {
             if (out.payload[i] >= 0 && out.payload[i] <= 255 && out.payload[i] !== null && typeof out.payload[i] !== 'undefined') continue;
             throw new OutboundMessageError(out, `Invalid payload detected: ${out.toShortPacket()}`);
         }
@@ -661,7 +806,6 @@ export class Outbound extends OutboundCommon {
         return false;
     }
     public get remainingTries(): number { return this.retries - this.tries + 1; } // Always allow 1 try.
-
     public setPayloadByte(ndx: number, value: number, def?: number) {
         if (typeof value === 'undefined' || isNaN(value)) value = def;
         if (ndx < this.payload.length) this.payload[ndx] = value;

package/controller/comms/messages/config/ChlorinatorMessage.ts

@@ -28,17 +28,18 @@ export class ChlorinatorMessage {
                 for (let i = 0; i < 4 && i + 30 < msg.payload.length; i++) {
                     let isActive = msg.extractPayloadByte(i + 22) === 1;
                     chlor = sys.chlorinators.getItemById(chlorId);
-                    if (chlor.master === 1) continue; // RSG: probably never need this.  See Touch chlor below.
+                    //if (chlor.master !== 0) continue; // RSG: probably never need this.  See Touch chlor below.
                     if (isActive) {
                         chlor = sys.chlorinators.getItemById(chlorId, true);
                         let schlor = state.chlorinators.getItemById(chlor.id, true);
                         chlor.isActive = schlor.isActive = true;
+                        chlor.master = 0;
                         chlor.body = msg.extractPayloadByte(i + 2);
                         chlor.type = msg.extractPayloadByte(i + 6);
                         if (!chlor.disabled && !chlor.isDosing) {
                             // RKS: We don't want to change the setpoints if our chem controller disabled
                             // the chlorinator.  These should be 0.
-                            if (msg.extractPayloadByte(i + 10) === 0) logger.info(`Changing pool setpoint to 0 ${msg.extractPayloadByte(i + 10)}`);
+                            if (msg.extractPayloadByte(i + 10) === 0 && chlor.poolSetpoint > 0) logger.info(`Changing pool setpoint to 0 ${msg.extractPayloadByte(i + 10)}`);
 
                             chlor.poolSetpoint = msg.extractPayloadByte(i + 10);
                             chlor.spaSetpoint = msg.extractPayloadByte(i + 14);
@@ -51,6 +52,7 @@ export class ChlorinatorMessage {
                         schlor.poolSetpoint = chlor.poolSetpoint;
                         schlor.spaSetpoint = chlor.spaSetpoint;
                         schlor.type = chlor.type;
+                        schlor.model = chlor.model;
                         schlor.isActive = chlor.isActive;
                         schlor.superChlorHours = chlor.superChlorHours;
                         state.emitEquipmentChanges();
@@ -69,9 +71,10 @@ export class ChlorinatorMessage {
         }
     }
     public static processTouch(msg: Inbound) {
+        //[255, 0, 255][165, 1, 15, 16, 25, 22][1, 90, 128, 58, 128, 0, 73, 110, 116, 101, 108, 108, 105, 99, 104, 108, 111, 114, 45, 45, 54, 48][8, 50]
         // This is for the 25 message that is broadcast from the OCP.
         let chlor = sys.chlorinators.getItemById(1);
-        if (chlor.master === 1) return;  // Some Aquarite chlors need more frequent control (via Nixie) but will be disabled via Touch.  https://github.com/tagyoureit/nodejs-poolController/issues/349
+        if (chlor.master !== 0 && typeof chlor.master !== 'undefined') return;  // Some Aquarite chlors need more frequent control (via Nixie) but will be disabled via Touch.  https://github.com/tagyoureit/nodejs-poolController/issues/349
         let isActive = (msg.extractPayloadByte(0) & 0x01) === 1;
         if (isActive) {
             let chlor = sys.chlorinators.getItemById(1, true);

package/controller/comms/messages/config/CircuitMessage.ts

@@ -243,6 +243,7 @@ export class CircuitMessage {
         if (_isActive) {
             const type = functionId & 63;
             let circuit: ICircuit = sys.circuits.getInterfaceById(id, _isActive);
+            circuit.master = 0;
             circuit.name = sys.board.circuits.getNameById(nameId);
             circuit.nameId = nameId;
             circuit.type = type;

package/controller/comms/messages/config/ExternalMessage.ts

@@ -217,7 +217,7 @@ export class ExternalMessage {
                     if (group.isActive) {
                         for (let i = 0; i < 16; i++) {
                             let circuitId = msg.extractPayloadByte(i + 6);
-                            let circuit = group.circuits.getItemById(i + 1, circuitId !== 255);
+                            let circuit = group.circuits.getItemById(i + 1, circuitId < 255);
                             if (circuitId === 255) group.circuits.removeItemById(i + 1);
                             circuit.circuit = circuitId + 1;
 
@@ -429,13 +429,13 @@ export class ExternalMessage {
                         // [11] = No sequencing underway.
                         switch (byte) {
                             case 0: // Sync
-                                lg.action = 1;
+                                lg.action = sys.board.valueMaps.circuitActions.getValue('colorsync');
                                 break;
                             case 1: // Color swim
-                                lg.action = 3;
+                                lg.action = sys.board.valueMaps.circuitActions.getValue('colorswim');
                                 break;
                             case 2: // Color set
-                                lg.action = 2;
+                                lg.action = sys.board.valueMaps.circuitActions.getValue('colorset');
                                 break;
                             default:
                                 lg.action = 0;
@@ -500,11 +500,14 @@ export class ExternalMessage {
         let startTime = msg.extractPayloadInt(3);
         let endTime = msg.extractPayloadInt(5);
         let circuit = msg.extractPayloadByte(7) + 1;
-        let cfg = sys.schedules.getItemById(schedId, circuit !== 256 && startTime !== 0 && endTime !== 0);
-        cfg.isActive = (circuit !== 256 && startTime !== 0 && endTime !== 0);
+        let isActive = (msg.extractPayloadByte(8) & 128) === 128; // Inactive schedules do not have bit 8 set.
+        let cfg = sys.schedules.getItemById(schedId, isActive);
+        let s = state.schedules.getItemById(schedId, cfg.isActive);
+        //cfg.isActive = (circuit !== 256);
         cfg.startTime = startTime;
         cfg.endTime = endTime;
         cfg.circuit = circuit;
+        cfg.isActive = isActive;
         let byte = msg.extractPayloadByte(8);
         cfg.scheduleType = (byte & 1 & 0xFF) === 1 ? 0 : 128;
         if ((byte & 4 & 0xFF) === 4) cfg.startTimeType = 1;
@@ -525,7 +528,6 @@ export class ExternalMessage {
         cfg.heatSource = hs;
         cfg.heatSetpoint = msg.extractPayloadByte(14);
         cfg.coolSetpoint = msg.extractPayloadByte(15);
-        let s = state.schedules.getItemById(schedId, cfg.isActive);
         if (cfg.isActive) {
             let s = state.schedules.getItemById(schedId, cfg.isActive);
             s.isActive = cfg.isActive = true;
@@ -773,7 +775,7 @@ export class ExternalMessage {
                 break;
             case 21: // Body 2 Cool Setpoint
                 body = sys.bodies.getItemById(2, false);
-                body.setPoint = msg.extractPayloadByte(24);
+                body.coolSetpoint = msg.extractPayloadByte(24);
                 state.temps.bodies.getItemById(2).coolSetpoint = body.coolSetpoint;
                 state.emitEquipmentChanges();
                 msg.isProcessed = true;