hoffmation-base 1.1.2 → 1.1.3

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

@@ -1,5 +1,5 @@
-import { DeviceSettings } from './deviceSettings';
-export declare class WledSettings extends DeviceSettings {
+import { DimmerSettings } from './dimmerSettings';
+export declare class WledSettings extends DimmerSettings {
     dayOn: boolean;
     dayBrightness: number;
     dawnOn: boolean;

package/lib/models/deviceSettings/wledSettings.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WledSettings = void 0;
-const deviceSettings_1 = require("./deviceSettings");
-class WledSettings extends deviceSettings_1.DeviceSettings {
+const dimmerSettings_1 = require("./dimmerSettings");
+class WledSettings extends dimmerSettings_1.DimmerSettings {
     constructor() {
         super(...arguments);
         this.dayOn = false;

package/lib/server/devices/baseDeviceInterfaces/iButtonSwitch.d.ts

@@ -1,4 +1,4 @@
-import { Button } from '../button';
+import { Button, ButtonPressType } from '../button';
 import { iRoomDevice } from './iRoomDevice';
 export interface iButtonSwitch extends iRoomDevice {
     buttonTopLeft: Button | undefined;
@@ -9,5 +9,6 @@ export interface iButtonSwitch extends iRoomDevice {
     buttonBotRight: Button | undefined;
     buttonBot: Button | undefined;
     buttonTop: Button | undefined;
+    persist(buttonName: string, pressType: ButtonPressType): void;
     getButtonAssignment(): string;
 }

package/lib/server/devices/baseDeviceInterfaces/iShutter.d.ts

@@ -4,5 +4,6 @@ export interface iShutter extends iRoomDevice {
     currentLevel: number;
     desiredFensterLevel: number;
     fenster: Fenster | undefined;
+    persist(): void;
     setLevel(pPosition: number, initial: boolean, skipOpenWarning?: boolean): void;
 }

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

@@ -131,7 +131,7 @@ class LampenGroup extends base_group_1.BaseGroup {
     }
     setAllWled(pValue, brightness = -1, preset) {
         this.getWled().forEach((w) => {
-            w.setLight(pValue, brightness, preset);
+            w.setWled(pValue, brightness, preset);
         });
     }
 }

package/lib/server/devices/hmIPDevices/hmIpRoll.d.ts

@@ -17,6 +17,7 @@ export declare class HmIpRoll extends HmIPDevice implements iShutter {
     get fenster(): Fenster | undefined;
     set fenster(value: Fenster | undefined);
     get desiredFensterLevel(): number;
+    persist(): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     setLevel(pPosition: number, initial?: boolean, skipOpenWarning?: boolean): void;
     toJSON(): Partial<IoBrokerBaseDevice>;

package/lib/server/devices/hmIPDevices/hmIpRoll.js

@@ -36,6 +36,7 @@ class HmIpRoll extends hmIpDevice_1.HmIPDevice {
                 var _a;
                 (_a = this._fenster) === null || _a === void 0 ? void 0 : _a.rolloPositionChange(value);
             }, this);
+            this.persist();
         }
         this._currentLevel = value;
     }
@@ -51,6 +52,10 @@ class HmIpRoll extends hmIpDevice_1.HmIPDevice {
         }
         return this._fenster.desiredPosition;
     }
+    persist() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistShutter(this);
+    }
     update(idSplit, state, initial = false) {
         this.log(models_2.LogLevel.DeepTrace, `Rollo Update : ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);

package/lib/server/devices/hmIPDevices/hmIpTaster.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
 import { iBatteryDevice, iButtonSwitch } from '../baseDeviceInterfaces';
-import { Button } from '../button';
+import { Button, ButtonPressType } from '../button';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpTaster extends HmIPDevice implements iButtonSwitch, iBatteryDevice {
     private static readonly BUTTON_CAPABILLITIES;
@@ -15,6 +15,7 @@ export declare class HmIpTaster extends HmIPDevice implements iButtonSwitch, iBa
     buttonTop: undefined;
     battery: number;
     constructor(pInfo: IoBrokerDeviceInfo);
+    persist(buttonName: string, pressType: ButtonPressType): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     getButtonAssignment(): string;
 }

package/lib/server/devices/hmIPDevices/hmIpTaster.js

@@ -6,20 +6,25 @@ const deviceType_1 = require("../deviceType");
 const button_1 = require("../button");
 const models_1 = require("../../../models");
 const DeviceCapability_1 = require("../DeviceCapability");
+const services_1 = require("../../services");
 class HmIpTaster extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpTaster);
+        this.buttonBot = undefined;
+        this.buttonTop = undefined;
+        this.battery = -99;
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.buttonSwitch);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         this.buttonTopLeft = new button_1.Button('TopLeft', HmIpTaster.BUTTON_CAPABILLITIES);
         this.buttonMidLeft = new button_1.Button('MidLeft', HmIpTaster.BUTTON_CAPABILLITIES);
         this.buttonBotLeft = new button_1.Button('BotLeft', HmIpTaster.BUTTON_CAPABILLITIES);
         this.buttonTopRight = new button_1.Button('TopRight', HmIpTaster.BUTTON_CAPABILLITIES);
         this.buttonMidRight = new button_1.Button('MidRight', HmIpTaster.BUTTON_CAPABILLITIES);
         this.buttonBotRight = new button_1.Button('BotRight', HmIpTaster.BUTTON_CAPABILLITIES);
-        this.buttonBot = undefined;
-        this.buttonTop = undefined;
-        this.battery = -99;
-        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.buttonSwitch);
-        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
+    }
+    persist(buttonName, pressType) {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistSwitchInput(this, pressType, buttonName);
     }
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Taster Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
@@ -55,17 +60,24 @@ class HmIpTaster extends hmIpDevice_1.HmIPDevice {
         if (cTaste === undefined) {
             return;
         }
+        const boolVal = state.val;
         switch (idSplit[4]) {
             case 'PRESS_SHORT':
                 if (!initial) {
                     // Tasten beim Starten ignorieren
-                    cTaste.updateState(button_1.ButtonPressType.short, state.val);
+                    if (boolVal) {
+                        this.persist(cTaste.name, button_1.ButtonPressType.short);
+                    }
+                    cTaste.updateState(button_1.ButtonPressType.short, boolVal);
                 }
                 break;
             case 'PRESS_LONG':
                 if (!initial) {
                     // Tasten beim Starten ignorieren
-                    cTaste.updateState(button_1.ButtonPressType.long, state.val);
+                    if (boolVal) {
+                        this.persist(cTaste.name, button_1.ButtonPressType.long);
+                    }
+                    cTaste.updateState(button_1.ButtonPressType.long, boolVal);
                 }
                 break;
         }

package/lib/server/devices/hmIPDevices/hmIpWippe.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
-import { Button } from '../button';
+import { Button, ButtonPressType } from '../button';
 import { iButtonSwitch } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpWippe extends HmIPDevice implements iButtonSwitch {
@@ -15,5 +15,6 @@ export declare class HmIpWippe extends HmIPDevice implements iButtonSwitch {
     buttonTop: Button;
     constructor(pInfo: IoBrokerDeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
+    persist(buttonName: string, pressType: ButtonPressType): void;
     getButtonAssignment(): string;
 }

package/lib/server/devices/hmIPDevices/hmIpWippe.js

@@ -6,6 +6,7 @@ const deviceType_1 = require("../deviceType");
 const button_1 = require("../button");
 const models_1 = require("../../../models");
 const DeviceCapability_1 = require("../DeviceCapability");
+const services_1 = require("../../services");
 class HmIpWippe extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpWippe);
@@ -28,23 +29,32 @@ class HmIpWippe extends hmIpDevice_1.HmIPDevice {
         if (cTaste === undefined) {
             return;
         }
+        const boolVal = state.val;
         switch (idSplit[4]) {
             case 'PRESS_SHORT':
                 if (!initial) {
                     // Tasten beim Starten ignorieren
-                    this.log(models_1.LogLevel.Debug, `Tasten Update initial ignoriert`);
-                    cTaste.updateState(button_1.ButtonPressType.short, state.val);
+                    if (boolVal) {
+                        this.persist(cTaste.name, button_1.ButtonPressType.short);
+                    }
+                    cTaste.updateState(button_1.ButtonPressType.short, boolVal);
                 }
                 break;
             case 'PRESS_LONG':
                 if (!initial) {
                     // Tasten beim Starten ignorieren
-                    this.log(models_1.LogLevel.Debug, `Tasten Update initial ignoriert`);
-                    cTaste.updateState(button_1.ButtonPressType.long, state.val);
+                    if (boolVal) {
+                        this.persist(cTaste.name, button_1.ButtonPressType.long);
+                    }
+                    cTaste.updateState(button_1.ButtonPressType.long, boolVal);
                 }
                 break;
         }
     }
+    persist(buttonName, pressType) {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistSwitchInput(this, pressType, buttonName);
+    }
     getButtonAssignment() {
         const result = [`Button: ${this.info.customName}`];
         for (const taste of [this.buttonTop, this.buttonBot]) {

package/lib/server/devices/wledDevice.d.ts

@@ -3,7 +3,8 @@ import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
 import { TimeOfDay } from '../../models';
 import { WledSettings } from '../../models/deviceSettings/wledSettings';
 import { IoBrokerDeviceInfo } from './IoBrokerDeviceInfo';
-export declare class WledDevice extends IoBrokerBaseDevice {
+import { iDimmableLamp } from './baseDeviceInterfaces/iDimmableLamp';
+export declare class WledDevice extends IoBrokerBaseDevice implements iDimmableLamp {
     on: boolean;
     brightness: number;
     linkQuality: number;
@@ -14,7 +15,14 @@ export declare class WledDevice extends IoBrokerBaseDevice {
     private readonly _presetID;
     private readonly _brightnessID;
     constructor(pInfo: IoBrokerDeviceInfo);
+    get actuatorOn(): boolean;
+    get lightOn(): boolean;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, _pOverride?: boolean): void;
-    setLight(pValue: boolean, brightness?: number, preset?: number): void;
+    setLight(pValue: boolean, _timeout?: number, _force?: boolean, brightness?: number, _transitionTime?: number): void;
+    setWled(pValue: boolean, brightness?: number, preset?: number): void;
     setTimeBased(time: TimeOfDay): void;
+    persist(): void;
+    setActuator(pValue: boolean, _timeout?: number, _force?: boolean): void;
+    toggleActuator(_force: boolean): boolean;
+    toggleLight(time?: TimeOfDay, _force?: boolean, calculateTime?: boolean): boolean;
 }

package/lib/server/devices/wledDevice.js

@@ -19,6 +19,12 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         this._presetID = `${this.info.fullID}.ps`;
         this._brightnessID = `${this.info.fullID}.bri`;
     }
+    get actuatorOn() {
+        return this.on;
+    }
+    get lightOn() {
+        return this.on;
+    }
     update(idSplit, state, initial = false, _pOverride = false) {
         services_1.ServerLogService.writeLog(models_1.LogLevel.DeepTrace, `Wled: ${initial ? 'Initiales ' : ''}Update für "${this.info.customName}": ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         switch (idSplit[3]) {
@@ -30,7 +36,10 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
                 break;
         }
     }
-    setLight(pValue, brightness = -1, preset) {
+    setLight(pValue, _timeout, _force, brightness, _transitionTime) {
+        this.setWled(pValue, brightness);
+    }
+    setWled(pValue, brightness = -1, preset) {
         if (this._onID === '') {
             services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Keine On ID für "${this.info.customName}" bekannt.`);
             return;
@@ -62,25 +71,49 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         switch (time) {
             case models_1.TimeOfDay.Night:
                 if (this.settings.nightOn) {
-                    this.setLight(true, this.settings.nightBrightness, this.settings.nightPreset);
+                    this.setWled(true, this.settings.nightBrightness, this.settings.nightPreset);
                 }
                 break;
             case models_1.TimeOfDay.AfterSunset:
                 if (this.settings.duskOn) {
-                    this.setLight(true, this.settings.duskBrightness, this.settings.duskPreset);
+                    this.setWled(true, this.settings.duskBrightness, this.settings.duskPreset);
                 }
                 break;
             case models_1.TimeOfDay.BeforeSunrise:
                 if (this.settings.dawnOn) {
-                    this.setLight(true, this.settings.dawnBrightness, this.settings.dawnPreset);
+                    this.setWled(true, this.settings.dawnBrightness, this.settings.dawnPreset);
                 }
                 break;
             case models_1.TimeOfDay.Daylight:
                 if (this.settings.dayOn) {
-                    this.setLight(true, this.settings.dayBrightness, this.settings.dayPreset);
+                    this.setWled(true, this.settings.dayBrightness, this.settings.dayPreset);
                 }
                 break;
         }
     }
+    persist() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistActuator(this);
+    }
+    setActuator(pValue, _timeout, _force) {
+        this.setLight(pValue);
+    }
+    toggleActuator(_force) {
+        this.setLight(!this.on);
+        return this.on;
+    }
+    toggleLight(time, _force = false, calculateTime = false) {
+        var _a;
+        const newVal = !this.lightOn;
+        if (newVal && time === undefined && calculateTime && this.room !== undefined) {
+            time = services_1.TimeCallbackService.dayType((_a = this.room) === null || _a === void 0 ? void 0 : _a.settings.lampOffset);
+        }
+        if (newVal && time !== undefined) {
+            this.setTimeBased(time);
+            return true;
+        }
+        this.setLight(newVal);
+        return newVal;
+    }
 }
 exports.WledDevice = WledDevice;

package/lib/server/devices/zigbee/BaseDevices/zigbeeShutter.d.ts

@@ -22,6 +22,7 @@ export declare class ZigbeeShutter extends ZigbeeDevice implements iShutter {
     get fenster(): Fenster | undefined;
     set fenster(value: Fenster | undefined);
     get desiredFensterLevel(): number;
+    persist(): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
     setLevel(pPosition: number, initial?: boolean, skipOpenWarning?: boolean): void;
     toJSON(): Partial<IoBrokerBaseDevice>;

package/lib/server/devices/zigbee/BaseDevices/zigbeeShutter.js

@@ -45,6 +45,7 @@ class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
                 var _a;
                 (_a = this._fenster) === null || _a === void 0 ? void 0 : _a.rolloPositionChange(value);
             }, this);
+            this.persist();
         }
         this._currentLevel = value;
     }
@@ -60,6 +61,10 @@ class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
         }
         return this._fenster.desiredPosition;
     }
+    persist() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistShutter(this);
+    }
     update(idSplit, state, initial = false, pOverride = false) {
         super.update(idSplit, state, initial, pOverride);
     }

package/lib/server/devices/zigbee/BaseDevices/zigbeeSwitch.d.ts

@@ -2,7 +2,7 @@
 import { iButtonSwitch } from '../../baseDeviceInterfaces';
 import { ZigbeeDevice } from './zigbeeDevice';
 import { DeviceType } from '../../deviceType';
-import { Button } from '../../button';
+import { Button, ButtonPressType } from '../../button';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 export declare abstract class ZigbeeSwitch extends ZigbeeDevice implements iButtonSwitch {
     battery: number;
@@ -15,6 +15,7 @@ export declare abstract class ZigbeeSwitch extends ZigbeeDevice implements iButt
     abstract buttonTopLeft: Button | undefined;
     abstract buttonTopRight: Button | undefined;
     constructor(pInfo: IoBrokerDeviceInfo, deviceType: DeviceType);
+    persist(buttonName: string, pressType: ButtonPressType): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverrride?: boolean): void;
     abstract getButtonAssignment(): string;
 }

package/lib/server/devices/zigbee/BaseDevices/zigbeeSwitch.js

@@ -4,12 +4,17 @@ exports.ZigbeeSwitch = void 0;
 const zigbeeDevice_1 = require("./zigbeeDevice");
 const DeviceCapability_1 = require("../../DeviceCapability");
 const models_1 = require("../../../../models");
+const services_1 = require("../../../services");
 class ZigbeeSwitch extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, deviceType) {
         super(pInfo, deviceType);
         this.battery = -99;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
     }
+    persist(buttonName, pressType) {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistSwitchInput(this, pressType, buttonName);
+    }
     update(idSplit, state, initial = false, pOverrride = false) {
         super.update(idSplit, state, initial, pOverrride);
         switch (idSplit[3]) {

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

@@ -77,23 +77,29 @@ class ZigbeeAqaraOpple3Switch extends BaseDevices_1.ZigbeeSwitch {
                 this.log(models_1.LogLevel.Error, `Unknown index: ${index} for button, Aqara Opple 3 has only 6 buttons.`);
                 return;
         }
+        let pressType = undefined;
         switch (parts[2]) {
             case 'click':
-                taste.updateState(button_1.ButtonPressType.short, val);
-                return;
+                pressType = button_1.ButtonPressType.short;
+                break;
             case 'hold':
-                taste.updateState(button_1.ButtonPressType.long, val);
-                return;
+                pressType = button_1.ButtonPressType.long;
+                break;
             case 'double':
-                taste.updateState(button_1.ButtonPressType.double, val);
-                return;
+                pressType = button_1.ButtonPressType.double;
+                break;
             case 'triple':
-                taste.updateState(button_1.ButtonPressType.triple, val);
-                return;
-            default:
-                this.log(models_1.LogLevel.Error, `Unknown pressType: "${parts[2]}" for button, Aqara Opple 3 has only types "click, hold, double, triple".`);
-                return;
+                pressType = button_1.ButtonPressType.triple;
+                break;
+        }
+        if (pressType == undefined) {
+            this.log(models_1.LogLevel.Error, `Unknown pressType: "${parts[2]}" for button, Aqara Opple 3 has only types "click, hold, double, triple".`);
+            return;
+        }
+        if (val) {
+            this.persist(taste.name, pressType);
         }
+        taste.updateState(pressType, val);
     }
 }
 exports.ZigbeeAqaraOpple3Switch = ZigbeeAqaraOpple3Switch;

package/lib/server/services/dbo/iPersist.d.ts

@@ -1,4 +1,4 @@
-import { iAcDevice, iActuator, iBaseDevice, iHeater, iMotionSensor, IoBrokerBaseDevice } from '../../devices';
+import { ButtonPressType, iAcDevice, iActuator, iBaseDevice, iButtonSwitch, iHeater, iMotionSensor, IoBrokerBaseDevice, iShutter } from '../../devices';
 import { CountToday, CurrentIlluminationDataPoint, EnergyCalculation, RoomBase, ShutterCalibration, TemperaturDataPoint } from '../../../models';
 export interface iPersist {
     initialized: boolean;
@@ -13,6 +13,8 @@ export interface iPersist {
     persistEnergyManager(energyData: EnergyCalculation): void;
     persistAC(device: iAcDevice): void;
     persistActuator(device: iActuator): void;
+    persistSwitchInput(device: iButtonSwitch, pressType: ButtonPressType, buttonName: string): void;
     persistMotionSensor(device: iMotionSensor): void;
+    persistShutter(device: iShutter): void;
     readTemperaturDataPoint(hzGrp: iHeater, limit: number): Promise<TemperaturDataPoint[]>;
 }

package/lib/server/services/dbo/postgreSqlPersist.d.ts

@@ -1,6 +1,6 @@
 import { iPersist } from './iPersist';
 import { CountToday, CurrentIlluminationDataPoint, EnergyCalculation, RoomBase, ShutterCalibration, TemperaturDataPoint } from '../../../models';
-import { iAcDevice, iActuator, iBaseDevice, iHeater, iMotionSensor, IoBrokerBaseDevice } from '../../devices';
+import { ButtonPressType, iAcDevice, iActuator, iBaseDevice, iButtonSwitch, iHeater, iMotionSensor, IoBrokerBaseDevice, iShutter } from '../../devices';
 import { iPersistenceSettings } from '../../config';
 export declare class PostgreSqlPersist implements iPersist {
     initialized: boolean;
@@ -14,7 +14,9 @@ export declare class PostgreSqlPersist implements iPersist {
     initialize(): Promise<void>;
     persistAC(device: iAcDevice): void;
     persistActuator(device: iActuator): void;
+    persistSwitchInput(device: iButtonSwitch, pressType: ButtonPressType, buttonName: string): void;
     persistMotionSensor(device: iMotionSensor): void;
+    persistShutter(device: iShutter): void;
     persistCurrentIllumination(data: CurrentIlluminationDataPoint): void;
     persistShutterCalibration(_data: ShutterCalibration): void;
     readTemperaturDataPoint(heater: iHeater, limit: number): Promise<TemperaturDataPoint[]>;

package/lib/server/services/dbo/postgreSqlPersist.js

@@ -124,6 +124,25 @@ create table "CurrentIllumination"
 alter table "CurrentIllumination"
     owner to postgres;
     END IF;
+    
+    IF (SELECT to_regclass('hoffmation_schema."ButtonSwitchPresses"') IS NULL) Then
+create table if not exists hoffmation_schema."ButtonSwitchPresses"
+(
+    "deviceID"         varchar(60) not null
+        constraint "ButtonSwitchPresses_DeviceInfo_null_fk"
+            references hoffmation_schema."DeviceInfo"
+            on delete set null,
+    "pressType" int,
+    "buttonName" varchar(30),
+    date               timestamp   not null,
+    constraint buttonswitchpresses_pk
+        primary key ("deviceID", "pressType", date)
+);
+
+alter table hoffmation_schema."ButtonSwitchPresses"
+    owner to postgres;
+    END IF;
+    
     IF (SELECT to_regclass('hoffmation_schema."EnergyCalculation"') IS NULL) Then
 create table "EnergyCalculation"
 (
@@ -207,6 +226,23 @@ IF (SELECT to_regclass('hoffmation_schema."MotionSensorDeviceData"') IS NULL) Th
   alter table hoffmation_schema."MotionSensorDeviceData"
     owner to postgres;
 END IF;
+
+IF (SELECT to_regclass('hoffmation_schema."ShutterDeviceData"') IS NULL) Then    
+  create table if not exists hoffmation_schema."ShutterDeviceData"
+(
+    "deviceID"         varchar(60) not null
+        constraint "ShutterDeviceData_DeviceInfo_null_fk"
+            references hoffmation_schema."DeviceInfo"
+            on delete set null,
+    "position" double precision,
+    date               timestamp   not null,
+    constraint shutterdevicedata_pk
+        primary key ("deviceID", date)
+);
+
+alter table hoffmation_schema."ShutterDeviceData"
+    owner to postgres;
+END IF;
     
     IF (SELECT to_regclass('hoffmation_schema."TemperaturData"') IS NULL) Then
 create table "TemperaturData"
@@ -243,12 +279,24 @@ values ('${device.id}', ${device.on}, '${new Date().toISOString()}', ${device.te
         this.query(`
 insert into hoffmation_schema."ActuatorDeviceData" ("deviceID", "on", "date", "percentage")
 values ('${device.id}', ${device.actuatorOn}, '${new Date().toISOString()}', ${percentage !== null && percentage !== void 0 ? percentage : 'null'});
+    `);
+    }
+    persistSwitchInput(device, pressType, buttonName) {
+        this.query(`
+insert into hoffmation_schema."ButtonSwitchPresses" ("deviceID", "pressType", "buttonName", "date")
+values ('${device.id}', ${pressType}, '${buttonName}', '${new Date().toISOString()}');
     `);
     }
     persistMotionSensor(device) {
         this.query(`
 insert into hoffmation_schema."MotionSensorDeviceData" ("deviceID", "movementDetected", "date")
 values ('${device.id}', ${device.movementDetected}, '${new Date().toISOString()}');
+    `);
+    }
+    persistShutter(device) {
+        this.query(`
+insert into hoffmation_schema."ShutterDeviceData" ("deviceID", "position", "date")
+values ('${device.id}', ${device.currentLevel}, '${new Date().toISOString()}');
     `);
     }
     persistCurrentIllumination(data) {