WIP

schlimmchen · Nov 3, 2024 · fbd7d1f · fbd7d1f
1 parent 9fe6a30
commit fbd7d1f
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 274 deletions.
diff --git a/include/Configuration.h b/include/Configuration.h
@@ -130,6 +130,7 @@ using PowerMeterHttpSmlConfig = struct POWERMETER_HTTP_SML_CONFIG_T;
 
 struct POWERLIMITER_INVERTER_CONFIG_T {
     uint64_t Serial;
+    bool IsGoverned;
     bool IsBehindPowerMeter;
     bool IsSolarPowered;
     bool UseOverscalingToCompensateShading;

diff --git a/src/Configuration.cpp b/src/Configuration.cpp
@@ -147,6 +147,7 @@ void ConfigurationClass::serializePowerLimiterConfig(PowerLimiterConfig const& s
         JsonObject t = inverters.add<JsonObject>();
 
         t["serial"] = serialStr(s.Serial);
+        t["is_governed"] = s.IsGoverned;
         t["is_behind_power_meter"] = s.IsBehindPowerMeter;
         t["is_solar_powered"] = s.IsSolarPowered;
         t["use_overscaling_to_compensate_shading"] = s.UseOverscalingToCompensateShading;
@@ -461,6 +462,7 @@ void ConfigurationClass::deserializePowerLimiterConfig(JsonObject const& source,
         JsonObject s = inverters[i];
 
         inv.Serial = serialBin(s["serial"] | String("0")); // 0 marks inverter slot as unused
+        inv.IsGoverned = s["is_governed"] | false;
         inv.IsBehindPowerMeter = s["is_behind_power_meter"] | POWERLIMITER_IS_INVERTER_BEHIND_POWER_METER;
         inv.IsSolarPowered = s["is_solar_powered"] | POWERLIMITER_IS_INVERTER_SOLAR_POWERED;
         inv.UseOverscalingToCompensateShading = s["use_overscaling_to_compensate_shading"] | POWERLIMITER_USE_OVERSCALING_TO_COMPENSATE_SHADING;

diff --git a/webapp/src/locales/de.json b/webapp/src/locales/de.json
@@ -659,7 +659,7 @@
         "ConfigHintNoBatteryInterface": "SoC-basierte Schwellwerte können nur mit konfigurierter Batteriekommunikationsschnittstelle genutzt werden.",
         "General": "Allgemein",
         "Enable": "Aktiviert",
-        "GovernInverter": "Steuere {name}",
+        "GovernInverter": "Steuere Wechselrichter \"{name}\"",
         "VerboseLogging": "@:base.VerboseLogging",
         "SolarPassthrough": "Solar-Passthrough",
         "EnableSolarPassthrough": "Aktiviere Solar-Passthrough",

diff --git a/webapp/src/locales/en.json b/webapp/src/locales/en.json
@@ -661,7 +661,7 @@
         "ConfigHintNoBatteryInterface": "SoC-based thresholds can only be used if a battery communication interface is configured.",
         "General": "General",
         "Enable": "Enable",
-        "GovernInverter": "Govern {name}",
+        "GovernInverter": "Govern Inverter \"{name}\"",
         "VerboseLogging": "@:base.VerboseLogging",
         "SolarPassthrough": "Solar-Passthrough",
         "EnableSolarPassthrough": "Enable Solar-Passthrough",

diff --git a/webapp/src/locales/fr.json b/webapp/src/locales/fr.json
@@ -721,7 +721,7 @@
         "ConfigHintNoBatteryInterface": "SoC-based thresholds can only be used if a battery communication interface is configured.",
         "General": "General",
         "Enable": "Enable",
-        "GovernInverter": "Govern {name}",
+        "GovernInverter": "Govern Inverter \"{name}\"",
         "VerboseLogging": "@:base.VerboseLogging",
         "SolarPassthrough": "Solar-Passthrough",
         "EnableSolarPassthrough": "Enable Solar-Passthrough",

diff --git a/webapp/src/types/PowerLimiterConfig.ts b/webapp/src/types/PowerLimiterConfig.ts
@@ -21,6 +21,7 @@ export interface PowerLimiterMetaData {
 
 export interface PowerLimiterInverterConfig {
     serial: string;
+    is_governed: boolean;
     is_behind_power_meter: boolean;
     is_solar_powered: boolean;
     use_overscaling_to_compensate_shading: boolean;