patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix(Power Limiter): hysteresis is not repected properly

Browse Source
This commit is contained in:
helgeerbe 2023-06-12 13:06:31 +02:00
parent 51a21de189
commit 0fd7b75e83
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/PowerLimiter.cpp
View File

@ -244,6 +244,7 @@ int32_t PowerLimiterClass::calcPowerLimit(std::shared_ptr<InverterAbstract> inve
{ {
CONFIG_T& config = Configuration.get(); CONFIG_T& config = Configuration.get();
int32_t acPower = 0;
int32_t newPowerLimit = round(PowerMeter.getPowerTotal()); int32_t newPowerLimit = round(PowerMeter.getPowerTotal());
if (!solarPowerEnabled && !batteryDischargeEnabled) { if (!solarPowerEnabled && !batteryDischargeEnabled) {
@ -256,8 +257,8 @@ int32_t PowerLimiterClass::calcPowerLimit(std::shared_ptr<InverterAbstract> inve
// the produced power of this inverter has also to be taken into account. // the produced power of this inverter has also to be taken into account.
// We don't use FLD_PAC from the statistics, because that // We don't use FLD_PAC from the statistics, because that
// data might be too old and unreliable. // data might be too old and unreliable.
float acPower = inverter->Statistics()->getChannelFieldValue(TYPE_AC, (ChannelNum_t) config.PowerLimiter_InverterChannelId, FLD_PAC); acPower = static_cast<int>(inverter->Statistics()->getChannelFieldValue(TYPE_AC, (ChannelNum_t) config.PowerLimiter_InverterChannelId, FLD_PAC));
newPowerLimit += static_cast<int>(acPower); newPowerLimit += acPower;
} }
// We're not trying to hit 0 exactly but take an offset into account // We're not trying to hit 0 exactly but take an offset into account
@ -268,8 +269,8 @@ int32_t PowerLimiterClass::calcPowerLimit(std::shared_ptr<InverterAbstract> inve
// Check if the new value is within the limits of the hysteresis and // Check if the new value is within the limits of the hysteresis and
// if we can discharge the battery // if we can discharge the battery
// If things did not change much we just use the old setting // If things did not change much we just use the old setting
if (newPowerLimit >= (-config.PowerLimiter_TargetPowerConsumptionHysteresis) && if ((newPowerLimit - acPower) >= (-config.PowerLimiter_TargetPowerConsumptionHysteresis) &&
newPowerLimit <= (+config.PowerLimiter_TargetPowerConsumptionHysteresis) && (newPowerLimit - acPower) <= (+config.PowerLimiter_TargetPowerConsumptionHysteresis) &&
batteryDischargeEnabled ) { batteryDischargeEnabled ) {
MessageOutput.println("[PowerLimiterClass::loop] reusing old limit"); MessageOutput.println("[PowerLimiterClass::loop] reusing old limit");
return _lastRequestedPowerLimit; return _lastRequestedPowerLimit;