Screenlogic implementation

tagyoureit · Nov 22, 2022 · 1e6cddc · 1e6cddc
1 parent a6bbe91
commit 1e6cddc
Show file tree

Hide file tree

Showing 14 changed files with 1,830 additions and 1,036 deletions.
diff --git a/anslq25/MessagesMock.ts b/anslq25/MessagesMock.ts
@@ -11,7 +11,7 @@ export class MessagesMock {
     constructor() { }
 
     public static process(msg: Inbound) {
-        switch (msg.protocol) {
+        switch (msg. protocol) {
             case Protocol.Broadcast: {
                 switch (sys.controllerType) {
                     case ControllerType.IntelliCenter:

diff --git a/app.ts b/app.ts
@@ -39,16 +39,8 @@ export async function initAsync() {
         await conn.initAsync();
         await sys.start();
         await webApp.initAutoBackup();
-        await sl.connectAsync();
+        await sl.initAsync();
     } catch (err) { console.log(`Error Initializing nodejs-PoolController ${err.message}`);  }
-    //return Promise.resolve()
-    //    .then(function () { config.init(); })
-    //    .then(function () { logger.init(); })
-    //    .then(function () { conn.init(); })
-    //    .then(function () { sys.init(); })
-    //    .then(function () { state.init(); })
-    //    .then(function () { webApp.init(); })
-    //    .then(function () { sys.start(); });
 }
 
 export async function startPacketCapture(bResetLogs: boolean) {
@@ -78,6 +70,7 @@ export async function stopAsync(): Promise<void> {
         await sys.stopAsync();
         await state.stopAsync();
         await conn.stopAsync();
+        await sl.stopAsync();
         await webApp.stopAsync();
         await config.updateAsync();
         await logger.stopAsync();

diff --git a/controller/Equipment.ts b/controller/Equipment.ts
@@ -34,6 +34,7 @@ import { NixieControlPanel } from "./nixie/Nixie";
 import { NixieBoard } from 'controller/boards/NixieBoard';
 import { MockSystemBoard } from "../anslq25/boards/MockSystemBoard";
 import { MockBoardFactory } from "../anslq25/boards/MockBoardFactory";
+import { ScreenLogicComms } from "./comms/ScreenLogic";
 
 interface IPoolSystem {
     cfgPath: string;
@@ -335,6 +336,7 @@ export class PoolSystem implements IPoolSystem {
     public chemControllers: ChemControllerCollection;
     public chemDosers: ChemDoserCollection;
     public filters: FilterCollection;
+    public screenlogic: ScreenLogicComms;
     public appVersion: string;
     public get dirty(): boolean { return this._isDirty; }
     public set dirty(val) {
@@ -819,17 +821,6 @@ export class Options extends EqItem {
     public set cleanerSolarDelay(val: boolean) { this.setDataVal('cleanerSolarDelay', val); }
     public get cleanerSolarDelayTime(): number { return this.data.cleanerSolarDelayTime; }
     public set cleanerSolarDelayTime(val: number) { this.setDataVal('cleanerSolarDelayTime', val); }
-
-    //public get airTempAdj(): number { return typeof this.data.airTempAdj === 'undefined' ? 0 : this.data.airTempAdj; }
-    //public set airTempAdj(val: number) { this.setDataVal('airTempAdj', val); }
-    //public get waterTempAdj1(): number { return typeof this.data.waterTempAdj1 === 'undefined' ? 0 : this.data.waterTempAdj1; }
-    //public set waterTempAdj1(val: number) { this.setDataVal('waterTempAdj1', val); }
-    //public get solarTempAdj1(): number { return typeof this.data.solarTempAdj1 === 'undefined' ? 0 : this.data.solarTempAdj1; }
-    //public set solarTempAdj1(val: number) { this.setDataVal('solarTempAdj1', val); }
-    //public get waterTempAdj2(): number { return typeof this.data.waterTempAdj2 === 'undefined' ? 0 : this.data.waterTempAdj2; }
-    //public set waterTempAdj2(val: number) { this.setDataVal('waterTempAdj2', val); }
-    //public get solarTempAdj2(): number { return typeof this.data.solarTempAdj2 === 'undefined' ? 0 : this.data.solarTempAdj2; }
-    //public set solarTempAdj2(val: number) { this.setDataVal('solarTempAd2', val); }
 }
 export class VacationOptions extends ChildEqItem {
     public initData() {
@@ -2652,4 +2643,21 @@ export class AlarmSetting extends ChildEqItem {
     public get high(): number { return this.data.high; }
     public set high(val: number) { this.setDataVal('high', val); }
 }
+export class Screenlogic extends EqItem {
+    ctor(data: any, name?: any): General { return new General(data, name || 'pool'); }
+    public get enabled(): boolean { return this.data.enabled; }
+    public set enabled(val: boolean) { this.setDataVal('enabled', val); }
+    public get type(): 'local'|'remote' { return this.data.type; }
+    public set type(val: 'local'|'remote') { this.setDataVal('type', val); }
+    public get systemName(): string { return this.data.systemName; }
+    public set systemName(val: string) { this.setDataVal('systemName', val); }
+    public get password(): string { return this.data.password; }
+    public set password(val: string) { this.setDataVal('password', val); }
+
+    public clear(master: number = -1) {
+        if (master === -1)
+            super.clear();
+    }
+
+}
 export let sys = new PoolSystem();
diff --git a/controller/State.ts b/controller/State.ts
@@ -966,15 +966,15 @@ export class PumpState extends EqState {
             this.hasChanged = true;
         }
     }
-    public get virtualControllerStatus(): number {
+/*     public get virtualControllerStatus(): number {
         return typeof (this.data.virtualControllerStatus) !== 'undefined' ? this.data.virtualControllerStatus.val : -1;
     }
     public set virtualControllerStatus(val: number) {
         if (this.virtualControllerStatus !== val) {
             this.data.virtualControllerStatus = sys.board.valueMaps.virtualControllerStatus.transform(val);
             this.hasChanged = true;
         }
-    }
+    } */
     public get targetSpeed(): number { return this.data.targetSpeed; } // used for virtual controller
     public set targetSpeed(val: number) { this.setDataVal('targetSpeed', val); }
     public get type() { return typeof (this.data.type) !== 'undefined' ? this.data.type.val : -1; }