hoffmation-base 0.1.1 → 0.1.5

package/server/devices/hmIPDevices/hmIpRoll.ts

@@ -1,133 +1,133 @@
-import { LogLevel } from '../../../models/logLevel';
-import { Fenster } from './Fenster';
-import { FensterPosition } from './FensterPosition';
-import { HmIPDevice } from './hmIpDevice';
-import { HmIpDeviceType } from './hmIpDeviceType';
-import { DeviceInfo } from '../DeviceInfo';
-import { ServerLogService } from '../../services/log-service';
-import { Utils } from '../../services/utils/utils';
-
-export class HmIpRoll extends HmIPDevice {
-  public get currentLevel(): number {
-    if (this._setLevel !== -1 && this._currentLevel !== this._setLevel) {
-      return this._setLevel;
-    }
-    return this._currentLevel;
-  }
-
-  public set currentLevel(value: number) {
-    if (value !== this._setLevel && Utils.nowMS() - this._setLevelTime < 60 * 10000) {
-      value = this._setLevel;
-    }
-    if (value !== this._currentLevel && this._fenster) {
-      Utils.guardedNewThread(() => {
-        this._fenster?.rolloPositionChange(value);
-      }, this);
-    }
-    this._currentLevel = value;
-  }
-
-  public get desiredFensterLevel(): number {
-    if (this._fenster === undefined) {
-      return -1;
-    }
-    return this._fenster.desiredPosition;
-  }
-
-  private _currentLevel: number = -1;
-  private _setLevelSwitchID: string;
-  private _fenster?: Fenster;
-  private _firstCommandRecieved: boolean = false;
-  private _setLevel: number = -1;
-  private _setLevelTime: number = -1;
-
-  public set Fenster(value: Fenster) {
-    this._fenster = value;
-  }
-
-  public constructor(pInfo: DeviceInfo) {
-    super(pInfo, HmIpDeviceType.HmIpRoll);
-    this._setLevelSwitchID = `${this.info.fullID}.4.LEVEL`;
-  }
-
-  public update(idSplit: string[], state: ioBroker.State, initial: boolean = false): void {
-    ServerLogService.writeLog(
-      LogLevel.DeepTrace,
-      `Rollo Update für "${this.info.customName}": ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`,
-    );
-    super.update(idSplit, state, initial, true);
-    switch (idSplit[3]) {
-      case '3':
-        if (idSplit[4] === 'LEVEL') {
-          this.currentLevel = state.val as number;
-        }
-        break;
-    }
-  }
-
-  public setLevel(pPosition: number, initial: boolean = false, skipOpenWarning: boolean = false): void {
-    if (!this._firstCommandRecieved && !initial) {
-      this._firstCommandRecieved = true;
-    }
-    if (this._firstCommandRecieved && initial) {
-      ServerLogService.writeLog(
-        LogLevel.Debug,
-        `Skipped initial Rollo "${this.info.customName}" to ${pPosition} as we recieved a command already`,
-      );
-      return;
-    }
-    if (this.currentLevel === pPosition) {
-      ServerLogService.writeLog(
-        LogLevel.Debug,
-        `Skip Rollo command for "${this.info.customName}" to Position ${pPosition} as this is the current one`,
-      );
-      return;
-    }
-    if (this._setLevelSwitchID === '') {
-      console.error(`Keine Switch ID für "${this.info.customName}" bekannt.`);
-      return;
-    }
-
-    if (!this.ioConn) {
-      console.error(`Keine Connection für "${this.info.customName}" bekannt.`);
-      return;
-    }
-
-    if (this._fenster !== undefined) {
-      if (this._fenster.griffeInPosition(FensterPosition.offen) > 0 && pPosition < 100) {
-        if (!skipOpenWarning) {
-          ServerLogService.writeLog(
-            LogLevel.Alert,
-            `Fahre Rollo "${this.info.customName}" nicht runter, weil das Fenster offen ist!`,
-          );
-        }
-        return;
-      }
-      if (this._fenster.griffeInPosition(FensterPosition.kipp) > 0 && pPosition < 50) {
-        pPosition = 50;
-        if (!skipOpenWarning) {
-          ServerLogService.writeLog(
-            LogLevel.Alert,
-            `Fahre Rollo "${this.info.customName}" nicht runter, weil das Fenster auf Kipp ist!`,
-          );
-        }
-      }
-    }
-
-    this._setLevel = pPosition;
-    ServerLogService.writeLog(LogLevel.Debug, `Fahre Rollo "${this.info.customName}" auf Position ${pPosition}`);
-    this.ioConn.setState(this._setLevelSwitchID, pPosition);
-  }
-
-  public down(initial: boolean = false): void {
-    this.setLevel(0, initial);
-  }
-
-  public middle(): void {
-    this.setLevel(50);
-  }
-
-  public up(initial: boolean = false): void {
-    this.setLevel(100, initial);
-  }
-}
+import { LogLevel } from '../../../models/logLevel';
+import { Fenster } from './Fenster';
+import { FensterPosition } from './FensterPosition';
+import { HmIPDevice } from './hmIpDevice';
+import { HmIpDeviceType } from './hmIpDeviceType';
+import { DeviceInfo } from '../DeviceInfo';
+import { ServerLogService } from '../../services/log-service';
+import { Utils } from '../../services/utils/utils';
+
+export class HmIpRoll extends HmIPDevice {
+  public get currentLevel(): number {
+    if (this._setLevel !== -1 && this._currentLevel !== this._setLevel) {
+      return this._setLevel;
+    }
+    return this._currentLevel;
+  }
+
+  public set currentLevel(value: number) {
+    if (value !== this._setLevel && Utils.nowMS() - this._setLevelTime < 60 * 10000) {
+      value = this._setLevel;
+    }
+    if (value !== this._currentLevel && this._fenster) {
+      Utils.guardedNewThread(() => {
+        this._fenster?.rolloPositionChange(value);
+      }, this);
+    }
+    this._currentLevel = value;
+  }
+
+  public get desiredFensterLevel(): number {
+    if (this._fenster === undefined) {
+      return -1;
+    }
+    return this._fenster.desiredPosition;
+  }
+
+  private _currentLevel: number = -1;
+  private _setLevelSwitchID: string;
+  private _fenster?: Fenster;
+  private _firstCommandRecieved: boolean = false;
+  private _setLevel: number = -1;
+  private _setLevelTime: number = -1;
+
+  public set Fenster(value: Fenster) {
+    this._fenster = value;
+  }
+
+  public constructor(pInfo: DeviceInfo) {
+    super(pInfo, HmIpDeviceType.HmIpRoll);
+    this._setLevelSwitchID = `${this.info.fullID}.4.LEVEL`;
+  }
+
+  public update(idSplit: string[], state: ioBroker.State, initial: boolean = false): void {
+    ServerLogService.writeLog(
+      LogLevel.DeepTrace,
+      `Rollo Update für "${this.info.customName}": ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`,
+    );
+    super.update(idSplit, state, initial, true);
+    switch (idSplit[3]) {
+      case '3':
+        if (idSplit[4] === 'LEVEL') {
+          this.currentLevel = state.val as number;
+        }
+        break;
+    }
+  }
+
+  public setLevel(pPosition: number, initial: boolean = false, skipOpenWarning: boolean = false): void {
+    if (!this._firstCommandRecieved && !initial) {
+      this._firstCommandRecieved = true;
+    }
+    if (this._firstCommandRecieved && initial) {
+      ServerLogService.writeLog(
+        LogLevel.Debug,
+        `Skipped initial Rollo "${this.info.customName}" to ${pPosition} as we recieved a command already`,
+      );
+      return;
+    }
+    if (this.currentLevel === pPosition) {
+      ServerLogService.writeLog(
+        LogLevel.Debug,
+        `Skip Rollo command for "${this.info.customName}" to Position ${pPosition} as this is the current one`,
+      );
+      return;
+    }
+    if (this._setLevelSwitchID === '') {
+      console.error(`Keine Switch ID für "${this.info.customName}" bekannt.`);
+      return;
+    }
+
+    if (!this.ioConn) {
+      console.error(`Keine Connection für "${this.info.customName}" bekannt.`);
+      return;
+    }
+
+    if (this._fenster !== undefined) {
+      if (this._fenster.griffeInPosition(FensterPosition.offen) > 0 && pPosition < 100) {
+        if (!skipOpenWarning) {
+          ServerLogService.writeLog(
+            LogLevel.Alert,
+            `Fahre Rollo "${this.info.customName}" nicht runter, weil das Fenster offen ist!`,
+          );
+        }
+        return;
+      }
+      if (this._fenster.griffeInPosition(FensterPosition.kipp) > 0 && pPosition < 50) {
+        pPosition = 50;
+        if (!skipOpenWarning) {
+          ServerLogService.writeLog(
+            LogLevel.Alert,
+            `Fahre Rollo "${this.info.customName}" nicht runter, weil das Fenster auf Kipp ist!`,
+          );
+        }
+      }
+    }
+
+    this._setLevel = pPosition;
+    ServerLogService.writeLog(LogLevel.Debug, `Fahre Rollo "${this.info.customName}" auf Position ${pPosition}`);
+    this.ioConn.setState(this._setLevelSwitchID, pPosition);
+  }
+
+  public down(initial: boolean = false): void {
+    this.setLevel(0, initial);
+  }
+
+  public middle(): void {
+    this.setLevel(50);
+  }
+
+  public up(initial: boolean = false): void {
+    this.setLevel(100, initial);
+  }
+}

