hoffmation-base 3.0.0-beta.2 → 3.0.0-beta.4

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

@@ -37,6 +37,14 @@ export declare class DachsDeviceSettings extends ActuatorSettings {
      * Defines the desired minimum temperature for warm water.
      */
     warmWaterDesiredMinTemp: number;
+    /**
+     * Defines the desired minimum temperature for heat storage during winter.
+     */
+    winterMinimumHeatStorageTemp: number;
+    /**
+     * Defines the desired minimum temperature for heat storage during winter.
+     */
+    winterMinimumPreNightHeatStorageTemp: number;
     fromPartialObject(data: Partial<DachsDeviceSettings>): void;
     protected toJSON(): Partial<DachsDeviceSettings>;
 }

package/lib/models/deviceSettings/dachsSettings.js

@@ -43,9 +43,17 @@ class DachsDeviceSettings extends actuatorSettings_1.ActuatorSettings {
          * Defines the desired minimum temperature for warm water.
          */
         this.warmWaterDesiredMinTemp = 45;
+        /**
+         * Defines the desired minimum temperature for heat storage during winter.
+         */
+        this.winterMinimumHeatStorageTemp = 55;
+        /**
+         * Defines the desired minimum temperature for heat storage during winter.
+         */
+        this.winterMinimumPreNightHeatStorageTemp = 65;
     }
     fromPartialObject(data) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         this.refreshIntervalTime = (_a = data.refreshIntervalTime) !== null && _a !== void 0 ? _a : this.refreshIntervalTime;
         this.batteryLevelBeforeNightTurnOnThreshold =
             (_b = data.batteryLevelBeforeNightTurnOnThreshold) !== null && _b !== void 0 ? _b : this.batteryLevelBeforeNightTurnOnThreshold;
