nodejs-poolcontroller 7.7.0 → 8.0.1

package/controller/comms/messages/status/PumpStateMessage.ts

@@ -1,5 +1,6 @@
 /*  nodejs-poolController.  An application to control pool equipment.
-Copyright (C) 2016, 2017, 2018, 2019, 2020.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
+Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022.  
+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
@@ -14,12 +15,51 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Inbound } from "../Messages";
+import { Inbound, Outbound, Protocol } from "../Messages";
 import { state } from "../../../State";
 import { sys, ControllerType } from "../../../Equipment";
+import { conn } from "../../Comms";
+import { logger } from "../../../../logger/Logger";
+
 export class PumpStateMessage {
+    private static detectPumpType(msg: Inbound) {
+        let pumpType = -1;
+        switch (msg.action) {
+            case 1:
+                {
+                    let speed = (msg.extractPayloadByte(2) * 256) + msg.extractPayloadByte(3);
+                    if (speed > 0) {
+                        pumpType = speed < 300 ? sys.board.valueMaps.pumpTypes.getValue('vf') : sys.board.valueMaps.pumpTypes.getValue('vs');
+                    }
+                }
+                break;
+            case 9:
+            case 10:
+                pumpType = sys.board.valueMaps.pumpTypes.getValue('vsf');
+                break;
+        }
+        if (pumpType > 0) {
+            let pump = sys.pumps.find(x => x.address === msg.dest);
+            if (typeof pump === 'undefined') {
+                let id = sys.pumps.filter(elem => elem.master === 0).getMaxId(false, 0) + 1;
+                pump = sys.pumps.getItemById(id, true);
+                pump.name = `Pump ${msg.dest - 95}`;
+                pump.address = msg.dest;
+                pump.isActive = true;
+                pump.type = pumpType;
+                pump.master = 0;
+            }
+            let spump = state.pumps.getItemById(pump.id, true);
+            spump.address = pump.address;
+            spump.type = pump.type;
+            spump.isActive = pump.isActive;
+            spump.name = pump.name;
+            spump.type = pump.type;
+        }
+    }
     public static process(msg: Inbound) {
         if (sys.controllerType === ControllerType.Unknown) return;
+        if (msg.dest >= 96 && sys.controllerType === ControllerType.SunTouch) PumpStateMessage.detectPumpType(msg);
 
         // We only want to process the messages that are coming from the pump not to the pump.  At some point
         // this filter was removed.  Any messages that are coming from the panel are simply requests to the pump
@@ -33,6 +73,29 @@ export class PumpStateMessage {
         let ptype = sys.board.valueMaps.pumpTypes.transform(pumpCfg.type);
         let pump = state.pumps.getItemById(pumpId, pumpCfg.isActive === true);
         switch (msg.action) {
+            case 1:
+                if (msg.source === 96 && sys.controllerType === ControllerType.EasyTouch) {
+                    if (sys.equipment.modules.getItemByIndex(0, false).type >= 128) {
+                        // EasyTouch Version 1 controllers do not request the current information about rpms or wattage from the pump.  We need to ask in
+                        // its stead.
+                        let out = Outbound.create({
+                                portId: pumpCfg.portId || 0,
+                                protocol: Protocol.Pump,
+                                dest: pumpCfg.address,
+                                action: 7,
+                                payload: [],
+                                retries: 1,
+                                response: true,
+                                onComplete: (err, _) => {
+                                    if (err) {
+                                        logger.error(`EasyTouch 1 request pump status failed for ${pump.name}: ${err.message}`);
+                                    }
+                                }
+                            });
+                        conn.queueSendMessage(out);
+                    }
+                }
+                break;
             case 7:
                 //[165, 63, 15, 16, 2, 29][11, 47, 32, 0, 0, 0, 0, 0, 0, 32, 0, 0, 2, 0, 59, 59, 0, 241, 56, 121, 24, 246, 0, 0, 0, 0, 0, 23, 0][4, 219]
                 //[165, 0, 96, 16, 1, 4][2, 196, 7, 58][2, 33]
@@ -57,7 +120,7 @@ export class PumpStateMessage {
     }
     public static processHayward(msg: Inbound) {
         switch (msg.action) {
-            case 12:
+            case 12: // This is a pump status message
                 PumpStateMessage.processHaywardStar(msg);
                 break;
         }
@@ -67,7 +130,10 @@ export class PumpStateMessage {
         //[0x10, 0x02, 0x00, 0x0C, 0x00][0x00, 0x62, 0x17, 0x81][0x01, 0x18, 0x10, 0x03]
         //[0x10, 0x02, 0x00, 0x0C, 0x00][0x00, 0x2D, 0x02, 0x36][0x00, 0x83, 0x10, 0x03] -- Response from pump
         let ptype = sys.board.valueMaps.pumpTypes.transformByName('hwvs');
-        let pump = sys.pumps.find(elem => elem.address === msg.source + 96 && elem.type === 6);
+        let address = msg.source + 96;
+        //console.log({ src: msg.source, dest: msg.dest, action: msg.action, address: address });
+
+        let pump = sys.pumps.find(elem => elem.address === address && elem.type === 6);
         if (typeof pump !== 'undefined') {
             let pstate = state.pumps.getItemById(pump.id, true);
             // 3450 * .5
@@ -75,6 +141,8 @@ export class PumpStateMessage {
             // This is really goofy as the watts are actually the hex string from the two bytes.
             pstate.watts = parseInt(msg.extractPayloadByte(2).toString(16) + msg.extractPayloadByte(3).toString(16), 10);
             pstate.isActive = true;
+            pstate.command = (pstate.rpm > 0 || pstate.watts > 0) ? 10 : 0;
+            pstate.driveState
             state.emitEquipmentChanges();
         }
     }

package/controller/comms/messages/status/VersionMessage.ts

@@ -1,5 +1,6 @@
 /*  nodejs-poolController.  An application to control pool equipment.
-Copyright (C) 2016, 2017, 2018, 2019, 2020.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
+Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022.  
+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/controller/nixie/Nixie.ts

@@ -5,6 +5,7 @@ import { webApp } from "../../web/Server";
 import { logger } from "../../logger/Logger";
 import { INixieControlPanel } from "./NixieEquipment";
 import { NixieChemControllerCollection } from "./chemistry/ChemController";
+import { NixieChemDoserCollection } from "./chemistry/ChemDoser";
 
 import { sys, PoolSystem } from "../../controller/Equipment";
 import { NixieCircuitCollection } from './circuits/Circuit';
@@ -55,6 +56,7 @@ export class NixieControlPanel implements INixieControlPanel {
     // Only equipment controlled by Nixie is represented on the controller.  If interaction with
     // other equipment is required this should be sent back through the original controller.
     // Command sequence is <OCP>Board -> SystemBoard -> NixieController whenever the master is not identified as Nixie.
+    chemDosers: NixieChemDoserCollection = new NixieChemDoserCollection(this);
     chemControllers: NixieChemControllerCollection = new NixieChemControllerCollection(this);
     chlorinators: NixieChlorinatorCollection = new NixieChlorinatorCollection(this);
     circuits: NixieCircuitCollection = new NixieCircuitCollection(this);
@@ -64,7 +66,14 @@ export class NixieControlPanel implements INixieControlPanel {
     heaters: NixieHeaterCollection = new NixieHeaterCollection(this);
     pumps: NixiePumpCollection = new NixiePumpCollection(this);
     schedules: NixieScheduleCollection = new NixieScheduleCollection(this);
-
+    public async setServiceModeAsync() {
+        await this.circuits.setServiceModeAsync();
+        await this.heaters.setServiceModeAsync();
+        await this.chlorinators.setServiceModeAsync();
+        await this.chemControllers.setServiceModeAsync();
+        await this.chemDosers.setServiceModeAsync();
+        await this.pumps.setServiceModeAsync();
+    }
     public async initAsync(equipment: PoolSystem) {
         try {
 
@@ -80,6 +89,7 @@ export class NixieControlPanel implements INixieControlPanel {
             await this.heaters.initAsync(equipment.heaters);
             await this.chlorinators.initAsync(equipment.chlorinators);
             await this.chemControllers.initAsync(equipment.chemControllers);
+            await this.chemDosers.initAsync(equipment.chemDosers);
             await this.pumps.initAsync(equipment.pumps);
             await this.schedules.initAsync(equipment.schedules);
             logger.info(`Nixie Controller Initialized`)
@@ -97,7 +107,7 @@ export class NixieControlPanel implements INixieControlPanel {
                 lines = buff.toString().split('\n');
             }
             return lines;
-        } catch (err) { logger.error(err); }
+        } catch (err) { logger.error(`Error reading log file ${logFile}: ${err.message}`); }
     }
     public async logData(logFile: string, data: any) {
         try {
@@ -114,10 +124,11 @@ export class NixieControlPanel implements INixieControlPanel {
             else
                 lines.unshift(data.toString());
             fs.writeFileSync(logPath, lines.join('\n'));
-        } catch (err) { logger.error(err); }
+        } catch (err) { logger.error(`Error logging to ${logFile}: ${err.message}`); }
     }
     public async closeAsync() {
         // Close all the associated equipment.
+        await this.chemDosers.closeAsync();
         await this.chemControllers.closeAsync();
         await this.chlorinators.closeAsync();
         await this.heaters.closeAsync();
@@ -156,7 +167,7 @@ export class NixieControlPanel implements INixieControlPanel {
                 await ncp.chemControllers.syncRemoteREMFeeds(srv);
             }
             return srv;
-        } catch (err) { logger.error(err); }
+        } catch (err) { logger.error(`Error gettting REM Servers: ${err.message}`); }
     }
 }
 

package/controller/nixie/NixieEquipment.ts

@@ -86,6 +86,7 @@ export class NixieEquipmentCollection<T> extends Array<NixieEquipment> {
                 let eq = this[ndx];
                 await eq.closeAsync();
                 this.splice(ndx, 1);
+                logger.info(`Removing chem doser id# ${id} at index ndx`);
             }
             else
                 logger.warn(`A Nixie equipment item was not found with id ${id}. Equipment not removed.`);