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

Renamed functions

Browse Source 
getValue --> getChannelFieldValue
hasValue --> hasChannelFieldValue
getUnit --> getChannelFieldUnit
getName --> getChannelFieldName
This commit is contained in:
Thomas Basler 2022-06-24 17:53:37 +02:00
parent db0a3da803
commit 2de865037c
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Hoymiles/src/inverters/InverterAbstract.cpp
View File

@ -160,7 +160,7 @@ uint8_t InverterAbstract::getAssignIdxByChannelField(uint8_t channel, uint8_t fi
return 0xff; return 0xff;
} }
float InverterAbstract::getValue(uint8_t channel, uint8_t fieldId) float InverterAbstract::getChannelFieldValue(uint8_t channel, uint8_t fieldId)
{ {
uint8_t pos = getAssignIdxByChannelField(channel, fieldId); uint8_t pos = getAssignIdxByChannelField(channel, fieldId);
if (pos == 0xff) { if (pos == 0xff) {
@ -190,13 +190,13 @@ float InverterAbstract::getValue(uint8_t channel, uint8_t fieldId)
return 0; return 0;
} }
bool InverterAbstract::hasValue(uint8_t channel, uint8_t fieldId) bool InverterAbstract::hasChannelFieldValue(uint8_t channel, uint8_t fieldId)
{ {
uint8_t pos = getAssignIdxByChannelField(channel, fieldId); uint8_t pos = getAssignIdxByChannelField(channel, fieldId);
return pos != 0xff; return pos != 0xff;
} }
const char* InverterAbstract::getUnit(uint8_t channel, uint8_t fieldId) const char* InverterAbstract::getChannelFieldUnit(uint8_t channel, uint8_t fieldId)
{ {
uint8_t pos = getAssignIdxByChannelField(channel, fieldId); uint8_t pos = getAssignIdxByChannelField(channel, fieldId);
const byteAssign_t* b = getByteAssignment(); const byteAssign_t* b = getByteAssignment();
@ -204,7 +204,7 @@ const char* InverterAbstract::getUnit(uint8_t channel, uint8_t fieldId)
return units[b[pos].unitId]; return units[b[pos].unitId];
} }
const char* InverterAbstract::getName(uint8_t channel, uint8_t fieldId) const char* InverterAbstract::getChannelFieldName(uint8_t channel, uint8_t fieldId)
{ {
uint8_t pos = getAssignIdxByChannelField(channel, fieldId); uint8_t pos = getAssignIdxByChannelField(channel, fieldId);
const byteAssign_t* b = getByteAssignment(); const byteAssign_t* b = getByteAssignment();
@ -216,7 +216,7 @@ static float calcYieldTotalCh0(InverterAbstract* iv, uint8_t arg0)
{ {
float yield = 0; float yield = 0;
for (uint8_t i = 1; i <= iv->getChannelCount(); i++) { for (uint8_t i = 1; i <= iv->getChannelCount(); i++) {
yield += iv->getValue(i, FLD_YT); yield += iv->getChannelFieldValue(i, FLD_YT);
} }
return yield; return yield;
} }
@ -225,7 +225,7 @@ static float calcYieldDayCh0(InverterAbstract* iv, uint8_t arg0)
{ {
float yield = 0; float yield = 0;
for (uint8_t i = 1; i <= iv->getChannelCount(); i++) { for (uint8_t i = 1; i <= iv->getChannelCount(); i++) {
yield += iv->getValue(i, FLD_YD); yield += iv->getChannelFieldValue(i, FLD_YD);
} }
return yield; return yield;
} }
@ -233,14 +233,14 @@ static float calcYieldDayCh0(InverterAbstract* iv, uint8_t arg0)
// arg0 = channel of source // arg0 = channel of source
static float calcUdcCh(InverterAbstract* iv, uint8_t arg0) static float calcUdcCh(InverterAbstract* iv, uint8_t arg0)
{ {
return iv->getValue(arg0, FLD_UDC); return iv->getChannelFieldValue(arg0, FLD_UDC);
} }
static float calcPowerDcCh0(InverterAbstract* iv, uint8_t arg0) static float calcPowerDcCh0(InverterAbstract* iv, uint8_t arg0)
{ {
float dcPower = 0; float dcPower = 0;
for (uint8_t i = 1; i <= iv->getChannelCount(); i++) { for (uint8_t i = 1; i <= iv->getChannelCount(); i++) {
dcPower += iv->getValue(i, FLD_PDC); dcPower += iv->getChannelFieldValue(i, FLD_PDC);
} }
return dcPower; return dcPower;
} }
@ -248,10 +248,10 @@ static float calcPowerDcCh0(InverterAbstract* iv, uint8_t arg0)
// arg0 = channel // arg0 = channel
static float calcEffiencyCh0(InverterAbstract* iv, uint8_t arg0) static float calcEffiencyCh0(InverterAbstract* iv, uint8_t arg0)
{ {
float acPower = iv->getValue(CH0, FLD_PAC); float acPower = iv->getChannelFieldValue(CH0, FLD_PAC);
float dcPower = 0; float dcPower = 0;
for (uint8_t i = 1; i <= iv->getChannelCount(); i++) { for (uint8_t i = 1; i <= iv->getChannelCount(); i++) {
dcPower += iv->getValue(i, FLD_PDC); dcPower += iv->getChannelFieldValue(i, FLD_PDC);
} }
if (dcPower > 0) { if (dcPower > 0) {
return acPower / dcPower * 100.0f; return acPower / dcPower * 100.0f;
@ -265,7 +265,7 @@ static float calcIrradiation(InverterAbstract* iv, uint8_t arg0)
{ {
if (NULL != iv) { if (NULL != iv) {
if (iv->getChannelMaxPower(arg0) > 0) if (iv->getChannelMaxPower(arg0) > 0)
return iv->getValue(arg0, FLD_PDC) / iv->getChannelMaxPower(arg0) * 100.0f; return iv->getChannelFieldValue(arg0, FLD_PDC) / iv->getChannelMaxPower(arg0) * 100.0f;
} }
return 0.0; return 0.0;
} }

8
lib/Hoymiles/src/inverters/InverterAbstract.h
View File

@ -106,10 +106,10 @@ public:
uint8_t verifyAllFragments(); uint8_t verifyAllFragments();
uint8_t getAssignIdxByChannelField(uint8_t channel, uint8_t fieldId); uint8_t getAssignIdxByChannelField(uint8_t channel, uint8_t fieldId);
float getValue(uint8_t channel, uint8_t fieldId); float getChannelFieldValue(uint8_t channel, uint8_t fieldId);
bool hasValue(uint8_t channel, uint8_t fieldId); bool hasChannelFieldValue(uint8_t channel, uint8_t fieldId);
const char* getUnit(uint8_t channel, uint8_t fieldId); const char* getChannelFieldUnit(uint8_t channel, uint8_t fieldId);
const char* getName(uint8_t channel, uint8_t fieldId); const char* getChannelFieldName(uint8_t channel, uint8_t fieldId);
virtual bool getStatsRequest(inverter_transaction_t* payload) = 0; virtual bool getStatsRequest(inverter_transaction_t* payload) = 0;
uint32_t getLastStatsUpdate(); uint32_t getLastStatsUpdate();

4
src/MqttPublishing.cpp
View File

@ -62,7 +62,7 @@ void MqttPublishingClass::loop()
void MqttPublishingClass::publishField(String subtopic, std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId) void MqttPublishingClass::publishField(String subtopic, std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId)
{ {
if (inv->hasValue(channel, fieldId)) { if (inv->hasChannelFieldValue(channel, fieldId)) {
MqttSettings.publish(subtopic + "/" + String(channel) + "/" + inv->getName(channel, fieldId), String(inv->getValue(channel, fieldId))); MqttSettings.publish(subtopic + "/" + String(channel) + "/" + inv->getChannelFieldName(channel, fieldId), String(inv->getChannelFieldValue(channel, fieldId)));
} }
} }

6
src/WebApi_ws_live.cpp
View File

@ -81,8 +81,8 @@ void WebApiWsLiveClass::loop()
void WebApiWsLiveClass::addField(JsonDocument& root, uint8_t idx, std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId) void WebApiWsLiveClass::addField(JsonDocument& root, uint8_t idx, std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId)
{ {
if (inv->hasValue(channel, fieldId)) { if (inv->hasChannelFieldValue(channel, fieldId)) {
root[idx][String(channel)][inv->getName(channel, fieldId)]["v"] = inv->getValue(channel, fieldId); root[idx][String(channel)][inv->getChannelFieldName(channel, fieldId)]["v"] = inv->getChannelFieldValue(channel, fieldId);
root[idx][String(channel)][inv->getName(channel, fieldId)]["u"] = inv->getUnit(channel, fieldId); root[idx][String(channel)][inv->getChannelFieldName(channel, fieldId)]["u"] = inv->getChannelFieldUnit(channel, fieldId);
} }
} }