hoffmation-base 3.2.1 → 3.2.3-alpha.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -89,7 +89,7 @@ class Dachs extends RoomBaseDevice_1.RoomBaseDevice {
|
|
|
89
89
|
/** @inheritDoc */
|
|
90
90
|
get id() {
|
|
91
91
|
var _a;
|
|
92
|
-
return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `
|
|
92
|
+
return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `dachs-${this.info.room}-${this.info.customName}`;
|
|
93
93
|
}
|
|
94
94
|
get name() {
|
|
95
95
|
return this.info.customName;
|
|
@@ -269,7 +269,10 @@ class Dachs extends RoomBaseDevice_1.RoomBaseDevice {
|
|
|
269
269
|
if (this.heatingRod === undefined) {
|
|
270
270
|
return;
|
|
271
271
|
}
|
|
272
|
-
const shouldBeOff = batteryLevel < this.settings.batteryLevelHeatingRodThreshold
|
|
272
|
+
const shouldBeOff = batteryLevel < this.settings.batteryLevelHeatingRodThreshold &&
|
|
273
|
+
!(settings_service_1.SettingsService.heatMode === enums_1.HeatingMode.Winter &&
|
|
274
|
+
batteryLevel > this.settings.batteryLevelPreventStartThreshold &&
|
|
275
|
+
this.heatStorageTempSensor.temperatureSensor.temperature < 60);
|
|
273
276
|
if (this.heatingRod.actuatorOn !== shouldBeOff) {
|
|
274
277
|
return;
|
|
275
278
|
}
|
|
@@ -16,7 +16,7 @@ class AcDevice extends devices_1.RoomBaseDevice {
|
|
|
16
16
|
* @returns {boolean} True if the AC is allowed to cool
|
|
17
17
|
*/
|
|
18
18
|
get coolingAllowed() {
|
|
19
|
-
if (settings_service_1.SettingsService.heatMode
|
|
19
|
+
if (settings_service_1.SettingsService.heatMode === enums_1.HeatingMode.Winter) {
|
|
20
20
|
return false;
|
|
21
21
|
}
|
|
22
22
|
if (weather_1.WeatherService.active &&
|