hoffmation-base 3.0.0-alpha.17 → 3.0.0-alpha.19

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

@@ -15,7 +15,13 @@ export declare class AcSettings extends DeviceSettings {
      * Whether we should ignore the room temperature and let the AC decide on its own
      * @type {boolean}
      */
-    useOwnTemperatureAndAutomatic: boolean;
+    useOwnTemperature: boolean;
+    /**
+     * Whether the AC should use automatic mode to decide on its own whether to heat or cool
+     * !!Warning!! This can result in excessive energy consumption, as overshooting the temperature can result in the AC switching to the opposite mode
+     * @type {boolean}
+     */
+    useAutomatic: boolean;
     /**
      * Whether we should turn off AC-Cooling when someone is in the room
      * @type {boolean}

package/lib/models/deviceSettings/acSettings.js

@@ -21,7 +21,13 @@ class AcSettings extends deviceSettings_1.DeviceSettings {
          * Whether we should ignore the room temperature and let the AC decide on its own
          * @type {boolean}
          */
-        this.useOwnTemperatureAndAutomatic = false;
+        this.useOwnTemperature = false;
+        /**
+         * Whether the AC should use automatic mode to decide on its own whether to heat or cool
+         * !!Warning!! This can result in excessive energy consumption, as overshooting the temperature can result in the AC switching to the opposite mode
+         * @type {boolean}
+         */
+        this.useAutomatic = false;
         /**
          * Whether we should turn off AC-Cooling when someone is in the room
          * @type {boolean}
@@ -34,15 +40,16 @@ class AcSettings extends deviceSettings_1.DeviceSettings {
         this.manualDisabled = false;
     }
     fromPartialObject(data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         this.minimumHours = (_a = data.minimumHours) !== null && _a !== void 0 ? _a : this.minimumHours;
         this.minimumMinutes = (_b = data.minimumMinutes) !== null && _b !== void 0 ? _b : this.minimumMinutes;
         this.maximumHours = (_c = data.maximumHours) !== null && _c !== void 0 ? _c : this.maximumHours;
         this.maximumMinutes = (_d = data.maximumMinutes) !== null && _d !== void 0 ? _d : this.maximumMinutes;
         this.heatingAllowed = (_e = data.heatingAllowed) !== null && _e !== void 0 ? _e : this.heatingAllowed;
         this.noCoolingOnMovement = (_f = data.noCoolingOnMovement) !== null && _f !== void 0 ? _f : this.noCoolingOnMovement;
-        this.useOwnTemperatureAndAutomatic = (_g = data.useOwnTemperatureAndAutomatic) !== null && _g !== void 0 ? _g : this.useOwnTemperatureAndAutomatic;
-        this.manualDisabled = (_h = data.manualDisabled) !== null && _h !== void 0 ? _h : this.manualDisabled;
+        this.useOwnTemperature = (_g = data.useOwnTemperature) !== null && _g !== void 0 ? _g : this.useOwnTemperature;
+        this.useAutomatic = (_h = data.useAutomatic) !== null && _h !== void 0 ? _h : this.useAutomatic;
+        this.manualDisabled = (_j = data.manualDisabled) !== null && _j !== void 0 ? _j : this.manualDisabled;
         super.fromPartialObject(data);
     }
     toJSON() {

package/lib/models/groupSettings/heatGroupSettings.d.ts

@@ -3,6 +3,10 @@ import { iIdHolder } from '../iIdHolder';
 import { GroupSettings } from './groupSettings';
 export declare class HeatGroupSettings extends GroupSettings {
     automaticPoints: TemperatureSettings[];
+    /**
+     * Whether the temperature should be calculated automatically, or the manualTemperature should be used
+     * @type {boolean}
+     */
     automaticMode: boolean;
     automaticFallBackTemperatur: number;
     /**

package/lib/models/groupSettings/heatGroupSettings.js

@@ -7,6 +7,10 @@ class HeatGroupSettings extends groupSettings_1.GroupSettings {
     constructor() {
         super(...arguments);
         this.automaticPoints = [];
+        /**
+         * Whether the temperature should be calculated automatically, or the manualTemperature should be used
+         * @type {boolean}
+         */
         this.automaticMode = true;
         this.automaticFallBackTemperatur = 20;
         /**

package/lib/server/devices/wledDevice.js

@@ -67,18 +67,21 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
             c.brightness = 10;
         }
         this.queuedValue = c.on;
-        if (c.preset !== undefined) {
-            // Warning: This also turns the device on
+        if (!c.on) {
+            this.writeActuatorStateToDevice(new models_1.ActuatorWriteStateToDeviceCommand(c, c.on, 'WLED ausschalten'));
+        }
+        else if (c.preset !== undefined) {
+            // This also turns the device on
             this.setState(this._presetID, c.preset, undefined, (err) => {
                 services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `WLED schalten ergab Fehler: ${err}`);
             });
         }
         else if (c.brightness > -1) {
+            // This also turns the device on
             this.setState(this._brightnessID, c.brightness, undefined, (err) => {
                 services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Dimmer Helligkeit schalten ergab Fehler: ${err}`);
             });
         }
-        this.writeActuatorStateToDevice(new models_1.ActuatorWriteStateToDeviceCommand(c, c.on, 'WLED Schalten'));
         if (c.timeout !== undefined && c.timeout > -1 && !dontBlock) {
             this.blockAutomationHandler.disableAutomatic(c.timeout, models_1.CollisionSolving.overrideIfGreater);
         }

package/lib/server/services/ac/ac-device.js

@@ -85,7 +85,8 @@ class AcDevice {
         this.automaticCheck();
     }
     isAvailableForExcessEnergy() {
-        if (this.settings.useOwnTemperatureAndAutomatic) {
+        var _a, _b;
+        if (this.settings.useAutomatic || (((_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup) === null || _b === void 0 ? void 0 : _b.settings.automaticMode) && this.settings.heatingAllowed)) {
             return false;
         }
         if (this.blockAutomationHandler.automaticBlockActive) {
@@ -114,9 +115,9 @@ class AcDevice {
             acOn && this.log(models_1.LogLevel.Info, `We should turn off now, to respect night settings.`);
             return ac_mode_1.AcMode.Off;
         }
-        if (this.settings.useOwnTemperatureAndAutomatic) {
+        if (this.settings.useOwnTemperature) {
             // Device is in automatic mode so ignore energy and room temperature
-            if (heatGroup === null || heatGroup === void 0 ? void 0 : heatGroup.settings.automaticMode) {
+            if (this.settings.useAutomatic) {
                 return ac_mode_1.AcMode.Auto;
             }
             if (settings_service_1.SettingsService.heatMode !== config_1.HeatingMode.Sommer && this.settings.heatingAllowed) {

package/lib/server/services/ac/own-daikin-device.js

@@ -97,10 +97,10 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
         }
         let targetTemp = this._desiredTemperatur;
         if (this.desiredMode == daikin_controller_1.Mode.HOT) {
-            targetTemp = this.settings.useOwnTemperatureAndAutomatic ? targetTemp + 1 : 29;
+            targetTemp = this.settings.useOwnTemperature ? targetTemp : 29;
         }
         else if (this.desiredMode == daikin_controller_1.Mode.COLD) {
-            targetTemp = this.settings.useOwnTemperatureAndAutomatic ? targetTemp - 1 : 16;
+            targetTemp = this.settings.useOwnTemperature ? targetTemp : 16;
         }
         const changeObject = {
             power: this.desiredState,