nodejs-poolcontroller 8.0.2 → 8.0.5

package/.github/workflows/docker-publish-njsPC-linux.yml

@@ -4,30 +4,37 @@ on:
   push:
     branches:
       - master
-      - docker
+    tags:
+      - "v*.*.*"
   workflow_dispatch:
     
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-    
-      - name: Checkout code from tagyoureit/nodejs-poolcontroller
-        uses: actions/checkout@v3
-        with:
-          repository: tagyoureit/nodejs-poolcontroller
-          ref: master  # or specify the branch or tag to pull from
-          path: nodejs-poolcontroller
-
-      - name: Checkout code from rstrouse/nodejs-poolcontroller-dashpanel
-        uses: actions/checkout@v3
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
         with:
-          repository: rstrouse/nodejs-poolcontroller-dashpanel  # 
-          ref: master  # Specify the branch or tag to pull from
-          path: nodejs-poolcontroller-dashpanel  # Specify the directory to checkout the code into
-
+          # list of Docker images to use as base name for tags
+          images: |
+            tagyoureit/njspc          
+          # generate Docker tags based on the following events/attributes
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -35,47 +42,9 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push combined Docker image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
-          context: .
-          file: ./.docker/Dockerfile.linux
           push: true
-          tags: |
-            tagyoureit/njspc-dp-combined-app:latest
-        
-
-      # - name: Build and push njsPC Linux Docker image (x86_64)
-      #   uses: docker/build-push-action@v4
-      #   with:
-      #     context: .
-      #     file: ./.docker/Dockerfile.linux
-      #     push: true
-      #     tags: |
-      #       tagyoureit/nodejs-poolcontroller:latest
-
-      # - name: Build and push njsPC-dP Linux Docker image (x86_64)
-      #   uses: docker/build-push-action@v4
-      #   with:
-      #     context: nodejs-poolcontroller-dashpanel
-      #     file: ./.docker/Dockerfile.linux
-      #     push: true
-      #     tags: |
-      #       rstrouse/nodejs-poolcontroller-dashpanel:latest
-
-      # - name: Build and push ARMv7 Docker image
-      #   uses: docker/build-push-action@v4
-      #   with:
-      #     context: .
-      #     file: ./.docker/Dockerfile.armv7  # Adjust the path to your ARMv7 Dockerfile
-      #     push: true
-      #     tags: |
-      #       tagyoureit/nodejs-poolcontroller-armv7:latest
-
-      # - name: Build and push ARMv6 Docker image
-      #   uses: docker/build-push-action@v4
-      #   with:
-      #     context: .
-      #     file: ./.docker/Dockerfile.armv6  # Adjust the path to your ARMv6 Dockerfile
-      #     push: true
-      #     tags: |
-      #       tagyoureit/nodejs-poolcontroller-armv6:latest
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

package/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:lts-alpine AS build
+FROM node:18-alpine AS build
 RUN apk add --no-cache make gcc g++ python3 linux-headers udev tzdata
 WORKDIR /app
 COPY package*.json ./
@@ -8,11 +8,12 @@ COPY . .
 RUN npm run build
 RUN npm ci --omit=dev
 
-FROM node:lts-alpine as prod
+FROM node:18-alpine as prod
 RUN apk add git
 RUN mkdir /app && chown node:node /app
 WORKDIR /app
 COPY --chown=node:node --from=build /app .
 USER node
 ENV NODE_ENV=production
+EXPOSE 5150
 ENTRYPOINT ["node", "dist/app.js"]

package/controller/State.ts

