hoffmation-base 3.0.0-alpha.88 → 3.0.0-alpha.89

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

@@ -1,5 +1,10 @@
 import { DeviceSettings } from './deviceSettings';
 export declare class VictronDeviceSettings extends DeviceSettings {
+    /**
+     * The default time interval in minutes for battery-change reporting regardless of battery level.
+     * -1 = disabled
+     */
+    batteryReportingInterval: number;
     /**
      * The maximum wattage that the battery can deliver to the house
      * @default 1700

package/lib/models/deviceSettings/victronDeviceSettings.js

@@ -6,6 +6,11 @@ const server_1 = require("../../server");
 class VictronDeviceSettings extends deviceSettings_1.DeviceSettings {
     constructor() {
         super(...arguments);
+        /**
+         * The default time interval in minutes for battery-change reporting regardless of battery level.
+         * -1 = disabled
+         */
+        this.batteryReportingInterval = 30;
         /**
          * The maximum wattage that the battery can deliver to the house
          * @default 1700
@@ -63,20 +68,21 @@ class VictronDeviceSettings extends deviceSettings_1.DeviceSettings {
         this.excessEnergyTurnOffThreshold = 50;
     }
     fromPartialObject(data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         this.maxBatteryLoadWattage = (_a = data.maxBatteryLoadWattage) !== null && _a !== void 0 ? _a : this.maxBatteryLoadWattage;
-        this.hasBattery = (_b = data.hasBattery) !== null && _b !== void 0 ? _b : this.hasBattery;
-        this.hasGrid = (_c = data.hasGrid) !== null && _c !== void 0 ? _c : this.hasGrid;
-        this.hasSolar = (_d = data.hasSolar) !== null && _d !== void 0 ? _d : this.hasSolar;
-        this.minimumNightTimeAcBatteryLevel = (_e = data.minimumNightTimeAcBatteryLevel) !== null && _e !== void 0 ? _e : this.minimumNightTimeAcBatteryLevel;
+        this.batteryReportingInterval = (_b = data.batteryReportingInterval) !== null && _b !== void 0 ? _b : this.batteryReportingInterval;
+        this.hasBattery = (_c = data.hasBattery) !== null && _c !== void 0 ? _c : this.hasBattery;
+        this.hasGrid = (_d = data.hasGrid) !== null && _d !== void 0 ? _d : this.hasGrid;
+        this.hasSolar = (_e = data.hasSolar) !== null && _e !== void 0 ? _e : this.hasSolar;
+        this.minimumNightTimeAcBatteryLevel = (_f = data.minimumNightTimeAcBatteryLevel) !== null && _f !== void 0 ? _f : this.minimumNightTimeAcBatteryLevel;
         this.minimumTransientTimeAcBatteryLevel =
-            (_f = data.minimumTransientTimeAcBatteryLevel) !== null && _f !== void 0 ? _f : this.minimumTransientTimeAcBatteryLevel;
-        this.minimumDayTimeAcBatteryLevel = (_g = data.minimumDayTimeAcBatteryLevel) !== null && _g !== void 0 ? _g : this.minimumDayTimeAcBatteryLevel;
-        this.batteryCapacityWattage = (_h = data.batteryCapacityWattage) !== null && _h !== void 0 ? _h : this.batteryCapacityWattage;
-        this.normalBaseConsumptionWattage = (_j = data.normalBaseConsumptionWattage) !== null && _j !== void 0 ? _j : this.normalBaseConsumptionWattage;
-        this.maximumBatteryDischargeWattage = (_k = data.maximumBatteryDischargeWattage) !== null && _k !== void 0 ? _k : this.maximumBatteryDischargeWattage;
-        this.excessEnergyTurnOnThreshold = (_l = data.excessEnergyTurnOnThreshold) !== null && _l !== void 0 ? _l : this.excessEnergyTurnOnThreshold;
-        this.excessEnergyTurnOffThreshold = (_m = data.excessEnergyTurnOffThreshold) !== null && _m !== void 0 ? _m : this.excessEnergyTurnOffThreshold;
+            (_g = data.minimumTransientTimeAcBatteryLevel) !== null && _g !== void 0 ? _g : this.minimumTransientTimeAcBatteryLevel;
+        this.minimumDayTimeAcBatteryLevel = (_h = data.minimumDayTimeAcBatteryLevel) !== null && _h !== void 0 ? _h : this.minimumDayTimeAcBatteryLevel;
+        this.batteryCapacityWattage = (_j = data.batteryCapacityWattage) !== null && _j !== void 0 ? _j : this.batteryCapacityWattage;
+        this.normalBaseConsumptionWattage = (_k = data.normalBaseConsumptionWattage) !== null && _k !== void 0 ? _k : this.normalBaseConsumptionWattage;
+        this.maximumBatteryDischargeWattage = (_l = data.maximumBatteryDischargeWattage) !== null && _l !== void 0 ? _l : this.maximumBatteryDischargeWattage;
+        this.excessEnergyTurnOnThreshold = (_m = data.excessEnergyTurnOnThreshold) !== null && _m !== void 0 ? _m : this.excessEnergyTurnOnThreshold;
+        this.excessEnergyTurnOffThreshold = (_o = data.excessEnergyTurnOffThreshold) !== null && _o !== void 0 ? _o : this.excessEnergyTurnOffThreshold;
         super.fromPartialObject(data);
     }
     toJSON() {

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

@@ -22,6 +22,7 @@ export declare class VictronDevice implements iEnergyManager, iBatteryDevice {
     private _lastBatteryLevel;
     private _batteryLevelCallbacks;
     private _excessEnergy;
+    private _lastBatteryChangeReportMs;
     constructor(opts: VictronMqttConnectionOptions);
     /** @inheritDoc */
     get acBlocked(): boolean;

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

@@ -25,6 +25,7 @@ class VictronDevice {
         this._lastBatteryLevel = -1;
         this._batteryLevelCallbacks = [];
         this._excessEnergy = 0;
+        this._lastBatteryChangeReportMs = 0;
         this.settings = new models_1.VictronDeviceSettings();
         this._info = new devices_1.DeviceInfo();
         this._info.fullName = 'Victron Device';
@@ -278,9 +279,12 @@ class VictronDevice {
     }
     checkForBatteryChange() {
         const newLevel = this.battery;
-        if (newLevel == this._lastBatteryLevel) {
+        if (newLevel == this._lastBatteryLevel &&
+            (this.settings.batteryReportingInterval < 0 ||
+                utils_1.Utils.nowMS() - this._lastBatteryChangeReportMs < this.settings.batteryReportingInterval * 60 * 1000)) {
             return;
         }
+        this._lastBatteryChangeReportMs = utils_1.Utils.nowMS();
         for (const cb of this._batteryLevelCallbacks) {
             cb(new models_1.BatteryLevelChangeAction(this));
         }