hoffmation-base 3.2.10 → 3.2.11-alpha.1

package/lib/devices/hmIPDevices/hmIpRoll.js

@@ -26,6 +26,7 @@ class HmIpRoll extends hmIpDevice_1.HmIPDevice {
         this._currentLevel = -1;
         this.jsonOmitKeys.push('_window');
         this.deviceCapabilities.push(enums_1.DeviceCapability.shutter);
+        this.deviceCapabilities.push(enums_1.DeviceCapability.blockAutomatic);
         this._setLevelSwitchID = `${this.info.fullID}.4.LEVEL`;
         this.blockAutomationHandler = new services_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this), this.log.bind(this));
         (_a = this.dbo) === null || _a === void 0 ? void 0 : _a.getLastDesiredPosition(this).then((val) => {

package/lib/devices/velux/veluxShutter.js

@@ -26,6 +26,7 @@ class VeluxShutter extends veluxDevice_1.VeluxDevice {
         this._currentLevel = -1;
         this.jsonOmitKeys.push('_window');
         this.deviceCapabilities.push(enums_1.DeviceCapability.shutter);
+        this.deviceCapabilities.push(enums_1.DeviceCapability.blockAutomatic);
         this._setLevelSwitchID = `${this.info.fullID}.targetPosition`;
         this.blockAutomationHandler = new services_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this), this.log.bind(this));
         (_a = this.dbo) === null || _a === void 0 ? void 0 : _a.getLastDesiredPosition(this).then((val) => {

package/lib/devices/zigbee/BaseDevices/zigbeeMotionSensor.d.ts

@@ -17,6 +17,7 @@ export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionS
     protected _needsMovementResetFallback: boolean;
     protected _fallBackTimeout: NodeJS.Timeout | undefined;
     protected _timeSinceLastMotion: number;
+    protected readonly _occupancyStateId: string;
     private _movementDetected;
     constructor(pInfo: IoBrokerDeviceInfo, type: DeviceType);
     /** @inheritDoc */

package/lib/devices/zigbee/BaseDevices/zigbeeMotionSensor.js

@@ -21,6 +21,7 @@ class ZigbeeMotionSensor extends zigbeeDevice_1.ZigbeeDevice {
         this._movementDetectedCallback = [];
         this._needsMovementResetFallback = true;
         this._timeSinceLastMotion = 0;
+        this._occupancyStateId = 'occupancy';
         this._movementDetected = false;
         this.deviceCapabilities.push(enums_1.DeviceCapability.motionSensor);
         this.deviceCapabilities.push(enums_1.DeviceCapability.batteryDriven);
@@ -115,7 +116,7 @@ class ZigbeeMotionSensor extends zigbeeDevice_1.ZigbeeDevice {
                     this.log(enums_1.LogLevel.Warn, 'Das Zigbee Gerät hat unter 20% Batterie.');
                 }
                 break;
-            case 'occupancy':
+            case this._occupancyStateId:
                 this.log(enums_1.LogLevel.Trace, `Motion sensor: Update for motion state of ${this.info.customName}: ${state.val}`);
                 this.updateMovement(state.val);
                 break;

package/lib/devices/zigbee/BaseDevices/zigbeeShutter.js

@@ -28,6 +28,7 @@ class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
         /** @inheritDoc */
         this.baseAutomaticLevel = 0;
         this.deviceCapabilities.push(enums_1.DeviceCapability.shutter);
+        this.deviceCapabilities.push(enums_1.DeviceCapability.blockAutomatic);
         this.jsonOmitKeys.push('_window');
         // Initialize blockAutomationHandler for iTemporaryDisableAutomatic
         this.blockAutomationHandler = new services_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this), this.log.bind(this));

package/lib/devices/zigbee/zigbeeAqaraPresence.d.ts

@@ -1,7 +1,7 @@
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { ZigbeeMotionSensor } from './BaseDevices';
 export declare class ZigbeeAqaraPresence extends ZigbeeMotionSensor {
+    protected _needsMovementResetFallback: boolean;
+    protected readonly _occupancyStateId: string;
     constructor(pInfo: IoBrokerDeviceInfo);
-    /** @inheritDoc */
-    update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
 }

package/lib/devices/zigbee/zigbeeAqaraPresence.js

@@ -6,17 +6,8 @@ const enums_1 = require("../../enums");
 class ZigbeeAqaraPresence extends BaseDevices_1.ZigbeeMotionSensor {
     constructor(pInfo) {
         super(pInfo, enums_1.DeviceType.ZigbeeAqaraPresence);
-    }
-    /** @inheritDoc */
-    update(idSplit, state, initial = false) {
-        this.log(enums_1.LogLevel.DeepTrace, `Motion update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
-        super.update(idSplit, state, initial, true);
-        switch (idSplit[3]) {
-            case 'presence':
-                this.log(enums_1.LogLevel.Trace, `Motion sensor: Update for motion of ${this.info.customName}: ${state.val}`);
-                this.updateMovement(state.val);
-                break;
-        }
+        this._needsMovementResetFallback = false;
+        this._occupancyStateId = 'presence';
     }
 }
 exports.ZigbeeAqaraPresence = ZigbeeAqaraPresence;