trabus322/hoymilesClient
1
0
Fork 0
Code Issues 4 Pull requests Projects 3 Releases Packages Wiki Activity

Release 2.4h #20

Merged
trabus322 merged 3 commits from master into release 2024-04-09 20:50:28 +02:00
Conversation 0 Commits 3 Files changed 3 +5 -5
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 582b1bcc93 - Show all commits

5
src/hoymiles/dtu.cpp
View file

@ -43,9 +43,10 @@ void Dtu::populateMicroinverters() {
int portStartAddress = 0x4000; int portStartAddress = 0x4000;
uint16_t registers[19]; uint16_t registers[19];
while (portStartAddress <= (0x4000 + 0x0019 * 99)) { while (portStartAddress <= (0x4000 + (0x0019 * 99))) {
int registerCount; int registerCount;
registerCount = modbus_read_registers(this->modbus, portStartAddress, 19, registers); registerCount = modbus_read_registers(this->modbus, portStartAddress, 19, registers);
portStartAddress += 0x0019;
if (registers[0] == 12) { if (registers[0] == 12) {
Port port{portStartAddress}; Port port{portStartAddress};
port.setParametersFromMicroinverterArray(registers, 0); port.setParametersFromMicroinverterArray(registers, 0);
@ -58,8 +59,6 @@ void Dtu::populateMicroinverters() {
this->getMicroinverterBySerialNumber(port.getParameterByName("microinverterSerialNumber").first.get()->getValue().first.i).first->ports.push_back(port); this->getMicroinverterBySerialNumber(port.getParameterByName("microinverterSerialNumber").first.get()->getValue().first.i).first->ports.push_back(port);
} }
portStartAddress += 0x0019;
std::this_thread::sleep_for(std::chrono::milliseconds(10)); std::this_thread::sleep_for(std::chrono::milliseconds(10));
} }
} }

5
src/hoymiles/portParameters/portParameters.cpp
View file

@ -11,8 +11,9 @@ void PortParameterMicroinverterSerialNumber::getValueFromRegisters(uint16_t *reg
std::string readValueString = ""; std::string readValueString = "";
for (int i{0}; i < this->registerSize; i++) { for (int i{0}; i < this->registerSize; i++) {
std::stringstream readValueStringStream; std::stringstream readValueStringStream;
readValueStringStream << std::hex << (int) ((registers[addressOffset + this->parameterAddressOffset + i] & 0xff00) >> 8); readValueStringStream.fill('0');
readValueStringStream << std::hex << (int) (registers[addressOffset + this->parameterAddressOffset + i] & 0x00ff); readValueStringStream << std::setw(2) << std::hex << (int) ((registers[addressOffset + this->parameterAddressOffset + i] & 0xff00) >> 8);
readValueStringStream << std::setw(2) << std::hex << (int) (registers[addressOffset + this->parameterAddressOffset + i] & 0x00ff);
readValueString.append(readValueStringStream.str()); readValueString.append(readValueStringStream.str());
} }
this->value.i = std::stoll(readValueString); this->value.i = std::stoll(readValueString);