hoffmation-base 2.9.14 → 2.9.16

package/lib/server/devices/device-cluster.js

@@ -39,6 +39,7 @@ class DeviceCluster {
             case deviceType_1.DeviceType.ZigbeeIlluDimmer:
             case deviceType_1.DeviceType.ZigbeeOsramDimmer:
             case deviceType_1.DeviceType.ZigbeeIlluLampe:
+            case deviceType_1.DeviceType.ZigbeeUbisysLampe:
                 clusterTypes.push(device_cluster_type_1.DeviceClusterType.Lamps);
                 break;
             case deviceType_1.DeviceType.HmIpWippe:
@@ -97,6 +98,7 @@ class DeviceCluster {
                 clusterTypes.push(device_cluster_type_1.DeviceClusterType.WLED);
                 break;
             case deviceType_1.DeviceType.ZigbeeIlluActuator: // Dependent on use case
+            case deviceType_1.DeviceType.ZigbeeUbisysActuator: // Dependent on use case
             case deviceType_1.DeviceType.HmIpTherm: // Humidity and temperature not yet implemented
             case deviceType_1.DeviceType.HmIpHeizung: // Setting/Controlling via HM-Ip Heizgruppe
             case deviceType_1.DeviceType.unknown:

package/lib/server/devices/deviceType.d.ts

@@ -35,6 +35,8 @@ export declare enum DeviceType {
     ZigbeeLinkindLedRgbCct = 221,
     ZigbeeOsramDimmer = 222,
     ZigbeeIkeaShutter = 223,
+    ZigbeeUbisysActuator = 224,
+    ZigbeeUbisysLampe = 224,
     JsEnergyManager = 301,
     RoomScene = 401,
     WledDevice = 1001,

package/lib/server/devices/deviceType.js

@@ -39,6 +39,8 @@ var DeviceType;
     DeviceType[DeviceType["ZigbeeLinkindLedRgbCct"] = 221] = "ZigbeeLinkindLedRgbCct";
     DeviceType[DeviceType["ZigbeeOsramDimmer"] = 222] = "ZigbeeOsramDimmer";
     DeviceType[DeviceType["ZigbeeIkeaShutter"] = 223] = "ZigbeeIkeaShutter";
+    DeviceType[DeviceType["ZigbeeUbisysActuator"] = 224] = "ZigbeeUbisysActuator";
+    DeviceType[DeviceType["ZigbeeUbisysLampe"] = 224] = "ZigbeeUbisysLampe";
     DeviceType[DeviceType["JsEnergyManager"] = 301] = "JsEnergyManager";
     DeviceType[DeviceType["RoomScene"] = 401] = "RoomScene";
     DeviceType[DeviceType["WledDevice"] = 1001] = "WledDevice";

package/lib/server/devices/devices.js

@@ -142,6 +142,12 @@ class Devices {
             case 'SonoffTemp':
                 d = new zigbee_1.ZigbeeSonoffTemp(zigbeeInfo);
                 break;
+            case 'UbisysActuator':
+                d = new zigbee_1.ZigbeeUbisysActuator(zigbeeInfo);
+                break;
+            case 'UbisysLampe':
+                d = new zigbee_1.ZigbeeUbisysLampe(zigbeeInfo);
+                break;
             case 'UbisysShutter':
                 d = new zigbee_1.ZigbeeUbisysShutter(zigbeeInfo);
                 break;

package/lib/server/devices/zigbee/BaseDevices/zigbeeSwitch.js

@@ -10,7 +10,7 @@ class ZigbeeSwitch extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, deviceType) {
         super(pInfo, deviceType);
         this.battery = -99;
-        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven, DeviceCapability_1.DeviceCapability.buttonSwitch);
     }
     persist(buttonName, pressType) {
         var _a;

package/lib/server/devices/zigbee/index.d.ts

@@ -20,4 +20,6 @@ export * from './zigbeeSMaBiTMagnetContact';
 export * from './zigbeeSonoffMotion';
 export * from './zigbeeSonoffTemp';
 export * from './zigbeeTuyaValve';
+export * from './zigbeeUbisysActuator';
+export * from './zigbeeUbisysLampe';
 export * from './zigbeeUbisysShutter';

package/lib/server/devices/zigbee/index.js

@@ -36,4 +36,6 @@ __exportStar(require("./zigbeeSMaBiTMagnetContact"), exports);
 __exportStar(require("./zigbeeSonoffMotion"), exports);
 __exportStar(require("./zigbeeSonoffTemp"), exports);
 __exportStar(require("./zigbeeTuyaValve"), exports);
+__exportStar(require("./zigbeeUbisysActuator"), exports);
+__exportStar(require("./zigbeeUbisysLampe"), exports);
 __exportStar(require("./zigbeeUbisysShutter"), exports);

package/lib/server/devices/zigbee/zigbeeUbisysActuator.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="iobroker" />
+import { ZigbeeActuator } from './BaseDevices';
+import { DeviceType } from '../deviceType';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
+export declare class ZigbeeUbisysActuator extends ZigbeeActuator {
+    private _loadPower;
+    constructor(pInfo: IoBrokerDeviceInfo, deviceType?: DeviceType);
+    get isActuatorOn(): boolean;
+    get loadPower(): number;
+    update(idSplit: string[], state: ioBroker.State, initial?: boolean, handledByChildObject?: boolean): void;
+    setActuator(pValue: boolean, timeout?: number, force?: boolean): void;
+    toggleActuator(force?: boolean): boolean;
+}

package/lib/server/devices/zigbee/zigbeeUbisysActuator.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZigbeeUbisysActuator = void 0;
+const BaseDevices_1 = require("./BaseDevices");
+const models_1 = require("../../../models");
+const deviceType_1 = require("../deviceType");
+class ZigbeeUbisysActuator extends BaseDevices_1.ZigbeeActuator {
+    constructor(pInfo, deviceType = deviceType_1.DeviceType.ZigbeeUbisysActuator) {
+        super(pInfo, deviceType, `${pInfo.fullID}.state`);
+        this._loadPower = 0;
+    }
+    get isActuatorOn() {
+        return this.actuatorOn;
+    }
+    get loadPower() {
+        return this._loadPower;
+    }
+    update(idSplit, state, initial = false, handledByChildObject = false) {
+        if (!handledByChildObject) {
+            this.log(models_1.LogLevel.DeepTrace, `Aktuator Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
+        }
+        switch (idSplit[3]) {
+            case 'load_power':
+                const newLoadPower = state.val;
+                this.log(Math.abs(newLoadPower - this._loadPower) > 0.25 ? models_1.LogLevel.Trace : models_1.LogLevel.DeepTrace, `Outlet update, new current load power: ${state.val}`);
+                this._loadPower = newLoadPower;
+                break;
+        }
+        super.update(idSplit, state, initial, true);
+    }
+    setActuator(pValue, timeout = -1, force = false) {
+        super.setActuator(pValue, timeout, force);
+    }
+    toggleActuator(force = false) {
+        return super.toggleActuator(force);
+    }
+}
+exports.ZigbeeUbisysActuator = ZigbeeUbisysActuator;

package/lib/server/devices/zigbee/zigbeeUbisysLampe.d.ts

@@ -0,0 +1,15 @@
+/// <reference types="iobroker" />
+import { TimeOfDay } from '../../../models';
+import { iLamp } from '../baseDeviceInterfaces';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
+import { ZigbeeUbisysActuator } from './zigbeeUbisysActuator';
+export declare class ZigbeeUbisysLampe extends ZigbeeUbisysActuator implements iLamp {
+    constructor(pInfo: IoBrokerDeviceInfo);
+    get lightOn(): boolean;
+    update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
+    /** @inheritdoc */
+    setLight(pValue: boolean, timeout?: number, force?: boolean): void;
+    toggleLight(time?: TimeOfDay, force?: boolean, calculateTime?: boolean): boolean;
+    setTimeBased(time: TimeOfDay, timeout?: number, force?: boolean): void;
+    persist(): void;
+}

package/lib/server/devices/zigbee/zigbeeUbisysLampe.js

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZigbeeUbisysLampe = void 0;
+const deviceType_1 = require("../deviceType");
+const models_1 = require("../../../models");
+const services_1 = require("../../services");
+const DeviceCapability_1 = require("../DeviceCapability");
+const zigbeeUbisysActuator_1 = require("./zigbeeUbisysActuator");
+class ZigbeeUbisysLampe extends zigbeeUbisysActuator_1.ZigbeeUbisysActuator {
+    constructor(pInfo) {
+        super(pInfo, deviceType_1.DeviceType.ZigbeeUbisysLampe);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
+    }
+    get lightOn() {
+        return super.isActuatorOn;
+    }
+    update(idSplit, state, initial = false) {
+        super.update(idSplit, state, initial, true);
+        switch (idSplit[3]) {
+            case 'state':
+                this.log(models_1.LogLevel.Trace, `Lampen Update für ${this.info.customName} auf ${state.val}`);
+                break;
+        }
+    }
+    /** @inheritdoc */
+    setLight(pValue, timeout = -1, force = false) {
+        this.log(models_1.LogLevel.Debug, `Set Light Acutator to "${pValue}"`, services_1.LogDebugType.SetActuator);
+        if (this.settings.isStromStoss) {
+            timeout = 3000;
+            services_1.Utils.guardedTimeout(() => {
+                var _a;
+                if (this.room && ((_a = this.room.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.anyPresent())) {
+                    this.setLight(true, -1, true);
+                }
+            }, this.settings.stromStossResendTime * 1000, this);
+        }
+        super.setActuator(pValue, timeout, force);
+    }
+    toggleLight(time, force = false, calculateTime = false) {
+        var _a;
+        const newVal = this.queuedValue !== null ? !this.queuedValue : !this.lightOn;
+        const timeout = newVal && force ? 30 * 60 * 1000 : -1;
+        if (newVal && time === undefined && calculateTime && this.room !== undefined) {
+            time = services_1.TimeCallbackService.dayType((_a = this.room) === null || _a === void 0 ? void 0 : _a.settings.lampOffset);
+        }
+        if (newVal && time !== undefined) {
+            this.setTimeBased(time, timeout, force);
+            return true;
+        }
+        this.setLight(newVal, timeout, force);
+        return newVal;
+    }
+    setTimeBased(time, timeout = -1, force = false) {
+        if ((time === models_1.TimeOfDay.Night && this.settings.nightOn) ||
+            (time === models_1.TimeOfDay.BeforeSunrise && this.settings.dawnOn) ||
+            (time === models_1.TimeOfDay.AfterSunset && this.settings.duskOn)) {
+            this.setLight(true, timeout, force);
+        }
+    }
+    persist() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistActuator(this);
+    }
+}
+exports.ZigbeeUbisysLampe = ZigbeeUbisysLampe;