hoffmation-base 3.0.0-alpha.73 → 3.0.0-alpha.74

package/lib/models/command/ledSetLightCommand.js

@@ -38,13 +38,13 @@ class LedSetLightCommand extends dimmerSetLightCommand_1.DimmerSetLightCommand {
     static byTimeBased(settings, c) {
         switch (c.time) {
             case timeCallback_1.TimeOfDay.Daylight:
-                return new LedSetLightCommand(c, settings.dayOn, '', c.disableAutomaticCommand, settings.dayBrightness, undefined, settings.dayColor, settings.dayColorTemp);
+                return new LedSetLightCommand(c, settings.dayOn, `byTimeBased(${timeCallback_1.TimeOfDay[c.time]})`, c.disableAutomaticCommand, settings.dayBrightness, undefined, settings.dayColor, settings.dayColorTemp);
             case timeCallback_1.TimeOfDay.BeforeSunrise:
-                return new LedSetLightCommand(c, settings.dawnOn, '', c.disableAutomaticCommand, settings.dawnBrightness, undefined, settings.dawnColor, settings.dawnColorTemp);
+                return new LedSetLightCommand(c, settings.dawnOn, `byTimeBased(${timeCallback_1.TimeOfDay[c.time]})`, c.disableAutomaticCommand, settings.dawnBrightness, undefined, settings.dawnColor, settings.dawnColorTemp);
             case timeCallback_1.TimeOfDay.AfterSunset:
-                return new LedSetLightCommand(c, settings.duskOn, '', c.disableAutomaticCommand, settings.duskBrightness, undefined, settings.duskColor, settings.duskColorTemp);
+                return new LedSetLightCommand(c, settings.duskOn, `byTimeBased(${timeCallback_1.TimeOfDay[c.time]})`, c.disableAutomaticCommand, settings.duskBrightness, undefined, settings.duskColor, settings.duskColorTemp);
             case timeCallback_1.TimeOfDay.Night:
-                return new LedSetLightCommand(c, settings.nightOn, '', c.disableAutomaticCommand, settings.nightBrightness, undefined, settings.nightColor, settings.nightColorTemp);
+                return new LedSetLightCommand(c, settings.nightOn, `byTimeBased(${timeCallback_1.TimeOfDay[c.time]})`, c.disableAutomaticCommand, settings.nightBrightness, undefined, settings.nightColor, settings.nightColorTemp);
         }
     }
 }

package/lib/models/rooms/RoomBase.js

@@ -141,7 +141,7 @@ class RoomBase {
                 })))) {
             timeOfDay = server_1.Utils.nowTime().hours > 16 ? timeCallback_1.TimeOfDay.AfterSunset : timeCallback_1.TimeOfDay.BeforeSunrise;
         }
