hoffmation-base 3.0.0-alpha.23 → 3.0.0-alpha.24

package/lib/server/devices/shelly/shellyTrv.js

@@ -9,21 +9,16 @@ const liquid_pid_1 = require("../../../liquid-pid");
 const deviceType_1 = require("../deviceType");
 const DeviceCapability_1 = require("../DeviceCapability");
 class ShellyTrv extends shellyDevice_1.ShellyDevice {
-    get lastBatteryPersist() {
-        return this._lastBatteryPersist;
-    }
-    get battery() {
-        return this._battery;
-    }
-    get minimumLevel() {
-        return this._minimumValveLevel;
-    }
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ShellyTrv);
+        /** @inheritDoc */
         this.settings = new models_1.HeaterSettings();
+        /** @inheritDoc */
         this.persistHeaterInterval = services_1.Utils.guardedInterval(() => {
             this.persistHeater();
         }, 5 * 60 * 1000, this, false);
+        this._seasonTurnOff = false;
+        this._roomTemperature = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         this._automaticMode = false;
         this._battery = -99;
         this._initialSeasonCheckDone = false;
@@ -46,9 +41,6 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
             Kd: 9, // PID: Kd in 1/1000
         });
         this._lastBatteryPersist = 0;
-        this._seasonTurnOff = false;
-        this._humidity = 0;
-        this._roomTemperature = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.heater);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         this._setAutomaticModeId = `${this.info.fullID}.tmp.automaticTemperatureControl`;
@@ -62,9 +54,22 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
             this.checkSeasonTurnOff();
         }, 0, 2, 0));
     }
+    /** @inheritDoc */
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
+    /** @inheritDoc */
+    get battery() {
+        return this._battery;
+    }
+    get minimumLevel() {
+        return this._minimumValveLevel;
+    }
+    /** @inheritDoc */
     get seasonTurnOff() {
         return this._seasonTurnOff;
     }
+    /** @inheritDoc */
     set seasonTurnOff(value) {
         this._seasonTurnOff = value;
         if (value) {
@@ -74,9 +79,11 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         }
         this.setMode(!this.settings.controlByPid);
     }
+    /** @inheritDoc */
     get desiredTemperature() {
         return this._desiredTemperatur;
     }
+    /** @inheritDoc */
     set desiredTemperature(val) {
         this._desiredTemperatur = val;
         if (this._targetTempVal === val) {
@@ -88,18 +95,11 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
             this.log(models_1.LogLevel.Error, `Temperaturänderung ergab Fehler ${err}.`);
         });
     }
-    get humidity() {
-        return this._humidity;
-    }
-    get sLevel() {
-        return `${this._level * 100}%`;
-    }
+    /** @inheritDoc */
     get iLevel() {
         return this._level;
     }
-    get sTemperatur() {
-        return `${this.iTemperature}°C`;
-    }
+    /** @inheritDoc */
     get iTemperature() {
         if (this.settings.useOwnTemperatur) {
             return this._temperatur;
@@ -108,6 +108,7 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
             return this._roomTemperature;
         }
     }
+    /** @inheritDoc */
     get roomTemperature() {
         return this._roomTemperature;
     }
@@ -121,6 +122,7 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
             this.recalcLevel();
         }
     }
+    /** @inheritDoc */
     checkAutomaticChange() {
         var _a;
         if (!this._initialSeasonCheckDone) {
@@ -156,19 +158,16 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
             this.desiredTemperature = targetTemperature;
         }
     }
-    stopAutomaticCheck() {
-        if (this._iAutomaticInterval !== undefined) {
-            clearInterval(this._iAutomaticInterval);
-            this._iAutomaticInterval = undefined;
-        }
-    }
+    /** @inheritDoc */
     onTemperaturChange(newTemperatur) {
         this.roomTemperatur = newTemperatur;
     }
