hoffmation-base 2.20.5 → 2.21.1

package/lib/models/iIdHolder.d.ts

@@ -1,6 +1,7 @@
 import { LogLevel } from './logLevel';
+import { LogDebugType } from '../server';
 export interface iIdHolder {
     readonly id: string;
     readonly customName: string;
-    log(level: LogLevel, message: string): void;
+    log(level: LogLevel, message: string, logDebugType?: LogDebugType): void;
 }

package/lib/server/devices/baseDeviceInterfaces/iActuator.d.ts

@@ -1,14 +1,20 @@
 import { ActuatorSettings } from '../../../models';
 import { iRoomDevice } from './iRoomDevice';
-export interface iActuator extends iRoomDevice {
+import { iTemporaryDisableAutomatic } from './iTemporaryDisableAutomatic';
+export interface iActuator extends iRoomDevice, iTemporaryDisableAutomatic {
     /**
      * The settings for this Actuator primarily for controlling its automatic actions
      */
     settings: ActuatorSettings;
+    targetAutomaticState: boolean;
     /**
      * The state value of the device
      */
     readonly actuatorOn: boolean;
+    /**
+     * Queued value for the actuator
+     */
+    queuedValue: boolean | null;
     /**
      * Persisting the current states of this device to the database
      */

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

@@ -6,8 +6,10 @@ import { iDachsSettings } from '../../config/iDachsSettings';
 import { DachsDeviceSettings } from '../../../models/deviceSettings/dachsSettings';
 import { iFlattenedCompleteResponse } from './interfaces';
 import { DachsTemperatureSensor } from './dachsTemperatureSensor';
+import { BlockAutomaticHandler } from '../../services/blockAutomaticHandler';
 export declare class Dachs implements iBaseDevice, iActuator {
     settings: DachsDeviceSettings;
+    readonly blockAutomationHandler: BlockAutomaticHandler;
     readonly deviceType: DeviceType;
     readonly deviceCapabilities: DeviceCapability[];
     readonly warmWaterSensor: DachsTemperatureSensor;
@@ -15,15 +17,18 @@ export declare class Dachs implements iBaseDevice, iActuator {
     private readonly client;
     private readonly config;
     fetchedData: iFlattenedCompleteResponse | undefined;
+    queuedValue: boolean | null;
     private readonly _influxClient;
     private _dachsOn;
     private _tempWarmWater;
     private _tempHeatStorage;
+    targetAutomaticState: boolean;
     get customName(): string;
     get actuatorOn(): boolean;
     get tempWarmWater(): number;
     get tempHeatStorage(): number;
     constructor(options: iDachsSettings);
+    restoreTargetAutomaticValue(): void;
     protected _info: DeviceInfo;
     get info(): DeviceInfo;
     set info(info: DeviceInfo);
@@ -36,6 +41,6 @@ export declare class Dachs implements iBaseDevice, iActuator {
     loadDeviceSettings(): void;
     private loadData;
     persist(): void;
-    setActuator(pValue: boolean, _timeout?: number, _force?: boolean): void;
+    setActuator(pValue: boolean, timeout?: number, force?: boolean): void;
     toggleActuator(_force: boolean): boolean;
 }

package/lib/server/devices/dachs/dachs.js

@@ -12,6 +12,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const dachsSettings_1 = require("../../../models/deviceSettings/dachsSettings");
 const lib_1 = require("./lib");
 const dachsTemperatureSensor_1 = require("./dachsTemperatureSensor");
+const blockAutomaticHandler_1 = require("../../services/blockAutomaticHandler");
 class Dachs {
     get customName() {
         return this.info.customName;
@@ -29,9 +30,11 @@ class Dachs {
         this.settings = new dachsSettings_1.DachsDeviceSettings();
         this.deviceType = devices_1.DeviceType.Dachs;
         this.deviceCapabilities = [];
+        this.queuedValue = null;
         this._dachsOn = false;
         this._tempWarmWater = 0;
         this._tempHeatStorage = 0;
+        this.targetAutomaticState = false;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.actuator);
         this._info = new devices_1.DeviceInfo();
         this._info.fullName = `Dachs`;
@@ -53,6 +56,11 @@ class Dachs {
         this.warmWaterSensor = new dachsTemperatureSensor_1.DachsTemperatureSensor(this.config.roomName, 'ww', 'Water Temperature');
         this.heatStorageTempSensor = new dachsTemperatureSensor_1.DachsTemperatureSensor(this.config.roomName, 'hs', 'Heat Storage Temperature');
         services_1.Utils.guardedInterval(this.loadData, this.config.refreshInterval, this);
+        this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this));
+    }
+    restoreTargetAutomaticValue() {
+        this.log(models_1.LogLevel.Debug, `Restore Target Automatic value`);
+        this.setActuator(this.targetAutomaticState);
     }
     get info() {
         return this._info;
@@ -91,8 +99,11 @@ class Dachs {
         this.settings.initializeFromDb(this);
     }
     loadData() {
-        this.client.fetchAllKeys().then((data) => {
+        this.client
+            .fetchAllKeys()
+            .then((data) => {
             var _a, _b;
+            this.queuedValue = null;
             this.fetchedData = data;
             if (this._influxClient === undefined) {
                 return;
@@ -112,18 +123,26 @@ class Dachs {
             this._tempHeatStorage = (_b = this.fetchedData['Hka_Mw1.Temp.sbFuehler1']) !== null && _b !== void 0 ? _b : 0;
             this.heatStorageTempSensor.update(this._tempHeatStorage);
             this.persist();
+        })
+            .catch((error) => {
+            this.log(models_1.LogLevel.Error, `Error while fetching data: ${error}`);
         });
     }
     persist() {
         var _a;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistActuator(this);
     }
-    setActuator(pValue, _timeout, _force) {
+    setActuator(pValue, timeout, force) {
         if (!pValue || this._dachsOn) {
             // Dachs can only be turned on, not off
             return;
         }
+        const dontBlock = devices_1.LampUtils.checkUnBlock(this, force, pValue);
+        if (devices_1.LampUtils.checkBlockActive(this, force, pValue)) {
+            return;
+        }
         this.log(models_1.LogLevel.Debug, `Starting Dachs`);
+        this.queuedValue = pValue;
         this.client
             .setKeys({
             'Stromf_Ew.Anforderung_GLT.bAktiv': '1',
@@ -145,6 +164,9 @@ class Dachs {
             .catch((error) => {
             this.log(models_1.LogLevel.Error, `Error while turning on Dachs: ${error}`);
         });
+        if (timeout !== undefined && timeout > -1 && !dontBlock) {
+            this.blockAutomationHandler.disableAutomatic(timeout, models_1.CollisionSolving.overrideIfGreater);
+        }
     }
     toggleActuator(_force) {
         if (!this._dachsOn) {

package/lib/server/devices/dachs/lib/dachsHttpClient.js

@@ -91,6 +91,8 @@ class DachsHttpClient {
             this.axiosInstance
                 .get(`/getKey` + this.urlBuilder(keys))
                 .then((res) => {
+                if (!res.data)
+                    reject('No data received');
                 resolve(this.parser(res.data));
             })
                 .catch((err) => {

package/lib/server/devices/hmIPDevices/hmIpLampe.d.ts

@@ -5,11 +5,11 @@ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { BlockAutomaticHandler } from '../../services/blockAutomaticHandler';
 export declare class HmIpLampe extends HmIPDevice implements iLamp, iTemporaryDisableAutomatic {
     lightOn: boolean;
-    queuedLightValue: boolean | null;
     settings: ActuatorSettings;
     private lightOnSwitchID;
     readonly blockAutomationHandler: BlockAutomaticHandler;
-    private _targetAutomaticState;
+    queuedValue: boolean | null;
+    targetAutomaticState: boolean;
     constructor(pInfo: IoBrokerDeviceInfo);
     get actuatorOn(): boolean;
     restoreTargetAutomaticValue(): void;

package/lib/server/devices/hmIPDevices/hmIpLampe.js

@@ -7,14 +7,15 @@ const services_1 = require("../../services");
 const models_1 = require("../../../models");
 const DeviceCapability_1 = require("../DeviceCapability");
 const blockAutomaticHandler_1 = require("../../services/blockAutomaticHandler");
+const sharedFunctions_1 = require("../sharedFunctions");
 class HmIpLampe extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpLampe);
         this.lightOn = false;
-        this.queuedLightValue = null;
         this.settings = new models_1.ActuatorSettings();
         this.lightOnSwitchID = '';
-        this._targetAutomaticState = false;
+        this.queuedValue = null;
+        this.targetAutomaticState = false;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.blockAutomatic);
         this.lightOnSwitchID = `${this.info.fullID}.2.STATE`;
@@ -25,12 +26,12 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
     }
     restoreTargetAutomaticValue() {
         this.log(models_1.LogLevel.Debug, `Restore Target Automatic value`);
-        this.setActuator(this._targetAutomaticState);
+        this.setActuator(this.targetAutomaticState);
     }
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Lampen Update : ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
+        this.queuedValue = null;
         super.update(idSplit, state, initial, true);
-        this.queuedLightValue = null;
         switch (idSplit[3]) {
             case '1':
                 if (idSplit[4] === 'STATE') {
@@ -48,13 +49,10 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
     }
     /** @inheritdoc */
     setLight(pValue, timeout = -1, force = false) {
-        if (!force && this.blockAutomationHandler.automaticBlockActive) {
-            this.log(models_1.LogLevel.Debug, `Skip automatic command to ${pValue} as it is locked until ${new Date(this.blockAutomationHandler.automaticBlockedUntil).toLocaleTimeString()}`);
-            this._targetAutomaticState = pValue;
+        if (sharedFunctions_1.LampUtils.checkBlockActive(this, force, pValue)) {
             return;
         }
-        if (!force && pValue === this.lightOn && this.queuedLightValue === null) {
-            this.log(models_1.LogLevel.DeepTrace, `Skip light command as it is already ${pValue}`, services_1.LogDebugType.SkipUnchangedActuatorCommand);
+        if (sharedFunctions_1.LampUtils.checkUnchanged(this, force, pValue)) {
             return;
         }
         if (this.lightOnSwitchID === '') {
@@ -62,18 +60,13 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
             return;
         }
         this.log(models_1.LogLevel.Debug, `Set Light Acutator to "${pValue}"`, services_1.LogDebugType.SetActuator);
+        this.queuedValue = pValue;
         this.setState(this.lightOnSwitchID, pValue, undefined, (err) => {
             this.log(models_1.LogLevel.Error, `Lampe schalten ergab Fehler: ${err}`);
         });
-        this.queuedLightValue = pValue;
-        if (this.settings.isStromStoss) {
+        if (this.settings.isStromStoss && pValue) {
             timeout = 3000;
-            services_1.Utils.guardedTimeout(() => {
-                var _a;
-                if ((_a = this.room.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.anyPresent()) {
-                    this.setLight(true, -1, true);
-                }
-            }, this.settings.stromStossResendTime * 1000, this);
+            sharedFunctions_1.LampUtils.stromStossOn(this);
         }
         if (timeout < 0 || !pValue) {
             return;
@@ -83,24 +76,10 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
         }
     }
     toggleLight(time, force = false, calculateTime = false) {
-        const newVal = this.queuedLightValue !== null ? !this.queuedLightValue : !this.lightOn;
-        const timeout = newVal && force ? 30 * 60 * 1000 : -1;
-        if (newVal && time === undefined && calculateTime) {
-            time = services_1.TimeCallbackService.dayType(this.room.settings.lampOffset);
-        }
-        if (newVal && time !== undefined) {
-            this.setTimeBased(time, timeout, force);
-            return true;
-        }
-        this.setLight(newVal, timeout, force);
-        return newVal;
+        return sharedFunctions_1.LampUtils.toggleLight(this, time, force, calculateTime);
     }
     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);
-        }
+        sharedFunctions_1.LampUtils.setTimeBased(this, time, timeout, force);
     }
     persist() {
         var _a;

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

@@ -7,6 +7,7 @@ export * from './hmIPDevices/index';
 export * from './jsObject/index';
 export * from './models/index';
 export * from './scene/index';
+export * from './sharedFunctions/index';
 export * from './shelly/index';
 export * from './tuya/index';
 export * from './zigbee/index';

package/lib/server/devices/index.js

@@ -23,6 +23,7 @@ __exportStar(require("./hmIPDevices/index"), exports);
 __exportStar(require("./jsObject/index"), exports);
 __exportStar(require("./models/index"), exports);
 __exportStar(require("./scene/index"), exports);
+__exportStar(require("./sharedFunctions/index"), exports);
 __exportStar(require("./shelly/index"), exports);
 __exportStar(require("./tuya/index"), exports);
 __exportStar(require("./zigbee/index"), exports);

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

@@ -0,0 +1 @@
+export * from './lampUtils';

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

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./lampUtils"), exports);

package/lib/server/devices/sharedFunctions/lampUtils.d.ts

@@ -0,0 +1,10 @@
+import { iActuator, iLamp } from '../baseDeviceInterfaces';
+import { TimeOfDay } from '../../../models';
+export declare class LampUtils {
+    static stromStossOn(lamp: iLamp): void;
+    static setTimeBased(device: iLamp, time: TimeOfDay, timeout: number, force: boolean): void;
+    static checkUnBlock(device: iActuator, force: boolean | undefined, pValue: boolean): boolean;
+    static toggleLight(device: iLamp, time: TimeOfDay | undefined, force: boolean, calculateTime: boolean): boolean;
+    static checkBlockActive(device: iActuator, force: boolean | undefined, pValue: boolean): boolean;
+    static checkUnchanged(device: iActuator, force: boolean, pValue: boolean): boolean;
+}

package/lib/server/devices/sharedFunctions/lampUtils.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LampUtils = void 0;
+const services_1 = require("../../services");
+const models_1 = require("../../../models");
+class LampUtils {
+    static stromStossOn(lamp) {
+        services_1.Utils.guardedTimeout(() => {
+            var _a, _b;
+            if ((_b = (_a = lamp.room) === null || _a === void 0 ? void 0 : _a.PraesenzGroup) === null || _b === void 0 ? void 0 : _b.anyPresent()) {
+                lamp.setLight(true, -1, true);
+            }
+        }, lamp.settings.stromStossResendTime * 1000, this);
+        services_1.Utils.guardedTimeout(() => {
+            lamp.setLight(false, -1, true);
+        }, 3000, this);
+    }
+    static setTimeBased(device, time, timeout, force) {
+        if ((time === models_1.TimeOfDay.Night && device.settings.nightOn) ||
+            (time === models_1.TimeOfDay.BeforeSunrise && device.settings.dawnOn) ||
+            (time === models_1.TimeOfDay.AfterSunset && device.settings.duskOn)) {
+            device.setLight(true, timeout, force);
+        }
+    }
+    static checkUnBlock(device, force, pValue) {
+        let dontBlock = false;
+        if (force &&
+            device.settings.resetToAutomaticOnForceOffAfterForceOn &&
+            !pValue &&
+            device.blockAutomationHandler.automaticBlockActive) {
+            dontBlock = true;
+            device.log(models_1.LogLevel.Debug, `Reset Automatic Block as we are turning off manually after a force on`);
+            device.blockAutomationHandler.liftAutomaticBlock();
+        }
+        return dontBlock;
+    }
+    static toggleLight(device, time, force, calculateTime) {
+        var _a;
+        const newVal = device.queuedValue !== null ? !device.queuedValue : !device.lightOn;
+        const timeout = newVal && force ? 30 * 60 * 1000 : -1;
+        if (newVal && time === undefined && calculateTime && device.room !== undefined) {
+            time = services_1.TimeCallbackService.dayType((_a = device.room) === null || _a === void 0 ? void 0 : _a.settings.lampOffset);
+        }
+        if (newVal && time !== undefined) {
+            device.setTimeBased(time, timeout, force);
+            return true;
+        }
+        device.setLight(newVal, timeout, force);
+        return newVal;
+    }
+    static checkBlockActive(device, force, pValue) {
+        if (!force && device.blockAutomationHandler.automaticBlockActive) {
+            device.log(models_1.LogLevel.Debug, `Skip automatic command to ${pValue} as it is locked until ${new Date(device.blockAutomationHandler.automaticBlockedUntil).toLocaleTimeString()}`);
+            device.targetAutomaticState = pValue;
+            return true;
+        }
+        return false;
+    }
+    static checkUnchanged(device, force, pValue) {
+        if (!force && pValue === device.actuatorOn && device.queuedValue === null) {
+            device.log(models_1.LogLevel.DeepTrace, `Skip light command as it is already ${pValue}`, services_1.LogDebugType.SkipUnchangedActuatorCommand);
+            return true;
+        }
+        return false;
+    }
+}
+exports.LampUtils = LampUtils;

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

@@ -2,25 +2,28 @@ import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
 import { TimeOfDay, WledSettings } from '../../models';
 import { IoBrokerDeviceInfo } from './IoBrokerDeviceInfo';
 import { iDimmableLamp } from './baseDeviceInterfaces/iDimmableLamp';
+import { BlockAutomaticHandler } from '../services/blockAutomaticHandler';
 export declare class WledDevice extends IoBrokerBaseDevice implements iDimmableLamp {
     on: boolean;
     brightness: number;
-    linkQuality: number;
     battery: number;
-    voltage: string;
+    queuedValue: boolean | null;
     settings: WledSettings;
+    readonly blockAutomationHandler: BlockAutomaticHandler;
+    targetAutomaticState: boolean;
     private readonly _onID;
     private readonly _presetID;
     private readonly _brightnessID;
     constructor(pInfo: IoBrokerDeviceInfo);
     get actuatorOn(): boolean;
     get lightOn(): boolean;
+    restoreTargetAutomaticValue(): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, _pOverride?: boolean): void;
-    setLight(pValue: boolean, _timeout?: number, _force?: boolean, brightness?: number, _transitionTime?: number): void;
-    setWled(pValue: boolean, brightness?: number, preset?: number): void;
+    setLight(pValue: boolean, timeout?: number, force?: boolean, brightness?: number, _transitionTime?: number): void;
+    setWled(pValue: boolean, brightness?: number, preset?: number, timeout?: number, force?: boolean): void;
     setTimeBased(time: TimeOfDay): void;
     persist(): void;
     setActuator(pValue: boolean, _timeout?: number, _force?: boolean): void;
     toggleActuator(_force: boolean): boolean;
-    toggleLight(time?: TimeOfDay, _force?: boolean, calculateTime?: boolean): boolean;
+    toggleLight(time?: TimeOfDay, force?: boolean, calculateTime?: boolean): boolean;
 }

package/lib/server/devices/wledDevice.js

@@ -5,18 +5,21 @@ const IoBrokerBaseDevice_1 = require("./IoBrokerBaseDevice");
 const deviceType_1 = require("./deviceType");
 const services_1 = require("../services");
 const models_1 = require("../../models");
+const blockAutomaticHandler_1 = require("../services/blockAutomaticHandler");
+const sharedFunctions_1 = require("./sharedFunctions");
 class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.WledDevice);
         this.on = false;
         this.brightness = -1;
-        this.linkQuality = 0;
         this.battery = -1;
-        this.voltage = '';
+        this.queuedValue = null;
         this.settings = new models_1.WledSettings();
+        this.targetAutomaticState = false;
         this._onID = `${this.info.fullID}.on`;
         this._presetID = `${this.info.fullID}.ps`;
         this._brightnessID = `${this.info.fullID}.bri`;
+        this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this));
     }
     get actuatorOn() {
         return this.on;
@@ -24,7 +27,12 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     get lightOn() {
         return this.on;
     }
+    restoreTargetAutomaticValue() {
+        this.log(models_1.LogLevel.Debug, `Restore Target Automatic value`);
+        this.setActuator(this.targetAutomaticState);
+    }
     update(idSplit, state, initial = false, _pOverride = false) {
+        this.queuedValue = null;
         services_1.ServerLogService.writeLog(models_1.LogLevel.DeepTrace, `Wled: ${initial ? 'Initiales ' : ''}Update für "${this.info.customName}": ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         switch (idSplit[3]) {
             case 'on':
@@ -35,10 +43,10 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
                 break;
         }
     }
-    setLight(pValue, _timeout, _force, brightness, _transitionTime) {
-        this.setWled(pValue, brightness);
+    setLight(pValue, timeout, force, brightness, _transitionTime) {
+        this.setWled(pValue, brightness, undefined, timeout, force);
     }
-    setWled(pValue, brightness = -1, preset) {
+    setWled(pValue, brightness = -1, preset, timeout, force) {
         if (this._onID === '') {
             services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Keine On ID für "${this.info.customName}" bekannt.`);
             return;
@@ -47,10 +55,15 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
             services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Keine Connection für "${this.info.customName}" bekannt.`);
             return;
         }
+        const dontBlock = sharedFunctions_1.LampUtils.checkUnBlock(this, force, pValue);
+        if (sharedFunctions_1.LampUtils.checkBlockActive(this, force, pValue)) {
+            return;
+        }
         if (pValue && brightness !== -1 && this.brightness < 10) {
             brightness = 10;
         }
         services_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `WLED Schalten: "${this.info.customName}" An: ${pValue}\tHelligkeit: ${brightness}%`);
+        this.queuedValue = pValue;
         this.setState(this._onID, pValue, undefined, (err) => {
             services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `WLED schalten ergab Fehler: ${err}`);
         });
@@ -64,6 +77,9 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
                 services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Dimmer Helligkeit schalten ergab Fehler: ${err}`);
             });
         }
+        if (timeout !== undefined && timeout > -1 && !dontBlock) {
+            this.blockAutomationHandler.disableAutomatic(timeout, models_1.CollisionSolving.overrideIfGreater);
+        }
     }
     setTimeBased(time) {
         this.log(models_1.LogLevel.Debug, `Wled setTimeBased ${time}`);
@@ -101,17 +117,8 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         this.setLight(!this.on);
         return this.on;
     }
-    toggleLight(time, _force = false, calculateTime = false) {
-        const newVal = !this.lightOn;
-        if (newVal && time === undefined && calculateTime) {
-            time = services_1.TimeCallbackService.dayType(this.room.settings.lampOffset);
-        }
-        if (newVal && time !== undefined) {
-            this.setTimeBased(time);
-            return true;
-        }
-        this.setLight(newVal);
-        return newVal;
+    toggleLight(time, force = false, calculateTime = false) {
+        return sharedFunctions_1.LampUtils.toggleLight(this, time, force, calculateTime);
     }
 }
 exports.WledDevice = WledDevice;

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

@@ -1,16 +1,16 @@
 import { ActuatorSettings } from '../../../../models';
 import { DeviceType } from '../../deviceType';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
-import { iActuator, iTemporaryDisableAutomatic } from '../../baseDeviceInterfaces';
+import { iActuator } from '../../baseDeviceInterfaces';
 import { ZigbeeDevice } from './zigbeeDevice';
 import { BlockAutomaticHandler } from '../../../services/blockAutomaticHandler';
-export declare class ZigbeeActuator extends ZigbeeDevice implements iActuator, iTemporaryDisableAutomatic {
+export declare class ZigbeeActuator extends ZigbeeDevice implements iActuator {
     private _actuatorOn;
     readonly blockAutomationHandler: BlockAutomaticHandler;
-    private _targetAutomaticState;
+    targetAutomaticState: boolean;
     settings: ActuatorSettings;
     protected readonly actuatorOnSwitchID: string;
-    protected queuedValue: boolean | null;
+    queuedValue: boolean | null;
     get actuatorOn(): boolean;
     constructor(pInfo: IoBrokerDeviceInfo, type: DeviceType, actuatorOnSwitchID: string);
     restoreTargetAutomaticValue(): void;

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

@@ -6,6 +6,7 @@ const models_1 = require("../../../../models");
 const zigbeeDevice_1 = require("./zigbeeDevice");
 const DeviceCapability_1 = require("../../DeviceCapability");
 const blockAutomaticHandler_1 = require("../../../services/blockAutomaticHandler");
+const sharedFunctions_1 = require("../../sharedFunctions");
 class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {
     get actuatorOn() {
         return this._actuatorOn;
@@ -13,7 +14,7 @@ class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, type, actuatorOnSwitchID) {
         super(pInfo, type);
         this._actuatorOn = false;
-        this._targetAutomaticState = false;
+        this.targetAutomaticState = false;
         this.settings = new models_1.ActuatorSettings();
         this.queuedValue = null;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.actuator);
@@ -23,7 +24,7 @@ class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {
     }
     restoreTargetAutomaticValue() {
         this.log(models_1.LogLevel.Debug, `Restore Target Automatic value`);
-        this.setActuator(this._targetAutomaticState);
+        this.setActuator(this.targetAutomaticState);
     }
     update(idSplit, state, initial = false, handledByChildObject = false) {
         if (!handledByChildObject) {
@@ -46,22 +47,11 @@ class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {
             this.log(models_1.LogLevel.Error, `Keine Switch ID bekannt.`);
             return;
         }
-        let dontBlock = false;
-        if (force &&
-            this.settings.resetToAutomaticOnForceOffAfterForceOn &&
-            !pValue &&
-            this.blockAutomationHandler.automaticBlockActive) {
-            dontBlock = true;
-            this.log(models_1.LogLevel.Debug, `Reset Automatic Block as we are turning off manually after a force on`);
-            this.blockAutomationHandler.liftAutomaticBlock();
-        }
-        if (!force && this.blockAutomationHandler.automaticBlockActive) {
-            this.log(models_1.LogLevel.Debug, `Skip automatic command to ${pValue} as it is locked until ${new Date(this.blockAutomationHandler.automaticBlockedUntil).toLocaleTimeString()}`);
-            this._targetAutomaticState = pValue;
+        const dontBlock = sharedFunctions_1.LampUtils.checkUnBlock(this, force, pValue);
+        if (sharedFunctions_1.LampUtils.checkBlockActive(this, force, pValue)) {
             return;
         }
-        if (!force && pValue === this._actuatorOn && this.queuedValue === null) {
-            this.log(models_1.LogLevel.Debug, `Skip actuator command as it is already ${pValue}`, services_1.LogDebugType.SkipUnchangedActuatorCommand);
+        if (sharedFunctions_1.LampUtils.checkUnchanged(this, force, pValue)) {
             return;
         }
         this.log(models_1.LogLevel.Debug, `Set Acutator to "${pValue}"`, services_1.LogDebugType.SetActuator);

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

@@ -9,22 +9,22 @@ export declare abstract class ZigbeeDimmer extends ZigbeeDevice implements iDimm
     readonly blockAutomationHandler: BlockAutomaticHandler;
     queuedValue: boolean | null;
     settings: DimmerSettings;
-    protected _brightness: number;
+    targetAutomaticState: boolean;
     protected _lastPersist: number;
-    protected _lightOn: boolean;
-    protected _transitionTime: number;
-    protected _targetAutomaticState: boolean;
     protected abstract readonly _stateIdBrightness: string;
     protected abstract readonly _stateIdState: string;
     protected abstract readonly _stateIdTransitionTime: string;
     protected abstract readonly _stateNameBrightness: string;
     protected abstract readonly _stateNameState: string;
     protected abstract readonly _stateNameTransitionTime: string;
-    get lightOn(): boolean;
+    protected constructor(pInfo: IoBrokerDeviceInfo, deviceType: DeviceType);
+    protected _brightness: number;
     get brightness(): number;
+    protected _lightOn: boolean;
+    get lightOn(): boolean;
+    protected _transitionTime: number;
     get transitionTime(): number;
     get actuatorOn(): boolean;
-    protected constructor(pInfo: IoBrokerDeviceInfo, deviceType: DeviceType);
     restoreTargetAutomaticValue(): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     setTimeBased(time: TimeOfDay, timeout?: number, force?: boolean): void;