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

Revert "Trying to make less calls to dtu, making it "multithreaded""

Browse source 
This reverts commit ad4ff13be0.
This commit is contained in:
TraYali 2024-03-18 13:44:25 +01:00
parent ad4ff13be0
commit f22aae499d
7 changed files with 33 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

3
inc/hoymiles/port.h
View file

@ -19,9 +19,6 @@ class Port {
uint16_t portStartAddress; uint16_t portStartAddress;
uint16_t *readArray;
int readArraySize;
std::vector<std::shared_ptr<PortParameter>> parameters; std::vector<std::shared_ptr<PortParameter>> parameters;
void populateParameters(); void populateParameters();

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

@ -5,7 +5,7 @@
class PortParameterMicroinverterSerialNumber : public PortParameterInt { class PortParameterMicroinverterSerialNumber : public PortParameterInt {
protected: protected:
void setValueFromRegisters(uint16_t *readArray, int readArraySize); void setValueFromRegisters(uint16_t *readArray, int registerCount);
public: public:
PortParameterMicroinverterSerialNumber(); PortParameterMicroinverterSerialNumber();
@ -13,7 +13,7 @@ class PortParameterMicroinverterSerialNumber : public PortParameterInt {
class PortParameterPortNumber : public PortParameterInt { class PortParameterPortNumber : public PortParameterInt {
private: private:
void setValueFromRegisters(uint16_t *readArray, int readArraySize); void setValueFromRegisters(uint16_t *readArray, int registerCount);
public: public:
PortParameterPortNumber(); PortParameterPortNumber();

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

@ -14,7 +14,7 @@ class PortParameter {
uint16_t parameterAddressOffset; uint16_t parameterAddressOffset;
int registerSize; int registerSize;
virtual void setValueFromRegisters(uint16_t *readArray, int readArraySize); virtual void setValueFromRegisters(uint16_t *readArray, int registerCount);
public: public:
PortParameter(std::string name, uint16_t parameterAddressOffset, int registerSize); PortParameter(std::string name, uint16_t parameterAddressOffset, int registerSize);
@ -40,14 +40,14 @@ class PortParameter {
virtual std::string getOutputValue(); virtual std::string getOutputValue();
void updateValue(uint16_t *readArray, int readArraySize, int registerCount); void updateValue(std::shared_ptr<modbus_t*> modbus_context, std::mutex *modbus_context_mutex, uint16_t portStartAddress);
}; };
class PortParameterFloat : virtual public PortParameter { class PortParameterFloat : virtual public PortParameter {
protected: protected:
int decimalPlaces; int decimalPlaces;
virtual void setValueFromRegisters(uint16_t *readArray, int readArraySize); virtual void setValueFromRegisters(uint16_t *readArray, int registerCount);
public: public:
PortParameterFloat(std::string name, int decimalPlaces, uint16_t parameterAddressOffset, int registerSize); PortParameterFloat(std::string name, int decimalPlaces, uint16_t parameterAddressOffset, int registerSize);
@ -57,7 +57,7 @@ class PortParameterFloat : virtual public PortParameter {
class PortParameterInt : virtual public PortParameter { class PortParameterInt : virtual public PortParameter {
protected: protected:
virtual void setValueFromRegisters(uint16_t *readArray, int readArraySize); virtual void setValueFromRegisters(uint16_t *readArray, int registerCount);
public: public:
PortParameterInt(std::string name, uint16_t parameterAddressOffset, int registerSize); PortParameterInt(std::string name, uint16_t parameterAddressOffset, int registerSize);

2
src/hoymiles/microinverter.cpp
View file

@ -29,8 +29,6 @@ void Microinverter::populatePorts() {
this->modbus_context_mutex->lock(); this->modbus_context_mutex->lock();
registerCount = modbus_read_registers(*this->modbus_context.get(), portStartAddress + 0x0021, 1, readArray); registerCount = modbus_read_registers(*this->modbus_context.get(), portStartAddress + 0x0021, 1, readArray);
this->modbus_context_mutex->unlock(); this->modbus_context_mutex->unlock();
break;
} }
} }

21
src/hoymiles/port.cpp
View file

@ -1,21 +1,18 @@
#include <cmath>
#include <iostream>
#include <memory>
#include <string>
#include <vector> #include <vector>
#include <string>
#include <iostream>
#include <cmath>
#include <memory>
#include "modbus.h" #include "modbus.h"
#include "port.h" #include "port.h"
#include "portParameters.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, std::mutex *modbus_context_mutex, uint16_t portStartAddress) {
this->modbus_context = modbus_context; this->modbus_context = modbus_context;
this->modbus_context_mutex = modbus_context_mutex; this->modbus_context_mutex = modbus_context_mutex;
this->readArraySize = 34;
this->readArray = new uint16_t[this->readArraySize];
this->portStartAddress = portStartAddress; this->portStartAddress = portStartAddress;
this->populateParameters(); this->populateParameters();
@ -54,15 +51,9 @@ void Port::populateParameters() {
} }
void Port::updateParameters() { void Port::updateParameters() {
int registerCount;
modbus_context_mutex->lock();
registerCount = modbus_read_registers(*modbus_context.get(), portStartAddress - 1, this->readArraySize, this->readArray);
modbus_context_mutex->unlock();
std::vector<std::shared_ptr<PortParameter>>::iterator parametersIterator{this->parameters.begin()}; std::vector<std::shared_ptr<PortParameter>>::iterator parametersIterator{this->parameters.begin()};
while (parametersIterator != this->parameters.end()) { while (parametersIterator != this->parameters.end()) {
parametersIterator->get()->updateValue(this->readArray, this->readArraySize, registerCount); parametersIterator->get()->updateValue(this->modbus_context, this->modbus_context_mutex, this->portStartAddress);
parametersIterator++; parametersIterator++;
} }
} }

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

@ -6,11 +6,12 @@
PortParameterMicroinverterSerialNumber::PortParameterMicroinverterSerialNumber() : PortParameterInt("microinverterSerialNumber", 0x0001, 6), PortParameter("microinverterSerialNumber", 0x0001, 6) {} PortParameterMicroinverterSerialNumber::PortParameterMicroinverterSerialNumber() : PortParameterInt("microinverterSerialNumber", 0x0001, 6), PortParameter("microinverterSerialNumber", 0x0001, 6) {}
void PortParameterMicroinverterSerialNumber::setValueFromRegisters(uint16_t *readArray, int readArraySize) { void PortParameterMicroinverterSerialNumber::setValueFromRegisters(uint16_t *readArray, int registerCount) {
uint16_t readValue; uint16_t readValue;
std::string readValueString = ""; std::string readValueString = "";
for (int i{0}; i < std::ceil(this->registerSize/2) && (this->parameterAddressOffset + i) < readArraySize; i++) { registerCount = std::ceil(registerCount/2);
readValue = readArray[this->parameterAddressOffset + i]; for (int i{0}; i < registerCount; i++) {
readValue = readArray[i];
std::stringstream readValueStringStream; std::stringstream readValueStringStream;
readValueStringStream << std::hex << readValue; readValueStringStream << std::hex << readValue;
readValueString.append(readValueStringStream.str()); readValueString.append(readValueStringStream.str());
@ -20,9 +21,9 @@ void PortParameterMicroinverterSerialNumber::setValueFromRegisters(uint16_t *rea
PortParameterPortNumber::PortParameterPortNumber() : PortParameterInt("portNumber", 0x0007, 1), PortParameter("portNumber", 0x0007, 1) {} PortParameterPortNumber::PortParameterPortNumber() : PortParameterInt("portNumber", 0x0007, 1), PortParameter("portNumber", 0x0007, 1) {}
void PortParameterPortNumber::setValueFromRegisters(uint16_t *readArray, int readArraySize) { void PortParameterPortNumber::setValueFromRegisters(uint16_t *readArray, int registerCount) {
if(readArraySize > this->parameterAddressOffset) { if (registerCount > 0) {
this->value.i = readArray[this->parameterAddressOffset]; this->value.i = readArray[0];
} }
} }

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

@ -20,7 +20,7 @@ PortParameter::PortParameter(std::string name, uint16_t parameterAddressOffset,
PortParameter::~PortParameter() {} PortParameter::~PortParameter() {}
void PortParameter::setValueFromRegisters(uint16_t *readArray, int readArraySize) {} void PortParameter::setValueFromRegisters(uint16_t *readArray, int registerCount) {}
std::pair<PortParameter::PortParameterValue, PortParameter::PortParameterValueType> PortParameter::getValue() { std::pair<PortParameter::PortParameterValue, PortParameter::PortParameterValueType> PortParameter::getValue() {
return std::pair<PortParameter::PortParameterValue, PortParameter::PortParameterValueType>(this->value, this->valueType); return std::pair<PortParameter::PortParameterValue, PortParameter::PortParameterValueType>(this->value, this->valueType);
@ -28,7 +28,14 @@ std::pair<PortParameter::PortParameterValue, PortParameter::PortParameterValueTy
std::string PortParameter::getOutputValue() {} std::string PortParameter::getOutputValue() {}
void PortParameter::updateValue(uint16_t *readArray, int readArraySize, int registerCount) { void PortParameter::updateValue(std::shared_ptr<modbus_t*> modbus_context, std::mutex *modbus_context_mutex, uint16_t portStartAddress) {
uint16_t readArray[this->registerSize];
int registerCount;
modbus_context_mutex->lock();
registerCount = modbus_read_registers(*modbus_context.get(), portStartAddress + this->parameterAddressOffset, this->registerSize, readArray);
modbus_context_mutex->unlock();
if(registerCount == -1){ if(registerCount == -1){
this->age++; this->age++;
} }
@ -46,7 +53,7 @@ PortParameterFloat::PortParameterFloat(std::string name, int decimalPlaces, uint
this->value.f = 0; this->value.f = 0;
} }
void PortParameterFloat::setValueFromRegisters(uint16_t *readArray, int readArraySize) { void PortParameterFloat::setValueFromRegisters(uint16_t *readArray, int registerCount) {
float temp = readArray[0]; float temp = readArray[0];
temp = temp / std::pow(10, this->decimalPlaces); temp = temp / std::pow(10, this->decimalPlaces);
this->value.f = temp; this->value.f = temp;
@ -62,11 +69,12 @@ PortParameterInt::PortParameterInt(std::string name, uint16_t parameterAddressOf
this->value.i = 0; this->value.i = 0;
} }
void PortParameterInt::setValueFromRegisters(uint16_t *readArray, int readArraySize) { void PortParameterInt::setValueFromRegisters(uint16_t *readArray, int registerCount) {
uint16_t readValue; uint16_t readValue;
std::string readValueString = ""; std::string readValueString = "";
for (int i{0}; i < std::ceil(this->registerSize/2) && (this->parameterAddressOffset + i) < readArraySize; i++) { registerCount = std::ceil(registerCount/2);
readValue = readArray[this->parameterAddressOffset + i]; for (int i{0}; i < registerCount; i++) {
readValue = readArray[i];
readValueString.append(std::to_string(readValue)); readValueString.append(std::to_string(readValue));
} }
this->value.i = std::stol(readValueString); this->value.i = std::stol(readValueString);