hoffmation-base 3.0.0-alpha.27 → 3.0.0-alpha.29

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

@@ -1,19 +1,14 @@
-import { LampSetLightCommand, LampSetTimeBasedCommand, LampToggleLightCommand } from '../../../models';
 import { iLamp } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-import { ZigbeeUbisysActuator } from './zigbeeUbisysActuator';
-export declare class ZigbeeUbisysLampe extends ZigbeeUbisysActuator implements iLamp {
+import { ZigbeeLamp } from './BaseDevices';
+import { iLoadMeter } from '../baseDeviceInterfaces/iLoadMeter';
+export declare class ZigbeeUbisysLampe extends ZigbeeLamp implements iLamp, iLoadMeter {
+    protected readonly _stateIdState: string;
+    protected readonly _stateNameState: string;
+    private _loadPower;
     constructor(pInfo: IoBrokerDeviceInfo);
     /** @inheritDoc */
-    get lightOn(): boolean;
+    get loadPower(): number;
     /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
-    /** @inheritdoc */
-    setLight(c: LampSetLightCommand): void;
-    /** @inheritDoc */
-    toggleLight(c: LampToggleLightCommand): boolean;
-    /** @inheritDoc */
-    setTimeBased(c: LampSetTimeBasedCommand): void;
-    /** @inheritDoc */
-    persist(): void;
 }

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

@@ -3,44 +3,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeUbisysLampe = void 0;
 const deviceType_1 = require("../deviceType");
 const models_1 = require("../../../models");
-const services_1 = require("../../services");
+const BaseDevices_1 = require("./BaseDevices");
 const DeviceCapability_1 = require("../DeviceCapability");
-const zigbeeUbisysActuator_1 = require("./zigbeeUbisysActuator");
-const sharedFunctions_1 = require("../sharedFunctions");
-class ZigbeeUbisysLampe extends zigbeeUbisysActuator_1.ZigbeeUbisysActuator {
+class ZigbeeUbisysLampe extends BaseDevices_1.ZigbeeLamp {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeUbisysLampe);
-        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
+        this._loadPower = 0;
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.loadMetering);
+        this._stateIdState = `${pInfo.fullID}.state`;
+        this._stateNameState = `${pInfo.fullID}.state`;
     }
     /** @inheritDoc */
-    get lightOn() {
-        return super.actuatorOn;
+    get loadPower() {
+        return this._loadPower;
     }
     /** @inheritDoc */
     update(idSplit, state, initial = false) {
-        super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
-            case 'state':
-                this.log(models_1.LogLevel.Trace, `Lampen Update für ${this.info.customName} auf ${state.val}`);
+            case 'load_power':
+                const newLoadPower = state.val;
+                this.log(Math.abs(newLoadPower - this._loadPower) > 0.25 ? models_1.LogLevel.Trace : models_1.LogLevel.DeepTrace, `Outlet update, new current load power: ${state.val}`);
+                this._loadPower = newLoadPower;
                 break;
         }
-    }
-    /** @inheritdoc */
-    setLight(c) {
-        super.setActuator(c);
-    }
-    /** @inheritDoc */
-    toggleLight(c) {
-        return sharedFunctions_1.LampUtils.toggleLight(this, c);
-    }
-    /** @inheritDoc */
-    setTimeBased(c) {
-        sharedFunctions_1.LampUtils.setTimeBased(this, c);
-    }
-    /** @inheritDoc */
-    persist() {
-        var _a;
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistActuator(this);
+        super.update(idSplit, state, initial, true);
     }
 }
 exports.ZigbeeUbisysLampe = ZigbeeUbisysLampe;

package/lib/server/services/ShutterService.js

