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

Check 4th byte on DevInfoSimple to get max_power

Browse Source 
This is required to detect models with fixed power limits
This commit is contained in:
Thomas Basler 2022-10-18 21:23:58 +02:00
parent cc7df7c302
commit 1dd6e9c453
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,21 +1,24 @@
#include "DevInfoParser.h" #include "DevInfoParser.h"
#include <cstring> #include <cstring>
#define ALL 0xff
typedef struct { typedef struct {
uint8_t hwPart[3]; uint8_t hwPart[4];
uint16_t maxPower; uint16_t maxPower;
const char* modelName; const char* modelName;
} devInfo_t; } devInfo_t;
const devInfo_t devInfo[] = { const devInfo_t devInfo[] = {
{ { 0x10, 0x10, 0x10 }, 300, "HM-300" }, { { 0x10, 0x10, 0x10, ALL }, 300, "HM-300" },
{ { 0x10, 0x10, 0x20 }, 350, "HM-350" }, { { 0x10, 0x10, 0x20, ALL }, 350, "HM-350" },
{ { 0x10, 0x10, 0x40 }, 400, "HM-400" }, { { 0x10, 0x10, 0x40, ALL }, 400, "HM-400" },
{ { 0x10, 0x11, 0x10 }, 600, "HM-600" }, { { 0x10, 0x11, 0x10, ALL }, 600, "HM-600" },
{ { 0x10, 0x11, 0x20 }, 700, "HM-700" }, { { 0x10, 0x11, 0x20, ALL }, 700, "HM-700" },
{ { 0x10, 0x11, 0x40 }, 800, "HM-800" }, { { 0x10, 0x11, 0x40, ALL }, 800, "HM-800" },
{ { 0x10, 0x12, 0x10 }, 1200, "HM-1200" }, { { 0x10, 0x12, 0x10, ALL }, 1200, "HM-1200" },
{ { 0x10, 0x12, 0x30 }, 1500, "HM-1500" } { { 0x10, 0x12, 0x30, ALL }, 1500, "HM-1500" },
{ { 0x10, 0x10, 0x10, 0x15 }, static_cast<uint16_t>(300 * 0.7), "HM-300" }, // HM-300 limitted to 70%
}; };
void DevInfoParser::clearBufferAll() void DevInfoParser::clearBufferAll()
@ -135,6 +138,17 @@ String DevInfoParser::getHwModelName()
uint8_t DevInfoParser::getDevIdx() uint8_t DevInfoParser::getDevIdx()
{ {
uint8_t pos; uint8_t pos;
// Check for all 4 bytes first
for (pos = 0; pos < sizeof(devInfo) / sizeof(devInfo_t); pos++) {
if (devInfo[pos].hwPart[0] == _payloadDevInfoSimple[2]
&& devInfo[pos].hwPart[1] == _payloadDevInfoSimple[3]
&& devInfo[pos].hwPart[2] == _payloadDevInfoSimple[4]
&& devInfo[pos].hwPart[3] == _payloadDevInfoSimple[5]) {
return pos;
}
}
// Then only for 3 bytes
for (pos = 0; pos < sizeof(devInfo) / sizeof(devInfo_t); pos++) { for (pos = 0; pos < sizeof(devInfo) / sizeof(devInfo_t); pos++) {
if (devInfo[pos].hwPart[0] == _payloadDevInfoSimple[2] if (devInfo[pos].hwPart[0] == _payloadDevInfoSimple[2]
&& devInfo[pos].hwPart[1] == _payloadDevInfoSimple[3] && devInfo[pos].hwPart[1] == _payloadDevInfoSimple[3]