@@ -1089,7 +1089,9 @@ export class ScheduleStateCollection extends EqStateCollection<ScheduleState> {
             let ssched = this.getItemByIndex(i);
             let st = ssched.scheduleTime;
             let sched = sys.schedules.getItemById(ssched.id);
-            if (!sched.isActive || ssched.disabled) {
+            // rsg st.startTime is null when the schedule has No Days  <-- WRONG.  ssched.scheduleDays should be checked.
+            // original fix #879;  updated fix #1033
+            if (!sched.isActive || ssched.disabled || ssched.scheduleDays === 0) {
                 continue;
             }
             st.calcSchedule(state.time, sys.schedules.getItemById(ssched.id));
@@ -1837,6 +1839,7 @@ export class HeaterState extends EqState {
     public set prevHeaterOffTemp(val: number) {
         if (this.prevHeaterOffTemp !== val) {
             this.data.prevHeaterOffTemp = val;
+            if (typeof val === 'undefined') delete this.data.prevHeaterOffTemp;
         }
     }
     public get startupDelay(): boolean { return this.data.startupDelay; }

package/controller/boards/IntelliCenterBoard.ts

@@ -2173,6 +2173,7 @@ class IntelliCenterCircuitCommands extends CircuitCommands {
             255, 255, 0, 0, 0, 0], // 30-35
             3);
 
+
         // Circuits are always contiguous so we don't have to worry about
         // them having a strange offset like features and groups. However, in
         // single body systems they start with 2.
@@ -2180,13 +2181,14 @@ class IntelliCenterCircuitCommands extends CircuitCommands {
             // We are using the index and setting the circuits based upon
             // the index.  This way it doesn't matter what the sort happens to
             // be and whether there are gaps in the ids or not.  The ordinal is the bit number.
-            let circuit = state.circuits.getItemByIndex(i);
-            let ordinal = circuit.id - 1;
+            let cstate = state.circuits.getItemByIndex(i);
+            let ordinal = cstate.id - 1;
+            if (ordinal >= 40) continue;
             let ndx = Math.floor(ordinal / 8);
             let byte = out.payload[ndx + 3];
             let bit = ordinal - (ndx * 8);
-            if (circuit.id === id) byte = isOn ? byte = byte | (1 << bit) : byte;
-            else if (circuit.isOn) byte = byte | (1 << bit);
+            if (cstate.id === id) byte = isOn ? byte = byte | (1 << bit) : byte;
+            else if (cstate.isOn) byte = byte | (1 << bit);
             out.payload[ndx + 3] = byte;
         }
         // Set the bits for the features.
@@ -2196,6 +2198,7 @@ class IntelliCenterCircuitCommands extends CircuitCommands {
             // be and whether there are gaps in the ids or not.  The ordinal is the bit number.
             let feature = state.features.getItemByIndex(i);
             let ordinal = feature.id - sys.board.equipmentIds.features.start;
+            if (ordinal >= 32) continue;
             let ndx = Math.floor(ordinal / 8);
             let byte = out.payload[ndx + 9];
             let bit = ordinal - (ndx * 8);
@@ -2207,6 +2210,7 @@ class IntelliCenterCircuitCommands extends CircuitCommands {
         for (let i = 0; i < state.data.circuitGroups.length; i++) {
             let group = state.circuitGroups.getItemByIndex(i);
             let ordinal = group.id - sys.board.equipmentIds.circuitGroups.start;
+            if (ordinal >= 16) continue;
             let ndx = Math.floor(ordinal / 8);
             let byte = out.payload[ndx + 13];
             let bit = ordinal - (ndx * 8);
@@ -2218,6 +2222,7 @@ class IntelliCenterCircuitCommands extends CircuitCommands {
         for (let i = 0; i < state.data.lightGroups.length; i++) {
             let group = state.lightGroups.getItemByIndex(i);
             let ordinal = group.id - sys.board.equipmentIds.circuitGroups.start;
+            if (ordinal >= 16) continue;
             let ndx = Math.floor(ordinal / 8);
             let byte = out.payload[ndx + 13];
             let bit = ordinal - (ndx * 8);
@@ -2253,6 +2258,7 @@ class IntelliCenterCircuitCommands extends CircuitCommands {
         for (let i = 0; i < state.data.schedules.length; i++) {
             let sched = state.schedules.getItemByIndex(i);
             let ordinal = sched.id - 1;
+            if (ordinal >= 100) continue;
             let ndx = Math.floor(ordinal / 8);
             let byte = out.payload[ndx + 15];
             let bit = ordinal - (ndx * 8);
@@ -2822,6 +2828,7 @@ class IntelliCenterBodyCommands extends BodyCommands {
         body2: { heatMode: number, heatSetpoint: number, coolSetpoint: number }
     };
     private async queueBodyHeatSettings(bodyId?: number, byte?: number, data?: any): Promise<Boolean> {
+        logger.debug(`queueBodyHeatSettings: ${JSON.stringify(this.bodyHeatSettings)}`);  // remove this line if #848 is fixed
         if (typeof this.bodyHeatSettings === 'undefined') {
             let body1 = sys.bodies.getItemById(1);
             let body2 = sys.bodies.getItemById(2);
@@ -2884,10 +2891,12 @@ class IntelliCenterBodyCommands extends BodyCommands {
                 state.emitEquipmentChanges();
             } catch (err) {
                 bhs.processing = false;
+                bhs.bytes = [];
                 throw (err);
             }
             finally {
                 bhs.processing = false;
+                bhs.bytes = [];
             }
             return true;
         }
@@ -2897,7 +2906,10 @@ class IntelliCenterBodyCommands extends BodyCommands {
                 setTimeout(async () => {
                     try {
                         await this.queueBodyHeatSettings();
-                    } catch (err) { logger.error(`Error sending queued body setpoint message: ${err.message}`); }
+                    } catch (err) {
+                        logger.error(`Error sending queued body setpoint message: ${err.message}`);
+                        throw (err);
+                    }
                 }, 3000);
             }
             else bhs.processing = false;

package/controller/boards/SystemBoard.ts

@@ -1762,6 +1762,7 @@ export class BodyCommands extends BoardCommands {
         let bdy = sys.bodies.getItemById(body.id);
         let bstate = state.temps.bodies.getItemById(body.id);
         bdy.heatMode = bstate.heatMode = mode;
+        sys.board.heaters.clearPrevHeaterOffTemp();
         sys.board.heaters.syncHeaterStates();
         state.emitEquipmentChanges();
         return Promise.resolve(bstate);
@@ -1770,6 +1771,7 @@ export class BodyCommands extends BoardCommands {
         let bdy = sys.bodies.getItemById(body.id);
         let bstate = state.temps.bodies.getItemById(body.id);
         bdy.setPoint = bstate.setPoint = setPoint;
+        sys.board.heaters.clearPrevHeaterOffTemp();
         state.emitEquipmentChanges();
         sys.board.heaters.syncHeaterStates();
         return Promise.resolve(bstate);
@@ -3629,7 +3631,7 @@ export class ScheduleCommands extends BoardCommands {
         if (heatSetpoint < 0 || heatSetpoint > 104) return Promise.reject(new InvalidEquipmentDataError(`Invalid heat setpoint: ${heatSetpoint}`, 'Schedule', heatSetpoint));
         if (sys.board.circuits.getCircuitReferences(true, true, false, true).find(elem => elem.id === circuit) === undefined)
             return Promise.reject(new InvalidEquipmentDataError(`Invalid circuit reference: ${circuit}`, 'Schedule', circuit));
-        if (schedType === 128 && schedDays === 0) return Promise.reject(new InvalidEquipmentDataError(`Invalid schedule days: ${schedDays}. You must supply days that the schedule is to run.`, 'Schedule', schedDays));
+        if (schedType === 128 && schedDays === 0) return Promise.reject(new InvalidEquipmentDataError(`Invalid schedule days: ${schedDays}. You must supply days that the schedule is to run.`, 'Schedule', schedDays)); // rsg 2024.11.22 - some controllers allow no days.
 
         // If we made it to here we are valid and the schedula and it state should exist.
         sched = sys.schedules.getItemById(id, true);
@@ -4610,7 +4612,8 @@ export class ValveCommands extends BoardCommands {
             let drain = sys.equipment.shared ? typeof state.circuits.get().find(elem => typeof elem.type !== 'undefined' && elem.type.name === 'spadrain' && elem.isOn === true) !== 'undefined' ||
                 typeof state.features.get().find(elem => typeof elem.type !== 'undefined' && elem.type.name === 'spadrain' && elem.isOn === true) !== 'undefined' : false;
             // Check to see if there is a spillway circuit or feature on.  If it is on then the return will be diverted no mater what.
-            let spillway = sys.equipment.shared ? typeof state.circuits.get().find(elem => typeof elem.type !== 'undefined' && elem.type.name === 'spillway' && elem.isOn === true) !== 'undefined' ||
+            let spillway = sys.equipment.shared ? 
+                typeof state.circuits.get().find(elem => typeof elem.type !== 'undefined' && elem.type.name === 'spillway' && elem.isOn === true) !== 'undefined' ||
                 typeof state.features.get().find(elem => typeof elem.type !== 'undefined' && elem.type.name === 'spillway' && elem.isOn === true) !== 'undefined' : false;
             let spa = sys.equipment.shared ? state.circuits.getItemById(1).isOn : false;
             let pool = sys.equipment.shared ? state.circuits.getItemById(6).isOn : false;

package/controller/comms/Comms.ts

@@ -668,6 +668,9 @@ export class RS485Port {
                 let opts: SerialPortOpenOptions<AutoDetectTypes> = { path: portPath, autoOpen: false, baudRate: 9600 };
                 sp = new SerialPortMock(opts);
             }
+            else if (this._cfg.type === 'screenlogic') {
+                return await sl.openAsync();
+            }
             else {
                 this.mock = false;
                 let opts: SerialPortOpenOptions<AutoDetectTypes> = extend(true, { path: this._cfg.rs485Port }, this._cfg.portSettings);

package/controller/comms/ScreenLogic.ts

@@ -1,5 +1,5 @@
 import { ControllerType, Timestamp, Utils, utils } from '../../controller/Constants';
-import { LightGroup, LightGroupCircuit, sys, Valve, Body, Pump, PumpCircuit, Remote} from '../../controller/Equipment';
+import { LightGroup, LightGroupCircuit, sys, Valve, Body, Pump, PumpCircuit, Remote } from '../../controller/Equipment';
 import { CircuitState, state, ValveState } from '../../controller/State';
 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';
@@ -87,7 +87,7 @@ export class ScreenLogicComms {
           logger.screenlogic(msg);
         })
         let ver = await this._client.getVersionAsync();
-        logger.info(`Screenlogic: connect to ${systemName} ${ver} at ${unit.ipAddr}:${unit.port}`);
+        logger.info(`Screenlogic: connect to ${systemName} ${ver.version} at ${unit.ipAddr}:${unit.port}`);
 
         let addClient = await this._client.addClientAsync();
         logger.silly(`Screenlogic:Add client result: ${addClient}`);
@@ -912,21 +912,21 @@ class Controller {
           }
         ], */
   }
-    public static decodeHighSpeed(highSpeed: number[]) {
-        let maxCircuits = sys.controllerType === ControllerType.IntelliTouch ? 8 : 4;
-        let arrCircuits = [];
-        let pump = sys.pumps.find(x => { return x.master !== 1 && x.type === 65 });
-        for (let i = 0; i < maxCircuits && i < highSpeed.length; i++) {
-            let val = highSpeed[i];
-            if (val > 0) arrCircuits.push(val);
-            else if (typeof pump !== 'undefined') pump.circuits.removeItemById(i);
-        }
-        if (arrCircuits.length > 0) {
-            let pump = sys.pumps.getDualSpeed(true);
-            for (let j = 1; j <= arrCircuits.length; j++) pump.circuits.getItemById(j, true).circuit = arrCircuits[j - 1];
-        }
-        else if (typeof pump !== 'undefined') sys.pumps.removeItemById(pump.id);
-    }
+  public static decodeHighSpeed(highSpeed: number[]) {
+    let maxCircuits = sys.controllerType === ControllerType.IntelliTouch ? 8 : 4;
+    let arrCircuits = [];
+    let pump = sys.pumps.find(x => { return x.master !== 1 && x.type === 65 });
+    for (let i = 0; i < maxCircuits && i < highSpeed.length; i++) {
+      let val = highSpeed[i];
+      if (val > 0) arrCircuits.push(val);
+      else if (typeof pump !== 'undefined') pump.circuits.removeItemById(i);
+    }
+    if (arrCircuits.length > 0) {
+      let pump = sys.pumps.getDualSpeed(true);
+      for (let j = 1; j <= arrCircuits.length; j++) pump.circuits.getItemById(j, true).circuit = arrCircuits[j - 1];
+    }
+    else if (typeof pump !== 'undefined') sys.pumps.removeItemById(pump.id);
+  }
   public static decodeRemote(remoteDataArray) {
     if (sys.controllerType === ControllerType.EasyTouch) {
 
@@ -980,11 +980,11 @@ class Controller {
             remote6.button3 = remote.button8;
             remote6.button4 = remote.button9;
             if (!remote5.button1 && !remote5.button2 && !remote5.button3 && !remote5.button4) remote5.isActive = false;
-                    else remote5.isActive = true;
-           
+            else remote5.isActive = true;
+
             if (!remote6.button1 && !remote6.button2 && !remote6.button3 && !remote6.button4) remote6.isActive = false;
-                    else remote6.isActive = true;
-           
+            else remote6.isActive = true;
+
           }
           else {
             remote5.isActive = remote6.isActive = false;
@@ -1066,43 +1066,43 @@ class Controller {
     }
 
   }
-  public static async decodePumpAsync(pDataArr: any ){
-    pDataArr.forEach(async (pData, idx)=>{
+  public static async decodePumpAsync(pDataArr: any) {
+    pDataArr.forEach(async (pData, idx) => {
       await sys.board.pumps.setPumpAsync(pData, false);
     })
   }
-    public static async decodePumpStatusAsync(id: number, slpump: SLPumpStatusData) {
-        /*   {
-            pumpCircuits: [
-              { circuitId: 6,speed: 2000,isRPMs: true, },
-              { circuitId: 8, speed:2700,isRPMs: true, },
-              { circuitId: 2,speed: 2710,isRPMs: true, },
-              { circuitId: 2,speed:1000, isRPMs: true,},
-              { circuitId: 5,speed:2830, isRPMs: true,},
-              { circuitId: 0,speed: 30,isRPMs: false,},
-              { circuitId: 0,speed: 30,isRPMs: false,},
-              { circuitId: 0,speed: 30,isRPMs: false,},
-            ],
-            pumpType: 4,
-            isRunning: false,
-            pumpWatts: 0,
-            pumpRPMs: 0,
-            pumpUnknown1: 0,
-            pumpGPMs: 0,
-            pumpUnknown2: 255,
-          }
-        */
-        // RKS: 05-07-23 - This process of getting the pump by its id is flawed.  We need to pull this information by its address.
-        //let pstate = state.pumps.getItemById(id);
-        let pstate = state.pumps.find(x => x.address === 95 + id);
-        if (typeof pstate !== 'undefined') {
-            pstate.watts = slpump.pumpWatts;
-            pstate.rpm = slpump.pumpRPMs;
-            pstate.flow = slpump.pumpGPMs === 255 ? 0 : slpump.pumpGPMs;
-            pstate.command = (pstate.rpm > 0 || pstate.watts > 0) ? 10 : 0;
-            state.emitEquipmentChanges();
-        }
+  public static async decodePumpStatusAsync(id: number, slpump: SLPumpStatusData) {
+    /*   {
+        pumpCircuits: [
+          { circuitId: 6,speed: 2000,isRPMs: true, },
+          { circuitId: 8, speed:2700,isRPMs: true, },
+          { circuitId: 2,speed: 2710,isRPMs: true, },
+          { circuitId: 2,speed:1000, isRPMs: true,},
+          { circuitId: 5,speed:2830, isRPMs: true,},
+          { circuitId: 0,speed: 30,isRPMs: false,},
+          { circuitId: 0,speed: 30,isRPMs: false,},
+          { circuitId: 0,speed: 30,isRPMs: false,},
+        ],
+        pumpType: 4,
+        isRunning: false,
+        pumpWatts: 0,
+        pumpRPMs: 0,
+        pumpUnknown1: 0,
+        pumpGPMs: 0,
+        pumpUnknown2: 255,
+      }
+    */
+    // RKS: 05-07-23 - This process of getting the pump by its id is flawed.  We need to pull this information by its address.
+    //let pstate = state.pumps.getItemById(id);
+    let pstate = state.pumps.find(x => x.address === 95 + id);
+    if (typeof pstate !== 'undefined') {
+      pstate.watts = slpump.pumpWatts;
+      pstate.rpm = slpump.pumpRPMs;
+      pstate.flow = slpump.pumpGPMs === 255 ? 0 : slpump.pumpGPMs;
+      pstate.command = (pstate.rpm > 0 || pstate.watts > 0) ? 10 : 0;
+      state.emitEquipmentChanges();
     }
+  }
   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"]},
     
@@ -1111,18 +1111,17 @@ class Controller {
         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.data.length; i++) {
-      let slsched = slrecurring[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,
-        scheduleDays: slsched.dayMask,
-        changeHeatSetPoint: slsched.heatCmd > 0,
-        heatSetPoint: slsched.heatSetPoint,
-        schedType: 128 // recurring
-      }
+      let slsched = slrecurring.data[i];
       try {
+        let data = {
+        circuit: slsched.circuitId,
+          startTime: Math.floor(parseInt(slsched.startTime, 10) / 100) * 60 + parseInt(slsched.startTime, 10) % 100,
+          endTime: Math.floor(parseInt(slsched.stopTime, 10) / 100) * 60 + parseInt(slsched.stopTime, 10) % 100,
+          scheduleDays: slsched.dayMask,
+          changeHeatSetPoint: slsched.heatCmd > 0,
+          heatSetPoint: slsched.heatSetPoint,
+          schedType: 128 // recurring
+        }
         await sys.board.schedules.setScheduleAsync(data, false)
       } catch (err) {
         logger.error(`Error setting schedule ${slsched.scheduleId}.  ${err.message}`);
@@ -1130,18 +1129,18 @@ class Controller {
     }
     for (let i = 0; i < slrunonce.data.length; i++) {
       let slsched = slrunonce.data[i];
-      let data = {
-        id: slsched.scheduleId,
-        circuit: slsched.circuitId,
-        // 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,
-        schedType: 0 // runonce
-      }
       try {
+        let data = {
+          id: slsched.scheduleId,
+          circuit: slsched.circuitId,
+          // 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,
+          schedType: 0 // runonce
+        }
         await sys.board.schedules.setScheduleAsync(data, false);
         sys.board.system.setTZ();
       } catch (err) {
@@ -1607,23 +1606,23 @@ export class SLController extends SLCommands {
     const spaCommand: Remote = sys.remotes.getItemById(8).get();
     let alarm = 0;
 
-    switch (eq){
+    switch (eq) {
       case 'misc': {
-          misc = extend({}, true, misc, obj);
+        misc = extend({}, true, misc, obj);
         break;
       }
       case 'lightGroup': {
-          lightGroup = extend({}, true, lightGroup, obj);
+        lightGroup = extend({}, true, lightGroup, obj);
         break;
       }
-      case 'pump':{
-        let idx = pumps.findIndex(el=>{console.log(el.id);return el.id === obj.id;})
+      case 'pump': {
+        let idx = pumps.findIndex(el => { console.log(el.id); return el.id === obj.id; })
         if (idx >= 0) pumps = extend({}, true, pumps[idx], obj);
         else return Promise.reject(`Screenlogic: No pump found by that id: ${obj}`);
         break;
       }
       case 'heater': {
-        let idx = heaters.findIndex(el=>{console.log(el.id);return el.id === obj.id;})
+        let idx = heaters.findIndex(el => { console.log(el.id); return el.id === obj.id; })
         if (idx >= 0) heaters = extend({}, true, heaters[idx], obj);
         else return Promise.reject(`Screenlogic: No pump found by that id: ${obj}`);
         break;
@@ -1646,7 +1645,7 @@ export class SLController extends SLCommands {
     // await this._unit.equipment.setEquipmentConfigurationAsync(data);
   }
 
-  public async setSystemTime(){
+  public async setSystemTime() {
     try {
       let sysTime = await this._unit.equipment.setSystemTimeAsync(state.time.toDate(), sys.general.options.adjustDST);
       logger.silly(`Screenlogic:set time result: ${sysTime}`);
@@ -1654,7 +1653,7 @@ export class SLController extends SLCommands {
       return Promise.reject(new InvalidOperationError('Unable to set system time.', error.message));
     }
   }
-  public async setCustomName(idx: number, name: string){
+  public async setCustomName(idx: number, name: string) {
     try {
       let ack = await this._unit.equipment.setCustomNameAsync(idx, name);
       logger.silly(`Screenlogic:set custom name result: ${JSON.stringify(ack)}`);

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

@@ -105,7 +105,7 @@ export class PumpStateMessage {
                 pump.mode = msg.extractPayloadByte(1);
                 pump.driveState = msg.extractPayloadByte(2);
                 pump.watts = (msg.extractPayloadByte(3) * 256) + msg.extractPayloadByte(4);
-                pump.rpm = (typeof ptype !== 'undefined' && ptype.maxSpeed > 0) ? (msg.extractPayloadByte(5) * 256) + msg.extractPayloadByte(6) : 0;
+                pump.rpm = (typeof ptype !== 'undefined' && (ptype.maxSpeed > 0 || ptype.name === 'vf')) ? (msg.extractPayloadByte(5) * 256) + msg.extractPayloadByte(6) : 0;
                 pump.flow = (typeof ptype !== 'undefined' && ptype.maxFlow > 0) ? msg.extractPayloadByte(7) : 0;
                 pump.ppc = msg.extractPayloadByte(8);
                 pump.status = (msg.extractPayloadByte(11) * 256) + msg.extractPayloadByte(12); // 16-bits of error codes.

package/controller/nixie/circuits/Circuit.ts

@@ -158,17 +158,22 @@ export class NixieCircuit extends NixieEquipment {
     }
     protected async setIntelliBriteThemeAsync(cstate: CircuitState, theme: any): Promise<InterfaceServerResponse> {
         let arr = [];
-        if (cstate.isOn) arr.push({ isOn: false, timeout: 1000 });
         let count = typeof theme !== 'undefined' && theme.sequence ? theme.sequence : 0;
-        if (cstate.isOn) arr.push({ isOn: false, timeout: 1000 });
+		
+		// Removing this. No need to turn the light off first.  We actually need it on to start the sequence for theme setting to work correctly when the light is starting from the off state.
+		// if (cstate.isOn) arr.push({ isOn: false, timeout: 1000 });
+		
+		// Start the sequence of off/on after the light is on.
+        arr.push({ isOn: true, timeout: 100 });
         for (let i = 0; i < count; i++) {
-            if (i < count - 1) {
-                arr.push({ isOn: true, timeout: 100 });
-                arr.push({ isOn: false, timeout: 100 });
-            }
-            else arr.push({ isOn: true, timeout: 1000 });
+			arr.push({ isOn: false, timeout: 100 });
+			arr.push({ isOn: true, timeout: 100 });     
         }
-        console.log(arr);
+		// Ensure light stays on long enough for the theme to stick (required for light group theme setting to function correctly).
+		// 2s was too short.
+		arr.push({ isOn: true, timeout: 3000 });
+        
+		logger.debug(arr);
         let res = await NixieEquipment.putDeviceService(this.circuit.connectionId, `/state/device/${this.circuit.deviceBinding}`, arr, 60000);
         // Even though we ended with on we need to make sure that the relay stays on now that we are done.
         if (!res.error) {

package/controller/nixie/pumps/Pump.ts

@@ -771,9 +771,13 @@ export class NixiePumpVF extends NixiePumpRS485 {
                 // When we are 0 then it sends 4[255], 6[4], 5[6]
                 // When we are not 0 then it sends 4[255], 6[10], 5[6], 1[flow]
                 if (!this.closing) await this.setPumpToRemoteControlAsync(); // Action 4
-                if (!this.closing) await this.setDriveStateAsync();         // Action 6
-                if (!this.closing) await this.setPumpFeatureAsync(this._targetSpeed > 0 ? 6 : undefined); // Action 5
                 if (!this.closing && this._targetSpeed > 0) await this.setPumpGPMAsync(); // Action 1
+                if (!this.closing && this._targetSpeed > 0) await this.setPumpFeatureAsync(6); // Action 5
+                // RKS: 07-21-24 - This used to send an empty payload when the pump should be off.  For VF pumps it
+                // appears that not setting the feature or target flow will set the pump off when it gets to
+                // the drive state.
+                //if (!this.closing) await this.setPumpFeatureAsync(this._targetSpeed > 0 ? 6 : undefined); // Action 5
+                if (!this.closing) await this.setDriveStateAsync();         // Action 6
                 if (!this.closing) await setTimeout(200);
                 if (!this.closing) await this.requestPumpStatusAsync(); // Action 7
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nodejs-poolcontroller",
-    "version": "8.0.2",
+    "version": "8.0.5",
     "description": "nodejs-poolController",
     "main": "app.js",
     "author": {

package/.docker/Dockerfile.armv6

@@ -1,29 +0,0 @@
-# Use a base image compatible with ARMv6 architecture
-FROM arm32v6/node:14-alpine
-
-# Install necessary build dependencies
-RUN apk add --no-cache make gcc g++ python3 linux-headers udev tzdata git
-
-# Set the working directory
-WORKDIR /app
-
-# Copy package.json and package-lock.json
-COPY package*.json ./
-
-# Install dependencies (both development and production)
-RUN npm ci
-
-# Copy the rest of the application
-COPY . .
-
-# Build the application
-RUN npm run build
-
-# Set environment variables
-ENV NODE_ENV=production
-
-# Expose the port (if applicable)
-EXPOSE 4200
-
-# Command to run the application
-CMD ["node", "dist/app.js"]

package/.docker/Dockerfile.armv7

@@ -1,29 +0,0 @@
-# Use a base image compatible with ARMv7 architecture
-FROM arm32v7/node:14-alpine
-
-# Install necessary build dependencies
-RUN apk add --no-cache make gcc g++ python3 linux-headers udev tzdata git
-
-# Set the working directory
-WORKDIR /app
-
-# Copy package.json and package-lock.json
-COPY package*.json ./
-
-# Install dependencies (both development and production)
-RUN npm ci
-
-# Copy the rest of the application
-COPY . .
-
-# Build the application
-RUN npm run build
-
-# Set environment variables
-ENV NODE_ENV=production
-
-# Expose the port (if applicable)
-EXPOSE 4200
-
-# Command to run the application
-CMD ["node", "dist/app.js"]

package/.docker/Dockerfile.linux

@@ -1,62 +0,0 @@
-# Use a Linux-based image as the build stage for the first application
-FROM node:lts-alpine AS build-njspc
-
-# Install necessary build dependencies
-RUN apk add --no-cache make gcc g++ python3 linux-headers udev tzdata
-
-# Create the app directory and set ownership for the first application
-RUN mkdir -p /app/nodejs-poolcontroller && chown node:node /app/nodejs-poolcontroller
-
-# Set the working directory for the first application
-WORKDIR /app/nodejs-poolcontroller
-
-# Copy the source code and necessary files for the first application
-COPY ./nodejs-poolcontroller/defaultConfig.json ./config.json
-COPY ./nodejs-poolcontroller ./
-COPY ./.docker/ecosystem.config.js ./ecosystem.config.js
-
-# Install dependencies and build the first application
-RUN npm ci
-RUN npm run build
-
-# Second stage for the second application
-FROM node:lts-alpine AS build-njspc-dp
-
-# Create the app directory and set ownership for the second application
-RUN mkdir -p /app/nodejs-poolcontroller-dashpanel && chown node:node /app/nodejs-poolcontroller-dashpanel
-
-# Set the working directory for the second application
-WORKDIR /app/nodejs-poolcontroller-dashpanel
-
-# Copy the source code and necessary files for the second application
-COPY ./nodejs-poolcontroller-dashpanel ./
-
-# Install dependencies and build the second application
-RUN npm ci
-RUN npm run build
-
-# Fourth stage for the final combined image
-FROM node:lts-alpine AS final
-
-# Install PM2 globally
-RUN npm install pm2 -g
-
-# Create the app directory and set ownership
-RUN mkdir -p /app && chown node:node /app
-
-# Set the working directory for the final combined image
-WORKDIR /app
-
-# Copy built applications from the previous stages into the final image
-COPY --from=build-njspc /app/nodejs-poolcontroller ./nodejs-poolcontroller
-COPY --from=build-njspc-dp /app/nodejs-poolcontroller-dashpanel ./nodejs-poolcontroller-dashpanel
-# COPY --from=build-rem /app/relayEquipmentManager ./relayEquipmentManager
-
-# Copy the ecosystem configuration file from the build stage
-COPY --from=build-njspc /app/nodejs-poolcontroller/ecosystem.config.js ./ecosystem.config.js
-
-# Expose any necessary ports
-EXPOSE 4200 5150
-
-# Define the command to run both applications using PM2
-CMD ["pm2-runtime", "start", "ecosystem.config.js"]

package/.docker/Dockerfile.windows

@@ -1,43 +0,0 @@
-# Use a Windows-based image as the build stage
-FROM mcr.microsoft.com/windows/servercore:ltsc2019 AS build
-
-# Set the working directory
-WORKDIR C:\app
-
-# Copy package.json and package-lock.json files
-COPY package*.json ./
-COPY defaultConfig.json config.json
-
-# Install Node.js
-RUN curl -sL https://nodejs.org/dist/v14.17.6/node-v14.17.6-x64.msi -o node.msi
-RUN msiexec /i node.msi /quiet
-
-# Install npm dependencies
-RUN npm ci
-
-# Copy the rest of the application files
-COPY . .
-
-# Build the application
-RUN npm run build
-
-# Second stage for the production image
-FROM mcr.microsoft.com/windows/servercore:ltsc2019 as prod
-
-# Install git
-RUN powershell -Command "Invoke-WebRequest -Uri https://github.com/git-for-windows/git/releases/download/v2.33.1.windows.1/Git-2.33.1-64-bit.exe -OutFile git.exe" && .\git.exe /VERYSILENT /NORESTART
-
-# Create the app directory
-RUN mkdir C:\app
-
-# Set the working directory
-WORKDIR C:\app
-
-# Copy built application from the build stage
-COPY --from=build C:\app .
-
-# Set environment variables
-ENV NODE_ENV=production
-
-# Define the entrypoint
-CMD ["node", "dist/app.js"]

package/.docker/docker-compose.yml

@@ -1,47 +0,0 @@
-version: '3.8'
-
-services:
-  poolcontroller:
-    image: tagyoureit/nodejs-poolcontroller:latest
-    container_name: poolcontroller
-    restart: always
-    group_add:
-      - dialout
-    devices:
-      - /dev/ttyUSB0
-    ports:
-      - "4200:4200"
-    volumes:
-      - /data/poolcontroller/config.json:/app/nodejs-poolcontroller/config.json
-      - /data/poolcontroller/data:/app/nodejs-poolcontroller/data
-      - /data/poolcontroller/logs:/app/nodejs-poolcontroller/logs
-  poolcontroller-dashpanel:
-    restart: always
-    container_name: poolcontroller-dashpanel
-    ports:
-      - "5150:5150"
-    volumes:
-      - /data/poolcontroller-dashpanel/config.json:/app/nodejs-poolcontroller-dashpanel/config.json
-    image: rstrouse/nodejs-poolcontroller-dashpanel:latest
-    depends_on:
-      - poolcontroller
-
-  # poolcontroller-armv7:
-  #   image: tagyoureit/nodejs-poolcontroller-armv7:latest
-  #   container_name: poolcontroller-armv7
-  #   restart: always
-  #   ports:
-  #     - "4200:4200"
-  #   volumes:
-  #     - /data/poolcontroller/config.json:/app/config.json
-  #     - /data/poolcontroller/data:/app/data
-
-  # poolcontroller-armv6:
-  #   image: tagyoureit/nodejs-poolcontroller-armv6:latest
-  #   container_name: poolcontroller-armv6
-  #   restart: always
-  #   ports:
-  #     - "4200:4200"
-  #   volumes:
-  #     - /data/poolcontroller/config.json:/app/config.json
-  #     - /data/poolcontroller/data:/app/data

package/.docker/ecosystem.config.js

@@ -1,35 +0,0 @@
-module.exports = {
-  apps: [
-    {
-      name: "dashPanel",
-      script: "npm",
-      args: ["start"],
-      cwd: "/app/nodejs-poolcontroller-dashpanel",
-      restart_delay: 10000,
-      watch: [
-        "pages",
-        "scripts",
-        "server",
-        "package.json"
-      ],
-      watch_delay: 5000,
-      kill_timeout: 15000
-    },
-    {
-      name: "njsPC",
-      script: "npm",
-      args: ["start"],
-      cwd: "/app/nodejs-poolcontroller",
-      restart_delay: 10000,
-      watch: [
-        "config",
-        "controller",
-        "logger",
-        "web",
-        "package.json"
-      ],
-      watch_delay: 5000,
-      kill_timeout: 15000
-    }
-  ]
-};

package/.github/workflows/docker-publish-njsPC-windows.yml

@@ -1,41 +0,0 @@
-name: Publish Docker Image - Windows
-
-on:
-  push:
-    branches:
-      - docker
-  workflow_dispatch:
-    
-
-jobs:
-  build-and-push-windows:
-    runs-on: windows-latest
-    
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      -
-          # Add support for more platforms with QEMU (optional)
-          # https://github.com/docker/setup-qemu-action
-          name: Set up QEMU
-          uses: docker/setup-qemu-action@v3
-      -
-          name: Set up Docker Buildx
-          uses: docker/setup-buildx-action@v3
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push Windows Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: ./Dockerfile.windows
-          push: true
-          tags: |
-            tagyoureit/nodejs-poolcontroller:windows-latest
-          platforms: windows/amd64