hoffmation-base 1.2.4 → 1.2.6

package/lib/models/timeCallback.js

@@ -35,18 +35,15 @@ class TimeCallback {
         today.setHours(0, 0, 0, 0);
         switch (this.type) {
             case TimeCallbackType.TimeOfDay:
+                // !!WARNING!! Changing to winter time, that day has 25 hours.
                 if (this.hours === undefined) {
                     this.hours = 0;
                 }
                 if (this.minutes === undefined) {
                     this.minutes = 0;
                 }
-                this.nextToDo = new Date(today.getTime() + this.hours * 60 * 60 * 1000 + (this.minutes + this.minuteOffset) * 60 * 1000);
-                if (this.nextToDo < now) {
-                    // Heute ist schon abgelaufen, also morgen festlegen
-                    this.nextToDo = new Date(this.nextToDo.getTime() + 24 * 60 * 60 * 1000);
-                }
-                server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Nächste Zeitevent für "${this.name}" um ${this.nextToDo.toLocaleTimeString('de-DE')}`);
+                this.nextToDo = server_1.Utils.nextMatchingDate(this.hours, this.minutes + this.minuteOffset);
+                server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Next Time event for "${this.name}" at ${this.nextToDo.toLocaleString('de-DE')}`);
                 break;
             case TimeCallbackType.Sunrise:
                 if (this.cloudOffset === undefined) {

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

@@ -1,5 +1,6 @@
 import { iRoomDevice } from './iRoomDevice';
 export interface iBatteryDevice extends iRoomDevice {
+    readonly lastBatteryPersist: number;
     /**
      * The battery status of the device in percentage
      * @type {number}

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

@@ -2,6 +2,7 @@
 import { iRoomDevice } from './index';
 import { SceneSettings } from '../../../models/deviceSettings/sceneSettings';
 export interface iScene extends iRoomDevice {
+    description: string;
     readonly onSceneStart: () => void;
     readonly onSceneEnd: () => void;
     readonly on: boolean;

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

@@ -8,6 +8,8 @@ import { HmIPDevice } from './hmIpDevice';
 import { iBatteryDevice, iHandleSensor } from '../baseDeviceInterfaces';
 export declare class HmIpGriff extends HmIPDevice implements iHandleSensor, iBatteryDevice, iDisposable {
     private _battery;
+    private _lastBatteryPersist;
+    get lastBatteryPersist(): number;
     get battery(): number;
     position: WindowPosition;
     private _kippCallback;

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

@@ -15,6 +15,7 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpGriff);
         this._battery = -99;
+        this._lastBatteryPersist = 0;
         this.position = models_1.WindowPosition.geschlossen;
         this._kippCallback = [];
         this._closedCallback = [];
@@ -25,6 +26,9 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.handleSensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
     }
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
     get battery() {
         return this._battery;
     }
@@ -139,7 +143,12 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
     }
     persistBatteryDevice() {
         var _a;
+        const now = services_1.Utils.nowMS();
+        if (this._lastBatteryPersist + 60000 > now) {
+            return;
+        }
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+        this._lastBatteryPersist = now;
     }
     dispose() {
         if (this._iOpenTimeout) {

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

@@ -7,6 +7,8 @@ export declare class HmIpHeizung extends HmIPDevice implements iBatteryDevice {
     private _temperatur;
     private _level;
     private _adaptionState;
+    private _lastBatteryPersist;
+    get lastBatteryPersist(): number;
     get battery(): number;
     constructor(pInfo: IoBrokerDeviceInfo);
     private _desiredTemperatur;

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

@@ -24,9 +24,13 @@ class HmIpHeizung extends hmIpDevice_1.HmIPDevice {
         this._battery = -99;
         this._temperatur = 0;
         this._level = 0;
+        this._lastBatteryPersist = 0;
         this._desiredTemperatur = 0;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
     }
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
     get battery() {
         return this._battery;
     }
@@ -79,7 +83,12 @@ class HmIpHeizung extends hmIpDevice_1.HmIPDevice {
     }
     persistBatteryDevice() {
         var _a;
+        const now = services_1.Utils.nowMS();
+        if (this._lastBatteryPersist + 60000 > now) {
+            return;
+        }
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+        this._lastBatteryPersist = now;
     }
 }
 exports.HmIpHeizung = HmIpHeizung;

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

@@ -5,6 +5,8 @@ import { iBatteryDevice, iIlluminationSensor, iMotionSensor } from '../baseDevic
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpPraezenz extends HmIPDevice implements iIlluminationSensor, iBatteryDevice, iMotionSensor {
     private _battery;
+    private _lastBatteryPersist;
+    get lastBatteryPersist(): number;
     private static PRESENCE_DETECTION;
     private static CURRENT_ILLUMINATION;
     excludeFromNightAlarm: boolean;

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

@@ -11,6 +11,7 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
         var _a;
         super(pInfo, deviceType_1.DeviceType.HmIpPraezenz);
         this._battery = -99;
+        this._lastBatteryPersist = 0;
         this.excludeFromNightAlarm = false;
         this.movementDetected = false;
         this.settings = new models_1.MotionSensorSettings();
@@ -38,6 +39,9 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
             });
         }
     }
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
     get battery() {
         return this._battery;
     }
@@ -115,7 +119,12 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
     }
     persistBatteryDevice() {
         var _a;
+        const now = services_1.Utils.nowMS();
+        if (this._lastBatteryPersist + 60000 > now) {
+            return;
+        }
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+        this._lastBatteryPersist = now;
     }
 }
 exports.HmIpPraezenz = HmIpPraezenz;

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

@@ -5,6 +5,8 @@ import { Button, ButtonPressType } from '../button';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpTaster extends HmIPDevice implements iButtonSwitch, iBatteryDevice {
     private _battery;
+    private _lastBatteryPersist;
+    get lastBatteryPersist(): number;
     private static readonly BUTTON_CAPABILLITIES;
     buttonTopLeft: Button;
     buttonMidLeft: Button;

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

@@ -11,6 +11,7 @@ class HmIpTaster extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpTaster);
         this._battery = -99;
+        this._lastBatteryPersist = 0;
         this.buttonBot = undefined;
         this.buttonTop = undefined;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.buttonSwitch);
@@ -22,6 +23,9 @@ class HmIpTaster extends hmIpDevice_1.HmIPDevice {
         this.buttonMidRight = new button_1.Button('MidRight', HmIpTaster.BUTTON_CAPABILLITIES);
         this.buttonBotRight = new button_1.Button('BotRight', HmIpTaster.BUTTON_CAPABILLITIES);
     }
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
     get battery() {
         return this._battery;
     }
@@ -111,7 +115,12 @@ class HmIpTaster extends hmIpDevice_1.HmIPDevice {
     }
     persistBatteryDevice() {
         var _a;
+        const now = services_1.Utils.nowMS();
+        if (this._lastBatteryPersist + 60000 > now) {
+            return;
+        }
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+        this._lastBatteryPersist = now;
     }
 }
 exports.HmIpTaster = HmIpTaster;

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

@@ -4,6 +4,8 @@ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { iBatteryDevice } from '../baseDeviceInterfaces';
 export declare class HmIpTherm extends HmIPDevice implements iBatteryDevice {
     private _battery;
+    private _lastBatteryPersist;
+    get lastBatteryPersist(): number;
     get battery(): number;
     constructor(pInfo: IoBrokerDeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;

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

@@ -10,8 +10,12 @@ class HmIpTherm extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpTherm);
         this._battery = -99;
+        this._lastBatteryPersist = 0;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
     }
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
     get battery() {
         return this._battery;
     }
@@ -31,7 +35,12 @@ class HmIpTherm extends hmIpDevice_1.HmIPDevice {
     }
     persistBatteryDevice() {
         var _a;
+        const now = services_1.Utils.nowMS();
+        if (this._lastBatteryPersist + 60000 > now) {
+            return;
+        }
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+        this._lastBatteryPersist = now;
     }
 }
 exports.HmIpTherm = HmIpTherm;

package/lib/server/devices/scene/room-scene.d.ts

@@ -8,6 +8,7 @@ import { DeviceCapability } from '../DeviceCapability';
 import { DeviceType } from '../deviceType';
 import { SceneSettings } from '../../../models/deviceSettings/sceneSettings';
 export declare class RoomScene implements iScene {
+    description: string;
     room: RoomBase | undefined;
     settings: SceneSettings;
     private readonly _onSceneStart;

package/lib/server/devices/scene/room-scene.js

@@ -14,6 +14,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const sceneSettings_1 = require("../../../models/deviceSettings/sceneSettings");
 class RoomScene {
     constructor(name, room, onSceneStart, onSceneEnd, turnOffTimeout) {
+        this.description = '';
         this.settings = new sceneSettings_1.SceneSettings();
         this._automaticEndTimeout = null;
         this._deviceCapabilities = [DeviceCapability_1.DeviceCapability.scene];

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

@@ -143,7 +143,7 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
     persist() {
         var _a;
         const now = services_1.Utils.nowMS();
-        if (this._lastPersist + 1000 < now) {
+        if (this._lastPersist + 1000 > now) {
             return;
         }
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistActuator(this);

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

@@ -8,6 +8,8 @@ import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 import { PIDController } from '../../../../liquid-pid';
 export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater, iBatteryDevice {
     protected _battery: number;
+    private _lastBatteryPersist;
+    get lastBatteryPersist(): number;
     readonly persistHeaterInterval: NodeJS.Timeout;
     settings: HeaterSettings;
     get battery(): number;

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

@@ -11,6 +11,7 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, pType) {
         super(pInfo, pType);
         this._battery = -99;
+        this._lastBatteryPersist = 0;
         this.persistHeaterInterval = services_1.Utils.guardedInterval(() => {
             this.persistHeater();
         }, 5 * 60 * 1000, this, false);
@@ -41,6 +42,9 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
             this.checkSeasonTurnOff();
         }, 0, 2, 0));
     }
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
     get battery() {
         return this._battery;
     }
@@ -156,7 +160,12 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
     }
     persistBatteryDevice() {
         var _a;
+        const now = services_1.Utils.nowMS();
+        if (this._lastBatteryPersist + 60000 > now) {
+            return;
+        }
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+        this._lastBatteryPersist = now;
     }
     dispose() {
         if (this.persistHeaterInterval) {

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

@@ -6,6 +6,8 @@ import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 import { iBatteryDevice } from '../../baseDeviceInterfaces';
 export declare class ZigbeeMagnetContact extends ZigbeeDevice implements iBatteryDevice {
     protected _battery: number;
+    private _lastBatteryPersist;
+    get lastBatteryPersist(): number;
     get battery(): number;
     position: MagnetPosition;
     telegramOnOpen: boolean;

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

@@ -9,6 +9,7 @@ class ZigbeeMagnetContact extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, deviceType) {
         super(pInfo, deviceType);
         this._battery = -99;
+        this._lastBatteryPersist = 0;
         this.position = models_2.MagnetPosition.closed;
         this.telegramOnOpen = false;
         this.speakOnOpen = false;
@@ -16,6 +17,9 @@ class ZigbeeMagnetContact extends zigbeeDevice_1.ZigbeeDevice {
         this._openCallback = [];
         this.minutesOpen = 0;
     }
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
     get battery() {
         return this._battery;
     }
@@ -103,7 +107,12 @@ class ZigbeeMagnetContact extends zigbeeDevice_1.ZigbeeDevice {
     }
     persistBatteryDevice() {
         var _a;
+        const now = services_1.Utils.nowMS();
+        if (this._lastBatteryPersist + 60000 > now) {
+            return;
+        }
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+        this._lastBatteryPersist = now;
     }
 }
 exports.ZigbeeMagnetContact = ZigbeeMagnetContact;

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

@@ -7,6 +7,8 @@ import { iBatteryDevice, iMotionSensor } from '../../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionSensor, iBatteryDevice {
     private _battery;
+    private _lastBatteryPersist;
+    get lastBatteryPersist(): number;
     settings: MotionSensorSettings;
     movementDetected: boolean;
     get battery(): number;

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

@@ -10,6 +10,7 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
         var _a;
         super(pInfo, type);
         this._battery = -99;
+        this._lastBatteryPersist = 0;
         this.settings = new models_1.MotionSensorSettings();
         this.movementDetected = false;
         this._initialized = false;
@@ -34,6 +35,9 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
             });
         }
     }
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
     get battery() {
         return this._battery;
     }
@@ -127,7 +131,12 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
     }
     persistBatteryDevice() {
         var _a;
+        const now = services_1.Utils.nowMS();
+        if (this._lastBatteryPersist + 60000 > now) {
+            return;
+        }
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+        this._lastBatteryPersist = now;
     }
 }
 exports.ZigbeeMotionSensor = ZigbeeMotionSensor;

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

@@ -4,6 +4,8 @@ import { ZigbeeDevice } from './BaseDevices';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeAquaraVibra extends ZigbeeDevice implements iVibrationSensor, iBatteryDevice {
     private _battery;
+    private _lastBatteryPersist;
+    get lastBatteryPersist(): number;
     get battery(): number;
     sensitivity: string;
     tiltAngle: number;

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

@@ -10,6 +10,7 @@ class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeAquaraVibra);
         this._battery = -99;
+        this._lastBatteryPersist = 0;
         this.sensitivity = '';
         this.tiltAngle = 0;
         this.tiltAngleX = 0;
@@ -31,6 +32,9 @@ class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
         services_1.PollyService.preloadTTS(this._alarmMessage);
         this._idSensitivity = `${this.info.fullID}.sensitivity`;
     }
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
     get battery() {
         return this._battery;
     }
@@ -143,7 +147,12 @@ class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
     }
     persistBatteryDevice() {
         var _a;
+        const now = services_1.Utils.nowMS();
+        if (this._lastBatteryPersist + 60000 > now) {
+            return;
+        }
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+        this._lastBatteryPersist = now;
     }
 }
 exports.ZigbeeAquaraVibra = ZigbeeAquaraVibra;

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

@@ -5,6 +5,8 @@ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { iBatteryDevice } from '../baseDeviceInterfaces';
 export declare class ZigbeeAquaraWater extends ZigbeeDevice implements iBatteryDevice {
     private _battery;
+    private _lastBatteryPersist;
+    get lastBatteryPersist(): number;
     get battery(): number;
     water: boolean;
     iAlarmTimeout: NodeJS.Timeout | undefined;

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

@@ -10,6 +10,7 @@ class ZigbeeAquaraWater extends BaseDevices_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeAquaraWater);
         this._battery = -99;
+        this._lastBatteryPersist = 0;
         this.water = false;
         this.iAlarmTimeout = undefined;
         this._messageAlarmFirst = '';
@@ -22,6 +23,9 @@ class ZigbeeAquaraWater extends BaseDevices_1.ZigbeeDevice {
         this._messageAlarm = services_1.Res.waterAlarmRepeat(this.info.customName, this._roomName);
         this._messageAlarmEnd = services_1.Res.waterAlarmEnd(this._roomName);
     }
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
     get battery() {
         return this._battery;
     }
@@ -100,7 +104,12 @@ class ZigbeeAquaraWater extends BaseDevices_1.ZigbeeDevice {
     }
     persistBatteryDevice() {
         var _a;
+        const now = services_1.Utils.nowMS();
+        if (this._lastBatteryPersist + 60000 > now) {
+            return;
+        }
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+        this._lastBatteryPersist = now;
     }
     dispose() {
         if (this.iAlarmTimeout) {

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

@@ -5,6 +5,8 @@ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { iBatteryDevice } from '../baseDeviceInterfaces';
 export declare class ZigbeeHeimanSmoke extends ZigbeeDevice implements iBatteryDevice {
     private _battery;
+    private _lastBatteryPersist;
+    get lastBatteryPersist(): number;
     get battery(): number;
     smoke: boolean;
     iAlarmTimeout: NodeJS.Timeout | undefined;

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

@@ -10,6 +10,7 @@ class ZigbeeHeimanSmoke extends BaseDevices_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeHeimanSmoke);
         this._battery = -99;
+        this._lastBatteryPersist = 0;
         this.smoke = false;
         this.iAlarmTimeout = undefined;
         this._messageAlarmFirst = '';
@@ -21,6 +22,9 @@ class ZigbeeHeimanSmoke extends BaseDevices_1.ZigbeeDevice {
         this._messageAlarm = services_1.Res.fireAlarmRepeat(this._roomName, this.info.customName);
         this._messageAlarmEnd = services_1.Res.fireAlarmEnd(this._roomName);
     }
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
     get battery() {
         return this._battery;
     }
@@ -96,7 +100,12 @@ class ZigbeeHeimanSmoke extends BaseDevices_1.ZigbeeDevice {
     }
     persistBatteryDevice() {
         var _a;
+        const now = services_1.Utils.nowMS();
+        if (this._lastBatteryPersist + 60000 > now) {
+            return;
+        }
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+        this._lastBatteryPersist = now;
     }
     dispose() {
         if (this.iAlarmTimeout) {

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

@@ -5,6 +5,8 @@ import { iBatteryDevice, iHumiditySensor, iTemperatureSensor } from '../baseDevi
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeSonoffTemp extends ZigbeeDevice implements iTemperatureSensor, iHumiditySensor, iBatteryDevice {
     private _battery;
+    private _lastBatteryPersist;
+    get lastBatteryPersist(): number;
     readonly persistTemperatureSensorInterval: NodeJS.Timeout;
     readonly persistHumiditySensorInterval: NodeJS.Timeout;
     get battery(): number;

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

@@ -11,6 +11,7 @@ class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeSonoffTemp);
         this._battery = -99;
+        this._lastBatteryPersist = 0;
         this.persistTemperatureSensorInterval = services_1.Utils.guardedInterval(() => {
             this.persistTemperaturSensor();
         }, 5 * 60 * 1000, this, false);
@@ -26,6 +27,9 @@ class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.humiditySensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
     }
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
     get battery() {
         return this._battery;
     }
@@ -99,7 +103,12 @@ class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
     }
     persistBatteryDevice() {
         var _a;
+        const now = services_1.Utils.nowMS();
+        if (this._lastBatteryPersist + 60000 > now) {
+            return;
+        }
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+        this._lastBatteryPersist = now;
     }
     dispose() {
         if (this.persistTemperatureSensorInterval) {

package/lib/server/services/time-callback-service.js

@@ -150,8 +150,10 @@ class TimeCallbackService {
         TimeCallbackService._todaySunSet = (0, sunrise_sunset_js_1.getSunset)(settings_service_1.SettingsService.latitude, settings_service_1.SettingsService.longitude, calculationDate);
         TimeCallbackService.updateSunSet();
         TimeCallbackService.updateSunRise();
-        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Nächster Sonnenaufgang um ${TimeCallbackService.nextSunRise.toLocaleTimeString('de-DE')}
-Nächster Sonnenuntergang um ${TimeCallbackService._nextSunSet.toLocaleTimeString('de-DE')}`);
+        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Today Sunrise: ${TimeCallbackService._todaySunRise.toLocaleString('de-DE')}
+Today Sunset: ${TimeCallbackService._todaySunSet.toLocaleString('de-DE')}
+Next Sunrise: ${TimeCallbackService._nextSunRise.toLocaleString('de-DE')}
+Next Sunset: ${TimeCallbackService._nextSunSet.toLocaleString('de-DE')}`);
     }
     static removeCallback(pCallback) {
         for (let i = 0; i < TimeCallbackService._callbacks.length; i++) {

package/lib/server/services/utils/utils.d.ts

@@ -30,4 +30,5 @@ export declare class Utils {
     static positiveMod(number: number, mod: number): number;
     static degreeInBetween(minDegree: number, maxDegree: number, degreeToCheck: number): boolean;
     private static deepOmit;
+    static nextMatchingDate(hours?: number, minutes?: number, now?: Date): Date;
 }

package/lib/server/services/utils/utils.js

@@ -194,5 +194,19 @@ class Utils {
             result[key] = lodash_1.default.isObject(value) ? this.deepOmit(value, keysToOmit) : value;
         });
     }
+    static nextMatchingDate(hours = 0, minutes = 0, now = new Date()) {
+        const todayOption = new Date(now.getTime());
+        todayOption.setHours(hours, minutes, 0, 0);
+        if (todayOption > now) {
+            // Today Option is in the future --> valid
+            return todayOption;
+        }
+        const todayMidnight = new Date(now.getTime());
+        todayMidnight.setHours(0, 0, 0, 0);
+        // 26 to guarantee matching next day even with time changes
+        const tomorowOption = new Date(todayMidnight.getTime() + 26 * 60 * 60 * 1000);
+        tomorowOption.setHours(hours, minutes, 0, 0);
+        return tomorowOption;
+    }
 }
 exports.Utils = Utils;