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

Removed multithtreading (thanks windows)

Browse source
This commit is contained in:
TraYali 2024-03-19 13:02:41 +01:00
parent e0135b6753
commit d62fda675a
8 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
inc/hoymiles/dtu.h
View file

@ -3,7 +3,7 @@
#include <vector>
#include <memory>
#include <mutex>
// #include <mutex>
#include "microinverter.h"
@ -13,7 +13,7 @@ typedef _modbus modbus_t;
class Dtu {
private:
std::shared_ptr<modbus_t*> modbus_context;
std::mutex modbus_context_mutex;
// std::mutex modbus_context_mutex;
std::vector<Microinverter> microinverters;

6
inc/hoymiles/microinverter.h
View file

@ -3,7 +3,7 @@
#include <vector>
#include <memory>
#include <mutex>
// #include <mutex>
#include "port.h"
@ -13,12 +13,12 @@ typedef _modbus modbus_t;
class Microinverter {
private:
std::shared_ptr<modbus_t*> modbus_context;
std::mutex *modbus_context_mutex;
// std::mutex *modbus_context_mutex;
public:
Microinverter(std::shared_ptr<modbus_t*> modbus_context, std::mutex *modbus_context_mutex, long serialNumber);
Microinverter(std::shared_ptr<modbus_t*> modbus_context, long serialNumber);
long serialNumber;

6
inc/hoymiles/port.h
View file

@ -5,7 +5,7 @@
#include <string>
#include <vector>
#include <memory>
#include <mutex>
// #include <mutex>
#include "portParametersGeneric.h"
@ -15,7 +15,7 @@ typedef _modbus modbus_t;
class Port {
private:
std::shared_ptr<modbus_t*> modbus_context;
std::mutex *modbus_context_mutex;
// std::mutex *modbus_context_mutex;
uint16_t portStartAddress;
@ -25,7 +25,7 @@ class Port {
bool currentFixed;
public:
Port(std::shared_ptr<modbus_t*> modbus_context, std::mutex *modbus_context_mutex, uint16_t portStartAddress);
Port(std::shared_ptr<modbus_t*> modbus_context, uint16_t portStartAddress);
std::vector<std::shared_ptr<PortParameter>> parameters;

4
inc/hoymiles/portParameters/portParametersGeneric.h
View file

@ -4,7 +4,7 @@
#include <stdint.h>
#include <string>
#include <memory>
#include <mutex>
// #include <mutex>
struct _modbus;
typedef _modbus modbus_t;
@ -40,7 +40,7 @@ class PortParameter {
virtual std::string getOutputValue();
void updateValue(std::shared_ptr<modbus_t*> modbus_context, std::mutex *modbus_context_mutex, uint16_t portStartAddress);
void updateValue(std::shared_ptr<modbus_t*> modbus_context, uint16_t portStartAddress);
};
class PortParameterFloat : virtual public PortParameter {

11
src/hoymiles/dtu.cpp
View file

@ -17,7 +17,6 @@ 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());
this->connected = false;
}
else {
@ -45,10 +44,10 @@ void Dtu::populateMicroinverters() {
int registerCount;
registerCount = modbus_read_registers(*this->modbus_context.get(), portStartAddress + 0x0021, 1, readArray);
while(registerCount != -1 && readArray[0] == 0x700) {
Port port{ this->modbus_context, &this->modbus_context_mutex, portStartAddress };
Port port{ this->modbus_context, portStartAddress };
PortParameterMicroinverterSerialNumber portParameterMicroinverterSerialNumber{};
portParameterMicroinverterSerialNumber.updateValue(this->modbus_context, &this->modbus_context_mutex, portStartAddress);
portParameterMicroinverterSerialNumber.updateValue(this->modbus_context, portStartAddress);
long serialNumber = portParameterMicroinverterSerialNumber.getValue().first.i;
std::pair<bool, Microinverter*> getMicroinverterBySerialNumber = this->getMicroinverterBySerialNumber(serialNumber);
@ -56,16 +55,16 @@ void Dtu::populateMicroinverters() {
getMicroinverterBySerialNumber.second->ports.push_back(port);
}
else {
Microinverter microinverter{ this->modbus_context, &this->modbus_context_mutex, serialNumber };
Microinverter microinverter{ this->modbus_context, serialNumber };
this->microinverters.push_back(microinverter);
this->microinverters.back().ports.push_back(port);
}
portStartAddress += 0x0028;
this->modbus_context_mutex.lock();
// this->modbus_context_mutex.lock();
registerCount = modbus_read_registers(*this->modbus_context.get(), portStartAddress + 0x0021, 1, readArray);
this->modbus_context_mutex.unlock();
// this->modbus_context_mutex.unlock();
}
}

4
src/hoymiles/microinverter.cpp
View file

@ -10,9 +10,9 @@
struct _modbus;
typedef _modbus modbus_t;
Microinverter::Microinverter(std::shared_ptr<modbus_t*> modbus_context, std::mutex *modbus_context_mutex, long serialNumber) {
Microinverter::Microinverter(std::shared_ptr<modbus_t*> modbus_context, long serialNumber) {
this->modbus_context = modbus_context;
this->modbus_context_mutex = modbus_context_mutex;
// this->modbus_context_mutex = modbus_context_mutex;
this->serialNumber = serialNumber;
}

6
src/hoymiles/port.cpp
View file

@ -9,9 +9,9 @@
#include "port.h"
#include "portParameters.h"
Port::Port(std::shared_ptr<modbus_t*> modbus_context, std::mutex *modbus_context_mutex, uint16_t portStartAddress) {
Port::Port(std::shared_ptr<modbus_t*> modbus_context, uint16_t portStartAddress) {
this->modbus_context = modbus_context;
this->modbus_context_mutex = modbus_context_mutex;
// this->modbus_context_mutex = modbus_context_mutex;
this->portStartAddress = portStartAddress;
@ -71,7 +71,7 @@ void Port::fixCurrent() {
void Port::updateParameters() {
std::vector<std::shared_ptr<PortParameter>>::iterator parametersIterator{this->parameters.begin()};
while (parametersIterator != this->parameters.end()) {
parametersIterator->get()->updateValue(this->modbus_context, this->modbus_context_mutex, this->portStartAddress);
parametersIterator->get()->updateValue(this->modbus_context, this->portStartAddress);
parametersIterator++;
}
this->fixCurrent();

6
src/hoymiles/portParameters/portParametersGeneric.cpp
View file

@ -30,13 +30,13 @@ std::pair<PortParameter::PortParameterValue, PortParameter::PortParameterValueTy
std::string PortParameter::getOutputValue() {}
void PortParameter::updateValue(std::shared_ptr<modbus_t*> modbus_context, std::mutex *modbus_context_mutex, uint16_t portStartAddress) {
void PortParameter::updateValue(std::shared_ptr<modbus_t*> modbus_context, uint16_t portStartAddress) {
uint16_t readArray[this->registerSize];
int registerCount;
modbus_context_mutex->lock();
// modbus_context_mutex->lock();
registerCount = modbus_read_registers(*modbus_context.get(), portStartAddress + this->parameterAddressOffset, this->registerSize, readArray);
modbus_context_mutex->unlock();
// modbus_context_mutex->unlock();
if(registerCount == -1){
this->age++;