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

Merge branch 'development' of https://github.com/helgeerbe/OpenDTU into development

Browse Source
This commit is contained in:
helgeerbe 2023-08-06 17:02:53 +02:00
commit c950eb7245
2 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/PowerLimiter.h
View File

@ -88,7 +88,7 @@ private:
bool isStartThresholdReached(); bool isStartThresholdReached();
bool isStopThresholdReached(); bool isStopThresholdReached();
bool isBelowStopThreshold(); bool isBelowStopThreshold();
bool useFullSolarPassthrough(std::shared_ptr<InverterAbstract> inverter); bool useFullSolarPassthrough();
}; };
extern PowerLimiterClass PowerLimiter; extern PowerLimiterClass PowerLimiter;

35
src/PowerLimiter.cpp
View File

@ -462,7 +462,7 @@ int32_t PowerLimiterClass::calcPowerLimit(std::shared_ptr<InverterAbstract> inve
int32_t adjustedVictronChargePower = inverterPowerDcToAc(inverter, getSolarChargePower()); int32_t adjustedVictronChargePower = inverterPowerDcToAc(inverter, getSolarChargePower());
// Battery can be discharged and we should output max (Victron solar power || power meter value) // Battery can be discharged and we should output max (Victron solar power || power meter value)
if(batteryDischargeEnabled && useFullSolarPassthrough(inverter)) { if(batteryDischargeEnabled && useFullSolarPassthrough()) {
// Case 5 // Case 5
newPowerLimit = newPowerLimit > adjustedVictronChargePower ? newPowerLimit : adjustedVictronChargePower; newPowerLimit = newPowerLimit > adjustedVictronChargePower ? newPowerLimit : adjustedVictronChargePower;
} else { } else {
@ -689,7 +689,7 @@ void PowerLimiterClass::calcNextInverterRestart()
MessageOutput.printf("[DPL::calcNextInverterRestart] _nextInverterRestart @ %d millis\r\n", _nextInverterRestart); MessageOutput.printf("[DPL::calcNextInverterRestart] _nextInverterRestart @ %d millis\r\n", _nextInverterRestart);
} }
bool PowerLimiterClass::useFullSolarPassthrough(std::shared_ptr<InverterAbstract> inverter) bool PowerLimiterClass::useFullSolarPassthrough()
{ {
CONFIG_T& config = Configuration.get(); CONFIG_T& config = Configuration.get();
@ -698,34 +698,15 @@ bool PowerLimiterClass::useFullSolarPassthrough(std::shared_ptr<InverterAbstract
return false; return false;
} }
// Check if the Battery interface is enabled and the SOC stop threshold is reached if (testThreshold(config.PowerLimiter_FullSolarPassThroughSoc,
if (config.Battery_Enabled config.PowerLimiter_FullSolarPassThroughStartVoltage,
&& config.PowerLimiter_FullSolarPassThroughSoc > 0.0 [](float a, float b) -> bool { return a >= b; })) {
&& (millis() - Battery.stateOfChargeLastUpdate) < 60000) {
return Battery.stateOfCharge >= config.PowerLimiter_FullSolarPassThroughSoc;
}
// Otherwise we use the voltage threshold
if (config.PowerLimiter_FullSolarPassThroughStartVoltage <= 0.0 || config.PowerLimiter_FullSolarPassThroughStopVoltage <= 0.0) {
return false;
}
float dcVoltage = inverter->Statistics()->getChannelFieldValue(TYPE_DC, (ChannelNum_t) config.PowerLimiter_InverterChannelId, FLD_UDC);
if (_verboseLogging) {
MessageOutput.printf("[DPL::loop] useFullSolarPassthrough: FullSolarPT Start %.2f V, FullSolarPT Stop: %.2f V, dcVoltage: %.2f V\r\n",
config.PowerLimiter_FullSolarPassThroughStartVoltage, config.PowerLimiter_FullSolarPassThroughStopVoltage, dcVoltage);
}
if (dcVoltage <= 0.0) {
return false;
}
if (dcVoltage >= config.PowerLimiter_FullSolarPassThroughStartVoltage) {
_fullSolarPassThroughEnabled = true; _fullSolarPassThroughEnabled = true;
} }
if (dcVoltage <= config.PowerLimiter_FullSolarPassThroughStopVoltage) { if (testThreshold(config.PowerLimiter_FullSolarPassThroughSoc,
config.PowerLimiter_FullSolarPassThroughStopVoltage,
[](float a, float b) -> bool { return a < b; })) {
_fullSolarPassThroughEnabled = false; _fullSolarPassThroughEnabled = false;
} }