nodejs-poolcontroller 8.1.2 → 8.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.eslintrc.json +36 -36
- package/.github/ISSUE_TEMPLATE/1-bug-report.yml +84 -84
- package/.github/ISSUE_TEMPLATE/2-docs.md +12 -12
- package/.github/ISSUE_TEMPLATE/3-proposal.md +28 -28
- package/.github/ISSUE_TEMPLATE/config.yml +8 -8
- package/.github/copilot-instructions.md +63 -0
- package/.github/workflows/ghcr-publish.yml +67 -0
- package/AGENTS.md +597 -0
- package/CONTRIBUTING.md +74 -74
- package/Changelog +292 -257
- package/Dockerfile +62 -19
- package/Gruntfile.js +40 -40
- package/LICENSE +661 -661
- package/README.md +318 -191
- package/anslq25/MessagesMock.ts +221 -221
- package/anslq25/boards/MockBoardFactory.ts +49 -49
- package/anslq25/boards/MockEasyTouchBoard.ts +696 -696
- package/anslq25/boards/MockSystemBoard.ts +216 -216
- package/anslq25/chemistry/MockChlorinator.ts +98 -98
- package/anslq25/pumps/MockPump.ts +83 -83
- package/app.ts +115 -115
- package/config/Config.ts +57 -7
- package/config/VersionCheck.ts +63 -35
- package/controller/Constants.ts +809 -805
- package/controller/Equipment.ts +2688 -2664
- package/controller/Errors.ts +181 -181
- package/controller/Lockouts.ts +549 -549
- package/controller/State.ts +3738 -3690
- package/controller/boards/AquaLinkBoard.ts +1003 -1003
- package/controller/boards/BoardFactory.ts +53 -53
- package/controller/boards/EasyTouchBoard.ts +3202 -3202
- package/controller/boards/IntelliCenterBoard.ts +4393 -3899
- package/controller/boards/IntelliComBoard.ts +69 -69
- package/controller/boards/IntelliTouchBoard.ts +382 -382
- package/controller/boards/NixieBoard.ts +1944 -1929
- package/controller/boards/SunTouchBoard.ts +400 -400
- package/controller/boards/SystemBoard.ts +5268 -5268
- package/controller/comms/Comms.ts +1272 -1214
- package/controller/comms/ScreenLogic.ts +1665 -1665
- package/controller/comms/messages/Messages.ts +1433 -1243
- package/controller/comms/messages/config/ChlorinatorMessage.ts +5 -0
- package/controller/comms/messages/config/CircuitGroupMessage.ts +0 -0
- package/controller/comms/messages/config/CircuitMessage.ts +0 -0
- package/controller/comms/messages/config/ConfigMessage.ts +6 -0
- package/controller/comms/messages/config/CoverMessage.ts +0 -0
- package/controller/comms/messages/config/CustomNameMessage.ts +31 -31
- package/controller/comms/messages/config/EquipmentMessage.ts +216 -210
- package/controller/comms/messages/config/ExternalMessage.ts +96 -10
- package/controller/comms/messages/config/FeatureMessage.ts +0 -0
- package/controller/comms/messages/config/GeneralMessage.ts +0 -0
- package/controller/comms/messages/config/HeaterMessage.ts +0 -0
- package/controller/comms/messages/config/IntellichemMessage.ts +0 -0
- package/controller/comms/messages/config/OptionsMessage.ts +194 -174
- package/controller/comms/messages/config/PumpMessage.ts +0 -0
- package/controller/comms/messages/config/RemoteMessage.ts +0 -0
- package/controller/comms/messages/config/ScheduleMessage.ts +401 -390
- package/controller/comms/messages/config/SecurityMessage.ts +0 -0
- package/controller/comms/messages/config/ValveMessage.ts +0 -0
- package/controller/comms/messages/status/ChlorinatorStateMessage.ts +0 -0
- package/controller/comms/messages/status/EquipmentStateMessage.ts +1158 -822
- package/controller/comms/messages/status/HeaterStateMessage.ts +135 -135
- package/controller/comms/messages/status/IntelliChemStateMessage.ts +448 -448
- package/controller/comms/messages/status/IntelliValveStateMessage.ts +36 -36
- package/controller/comms/messages/status/PumpStateMessage.ts +0 -0
- package/controller/comms/messages/status/RegalModbusStateMessage.ts +411 -0
- package/controller/comms/messages/status/VersionMessage.ts +103 -41
- package/controller/nixie/Nixie.ts +173 -173
- package/controller/nixie/NixieEquipment.ts +104 -104
- package/controller/nixie/bodies/Body.ts +120 -120
- package/controller/nixie/bodies/Filter.ts +135 -135
- package/controller/nixie/chemistry/ChemController.ts +2724 -2724
- package/controller/nixie/chemistry/ChemDoser.ts +806 -806
- package/controller/nixie/chemistry/Chlorinator.ts +367 -367
- package/controller/nixie/circuits/Circuit.ts +478 -478
- package/controller/nixie/heaters/Heater.ts +834 -834
- package/controller/nixie/pumps/Pump.ts +1194 -996
- package/controller/nixie/schedules/Schedule.ts +401 -401
- package/controller/nixie/valves/Valve.ts +170 -170
- package/defaultConfig.json +352 -347
- package/docker-compose.yml +32 -0
- package/logger/DataLogger.ts +448 -448
- package/logger/Logger.ts +448 -436
- package/package.json +58 -60
- package/sendSocket.js +32 -32
- package/tsconfig.json +25 -25
- package/types/express-multer.d.ts +32 -0
- package/web/Server.ts +1937 -1927
- package/web/bindings/aqualinkD.json +559 -559
- package/web/bindings/influxDB.json +1066 -1066
- package/web/bindings/mqtt.json +721 -721
- package/web/bindings/mqttAlt.json +746 -746
- package/web/bindings/rulesManager.json +54 -54
- package/web/bindings/smartThings-Hubitat.json +31 -31
- package/web/bindings/valveRelays.json +20 -20
- package/web/bindings/vera.json +25 -25
- package/web/interfaces/baseInterface.ts +188 -188
- package/web/interfaces/httpInterface.ts +148 -148
- package/web/interfaces/influxInterface.ts +283 -283
- package/web/interfaces/mqttInterface.ts +695 -695
- package/web/interfaces/ruleInterface.ts +101 -87
- package/web/services/config/Config.ts +1063 -1053
- package/web/services/config/ConfigSocket.ts +0 -0
- package/web/services/state/State.ts +0 -0
- package/web/services/state/StateSocket.ts +0 -0
- package/web/services/utilities/Utilities.ts +233 -233
- package/.github/workflows/docker-publish-njsPC-linux.yml +0 -50
|
@@ -1,69 +1,69 @@
|
|
|
1
|
-
/* nodejs-poolController. An application to control pool equipment.
|
|
2
|
-
Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022.
|
|
3
|
-
Russell Goldin, tagyoureit. russ.goldin@gmail.com
|
|
4
|
-
|
|
5
|
-
This program is free software: you can redistribute it and/or modify
|
|
6
|
-
it under the terms of the GNU Affero General Public License as
|
|
7
|
-
published by the Free Software Foundation, either version 3 of the
|
|
8
|
-
License, or (at your option) any later version.
|
|
9
|
-
|
|
10
|
-
This program is distributed in the hope that it will be useful,
|
|
11
|
-
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
12
|
-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
13
|
-
GNU Affero General Public License for more details.
|
|
14
|
-
|
|
15
|
-
You should have received a copy of the GNU Affero General Public License
|
|
16
|
-
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
|
-
*/
|
|
18
|
-
import * as extend from 'extend';
|
|
19
|
-
import { EventEmitter } from 'events';
|
|
20
|
-
import { EasyTouchBoard } from './EasyTouchBoard';
|
|
21
|
-
import { sys, PoolSystem } from '../Equipment';
|
|
22
|
-
import { byteValueMap } from './SystemBoard';
|
|
23
|
-
import { state } from '../State';
|
|
24
|
-
|
|
25
|
-
export class IntelliComBoard extends EasyTouchBoard {
|
|
26
|
-
constructor(system: PoolSystem) {
|
|
27
|
-
super(system); // graph chain to EasyTouchBoard constructor.
|
|
28
|
-
this.valueMaps.expansionBoards = new byteValueMap([
|
|
29
|
-
[11, { name: 'INTCOM2', part: 'INTCOM2', desc: 'IntelliComm II', circuits: 6, shared: true }]
|
|
30
|
-
]);
|
|
31
|
-
}
|
|
32
|
-
public initExpansionModules(byte1: number, byte2: number) {
|
|
33
|
-
switch (byte1) {
|
|
34
|
-
case 40: // This is a SunTouch
|
|
35
|
-
break;
|
|
36
|
-
}
|
|
37
|
-
console.log(`Pentair IntelliCom System Detected!`);
|
|
38
|
-
|
|
39
|
-
sys.equipment.model = 'Suntouch/Intellicom';
|
|
40
|
-
|
|
41
|
-
// Initialize the installed personality board.
|
|
42
|
-
let mt = this.valueMaps.expansionBoards.transform(0);
|
|
43
|
-
let mod = sys.equipment.modules.getItemById(0, true);
|
|
44
|
-
mod.name = mt.name;
|
|
45
|
-
mod.desc = mt.desc;
|
|
46
|
-
mod.type = byte1;
|
|
47
|
-
mod.part = mt.part;
|
|
48
|
-
let eq = sys.equipment;
|
|
49
|
-
let md = mod.get();
|
|
50
|
-
eq.maxBodies = md.bodies = typeof mt.bodies !== 'undefined' ? mt.bodies : mt.shared ? 2 : 1;
|
|
51
|
-
eq.maxCircuits = md.circuits = typeof mt.circuits !== 'undefined' ? mt.circuits : 4;
|
|
52
|
-
eq.maxFeatures = md.features = typeof mt.features !== 'undefined' ? mt.features : 0
|
|
53
|
-
eq.maxValves = md.valves = typeof mt.valves !== 'undefined' ? mt.valves : 2;
|
|
54
|
-
eq.maxPumps = md.maxPumps = typeof mt.pumps !== 'undefined' ? mt.pumps : 2;
|
|
55
|
-
eq.shared = mt.shared;
|
|
56
|
-
eq.dual = false;
|
|
57
|
-
eq.single = true;
|
|
58
|
-
eq.maxChlorinators = md.chlorinators = 1;
|
|
59
|
-
eq.maxChemControllers = md.chemControllers = 1;
|
|
60
|
-
eq.maxCustomNames = 10;
|
|
61
|
-
// Calculate out the invalid ids.
|
|
62
|
-
sys.board.equipmentIds.invalidIds.set([]);
|
|
63
|
-
sys.board.equipmentIds.invalidIds.merge([5, 7, 8, 9, 13, 14, 15, 16, 17, 18])
|
|
64
|
-
sys.equipment.model = mt.desc;
|
|
65
|
-
this.initBodyDefaults();
|
|
66
|
-
state.emitControllerChange();
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
}
|
|
1
|
+
/* nodejs-poolController. An application to control pool equipment.
|
|
2
|
+
Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022.
|
|
3
|
+
Russell Goldin, tagyoureit. russ.goldin@gmail.com
|
|
4
|
+
|
|
5
|
+
This program is free software: you can redistribute it and/or modify
|
|
6
|
+
it under the terms of the GNU Affero General Public License as
|
|
7
|
+
published by the Free Software Foundation, either version 3 of the
|
|
8
|
+
License, or (at your option) any later version.
|
|
9
|
+
|
|
10
|
+
This program is distributed in the hope that it will be useful,
|
|
11
|
+
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
12
|
+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
13
|
+
GNU Affero General Public License for more details.
|
|
14
|
+
|
|
15
|
+
You should have received a copy of the GNU Affero General Public License
|
|
16
|
+
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
|
+
*/
|
|
18
|
+
import * as extend from 'extend';
|
|
19
|
+
import { EventEmitter } from 'events';
|
|
20
|
+
import { EasyTouchBoard } from './EasyTouchBoard';
|
|
21
|
+
import { sys, PoolSystem } from '../Equipment';
|
|
22
|
+
import { byteValueMap } from './SystemBoard';
|
|
23
|
+
import { state } from '../State';
|
|
24
|
+
|
|
25
|
+
export class IntelliComBoard extends EasyTouchBoard {
|
|
26
|
+
constructor(system: PoolSystem) {
|
|
27
|
+
super(system); // graph chain to EasyTouchBoard constructor.
|
|
28
|
+
this.valueMaps.expansionBoards = new byteValueMap([
|
|
29
|
+
[11, { name: 'INTCOM2', part: 'INTCOM2', desc: 'IntelliComm II', circuits: 6, shared: true }]
|
|
30
|
+
]);
|
|
31
|
+
}
|
|
32
|
+
public initExpansionModules(byte1: number, byte2: number) {
|
|
33
|
+
switch (byte1) {
|
|
34
|
+
case 40: // This is a SunTouch
|
|
35
|
+
break;
|
|
36
|
+
}
|
|
37
|
+
console.log(`Pentair IntelliCom System Detected!`);
|
|
38
|
+
|
|
39
|
+
sys.equipment.model = 'Suntouch/Intellicom';
|
|
40
|
+
|
|
41
|
+
// Initialize the installed personality board.
|
|
42
|
+
let mt = this.valueMaps.expansionBoards.transform(0);
|
|
43
|
+
let mod = sys.equipment.modules.getItemById(0, true);
|
|
44
|
+
mod.name = mt.name;
|
|
45
|
+
mod.desc = mt.desc;
|
|
46
|
+
mod.type = byte1;
|
|
47
|
+
mod.part = mt.part;
|
|
48
|
+
let eq = sys.equipment;
|
|
49
|
+
let md = mod.get();
|
|
50
|
+
eq.maxBodies = md.bodies = typeof mt.bodies !== 'undefined' ? mt.bodies : mt.shared ? 2 : 1;
|
|
51
|
+
eq.maxCircuits = md.circuits = typeof mt.circuits !== 'undefined' ? mt.circuits : 4;
|
|
52
|
+
eq.maxFeatures = md.features = typeof mt.features !== 'undefined' ? mt.features : 0
|
|
53
|
+
eq.maxValves = md.valves = typeof mt.valves !== 'undefined' ? mt.valves : 2;
|
|
54
|
+
eq.maxPumps = md.maxPumps = typeof mt.pumps !== 'undefined' ? mt.pumps : 2;
|
|
55
|
+
eq.shared = mt.shared;
|
|
56
|
+
eq.dual = false;
|
|
57
|
+
eq.single = true;
|
|
58
|
+
eq.maxChlorinators = md.chlorinators = 1;
|
|
59
|
+
eq.maxChemControllers = md.chemControllers = 1;
|
|
60
|
+
eq.maxCustomNames = 10;
|
|
61
|
+
// Calculate out the invalid ids.
|
|
62
|
+
sys.board.equipmentIds.invalidIds.set([]);
|
|
63
|
+
sys.board.equipmentIds.invalidIds.merge([5, 7, 8, 9, 13, 14, 15, 16, 17, 18])
|
|
64
|
+
sys.equipment.model = mt.desc;
|
|
65
|
+
this.initBodyDefaults();
|
|
66
|
+
state.emitControllerChange();
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
}
|