+    /** @inheritDoc */
     persistHeater() {
         var _a;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistHeater(this);
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         if (idSplit[3] === 'tmp' && idSplit[4] === 'valvePosition') {
             this.log(models_1.LogLevel.Trace, `Valve position update for ${this.info.customName} to "${state.val}"`);
@@ -197,28 +196,12 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
             this._battery = state.val;
             this.persistBatteryDevice();
             if (this._battery < 20) {
-                this.log(models_1.LogLevel.Warn, `Das Shelly Gerät hat unter 20% Batterie.`);
+                this.log(models_1.LogLevel.Warn, 'Das Shelly Gerät hat unter 20% Batterie.');
             }
         }
         super.update(idSplit, state, initial, true);
     }
-    getNextPidLevel() {
-        if (this.seasonTurnOff || this._roomTemperature < 0) {
-            return 0;
-        }
-        this._pidController.setPoint(this.desiredTemperature);
-        const newValue = this._pidController.calculate(this._roomTemperature);
-        this.log(models_1.LogLevel.Debug, `New PID Value ${newValue}% (cTemp: ${this._roomTemperature}, dTemp: ${this.desiredTemperature})`);
-        return newValue;
-    }
-    checkSeasonTurnOff() {
-        const desiredState = services_1.Utils.beetweenDays(new Date(), this.settings.seasonTurnOffDay, this.settings.seasonTurnOnDay);
-        if (desiredState !== this.seasonTurnOff || !this._initialSeasonCheckDone) {
-            this.log(models_1.LogLevel.Info, `Switching Seasonal Heating --> New seasonTurnOff: ${desiredState}`);
-            this.seasonTurnOff = desiredState;
-        }
-        this._initialSeasonCheckDone = true;
-    }
+    /** @inheritDoc */
     persistBatteryDevice() {
         var _a;
         const now = services_1.Utils.nowMS();
@@ -228,6 +211,7 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
         this._lastBatteryPersist = now;
     }
+    /** @inheritDoc */
     dispose() {
         if (this.persistHeaterInterval) {
             clearInterval(this.persistHeaterInterval);
@@ -238,6 +222,23 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         }
         super.dispose();
     }
