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

Removed multithreading for now, corrected connected

Browse source
This commit is contained in:
TraYali 2024-03-19 12:54:05 +01:00
parent 089c7a77b5
commit e0135b6753
4 changed files with 34 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/hoymiles/dtu.cpp
View file

@ -1,6 +1,6 @@
#include <vector>
#include <iostream>
#include <thread>
// #include <thread>
#include "modbus.h"
@ -18,10 +18,19 @@ Dtu::Dtu(const char *ip_address, int port) {
if (modbus_connect(*this->modbus_context.get()) == -1) {
std::cerr << "conn_error";
modbus_free(*this->modbus_context.get());
abort();
this->connected = false;
}
else {
this->connected = true;
}
this->populateMicroinverters();
if(this->connected) {
this->populateMicroinverters();
}
}
bool Dtu::isConnected() {
return this->connected;
}
Dtu::~Dtu() {
@ -74,19 +83,20 @@ std::pair<bool, Microinverter*> Dtu::getMicroinverterBySerialNumber(long serialN
}
void Dtu::updateMicroinverters() {
std::vector<std::thread> updateThreads;
// std::vector<std::thread> updateThreads;
std::vector<Microinverter>::iterator microinvertersIterator = this->microinverters.begin();
while (microinvertersIterator != this->microinverters.end()) {
updateThreads.push_back(std::thread(&Microinverter::updatePorts, microinvertersIterator));
// updateThreads.push_back(std::thread(&Microinverter::updatePorts, microinvertersIterator));
microinvertersIterator->updatePorts();
microinvertersIterator++;
}
std::vector<std::thread>::iterator updateThreadsIterator = updateThreads.begin();
while(updateThreadsIterator != updateThreads.end()) {
updateThreadsIterator->join(); updateThreadsIterator++;
}
std::cout << std::endl;
// std::vector<std::thread>::iterator updateThreadsIterator = updateThreads.begin();
// while(updateThreadsIterator != updateThreads.end()) {
// updateThreadsIterator->join(); updateThreadsIterator++;
// }
// std::cout << std::endl;
}
void Dtu::printMicroinverters() {