-        this.LightGroup.switchTimeConditional(new command_1.LightGroupSwitchTimeConditionalCommand(c, timeOfDay));
+        this.LightGroup.switchTimeConditional(new command_1.LightGroupSwitchTimeConditionalCommand(c, timeOfDay, `time: ${timeCallback_1.TimeOfDay[timeOfDay]}`));
     }
     isNowLightTime() {
         var _a;

package/lib/server/devices/groups/lightGroup.js

@@ -61,7 +61,7 @@ class LightGroup extends base_group_1.BaseGroup {
         let resultLampen = false;
         let resultSteckdosen = false;
         let activatedGroups = 0;
-        const command = new models_1.LampSetTimeBasedCommand(c, c.time, 'LightGroup switchTimeConditional');
+        const command = new models_1.LampSetTimeBasedCommand(c, c.time);
         if (this.getWled().length > 0) {
             activatedGroups++;
             this.log(models_1.LogLevel.Debug, `Set Wled time based for time "${models_1.TimeOfDay[c.time]}"`);
@@ -196,7 +196,7 @@ class LightGroup extends base_group_1.BaseGroup {
             var _a;
             this.log(models_1.LogLevel.Info, 'Ambientenbeleuchtung um Mitternacht abschalten.');
             this._ambientLightOn = false;
-            if (((_a = this.getRoom().PraesenzGroup) === null || _a === void 0 ? void 0 : _a.anyPresent()) !== true) {
+            if (((_a = this.getRoom().PraesenzGroup) === null || _a === void 0 ? void 0 : _a.anyPresent(true)) !== true) {
                 this.switchAll(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, false, 'Ambient Light End Callback'));
             }
         }, services_1.Utils.timeTilMidnight, this);

package/lib/server/devices/groups/presenceGroup.d.ts

@@ -8,12 +8,13 @@ export declare class PresenceGroup extends BaseGroup {
     private _firstEnterCbs;
     private _anyMovementCbs;
     constructor(roomName: string, motionSensorIds: string[]);
+    private get lastLeftDelayActive();
     getMotionDetector(): Array<iMotionSensor>;
     initCallbacks(): void;
     presentAmount(): number;
     addLastLeftCallback(cb: (action: PresenceGroupLastLeftAction) => void): void;
     addAnyMovementCallback(cb: (action: PresenceGroupAnyMovementAction) => void): void;
-    anyPresent(): boolean;
+    anyPresent(includeMovementResetDelayCheck?: boolean): boolean;
     private fireFistEnterCBs;
     addFirstEnterCallback(cb: (action: PresenceGroupFirstEnterAction) => void): void;
     private motionSensorOnAnyMovement;

package/lib/server/devices/groups/presenceGroup.js

@@ -17,6 +17,9 @@ class PresenceGroup extends base_group_1.BaseGroup {
         this._anyMovementCbs = [];
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.MotionDetection, new device_list_1.DeviceList(motionSensorIds));
     }
+    get lastLeftDelayActive() {
+        return this._lastLeftTimeout !== null;
+    }
     getMotionDetector() {
         return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.MotionDetection);
     }
@@ -62,7 +65,10 @@ class PresenceGroup extends base_group_1.BaseGroup {
     addAnyMovementCallback(cb) {
         this._anyMovementCbs.push(cb);
     }
-    anyPresent() {
+    anyPresent(includeMovementResetDelayCheck = false) {
+        if (includeMovementResetDelayCheck && this.lastLeftDelayActive) {
+            return true;
+        }
         return this.getMotionDetector().find((b) => b.movementDetected) !== undefined;
     }
     fireFistEnterCBs(action) {

package/lib/server/devices/sharedFunctions/lampUtils.js

@@ -9,7 +9,7 @@ class LampUtils {
             LampUtils.stromStossContinueTimeouts.set(actuator.id, services_1.Utils.guardedTimeout(() => {
                 var _a, _b;
                 LampUtils.stromStossContinueTimeouts.delete(actuator.id);
-                if ((_b = (_a = actuator.room) === null || _a === void 0 ? void 0 : _a.PraesenzGroup) === null || _b === void 0 ? void 0 : _b.anyPresent()) {
+                if ((_b = (_a = actuator.room) === null || _a === void 0 ? void 0 : _a.PraesenzGroup) === null || _b === void 0 ? void 0 : _b.anyPresent(true)) {
                     actuator.setActuator(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, true, 'StromStoss On due to Presence', null));
                 }
             }, actuator.settings.stromStossResendTime * 1000, this));

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

@@ -1,9 +1,8 @@
-import { DeviceInfo, DeviceType, iAcDevice, iExcessEnergyConsumer, iRoomDevice, iTemporaryDisableAutomatic } from '../../devices';
+import { DeviceCapability, DeviceInfo, DeviceType, iAcDevice, iExcessEnergyConsumer, iRoomDevice, iTemporaryDisableAutomatic } from '../../devices';
 import { AcSettings, ExcessEnergyConsumerSettings, LogLevel, RoomBase } from '../../../models';
 import { LogDebugType } from '../log-service';
 import { AcMode } from './ac-mode';
 import { AcDeviceType } from './acDeviceType';
-import { DeviceCapability } from '../../devices/DeviceCapability';
 import { BlockAutomaticHandler } from '../blockAutomaticHandler';
 export declare abstract class AcDevice implements iExcessEnergyConsumer, iRoomDevice, iAcDevice, iTemporaryDisableAutomatic {
     ip: string;

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

@@ -10,7 +10,6 @@ const utils_1 = require("../utils");
 const log_service_1 = require("../log-service");
 const ac_mode_1 = require("./ac-mode");
 const lodash_1 = __importDefault(require("lodash"));
-const DeviceCapability_1 = require("../../devices/DeviceCapability");
 const settings_service_1 = require("../settings-service");
 const config_1 = require("../../config");
 const blockAutomaticHandler_1 = require("../blockAutomaticHandler");
@@ -25,7 +24,7 @@ class AcDevice {
         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())) {
+        if (this.settings.noCoolingOnMovement && ((_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.PraesenzGroup) === null || _b === void 0 ? void 0 : _b.anyPresent(true))) {
             return false;
         }
         if (weather_1.WeatherService.active &&
@@ -78,7 +77,7 @@ class AcDevice {
         /** @inheritDoc */
         this.settings = new models_1.AcSettings();
         /** @inheritDoc */
-        this.deviceCapabilities = [DeviceCapability_1.DeviceCapability.ac, DeviceCapability_1.DeviceCapability.blockAutomatic];
+        this.deviceCapabilities = [devices_1.DeviceCapability.ac, devices_1.DeviceCapability.blockAutomatic];
         this._activatedByExcessEnergy = false;
         this._desiredTemperatur = devices_1.UNDEFINED_TEMP_VALUE;
         this._mode = ac_mode_1.AcMode.Off;