hoffmation-base 3.2.11-alpha.1 → 3.2.12

package/lib/devices/dachs/dachs.js

@@ -225,7 +225,11 @@ class Dachs extends RoomBaseDevice_1.RoomBaseDevice {
         const heatStorageTemp = this._tempHeatStorage;
         let desiredWwPumpState = false;
         let reason = '';
-        if (((_a = this.warmWaterDachsAlternativeActuator) === null || _a === void 0 ? void 0 : _a.actuatorOn) === true) {
+        if (this.settings.disableDachsOwnWW) {
+            desiredWwPumpState = false;
+            reason = 'Dachs own WW is disabled';
+        }
+        else if (((_a = this.warmWaterDachsAlternativeActuator) === null || _a === void 0 ? void 0 : _a.actuatorOn) === true) {
             desiredWwPumpState = false;
             reason = 'Alternative heating source is on';
         }
@@ -346,7 +350,11 @@ class Dachs extends RoomBaseDevice_1.RoomBaseDevice {
         }
         let desiredState = false;
         let reason = 'Dachs is allowed to run --> Block alternative heating source';
-        if (shouldDachsBeStarted || this._dachsOn) {
+        if (this.settings.disableDachsOwnWW) {
+            reason = 'Dachs own WW is disabled';
+            desiredState = true;
+        }
+        else if (shouldDachsBeStarted || this._dachsOn) {
             reason = 'Dachs is running or should be started';
             desiredState = false;
         }

package/lib/devices/unifi/own-unifi-camera.js

@@ -45,7 +45,7 @@ class OwnUnifiCamera extends index_1.CameraDevice {
         for (const smartDetectType of detectedTypes) {
             switch (smartDetectType) {
                 case 'licensePlate':
-                    this.log(enums_1.LogLevel.Debug, `Detected "licensePlate": ${JSON.stringify(payloadAsEventAdd.metadata.licensePlate)}`);
+                    this.log(enums_1.LogLevel.Debug, `Detected "licensePlate" Data: ${JSON.stringify(payloadAsEventAdd)}`);
                     break;
                 case 'person':
                     this.onNewPersonDetectedValue(true, enums_1.CommandSource.Automatic);

package/lib/devices/unifi/unifi-protect.js

@@ -79,7 +79,9 @@ class UnifiProtect {
                 }
                 const ownCamera = UnifiProtect.ownCameras.get(ownName);
                 if (ownCamera !== undefined) {
-                    ownCamera.update(packet, baseEvent);
+                    utils_1.Utils.guardedFunction(() => {
+                        ownCamera.update(packet, baseEvent);
+                    }, this);
                     break;
                 }
                 break;

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

@@ -4,4 +4,5 @@ export declare class ZigbeeAqaraPresence extends ZigbeeMotionSensor {
     protected _needsMovementResetFallback: boolean;
     protected readonly _occupancyStateId: string;
     constructor(pInfo: IoBrokerDeviceInfo);
+    update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
 }

package/lib/devices/zigbee/zigbeeAqaraPresence.js

@@ -9,5 +9,8 @@ class ZigbeeAqaraPresence extends BaseDevices_1.ZigbeeMotionSensor {
         this._needsMovementResetFallback = false;
         this._occupancyStateId = 'presence';
     }
+    update(idSplit, state, initial = false) {
+        super.update(idSplit, state, initial, true);
+    }
 }
 exports.ZigbeeAqaraPresence = ZigbeeAqaraPresence;

package/lib/devices/zigbee/zigbeeAquaraMotion.js

@@ -37,7 +37,7 @@ class ZigbeeAquaraMotion extends BaseDevices_1.ZigbeeMotionSensor {
     }
     /** @inheritDoc */
     update(idSplit, state, initial = false) {
-        this.log(enums_1.LogLevel.DeepTrace, `Motion update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
+        // this.log(LogLevel.DeepTrace, `Motion update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
             case 'illuminance':

package/lib/interfaces/deviceSettings/iDachsDeviceSettings.d.ts

@@ -11,6 +11,10 @@ export interface iDachsDeviceSettings extends iActuatorSettings {
      * Whether the secondary water heating source should be disabled regardless of battery level.
      */
     disableHeatingRod: boolean;
+    /**
+     * Option to disable Warm-Water production from dachs completely.
+     */
+    disableDachsOwnWW: boolean;
     /**
      * Defines the battery level at which the dachs should be turned on,
      * to prevent a battery based island-system to be out of power.

package/lib/settingsObjects/deviceSettings/dachsSettings.d.ts

@@ -6,6 +6,8 @@ export declare class DachsDeviceSettings extends ActuatorSettings implements iDa
     /** @inheritDoc */
     disableHeatingRod: boolean;
     /** @inheritDoc */
+    disableDachsOwnWW: boolean;
+    /** @inheritDoc */
     batteryLevelTurnOnThreshold: number;
     /** @inheritDoc */
     batteryLevelBeforeNightTurnOnThreshold: number;

package/lib/settingsObjects/deviceSettings/dachsSettings.js

@@ -11,6 +11,8 @@ class DachsDeviceSettings extends actuatorSettings_1.ActuatorSettings {
         /** @inheritDoc */
         this.disableHeatingRod = false;
         /** @inheritDoc */
+        this.disableDachsOwnWW = false;
+        /** @inheritDoc */
         this.batteryLevelTurnOnThreshold = -1;
         /** @inheritDoc */
         this.batteryLevelBeforeNightTurnOnThreshold = -1;
@@ -30,22 +32,23 @@ class DachsDeviceSettings extends actuatorSettings_1.ActuatorSettings {
         this.winterMinimumPreNightHeatStorageTemp = 65;
     }
     fromPartialObject(data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         this.disableHeatingRod = (_a = data.disableHeatingRod) !== null && _a !== void 0 ? _a : this.disableHeatingRod;
-        this.refreshIntervalTime = (_b = data.refreshIntervalTime) !== null && _b !== void 0 ? _b : this.refreshIntervalTime;
+        this.disableDachsOwnWW = (_b = data.disableDachsOwnWW) !== null && _b !== void 0 ? _b : this.disableDachsOwnWW;
+        this.refreshIntervalTime = (_c = data.refreshIntervalTime) !== null && _c !== void 0 ? _c : this.refreshIntervalTime;
         this.batteryLevelBeforeNightTurnOnThreshold =
-            (_c = data.batteryLevelBeforeNightTurnOnThreshold) !== null && _c !== void 0 ? _c : this.batteryLevelBeforeNightTurnOnThreshold;
-        this.batteryLevelTurnOnThreshold = (_d = data.batteryLevelTurnOnThreshold) !== null && _d !== void 0 ? _d : this.batteryLevelTurnOnThreshold;
-        this.batteryLevelHeatingRodThreshold = (_e = data.batteryLevelHeatingRodThreshold) !== null && _e !== void 0 ? _e : this.batteryLevelHeatingRodThreshold;
+            (_d = data.batteryLevelBeforeNightTurnOnThreshold) !== null && _d !== void 0 ? _d : this.batteryLevelBeforeNightTurnOnThreshold;
+        this.batteryLevelTurnOnThreshold = (_e = data.batteryLevelTurnOnThreshold) !== null && _e !== void 0 ? _e : this.batteryLevelTurnOnThreshold;
+        this.batteryLevelHeatingRodThreshold = (_f = data.batteryLevelHeatingRodThreshold) !== null && _f !== void 0 ? _f : this.batteryLevelHeatingRodThreshold;
         this.batteryLevelPreventStartThreshold =
-            (_f = data.batteryLevelPreventStartThreshold) !== null && _f !== void 0 ? _f : this.batteryLevelPreventStartThreshold;
+            (_g = data.batteryLevelPreventStartThreshold) !== null && _g !== void 0 ? _g : this.batteryLevelPreventStartThreshold;
         this.batteryLevelPreventStartAtNightThreshold =
-            (_g = data.batteryLevelPreventStartAtNightThreshold) !== null && _g !== void 0 ? _g : this.batteryLevelPreventStartAtNightThreshold;
-        this.batteryLevelAllowStartThreshold = (_h = data.batteryLevelAllowStartThreshold) !== null && _h !== void 0 ? _h : this.batteryLevelAllowStartThreshold;
-        this.warmWaterDesiredMinTemp = (_j = data.warmWaterDesiredMinTemp) !== null && _j !== void 0 ? _j : this.warmWaterDesiredMinTemp;
-        this.winterMinimumHeatStorageTemp = (_k = data.winterMinimumHeatStorageTemp) !== null && _k !== void 0 ? _k : this.winterMinimumHeatStorageTemp;
+            (_h = data.batteryLevelPreventStartAtNightThreshold) !== null && _h !== void 0 ? _h : this.batteryLevelPreventStartAtNightThreshold;
+        this.batteryLevelAllowStartThreshold = (_j = data.batteryLevelAllowStartThreshold) !== null && _j !== void 0 ? _j : this.batteryLevelAllowStartThreshold;
+        this.warmWaterDesiredMinTemp = (_k = data.warmWaterDesiredMinTemp) !== null && _k !== void 0 ? _k : this.warmWaterDesiredMinTemp;
+        this.winterMinimumHeatStorageTemp = (_l = data.winterMinimumHeatStorageTemp) !== null && _l !== void 0 ? _l : this.winterMinimumHeatStorageTemp;
         this.winterMinimumPreNightHeatStorageTemp =
-            (_l = data.winterMinimumPreNightHeatStorageTemp) !== null && _l !== void 0 ? _l : this.winterMinimumPreNightHeatStorageTemp;
+            (_m = data.winterMinimumPreNightHeatStorageTemp) !== null && _m !== void 0 ? _m : this.winterMinimumPreNightHeatStorageTemp;
         super.fromPartialObject(data);
     }
     toJSON() {