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

fixing a bug from merging and remove a leftover debug message

Browse Source
This commit is contained in:
MalteSchm 2023-04-13 10:06:06 +02:00
parent be7a43fbfb
commit 690025e5fd
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/PowerLimiter.cpp
View File

@ -24,7 +24,7 @@ void PowerLimiterClass::loop()
CONFIG_T& config = Configuration.get(); CONFIG_T& config = Configuration.get();
// Run inital checks to make sure we have met the basic conditions // Run inital checks to make sure we have met the basic conditions
if ( !config.PowerMeter_Enabled if (!config.PowerMeter_Enabled
|| !Hoymiles.getRadio()->isIdle() || !Hoymiles.getRadio()->isIdle()
|| (millis() - _lastLoop) < (config.PowerLimiter_Interval * 1000)) { || (millis() - _lastLoop) < (config.PowerLimiter_Interval * 1000)) {
return; return;
@ -95,8 +95,6 @@ void PowerLimiterClass::loop()
// Calculate and set Power Limit // Calculate and set Power Limit
int32_t newPowerLimit = calcPowerLimit(inverter, !_batteryDischargeEnabled); int32_t newPowerLimit = calcPowerLimit(inverter, !_batteryDischargeEnabled);
setNewPowerLimit(inverter, newPowerLimit); setNewPowerLimit(inverter, newPowerLimit);
// Debug, TODO: Remove
MessageOutput.printf("****************************** Powerlimit: %i\r\n", newPowerLimit);
} }
plStates PowerLimiterClass::getPowerLimiterState() { plStates PowerLimiterClass::getPowerLimiterState() {
@ -175,16 +173,9 @@ int32_t PowerLimiterClass::calcPowerLimit(std::shared_ptr<InverterAbstract> inve
MessageOutput.printf("[PowerLimiterClass::loop] victronChargePower: %d, efficiency: %.2f, consumeSolarPowerOnly: %s, powerConsumption: %d \r\n", MessageOutput.printf("[PowerLimiterClass::loop] victronChargePower: %d, efficiency: %.2f, consumeSolarPowerOnly: %s, powerConsumption: %d \r\n",
victronChargePower, efficency, consumeSolarPowerOnly ? "true" : "false", newPowerLimit); victronChargePower, efficency, consumeSolarPowerOnly ? "true" : "false", newPowerLimit);
// Safety check: Are the power meter values not too old? // We're not trying to hit 0 exactly but take an offset into account
// Are the reported inverter data not too old? // This means we never fully compensate the used power with the inverter
if (millis() - PowerMeter.getLastPowerMeterUpdate() < (30 * 1000) newPowerLimit -= config.PowerLimiter_TargetPowerConsumption;
&& millis() - inverter->Statistics()->getLastUpdate() < (15 * 1000)) {
if (config.PowerLimiter_IsInverterBehindPowerMeter) {
// If the inverter the behind the power meter (part of measurement),
// the produced power of this inverter has also to be taken into account.
float acPower = inverter->Statistics()->getChannelFieldValue(TYPE_AC, (ChannelNum_t) config.PowerLimiter_InverterChannelId, FLD_PAC);
newPowerLimit += static_cast<int>(acPower);
}
int32_t upperPowerLimit = config.PowerLimiter_UpperPowerLimit; int32_t upperPowerLimit = config.PowerLimiter_UpperPowerLimit;
if (consumeSolarPowerOnly && (upperPowerLimit > adjustedVictronChargePower)) { if (consumeSolarPowerOnly && (upperPowerLimit > adjustedVictronChargePower)) {