Mirrors/OpenDTU
2
0
Fork 0
mirror of https://github.com/tbnobody/OpenDTU.git synced 2026-01-05 20:33:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hoymiles Lib: Rename ChannelMaxPower to StringMaxPower

Browse Source
This commit is contained in:
Thomas Basler
2023-02-06 19:56:12 +01:00
parent d4c838a16e
commit ceaf08c1a0
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Hoymiles/src/parser/StatisticsParser.cpp
View File

@@ -147,15 +147,15 @@ std::list<ChannelNum_t> StatisticsParser::getChannelsByType(ChannelType_t type)
return l;
}
uint16_t StatisticsParser::getChannelMaxPower(uint8_t channel)
uint16_t StatisticsParser::getStringMaxPower(uint8_t channel)
{
return _chanMaxPower[channel];
return _stringMaxPower[channel];
}
void StatisticsParser::setChannelMaxPower(uint8_t channel, uint16_t power)
void StatisticsParser::setStringMaxPower(uint8_t channel, uint16_t power)
{
if (channel < sizeof(_chanMaxPower) / sizeof(_chanMaxPower[0])) {
_chanMaxPower[channel] = power;
if (channel < sizeof(_stringMaxPower) / sizeof(_stringMaxPower[0])) {
_stringMaxPower[channel] = power;
}
}
@@ -230,8 +230,8 @@ static float calcEffiencyCh0(StatisticsParser* iv, uint8_t arg0)
static float calcIrradiation(StatisticsParser* iv, uint8_t arg0)
{
if (NULL != iv) {
if (iv->getChannelMaxPower(arg0) > 0)
return iv->getChannelFieldValue(TYPE_DC, static_cast<ChannelNum_t>(arg0), FLD_PDC) / iv->getChannelMaxPower(arg0) * 100.0f;
if (iv->getStringMaxPower(arg0) > 0)
return iv->getChannelFieldValue(TYPE_DC, static_cast<ChannelNum_t>(arg0), FLD_PDC) / iv->getStringMaxPower(arg0) * 100.0f;
}
return 0.0;
}

6
lib/Hoymiles/src/parser/StatisticsParser.h
View File

@@ -100,8 +100,8 @@ public:
const char* getChannelTypeName(ChannelType_t type);
std::list<ChannelNum_t> getChannelsByType(ChannelType_t type);
uint16_t getChannelMaxPower(uint8_t channel);
void setChannelMaxPower(uint8_t channel, uint16_t power);
uint16_t getStringMaxPower(uint8_t channel);
void setStringMaxPower(uint8_t channel, uint16_t power);
void resetRxFailureCount();
void incrementRxFailureCount();
@@ -110,7 +110,7 @@ public:
private:
uint8_t _payloadStatistic[STATISTIC_PACKET_SIZE] = {};
uint8_t _statisticLength = 0;
uint16_t _chanMaxPower[CH4];
uint16_t _stringMaxPower[CH4];
const std::list<byteAssign_t>* _byteAssignment;