From e7d454ff0bfcb70b4576ed2fb9270041171e5cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20B=C3=B6hm?= <andreas@boehm.cx>
Date: Mon, 19 Aug 2024 20:49:37 +0200
Subject: [PATCH] Feature: support 'use battery at night' without VE.Direct

previously, we needed VE.Direct enabled to know the
solar charge controller output, which solely decided when
it was "nighttime". since this is now determined by the
wall clock, we can offer this feature to users without a
Victron charge controller connected using VE.Direct.
---
 src/PowerLimiter.cpp                       |  3 +--
 src/WebApi_powerlimiter.cpp                |  2 +-
 webapp/src/views/PowerLimiterAdminView.vue | 19 ++++++++++++-------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/PowerLimiter.cpp b/src/PowerLimiter.cpp
index 1c471a3d..93f027b0 100644
--- a/src/PowerLimiter.cpp
+++ b/src/PowerLimiter.cpp
@@ -251,8 +251,7 @@ void PowerLimiterClass::loop()
 
         if (isStartThresholdReached()) { return true; }
 
-        if (config.PowerLimiter.SolarPassThroughEnabled &&
-                config.PowerLimiter.BatteryAlwaysUseAtNight &&
+        if (config.PowerLimiter.BatteryAlwaysUseAtNight &&
                 !isDayPeriod &&
                 !_batteryDischargeEnabled) {
             _nighttimeDischarging = true;
diff --git a/src/WebApi_powerlimiter.cpp b/src/WebApi_powerlimiter.cpp
index b28380d3..adea6105 100644
--- a/src/WebApi_powerlimiter.cpp
+++ b/src/WebApi_powerlimiter.cpp
@@ -153,13 +153,13 @@ void WebApiPowerLimiterClass::onAdminPost(AsyncWebServerRequest* request)
     if (config.Vedirect.Enabled) {
         config.PowerLimiter.SolarPassThroughEnabled = root["solar_passthrough_enabled"].as<bool>();
         config.PowerLimiter.SolarPassThroughLosses = root["solar_passthrough_losses"].as<uint8_t>();
-        config.PowerLimiter.BatteryAlwaysUseAtNight= root["battery_always_use_at_night"].as<bool>();
         config.PowerLimiter.FullSolarPassThroughStartVoltage = static_cast<int>(root["full_solar_passthrough_start_voltage"].as<float>() * 100) / 100.0;
         config.PowerLimiter.FullSolarPassThroughStopVoltage = static_cast<int>(root["full_solar_passthrough_stop_voltage"].as<float>() * 100) / 100.0;
     }
 
     config.PowerLimiter.IsInverterBehindPowerMeter = root["is_inverter_behind_powermeter"].as<bool>();
     config.PowerLimiter.IsInverterSolarPowered = root["is_inverter_solar_powered"].as<bool>();
+    config.PowerLimiter.BatteryAlwaysUseAtNight = root["battery_always_use_at_night"].as<bool>();
     config.PowerLimiter.UseOverscalingToCompensateShading = root["use_overscaling_to_compensate_shading"].as<bool>();
     config.PowerLimiter.InverterId = root["inverter_serial"].as<uint64_t>();
     config.PowerLimiter.InverterChannelId = root["inverter_channel_id"].as<uint8_t>();
diff --git a/webapp/src/views/PowerLimiterAdminView.vue b/webapp/src/views/PowerLimiterAdminView.vue
index c87d8ffe..96f51ed4 100644
--- a/webapp/src/views/PowerLimiterAdminView.vue
+++ b/webapp/src/views/PowerLimiterAdminView.vue
@@ -105,6 +105,14 @@
                     wide
                 />
 
+                <InputElement
+                    v-show="canUseBatteryDischargeAtNight()"
+                    :label="$t('powerlimiteradmin.BatteryDischargeAtNight')"
+                    v-model="powerLimiterConfigList.battery_always_use_at_night"
+                    type="checkbox"
+                    wide
+                />
+
                 <InputElement
                     v-show="canUseOverscaling()"
                     :label="$t('powerlimiteradmin.UseOverscalingToCompensateShading')"
@@ -221,13 +229,6 @@
                 />
 
                 <div v-if="powerLimiterConfigList.solar_passthrough_enabled">
-                    <InputElement
-                        :label="$t('powerlimiteradmin.BatteryDischargeAtNight')"
-                        v-model="powerLimiterConfigList.battery_always_use_at_night"
-                        type="checkbox"
-                        wide
-                    />
-
                     <InputElement
                         :label="$t('powerlimiteradmin.SolarPassthroughLosses')"
                         v-model="powerLimiterConfigList.solar_passthrough_losses"
@@ -493,6 +494,10 @@ export default defineComponent({
             const cfg = this.powerLimiterConfigList;
             return cfg.is_inverter_solar_powered;
         },
+        canUseBatteryDischargeAtNight() {
+            const cfg = this.powerLimiterConfigList;
+            return !cfg.is_inverter_solar_powered;
+        },
         canUseSolarPassthrough() {
             const cfg = this.powerLimiterConfigList;
             const meta = this.powerLimiterMetaData;