+    getNextPidLevel() {
+        if (this.seasonTurnOff || this._roomTemperature < 0) {
+            return 0;
+        }
+        this._pidController.setPoint(this.desiredTemperature);
+        const newValue = this._pidController.calculate(this._roomTemperature);
+        this.log(models_1.LogLevel.Debug, `New PID Value ${newValue}% (cTemp: ${this._roomTemperature}, dTemp: ${this.desiredTemperature})`);
+        return newValue;
+    }
+    checkSeasonTurnOff() {
+        const desiredState = services_1.Utils.beetweenDays(new Date(), this.settings.seasonTurnOffDay, this.settings.seasonTurnOnDay);
+        if (desiredState !== this.seasonTurnOff || !this._initialSeasonCheckDone) {
+            this.log(models_1.LogLevel.Info, `Switching Seasonal Heating --> New seasonTurnOff: ${desiredState}`);
+            this.seasonTurnOff = desiredState;
+        }
+        this._initialSeasonCheckDone = true;
+    }
     recalcLevel() {
         if (this.settings.useOwnTemperatur || this.seasonTurnOff || !this.settings.controlByPid) {
             return;

package/lib/server/devices/tuya/tuyaDevice.d.ts

@@ -5,8 +5,9 @@ import { DeviceType } from '../deviceType';
 export declare class TuyaDevice extends IoBrokerBaseDevice implements iDisposable {
     private _lastUpdate;
     get lastUpdate(): Date;
-    stateMap: Map<string, ioBroker.State>;
     constructor(pInfo: IoBrokerDeviceInfo, pType: DeviceType);
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
+    /** @inheritDoc */
     dispose(): void;
 }

package/lib/server/devices/tuya/tuyaDevice.js

@@ -10,8 +10,8 @@ class TuyaDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     constructor(pInfo, pType) {
         super(pInfo, pType);
         this._lastUpdate = new Date(0);
-        this.stateMap = new Map();
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false, pOverride = false) {
         this.log(models_1.LogLevel.DeepTrace, `Tuya: ${initial ? 'Initiales ' : ''}Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         if (!pOverride) {
@@ -29,6 +29,7 @@ class TuyaDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
             }
         }
     }
+    /** @inheritDoc */
     dispose() {
         // Nothing yet
     }

package/lib/server/devices/tuya/tuyaGarageOpener.d.ts

@@ -3,6 +3,7 @@ import { GarageDoorOpenerSettings } from '../../../models';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { iGarageDoorOpener } from '../baseDeviceInterfaces';
 export declare class TuyaGarageOpener extends TuyaDevice implements iGarageDoorOpener {
+    /** @inheritDoc */
     settings: GarageDoorOpenerSettings;
     private readonly _switchId;
     private readonly _doorContactId;
@@ -10,9 +11,11 @@ export declare class TuyaGarageOpener extends TuyaDevice implements iGarageDoorO
     private _switchState;
     get isClosed(): boolean;
     constructor(pInfo: IoBrokerDeviceInfo);
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     open(): void;
     close(): void;
     trigger(): void;
+    /** @inheritDoc */
     dispose(): void;
 }

package/lib/server/devices/tuya/tuyaGarageOpener.js

@@ -11,6 +11,7 @@ class TuyaGarageOpener extends tuyaDevice_1.TuyaDevice {
     }
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.TuyaGarageDoorOpener);
+        /** @inheritDoc */
         this.settings = new models_1.GarageDoorOpenerSettings();
         this._isClosed = true;
         this._switchState = false;
@@ -18,6 +19,7 @@ class TuyaGarageOpener extends tuyaDevice_1.TuyaDevice {
         this._switchId = `${this.info.fullID}.1`;
         this._doorContactId = `${this.info.fullID}.3`;
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         const fullId = idSplit.join('.');
         switch (fullId) {
@@ -59,6 +61,7 @@ class TuyaGarageOpener extends tuyaDevice_1.TuyaDevice {
     trigger() {
         this.setState(this._switchId, !this._switchState);
     }
+    /** @inheritDoc */
     dispose() {
         super.dispose();
     }

package/lib/server/devices/tv/samsungTv.d.ts

@@ -1,6 +1,7 @@
 import { TvDevice } from './tvDevice';
 import { DeviceType } from '../deviceType';
 export declare class SamsungTv extends TvDevice {
+    /** @inheritDoc */
     deviceType: DeviceType;
     private _device;
     constructor(name: string, roomName: string, ip: string, mac: string, token: string);

package/lib/server/devices/tv/samsungTv.js

@@ -32,6 +32,7 @@ const models_1 = require("../../../models");
 class SamsungTv extends tvDevice_1.TvDevice {
     constructor(name, roomName, ip, mac, token) {
         super(name, roomName, ip, tvDeviceType_1.TvDeviceType.Samsung);
+        /** @inheritDoc */
         this.deviceType = deviceType_1.DeviceType.SamsungTv;
         this._on = false;
         this._device = new samsung_tv_control_1.default({

package/lib/server/devices/tv/tvDevice.d.ts

@@ -7,13 +7,19 @@ import { TvDeviceType } from './tvDeviceType';
 export declare abstract class TvDevice implements iTvDevice {
     ip: string;
     tvDeviceType: TvDeviceType;
+    /** @inheritDoc */
     settings: TvSettings;
+    /**
+     * @inheritDoc
+     */
     room: RoomBase | undefined;
+    /**
+     * @inheritDoc
+     */
     deviceCapabilities: DeviceCapability[];
     protected constructor(name: string, roomName: string, ip: string, tvDeviceType: TvDeviceType);
     protected _info: DeviceInfo;
     get info(): DeviceInfo;
-    set info(info: DeviceInfo);
     abstract get deviceType(): DeviceType;
     get name(): string;
     get id(): string;

package/lib/server/devices/tv/tvDevice.js

@@ -13,7 +13,11 @@ class TvDevice {
     constructor(name, roomName, ip, tvDeviceType) {
         this.ip = ip;
         this.tvDeviceType = tvDeviceType;
+        /** @inheritDoc */
         this.settings = new models_1.TvSettings();
+        /**
+         * @inheritDoc
+         */
         this.deviceCapabilities = [DeviceCapability_1.DeviceCapability.tv];
         this._info = new devices_1.DeviceInfo();
         this._info.fullName = `TV ${name}`;
@@ -27,9 +31,6 @@ class TvDevice {
     get info() {
         return this._info;
     }
-    set info(info) {
-        this._info = info;
-    }
     get name() {
         return this.info.customName;
     }

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

@@ -4,28 +4,41 @@ import { IoBrokerDeviceInfo } from './IoBrokerDeviceInfo';
 import { iDimmableLamp } from './baseDeviceInterfaces/iDimmableLamp';
 import { BlockAutomaticHandler } from '../services/blockAutomaticHandler';
 export declare class WledDevice extends IoBrokerBaseDevice implements iDimmableLamp {
-    on: boolean;
+    /** @inheritDoc */
     brightness: number;
-    battery: number;
+    /** @inheritDoc */
     queuedValue: boolean | null;
+    /** @inheritDoc */
     settings: WledSettings;
+    /** @inheritDoc */
     readonly blockAutomationHandler: BlockAutomaticHandler;
+    /** @inheritDoc */
     targetAutomaticState: boolean;
+    private on;
     protected readonly _debounceStateDelay: number;
     private readonly _onID;
     private readonly _presetID;
     private readonly _brightnessID;
     constructor(pInfo: IoBrokerDeviceInfo);
+    /** @inheritDoc */
     get actuatorOn(): boolean;
+    /** @inheritDoc */
     get lightOn(): boolean;
+    /** @inheritDoc */
     restoreTargetAutomaticValue(c: RestoreTargetAutomaticValueCommand): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, _pOverride?: boolean): void;
+    /** @inheritDoc */
     setLight(c: DimmerSetLightCommand): void;
     setWled(c: WledSetLightCommand): void;
     setTimeBased(c: LampSetTimeBasedCommand): void;
+    /** @inheritDoc */
     persist(): void;
+    /** @inheritDoc */
     setActuator(command: ActuatorSetStateCommand): void;
+    /** @inheritDoc */
     toggleActuator(c: ActuatorToggleCommand): boolean;
+    /** @inheritDoc */
     toggleLight(c: LampToggleLightCommand): boolean;
+    /** @inheritDoc */
     writeActuatorStateToDevice(c: ActuatorWriteStateToDeviceCommand): void;
 }

package/lib/server/devices/wledDevice.js

@@ -11,12 +11,15 @@ const DeviceCapability_1 = require("./DeviceCapability");
 class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.WledDevice);
-        this.on = false;
+        /** @inheritDoc */
         this.brightness = -1;
-        this.battery = -1;
+        /** @inheritDoc */
         this.queuedValue = null;
+        /** @inheritDoc */
         this.settings = new models_1.WledSettings();
+        /** @inheritDoc */
         this.targetAutomaticState = false;
+        this.on = false;
         this._debounceStateDelay = 500;
         this._onID = `${this.info.fullID}.on`;
         this._presetID = `${this.info.fullID}.ps`;
@@ -25,12 +28,15 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.dimmablelamp);
     }
+    /** @inheritDoc */
     get actuatorOn() {
         return this.on;
     }
+    /** @inheritDoc */
     get lightOn() {
         return this.on;
     }
+    /** @inheritDoc */
     restoreTargetAutomaticValue(c) {
         this.setLight(new models_1.WledSetLightCommand(c, this.targetAutomaticState));
     }
@@ -46,10 +52,12 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
                 break;
         }
     }
+    /** @inheritDoc */
     setLight(c) {
-        this.setWled(new models_1.WledSetLightCommand(c, c.on, 'Set Wled due to DimmerSetLightCommand', c.timeout, c.brightness, c.transitionTime, undefined));
+        this.setWled(new models_1.WledSetLightCommand(c, c.on, 'Set Wled due to DimmerSetLightCommand', c.disableAutomaticCommand, c.brightness, c.transitionTime, undefined));
     }
     setWled(c) {
+        var _a;
         if (this._onID === '') {
             services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Keine On ID für "${this.info.customName}" bekannt.`);
             return;
@@ -82,28 +90,36 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
                 services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Dimmer Helligkeit schalten ergab Fehler: ${err}`);
             });
         }
-        if (c.timeout !== undefined && c.timeout > -1 && !dontBlock) {
-            this.blockAutomationHandler.disableAutomatic(new models_1.BlockAutomaticCommand(c, c.timeout, '', models_1.CollisionSolving.overrideIfGreater));
+        if (!dontBlock && c.disableAutomaticCommand !== null) {
+            (_a = c.disableAutomaticCommand) !== null && _a !== void 0 ? _a : (c.disableAutomaticCommand = models_1.BlockAutomaticCommand.fromDeviceSettings(c, this.settings));
+            if (c.disableAutomaticCommand !== null) {
+                this.blockAutomationHandler.disableAutomatic(c.disableAutomaticCommand);
+            }
         }
     }
     setTimeBased(c) {
         this.setWled(models_1.WledSetLightCommand.byTimeBased(this.settings, c));
     }
+    /** @inheritDoc */
     persist() {
         var _a;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistActuator(this);
     }
+    /** @inheritDoc */
     setActuator(command) {
         this.setWled(new models_1.WledSetLightCommand(command, command.on, 'Set Wled due to ActuatorSetStateCommand'));
     }
+    /** @inheritDoc */
     toggleActuator(c) {
         const setActuatorCommand = models_1.ActuatorSetStateCommand.byActuatorAndToggleCommand(this, c);
         this.setActuator(setActuatorCommand);
         return setActuatorCommand.on;
     }
+    /** @inheritDoc */
     toggleLight(c) {
         return sharedFunctions_1.LampUtils.toggleLight(this, c);
     }
+    /** @inheritDoc */
     writeActuatorStateToDevice(c) {
         this.log(models_1.LogLevel.Debug, c.logMessage, services_1.LogDebugType.SetActuator);
         this.setState(this._onID, c.stateValue, undefined, (err) => {

package/lib/server/devices/zigbee/BaseDevices/ZigbeeActuator.d.ts

@@ -6,17 +6,28 @@ import { ZigbeeDevice } from './zigbeeDevice';
 import { BlockAutomaticHandler } from '../../../services/blockAutomaticHandler';
 export declare class ZigbeeActuator extends ZigbeeDevice implements iActuator {
     private _actuatorOn;
+    /** @inheritDoc */
     readonly blockAutomationHandler: BlockAutomaticHandler;
+    /** @inheritDoc */
     targetAutomaticState: boolean;
+    /** @inheritDoc */
     settings: ActuatorSettings;
     protected readonly actuatorOnSwitchID: string;
+    /** @inheritDoc */
     queuedValue: boolean | null;
+    /** @inheritDoc */
     get actuatorOn(): boolean;
     constructor(pInfo: IoBrokerDeviceInfo, type: DeviceType, actuatorOnSwitchID: string);
+    /** @inheritDoc */
     restoreTargetAutomaticValue(c: RestoreTargetAutomaticValueCommand): void;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, handledByChildObject?: boolean): void;
+    /** @inheritDoc */
     setActuator(command: ActuatorSetStateCommand): void;
+    /** @inheritDoc */
     persist(): void;
+    /** @inheritDoc */
     toggleActuator(command: ActuatorToggleCommand): boolean;
+    /** @inheritDoc */
     writeActuatorStateToDevice(c: ActuatorWriteStateToDeviceCommand): void;
 }

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

@@ -8,23 +8,29 @@ const DeviceCapability_1 = require("../../DeviceCapability");
 const blockAutomaticHandler_1 = require("../../../services/blockAutomaticHandler");
 const sharedFunctions_1 = require("../../sharedFunctions");
 class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {
+    /** @inheritDoc */
     get actuatorOn() {
         return this._actuatorOn;
     }
     constructor(pInfo, type, actuatorOnSwitchID) {
         super(pInfo, type);
         this._actuatorOn = false;
+        /** @inheritDoc */
         this.targetAutomaticState = false;
+        /** @inheritDoc */
         this.settings = new models_1.ActuatorSettings();
+        /** @inheritDoc */
         this.queuedValue = null;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.actuator);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.blockAutomatic);
         this.actuatorOnSwitchID = actuatorOnSwitchID;
         this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this));
     }
+    /** @inheritDoc */
     restoreTargetAutomaticValue(c) {
         this.setActuator(new models_1.ActuatorSetStateCommand(c, this.targetAutomaticState));
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false, handledByChildObject = false) {
         if (!handledByChildObject) {
             this.log(models_1.LogLevel.DeepTrace, `Aktuator Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
@@ -41,23 +47,27 @@ class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {
                 break;
         }
     }
+    /** @inheritDoc */
     setActuator(command) {
         if (this.actuatorOnSwitchID === '') {
-            this.log(models_1.LogLevel.Error, `Keine Switch ID bekannt.`);
+            this.log(models_1.LogLevel.Error, 'Keine Switch ID bekannt.');
             return;
         }
         sharedFunctions_1.LampUtils.setActuator(this, command);
     }
+    /** @inheritDoc */
     persist() {
         var _a;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistActuator(this);
     }
+    /** @inheritDoc */
     toggleActuator(command) {
         const newVal = this.queuedValue !== null ? !this.queuedValue : !this._actuatorOn;
-        const timeout = newVal && command.isForceAction ? 30 * 60 * 1000 : -1;
-        this.setActuator(new models_1.ActuatorSetStateCommand(command, newVal, 'Due to ZigbeeActuatorToggle', timeout));
+        const setStateCommand = models_1.ActuatorSetStateCommand.byActuatorAndToggleCommand(this, command);
+        this.setActuator(setStateCommand);
         return newVal;
     }
+    /** @inheritDoc */
     writeActuatorStateToDevice(c) {
         this.log(models_1.LogLevel.Debug, c.logMessage, services_1.LogDebugType.SetActuator);
         this.setState(this.actuatorOnSwitchID, c.stateValue, undefined, (err) => {

package/lib/server/devices/zigbee/BaseDevices/zigbeeDevice.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { DeviceType } from '../../deviceType';
 import { IoBrokerBaseDevice } from '../../IoBrokerBaseDevice';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
@@ -9,15 +8,17 @@ export declare class ZigbeeDevice extends IoBrokerBaseDevice implements iDisposa
     private readonly _deviceQueryId;
     get available(): boolean;
     protected _linkQuality: number;
-    readonly persistZigbeeInterval: NodeJS.Timeout;
+    private readonly _persistZigbeeInterval;
     get linkQuality(): number;
     private _lastUpdate;
     get lastUpdate(): Date;
-    stateMap: Map<string, ioBroker.State>;
     constructor(pInfo: IoBrokerDeviceInfo, pType: DeviceType);
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
     triggerDeviceQuery(): void;
+    /** @inheritDoc */
     dispose(): void;
     persistZigbeeDevice(): void;
+    /** @inheritDoc */
     protected setState(pointId: string, state: string | number | boolean | ioBroker.State | ioBroker.SettableState | null, onSuccess?: (() => void) | undefined, onError?: ((error: Error) => void) | undefined): void;
 }

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

@@ -19,13 +19,13 @@ class ZigbeeDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         this._available = false;
         this._dontSendOnUnavailable = false;
         this._linkQuality = 0;
-        this.persistZigbeeInterval = services_1.Utils.guardedInterval(() => {
+        this._persistZigbeeInterval = services_1.Utils.guardedInterval(() => {
             this.persistZigbeeDevice();
         }, 15 * 60 * 1000, this, false);
         this._lastUpdate = new Date(0);
-        this.stateMap = new Map();
         this._deviceQueryId = `${this.info.fullID}.device_query`;
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false, pOverride = false) {
         this.log(models_1.LogLevel.DeepTrace, `Zigbee: ${initial ? 'Initiales ' : ''}Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         if (!pOverride) {
@@ -39,7 +39,7 @@ class ZigbeeDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
             case 'available':
                 const newAvailability = state.val;
                 if (this._available && !newAvailability) {
-                    this.log(models_1.LogLevel.Debug, `Device became unavailable.`);
+                    this.log(models_1.LogLevel.Debug, 'Device became unavailable.');
                 }
                 this._available = newAvailability;
                 break;
@@ -60,16 +60,18 @@ class ZigbeeDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         }
     }
     triggerDeviceQuery() {
-        this.log(models_1.LogLevel.Info, `Triggering Device Query`);
+        this.log(models_1.LogLevel.Info, 'Triggering Device Query');
         this.setState(this._deviceQueryId, true);
     }
+    /** @inheritDoc */
     dispose() {
-        clearInterval(this.persistZigbeeInterval);
+        clearInterval(this._persistZigbeeInterval);
     }
     persistZigbeeDevice() {
         var _a;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistZigbeeDevice(this);
     }
+    /** @inheritDoc */
     setState(pointId, state, onSuccess = undefined, onError = undefined) {
         if (this._dontSendOnUnavailable && !this._available) {
             this.log(models_1.LogLevel.Warn, `Device unavailable --> Not changing ${pointId} to ${state}`);

package/lib/server/devices/zigbee/BaseDevices/zigbeeDimmer.d.ts

@@ -6,9 +6,13 @@ import { iDimmableLamp } from '../../baseDeviceInterfaces/iDimmableLamp';
 import { iTemporaryDisableAutomatic } from '../../baseDeviceInterfaces';
 import { BlockAutomaticHandler } from '../../../services/blockAutomaticHandler';
 export declare abstract class ZigbeeDimmer extends ZigbeeDevice implements iDimmableLamp, iTemporaryDisableAutomatic {
+    /** @inheritDoc */
     readonly blockAutomationHandler: BlockAutomaticHandler;
+    /** @inheritDoc */
     queuedValue: boolean | null;
+    /** @inheritDoc */
     settings: DimmerSettings;
+    /** @inheritDoc */
     targetAutomaticState: boolean;
     protected _lastPersist: number;
     protected abstract readonly _stateIdBrightness: string;
@@ -19,23 +23,31 @@ export declare abstract class ZigbeeDimmer extends ZigbeeDevice implements iDimm
     protected abstract readonly _stateNameTransitionTime: string;
     protected constructor(pInfo: IoBrokerDeviceInfo, deviceType: DeviceType);
     protected _brightness: number;
+    /** @inheritDoc */
     get brightness(): number;
     protected _lightOn: boolean;
+    /** @inheritDoc */
     get lightOn(): boolean;
     protected _transitionTime: number;
-    get transitionTime(): number;
+    /** @inheritDoc */
     get actuatorOn(): boolean;
+    /** @inheritDoc */
     restoreTargetAutomaticValue(c: RestoreTargetAutomaticValueCommand): void;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
+    /** @inheritDoc */
     setTimeBased(c: LampSetTimeBasedCommand): void;
+    /** @inheritDoc */
     setActuator(c: ActuatorSetStateCommand): void;
+    /** @inheritDoc */
     toggleActuator(c: ActuatorToggleCommand): boolean;
-    /**
-     * @inheritDoc
-     */
+    /** @inheritDoc */
     setLight(c: DimmerSetLightCommand): void;
+    /** @inheritDoc */
     persist(): void;
+    /** @inheritDoc */
     toggleLight(c: LampToggleLightCommand): boolean;
+    /** @inheritDoc */
     writeActuatorStateToDevice(c: ActuatorWriteStateToDeviceCommand): void;
     private setBrightnessState;
 }