@@ -30,10 +30,10 @@ class ShutterService {
             for (const f of r.WindowGroup.windows) {
                 f.getShutter().forEach((shutter) => {
                     var _a, _b, _c, _d, _e;
-                    response.push(`Rollo: "${shutter.info.customName}"\t${((_a = shutter.room) === null || _a === void 0 ? void 0 : _a.settings.sonnenAufgangRollos) === true
+                    response.push(`Shutter: "${shutter.info.customName}"\t${((_a = shutter.room) === null || _a === void 0 ? void 0 : _a.settings.sonnenAufgangRollos) === true
                         ? (_c = (_b = r.sunriseShutterCallback) === null || _b === void 0 ? void 0 : _b.nextToDo) === null || _c === void 0 ? void 0 : _c.toLocaleTimeString()
-                        : 'Hochfahren inaktiv'}`);
-                    down.push(`Rollo: "${shutter.info.customName}"\t${(_e = (_d = r.sunsetShutterCallback) === null || _d === void 0 ? void 0 : _d.nextToDo) === null || _e === void 0 ? void 0 : _e.toLocaleTimeString()}`);
+                        : 'Sunrise Shutter up inactive'}`);
+                    down.push(`Shutter: "${shutter.info.customName}"\t${(_e = (_d = r.sunsetShutterCallback) === null || _d === void 0 ? void 0 : _d.nextToDo) === null || _e === void 0 ? void 0 : _e.toLocaleTimeString('de-DE')}`);
                 });
             }
         }

package/lib/server/services/ac/ac-device.d.ts

@@ -22,6 +22,16 @@ export declare abstract class AcDevice implements iExcessEnergyConsumer, iRoomDe
     protected _room: RoomBase | undefined;
     protected _mode: AcMode;
     private _movementCallbackAdded;
+    /**
+     * Whether the AC is allowed to cool (depends on the season
+     * @returns {boolean} True if the AC is allowed to cool
+     */
+    get coolingAllowed(): boolean;
+    /**
+     * Whether the AC is allowed to heat (depends on the season and the settings)
+     * @returns {boolean} True if the AC is allowed to heat
+     */
+    get heatingAllowed(): boolean;
     /** @inheritDoc */
     get temperature(): number;
     /** @inheritDoc */

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

