nodejs-poolcontroller 8.4.0 → 8.4.1

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

@@ -17,45 +17,110 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 import { Inbound } from "../Messages";
 import { sys, General } from "../../../Equipment";
+import { ControllerType } from "../../../Constants";
 import { logger } from "../../../../logger/Logger";
 export class GeneralMessage {
+    private static isIntellicenterV3(): boolean {
+        return sys.controllerType === ControllerType.IntelliCenter && sys.equipment.isIntellicenterV3 === true;
+    }
+    private static getTrimmed(msg: Inbound, start: number, len: number): string {
+        return (msg.extractPayloadString(start, len) || '').replace(/\0+$/g, '').trim();
+    }
     public static process(msg: Inbound): void {
+        const isIntellicenterV3 = GeneralMessage.isIntellicenterV3();
         switch (msg.extractPayloadByte(1)) {
             case 0:
+                if (isIntellicenterV3) {
+                    // v3.008+ sends location-focused data for item 0.
+                    const zip = GeneralMessage.getTrimmed(msg, 2, 6);
+                    if (zip.length > 0) sys.general.location.zip = zip;
+                    // In captured v3.008 packets, bytes 13/14 map cleanly to longitude magnitude.
+                    const lonLo = msg.extractPayloadByte(13, 255);
+                    const lonHi = msg.extractPayloadByte(14, 255);
+                    if (lonLo !== 255 && lonHi !== 255) {
+                        const lon = ((lonHi * 256) + lonLo) / 100;
+                        if (!isNaN(lon) && lon > 0 && lon <= 180) sys.general.location.longitude = -lon;
+                    }
+                    msg.isProcessed = true;
+                    break;
+                }
                 sys.general.alias = msg.extractPayloadString(2, 16);
                 sys.general.owner.name = msg.extractPayloadString(18, 16);
                 sys.general.location.zip = msg.extractPayloadString(34, 6);
                 msg.isProcessed = true;
                 break;
             case 1:
+                if (isIntellicenterV3) {
+                    // v3.008+ item 1 carries city text (not phone fields).
+                    const city = GeneralMessage.getTrimmed(msg, 2, 32);
+                    if (city.length > 0) sys.general.location.city = city;
+                    msg.isProcessed = true;
+                    break;
+                }
                 sys.general.owner.phone = msg.extractPayloadString(2, 20);
                 sys.general.owner.phone2 = msg.extractPayloadString(21, 15);
                 sys.general.location.latitude = ((msg.extractPayloadByte(35) * 256) + msg.extractPayloadByte(34)) / 100;
                 msg.isProcessed = true;
                 break;
             case 2:
+                if (isIntellicenterV3) {
+                    const owner = GeneralMessage.getTrimmed(msg, 2, 16);
+                    if (owner.length > 0) sys.general.owner.name = owner;
+                    msg.isProcessed = true;
+                    break;
+                }
                 sys.general.location.address = msg.extractPayloadString(2, 32);
                 sys.general.location.longitude = -(((msg.extractPayloadByte(35) * 256) + msg.extractPayloadByte(34)) / 100);
                 msg.isProcessed = true;
                 break;
             case 3:
+                if (isIntellicenterV3) {
+                    const email = GeneralMessage.getTrimmed(msg, 2, 32);
+                    if (email.length > 0) sys.general.owner.email = email;
+                    msg.isProcessed = true;
+                    break;
+                }
                 sys.general.owner.email = msg.extractPayloadString(2, 32);
                 sys.general.location.timeZone = msg.extractPayloadByte(34);
                 msg.isProcessed = true;
                 break;
             case 4:
+                if (isIntellicenterV3) {
+                    const email2 = GeneralMessage.getTrimmed(msg, 2, 32);
+                    if (email2.length > 0) sys.general.owner.email2 = email2;
+                    msg.isProcessed = true;
+                    break;
+                }
                 sys.general.owner.email2 = msg.extractPayloadString(2, 32);
                 msg.isProcessed = true;
                 break;
             case 5:
+                if (isIntellicenterV3) {
+                    const country = GeneralMessage.getTrimmed(msg, 2, 32);
+                    if (country.length > 0) sys.general.location.country = country;
+                    msg.isProcessed = true;
+                    break;
+                }
                 sys.general.location.country = msg.extractPayloadString(2, 32);
                 msg.isProcessed = true;
                 break;
             case 6:
+                if (isIntellicenterV3) {
+                    const city = GeneralMessage.getTrimmed(msg, 2, 32);
+                    if (city.length > 0) sys.general.location.city = city;
+                    msg.isProcessed = true;
+                    break;
+                }
                 sys.general.location.city = msg.extractPayloadString(2, 32);
                 msg.isProcessed = true;
                 break;
             case 7:
+                if (isIntellicenterV3) {
+                    const stateText = GeneralMessage.getTrimmed(msg, 2, 32);
+                    if (stateText.length > 0) sys.general.location.state = stateText;
+                    msg.isProcessed = true;
+                    break;
+                }
                 sys.general.location.state = msg.extractPayloadString(2, 32);
                 msg.isProcessed = true;
                 break;

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

@@ -20,6 +20,10 @@ import { sys } from "../../../Equipment";
 import { state } from "../../../State";
 import { ControllerType } from "../../../Constants";
 export class OptionsMessage {
+    private static decodeFreezeOverride(raw: number): number {
+        // v3.008 captures show this as a compact code where 0 => 30 min and 1 => 90 min.
+        return raw <= 3 ? (30 + (raw * 60)) : raw;
+    }
     public static process(msg: Inbound): void {
         switch (sys.controllerType) {
             case ControllerType.IntelliCenter:
@@ -55,7 +59,17 @@ export class OptionsMessage {
                             // cooldownDelay
                             //[255, 0, 255][165, 63, 15, 16, 30, 40][0, 0, 1, 129, 0, 0, 0, 0, 0, 0, 0, 0, 0, 176, 149, 29, 35, 3, 0, 0, 92, 81, 91, 81, 3, 3, 0, 0, 15, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0][4, 194]
                             sys.general.options.cooldownDelay = msg.extractPayloadByte(30) === 1;
-                            sys.general.options.manualPriority = msg.extractPayloadByte(38) === 1;
+                            let manualPriorityByte = msg.extractPayloadByte(38, 255);
+                            const isIntellicenterV3 = (sys.controllerType === ControllerType.IntelliCenter && sys.equipment.isIntellicenterV3);
+                            if (isIntellicenterV3) {
+                                const v3ManualPriorityByte = msg.extractPayloadByte(28, 255);
+                                if (v3ManualPriorityByte === 0 || v3ManualPriorityByte === 1) manualPriorityByte = v3ManualPriorityByte;
+                                const freezeCycleTime = msg.extractPayloadByte(26, 255);
+                                if (freezeCycleTime !== 255) sys.general.options.freezeCycleTime = freezeCycleTime;
+                                const freezeOverrideRaw = msg.extractPayloadByte(27, 255);
+                                if (freezeOverrideRaw !== 255) sys.general.options.freezeOverride = OptionsMessage.decodeFreezeOverride(freezeOverrideRaw);
+                            }
+                            if (manualPriorityByte !== 255) sys.general.options.manualPriority = manualPriorityByte === 1;
                             sys.general.options.manualHeat = msg.extractPayloadByte(39) === 1;
                             let fnTranslateByte = (byte):number => { return (byte & 0x007F) * (((byte & 0x0080) > 0) ? -1 : 1); }
                             sys.equipment.tempSensors.setCalibration('water1', fnTranslateByte(msg.extractPayloadByte(3)));
@@ -79,7 +93,6 @@ export class OptionsMessage {
 
                             // v3.004+: payload layout shifted by 1 byte vs v1.x (timestamp insertion earlier in the packet).
                             // Evidence: replay.21 Action 30 type 0 has [.., 85,100,94,103, 3,3 ..] at bytes 19-24.
-                            const isIntellicenterV3 = (sys.controllerType === ControllerType.IntelliCenter && sys.equipment.isIntellicenterV3);
                             const poolHeatNdx = isIntellicenterV3 ? 19 : 20;
                             const poolCoolNdx = isIntellicenterV3 ? 20 : 21;
                             const spaHeatNdx = isIntellicenterV3 ? 21 : 22;