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

victron charge power is integer

Browse Source
This commit is contained in:
helgeerbe 2023-03-01 10:23:37 +01:00
parent 26a8809121
commit 4a51ae5038
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/PowerLimiter.h
View File

@ -25,7 +25,7 @@ private:
float _powerMeter3Power; float _powerMeter3Power;
bool canUseDirectSolarPower(); bool canUseDirectSolarPower();
float getDirectSolarPower(); uint16_t getDirectSolarPower();
float getLoadCorrectedVoltage(std::shared_ptr<InverterAbstract> inverter); float getLoadCorrectedVoltage(std::shared_ptr<InverterAbstract> inverter);
bool isStartThresholdReached(std::shared_ptr<InverterAbstract> inverter); bool isStartThresholdReached(std::shared_ptr<InverterAbstract> inverter);
bool isStopThresholdReached(std::shared_ptr<InverterAbstract> inverter); bool isStopThresholdReached(std::shared_ptr<InverterAbstract> inverter);

8
src/PowerLimiter.cpp
View File

@ -90,9 +90,9 @@ void PowerLimiterClass::loop()
return; return;
} }
float victronChargePower = this->getDirectSolarPower(); uint16_t victronChargePower = this->getDirectSolarPower();
MessageOutput.printf("[PowerLimiterClass::loop] victronChargePower: %.2f\r\n", victronChargePower); MessageOutput.printf("[PowerLimiterClass::loop] victronChargePower: %d\r\n", victronChargePower);
if (millis() - _lastPowerMeterUpdate < (30 * 1000)) { if (millis() - _lastPowerMeterUpdate < (30 * 1000)) {
MessageOutput.printf("[PowerLimiterClass::loop] dcVoltage: %.2f config.PowerLimiter_VoltageStartThreshold: %.2f config.PowerLimiter_VoltageStopThreshold: %.2f inverter->isProducing(): %d\r\n", MessageOutput.printf("[PowerLimiterClass::loop] dcVoltage: %.2f config.PowerLimiter_VoltageStartThreshold: %.2f config.PowerLimiter_VoltageStopThreshold: %.2f inverter->isProducing(): %d\r\n",
@ -218,13 +218,13 @@ bool PowerLimiterClass::canUseDirectSolarPower()
return true; return true;
} }
float PowerLimiterClass::getDirectSolarPower() uint16_t PowerLimiterClass::getDirectSolarPower()
{ {
if (!this->canUseDirectSolarPower()) { if (!this->canUseDirectSolarPower()) {
return 0; return 0;
} }
return VeDirect.veFrame.PPV; return round(VeDirect.veFrame.PPV);
} }
float PowerLimiterClass::getLoadCorrectedVoltage(std::shared_ptr<InverterAbstract> inverter) float PowerLimiterClass::getLoadCorrectedVoltage(std::shared_ptr<InverterAbstract> inverter)