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 *readArray;
int readArraySize;
std::vector<std::shared_ptr<PortParameter>> parameters;
void populateParameters();

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

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

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

@ -14,7 +14,7 @@ class PortParameter {
uint16_t parameterAddressOffset;
int registerSize;
virtual void setValueFromRegisters(uint16_t *readArray, int readArraySize);
virtual void setValueFromRegisters(uint16_t *readArray, int registerCount);
public:
PortParameter(std::string name, uint16_t parameterAddressOffset, int registerSize);
@ -40,14 +40,14 @@ class PortParameter {
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 {
protected:
int decimalPlaces;
virtual void setValueFromRegisters(uint16_t *readArray, int readArraySize);
virtual void setValueFromRegisters(uint16_t *readArray, int registerCount);
public:
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 {
protected:
virtual void setValueFromRegisters(uint16_t *readArray, int readArraySize);
virtual void setValueFromRegisters(uint16_t *readArray, int registerCount);
public:
PortParameterInt(std::string name, uint16_t parameterAddressOffset, int registerSize);