hoffmation-base 2.10.1 → 2.10.2

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

@@ -1,19 +1,20 @@
-/// <reference types="node" />
 /// <reference types="iobroker" />
 import { DimmerSettings, TimeOfDay } from '../../../../models';
 import { DeviceType } from '../../deviceType';
 import { ZigbeeDevice } from './index';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 import { iDimmableLamp } from '../../baseDeviceInterfaces/iDimmableLamp';
-export declare abstract class ZigbeeDimmer extends ZigbeeDevice implements iDimmableLamp {
+import { iTemporaryDisableAutomatic } from '../../baseDeviceInterfaces';
+import { BlockAutomaticHandler } from '../../../services/blockAutomaticHandler';
+export declare abstract class ZigbeeDimmer extends ZigbeeDevice implements iDimmableLamp, iTemporaryDisableAutomatic {
+    readonly blockAutomationHandler: BlockAutomaticHandler;
     queuedValue: boolean | null;
     settings: DimmerSettings;
     protected _brightness: number;
     protected _lastPersist: number;
     protected _lightOn: boolean;
     protected _transitionTime: number;
-    protected _turnOffTime: number;
-    protected _turnOffTimeout: NodeJS.Timeout | undefined;
+    protected _targetAutomaticState: boolean;
     protected abstract readonly _stateIdBrightness: string;
     protected abstract readonly _stateIdState: string;
     protected abstract readonly _stateIdTransitionTime: string;
@@ -25,6 +26,7 @@ export declare abstract class ZigbeeDimmer extends ZigbeeDevice implements iDimm
     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;
     setActuator(pValue: boolean, timeout?: number, force?: boolean): void;

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

@@ -5,6 +5,7 @@ const models_1 = require("../../../../models");
 const services_1 = require("../../../services");
 const index_1 = require("./index");
 const DeviceCapability_1 = require("../../DeviceCapability");
+const blockAutomaticHandler_1 = require("../../../services/blockAutomaticHandler");
 class ZigbeeDimmer extends index_1.ZigbeeDevice {
     get lightOn() {
         return this._lightOn;
@@ -26,10 +27,15 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
         this._lastPersist = 0;
         this._lightOn = false;
         this._transitionTime = 0;
-        this._turnOffTime = 0;
-        this._turnOffTimeout = undefined;
+        this._targetAutomaticState = false;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.dimmablelamp);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.blockAutomatic);
+        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);
     }
     update(idSplit, state, initial = false) {
         this.queuedValue = null;
@@ -98,8 +104,9 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
                 }
             });
         }
-        if (!force && services_1.Utils.nowMS() < this._turnOffTime) {
-            this.log(models_1.LogLevel.Debug, `Skip automatic command to ${pValue} as it is locked until ${new Date(this._turnOffTime).toLocaleTimeString()}`);
+        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;
             return;
         }
         if (pValue && brightness === -1 && this.brightness < 10) {
@@ -121,24 +128,9 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
                 this.setState(this._stateIdBrightness, brightness);
             }
         }
-        if (this._turnOffTimeout !== undefined) {
-            clearTimeout(this._turnOffTimeout);
-            this._turnOffTimeout = undefined;
-        }
-        if (timeout < 0 || !pValue) {
-            return;
+        if (timeout > -1) {
+            this.blockAutomationHandler.disableAutomatic(timeout, models_1.CollisionSolving.overrideIfGreater);
         }
-        this._turnOffTime = services_1.Utils.nowMS() + timeout;
-        this._turnOffTimeout = services_1.Utils.guardedTimeout(() => {
-            this.log(models_1.LogLevel.Debug, `Delayed Turnoff initiated`);
-            this._turnOffTimeout = undefined;
-            if (!this.room) {
-                this.setLight(false, -1, true);
-            }
-            else {
-                this.room.setLightTimeBased(true);
-            }
-        }, timeout, this);
     }
     persist() {
         var _a;