nodejs-poolcontroller 7.7.0 → 8.0.0

package/controller/boards/AquaLinkBoard.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
@@ -688,6 +689,7 @@ class AquaLinkChlorinatorCommands extends ChlorinatorCommands {
         let model = typeof obj.model !== 'undefined' ? obj.model : chlor.model;
         let portId = typeof obj.portId !== 'undefined' ? parseInt(obj.portId, 10) : chlor.portId;
         if (portId !== chlor.portId && sys.chlorinators.count(elem => elem.id !== chlor.id && elem.portId === portId && elem.master !== 2) > 0) return Promise.reject(new InvalidEquipmentDataError(`Another chlorinator is installed on port #${portId}.  Only one chlorinator can be installed per port.`, 'Chlorinator', portId));
+        let saltTarget = typeof obj.saltTarget === 'number' ? parseInt(obj.saltTarget, 10) : chlor.saltTarget;
 
         let chlorType = typeof obj.type !== 'undefined' ? sys.board.valueMaps.chlorinatorType.encode(obj.type) : chlor.type || 0;
         if (isAdd) {
@@ -719,13 +721,14 @@ class AquaLinkChlorinatorCommands extends ChlorinatorCommands {
         try {
             let schlor = state.chlorinators.getItemById(id, true);
             chlor.disabled = disabled;
+            chlor.saltTarget = saltTarget;
             schlor.isActive = chlor.isActive = true;
             schlor.superChlor = chlor.superChlor = superChlorinate;
             schlor.poolSetpoint = chlor.poolSetpoint = poolSetpoint;
             schlor.spaSetpoint = chlor.spaSetpoint = spaSetpoint;
             schlor.superChlorHours = chlor.superChlorHours = superChlorHours;
             schlor.body = chlor.body = body;
-            chlor.address = 79 + id;
+            if (typeof chlor.address === 'undefined') chlor.address = 80; // 79 + id;
             chlor.name = schlor.name = name;
             schlor.model = chlor.model = model;
             schlor.type = chlor.type = chlorType;
@@ -780,7 +783,7 @@ class AquaLinkPumpCommands extends PumpCommands {
             // changing type?  clear out all props and add as new
             if (ntype !== pump.type) {
                 isAdd = true;
-                super.setType(pump, ntype);
+                //super.setType(pump, ntype);
                 pump = sys.pumps.getItemById(id, false); // refetch pump with new value
             }
         }

package/controller/boards/BoardFactory.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
@@ -23,6 +24,7 @@ import { ControllerType } from '../Constants';
 import { PoolSystem } from '../Equipment';
 import { NixieBoard } from './NixieBoard';
 import { AquaLinkBoard } from './AquaLinkBoard';
+import { SunTouchBoard } from "./SunTouchBoard";
 
 
 export class BoardFactory {
@@ -42,6 +44,8 @@ export class BoardFactory {
                 return new NixieBoard(system);
             case ControllerType.AquaLink:
                 return new AquaLinkBoard(system);
+            case ControllerType.SunTouch:
+                return new SunTouchBoard(system);
         }
         return new SystemBoard(system);
     }