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

Return correct formatted HwVersion

Browse Source
This commit is contained in:
Thomas Basler 2022-10-03 13:58:50 +02:00
parent 6cbcfacac6
commit 66453b0854
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Hoymiles/src/parser/DevInfoParser.cpp
View File

@ -90,9 +90,11 @@ uint32_t DevInfoParser::getHwPartNumber()
return ((uint32_t)hwpn_h << 16) | ((uint32_t)hwpn_l); return ((uint32_t)hwpn_h << 16) | ((uint32_t)hwpn_l);
} }
uint16_t DevInfoParser::getHwVersion() String DevInfoParser::getHwVersion()
{ {
return (((uint16_t)_payloadDevInfoSimple[6]) << 8) | _payloadDevInfoSimple[7]; char buf[6];
snprintf(buf, sizeof(buf), "%02X.%02X", _payloadDevInfoSimple[6], _payloadDevInfoSimple[7]);
return String(buf);
} }
/* struct tm to seconds since Unix epoch */ /* struct tm to seconds since Unix epoch */

2
lib/Hoymiles/src/parser/DevInfoParser.h
View File

@ -23,7 +23,7 @@ public:
uint16_t getFwBootloaderVersion(); uint16_t getFwBootloaderVersion();
uint32_t getHwPartNumber(); uint32_t getHwPartNumber();
uint16_t getHwVersion(); String getHwVersion();
private: private:
time_t timegm(struct tm* tm); time_t timegm(struct tm* tm);

2
src/MqttPublishing.cpp
View File

@ -59,7 +59,7 @@ void MqttPublishingClass::loop()
MqttSettings.publish(subtopic + "/device/hwpartnumber", String(inv->DevInfo()->getHwPartNumber())); MqttSettings.publish(subtopic + "/device/hwpartnumber", String(inv->DevInfo()->getHwPartNumber()));
// Hardware version // Hardware version
MqttSettings.publish(subtopic + "/device/hwversion", String(inv->DevInfo()->getHwVersion())); MqttSettings.publish(subtopic + "/device/hwversion", inv->DevInfo()->getHwVersion());
} }
if (inv->SystemConfigPara()->getLastUpdate() > 0) { if (inv->SystemConfigPara()->getLastUpdate() > 0) {