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

Fixed issue of wrong detected byteAssignment length

Browse Source
This commit is contained in:
Thomas Basler 2022-06-15 20:03:23 +02:00
parent 9bfe6a9e63
commit 0d7cef5f60
8 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Hoymiles/src/inverters/HM_1CH.cpp
View File

@ -14,3 +14,8 @@ const byteAssign_t* HM_1CH::getByteAssignment()
{
return byteAssignment;
}
const uint8_t HM_1CH::getAssignmentCount()
{
return sizeof(byteAssignment) / sizeof(byteAssign_t);
}

1
lib/Hoymiles/src/inverters/HM_1CH.h
View File

@ -7,6 +7,7 @@ public:
static bool isValidSerial(uint64_t serial);
String typeName();
const byteAssign_t* getByteAssignment();
const uint8_t getAssignmentCount();
private:
const byteAssign_t byteAssignment[13] = {

5
lib/Hoymiles/src/inverters/HM_2CH.cpp
View File

@ -14,3 +14,8 @@ const byteAssign_t* HM_2CH::getByteAssignment()
{
return byteAssignment;
}
const uint8_t HM_2CH::getAssignmentCount()
{
return sizeof(byteAssignment) / sizeof(byteAssign_t);
}

1
lib/Hoymiles/src/inverters/HM_2CH.h
View File

@ -7,6 +7,7 @@ public:
static bool isValidSerial(uint64_t serial);
String typeName();
const byteAssign_t* getByteAssignment();
const uint8_t getAssignmentCount();
private:
const byteAssign_t byteAssignment[21] = {

5
lib/Hoymiles/src/inverters/HM_4CH.cpp
View File

@ -14,3 +14,8 @@ const byteAssign_t* HM_4CH::getByteAssignment()
{
return byteAssignment;
}
const uint8_t HM_4CH::getAssignmentCount()
{
return sizeof(byteAssignment) / sizeof(byteAssign_t);
}

1
lib/Hoymiles/src/inverters/HM_4CH.h
View File

@ -7,6 +7,7 @@ public:
static bool isValidSerial(uint64_t serial);
String typeName();
const byteAssign_t* getByteAssignment();
const uint8_t getAssignmentCount();
private:
const byteAssign_t byteAssignment[34] = {

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

@ -119,7 +119,8 @@ uint8_t InverterAbstract::getChannelCount()
{
const byteAssign_t* b = getByteAssignment();
uint8_t cnt = 0;
for (uint8_t pos = 0; pos < sizeof(b) / sizeof(byteAssign_t); pos++) {
for (uint8_t pos = 0; pos < getAssignmentCount(); pos++) {
Serial.println(b[pos].ch);
if (b[pos].ch > cnt) {
cnt = b[pos].ch;
}
@ -139,7 +140,7 @@ uint8_t InverterAbstract::getAssignIdxByChannelField(uint8_t channel, uint8_t fi
const byteAssign_t* b = getByteAssignment();
uint8_t pos;
for (pos = 0; pos < sizeof(b) / sizeof(byteAssign_t); pos++) {
for (pos = 0; pos < getAssignmentCount(); pos++) {
if (b[pos].ch == channel && b[pos].fieldId == fieldId) {
return pos;
}

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

@ -97,6 +97,7 @@ public:
const char* name();
virtual String typeName() = 0;
virtual const byteAssign_t* getByteAssignment() = 0;
virtual const uint8_t getAssignmentCount() = 0;
uint8_t getChannelCount();
uint16_t getChannelMaxPower(uint8_t channel);