From dc4e40924dbc8b3e5a1f82d52817a9c16edf4717 Mon Sep 17 00:00:00 2001 From: trabus322 Date: Tue, 9 Apr 2024 20:31:43 +0200 Subject: [PATCH 1/2] Scanning more stuff --- src/hoymiles/dtu.cpp | 69 +++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/src/hoymiles/dtu.cpp b/src/hoymiles/dtu.cpp index fb6695e..c7d659b 100644 --- a/src/hoymiles/dtu.cpp +++ b/src/hoymiles/dtu.cpp @@ -1,8 +1,8 @@ +#include #include #include -#include -#include #include +#include #include "modbus.h" @@ -12,10 +12,10 @@ #include "portParameters.h" Dtu::Dtu(const char *address, int id, bool rtu, bool tcp) { - if(tcp) { + if (tcp) { this->modbus = modbus_new_tcp(address, id); } - if(rtu) { + if (rtu) { this->modbus = modbus_new_rtu(address, 9600, 'N', 8, 1); modbus_rtu_set_serial_mode(this->modbus, MODBUS_RTU_RS485); } @@ -23,10 +23,9 @@ Dtu::Dtu(const char *address, int id, bool rtu, bool tcp) { this->connected = false; if (modbus_connect(this->modbus) == -1) { std::cerr << "NOT CONNECTED" << std::endl; - } - else { + } else { this->connected = true; - if(rtu) { + if (rtu) { modbus_set_slave(this->modbus, id); } this->populateMicroinverters(); @@ -44,34 +43,24 @@ void Dtu::populateMicroinverters() { int portStartAddress = 0x4000; uint16_t registers[19]; - modbus_set_debug(this->modbus, 1); + while (portStartAddress <= (0x4000 + 0x0019 * 99)) { + int registerCount; + registerCount = modbus_read_registers(this->modbus, portStartAddress, 19, registers); + if (registers[0] == 12) { + Port port{portStartAddress}; + port.setParametersFromMicroinverterArray(registers, 0); - int registerCount; - registerCount = modbus_read_registers(this->modbus, portStartAddress, 19, registers); + if (!this->getMicroinverterBySerialNumber(port.getParameterByName("microinverterSerialNumber").first.get()->getValue().first.i).second) { + Microinverter microinverter{this->modbus, portStartAddress, port.getParameterByName("microinverterSerialNumber").first.get()->getValue().first.i}; + this->microinverters.push_back(microinverter); + } - if (registerCount == -1) { - return; - } - - while (portStartAddress <= (0x4000 + 0x0019*99)) { - // if(registers[0] != 12) { - // break; - // } - - Port port{portStartAddress}; - port.setParametersFromMicroinverterArray(registers, 0); - - if (!this->getMicroinverterBySerialNumber(port.getParameterByName("microinverterSerialNumber").first.get()->getValue().first.i).second) { - Microinverter microinverter{this->modbus, portStartAddress, port.getParameterByName("microinverterSerialNumber").first.get()->getValue().first.i}; - this->microinverters.push_back(microinverter); + 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)); - registerCount = modbus_read_registers(this->modbus, portStartAddress, 19, registers); } } @@ -120,13 +109,17 @@ void Dtu::printMicroinverters(std::vector ¶metersToGet, bool al while (microinvertersToGetIterator != microinvertersToGet.end()) { std::pair microinverterPair = this->getMicroinverterBySerialNumber(*microinvertersToGetIterator); if (microinverterPair.second) { - std::cout << " " << "Microinverter: " << microinverterPair.first->serialNumber << std::endl; - std::cout << " " << "Microinverter Data Age: " << microinverterPair.first->age << std::endl; + std::cout << " " + << "Microinverter: " << microinverterPair.first->serialNumber << std::endl; + std::cout << " " + << "Microinverter Data Age: " << microinverterPair.first->age << std::endl; if (printTodayProduction) { - std::cout << " " << "TodayProduction: " << microinverterPair.first->getTodayProduction() << "Wh" << std::endl; + std::cout << " " + << "TodayProduction: " << microinverterPair.first->getTodayProduction() << "Wh" << std::endl; } if (printTotalProduction) { - std::cout << " " << "TotalProduction: " << microinverterPair.first->getTotalProduction() << "Wh" << std::endl; + std::cout << " " + << "TotalProduction: " << microinverterPair.first->getTotalProduction() << "Wh" << std::endl; } microinverterPair.first->printPorts(parametersToGet, allParameters, shortNames); std::cout << std::endl; @@ -135,7 +128,7 @@ void Dtu::printMicroinverters(std::vector ¶metersToGet, bool al } } -void Dtu::setStatusMicroinverters(uint16_t value, std::string statusName, std::vector& microinvertersToSet) { +void Dtu::setStatusMicroinverters(uint16_t value, std::string statusName, std::vector µinvertersToSet) { if (microinvertersToSet.empty()) { std::vector::iterator microinvertersIterator = this->microinverters.begin(); while (microinvertersIterator != this->microinverters.end()) { @@ -145,23 +138,21 @@ void Dtu::setStatusMicroinverters(uint16_t value, std::string statusName, std::v } std::vector::iterator microinvertersToSetIterator = microinvertersToSet.begin(); - while(microinvertersToSetIterator != microinvertersToSet.end()) { + while (microinvertersToSetIterator != microinvertersToSet.end()) { std::pair microinverterPair = this->getMicroinverterBySerialNumber(*microinvertersToSetIterator); - if(microinverterPair.second) { + if (microinverterPair.second) { microinverterPair.first->setStatusWholeMicroinverter(value, statusName); } microinvertersToSetIterator++; } } -bool Dtu::empty() { - return this->microinverters.empty(); -} +bool Dtu::empty() { return this->microinverters.empty(); } void Dtu::listOfMicroinverters() { std::vector::iterator microinvertersIterator = this->microinverters.begin(); std::cout << "Microinverter list:" << std::endl; - while(microinvertersIterator != this->microinverters.end()) { + while (microinvertersIterator != this->microinverters.end()) { std::cout << " " << microinvertersIterator->serialNumber << std::endl; microinvertersIterator++; } From 582b1bcc93dabf6249785ce3b2e919eea0167c91 Mon Sep 17 00:00:00 2001 From: trabus322 Date: Tue, 9 Apr 2024 20:47:44 +0200 Subject: [PATCH 2/2] Fiuxed reading values, release v2.4h --- src/hoymiles/dtu.cpp | 5 ++--- src/hoymiles/portParameters/portParameters.cpp | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/hoymiles/dtu.cpp b/src/hoymiles/dtu.cpp index c7d659b..a19fec1 100644 --- a/src/hoymiles/dtu.cpp +++ b/src/hoymiles/dtu.cpp @@ -43,9 +43,10 @@ void Dtu::populateMicroinverters() { int portStartAddress = 0x4000; uint16_t registers[19]; - while (portStartAddress <= (0x4000 + 0x0019 * 99)) { + while (portStartAddress <= (0x4000 + (0x0019 * 99))) { int registerCount; registerCount = modbus_read_registers(this->modbus, portStartAddress, 19, registers); + portStartAddress += 0x0019; if (registers[0] == 12) { Port port{portStartAddress}; 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); } - portStartAddress += 0x0019; - std::this_thread::sleep_for(std::chrono::milliseconds(10)); } } diff --git a/src/hoymiles/portParameters/portParameters.cpp b/src/hoymiles/portParameters/portParameters.cpp index d7bbb43..d614ec8 100644 --- a/src/hoymiles/portParameters/portParameters.cpp +++ b/src/hoymiles/portParameters/portParameters.cpp @@ -11,8 +11,9 @@ void PortParameterMicroinverterSerialNumber::getValueFromRegisters(uint16_t *reg std::string readValueString = ""; for (int i{0}; i < this->registerSize; i++) { std::stringstream readValueStringStream; - readValueStringStream << std::hex << (int) ((registers[addressOffset + this->parameterAddressOffset + i] & 0xff00) >> 8); - readValueStringStream << std::hex << (int) (registers[addressOffset + this->parameterAddressOffset + i] & 0x00ff); + readValueStringStream.fill('0'); + 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()); } this->value.i = std::stoll(readValueString);