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 +30 -39
1 changed files with 30 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit dc4e40924d - Show all commits

39
src/hoymiles/dtu.cpp
View file

@ -1,8 +1,8 @@
#include <chrono>
#include <iostream>
#include <string>
#include <vector>
#include <chrono>
#include <thread>
#include <vector>
#include "modbus.h"
@ -23,8 +23,7 @@ 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) {
modbus_set_slave(this->modbus, id);
@ -44,20 +43,10 @@ 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 (registerCount == -1) {
return;
}
while (portStartAddress <= (0x4000 + 0x0019*99)) {
// if(registers[0] != 12) {
// break;
// }
if (registers[0] == 12) {
Port port{portStartAddress};
port.setParametersFromMicroinverterArray(registers, 0);
@ -67,11 +56,11 @@ 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));
registerCount = modbus_read_registers(this->modbus, portStartAddress, 19, registers);
}
}
@ -120,13 +109,17 @@ void Dtu::printMicroinverters(std::vector<std::string> &parametersToGet, bool al
while (microinvertersToGetIterator != microinvertersToGet.end()) {
std::pair<Microinverter *, bool> 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;
@ -154,9 +147,7 @@ void Dtu::setStatusMicroinverters(uint16_t value, std::string statusName, std::v
}
}
bool Dtu::empty() {
return this->microinverters.empty();
}
bool Dtu::empty() { return this->microinverters.empty(); }
void Dtu::listOfMicroinverters() {
std::vector<Microinverter>::iterator microinvertersIterator = this->microinverters.begin();