nodejs-poolcontroller 8.0.0 → 8.0.1

package/controller/Equipment.ts

@@ -1398,6 +1398,7 @@ export class PumpCollection extends EqItemCollection<Pump> {
         if (typeof add !== 'undefined' && add) return this.add(data || { id: this.data.length + 1, address: address });
         return this.createItem(data || { id: this.data.length + 1, address: address });
     }
+    public getNextEquipmentId(range?: EquipmentIdRange, exclude?: number[]): number { return super.getNextEquipmentId(typeof range === 'undefined' ? sys.board.equipmentIds.pumps : range, exclude); }
 }
 export class Pump extends EqItem {
     public dataName = 'pumpConfig';

package/controller/boards/EasyTouchBoard.ts

@@ -613,7 +613,7 @@ export class TouchConfigQueue extends ConfigQueue {
                 response: Response.create({
                     response: true
                     , callback: () => {
-                        console.log(`CALLBACKED`);
+                    //    console.log(`CALLBACKED`);
                     }
                     // , callback: () => {
                     //     self.processNext(out);

package/controller/comms/ScreenLogic.ts

@@ -1,7 +1,7 @@
 import { ControllerType, Timestamp, Utils, utils } from '../../controller/Constants';
 import { LightGroup, LightGroupCircuit, sys, Valve, Body, Pump, PumpCircuit, Remote} from '../../controller/Equipment';
 import { CircuitState, state, ValveState } from '../../controller/State';
-import { SLChemData, RemoteLogin, UnitConnection, FindUnits, SLEquipmentStateData, SLIntellichlorData, SLPumpStatusData, SLScheduleData, SLSystemTimeData, HeatModes, SLControllerConfigData, SLEquipmentConfigurationData, HeaterConfig, Valves } from 'node-screenlogic';
+import { RemoteLogin, UnitConnection, FindUnits, SLEquipmentStateData, SLIntellichlorData, SLPumpStatusData, SLScheduleData, SLSystemTimeData, HeatModes, SLControllerConfigData, SLEquipmentConfigurationData, HeaterConfig, Valves, SLChemData, SLGetCustomNamesData } from 'node-screenlogic';
 import * as Screenlogic from 'node-screenlogic';
 import { EasyTouchBoard } from '../../controller/boards/EasyTouchBoard';
 import { IntelliTouchBoard } from '../../controller/boards/IntelliTouchBoard';
@@ -15,7 +15,7 @@ import { Message } from './messages/Messages';
 
 export class ScreenLogicComms {
   constructor() {
-    this._client = Screenlogic.screenlogic;
+    this._client = new Screenlogic.UnitConnection();
   };
   public a: SLChemData;
   public counter: SLCounter = new SLCounter();
@@ -47,11 +47,10 @@ export class ScreenLogicComms {
     this.controller = new SLController(this._client);
     let cfg = config.getSection('controller.comms');
     if (typeof cfg !== 'undefined') this._cfg = cfg;
-    this.enabled = this._cfg.enabled;
+    this.enabled = this._cfg.enabled && this._cfg.type === 'screenlogic';
     if (!this._cfg.enabled || this._cfg.type !== 'screenlogic') {
       return;
     }
-
     let systemName = this._cfg.screenlogic.systemName; // 'Pentair: 00-00-00';
     let password = this._cfg.screenlogic.password.toString(); // '1111';
 
@@ -766,11 +765,11 @@ class Controller {
       logger.error(`Caught error in decodeEquipmentState: ${err.message}`);
     }
   }
-  public static async decodeCustomNames(customNames: string[]) {
+  public static async decodeCustomNames(customNames: SLGetCustomNamesData) {
     for (let i = 0; i < sys.equipment.maxCustomNames; i++) {
       let data = {
         id: i,
-        name: customNames[i]
+        name: customNames.names[i]
       }
       try {
 
@@ -1101,14 +1100,14 @@ class Controller {
     pstate.command = (pstate.rpm > 0 || pstate.watts > 0) ? 10 : 0;
     state.emitEquipmentChanges();
   }
-  public static async decodeSchedules(slrecurring: SLScheduleData[], slrunonce: SLScheduleData[]) {
+  public static async decodeSchedules(slrecurring: SLScheduleData, slrunonce: SLScheduleData) {
     /*     reccuring schedules: [{"scheduleId":1,"circuitId":6,"startTime":"1800","stopTime":"0700","dayMask":127,"flags":0,"heatCmd":4,"heatSetPoint":70,"days":["Mon","Tue","Wed","Thu","Fri","Sat","Sun"]},
     
     {"scheduleId":4,"circuitId":2,"startTime":"1800","stopTime":"2300","dayMask":127,"flags":0,"heatCmd":0,"heatSetPoint":0,"days":["Mon","Tue","Wed","Thu","Fri","Sat","Sun"]},{"scheduleId":11,"circuitId":6,"startTime":"0800","stopTime":"1700","dayMask":127,"flags":0,"heatCmd":4,"heatSetPoint":70,"days":["Mon","Tue","Wed","Thu","Fri","Sat","Sun"]}]
     
         Run once schedules: [{"scheduleId":12,"circuitId":6,"startTime":"0800","stopTime":"1100","dayMask":1,"flags":1,"heatCmd":4,"heatSetPoint":70,"days":["Mon"]},{"scheduleId":13,"circuitId":6,"startTime":"0800","stopTime":"1100","dayMask":1,"flags":1,"heatCmd":4,"heatSetPoint":70,"days":["Mon"]}] */
 
-    for (let i = 0; i < slrecurring.length; i++) {
+    for (let i = 0; i < slrecurring.data.length; i++) {
       let slsched = slrecurring[i];
       let data = {
         id: slsched.scheduleId,
@@ -1126,13 +1125,14 @@ class Controller {
         logger.error(`Error setting schedule ${slsched.scheduleId}.  ${err.message}`);
       }
     }
-    for (let i = 0; i < slrunonce.length; i++) {
-      let slsched = slrunonce[i];
+    for (let i = 0; i < slrunonce.data.length; i++) {
+      let slsched = slrunonce.data[i];
       let data = {
         id: slsched.scheduleId,
         circuit: slsched.circuitId,
-        startTime: Math.floor(slsched.startTime / 100) * 60 + slsched.startTime % 100,
-        endTime: Math.floor(slsched.stopTime / 100) * 60 + slsched.stopTime % 100,
+        // start and stop come in as military time string
+        startTime: parseInt(slsched.startTime, 10),
+        endTime: parseInt(slsched.stopTime, 10),
         scheduleDays: slsched.dayMask,
         changeHeatSetPoint: slsched.heatCmd > 0,
         heatSetPoint: slsched.heatSetPoint,
@@ -1654,7 +1654,7 @@ export class SLController extends SLCommands {
   public async setCustomName(idx: number, name: string){
     try {
       let ack = await this._unit.equipment.setCustomNameAsync(idx, name);
-      logger.silly(`Screenlogic:set custom name result: ${ack}`);
+      logger.silly(`Screenlogic:set custom name result: ${JSON.stringify(ack)}`);
     } catch (error) {
       return Promise.reject(new InvalidOperationError('Unable to set custom name.', error.message));
     }

package/defaultConfig.json

@@ -1,6 +1,7 @@
 {
   "controller": {
     "comms": {
+      "type": "local",
       "portId": 0,
       "enabled": true,
       "rs485Port": "/dev/ttyUSB0",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nodejs-poolcontroller",
-    "version": "8.0.0",
+    "version": "8.0.1",
     "description": "nodejs-poolController",
     "main": "app.js",
     "author": {
@@ -31,7 +31,7 @@
         "mqtt": "^4.3.7",
         "multer": "^1.4.5-lts.1",
         "multicast-dns": "^7.2.4",
-        "node-screenlogic": "^1.10.1",
+        "node-screenlogic": "^2.0.0",
         "node-ssdp": "^4.0.1",
         "serialport": "^10.4.0",
         "socket.io": "^4.5.0",