hoffmation-base 0.1.41-1 → 0.1.41-13

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

@@ -1,6 +1,6 @@
-import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
-import { TemperaturSettings } from '../../models/temperaturSettings';
-export interface iHeater extends IoBrokerBaseDevice {
+import { TemperaturSettings } from '../../models';
+import { IBaseDevice } from './iBaseDevice';
+export interface iHeater extends IBaseDevice {
     readonly desiredTemperatur: number;
     readonly iLevel: number;
     readonly iTemperatur: number;

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

@@ -1,5 +1,5 @@
-import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
-export interface iHumiditySensor extends IoBrokerBaseDevice {
+import { IBaseDevice } from './iBaseDevice';
+export interface iHumiditySensor extends IBaseDevice {
     humidity: number;
     addHumidityCallback(pCallback: (pValue: number) => void): void;
 }

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

@@ -1,8 +1,6 @@
-import { ActuatorSettings } from '../../models';
-import { RoomBase } from '../../models';
-import { TimeOfDay } from '../services';
-import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
-export interface iLamp extends IoBrokerBaseDevice {
+import { ActuatorSettings, RoomBase, TimeOfDay } from '../../models';
+import { IBaseDevice } from './iBaseDevice';
+export interface iLamp extends IBaseDevice {
     settings: ActuatorSettings;
     lightOn: boolean;
     room: RoomBase | undefined;

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

@@ -0,0 +1,13 @@
+import { MotionSensorSettings } from '../../models';
+import { IBaseDevice } from './iBaseDevice';
+export interface iMotionSensor extends IBaseDevice {
+    settings: MotionSensorSettings;
+    movementDetected: boolean;
+    readonly timeSinceLastMotion: number;
+    detectionsToday: number;
+    /**
+     * Adds a callback for when a motion state has changed.
+     * @param pCallback Function that accepts the new state as parameter
+     */
+    addMovementCallback(pCallback: (newState: boolean) => void): void;
+}

package/lib/server/devices/iMotionSensor.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,6 +1,6 @@
-import { Fenster } from './groups/Fenster';
-import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
-export interface iShutter extends IoBrokerBaseDevice {
+import { Fenster } from './groups';
+import { IBaseDevice } from './iBaseDevice';
+export interface iShutter extends IBaseDevice {
     currentLevel: number;
     desiredFensterLevel: number;
     fenster: Fenster | undefined;

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

@@ -1,5 +1,5 @@
-import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
-export interface iTemperaturSensor extends IoBrokerBaseDevice {
+import { IBaseDevice } from './iBaseDevice';
+export interface iTemperaturSensor extends IBaseDevice {
     iTemperatur: number;
     sTemperatur: string;
 }

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

@@ -0,0 +1,9 @@
+import { IBaseDevice } from './iBaseDevice';
+export interface iVibrationSensor extends IBaseDevice {
+    vibrationBlockedByGriff: boolean;
+    vibrationBlockedByGriffTimeStamp: number;
+    vibrationBlockedByMotion: boolean;
+    vibrationBlockedByMotionTimeStamp: number;
+    vibration: boolean;
+    alarmCheck(): void;
+}

package/lib/server/devices/iVibrationSensor.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -13,6 +13,7 @@ export * from './deviceType';
 export * from './deviceUpdater';
 export * from './Griffe';
 export * from './Heizgruppen';
+export * from './iBaseDevice';
 export * from './iButtonSwitch';
 export * from './iDeviceUpdater';
 export * from './iEnergyManager';
@@ -21,7 +22,9 @@ export * from './iHumiditySensor';
 export * from './iHeater';
 export * from './iIlluminationSensor';
 export * from './iLamp';
+export * from './iMotionSensor';
 export * from './IoBrokerBaseDevice';
 export * from './iShutter';
 export * from './iTemperaturSensor';
+export * from './iVibrationSensor';
 export * from './wledDevice';

package/lib/server/devices/index.js

@@ -29,6 +29,7 @@ __exportStar(require("./deviceType"), exports);
 __exportStar(require("./deviceUpdater"), exports);
 __exportStar(require("./Griffe"), exports);
 __exportStar(require("./Heizgruppen"), exports);
+__exportStar(require("./iBaseDevice"), exports);
 __exportStar(require("./iButtonSwitch"), exports);
 __exportStar(require("./iDeviceUpdater"), exports);
 __exportStar(require("./iEnergyManager"), exports);
@@ -37,7 +38,9 @@ __exportStar(require("./iHumiditySensor"), exports);
 __exportStar(require("./iHeater"), exports);
 __exportStar(require("./iIlluminationSensor"), exports);
 __exportStar(require("./iLamp"), exports);
+__exportStar(require("./iMotionSensor"), exports);
 __exportStar(require("./IoBrokerBaseDevice"), exports);
 __exportStar(require("./iShutter"), exports);
 __exportStar(require("./iTemperaturSensor"), exports);
+__exportStar(require("./iVibrationSensor"), exports);
 __exportStar(require("./wledDevice"), exports);

package/lib/server/devices/jsObject/jsObjectEnergyManager.d.ts

@@ -1,42 +1,54 @@
 /// <reference types="iobroker" />
 import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
-import { iEnergyManager } from '../iEnergyManager';
+import { iEnergyManager, PhaseState } from '../iEnergyManager';
 import { iExcessEnergyConsumer } from '../iExcessEnergyConsumer';
 import { DeviceInfo } from '../DeviceInfo';
 export declare class JsObjectEnergyManager extends IoBrokerBaseDevice implements iEnergyManager {
-    /**
-     * Example:
-     * ________________________________________
-     * | ExcessEnergy | 500W  | -500W | -500W |
-     * | Production   | 1500W | 500W  | 0W    |
-     * _______________________________________
-     * | Consumption  | 1000W | 1000W | 500W  |
-     * | Injecting    | 500W  | 0W    | 0W    |
-     * | drawing      |    0W | 500W  | 500W  |
-     * | selfConsume  | 1000W | 500W  | 0W    |
-     * ________________________________________
-     **/
-    get excessEnergyConsumerConsumption(): number;
-    get excessEnergy(): number;
+    private _excessEnergyConsumer;
+    private _iCalculationInterval;
+    private _iDatabaseLoggerInterval;
+    private _lastPersistenceCalculation;
+    private _nextPersistEntry;
+    private _powerValuePhaseA;
+    private _powerValuePhaseB;
+    private _powerValuePhaseC;
+    constructor(info: DeviceInfo);
+    private _currentProduction;
+    get currentProduction(): number;
     get baseConsumption(): number;
     get totalConsumption(): number;
     get injectingWattage(): number;
     get drawingWattage(): number;
     get selfConsumingWattage(): number;
-    get currentProduction(): number;
-    private _currentProduction;
-    private _excessEnergy;
+    get excessEnergy(): number;
     private _excessEnergyConsumerConsumption;
-    private _excessEnergyConsumer;
-    private _iDatabaseLoggerInterval;
-    private _nextPersistEntry;
-    private _lastPersistenceCalculation;
-    constructor(info: DeviceInfo);
+    /**
+     * Example:
+     * ________________________________________
+     * | ExcessEnergyA | 200W  |  200W | -500W |
+     * | ExcessEnergyB | 300W  |  300W | -200W |
+     * | ExcessEnergyC | 100W  | -100W | -300W |
+     * | Production P  |  500W |  500W |    0W |
+     * | Production    | 1500W | 1500W |    0W |
+     * ________________________________________
+     * | Consumption   |  900W | 1100W | 1000W |
+     * | Injecting     |  600W |  500W |    0W |
+     * | drawing       |    0W |  100W | 1000W |
+     * | selfConsume   |  900W | 1000W |    0W |
+     * ________________________________________
+     **/
+    get excessEnergyConsumerConsumption(): number;
+    private _phaseAState;
+    get phaseAState(): PhaseState;
+    private _phaseBState;
+    get phaseBState(): PhaseState;
+    private _phaseCState;
+    get phaseCState(): PhaseState;
     cleanup(): void;
     addExcessConsumer(device: iExcessEnergyConsumer): void;
     recalculatePowerSharing(): void;
     update(idSplit: string[], state: ioBroker.State, initial: boolean, pOverride?: boolean): void;
-    private setExcessEnergy;
+    private calculateExcessEnergy;
     private calculatePersistenceValues;
     private persist;
 }

package/lib/server/devices/jsObject/jsObjectEnergyManager.js

@@ -2,66 +2,95 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsObjectEnergyManager = void 0;
 const IoBrokerBaseDevice_1 = require("../IoBrokerBaseDevice");
+const iEnergyManager_1 = require("../iEnergyManager");
 const deviceType_1 = require("../deviceType");
 const models_1 = require("../../../models");
 const services_1 = require("../../services");
-const index_1 = require("../../../index");
 class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     constructor(info) {
         super(info, deviceType_1.DeviceType.JsEnergyManager);
-        this._currentProduction = -1;
-        this._excessEnergy = -1;
-        this._excessEnergyConsumerConsumption = 0;
         this._excessEnergyConsumer = [];
+        this._iCalculationInterval = null;
         this._iDatabaseLoggerInterval = null;
         this._lastPersistenceCalculation = services_1.Utils.nowMS();
+        this._powerValuePhaseA = -1;
+        this._powerValuePhaseB = -1;
+        this._powerValuePhaseC = -1;
+        this._currentProduction = -1;
+        this._excessEnergyConsumerConsumption = 0;
+        this._phaseAState = new iEnergyManager_1.PhaseState(0, 0);
+        this._phaseBState = new iEnergyManager_1.PhaseState(0, 0);
+        this._phaseCState = new iEnergyManager_1.PhaseState(0, 0);
         this.log(models_1.LogLevel.Info, `Creating Energy Manager Device`);
+        this._iCalculationInterval = services_1.Utils.guardedInterval(() => {
+            this.calculateExcessEnergy();
+        }, 5 * 1000, this);
         this._iDatabaseLoggerInterval = services_1.Utils.guardedInterval(() => {
             this.persist();
         }, 15 * 60 * 1000, this);
-        this._nextPersistEntry = new index_1.EnergyCalculation(services_1.Utils.nowMS());
+        this._nextPersistEntry = new models_1.EnergyCalculation(services_1.Utils.nowMS());
     }
-    /**
-     * Example:
-     * ________________________________________
-     * | ExcessEnergy | 500W  | -500W | -500W |
-     * | Production   | 1500W | 500W  | 0W    |
-     * _______________________________________
-     * | Consumption  | 1000W | 1000W | 500W  |
-     * | Injecting    | 500W  | 0W    | 0W    |
-     * | drawing      |    0W | 500W  | 500W  |
-     * | selfConsume  | 1000W | 500W  | 0W    |
-     * ________________________________________
-     **/
-    get excessEnergyConsumerConsumption() {
-        return this._excessEnergyConsumerConsumption;
-    }
-    get excessEnergy() {
-        return this._excessEnergy;
+    get currentProduction() {
+        return this._currentProduction;
     }
     get baseConsumption() {
         return this.totalConsumption - this._excessEnergyConsumerConsumption;
     }
     get totalConsumption() {
-        return this._currentProduction - this._excessEnergy;
+        return (this.phaseAState.totalConsumptionWattage +
+            this.phaseBState.totalConsumptionWattage +
+            this.phaseCState.totalConsumptionWattage);
     }
     get injectingWattage() {
-        return Math.max(this._excessEnergy, 0);
+        return this.phaseAState.injectingWattage + this.phaseBState.injectingWattage + this.phaseCState.injectingWattage;
     }
     get drawingWattage() {
-        return Math.min(this._excessEnergy, 0) * -1;
+        return this.phaseAState.drawingWattage + this.phaseBState.drawingWattage + this.phaseCState.drawingWattage;
     }
     get selfConsumingWattage() {
-        return Math.min(this.totalConsumption, this._currentProduction);
+        return (this.phaseAState.selfConsumingWattage +
+            this.phaseBState.selfConsumingWattage +
+            this.phaseCState.selfConsumingWattage);
     }
-    get currentProduction() {
-        return this._currentProduction;
+    get excessEnergy() {
+        return this._powerValuePhaseA + this._powerValuePhaseB + this._powerValuePhaseC;
+    }
+    /**
+     * Example:
+     * ________________________________________
+     * | ExcessEnergyA | 200W  |  200W | -500W |
+     * | ExcessEnergyB | 300W  |  300W | -200W |
+     * | ExcessEnergyC | 100W  | -100W | -300W |
+     * | Production P  |  500W |  500W |    0W |
+     * | Production    | 1500W | 1500W |    0W |
+     * ________________________________________
+     * | Consumption   |  900W | 1100W | 1000W |
+     * | Injecting     |  600W |  500W |    0W |
+     * | drawing       |    0W |  100W | 1000W |
+     * | selfConsume   |  900W | 1000W |    0W |
+     * ________________________________________
+     **/
+    get excessEnergyConsumerConsumption() {
+        return this._excessEnergyConsumerConsumption;
+    }
+    get phaseAState() {
+        return this._phaseAState;
+    }
+    get phaseBState() {
+        return this._phaseBState;
+    }
+    get phaseCState() {
+        return this._phaseCState;
     }
     cleanup() {
         if (this._iDatabaseLoggerInterval !== null) {
             clearInterval(this._iDatabaseLoggerInterval);
             this._iDatabaseLoggerInterval = null;
         }
+        if (this._iCalculationInterval !== null) {
+            clearInterval(this._iCalculationInterval);
+            this._iCalculationInterval = null;
+        }
     }
     addExcessConsumer(device) {
         this._excessEnergyConsumer.push(device);
@@ -72,9 +101,17 @@ class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     update(idSplit, state, initial, pOverride = false) {
         this.log(models_1.LogLevel.DeepTrace, `EnergyManager: ${initial ? 'Initial ' : ''} update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}, override: ${pOverride}`);
         switch (idSplit[3]) {
-            case 'CurrentExcessEnergy':
-                this.log(models_1.LogLevel.Trace, `Current excess energy update to ${state.val}`);
-                this.setExcessEnergy(state.val);
+            case 'CurrentExcessEnergyPhaseA':
+                this.log(models_1.LogLevel.Trace, `Current excess energyA update to ${state.val}`);
+                this._powerValuePhaseA = state.val;
+                break;
+            case 'CurrentExcessEnergyPhaseB':
+                this.log(models_1.LogLevel.Trace, `Current excess energyB update to ${state.val}`);
+                this._powerValuePhaseB = state.val;
+                break;
+            case 'CurrentExcessEnergyPhaseC':
+                this.log(models_1.LogLevel.Trace, `Current excess energyC update to ${state.val}`);
+                this._powerValuePhaseC = state.val;
                 break;
             case 'CurrentProduction':
                 this.log(models_1.LogLevel.Trace, `Current Production Update to ${state.val}`);
@@ -82,8 +119,11 @@ class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
                 break;
         }
     }
-    setExcessEnergy(val) {
-        this._excessEnergy = val;
+    calculateExcessEnergy() {
+        const phaseProduction = this._currentProduction / 3.0;
+        this._phaseAState = new iEnergyManager_1.PhaseState(this._powerValuePhaseA, phaseProduction);
+        this._phaseBState = new iEnergyManager_1.PhaseState(this._powerValuePhaseB, phaseProduction);
+        this._phaseCState = new iEnergyManager_1.PhaseState(this._powerValuePhaseC, phaseProduction);
         this.calculatePersistenceValues();
         this.recalculatePowerSharing();
     }
@@ -96,21 +136,21 @@ class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         this._lastPersistenceCalculation = now;
     }
     persist() {
-        var _a;
+        var _a, _b;
         const obj = JSON.parse(JSON.stringify(this._nextPersistEntry));
         if (obj.drawnKwH === 0 && obj.injectedKwH === 0 && obj.selfConsumedKwH === 0) {
             this.log(models_1.LogLevel.Warn, `Not persisting energy Data, as all values are 0.`);
             return;
         }
-        this._nextPersistEntry = new index_1.EnergyCalculation(this._lastPersistenceCalculation);
+        this._nextPersistEntry = new models_1.EnergyCalculation(this._lastPersistenceCalculation);
         obj.endMs = this._lastPersistenceCalculation;
-        obj.earnedInjected = services_1.Utils.round(obj.injectedKwH * ((_a = index_1.SettingsService.settings.injectWattagePrice) !== null && _a !== void 0 ? _a : 0.06), 4);
-        obj.savedSelfConsume = services_1.Utils.round(obj.selfConsumedKwH * index_1.SettingsService.settings.wattagePrice, 4);
-        obj.costDrawn = services_1.Utils.round(obj.drawnKwH * index_1.SettingsService.settings.wattagePrice, 4);
+        obj.earnedInjected = services_1.Utils.round(obj.injectedKwH * ((_a = services_1.SettingsService.settings.injectWattagePrice) !== null && _a !== void 0 ? _a : 0.06), 4);
+        obj.savedSelfConsume = services_1.Utils.round(obj.selfConsumedKwH * services_1.SettingsService.settings.wattagePrice, 4);
+        obj.costDrawn = services_1.Utils.round(obj.drawnKwH * services_1.SettingsService.settings.wattagePrice, 4);
         obj.injectedKwH = services_1.Utils.round(obj.injectedKwH, 4);
         obj.selfConsumedKwH = services_1.Utils.round(obj.selfConsumedKwH, 4);
         obj.drawnKwH = services_1.Utils.round(obj.drawnKwH, 4);
-        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.persistEnergyManager(obj);
+        (_b = services_1.Utils.dbo) === null || _b === void 0 ? void 0 : _b.persistEnergyManager(obj);
         this.log(models_1.LogLevel.Info, `Persisting energy Manager Data.`);
     }
 }

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

@@ -20,3 +20,4 @@ export * from './zigbeeSMaBiTMagnetContact';
 export * from './zigbeeSonoffMotion';
 export * from './zigbeeSonoffTemp';
 export * from './zigbeeSwitch';
+export * from './zigbeeUbisysShutter';

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

@@ -36,3 +36,4 @@ __exportStar(require("./zigbeeSMaBiTMagnetContact"), exports);
 __exportStar(require("./zigbeeSonoffMotion"), exports);
 __exportStar(require("./zigbeeSonoffTemp"), exports);
 __exportStar(require("./zigbeeSwitch"), exports);
+__exportStar(require("./zigbeeUbisysShutter"), exports);

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

@@ -4,12 +4,12 @@ import { iIlluminationSensor } from '../iIlluminationSensor';
 import { ZigbeeMotionSensor } from './zigbeeMotionSensor';
 export declare class ZigbeeAquaraMotion extends ZigbeeMotionSensor implements iIlluminationSensor {
     private _illuminance;
-    private _motionTimeout;
     private occupancyTimeoutID;
-    get currentIllumination(): number;
-    private set currentIllumination(value);
+    constructor(pInfo: DeviceInfo);
+    private _motionTimeout;
     get motionTimeout(): number;
     set motionTimeout(value: number);
-    constructor(pInfo: DeviceInfo);
+    get currentIllumination(): number;
+    private set currentIllumination(value);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
 }

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

@@ -2,27 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeAquaraMotion = void 0;
 const deviceType_1 = require("../deviceType");
-const CurrentIlluminationDataPoint_1 = require("../../../models/persistence/CurrentIlluminationDataPoint");
-const logLevel_1 = require("../../../models/logLevel");
+const models_1 = require("../../../models");
 const zigbeeMotionSensor_1 = require("./zigbeeMotionSensor");
-const index_1 = require("../../../index");
+const services_1 = require("../../services");
 class ZigbeeAquaraMotion extends zigbeeMotionSensor_1.ZigbeeMotionSensor {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeAquaraMotion);
         this._illuminance = 0;
-        this._motionTimeout = 0;
         this.occupancyTimeoutID = `occupancy_timeout`;
+        this._motionTimeout = 0;
         this.occupancyTimeoutID = `${this.info.fullID}.${this.occupancyTimeoutID}`;
     }
-    // Currently measured brightness in lux
-    get currentIllumination() {
-        return this._illuminance;
-    }
-    set currentIllumination(value) {
-        var _a, _b, _c;
-        this._illuminance = value;
-        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.persistCurrentIllumination(new CurrentIlluminationDataPoint_1.CurrentIlluminationDataPoint(this.info.room, this.info.devID, value, new Date(), (_c = (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.LampenGroup) === null || _b === void 0 ? void 0 : _b.anyLightsOwn()) !== null && _c !== void 0 ? _c : false));
-    }
     // Time after the last trigger until a motion event gets triggered again
     get motionTimeout() {
         return this._motionTimeout;
@@ -34,16 +24,25 @@ class ZigbeeAquaraMotion extends zigbeeMotionSensor_1.ZigbeeMotionSensor {
             console.log(`Error occurred while setting motion timeout: ${err}`);
         });
     }
+    // Currently measured brightness in lux
+    get currentIllumination() {
+        return this._illuminance;
+    }
+    set currentIllumination(value) {
+        var _a, _b, _c, _d;
+        this._illuminance = value;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistCurrentIllumination(new models_1.CurrentIlluminationDataPoint(this.info.room, this.info.devID, value, new Date(), (_d = (_c = (_b = this.room) === null || _b === void 0 ? void 0 : _b.LampenGroup) === null || _c === void 0 ? void 0 : _c.anyLightsOwn()) !== null && _d !== void 0 ? _d : false));
+    }
     update(idSplit, state, initial = false) {
-        this.log(logLevel_1.LogLevel.DeepTrace, `Motion update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
+        this.log(models_1.LogLevel.DeepTrace, `Motion update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
             case 'illuminance':
-                this.log(logLevel_1.LogLevel.Trace, `Motion sensor: Update for illuminance of ${this.info.customName}: ${state.val}`);
+                this.log(models_1.LogLevel.Trace, `Motion sensor: Update for illuminance of ${this.info.customName}: ${state.val}`);
                 this.currentIllumination = state.val;
                 break;
             case 'occupancy_timeout':
-                this.log(logLevel_1.LogLevel.Trace, `Motion sensor: Update for motion timeout of ${this.info.customName}: ${state.val}`);
+                this.log(models_1.LogLevel.Trace, `Motion sensor: Update for motion timeout of ${this.info.customName}: ${state.val}`);
                 this._motionTimeout = state.val;
                 break;
         }

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

@@ -1,7 +1,8 @@
 /// <reference types="iobroker" />
 import { DeviceInfo } from '../DeviceInfo';
+import { iVibrationSensor } from '../iVibrationSensor';
 import { ZigbeeDevice } from './zigbeeDevice';
-export declare class ZigbeeAquaraVibra extends ZigbeeDevice {
+export declare class ZigbeeAquaraVibra extends ZigbeeDevice implements iVibrationSensor {
     sensitivity: string;
     tiltAngle: number;
     tiltAngleX: number;
@@ -11,13 +12,18 @@ export declare class ZigbeeAquaraVibra extends ZigbeeDevice {
     tiltAngleZ: number;
     tilt: boolean;
     vibration: boolean;
-    vibrationBlockedTimeStamp: number;
+    vibrationBlockedByGriffTimeStamp: number;
+    vibrationBlockedByMotionTimeStamp: number;
     private _idSensitivity;
-    private _vibrationBlocked;
     private _alarmMessage;
     constructor(pInfo: DeviceInfo);
-    set vibrationBlocked(pVal: boolean);
+    private _vibrationBlockedByGriff;
+    get vibrationBlockedByGriff(): boolean;
+    set vibrationBlockedByGriff(pVal: boolean);
+    private _vibrationBlockedByMotion;
+    get vibrationBlockedByMotion(): boolean;
+    set vibrationBlockedByMotion(pVal: boolean);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     setSensitivity(pVal: number): void;
-    private alarmCheck;
+    alarmCheck(): void;
 }