hoffmation-base 2.18.5 → 2.18.7

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

@@ -10,5 +10,5 @@ export interface iCameraDevice extends iMotionSensor {
     readonly alarmBlockedByGriff: boolean;
     readonly alarmBlockedByGriffTimeStamp: number;
     onGriffUpdate(open: boolean): void;
-    update(stateName: string, state: ioBroker.State): void;
+    update(idSplit: string[], state: ioBroker.State): void;
 }

package/lib/server/devices/blueIris/blueIrisCoordinator.js

@@ -17,7 +17,7 @@ class BlueIrisCoordinator {
             services_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Unknown Blue Iris Device "${devName}"`);
             return;
         }
-        dev.update(idSplit[4], state);
+        dev.update(idSplit, state);
     }
 }
 exports.BlueIrisCoordinator = BlueIrisCoordinator;

package/lib/server/devices/blueIris/cameraDevice.d.ts

@@ -6,6 +6,10 @@ import { DeviceCapability } from '../DeviceCapability';
 import { DeviceType } from '../deviceType';
 export declare class CameraDevice implements iCameraDevice {
     readonly blueIrisName: string;
+    private _personDetectFallbackTimeout;
+    private _movementDetectFallbackTimeout;
+    private _personDetectedStateId;
+    private _movementDetectedStateId;
     get lastImage(): string;
     settings: CameraSettings;
     readonly deviceCapabilities: DeviceCapability[];
@@ -48,10 +52,12 @@ export declare class CameraDevice implements iCameraDevice {
     addMovementCallback(pCallback: (newState: boolean) => void): void;
     onGriffUpdate(open: boolean): void;
     persistMotionSensor(): void;
-    update(stateName: string, state: ioBroker.State): void;
+    update(idSplit: string[], state: ioBroker.State): void;
     updateMovement(newState: boolean): void;
     log(level: LogLevel, message: string, debugType?: LogDebugType): void;
     toJSON(): Partial<iRoomDevice>;
     persistDeviceInfo(): void;
     loadDeviceSettings(): void;
+    private resetPersonDetectFallbackTimer;
+    private resetMovementFallbackTimer;
 }

package/lib/server/devices/blueIris/cameraDevice.js

@@ -12,6 +12,7 @@ const devices_1 = require("../devices");
 const DeviceInfo_1 = require("../DeviceInfo");
 const DeviceCapability_1 = require("../DeviceCapability");
 const deviceType_1 = require("../deviceType");
+const ioBroker_1 = require("../../ioBroker");
 class CameraDevice {
     get lastImage() {
         return this._lastImage;
@@ -24,6 +25,10 @@ class CameraDevice {
     }
     constructor(mqttName, roomName, blueIrisName) {
         var _a;
+        this._personDetectFallbackTimeout = null;
+        this._movementDetectFallbackTimeout = null;
+        this._personDetectedStateId = undefined;
+        this._movementDetectedStateId = undefined;
         this.settings = new models_1.CameraSettings();
         this.deviceCapabilities = [DeviceCapability_1.DeviceCapability.camera, DeviceCapability_1.DeviceCapability.motionSensor];
         this.deviceType = deviceType_1.DeviceType.Camera;
@@ -126,19 +131,27 @@ class CameraDevice {
         var _a;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistMotionSensor(this);
     }
-    update(stateName, state) {
+    update(idSplit, state) {
+        const stateName = idSplit[4];
         this.log(models_1.LogLevel.Debug, `Update for "${stateName}"`);
         switch (stateName) {
             case 'MotionDetected':
+                this._movementDetectedStateId = idSplit.join('.');
                 if (this.settings.movementDetectionOnPersonOnly) {
                     return;
                 }
-                this.updateMovement(state.val === 1);
+                const movementDetected = state.val === 1;
+                this.updateMovement(movementDetected);
+                if (movementDetected) {
+                    this.resetMovementFallbackTimer();
+                }
                 break;
             case 'PersonDetected':
+                this._personDetectedStateId = idSplit.join('.');
                 const newValue = state.val === 1;
                 if (newValue) {
                     this.log(models_1.LogLevel.Info, `Person Detected`);
+                    this.resetPersonDetectFallbackTimer();
                 }
                 this._personDetected = newValue;
                 if (this.settings.movementDetectionOnPersonOnly) {
@@ -204,5 +217,37 @@ class CameraDevice {
         var _a;
         (_a = this.settings) === null || _a === void 0 ? void 0 : _a.initializeFromDb(this);
     }
+    resetPersonDetectFallbackTimer() {
+        if (this._personDetectFallbackTimeout !== null) {
+            clearTimeout(this._personDetectFallbackTimeout);
+            this._personDetectFallbackTimeout = null;
+        }
+        this._personDetectFallbackTimeout = services_1.Utils.guardedTimeout(() => {
+            var _a;
+            this._personDetectFallbackTimeout = null;
+            this._personDetected = false;
+            if (this.settings.movementDetectionOnPersonOnly) {
+                this.updateMovement(false);
+            }
+            if (this._personDetectedStateId !== undefined) {
+                (_a = ioBroker_1.ioBrokerMain.iOConnection) === null || _a === void 0 ? void 0 : _a.setState(this._personDetectedStateId, { val: 0, ack: true });
+            }
+        }, 120000, this);
+    }
+    resetMovementFallbackTimer() {
+        if (this._movementDetectFallbackTimeout !== null) {
+            clearTimeout(this._movementDetectFallbackTimeout);
+            this._movementDetectFallbackTimeout = null;
+        }
+        this._movementDetectFallbackTimeout = services_1.Utils.guardedTimeout(() => {
+            var _a;
+            this._movementDetectFallbackTimeout = null;
+            this._movementDetected = false;
+            this.updateMovement(false);
+            if (this._movementDetectedStateId !== undefined) {
+                (_a = ioBroker_1.ioBrokerMain.iOConnection) === null || _a === void 0 ? void 0 : _a.setState(this._movementDetectedStateId, { val: 0, ack: true });
+            }
+        }, 120000, this);
+    }
 }
 exports.CameraDevice = CameraDevice;

package/lib/server/devices/shelly/shellyTrv.d.ts

@@ -8,12 +8,14 @@ export declare class ShellyTrv extends ShellyDevice implements iHeater {
     get lastBatteryPersist(): number;
     readonly persistHeaterInterval: NodeJS.Timeout;
     get battery(): number;
+    get minimumLevel(): number;
     private _automaticMode;
     private _battery;
     private _iAutomaticInterval;
     private _initialSeasonCheckDone;
     private _lastRecalc;
     private _level;
+    private _minimumValveLevel;
     private _recalcTimeout;
     private _temperatur;
     private _targetTempVal;
@@ -22,6 +24,7 @@ export declare class ShellyTrv extends ShellyDevice implements iHeater {
     private _pidController;
     private _lastBatteryPersist;
     private readonly _batteryId;
+    private readonly _minumumLevelId;
     private readonly _setAutomaticModeId;
     private readonly _setExternalTempId;
     private readonly _setEnableExternalTempId;
@@ -57,4 +60,5 @@ export declare class ShellyTrv extends ShellyDevice implements iHeater {
     private setExternalTemperature;
     private setExternalTemperatureEnabled;
     private setValve;
+    private setMinimumLevel;
 }

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

@@ -15,6 +15,9 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
     get battery() {
         return this._battery;
     }
+    get minimumLevel() {
+        return this._minimumValveLevel;
+    }
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ShellyTrv);
         this.settings = new models_1.HeaterSettings();
@@ -26,6 +29,7 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         this._initialSeasonCheckDone = false;
         this._lastRecalc = 0;
         this._level = 0;
+        this._minimumValveLevel = 0;
         this._recalcTimeout = null;
         this._temperatur = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         this._targetTempVal = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
@@ -52,7 +56,8 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         this._setExternalTempId = `${this.info.fullID}.ext.temperature`;
         this._setEnableExternalTempId = `${this.info.fullID}.ext.enabled`;
         this._setPointTemperaturID = `${this.info.fullID}.tmp.shelly.temperatureTargetC`;
-        this._temperatureId = `${this.info.fullID}.tmp..temperatureC`;
+        this._minumumLevelId = `${this.info.fullID}.tmp.minimumValvePosition`;
+        this._temperatureId = `${this.info.fullID}.tmp.temperatureC`;
         this._valvePosId = `${this.info.fullID}.tmp.valvePosition`;
         this._iAutomaticInterval = services_1.Utils.guardedInterval(this.checkAutomaticChange, 300000, this); // Alle 5 Minuten prüfen
         services_1.TimeCallbackService.addCallback(new models_1.TimeCallback(`${this.info.fullID} Season Check`, models_1.TimeCallbackType.TimeOfDay, () => {
@@ -126,6 +131,9 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         if (this.seasonTurnOff) {
             return;
         }
+        if (this.settings.pidForcedMinimum !== this.minimumLevel) {
+            this.setMinimumLevel(this.settings.pidForcedMinimum);
+        }
         if (!this.settings.useOwnTemperatur && !this.settings.controlByPid) {
             this.setExternalTemperatureEnabled(true);
         }
@@ -167,6 +175,9 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
             case this._setEnableExternalTempId:
                 this._useExternalTemperatureEnabled = state.val;
                 break;
+            case this._minumumLevelId:
+                this._minimumValveLevel = state.val;
+                break;
             case this._temperatureId:
                 this._temperatur = state.val;
                 break;
@@ -259,5 +270,8 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         this.log(models_1.LogLevel.Info, `Setting Valve to new value: "${target}%"`);
         this.setState(this._valvePosId, target);
     }
+    setMinimumLevel(pidForcedMinimum) {
+        this.setState(this._minumumLevelId, pidForcedMinimum);
+    }
 }
 exports.ShellyTrv = ShellyTrv;