DPL: make "IsInverterSolarPowered" configurable through web app

helgeerbe · Mar 9, 2024 · c6f8180 · c6f8180
1 parent b11b1db
commit c6f8180
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 0 deletions.
diff --git a/src/WebApi_powerlimiter.cpp b/src/WebApi_powerlimiter.cpp
@@ -39,6 +39,7 @@ void WebApiPowerLimiterClass::onStatus(AsyncWebServerRequest* request)
     root["solar_passthrough_losses"] = config.PowerLimiter.SolarPassThroughLosses;
     root["battery_drain_strategy"] = config.PowerLimiter.BatteryDrainStategy;
     root["is_inverter_behind_powermeter"] = config.PowerLimiter.IsInverterBehindPowerMeter;
+    root["is_inverter_solar_powered"] = config.PowerLimiter.IsInverterSolarPowered;
     root["inverter_id"] = config.PowerLimiter.InverterId;
     root["inverter_channel_id"] = config.PowerLimiter.InverterChannelId;
     root["target_power_consumption"] = config.PowerLimiter.TargetPowerConsumption;
@@ -128,6 +129,7 @@ void WebApiPowerLimiterClass::onAdminPost(AsyncWebServerRequest* request)
     config.PowerLimiter.SolarPassThroughLosses = root["solar_passthrough_losses"].as<uint8_t>();
     config.PowerLimiter.BatteryDrainStategy= root["battery_drain_strategy"].as<uint8_t>();
     config.PowerLimiter.IsInverterBehindPowerMeter = root["is_inverter_behind_powermeter"].as<bool>();
+    config.PowerLimiter.IsInverterSolarPowered = root["is_inverter_solar_powered"].as<bool>();
     config.PowerLimiter.InverterId = root["inverter_id"].as<uint8_t>();
     config.PowerLimiter.InverterChannelId = root["inverter_channel_id"].as<uint8_t>();
     config.PowerLimiter.TargetPowerConsumption = root["target_power_consumption"].as<int32_t>();

diff --git a/webapp/src/locales/de.json b/webapp/src/locales/de.json
@@ -610,6 +610,7 @@
         "VoltageLoadCorrectionFactor": "DC Spannung - Lastkorrekturfaktor",
         "BatterySocInfo": "<b>Hinweis:</b> Die Akku SoC (State of Charge) Werte werden nur benutzt, wenn die Batterie-Kommunikationsschnittstelle innerhalb der letzten Minute gültige Werte geschickt hat. Andernfalls werden als Fallback-Option die Spannungseinstellungen verwendet.",
         "InverterIsBehindPowerMeter": "Welchselrichter ist hinter Leistungsmesser",
+        "InverterIsSolarPowered": "Wechselrichter wird von Solarmodulen gespeist",
         "Battery": "DC / Akku",
         "VoltageLoadCorrectionInfo": "<b>Hinweis:</b> Wenn Leistung von der Batterie abgegeben wird, bricht normalerweise die Spannung etwas ein. Damit nicht vorzeitig der Wechelrichter ausgeschaltet wird sobald der \"Stop\"-Schwellenwert erreicht wird, wird der hier angegebene Korrekturfaktor mit einberechnet. Korrigierte Spannung = DC Spannung + (Aktuelle Leistung (W) * Korrekturfaktor).",
         "InverterRestart": "Wechselrichter Neustart",

diff --git a/webapp/src/locales/en.json b/webapp/src/locales/en.json
@@ -616,6 +616,7 @@
         "VoltageLoadCorrectionFactor": "DC Voltage - Load correction factor",
         "BatterySocInfo": "<b>Hint:</b> The battery SoC (State of Charge) values are only used if the battery communication interface reported SoC updates in the last minute. Otherwise the voltage thresholds will be used as fallback.",
         "InverterIsBehindPowerMeter": "Inverter is behind Power meter",
+        "InverterIsSolarPowered": "Inverter is powered by solar modules",
         "Battery": "DC / Battery",
         "VoltageLoadCorrectionInfo": "<b>Hint:</b> When the power output is higher, the voltage is usually decreasing. In order to not stop the inverter too early (Stop treshold), a power factor can be specified here to correct this. Corrected voltage = DC Voltage + (Current power * correction factor).",
         "InverterRestart": "Inverter Restart",

diff --git a/webapp/src/locales/fr.json b/webapp/src/locales/fr.json
@@ -699,6 +699,7 @@
       "VoltageLoadCorrectionFactor": "DC Voltage - Load correction factor",
       "BatterySocInfo": "<b>Hint:</b> The battery SoC (State of Charge) values are only used if the battery communication interface reported SoC updates in the last minute. Otherwise the voltage thresholds will be used as fallback.",
       "InverterIsBehindPowerMeter": "Inverter is behind Power meter",
+      "InverterIsSolarPowered": "Inverter is powered by solar modules",
       "Battery": "DC / Battery",
       "VoltageLoadCorrectionInfo": "<b>Hint:</b> When the power output is higher, the voltage is usually decreasing. In order to not stop the inverter too early (Stop treshold), a power factor can be specified here to correct this. Corrected voltage = DC Voltage + (Current power * correction factor)."
     },

diff --git a/webapp/src/types/PowerLimiterConfig.ts b/webapp/src/types/PowerLimiterConfig.ts
@@ -5,6 +5,7 @@ export interface PowerLimiterConfig {
     solar_passthrough_losses: number;
     battery_drain_strategy: number;
     is_inverter_behind_powermeter: boolean;
+    is_inverter_solar_powered: boolean;
     inverter_id: number;
     inverter_channel_id: number;
     target_power_consumption: number;

diff --git a/webapp/src/views/PowerLimiterAdminView.vue b/webapp/src/views/PowerLimiterAdminView.vue
@@ -77,6 +77,11 @@
                     </div>
                 </div>
 
+                <InputElement v-show="powerLimiterConfigList.enabled"
+                    :label="$t('powerlimiteradmin.InverterIsSolarPowered')"
+                    v-model="powerLimiterConfigList.is_inverter_solar_powered"
+                    type="checkbox" wide/>
+
                 <div class="row mb-3" v-show="powerLimiterConfigList.enabled">
                     <label for="targetPowerConsumption" class="col-sm-2 col-form-label">{{ $t('powerlimiteradmin.TargetPowerConsumption') }}:
                         <BIconInfoCircle v-tooltip :title="$t('powerlimiteradmin.TargetPowerConsumptionHint')" />