@@ -15,6 +15,27 @@ const settings_service_1 = require("../settings-service");
 const config_1 = require("../../config");
 const blockAutomaticHandler_1 = require("../blockAutomaticHandler");
 class AcDevice {
+    /**
+     * Whether the AC is allowed to cool (depends on the season
+     * @returns {boolean} True if the AC is allowed to cool
+     */
+    get coolingAllowed() {
+        var _a, _b;
+        if (settings_service_1.SettingsService.heatMode !== config_1.HeatingMode.Summer) {
+            return false;
+        }
+        if (this.settings.noCoolingOnMovement && ((_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.PraesenzGroup) === null || _b === void 0 ? void 0 : _b.anyPresent())) {
+            return false;
+        }
+        return true;
+    }
+    /**
+     * Whether the AC is allowed to heat (depends on the season and the settings)
+     * @returns {boolean} True if the AC is allowed to heat
+     */
+    get heatingAllowed() {
+        return settings_service_1.SettingsService.heatMode !== config_1.HeatingMode.Summer && this.settings.heatingAllowed;
+    }
     /** @inheritDoc */
     get temperature() {
         return this._roomTemperature;
@@ -114,7 +135,7 @@ class AcDevice {
     }
     /** @inheritDoc */
     calculateDesiredMode() {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c;
         const acOn = this.on;
         const heatGroup = (_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup;
         if (!heatGroup) {
@@ -136,10 +157,10 @@ class AcDevice {
             if (this.settings.useAutomatic) {
                 return ac_mode_1.AcMode.Auto;
             }
-            if (settings_service_1.SettingsService.heatMode !== config_1.HeatingMode.Sommer && this.settings.heatingAllowed) {
+            if (this.heatingAllowed) {
                 return ac_mode_1.AcMode.Heating;
             }
-            if (!this.settings.noCoolingOnMovement || ((_c = (_b = this.room) === null || _b === void 0 ? void 0 : _b.PraesenzGroup) === null || _c === void 0 ? void 0 : _c.anyPresent()) !== true) {
+            else if (this.coolingAllowed) {
                 return ac_mode_1.AcMode.Cooling;
             }
             return ac_mode_1.AcMode.Off;
@@ -156,7 +177,7 @@ class AcDevice {
         let threshold = acOn ? 0.5 : 1.5;
         let thresholdHeating = acOn ? 0.5 : 1.5;
         let desiredMode = ac_mode_1.AcMode.Off;
-        const excessEnergy = (_e = (_d = devices_1.Devices.energymanager) === null || _d === void 0 ? void 0 : _d.excessEnergy) !== null && _e !== void 0 ? _e : -1;
+        const excessEnergy = (_c = (_b = devices_1.Devices.energymanager) === null || _b === void 0 ? void 0 : _b.excessEnergy) !== null && _c !== void 0 ? _c : -1;
         if ((acOn ? 200 : 1000) < excessEnergy) {
             // As there is plenty of energy to spare we plan to overshoot the target by 1 degree
             threshold = -0.5;
@@ -165,13 +186,10 @@ class AcDevice {
         const targetTemp = heatGroup.desiredTemp;
         const coolUntil = targetTemp + threshold;
         const heatUntil = targetTemp - thresholdHeating;
-        if (temp > coolUntil && settings_service_1.SettingsService.heatMode === config_1.HeatingMode.Sommer) {
+        if (temp > coolUntil && this.coolingAllowed) {
             desiredMode = ac_mode_1.AcMode.Cooling;
-            if (this.settings.noCoolingOnMovement && ((_g = (_f = this.room) === null || _f === void 0 ? void 0 : _f.PraesenzGroup) === null || _g === void 0 ? void 0 : _g.anyPresent()) === true) {
-                return ac_mode_1.AcMode.Off;
-            }
         }
-        else if (temp < heatUntil && this.settings.heatingAllowed && settings_service_1.SettingsService.heatMode === config_1.HeatingMode.Winter) {
+        else if (temp < heatUntil && this.heatingAllowed) {
             desiredMode = ac_mode_1.AcMode.Heating;
         }
         if (acOn ? desiredMode === ac_mode_1.AcMode.Off : desiredMode !== ac_mode_1.AcMode.Off) {

package/lib/server/services/api/api-service.js

@@ -7,8 +7,6 @@ const room_service_1 = require("../room-service");
 const log_service_1 = require("../log-service");
 const ac_1 = require("../ac");
 const DeviceCapability_1 = require("../../devices/DeviceCapability");
-const settings_service_1 = require("../settings-service");
-const config_1 = require("../../config");
 class API {
     /**
      * Endpoint to end a scene manually (or early if it has automatic turn off)
@@ -97,7 +95,7 @@ class API {
                 desiredMode = ac_1.AcMode.Off;
             }
             else {
-                desiredMode = settings_service_1.SettingsService.heatMode == config_1.HeatingMode.Winter ? ac_1.AcMode.Heating : ac_1.AcMode.Cooling;
+                desiredMode = d.heatingAllowed ? ac_1.AcMode.Heating : ac_1.AcMode.Cooling;
             }
         }
         d.log(models_1.LogLevel.Info, `API Call to set AC to ${desiredState} with mode ${desiredMode} for ${forceTime}ms`);

package/lib/server/services/blockAutomaticHandler.js

@@ -38,7 +38,9 @@ class BlockAutomaticHandler {
         }
         this.automaticBlockedUntil = c.targetDate;
         if (c.revertToAutomaticAtBlockLift) {
-            this.updateRestoreTimeout(new models_1.RestoreTargetAutomaticValueCommand(c, 'Restore to automatic state after block.'));
+            const revertCommand = new models_1.RestoreTargetAutomaticValueCommand(c, 'Restore to automatic state after block.');
+            revertCommand.overrideCommandSource = models_1.CommandSource.Automatic;
+            this.updateRestoreTimeout(revertCommand);
         }
         else {
             this.removeRestoreTimeout();

package/lib/server/services/calendar/m/303/274ll-service.js

@@ -42,7 +42,7 @@ class MuellService {
                     continue;
                 }
                 const ev = data[k];
-                log_service_1.ServerLogService.writeLog(models_1.LogLevel.DeepTrace, `${ev.summary} is in ${ev.location} on the ${ev.start.getDate()} of ${this.months[ev.start.getMonth()]} at ${ev.start.toLocaleTimeString('en-GB')}`);
+                log_service_1.ServerLogService.writeLog(models_1.LogLevel.DeepTrace, `${ev.summary} is in ${ev.location} on the ${ev.start.getDate()} of ${this.months[ev.start.getMonth()]} at ${ev.start.toLocaleTimeString('de-DE')}`);
                 if (ev.start.getTime() < todayMidnight) {
                     continue;
                 }