Merge pull request #733 from helgeerbe/dpl-make-shutdown-partially-op…

…tional DPL: Explicit Support for solar-powered inverters
hoylabs · Mar 10, 2024 · 19859ed · 19859ed
2 parents c46980d + 80edbec
commit 19859ed
Show file tree

Hide file tree

Showing 11 changed files with 126 additions and 108 deletions.
diff --git a/include/Configuration.h b/include/Configuration.h
@@ -207,6 +207,7 @@ struct CONFIG_T {
         uint8_t BatteryDrainStategy;
         uint32_t Interval;
         bool IsInverterBehindPowerMeter;
+        bool IsInverterSolarPowered;
         uint8_t InverterId;
         uint8_t InverterChannelId;
         int32_t TargetPowerConsumption;

diff --git a/include/PowerLimiter.h b/include/PowerLimiter.h
@@ -40,8 +40,11 @@ class PowerLimiterClass {
         InverterPowerCmdPending,
         InverterDevInfoPending,
         InverterStatsPending,
+        CalculatedLimitBelowMinLimit,
         UnconditionalSolarPassthrough,
         NoVeDirect,
+        NoEnergy,
+        HuaweiPsu,
         Settling,
         Stable,
     };
@@ -91,10 +94,10 @@ class PowerLimiterClass {
     int32_t inverterPowerDcToAc(std::shared_ptr<InverterAbstract> inverter, int32_t dcPower);
     void unconditionalSolarPassthrough(std::shared_ptr<InverterAbstract> inverter);
     bool canUseDirectSolarPower();
-    int32_t calcPowerLimit(std::shared_ptr<InverterAbstract> inverter, bool solarPowerEnabled, bool batteryDischargeEnabled);
+    bool calcPowerLimit(std::shared_ptr<InverterAbstract> inverter, int32_t solarPower, bool batteryPower);
     bool updateInverter();
     bool setNewPowerLimit(std::shared_ptr<InverterAbstract> inverter, int32_t newPowerLimit);
-    int32_t getSolarChargePower();
+    int32_t getSolarPower();
     float getLoadCorrectedVoltage();
     bool testThreshold(float socThreshold, float voltThreshold,
             std::function<bool(float, float)> compare);

diff --git a/include/defaults.h b/include/defaults.h
@@ -122,6 +122,7 @@
 #define POWERLIMITER_BATTERY_DRAIN_STRATEGY 0
 #define POWERLIMITER_INTERVAL 10
 #define POWERLIMITER_IS_INVERTER_BEHIND_POWER_METER true
+#define POWERLIMITER_IS_INVERTER_SOLAR_POWERED false
 #define POWERLIMITER_INVERTER_ID 0
 #define POWERLIMITER_INVERTER_CHANNEL_ID 0
 #define POWERLIMITER_TARGET_POWER_CONSUMPTION 0

diff --git a/src/Configuration.cpp b/src/Configuration.cpp
@@ -185,6 +185,7 @@ bool ConfigurationClass::write()
     powerlimiter["battery_drain_strategy"] = config.PowerLimiter.BatteryDrainStategy;
     powerlimiter["interval"] = config.PowerLimiter.Interval;
     powerlimiter["is_inverter_behind_powermeter"] = config.PowerLimiter.IsInverterBehindPowerMeter;
+    powerlimiter["is_inverter_solar_powered"] = config.PowerLimiter.IsInverterSolarPowered;
     powerlimiter["inverter_id"] = config.PowerLimiter.InverterId;
     powerlimiter["inverter_channel_id"] = config.PowerLimiter.InverterChannelId;
     powerlimiter["target_power_consumption"] = config.PowerLimiter.TargetPowerConsumption;
@@ -431,6 +432,7 @@ bool ConfigurationClass::read()
     config.PowerLimiter.BatteryDrainStategy = powerlimiter["battery_drain_strategy"] | POWERLIMITER_BATTERY_DRAIN_STRATEGY;
     config.PowerLimiter.Interval =  powerlimiter["interval"] | POWERLIMITER_INTERVAL;
     config.PowerLimiter.IsInverterBehindPowerMeter = powerlimiter["is_inverter_behind_powermeter"] | POWERLIMITER_IS_INVERTER_BEHIND_POWER_METER;
+    config.PowerLimiter.IsInverterSolarPowered = powerlimiter["is_inverter_solar_powered"] | POWERLIMITER_IS_INVERTER_SOLAR_POWERED;
     config.PowerLimiter.InverterId = powerlimiter["inverter_id"] | POWERLIMITER_INVERTER_ID;
     config.PowerLimiter.InverterChannelId = powerlimiter["inverter_channel_id"] | POWERLIMITER_INVERTER_CHANNEL_ID;
     config.PowerLimiter.TargetPowerConsumption = powerlimiter["target_power_consumption"] | POWERLIMITER_TARGET_POWER_CONSUMPTION;

diff --git a/src/PowerLimiter.cpp b/src/PowerLimiter.cpp
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')" />