diff --git a/inc/hoymiles/port.h b/inc/hoymiles/port.h index 130918a..6cb1d62 100644 --- a/inc/hoymiles/port.h +++ b/inc/hoymiles/port.h @@ -28,7 +28,7 @@ class Port { // void updateParameters(std::vector ¶metersToGet, bool allParameters); - void setParametersFromMicroinverterArray(uint8_t *registers, int addressOffset); + void setParametersFromMicroinverterArray(uint16_t *registers, int addressOffset); void printParameters(std::vector ¶metersToGet, bool allParameters, bool shortNames); }; diff --git a/inc/hoymiles/portParameters/portParameters.h b/inc/hoymiles/portParameters/portParameters.h index 329ff17..93d1a8b 100644 --- a/inc/hoymiles/portParameters/portParameters.h +++ b/inc/hoymiles/portParameters/portParameters.h @@ -5,7 +5,7 @@ class PortParameterMicroinverterSerialNumber : public PortParameterInt { private: - void setValueFromRegisters(uint8_t *registers, int addressOffset); + void setValueFromRegisters(uint16_t *registers, int addressOffset); public: PortParameterMicroinverterSerialNumber(); diff --git a/inc/hoymiles/portParameters/portParametersGeneric.h b/inc/hoymiles/portParameters/portParametersGeneric.h index e209be9..b91952b 100644 --- a/inc/hoymiles/portParameters/portParametersGeneric.h +++ b/inc/hoymiles/portParameters/portParametersGeneric.h @@ -13,8 +13,10 @@ class PortParameter { uint16_t parameterAddressOffset; int registerSize; + std::string unit; + 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(); @@ -39,7 +41,7 @@ class PortParameter { 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 modubs, uint16_t portStartAddress); }; @@ -49,22 +51,22 @@ class PortParameterFloat : public PortParameter { int decimalPlaces; 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(); - virtual void setValueFromRegisters(uint8_t *registers, int addressOffset); + virtual void setValueFromRegisters(uint16_t *registers, int addressOffset); }; class PortParameterInt : public PortParameter { protected: 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(); - virtual void setValueFromRegisters(uint8_t *registers, int addressOffset); + virtual void setValueFromRegisters(uint16_t *registers, int addressOffset); }; #endif \ No newline at end of file diff --git a/src/hoymiles/dtu.cpp b/src/hoymiles/dtu.cpp index 83ab7af..96cdd5c 100644 --- a/src/hoymiles/dtu.cpp +++ b/src/hoymiles/dtu.cpp @@ -33,23 +33,17 @@ std::string Dtu::modbusErrorMessage() { return this->modbus.get()->error_msg; } Dtu::~Dtu() { this->modbus.get()->modbus_close(); } void Dtu::populateMicroinverters() { - int portStartAddress = 0x1000; - uint16_t readArrayJoined[20]; - uint8_t registers[40]; + int portStartAddress = 0x4000; + uint16_t registers[19]; 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) { return; } 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) { break; } @@ -64,9 +58,9 @@ void Dtu::populateMicroinverters() { 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); } } diff --git a/src/hoymiles/microinverter.cpp b/src/hoymiles/microinverter.cpp index 2524349..993599e 100644 --- a/src/hoymiles/microinverter.cpp +++ b/src/hoymiles/microinverter.cpp @@ -24,25 +24,29 @@ Microinverter::Microinverter(std::shared_ptr modbus, int startAddr // } void Microinverter::updateParameters(std::vector ¶metersToGet, bool allParameters) { - int registersToRead = (this->ports.size() * 40) / 2; - uint16_t registersJoined[registersToRead]; - uint8_t registers[registersToRead*2]; + int portsRead = 0; + while (portsRead < this->ports.size()) { + int portsToRead = 0; + while (portsToRead * 0x0019 < (128 - 0x0019) && (portsToRead + portsRead) < this->ports.size()) { + portsToRead++; + } - int registerCount; - registerCount = this->modbus.get()->modbus_read_holding_registers(this->startAddress, registersToRead, registersJoined); + int registersToRead = (portsToRead * 0x0019); + uint16_t registers[registersToRead]; - if(registerCount != 0) { - this->age++; - return; - } + int registerCount; + registerCount = this->modbus.get()->modbus_read_holding_registers(this->startAddress + (portsRead * 0x0019), registersToRead, registers); - for(int i{0}; i> 8; - registers[(2 * i)+1] = (registersJoined[i] & 0x00FF); - } + if (registerCount != 0) { + this->age++; + return; + } - for(int i{0}; iports.size(); i++) { - this->ports.at(i).setParametersFromMicroinverterArray(registers, i * 40); + for (int i{0}; i < portsToRead; i++) { + this->ports.at(i).setParametersFromMicroinverterArray(registers, i * 0x0019); + } + + portsRead += portsToRead; } } @@ -59,19 +63,19 @@ long long Microinverter::getTodayProduction() { long long result{0}; std::vector::iterator portsIterator = this->ports.begin(); - while(portsIterator != this->ports.end()) { + while (portsIterator != this->ports.end()) { result += portsIterator->getParameterByName("todayProduction").first.get()->getValue().first.i; portsIterator++; } - return result; + return result; } long long Microinverter::getTotalProduction() { long long result{0}; std::vector::iterator portsIterator = this->ports.begin(); - while(portsIterator != this->ports.end()) { + while (portsIterator != this->ports.end()) { result += portsIterator->getParameterByName("totalProduction").first.get()->getValue().first.i; portsIterator++; } diff --git a/src/hoymiles/port.cpp b/src/hoymiles/port.cpp index 833a0ac..7b1a518 100644 --- a/src/hoymiles/port.cpp +++ b/src/hoymiles/port.cpp @@ -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>::iterator parametersIterator = this->parameters.begin(); while(parametersIterator != this->parameters.end()) { parametersIterator->get()->setValueFromRegisters(registers, addressOffset); diff --git a/src/hoymiles/portParameters/portParameters.cpp b/src/hoymiles/portParameters/portParameters.cpp index c6e4e4a..39237cb 100644 --- a/src/hoymiles/portParameters/portParameters.cpp +++ b/src/hoymiles/portParameters/portParameters.cpp @@ -5,42 +5,43 @@ #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 = ""; for (int i{0}; i < this->registerSize; i++) { 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()); } 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) {} \ No newline at end of file +PortParameterLinkStatus::PortParameterLinkStatus() : PortParameterInt("linkStatus", "lS", "", 0x011, 1) {} \ No newline at end of file diff --git a/src/hoymiles/portParameters/portParametersGeneric.cpp b/src/hoymiles/portParameters/portParametersGeneric.cpp index 83348a2..bdea96f 100644 --- a/src/hoymiles/portParameters/portParametersGeneric.cpp +++ b/src/hoymiles/portParameters/portParametersGeneric.cpp @@ -8,9 +8,10 @@ #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->shortName = shortName; + this->unit = unit; this->parameterAddressOffset = parameterAddressOffset; this->registerSize = registerSize; @@ -20,7 +21,7 @@ PortParameter::PortParameter(std::string name, std::string shortName, uint16_t p PortParameter::~PortParameter() {} -void PortParameter::setValueFromRegisters(uint8_t *readArray, int portOffset) {} +void PortParameter::setValueFromRegisters(uint16_t *readArray, int portOffset) {} std::pair PortParameter::getValue() { return std::pair(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->valueType = Float; @@ -54,7 +55,7 @@ PortParameterFloat::PortParameterFloat(std::string name, std::string shortName, this->value.f = 0; } -void PortParameterFloat::setValueFromRegisters(uint8_t *registers, int addressOffset) { +void PortParameterFloat::setValueFromRegisters(uint16_t *registers, int addressOffset) { std::string readValueString{""}; for(int i{0}; iregisterSize; i++) { std::stringstream readValueStringStream; @@ -67,16 +68,16 @@ void PortParameterFloat::setValueFromRegisters(uint8_t *registers, int addressOf std::string PortParameterFloat::getOutputValue() { std::stringstream valueStringStream; 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->value.i = 0; } -void PortParameterInt::setValueFromRegisters(uint8_t *registers, int addressOffset) { +void PortParameterInt::setValueFromRegisters(uint16_t *registers, int addressOffset) { std::string readValueString{""}; for (int i{0}; i < this->registerSize; i++) { std::stringstream readValueStringStream; @@ -87,5 +88,5 @@ void PortParameterInt::setValueFromRegisters(uint8_t *registers, int addressOffs } std::string PortParameterInt::getOutputValue() { - return std::to_string(this->value.i); + return std::to_string(this->value.i).append(this->unit.c_str()); } \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index bd69d8e..0b22ab6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -19,7 +19,7 @@ int main(int argc, char **argv) { signal(SIGTERM, sigHandler); signal(SIGABRT, sigHandler); - std::string version{"v2.0"}; + std::string version{"v2.1"}; std::cout << version << std::endl; CLI::App hoymilesClient{"Client for DTU-Pro/DTU-ProS"};