hoffmation-base 2.20.0-beta.3 → 2.20.0

package/lib/server/services/govee/own-govee-device.js

@@ -19,6 +19,7 @@ class OwnGoveeDevice {
         this.settings = new models_1.LedSettings();
         this.deviceType = devices_1.DeviceType.GoveeLed;
         this.deviceCapabilities = [
+            DeviceCapability_1.DeviceCapability.ledLamp,
             DeviceCapability_1.DeviceCapability.lamp,
             DeviceCapability_1.DeviceCapability.dimmablelamp,
             DeviceCapability_1.DeviceCapability.blockAutomatic,
@@ -126,7 +127,6 @@ class OwnGoveeDevice {
      * @inheritDoc
      */
     setLight(pValue, timeout = -1, force, brightness = -1, _transitionTime, color = '', colorTemp = -1) {
-        var _a;
         if (pValue && brightness === -1 && this.brightness < 10) {
             brightness = 10;
         }
@@ -161,7 +161,6 @@ class OwnGoveeDevice {
         else {
             this.turnOff();
         }
-        (_a = this.device) === null || _a === void 0 ? void 0 : _a.actions.setOn();
         if (timeout > -1 && !dontBlock) {
             this.blockAutomationHandler.disableAutomatic(timeout, models_1.CollisionSolving.overrideIfGreater);
         }
@@ -205,9 +204,6 @@ class OwnGoveeDevice {
     }
     turnOff() {
         var _a;
-        if (!this.on) {
-            return;
-        }
         (_a = this.device) === null || _a === void 0 ? void 0 : _a.actions.setOff().then(() => {
             this.log(models_1.LogLevel.Debug, `Govee turned off`, log_service_1.LogDebugType.SetActuator);
         }).catch((error) => {

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

@@ -137,23 +137,25 @@ class VictronDevice {
         // Step 1: Calculate battery need
         const hoursTilSunset = time_callback_service_1.TimeCallbackService.hoursTilSunset();
         let neededBatteryWattage = 0;
-        if (this.settings.hasBattery) {
+        const timeOfDay = time_callback_service_1.TimeCallbackService.dayType(new time_callback_service_1.SunTimeOffsets());
+        if (this.settings.hasBattery && timeOfDay !== models_1.TimeOfDay.AfterSunset && timeOfDay !== models_1.TimeOfDay.Night) {
             if (this.data.battery.soc == null) {
                 this.log(models_1.LogLevel.Debug, `No battery data available from Victron device.`);
                 return;
             }
             neededBatteryWattage = ((1 - this.data.battery.soc) * this.settings.batteryCapacityWattage) / hoursTilSunset;
+            // Step 2: Calculate expected solar output
+            const solarOutput = (_a = this.data.pvInverter.power) !== null && _a !== void 0 ? _a : 0;
+            // Step 3: Calculate expected base consumption
+            const baseConsumption = this.settings.normalBaseConsumptionWattage;
+            // Step 4: Combine to get currently excess energy
+            this._excessEnergy = solarOutput - neededBatteryWattage - baseConsumption;
         }
-        // Step 2: Calculate expected solar output
-        const solarOutput = (_a = this.data.pvInverter.power) !== null && _a !== void 0 ? _a : 0;
-        // Step 3: Calculate expected base consumption
-        const baseConsumption = this.settings.normalBaseConsumptionWattage;
-        // Step 4: Combine to get currently excess energy
-        this._excessEnergy = solarOutput - neededBatteryWattage - baseConsumption;
         // Whilst calculated spare energy is more precise, we don't mind using the battery as a buffer, if it is full enough.
         if (this.data.battery.dcPower !== null &&
             this.data.battery.soc !== null &&
-            this.data.battery.soc > (hoursTilSunset > 4 ? 0.7 : 0.8)) {
+            this.data.battery.soc >
+                (hoursTilSunset > 4 && timeOfDay !== models_1.TimeOfDay.AfterSunset && timeOfDay !== models_1.TimeOfDay.Night ? 0.7 : 0.8)) {
             this._excessEnergy = this.settings.maximumBatteryDischargeWattage - Math.max(this.data.battery.dcPower, 0);
         }
         this.calculatePersistenceValues();