@@ -55,6 +63,9 @@ class DachsDeviceSettings extends actuatorSettings_1.ActuatorSettings {
             (_e = data.batteryLevelPreventStartThreshold) !== null && _e !== void 0 ? _e : this.batteryLevelPreventStartThreshold;
         this.batteryLevelAllowStartThreshold = (_f = data.batteryLevelAllowStartThreshold) !== null && _f !== void 0 ? _f : this.batteryLevelAllowStartThreshold;
         this.warmWaterDesiredMinTemp = (_g = data.warmWaterDesiredMinTemp) !== null && _g !== void 0 ? _g : this.warmWaterDesiredMinTemp;
+        this.winterMinimumHeatStorageTemp = (_h = data.winterMinimumHeatStorageTemp) !== null && _h !== void 0 ? _h : this.winterMinimumHeatStorageTemp;
+        this.winterMinimumPreNightHeatStorageTemp =
+            (_j = data.winterMinimumPreNightHeatStorageTemp) !== null && _j !== void 0 ? _j : this.winterMinimumPreNightHeatStorageTemp;
         super.fromPartialObject(data);
     }
     toJSON() {

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

@@ -87,7 +87,9 @@ export declare class Dachs implements iBaseDevice, iActuator {
      */
     private onBatteryLevelChange;
     private checkAllDesiredStates;
-    private onTempChange;
+    private onHeatStorageTempChange;
+    private onWarmWaterTempChange;
+    private checkWwPumpDesiredState;
     private checkHeatingRod;
     private shouldDachsBeStarted;
     private checkAlternativeActuator;

package/lib/server/devices/dachs/dachs.js

@@ -63,8 +63,8 @@ class Dachs {
             const energyManager = devices_1.Devices.energymanager;
             energyManager.battery.addBatteryLevelCallback(this.onBatteryLevelChange.bind(this));
         }
-        this.warmWaterSensor.addTempChangeCallback(this.onTempChange.bind(this));
-        this.heatStorageTempSensor.addTempChangeCallback(this.onTempChange.bind(this));
+        this.warmWaterSensor.addTempChangeCallback(this.onWarmWaterTempChange.bind(this));
+        this.heatStorageTempSensor.addTempChangeCallback(this.onHeatStorageTempChange.bind(this));
     }
     /** @inheritDoc */
     get info() {
@@ -220,6 +220,7 @@ class Dachs {
         const shouldDachsBeStarted = this.shouldDachsBeStarted(action, batteryLevel);
         this.checkHeatingRod(action, batteryLevel);
         this.checkAlternativeActuator(shouldDachsBeStarted, action);
+        this.checkWwPumpDesiredState(action);
         if (!shouldDachsBeStarted) {
             return;
         }
@@ -227,7 +228,15 @@ class Dachs {
         setStateCommand.overrideCommandSource = models_1.CommandSource.Force;
         this.setActuator(setStateCommand);
     }
-    onTempChange(action) {
+    onHeatStorageTempChange(action) {
+        var _a, _b;
+        this.checkAllDesiredStates(action, (_b = (_a = devices_1.Devices.energymanager) === null || _a === void 0 ? void 0 : _a.batteryLevel) !== null && _b !== void 0 ? _b : 0);
+    }
+    onWarmWaterTempChange(action) {
+        var _a, _b;
+        this.checkAllDesiredStates(action, (_b = (_a = devices_1.Devices.energymanager) === null || _a === void 0 ? void 0 : _a.batteryLevel) !== null && _b !== void 0 ? _b : 0);
+    }
+    checkWwPumpDesiredState(action) {
         var _a, _b;
         if (this.warmWaterPump === undefined) {
             // We have no control over the warm water pump --> nothing to do
@@ -288,7 +297,7 @@ class Dachs {
         this.heatingRod.setActuator(setAction);
     }
     shouldDachsBeStarted(action, batteryLevel) {
-        var _a;
+        var _a, _b;
         if (this.blockDachsStart !== undefined) {
             if (batteryLevel > this.settings.batteryLevelPreventStartThreshold) {
                 const blockAction = new models_1.ActuatorSetStateCommand(action, true, `Battery reached ${batteryLevel}%, Dachs should not run any more`, null);
@@ -301,7 +310,7 @@ class Dachs {
                 this.blockDachsStart.setActuator(liftAction);
             }
             else if (((_a = services_1.SettingsService.settings.heaterSettings) === null || _a === void 0 ? void 0 : _a.mode) === config_1.HeatingMode.Winter &&
-                this.heatStorageTempSensor.temperatureSensor.temperature < 60 &&
+                this.heatStorageTempSensor.temperatureSensor.temperature < this.settings.winterMinimumPreNightHeatStorageTemp &&
                 services_1.Utils.dateByTimeSpan(21, 30) < new Date()) {
                 const liftWinterAction = new models_1.ActuatorSetStateCommand(action, false, `Battery at ${batteryLevel}% but it is winter, we are nearing night and heat storage is kinda cold: Dachs is now allowed to run if needed`, null);
                 this.blockDachsStart.setActuator(liftWinterAction);
@@ -315,6 +324,11 @@ class Dachs {
             // We are already running
             return false;
         }
+        if (((_b = services_1.SettingsService.settings.heaterSettings) === null || _b === void 0 ? void 0 : _b.mode) === config_1.HeatingMode.Winter &&
+            this.heatStorageTempSensor.temperatureSensor.temperature < this.settings.winterMinimumHeatStorageTemp) {
+            // It is winter and heat storage is kinda cold --> Start
+            return true;
+        }
         const dayType = services_1.TimeCallbackService.dayType(new services_1.SunTimeOffsets());
         if ((dayType === models_1.TimeOfDay.Daylight || dayType === models_1.TimeOfDay.BeforeSunrise) &&
             batteryLevel > this.settings.batteryLevelTurnOnThreshold) {

package/lib/server/devices/device-cluster.js

@@ -65,6 +65,11 @@ class DeviceCluster {
             case deviceType_1.DeviceType.HmIpGriff:
                 clusterTypes.push(device_cluster_type_1.DeviceClusterType.Handle);
                 break;
+            case deviceType_1.DeviceType.ZigbeeSodaHandle:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.Handle);
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.TemperaturSensor);
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.HumiditySensor);
+                break;
             case deviceType_1.DeviceType.HmIpHeizgruppe:
                 clusterTypes.push(device_cluster_type_1.DeviceClusterType.Heater);
                 clusterTypes.push(device_cluster_type_1.DeviceClusterType.TemperaturSensor);
@@ -78,6 +83,7 @@ class DeviceCluster {
             case deviceType_1.DeviceType.HmIpBewegung:
             case deviceType_1.DeviceType.ZigbeeAquaraMotion:
             case deviceType_1.DeviceType.ZigbeeSonoffMotion:
+            case deviceType_1.DeviceType.ZigbeeTuyaMotion:
             case deviceType_1.DeviceType.HmIpPraezenz:
                 clusterTypes.push(device_cluster_type_1.DeviceClusterType.MotionDetection);
                 break;

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

@@ -39,6 +39,7 @@ export declare enum DeviceType {
     ZigbeeUbisysLampe = 225,
     ZigbeeInnr142C = 226,
     ZigbeeSodaHandle = 227,
+    ZigbeeTuyaMotion = 228,
     JsEnergyManager = 301,
     RoomScene = 401,
     ShellyTrv = 402,

package/lib/server/devices/deviceType.js

@@ -43,6 +43,7 @@ var DeviceType;
     DeviceType[DeviceType["ZigbeeUbisysLampe"] = 225] = "ZigbeeUbisysLampe";
     DeviceType[DeviceType["ZigbeeInnr142C"] = 226] = "ZigbeeInnr142C";
     DeviceType[DeviceType["ZigbeeSodaHandle"] = 227] = "ZigbeeSodaHandle";
+    DeviceType[DeviceType["ZigbeeTuyaMotion"] = 228] = "ZigbeeTuyaMotion";
     DeviceType[DeviceType["JsEnergyManager"] = 301] = "JsEnergyManager";
     DeviceType[DeviceType["RoomScene"] = 401] = "RoomScene";
     DeviceType[DeviceType["ShellyTrv"] = 402] = "ShellyTrv";

package/lib/server/devices/devices.js

@@ -223,6 +223,9 @@ class Devices {
             case 'TuyaValve':
                 d = new zigbee_1.ZigbeeTuyaValve(zigbeeInfo);
                 break;
+            case 'TuyaMotion':
+                d = new zigbee_1.ZigbeeTuyaMotion(zigbeeInfo);
+                break;
             case 'EuroHeater':
                 d = new zigbee_1.ZigbeeEuroHeater(zigbeeInfo);
                 break;

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

@@ -44,6 +44,7 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
             Kd: 9, // PID: Kd in 1/1000
         });
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.heater);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.temperatureSensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         this._setAutomaticModeId = `${this.info.fullID}.tmp.automaticTemperatureControl`;
         this._setExternalTempId = `${this.info.fullID}.ext.temperature`;

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

@@ -39,6 +39,7 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         });
         this._seasonTurnOff = false;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.heater);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.temperatureSensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         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, () => {

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

@@ -25,3 +25,4 @@ export * from './zigbeeTuyaValve';
 export * from './zigbeeUbisysActuator';
 export * from './zigbeeUbisysLampe';
 export * from './zigbeeUbisysShutter';
+export { ZigbeeTuyaMotion } from './zigbeeTuyaMotion';

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

@@ -14,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZigbeeTuyaMotion = void 0;
 __exportStar(require("./BaseDevices/index"), exports);
 __exportStar(require("./zigbeeAqaraMagnetContact"), exports);
 __exportStar(require("./zigbeeAqaraOpple3Switch"), exports);
@@ -41,3 +42,5 @@ __exportStar(require("./zigbeeTuyaValve"), exports);
 __exportStar(require("./zigbeeUbisysActuator"), exports);
 __exportStar(require("./zigbeeUbisysLampe"), exports);
 __exportStar(require("./zigbeeUbisysShutter"), exports);
+var zigbeeTuyaMotion_1 = require("./zigbeeTuyaMotion");
+Object.defineProperty(exports, "ZigbeeTuyaMotion", { enumerable: true, get: function () { return zigbeeTuyaMotion_1.ZigbeeTuyaMotion; } });

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

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

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

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZigbeeTuyaMotion = void 0;
+const BaseDevices_1 = require("./BaseDevices");
+const deviceType_1 = require("../deviceType");
+const models_1 = require("../../../models");
+class ZigbeeTuyaMotion extends BaseDevices_1.ZigbeeMotionSensor {
+    constructor(pInfo) {
+        super(pInfo, deviceType_1.DeviceType.ZigbeeTuyaMotion);
+        this._needsMovementResetFallback = false;
+    }
+    /** @inheritDoc */
+    update(idSplit, state, initial = false) {
+        this.log(models_1.LogLevel.DeepTrace, `Motion update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
+        super.update(idSplit, state, initial, true);
+    }
+}
+exports.ZigbeeTuyaMotion = ZigbeeTuyaMotion;