hoffmation-base 3.0.0-alpha.2 → 3.0.0-alpha.21

package/lib/server/services/Translation/res.js

@@ -11,115 +11,130 @@ class Res {
         this.translations = resources_json_1.default;
     }
     /**
-     * Retrieves a string like `Alarm system arming."`
+     * @returns Retrieves a string like `Alarm system arming."`
      */
     static alarmArmed() {
         return this.fill(this.translations.alarmArmed);
     }
     /**
-     * Retrieves a string like `Alarm system will be armed in night mode. Sweet Dreams!"`
+     * @returns Retrieves a string like `Alarm system will be armed in night mode. Sweet Dreams!"`
      */
     static alarmNightModeArmed() {
         return this.fill(this.translations.alarmNightModeArmed);
     }
     /**
-     * Retrieves a string like `"@P0" closed after @P1 minutes`
+     * @param deviceCustomName - The custom name of the device
+     * @param minutes - The minutes the device was closed after
+     * @returns Retrieves a string like `"@P0" closed after @P1 minutes`
      */
     static closedAfterMinutes(deviceCustomName, minutes) {
         return this.fill(this.translations.closedAfterMinutes, [deviceCustomName, minutes]);
     }
     /**
-     * Retrieves a string like `No more smoke: Danger in "@P0" resolved.`
+     * @param roomName - The name of the room
+     * @returns Retrieves a string like `No more smoke: Danger in "@P0" resolved.`
      */
     static fireAlarmEnd(roomName) {
         return this.fill(this.translations.fireAlarmEnd, [roomName]);
     }
     /**
-     * Retrieves a string like `Smoke detector "@P0" active. Possible fire in "@P1".`
+     * @param roomName - The name of the room
+     * @param deviceCustomName - The custom name of the device
+     * @returns Retrieves a string like `Smoke detector "@P0" active. Possible fire in "@P1".`
      */
     static fireAlarmRepeat(roomName, deviceCustomName) {
         return this.fill(this.translations.fireAlarmRepeat, [roomName, deviceCustomName]);
     }
     /**
-     * Retrieves a string like `Smoke detector "@P0" triggered. Possible fire in "@P1".`
+     * @param roomName - The name of the room
+     * @param deviceCustomName - The custom name of the device
+     * @returns Retrieves a string like `Smoke detector "@P0" triggered. Possible fire in "@P1".`
      */
     static fireAlarmStart(roomName, deviceCustomName) {
         return this.fill(this.translations.fireAlarmStart, [roomName, deviceCustomName]);
     }
     /**
-     * Retrieves a string like `Good Morning`
+     * @returns Retrieves a string like `Good Morning`
      */
     static goodMorning() {
         return this.fill(this.translations.goodMorning);
     }
     /**
-     * Retrieves a string like "Alarm. Intruder detected"
+     * @returns Retrieves a string like "Alarm. Intruder detected"
      */
     static intruderAlarm() {
         return this.fill(this.translations.intruderAlarm);
     }
     /**
-     * Retrieves a string like "Additional defense protocol initiated."
+     * @returns Retrieves a string like "Additional defense protocol initiated."
      */
     static intruderAdditionalDefenseWarning() {
         return this.fill(this.translations.intruderAdditionalDefenseWarning);
     }
     /**
-     * Retrieves a string like "Hello potential intruder! You're beeing recorded and the alarm protocol is initiated please leave the building immediately!"
+     * @returns Retrieves a string like "Hello potential intruder! You're beeing recorded and the alarm protocol is initiated please leave the building immediately!"
      */
     static intruderGreeting() {
         return this.fill(this.translations.intruderGreeting);
     }
     /**
-     * Retrieves a string like "Leave now! The owners and additional emergency contacts are informed!"
+     * @returns Retrieves a string like "Leave now! The owners and additional emergency contacts are informed!"
      */
     static intruderLeaveAndOwnerInformed() {
         return this.fill(this.translations.intruderLeaveAndOwnerInformed);
     }
     /**
-     * Retrieves a string like "All shutter are opening, please leave immediatly."
+     * @returns Retrieves a string like "All shutter are opening, please leave immediatly."
      */
     static intruderShutterUpPleaseLeave() {
         return this.fill(this.translations.intruderShutterUpPleaseLeave);
     }
     /**
-     * Retrieves a string like `"@P0" just closed`
+     * @param deviceCustomName - The custom name of the device
+     * @returns Retrieves a string like `"@P0" just closed`
      */
     static justClosed(deviceCustomName) {
         return this.fill(this.translations.justClosed, [deviceCustomName]);
     }
     /**
-     * Retrieves a string like `Vibration Alert from "@P0". I repeat: Alarm at "@P0"`
+     * @param deviceCustomName - The custom name of the device
+     * @returns Retrieves a string like `Vibration Alert from "@P0". I repeat: Alarm at "@P0"`
      */
     static vibrationAlarm(deviceCustomName) {
         return this.fill(this.translations.vibrationAlarm, [deviceCustomName]);
     }
     /**
-     * Retrieves a string like `Water alarm end: Flooding in "@P0" over.`
+     * @param roomName - The name of the room
+     * @returns Retrieves a string like `Water alarm end: Flooding in "@P0" over.`
      */
     static waterAlarmEnd(roomName) {
         return this.fill(this.translations.waterAlarmEnd, [roomName]);
     }
     /**
-     * Retrieves a string like `"@P0" has triggered. Pool party in "@P1".`
+     * @param deviceCustomName - The custom name of the device
+     * @param roomName - The name of the room
+     * @returns Retrieves a string like `"@P0" has triggered. Pool party in "@P1".`
      */
     static waterAlarmRepeat(deviceCustomName, roomName) {
         return this.fill(this.translations.waterAlarmRepeat, [deviceCustomName, roomName]);
     }
     /**
-     * Retrieves a string like `"@P0" detects water. Possible pipe burst in "@P1".`
+     * @param deviceCustomName - The custom name of the device
+     * @param roomName - The name of the room
+     * @returns Retrieves a string like `"@P0" detects water. Possible pipe burst in "@P1".`
      */
     static waterAlarmStart(deviceCustomName, roomName) {
         return this.fill(this.translations.waterAlarmStart, [deviceCustomName, roomName]);
     }
     /**
-     * Retrieves a string like "Vibration Alert from "@P0". I repeat: Alarm at "@P0""
+     * @returns Retrieves a string like "Vibration Alert from "@P0". I repeat: Alarm at "@P0""
      */
     static welcomeHome() {
         return this.fill(this.translations.welcomeHome);
     }
     /**
-     * Retrieves a string like `"@P0" was opened`
+     * @param deviceCustomName - The custom name of the device
+     * @returns Retrieves a string like `"@P0" was opened`
      */
     static wasOpened(deviceCustomName) {
         return this.fill(this.translations.wasOpened, [deviceCustomName]);

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

@@ -37,11 +37,6 @@ export declare abstract class AcDevice implements iExcessEnergyConsumer, iRoomDe
     restoreTargetAutomaticValue(): void;
     isAvailableForExcessEnergy(): boolean;
     calculateDesiredMode(): AcMode;
-    /**
-     * Disable automatic Turn-On and Turn-Off for given amount of ms.
-     * @param {number} timeout
-     */
-    deactivateAutomaticChange(timeout?: number): void;
     abstract setDesiredMode(mode: AcMode, writeToDevice: boolean, temp?: number): void;
     abstract turnOn(): void;
     onTemperaturChange(newTemperatur: number): void;

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

@@ -52,7 +52,7 @@ class AcDevice {
         this._info.customName = `${roomName} ${name}`;
         this._info.room = roomName;
         this._info.allDevicesKey = `ac-${roomName}-${name}`;
-        utils_1.Utils.guardedInterval(this.automaticCheck, 5 * 60 * 1000, this, true);
+        utils_1.Utils.guardedInterval(this.automaticCheck, 5 * 60 * 1000, this, false);
         utils_1.Utils.guardedInterval(this.persist, 15 * 60 * 1000, this, true);
         this.persistDeviceInfo();
         this.loadDeviceSettings();
@@ -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) {
@@ -97,9 +98,14 @@ class AcDevice {
         return this.calculateDesiredMode() !== ac_mode_1.AcMode.Off;
     }
     calculateDesiredMode() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g;
         const acOn = this.on;
-        this._desiredTemperatur = (_c = (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup) === null || _b === void 0 ? void 0 : _b.desiredTemp) !== null && _c !== void 0 ? _c : 0;
+        const heatGroup = (_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup;
+        if (!heatGroup) {
+            this.log(models_1.LogLevel.Warn, `Can't calculate AC Mode as we have no heat group`);
+            return ac_mode_1.AcMode.Off;
+        }
+        this._desiredTemperatur = heatGroup.desiredTemp;
         if (this.settings.manualDisabled) {
             acOn && this.log(models_1.LogLevel.Info, `We should turn off now, as manual disable force is set.`);
             return ac_mode_1.AcMode.Off;
@@ -109,16 +115,15 @@ class AcDevice {
             acOn && this.log(models_1.LogLevel.Info, `We should turn off now, to respect night settings.`);
             return ac_mode_1.AcMode.Off;
         }
-        const heatGroup = (_d = this.room) === null || _d === void 0 ? void 0 : _d.HeatGroup;
-        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) === false) {
+            if (this.settings.useAutomatic) {
                 return ac_mode_1.AcMode.Auto;
             }
             if (settings_service_1.SettingsService.heatMode !== config_1.HeatingMode.Sommer && this.settings.heatingAllowed) {
                 return ac_mode_1.AcMode.Heating;
             }
-            if (!this.settings.noCoolingOnMovement || ((_f = (_e = this.room) === null || _e === void 0 ? void 0 : _e.PraesenzGroup) === null || _f === void 0 ? void 0 : _f.anyPresent()) !== true) {
+            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) {
                 return ac_mode_1.AcMode.Cooling;
             }
             return ac_mode_1.AcMode.Off;
@@ -135,7 +140,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 = (_h = (_g = devices_1.Devices.energymanager) === null || _g === void 0 ? void 0 : _g.excessEnergy) !== null && _h !== void 0 ? _h : -1;
+        const excessEnergy = (_e = (_d = devices_1.Devices.energymanager) === null || _d === void 0 ? void 0 : _d.excessEnergy) !== null && _e !== void 0 ? _e : -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;
@@ -146,7 +151,7 @@ class AcDevice {
         const heatUntil = targetTemp - thresholdHeating;
         if (temp > coolUntil && settings_service_1.SettingsService.heatMode === config_1.HeatingMode.Sommer) {
             desiredMode = ac_mode_1.AcMode.Cooling;
-            if (this.settings.noCoolingOnMovement && ((_k = (_j = this.room) === null || _j === void 0 ? void 0 : _j.PraesenzGroup) === null || _k === void 0 ? void 0 : _k.anyPresent()) === true) {
+            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;
             }
         }
@@ -158,13 +163,6 @@ class AcDevice {
         }
         return desiredMode;
     }
-    /**
-     * Disable automatic Turn-On and Turn-Off for given amount of ms.
-     * @param {number} timeout
-     */
-    deactivateAutomaticChange(timeout = 60 * 60 * 1000) {
-        this.blockAutomationHandler.disableAutomatic(timeout);
-    }
     onTemperaturChange(newTemperatur) {
         this.roomTemperatur = newTemperatur;
     }
@@ -186,8 +184,9 @@ class AcDevice {
     turnOffDueToMissingEnergy() {
         this.turnOff();
     }
+    // TODO: Migrate to new command system
     setState(mode, desiredTemp, forceTime = 60 * 60 * 1000) {
-        this.blockAutomationHandler.disableAutomatic(forceTime);
+        this.blockAutomationHandler.disableAutomatic(new models_1.BlockAutomaticCommand(models_1.CommandSource.Unknown, forceTime));
         this._mode = mode;
         if (mode == ac_mode_1.AcMode.Off) {
             this.turnOff();

package/lib/server/services/ac/daikin-service.js

@@ -68,6 +68,7 @@ class DaikinService {
             });
         });
     }
+    // TODO: Migrate to new command system
     static setAll(on, force = false) {
         if (!this.isInitialized) {
             return;
@@ -81,7 +82,7 @@ class DaikinService {
                 dev.turnOff();
             }
             if (force) {
-                dev.deactivateAutomaticChange(180 * 60 * 1000);
+                dev.blockAutomationHandler.disableAutomatic(new models_1.BlockAutomaticCommand(models_1.CommandSource.Unknown, 180 * 60 * 1000));
             }
         }
     }

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

@@ -86,13 +86,21 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
         });
     }
     setDesiredInfo(retry = false, forceTemp) {
-        var _a;
+        var _a, _b;
+        if (this._desiredTemperatur === devices_1.UNDEFINED_TEMP_VALUE) {
+            if (((_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup) === undefined) {
+                this.log(models_1.LogLevel.Error, `Neither desired temperature nor HeatGroup is set for ${this.name}(${this.ip})`);
+                return;
+            }
+            this._desiredTemperatur = this.room.HeatGroup.desiredTemp;
+            return;
+        }
         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,
@@ -100,7 +108,7 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
             targetHumidity: this.desiredHum,
             targetTemperature: forceTemp !== null && forceTemp !== void 0 ? forceTemp : targetTemp,
         };
-        (_a = this.device) === null || _a === void 0 ? void 0 : _a.setACControlInfo(changeObject, (err, res) => {
+        (_b = this.device) === null || _b === void 0 ? void 0 : _b.setACControlInfo(changeObject, (err, res) => {
             var _a;
             if (err !== null) {
                 log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Setting Ac Info for ${this.name} failed:  ${err} `);

package/lib/server/services/api/api-service.d.ts

@@ -1,19 +1,19 @@
 import { BaseGroup, ButtonPosition, ButtonPressType, iBaseDevice } from '../../devices';
-import { CollisionSolving, DeviceSettings, RoomBase } from '../../../models';
+import { ActuatorSetStateCommand, BlockAutomaticCommand, BlockAutomaticLiftBlockCommand, CollisionSolving, DeviceSettings, DimmerSetLightCommand, LampSetLightCommand, LedSetLightCommand, RoomBase, ShutterSetLevelCommand } from '../../../models';
 import { LogObject } from '../log-service';
 import { AcDevice, AcMode } from '../ac';
 import { GroupSettings } from '../../../models/groupSettings/groupSettings';
 export declare class API {
     /**
      * Endpoint to end a scene manually (or early if it has automatic turn off)
-     * @param {string} deviceId
-     * @returns {Error | null}
+     * @param deviceId - The id of the scene to end
+     * @returns In case it failed the Error containing the reason
      */
     static endScene(deviceId: string): Error | null;
     /**
      * Gets the instance of an Ac Device identified by id
-     * @param {string} id
-     * @returns {OwnDaikinDevice | undefined}
+     * @param id - The device id of the AC
+     * @returns The instance of the AC Device or undefined if not found
      */
     static getAc(id: string): AcDevice | undefined;
     static getDevices(): {
@@ -26,86 +26,133 @@ export declare class API {
     static getLog(): LogObject[];
     /**
      * Turns on/off one AC identified by it's id
-     * @param id The id of the device, if wrong false will be returned
-     * @param {boolean} desiredState
-     * @param {AcMode} desiredMode
-     * @param desiredTemperature
-     * @param forceTime The time in ms this should not change before automatic change is allowed again
+     * @param id - The id of the device, if wrong false will be returned
+     * @param desiredState - The desired state for the AC
+     * @param desiredMode - The desired mode for the AC
+     * @param desiredTemperature - The desired temperature for the AC in Celsius
+     * @param forceTime - The time in ms this should not change before automatic change is allowed again
+     * @returns True if the AC was found and the state was changed
      */
     static setAc(id: string, desiredState: boolean, desiredMode?: AcMode, desiredTemperature?: number, forceTime?: number): boolean;
     /**
      * Turns on/off all AC´s in the home
-     * @param {boolean} desiredState
+     * @param desiredState - The desired state for all AC´s
      */
     static setAllAc(desiredState: boolean): void;
     /**
      * Changes the status of a given Lamp
-     * @param {string} deviceId The device Id of the lamp
-     * @param {boolean} state The desired new state
-     * @param timeout Desired time after which this should be reverted to normal state
-     * @returns {Error | null} In case it failed the Error containing the reason
+     * @param deviceId - The device Id of the lamp
+     * @param state - The desired new state
+     * @param timeout - Desired time after which this should be reverted to normal state
+     * @returns In case it failed the Error containing the reason
+     * @deprecated Use "API.lampSetLight" instead
+     * TODO: Remove deprecated API method
      */
     static setLamp(deviceId: string, state: boolean, timeout?: number): Error | null;
+    /**
+     * Changes the status of a given Lamp
+     * @param deviceId - The device Id of the lamp
+     * @param c - The command(stack) to perform on the lamp
+     * @returns In case it failed the Error containing the reason.
+     */
+    static lampSetLight(deviceId: string, c: LampSetLightCommand): Error | null;
     /**
      * Changes the status of a given actuator
-     * @param {string} deviceId The device Id of the actuator
-     * @param {boolean} state The desired new state
-     * @param timeout Desired time after which this should be reverted to automatic state
-     * @returns {Error | null} In case it failed the Error containing the reason
+     * @param deviceId - The device Id of the actuator
+     * @param state - The desired new state
+     * @param timeout - Desired time after which this should be reverted to automatic state
+     * @returns In case it failed the Error containing the reason
+     * @deprecated Use "API.actuatorSetState" instead
+     * TODO: Remove deprecated API method
      */
     static setActuator(deviceId: string, state: boolean, timeout?: number): Error | null;
     /**
      * Changes the status of a given actuator
-     * @param {string} deviceId The device Id of the actuator
-     * @param {boolean} state The desired new state
-     * @param timeout A chosen Timeout after which the light should be reset
-     * @param brightness The desired brightness
-     * @param transitionTime The transition time during turnOn/turnOff
-     * @returns {Error | null} In case it failed the Error containing the reason
+     * @param deviceId - The device Id of the actuator
+     * @param c - The command(stack) to perform on the actuator
+     * @returns In case it failed the Error containing the reason
+     */
+    static actuatorSetState(deviceId: string, c: ActuatorSetStateCommand): Error | null;
+    /**
+     * Changes the status of the given dimmer
+     * @param deviceId - The device Id of the actuator
+     * @param state - The desired new state
+     * @param timeout - A chosen Timeout after which the light should be reset
+     * @param brightness - The desired brightness
+     * @param transitionTime - The transition time during turnOn/turnOff
+     * @returns In case it failed the Error containing the reason
+     * @deprecated Use "API.dimmerSetLight" instead
+     * TODO: Remove deprecated API method
      */
     static setDimmer(deviceId: string, state: boolean, timeout?: number, brightness?: number, transitionTime?: number): Error | null;
     /**
-     * Changes the status of a given actuator
-     * @param {string} deviceId The device Id of the actuator
-     * @param {boolean} state The desired new state
-     * @param timeout A chosen Timeout after which the light should be reset
-     * @param brightness The desired brightness
-     * @param transitionTime The transition time during turnOn/turnOff
-     * @param {string} color The desired color in 6 digit hex Code
-     * @param {number} colorTemp The desired color Temperature (0 = more White)
-     * @returns {Error | null} In case it failed the Error containing the reason
+     * Changes the status of the given dimmer
+     * @param deviceId - The device Id of the dimmable device.
+     * @param command - The command(stack) to perform on the dimmer
+     * @returns In case it failed the Error containing the reason.
+     */
+    static dimmerSetLight(deviceId: string, command: DimmerSetLightCommand): Error | null;
+    /**
+     * Changes the status of a given led-device
+     * @param deviceId - The device Id of the actuator
+     * @param state - The desired new state
+     * @param timeout - A chosen Timeout after which the light should be reset
+     * @param brightness - The desired brightness
+     * @param transitionTime - The transition time during turnOn/turnOff
+     * @param color - The desired color in 6 digit hex Code
+     * @param colorTemp - The desired color Temperature (0 = more White)
+     * @returns In case it failed the Error containing the reason
+     * @deprecated Use "API.ledSetLight" instead
+     * TODO: Remove deprecated API method
      */
     static setLedLamp(deviceId: string, state: boolean, timeout?: number, brightness?: number, transitionTime?: number, color?: string, colorTemp?: number): Error | null;
+    /**
+     * Changes the status of a given led-device
+     * @param deviceId - The device Id of the LED-Device
+     * @param command - The command(stack) to perform on the led-device
+     * @returns In case it failed the Error containing the reason
+     */
+    static ledSetLight(deviceId: string, command: LedSetLightCommand): Error | null;
     /**
      * Changes the position of a given shutter
      * if needed this updates the window position as well
-     * @param {string} deviceId The device Id of the shutter
-     * @param {number} level The desired new level (0 being open, 100 being closed)
-     * @returns {Error | null} Error if there is no shutter with the given id
+     * @param deviceId - The device Id of the shutter
+     * @param level - The desired new level (0 being open, 100 being closed)
+     * @returns Error if there is no shutter with the given id
+     * @deprecated Use "API.shutterSetLevel" instead
+     * TODO: Remove deprecated API method
      */
     static setShutter(deviceId: string, level: number): Error | null;
+    /**
+     * Changes the position of a given shutter
+     * if needed this updates the window position as well
+     * @param deviceId - The device Id of the shutter
+     * @param command - The command(stack) to perform on the shutter
+     * @returns Error if there is no shutter with the given id
+     */
+    static shutterSetLevel(deviceId: string, command: ShutterSetLevelCommand): Error | null;
     static speakOnDevice(deviceId: string, message: string, volume?: number): Error | null;
     /**
      * Starts a specified scene
-     * @param {string} deviceId The targeted scene
-     * @param {number} turnOffTimeout If provided the time in ms after which the scene should end automatically
-     * @returns {Error | null} In case it failed the Error containing the reason
+     * @param deviceId - The targeted scene
+     * @param turnOffTimeout - If provided the time in ms after which the scene should end automatically
+     * @returns In case it failed the Error containing the reason
      */
     static startScene(deviceId: string, turnOffTimeout?: number): Error | null;
     static switchGarageDoor(deviceId: string, open: boolean): Error | null;
     /**
      * Changes the settings of a given device
-     * @param {string} deviceId The id of the device to change the settings
-     * @param settings A partial settings object containing the wanted settings properties
-     * @returns {Error | null} In case it failed the Error containing the reason
+     * @param deviceId - The id of the device to change the settings
+     * @param settings - A partial settings object containing the wanted settings properties
+     * @returns In case it failed the Error containing the reason
      */
     static setDeviceSettings(deviceId: string, settings: Partial<DeviceSettings>): Error | null;
     static setGroupSettings(groupId: string, settings: Partial<GroupSettings>): Error | null;
     /**
      * Changes the settings of a given room
-     * @param {string} roomName The id of the Room to change the settings
-     * @param settings A partial settings object containing the wanted settings properties
-     * @returns {Error | null} In case it failed the Error containing the reason
+     * @param roomName - The id of the Room to change the settings
+     * @param settings - A partial settings object containing the wanted settings properties
+     * @returns In case it failed the Error containing the reason
      */
     static setRoomSettings(roomName: string, settings: Partial<DeviceSettings>): Error | null;
     static getLastCameraImage(deviceId: string): Error | string;
@@ -113,17 +160,35 @@ export declare class API {
     static loadAllDeviceSettingsFromDb(): void;
     /**
      * Lifts a previously started Block of automatic
-     * @param {string} deviceId The target device
-     * @returns {Error | null} In case it failed the Error containing the reason
+     * @param deviceId - The target device
+     * @returns In case it failed the Error containing the reason
+     * @deprecated Use "API.blockAutomaticLiftAutomaticBlock" instead
+     * TODO: Remove deprecated API method
      */
     static liftAutomaticBlock(deviceId: string): Error | null;
+    /**
+     * Lifts a previously started Block of automatic
+     * @param deviceId - The target device
+     * @param command - The command to lift the automatic block
+     * @returns In case it failed the Error containing the reason
+     */
+    static blockAutomaticLiftAutomaticBlock(deviceId: string, command: BlockAutomaticLiftBlockCommand): Error | null;
     /**
      * Blocks the automatic of the given device for provided Duration
-     * @param {string} deviceId The target device
-     * @param {number} duration The duration in ms for which the device should remain in current state
-     * @param {CollisionSolving} onCollision The desired Collision Solving strategy, in case the automatic being blocked already
-     * @returns {Error | null} In case it failed the Error containing the reason
+     * @param deviceId - The target device
+     * @param duration - The duration in ms for which the device should remain in current state
+     * @param onCollision - The desired Collision Solving strategy, in case the automatic being blocked already
+     * @returns In case it failed the Error containing the reason
+     * @deprecated Use "API.blockAutomaticDisable" instead
+     * TODO: Remove deprecated API method
      */
     static blockAutomatic(deviceId: string, duration: number, onCollision?: CollisionSolving): Error | null;
+    /**
+     * Blocks the automatic of the given device for provided Duration
+     * @param deviceId - The target device
+     * @param command - The command to block the automatic
+     * @returns In case it failed the Error containing the reason
+     */
+    static blockAutomaticSetBlock(deviceId: string, command: BlockAutomaticCommand): Error | null;
     static pressButtonSwitch(deviceId: string, position: ButtonPosition, pressType: ButtonPressType): Error | null;
 }