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

Compare commits

base: trabus322:6a92fd82943f135ec984b3127520483be61745b2
Branches Tags
trabus322:master
trabus322:release
trabus322:microinverterTotalProduction
..
compare: trabus322:fdd0aa0eb62057793ce8eb04e73882da4a959701
Branches Tags
trabus322:release
trabus322:master
trabus322:microinverterTotalProduction

No commits in common. "6a92fd82943f135ec984b3127520483be61745b2" and "fdd0aa0eb62057793ce8eb04e73882da4a959701" have entirely different histories.
6a92fd8294 ... fdd0aa0eb6

17 changed files with 67 additions and 323 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -3,9 +3,9 @@ project(hoymilesClient VERSION 0.1.0 LANGUAGES C CXX)
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
include_directories(inc inc/libmodbus inc/hoymiles inc/hoymiles/portParameters inc/hoymiles/sunspecParameters) include_directories(inc inc/libmodbus inc/hoymiles inc/hoymiles/portParameters)
file(GLOB SOURCES src/*.cpp src/libmodbus/*.c src/hoymiles/*.cpp src/hoymiles/portParameters/*.cpp src/hoymiles/sunspecParameters/*.cpp) file(GLOB SOURCES src/*.cpp src/libmodbus/*.c src/hoymiles/*.cpp src/hoymiles/portParameters/*.cpp)
add_executable(hoymilesClient_exec ${SOURCES}) add_executable(hoymilesClient_exec ${SOURCES})

3
inc/hoymiles/microinverter.h
View file

@ -7,14 +7,11 @@
#include "modbus.h" #include "modbus.h"
#include "port.h" #include "port.h"
#include "sunspec.h"
class Microinverter { class Microinverter {
private: private:
std::shared_ptr<class modbus> modbus; std::shared_ptr<class modbus> modbus;
Sunspec sunspec;
int startAddress; int startAddress;
public: public:

2
inc/hoymiles/port.h
View file

@ -28,7 +28,7 @@ class Port {
// void updateParameters(std::vector<std::string> &parametersToGet, bool allParameters); // void updateParameters(std::vector<std::string> &parametersToGet, bool allParameters);
void setParametersFromMicroinverterArray(uint16_t *registers, int addressOffset); void setParametersFromMicroinverterArray(uint8_t *registers, int addressOffset);
void printParameters(std::vector<std::string> &parametersToGet, bool allParameters, bool shortNames); void printParameters(std::vector<std::string> &parametersToGet, bool allParameters, bool shortNames);
}; };

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

@ -5,7 +5,7 @@
class PortParameterMicroinverterSerialNumber : public PortParameterInt { class PortParameterMicroinverterSerialNumber : public PortParameterInt {
private: private:
void setValueFromRegisters(uint16_t *registers, int addressOffset); void setValueFromRegisters(uint8_t *registers, int addressOffset);
public: public:
PortParameterMicroinverterSerialNumber(); PortParameterMicroinverterSerialNumber();

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

@ -13,10 +13,8 @@ class PortParameter {
uint16_t parameterAddressOffset; uint16_t parameterAddressOffset;
int registerSize; int registerSize;
std::string unit;
public: public:
PortParameter(std::string name, std::string shortName, std::string unit, uint16_t parameterAddressOffset, int registerSize); PortParameter(std::string name, std::string shortName, uint16_t parameterAddressOffset, int registerSize);
virtual ~PortParameter(); virtual ~PortParameter();
@ -41,7 +39,7 @@ class PortParameter {
virtual std::string getOutputValue(); virtual std::string getOutputValue();
virtual void setValueFromRegisters(uint16_t *registers, int addressOffset); virtual void setValueFromRegisters(uint8_t *registers, int addressOffset);
// void updateValue(std::shared_ptr<class modbus> modubs, uint16_t portStartAddress); // void updateValue(std::shared_ptr<class modbus> modubs, uint16_t portStartAddress);
}; };
@ -51,22 +49,22 @@ class PortParameterFloat : public PortParameter {
int decimalPlaces; int decimalPlaces;
public: public:
PortParameterFloat(std::string name, std::string shortName, std::string unit, int decimalPlaces, uint16_t parameterAddressOffset, int registerSize); PortParameterFloat(std::string name, std::string shortName, int decimalPlaces, uint16_t parameterAddressOffset, int registerSize);
std::string getOutputValue(); std::string getOutputValue();
virtual void setValueFromRegisters(uint16_t *registers, int addressOffset); virtual void setValueFromRegisters(uint8_t *registers, int addressOffset);
}; };
class PortParameterInt : public PortParameter { class PortParameterInt : public PortParameter {
protected: protected:
public: public:
PortParameterInt(std::string name, std::string shortName, std::string unit, uint16_t parameterAddressOffset, int registerSize); PortParameterInt(std::string name, std::string shortName, uint16_t parameterAddressOffset, int registerSize);
std::string getOutputValue(); std::string getOutputValue();
virtual void setValueFromRegisters(uint16_t *registers, int addressOffset); virtual void setValueFromRegisters(uint8_t *registers, int addressOffset);
}; };
#endif #endif

37
inc/hoymiles/sunspec.h
View file

@ -1,37 +0,0 @@
#ifndef SUNSPEC_H
#define SUNSPEC_H
#include <string>
#include <stdint.h>
#include <memory>
#include <vector>
#include "modbus.h"
#include "sunspecParametersGeneric.h"
class Sunspec {
protected:
std::shared_ptr<class modbus> modbus;
std::vector<std::shared_ptr<SunspecParameter>> parameters;
std::string manufacturer;
std::string model;
std::string version;
std::string serialNumber;
uint16_t deviceAddress;
int sunspecAddress;
void setValues();
void populateParameters();
public:
Sunspec(int address, std::shared_ptr<class modbus> modbus);
uint16_t getAddress();
};
#endif

15
inc/hoymiles/sunspecParameters/sunspecParameters.h
View file

@ -1,15 +0,0 @@
#ifndef SUNSPEC_PARAMETERS_H
#define SUNSPEC_PARAMETERS_H
#include "sunspecParametersGeneric.h"
class SunspecParameterManufacturer : public SunspecParameterString32 {
protected:
public:
SunspecParameterManufacturer();
void setValueFromRegisters(uint16_t *registers, int addressOffset);
};
#endif

124
inc/hoymiles/sunspecParameters/sunspecParametersGeneric.h
View file

@ -1,124 +0,0 @@
#ifndef SUNSPEC_PARAMETERS_GENERIC_H
#define SUNSPEC_PARAMETERS_GENERIC_H
#include <stdint.h>
#include <string>
class SunspecParameter {
protected:
std::string name;
int registerAddressOffset;
int registerSize;
public:
SunspecParameter(std::string name, int registerAddressOffset, int registerSize);
virtual ~SunspecParameter();
enum SunspecValueType { uint32, uint16, string32, string16, sunssf, int16, acc32, float32, enum16 };
union SunspecValue {
uint32_t u32;
uint16_t u16;
uint16_t ssf;
int i16;
uint16_t a32;
float f;
uint16_t e16;
};
protected:
SunspecValueType valueType;
SunspecValue value;
public:
virtual void setValueFromRegisters(uint16_t *registers, int addressOffset);
std::pair<SunspecValue, SunspecValueType> getValue();
};
// class SunspecParameterUint32 : public SunspecParameter {
// protected:
// public:
// SunspecParameterUint32(std::string name, int registerAddressOffset, int registerSize);
// virtual void setValueFromRegisters(uint16_t *registers, int addressOffset);
// };
// class SunspecParameterUint16 : public SunspecParameter {
// protected:
// public:
// SunspecParameterUint16(std::string name, int registerAddressOffset, int registerSize);
// virtual void setValueFromRegisters(uint16_t *registers, int addressOffset);
// };
class SunspecParameterString32 : public SunspecParameter {
protected:
std::string value;
public:
SunspecParameterString32(std::string name, int registerAddressOffset, int registerSize);
virtual void setValueFromRegisters(uint16_t *registers, int addressOffset);
};
// class SunspecParameterString16 : public SunspecParameter {
// protected:
// std::string value;
// public:
// SunspecParameterString16(std::string name, int registerAddressOffset, int registerSize);
// virtual void setValueFromRegisters(uint16_t *registers, int addressOffset);
// };
// class SunspecParameterSunssf : public SunspecParameter {
// protected:
// public:
// SunspecParameterSunssf(std::string name, int registerAddressOffset, int registerSize);
// virtual void setValueFromRegisters(uint16_t *registers, int addressOffset);
// };
// class SunspecParameterInt16 : public SunspecParameter {
// protected:
// public:
// SunspecParameterInt16(std::string name, int registerAddressOffset, int registerSize);
// virtual void setValueFromRegisters(uint16_t *registers, int addressOffset);
// };
// class SunspecParameterAcc32 : public SunspecParameter {
// protected:
// public:
// SunspecParameterAcc32(std::string name, int registerAddressOffset, int registerSize);
// virtual void setValueFromRegisters(uint16_t *registers, int addressOffset);
// };
// class SunspecParameterFloat32 : public SunspecParameter {
// protected:
// public:
// SunspecParameterFloat32(std::string name, int registerAddressOffset, int registerSize);
// virtual void setValueFromRegisters(uint16_t *registers, int addressOffset);
// };
// class SunspecParameterEnum16 : public SunspecParameter {
// protected:
// public:
// SunspecParameterEnum16(std::string name, int registerAddressOffset, int registerSize);
// virtual void setValueFromRegisters(uint16_t *registers, int addressOffset);
// };
#endif

16
src/hoymiles/dtu.cpp
View file

@ -33,17 +33,23 @@ std::string Dtu::modbusErrorMessage() { return this->modbus.get()->error_msg; }
Dtu::~Dtu() { this->modbus.get()->modbus_close(); } Dtu::~Dtu() { this->modbus.get()->modbus_close(); }
void Dtu::populateMicroinverters() { void Dtu::populateMicroinverters() {
int portStartAddress = 0x4000; int portStartAddress = 0x1000;
uint16_t registers[19]; uint16_t readArrayJoined[20];
uint8_t registers[40];
int registerCount; int registerCount;
registerCount = this->modbus.get()->modbus_read_holding_registers(portStartAddress, 19, registers); registerCount = this->modbus.get()->modbus_read_holding_registers(portStartAddress, 20, readArrayJoined);
if (registerCount != 0) { if (registerCount != 0) {
return; return;
} }
while (registerCount == 0) { while (registerCount == 0) {
for (int i{0}; i < 20; i ++) {
registers[2 * i] = (readArrayJoined[i] & 0xFF00) >> 8;
registers[(2 * i) + 1] = (readArrayJoined[i] & 0x00FF);
}
if(registers[0] != 12) { if(registers[0] != 12) {
break; break;
} }
@ -58,9 +64,9 @@ void Dtu::populateMicroinverters() {
this->getMicroinverterBySerialNumber(port.getParameterByName("microinverterSerialNumber").first.get()->getValue().first.i).first->ports.push_back(port); this->getMicroinverterBySerialNumber(port.getParameterByName("microinverterSerialNumber").first.get()->getValue().first.i).first->ports.push_back(port);
portStartAddress += 0x0019; portStartAddress += 0x0028;
registerCount = this->modbus.get()->modbus_read_holding_registers(portStartAddress, 19, registers); registerCount = this->modbus.get()->modbus_read_holding_registers(portStartAddress, 20, readArrayJoined);
} }
} }

31
src/hoymiles/microinverter.cpp
View file

@ -6,9 +6,8 @@
#include "microinverter.h" #include "microinverter.h"
#include "port.h" #include "port.h"
#include "sunspec.h"
Microinverter::Microinverter(std::shared_ptr<class modbus> modbus, int startAddress, long long serialNumber) : sunspec(40000, modbus) { Microinverter::Microinverter(std::shared_ptr<class modbus> modbus, int startAddress, long long serialNumber) {
this->modbus = modbus; this->modbus = modbus;
this->startAddress = startAddress; this->startAddress = startAddress;
this->serialNumber = serialNumber; this->serialNumber = serialNumber;
@ -24,29 +23,25 @@ Microinverter::Microinverter(std::shared_ptr<class modbus> modbus, int startAddr
// } // }
void Microinverter::updateParameters(std::vector<std::string> &parametersToGet, bool allParameters) { void Microinverter::updateParameters(std::vector<std::string> &parametersToGet, bool allParameters) {
int portsRead = 0; int registersToRead = (this->ports.size() * 40) / 2;
while (portsRead < this->ports.size()) { uint16_t registersJoined[registersToRead];
int portsToRead = 0; uint8_t registers[registersToRead*2];
while (portsToRead * 0x0019 < (128 - 0x0019) && (portsToRead + portsRead) < this->ports.size()) {
portsToRead++;
}
int registersToRead = (portsToRead * 0x0019);
uint16_t registers[registersToRead];
int registerCount; int registerCount;
registerCount = this->modbus.get()->modbus_read_holding_registers(this->startAddress + (portsRead * 0x0019), registersToRead, registers); registerCount = this->modbus.get()->modbus_read_holding_registers(this->startAddress, registersToRead, registersJoined);
if (registerCount != 0) { if(registerCount != 0) {
this->age++; this->age++;
return; return;
} }
for (int i{0}; i < portsToRead; i++) { for(int i{0}; i<registersToRead; i++) {
this->ports.at(i).setParametersFromMicroinverterArray(registers, i * 0x0019); registers[2 * i] = (registersJoined[i] & 0xFF00) >> 8;
registers[(2 * i)+1] = (registersJoined[i] & 0x00FF);
} }
portsRead += portsToRead; for(int i{0}; i<this->ports.size(); i++) {
this->ports.at(i).setParametersFromMicroinverterArray(registers, i * 40);
} }
} }
@ -63,7 +58,7 @@ long long Microinverter::getTodayProduction() {
long long result{0}; long long result{0};
std::vector<Port>::iterator portsIterator = this->ports.begin(); std::vector<Port>::iterator portsIterator = this->ports.begin();
while (portsIterator != this->ports.end()) { while(portsIterator != this->ports.end()) {
result += portsIterator->getParameterByName("todayProduction").first.get()->getValue().first.i; result += portsIterator->getParameterByName("todayProduction").first.get()->getValue().first.i;
portsIterator++; portsIterator++;
} }
@ -75,7 +70,7 @@ long long Microinverter::getTotalProduction() {
long long result{0}; long long result{0};
std::vector<Port>::iterator portsIterator = this->ports.begin(); std::vector<Port>::iterator portsIterator = this->ports.begin();
while (portsIterator != this->ports.end()) { while(portsIterator != this->ports.end()) {
result += portsIterator->getParameterByName("totalProduction").first.get()->getValue().first.i; result += portsIterator->getParameterByName("totalProduction").first.get()->getValue().first.i;
portsIterator++; portsIterator++;
} }

2
src/hoymiles/port.cpp
View file

@ -123,7 +123,7 @@ void Port::fixCurrent() {
// } // }
// } // }
void Port::setParametersFromMicroinverterArray(uint16_t *registers, int addressOffset) { void Port::setParametersFromMicroinverterArray(uint8_t *registers, int addressOffset) {
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()->setValueFromRegisters(registers, addressOffset); parametersIterator->get()->setValueFromRegisters(registers, addressOffset);

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

@ -5,43 +5,42 @@
#include "portParameters.h" #include "portParameters.h"
PortParameterMicroinverterSerialNumber::PortParameterMicroinverterSerialNumber() : PortParameterInt("microinverterSerialNumber", "mSN", "", 0x0001, 3) {} PortParameterMicroinverterSerialNumber::PortParameterMicroinverterSerialNumber() : PortParameterInt("microinverterSerialNumber", "mSN", 0x0001, 6) {}
void PortParameterMicroinverterSerialNumber::setValueFromRegisters(uint16_t *registers, int addressOffset) { void PortParameterMicroinverterSerialNumber::setValueFromRegisters(uint8_t *registers, int addressOffset) {
std::string readValueString = ""; std::string readValueString = "";
for (int i{0}; i < this->registerSize; i++) { for (int i{0}; i < this->registerSize; i++) {
std::stringstream readValueStringStream; std::stringstream readValueStringStream;
readValueStringStream << std::hex << (int) ((registers[addressOffset + this->parameterAddressOffset + i] & 0xff00) > 8); readValueStringStream << std::hex << (int) registers[addressOffset + this->parameterAddressOffset + i];
readValueStringStream << std::hex << (int) (registers[addressOffset + this->parameterAddressOffset + i] & 0x00ff);
readValueString.append(readValueStringStream.str()); readValueString.append(readValueStringStream.str());
} }
this->value.i = std::stoll(readValueString); this->value.i = std::stoll(readValueString);
} }
PortParameterPortNumber::PortParameterPortNumber() : PortParameterInt("portNumber", "pN", "", 0x0004, 1) {} PortParameterPortNumber::PortParameterPortNumber() : PortParameterInt("portNumber", "pN", 0x0007, 1) {}
PortParameterPvVoltage::PortParameterPvVoltage() : PortParameterFloat("pvVoltage", "pvU", "V", 1, 0x0005, 1) {} PortParameterPvVoltage::PortParameterPvVoltage() : PortParameterFloat("pvVoltage", "pvU", 1, 0x0008, 2) {}
PortParameterPvCurrentMi::PortParameterPvCurrentMi() : PortParameterFloat("pvCurrentMI", "pvIMI", "A", 1, 0x0006, 1) {} PortParameterPvCurrentMi::PortParameterPvCurrentMi() : PortParameterFloat("pvCurrentMI", "pvIMI", 1, 0x000a, 2) {}
PortParameterPvCurrentHm::PortParameterPvCurrentHm() : PortParameterFloat("pvCurrentHM", "pvIHM", "A", 2, 0x0006, 1) {} PortParameterPvCurrentHm::PortParameterPvCurrentHm() : PortParameterFloat("pvCurrentHM", "pvIHM", 2, 0x000a, 2) {}
PortParameterGridVoltage::PortParameterGridVoltage() : PortParameterFloat("gridVoltage", "gU", "V", 1, 0x0007, 1) {} PortParameterGridVoltage::PortParameterGridVoltage() : PortParameterFloat("gridVoltage", "gU", 1, 0x000c, 2) {}
PortParameterGridFrequency::PortParameterGridFrequency() : PortParameterFloat("gridFrequency", "gF", "Hz", 2, 0x0008, 1) {} PortParameterGridFrequency::PortParameterGridFrequency() : PortParameterFloat("gridFrequency", "gF", 2, 0x000e, 2) {}
PortParameterPvPower::PortParameterPvPower() : PortParameterFloat("pvPower", "pvP", "W", 1, 0x0009, 1) {} PortParameterPvPower::PortParameterPvPower() : PortParameterFloat("pvPower", "pvP", 1, 0x0010, 2) {}
PortParameterTodayProduction::PortParameterTodayProduction() : PortParameterInt("todayProduction", "tdP", "Wh", 0x000A, 1) {} PortParameterTodayProduction::PortParameterTodayProduction() : PortParameterInt("todayProduction", "tdP", 0x0012, 2) {}
PortParameterTotalProduction::PortParameterTotalProduction() : PortParameterInt("totalProduction", "ttP", "Wh", 0x000B, 2) {} PortParameterTotalProduction::PortParameterTotalProduction() : PortParameterInt("totalProduction", "ttP", 0x0014, 4) {}
PortParameterTemperature::PortParameterTemperature() : PortParameterFloat("temperature", "t", "C", 1, 0x000D, 1) {} PortParameterTemperature::PortParameterTemperature() : PortParameterFloat("temperature", "t", 1, 0x0018, 2) {}
PortParameterOperatingStatus::PortParameterOperatingStatus() : PortParameterInt("operatingStatus", "oS", "", 0x000e, 1) {} PortParameterOperatingStatus::PortParameterOperatingStatus() : PortParameterInt("operatingStatus", "oS", 0x001a, 2) {}
PortParameterAlarmCode::PortParameterAlarmCode() : PortParameterInt("alarmCode", "aC", "", 0x000f, 1) {} PortParameterAlarmCode::PortParameterAlarmCode() : PortParameterInt("alarmCode", "aC", 0x001c, 2) {}
PortParameterAlarmCount::PortParameterAlarmCount() : PortParameterInt("alarmCount", "aCnt", "", 0x0010, 1) {} PortParameterAlarmCount::PortParameterAlarmCount() : PortParameterInt("alarmCount", "aCnt", 0x001e, 2) {}
PortParameterLinkStatus::PortParameterLinkStatus() : PortParameterInt("linkStatus", "lS", "", 0x011, 1) {} PortParameterLinkStatus::PortParameterLinkStatus() : PortParameterInt("linkStatus", "lS", 0x020, 2) {}

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

@ -8,10 +8,9 @@
#include "portParametersGeneric.h" #include "portParametersGeneric.h"
PortParameter::PortParameter(std::string name, std::string shortName, std::string unit, uint16_t parameterAddressOffset, int registerSize) { PortParameter::PortParameter(std::string name, std::string shortName, uint16_t parameterAddressOffset, int registerSize) {
this->name = name; this->name = name;
this->shortName = shortName; this->shortName = shortName;
this->unit = unit;
this->parameterAddressOffset = parameterAddressOffset; this->parameterAddressOffset = parameterAddressOffset;
this->registerSize = registerSize; this->registerSize = registerSize;
@ -21,7 +20,7 @@ PortParameter::PortParameter(std::string name, std::string shortName, std::strin
PortParameter::~PortParameter() {} PortParameter::~PortParameter() {}
void PortParameter::setValueFromRegisters(uint16_t *readArray, int portOffset) {} void PortParameter::setValueFromRegisters(uint8_t *readArray, int portOffset) {}
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);
@ -47,7 +46,7 @@ std::string PortParameter::getOutputValue() {
// } // }
// } // }
PortParameterFloat::PortParameterFloat(std::string name, std::string shortName, std::string unit, int decimalPlaces, uint16_t parameterAddressOffset, int registerSize) : PortParameter(name, shortName, unit, parameterAddressOffset, registerSize) { PortParameterFloat::PortParameterFloat(std::string name, std::string shortName, int decimalPlaces, uint16_t parameterAddressOffset, int registerSize) : PortParameter(name, shortName, parameterAddressOffset, registerSize) {
this->decimalPlaces = decimalPlaces; this->decimalPlaces = decimalPlaces;
this->valueType = Float; this->valueType = Float;
@ -55,7 +54,7 @@ PortParameterFloat::PortParameterFloat(std::string name, std::string shortName,
this->value.f = 0; this->value.f = 0;
} }
void PortParameterFloat::setValueFromRegisters(uint16_t *registers, int addressOffset) { void PortParameterFloat::setValueFromRegisters(uint8_t *registers, int addressOffset) {
std::string readValueString{""}; std::string readValueString{""};
for(int i{0}; i<this->registerSize; i++) { for(int i{0}; i<this->registerSize; i++) {
std::stringstream readValueStringStream; std::stringstream readValueStringStream;
@ -68,16 +67,16 @@ void PortParameterFloat::setValueFromRegisters(uint16_t *registers, int addressO
std::string PortParameterFloat::getOutputValue() { std::string PortParameterFloat::getOutputValue() {
std::stringstream valueStringStream; std::stringstream valueStringStream;
valueStringStream << std::fixed << std::setprecision(this->decimalPlaces) << this->value.f; valueStringStream << std::fixed << std::setprecision(this->decimalPlaces) << this->value.f;
return valueStringStream.str().append(this->unit.c_str()); return valueStringStream.str();
} }
PortParameterInt::PortParameterInt(std::string name, std::string shortName, std::string unit, uint16_t parameterAddressOffset, int registerSize) : PortParameter(name, shortName, unit, parameterAddressOffset, registerSize) { PortParameterInt::PortParameterInt(std::string name, std::string shortName, uint16_t parameterAddressOffset, int registerSize) : PortParameter(name, shortName, parameterAddressOffset, registerSize) {
this->valueType = Int; this->valueType = Int;
this->value.i = 0; this->value.i = 0;
} }
void PortParameterInt::setValueFromRegisters(uint16_t *registers, int addressOffset) { void PortParameterInt::setValueFromRegisters(uint8_t *registers, int addressOffset) {
std::string readValueString{""}; std::string readValueString{""};
for (int i{0}; i < this->registerSize; i++) { for (int i{0}; i < this->registerSize; i++) {
std::stringstream readValueStringStream; std::stringstream readValueStringStream;
@ -88,5 +87,5 @@ void PortParameterInt::setValueFromRegisters(uint16_t *registers, int addressOff
} }
std::string PortParameterInt::getOutputValue() { std::string PortParameterInt::getOutputValue() {
return std::to_string(this->value.i).append(this->unit.c_str()); return std::to_string(this->value.i);
} }

34
src/hoymiles/sunspec.cpp
View file

@ -1,34 +0,0 @@
#include <string>
#include <stdint.h>
#include <memory>
#include "sunspec.h"
#include "modbus.h"
#include "sunspecParameters.h"
Sunspec::Sunspec(int address, std::shared_ptr<class modbus> modbus) {
this->modbus = modbus;
this->sunspecAddress = address;
this->populateParameters();
this->setValues();
}
void Sunspec::setValues() {
uint16_t registers[70];
int registerCount;
registerCount = this->modbus.get()->modbus_read_holding_registers(this->sunspecAddress, 70, registers);
std::vector<std::shared_ptr<SunspecParameter>>::iterator parametersIterator = this->parameters.begin();
while(parametersIterator != this->parameters.end()) {
parametersIterator->get()->setValueFromRegisters(registers, 0);
parametersIterator++;
}
}
void Sunspec::populateParameters() {
SunspecParameterManufacturer manufacturer{};
this->parameters.push_back(std::make_shared<SunspecParameterManufacturer>(manufacturer));
}

23
src/hoymiles/sunspecParameters/sunspecParameters.cpp
View file

@ -1,23 +0,0 @@
#include <stdint.h>
#include <string>
#include <sstream>
#include "sunspecParameters.h"
SunspecParameterManufacturer::SunspecParameterManufacturer() : SunspecParameterString32("manufacturer", 4, 16) {
this->valueType = string32;
}
void SunspecParameterManufacturer::setValueFromRegisters(uint16_t *registers, int addressOffset) {
std::string readValue;
for(int i{0}; i<this->registerSize; i++) {
std::stringstream readValueStringStream;
readValueStringStream << (registers[addressOffset + this->registerAddressOffset + i] >> 8) << " ";
readValueStringStream << (registers[addressOffset + this->registerAddressOffset + i] & 0x00FF) << " ";
readValue.append(readValueStringStream.str().c_str());
}
this->value = readValue;
}

17
src/hoymiles/sunspecParameters/sunspecParametersGeneric.cpp
View file

@ -1,17 +0,0 @@
#include "sunspecParametersGeneric.h"
SunspecParameter::~SunspecParameter() {}
SunspecParameter::SunspecParameter(std::string name, int registerAddressOffset, int registerSize) {
this->name = name;
this->registerAddressOffset = registerAddressOffset;
this->registerSize = registerSize;
}
void SunspecParameter::setValueFromRegisters(uint16_t *registers, int addressOffset) {}
std::pair<SunspecParameter::SunspecValue, SunspecParameter::SunspecValueType> SunspecParameter::getValue() {}
SunspecParameterString32::SunspecParameterString32(std::string name, int registerAddressOffset, int registerSize) : SunspecParameter(name, registerAddressOffset, registerSize) {}
void SunspecParameterString32::setValueFromRegisters(uint16_t *registers, int addressOffset) {}

2
src/main.cpp
View file

@ -19,7 +19,7 @@ int main(int argc, char **argv) {
signal(SIGTERM, sigHandler); signal(SIGTERM, sigHandler);
signal(SIGABRT, sigHandler); signal(SIGABRT, sigHandler);
std::string version{"v2.1"}; std::string version{"v2.0beta"};
std::cout << version << std::endl; std::cout << version << std::endl;
CLI::App hoymilesClient{"Client for DTU-Pro/DTU-ProS"}; CLI::App hoymilesClient{"Client for DTU-Pro/DTU-ProS"};