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

Release v2.1 #16

Merged
trabus322 merged 2 commits from master into release 2024-04-05 16:00:48 +02:00
Conversation 0 Commits 2 Files changed 17 +66 -64
9 changed files with 66 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 35c4c661c7 - Show all commits

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(uint8_t *registers, int addressOffset); void setParametersFromMicroinverterArray(uint16_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(uint8_t *registers, int addressOffset); void setValueFromRegisters(uint16_t *registers, int addressOffset);
public: public:
PortParameterMicroinverterSerialNumber(); PortParameterMicroinverterSerialNumber();

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

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

16
src/hoymiles/dtu.cpp
View file

@ -33,23 +33,17 @@ 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 = 0x1000; int portStartAddress = 0x4000;
uint16_t readArrayJoined[20]; uint16_t registers[19];
uint8_t registers[40];
int registerCount; int registerCount;
registerCount = this->modbus.get()->modbus_read_holding_registers(portStartAddress, 20, readArrayJoined); registerCount = this->modbus.get()->modbus_read_holding_registers(portStartAddress, 19, registers);
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;
} }
@ -64,9 +58,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 += 0x0028; portStartAddress += 0x0019;
registerCount = this->modbus.get()->modbus_read_holding_registers(portStartAddress, 20, readArrayJoined); registerCount = this->modbus.get()->modbus_read_holding_registers(portStartAddress, 19, registers);
} }
} }

28
src/hoymiles/microinverter.cpp
View file

@ -24,25 +24,29 @@ 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 registersToRead = (this->ports.size() * 40) / 2; int portsRead = 0;
uint16_t registersJoined[registersToRead]; while (portsRead < this->ports.size()) {
uint8_t registers[registersToRead*2]; int portsToRead = 0;
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, registersToRead, registersJoined); registerCount = this->modbus.get()->modbus_read_holding_registers(this->startAddress + (portsRead * 0x0019), registersToRead, registers);
if(registerCount != 0) { if (registerCount != 0) {
this->age++; this->age++;
return; return;
} }
for(int i{0}; i<registersToRead; i++) { for (int i{0}; i < portsToRead; i++) {
registers[2 * i] = (registersJoined[i] & 0xFF00) >> 8; this->ports.at(i).setParametersFromMicroinverterArray(registers, i * 0x0019);
registers[(2 * i)+1] = (registersJoined[i] & 0x00FF);
} }
for(int i{0}; i<this->ports.size(); i++) { portsRead += portsToRead;
this->ports.at(i).setParametersFromMicroinverterArray(registers, i * 40);
} }
} }
@ -59,7 +63,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++;
} }
@ -71,7 +75,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(uint8_t *registers, int addressOffset) { void Port::setParametersFromMicroinverterArray(uint16_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,42 +5,43 @@
#include "portParameters.h" #include "portParameters.h"
PortParameterMicroinverterSerialNumber::PortParameterMicroinverterSerialNumber() : PortParameterInt("microinverterSerialNumber", "mSN", 0x0001, 6) {} PortParameterMicroinverterSerialNumber::PortParameterMicroinverterSerialNumber() : PortParameterInt("microinverterSerialNumber", "mSN", "", 0x0001, 3) {}
void PortParameterMicroinverterSerialNumber::setValueFromRegisters(uint8_t *registers, int addressOffset) { void PortParameterMicroinverterSerialNumber::setValueFromRegisters(uint16_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]; readValueStringStream << std::hex << (int) ((registers[addressOffset + this->parameterAddressOffset + i] & 0xff00) > 8);
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", 0x0007, 1) {} PortParameterPortNumber::PortParameterPortNumber() : PortParameterInt("portNumber", "pN", "", 0x0004, 1) {}
PortParameterPvVoltage::PortParameterPvVoltage() : PortParameterFloat("pvVoltage", "pvU", 1, 0x0008, 2) {} PortParameterPvVoltage::PortParameterPvVoltage() : PortParameterFloat("pvVoltage", "pvU", "V", 1, 0x0005, 1) {}
PortParameterPvCurrentMi::PortParameterPvCurrentMi() : PortParameterFloat("pvCurrentMI", "pvIMI", 1, 0x000a, 2) {} PortParameterPvCurrentMi::PortParameterPvCurrentMi() : PortParameterFloat("pvCurrentMI", "pvIMI", "A", 1, 0x0006, 1) {}
PortParameterPvCurrentHm::PortParameterPvCurrentHm() : PortParameterFloat("pvCurrentHM", "pvIHM", 2, 0x000a, 2) {} PortParameterPvCurrentHm::PortParameterPvCurrentHm() : PortParameterFloat("pvCurrentHM", "pvIHM", "A", 2, 0x0006, 1) {}
PortParameterGridVoltage::PortParameterGridVoltage() : PortParameterFloat("gridVoltage", "gU", 1, 0x000c, 2) {} PortParameterGridVoltage::PortParameterGridVoltage() : PortParameterFloat("gridVoltage", "gU", "V", 1, 0x0007, 1) {}
PortParameterGridFrequency::PortParameterGridFrequency() : PortParameterFloat("gridFrequency", "gF", 2, 0x000e, 2) {} PortParameterGridFrequency::PortParameterGridFrequency() : PortParameterFloat("gridFrequency", "gF", "Hz", 2, 0x0008, 1) {}
PortParameterPvPower::PortParameterPvPower() : PortParameterFloat("pvPower", "pvP", 1, 0x0010, 2) {} PortParameterPvPower::PortParameterPvPower() : PortParameterFloat("pvPower", "pvP", "W", 1, 0x0009, 1) {}
PortParameterTodayProduction::PortParameterTodayProduction() : PortParameterInt("todayProduction", "tdP", 0x0012, 2) {} PortParameterTodayProduction::PortParameterTodayProduction() : PortParameterInt("todayProduction", "tdP", "Wh", 0x000A, 1) {}
PortParameterTotalProduction::PortParameterTotalProduction() : PortParameterInt("totalProduction", "ttP", 0x0014, 4) {} PortParameterTotalProduction::PortParameterTotalProduction() : PortParameterInt("totalProduction", "ttP", "Wh", 0x000B, 2) {}
PortParameterTemperature::PortParameterTemperature() : PortParameterFloat("temperature", "t", 1, 0x0018, 2) {} PortParameterTemperature::PortParameterTemperature() : PortParameterFloat("temperature", "t", "C", 1, 0x000D, 1) {}
PortParameterOperatingStatus::PortParameterOperatingStatus() : PortParameterInt("operatingStatus", "oS", 0x001a, 2) {} PortParameterOperatingStatus::PortParameterOperatingStatus() : PortParameterInt("operatingStatus", "oS", "", 0x000e, 1) {}
PortParameterAlarmCode::PortParameterAlarmCode() : PortParameterInt("alarmCode", "aC", 0x001c, 2) {} PortParameterAlarmCode::PortParameterAlarmCode() : PortParameterInt("alarmCode", "aC", "", 0x000f, 1) {}
PortParameterAlarmCount::PortParameterAlarmCount() : PortParameterInt("alarmCount", "aCnt", 0x001e, 2) {} PortParameterAlarmCount::PortParameterAlarmCount() : PortParameterInt("alarmCount", "aCnt", "", 0x0010, 1) {}
PortParameterLinkStatus::PortParameterLinkStatus() : PortParameterInt("linkStatus", "lS", 0x020, 2) {} PortParameterLinkStatus::PortParameterLinkStatus() : PortParameterInt("linkStatus", "lS", "", 0x011, 1) {}

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

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

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.0"}; std::string version{"v2.1"};
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"};