package/server/devices/hmIPDevices/hmIpTaster.ts

@@ -1,73 +1,82 @@
-import { HmIPDevice } from './hmIpDevice';
-import { HmIpDeviceType } from './hmIpDeviceType';
-import { DeviceInfo } from '../DeviceInfo';
-import { HmIPTaste } from './hmIpTaste';
-import { LogLevel } from '../../../models/logLevel';
-import { ServerLogService } from '../../services/log-service';
-
-export class HmIpTaster extends HmIPDevice {
-  public tasten: {
-    ObenLinks: HmIPTaste;
-    ObenRechts: HmIPTaste;
-    MitteLinks: HmIPTaste;
-    MitteRechts: HmIPTaste;
-    UntenLinks: HmIPTaste;
-    UntenRechts: HmIPTaste;
-  } = {
-    ObenLinks: new HmIPTaste(1),
-    ObenRechts: new HmIPTaste(2),
-    MitteLinks: new HmIPTaste(3),
-    MitteRechts: new HmIPTaste(4),
-    UntenLinks: new HmIPTaste(5),
-    UntenRechts: new HmIPTaste(6),
-  };
-
-  public constructor(pInfo: DeviceInfo) {
-    super(pInfo, HmIpDeviceType.HmIpTaster);
-  }
-
-  public update(idSplit: string[], state: ioBroker.State, initial: boolean = false): void {
-    ServerLogService.writeLog(LogLevel.Trace, `Taster Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
-    super.update(idSplit, state, initial, true);
-    let cTaste: HmIPTaste | undefined = undefined;
-    switch (idSplit[3]) {
-      case '1':
-        cTaste = this.tasten.ObenLinks;
-        break;
-      case '2':
-        cTaste = this.tasten.ObenRechts;
-        break;
-      case '3':
-        cTaste = this.tasten.MitteLinks;
-        break;
-      case '4':
-        cTaste = this.tasten.MitteRechts;
-        break;
-      case '5':
-        cTaste = this.tasten.UntenLinks;
-        break;
-      case '6':
-        cTaste = this.tasten.UntenRechts;
-        break;
-    }
-
-    if (cTaste === undefined) {
-      return;
-    }
-
-    switch (idSplit[4]) {
-      case 'PRESS_SHORT':
-        if (!initial) {
-          // Tasten beim Starten ignorieren
-          cTaste.updateShort(state.val as boolean);
-        }
-        break;
-      case 'PRESS_LONG':
-        if (!initial) {
-          // Tasten beim Starten ignorieren
-          cTaste.updateLong(state.val as boolean);
-        }
-        break;
-    }
-  }
-}
+import { HmIPDevice } from './hmIpDevice';
+import { HmIpDeviceType } from './hmIpDeviceType';
+import { DeviceInfo } from '../DeviceInfo';
+import { Taste } from '../taste';
+import { LogLevel } from '../../../models/logLevel';
+import { ServerLogService } from '../../services/log-service';
+import { iTaster } from "/server/config/private/server/devices/iTaster";
+
+export class HmIpTaster extends HmIPDevice implements iTaster{
+  public tasten: { [id: string]: Taste} = {
+    ObenLinks: new Taste(1),
+    ObenRechts: new Taste(2),
+    MitteLinks: new Taste(3),
+    MitteRechts: new Taste(4),
+    UntenLinks: new Taste(5),
+    UntenRechts: new Taste(6),
+  };
+
+  public constructor(pInfo: DeviceInfo) {
+    super(pInfo, HmIpDeviceType.HmIpTaster);
+  }
+
+  public update(idSplit: string[], state: ioBroker.State, initial: boolean = false): void {
+    ServerLogService.writeLog(LogLevel.Trace, `Taster Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
+    super.update(idSplit, state, initial, true);
+    let cTaste: Taste | undefined = undefined;
+    switch (idSplit[3]) {
+      case '1':
+        cTaste = this.tasten.ObenLinks;
+        break;
+      case '2':
+        cTaste = this.tasten.ObenRechts;
+        break;
+      case '3':
+        cTaste = this.tasten.MitteLinks;
+        break;
+      case '4':
+        cTaste = this.tasten.MitteRechts;
+        break;
+      case '5':
+        cTaste = this.tasten.UntenLinks;
+        break;
+      case '6':
+        cTaste = this.tasten.UntenRechts;
+        break;
+    }
+
+    if (cTaste === undefined) {
+      return;
+    }
+
+    switch (idSplit[4]) {
+      case 'PRESS_SHORT':
+        if (!initial) {
+          // Tasten beim Starten ignorieren
+          cTaste.updateShort(state.val as boolean);
+        }
+        break;
+      case 'PRESS_LONG':
+        if (!initial) {
+          // Tasten beim Starten ignorieren
+          cTaste.updateLong(state.val as boolean);
+        }
+        break;
+    }
+  }
+
+  public getTastenAssignment(): string {
+    const result: string[] = [`Button: ${this.info.customName}`];
+    for (const tastenName in this.tasten) {
+      const desc: string =  this.tasten[tastenName].getDescription();
+      if (desc === '') {
+        continue;
+      }
+      result.push(`Button "${tastenName}":`);
+      result.push(desc);
+      result.push('');
+    }
+    result.push('____________');
+    return result.join('\n');
+  }
+}

package/server/devices/hmIPDevices/hmIpTherm.ts

@@ -1,19 +1,19 @@
-import { HmIPDevice } from './hmIpDevice';
-import { HmIpDeviceType } from './hmIpDeviceType';
-import { DeviceInfo } from '../DeviceInfo';
-import { LogLevel } from '../../../models/logLevel';
-import { ServerLogService } from '../../services/log-service';
-
-export class HmIpTherm extends HmIPDevice {
-  public constructor(pInfo: DeviceInfo) {
-    super(pInfo, HmIpDeviceType.HmIpTherm);
-  }
-
-  public update(idSplit: string[], state: ioBroker.State, initial: boolean = false): void {
-    ServerLogService.writeLog(
-      LogLevel.Trace,
-      `Thermostat "${this.info.customName}" Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`,
-    );
-    super.update(idSplit, state, initial, true);
-  }
-}
+import { HmIPDevice } from './hmIpDevice';
+import { HmIpDeviceType } from './hmIpDeviceType';
+import { DeviceInfo } from '../DeviceInfo';
+import { LogLevel } from '../../../models/logLevel';
+import { ServerLogService } from '../../services/log-service';
+
+export class HmIpTherm extends HmIPDevice {
+  public constructor(pInfo: DeviceInfo) {
+    super(pInfo, HmIpDeviceType.HmIpTherm);
+  }
+
+  public update(idSplit: string[], state: ioBroker.State, initial: boolean = false): void {
+    ServerLogService.writeLog(
+      LogLevel.Trace,
+      `Thermostat "${this.info.customName}" Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`,
+    );
+    super.update(idSplit, state, initial, true);
+  }
+}