Polymorphism "works"
This commit is contained in:
parent
b0e50c140e
commit
d0f8e5b885
10 changed files with 274 additions and 287 deletions
150
src/hoymiles.cpp
150
src/hoymiles.cpp
|
|
@ -1,150 +0,0 @@
|
|||
#include "hoymiles.h"
|
||||
#include "modbus.h"
|
||||
|
||||
#include <cmath>
|
||||
#include <iostream>
|
||||
#include <typeinfo>
|
||||
|
||||
Dtu::Dtu(const char *ip_address, int port) {
|
||||
this->modbus_context = modbus_new_tcp(ip_address, port);
|
||||
if (modbus_connect(this->modbus_context) == -1) {
|
||||
std::cerr << "conn_error";
|
||||
modbus_free(this->modbus_context);
|
||||
abort();
|
||||
}
|
||||
|
||||
this->populateMicroinverters();
|
||||
}
|
||||
|
||||
Dtu::~Dtu() {
|
||||
modbus_close(this->modbus_context);
|
||||
modbus_free(this->modbus_context);
|
||||
}
|
||||
|
||||
void Dtu::populateMicroinverters() {
|
||||
uint16_t address{0x1000};
|
||||
Microinverter microinverter{this->modbus_context};
|
||||
this->microinverters.push_back(microinverter);
|
||||
}
|
||||
|
||||
void Dtu::updateMicroinverters() {
|
||||
std::vector<Microinverter>::iterator microinvertersIterator = this->microinverters.begin();
|
||||
while (microinvertersIterator != this->microinverters.end()) {
|
||||
microinvertersIterator->updatePorts();
|
||||
microinvertersIterator++;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
void Microinverter::populatePorts() {
|
||||
Port port{this->modbus_context, 0x1000};
|
||||
|
||||
this->ports.push_back(port);
|
||||
}
|
||||
|
||||
void Microinverter::updatePorts() {
|
||||
for(Port port : this->ports){
|
||||
port.updateParameters();
|
||||
}
|
||||
}
|
||||
|
||||
Microinverter::Microinverter(modbus_t *modbus_context) {
|
||||
this->modbus_context = modbus_context;
|
||||
|
||||
this->populatePorts();
|
||||
}
|
||||
|
||||
|
||||
|
||||
Port::Port(modbus_t *modbus_context, uint16_t portStartAddress) {
|
||||
this->modbus_context = modbus_context;
|
||||
this->portStartAddress = portStartAddress;
|
||||
|
||||
this->populateParameters();
|
||||
}
|
||||
|
||||
void Port::populateParameters() {
|
||||
PortParameterFloat portParameterFloat{"gridVoltage", 0x0034, 2, 1};
|
||||
this->parameters.push_back(std::make_shared<PortParameterFloat>(portParameterFloat));
|
||||
|
||||
PortParameterSerialNumber portParameterSerialNumber{};
|
||||
this->parameters.push_back(std::make_shared<PortParameterSerialNumber>(portParameterSerialNumber));
|
||||
}
|
||||
|
||||
void Port::updateParameters() {
|
||||
std::vector<std::shared_ptr<PortParameter>>::iterator parametersIterator{this->parameters.begin()};
|
||||
while(parametersIterator != this->parameters.end()){
|
||||
parametersIterator->get()->updateValue(this->modbus_context, this->portStartAddress);
|
||||
parametersIterator++;
|
||||
}
|
||||
}
|
||||
|
||||
std::shared_ptr<PortParameter> Port::getParameterById(int i) {
|
||||
return this->parameters.at(i);
|
||||
}
|
||||
|
||||
|
||||
|
||||
PortParameter::PortParameter(std::string name, uint16_t addressOffset, int registerSize) {
|
||||
this->name = name;
|
||||
|
||||
this->addressOffset = addressOffset;
|
||||
this->registerSize = registerSize;
|
||||
}
|
||||
|
||||
void PortParameter::updateValue(modbus_t *modbus_context, uint16_t microinverterAddress) {
|
||||
uint16_t readArray[this->registerSize];
|
||||
int registerCount;
|
||||
registerCount = modbus_read_registers(modbus_context, microinverterAddress + this->addressOffset, this->registerSize, readArray);
|
||||
registerCount = 2;
|
||||
readArray[0] = 2309;
|
||||
readArray[1] = 4354;
|
||||
if (registerCount == -1) {
|
||||
this->age++;
|
||||
} else {
|
||||
this->setValue(readArray, registerCount);
|
||||
this->age = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void PortParameter::setValue(uint16_t *readArray, int registerCount) {}
|
||||
|
||||
|
||||
|
||||
template<typename Type>
|
||||
PortParameterTemplate<Type>::PortParameterTemplate(std::string name, uint16_t addressOffset, int registerSize) : PortParameter(name, addressOffset, registerSize) {}
|
||||
|
||||
|
||||
|
||||
PortParameterFloat::PortParameterFloat(std::string name, uint16_t addressOffset, int registerSize, int decimalPlaces) : PortParameterTemplate<float>(name, addressOffset, registerSize), PortParameter(name, addressOffset, registerSize) {
|
||||
this->decimalPlaces = decimalPlaces;
|
||||
this->value = 0;
|
||||
}
|
||||
|
||||
void PortParameterFloat::setValue(uint16_t *readArray, int registerCount) {
|
||||
uint16_t readValue{readArray[0]};
|
||||
|
||||
this->value = readValue / std::pow(10, this->decimalPlaces);
|
||||
}
|
||||
|
||||
template<typename Type>
|
||||
Type PortParameterTemplate<Type>::getValue() {
|
||||
return this->value;
|
||||
}
|
||||
|
||||
|
||||
|
||||
PortParameterSerialNumber::PortParameterSerialNumber() : PortParameterTemplate<std::string>("serialNumber", 0x0001, 6), PortParameter("serialNumber", 0x0001, 6) {};
|
||||
|
||||
void PortParameterSerialNumber::setValue(uint16_t *readArray, int registerCount) {
|
||||
uint16_t readValue;
|
||||
int registerCountCorrected = std::min(3, registerCount);
|
||||
for(int i{0}; i<registerCountCorrected; i++){
|
||||
readValue = readArray[i] & 0xFF00;
|
||||
this->value+= readValue * std::pow(10, (registerCountCorrected-i)*2);
|
||||
|
||||
readValue = readArray[i] & 0x00FF;
|
||||
this->value+= readValue * std::pow(10, ((registerCountCorrected-i)*2)-1);
|
||||
}
|
||||
}
|
||||
40
src/hoymiles/dtu.cpp
Normal file
40
src/hoymiles/dtu.cpp
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
#include <vector>
|
||||
#include <iostream>
|
||||
|
||||
#include "modbus.h"
|
||||
|
||||
#include "dtu.h"
|
||||
#include "microinverter.h"
|
||||
|
||||
struct _modbus;
|
||||
typedef _modbus modbus_t;
|
||||
|
||||
Dtu::Dtu(const char *ip_address, int port) {
|
||||
this->modbus_context = modbus_new_tcp(ip_address, port);
|
||||
if (modbus_connect(this->modbus_context) == -1) {
|
||||
std::cerr << "conn_error";
|
||||
modbus_free(this->modbus_context);
|
||||
abort();
|
||||
}
|
||||
|
||||
this->populateMicroinverters();
|
||||
}
|
||||
|
||||
Dtu::~Dtu() {
|
||||
modbus_close(this->modbus_context);
|
||||
modbus_free(this->modbus_context);
|
||||
}
|
||||
|
||||
void Dtu::populateMicroinverters() {
|
||||
uint16_t address{0x1000};
|
||||
Microinverter microinverter{this->modbus_context};
|
||||
this->microinverters.push_back(microinverter);
|
||||
}
|
||||
|
||||
void Dtu::updateMicroinverters() {
|
||||
std::vector<Microinverter>::iterator microinvertersIterator = this->microinverters.begin();
|
||||
while (microinvertersIterator != this->microinverters.end()) {
|
||||
microinvertersIterator->updatePorts();
|
||||
microinvertersIterator++;
|
||||
}
|
||||
}
|
||||
20
src/hoymiles/microinverter.cpp
Normal file
20
src/hoymiles/microinverter.cpp
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
#include "microinverter.h"
|
||||
#include "port.h"
|
||||
|
||||
Microinverter::Microinverter(modbus_t *modbus_context) {
|
||||
this->modbus_context = modbus_context;
|
||||
|
||||
this->populatePorts();
|
||||
}
|
||||
|
||||
void Microinverter::populatePorts() {
|
||||
Port port{this->modbus_context, 0x1000};
|
||||
|
||||
this->ports.push_back(port);
|
||||
}
|
||||
|
||||
void Microinverter::updatePorts() {
|
||||
for(Port port : this->ports){
|
||||
port.updateParameters();
|
||||
}
|
||||
}
|
||||
78
src/hoymiles/port.cpp
Normal file
78
src/hoymiles/port.cpp
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
#include <vector>
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include <cmath>
|
||||
#include <memory>
|
||||
|
||||
#include "modbus.h"
|
||||
|
||||
#include "port.h"
|
||||
|
||||
Port::Port(modbus_t *modbus_context, uint16_t portStartAddress) {
|
||||
this->modbus_context = modbus_context;
|
||||
this->portStartAddress = portStartAddress;
|
||||
|
||||
this->populateParameters();
|
||||
}
|
||||
|
||||
void Port::populateParameters() {
|
||||
PortParameterFloat portParameterFloat{"gridVoltage", 1, 0x001a, 2};
|
||||
this->parameters.push_back(std::make_shared<PortParameterFloat>(portParameterFloat));
|
||||
}
|
||||
|
||||
void Port::updateParameters() {
|
||||
std::vector<std::shared_ptr<PortParameter>>::iterator parametersIterator{this->parameters.begin()};
|
||||
while (parametersIterator != this->parameters.end()) {
|
||||
parametersIterator->get()->updateValue(this->modbus_context, this->portStartAddress);
|
||||
parametersIterator++;
|
||||
}
|
||||
}
|
||||
|
||||
PortParameter::PortParameter(std::string name, uint16_t parameterAddressOffset, int registerSize) {
|
||||
this->name = name;
|
||||
|
||||
this->parameterAddressOffset = parameterAddressOffset;
|
||||
this->registerSize = registerSize;
|
||||
}
|
||||
|
||||
PortParameter::~PortParameter() {}
|
||||
|
||||
void PortParameter::setValueFromRegisters(uint16_t *readArray, int registerCount) {}
|
||||
|
||||
std::pair<PortParameter::PortParameterValue, PortParameter::PortParameterValueType> PortParameter::getValue() {
|
||||
return std::pair<PortParameter::PortParameterValue, PortParameter::PortParameterValueType>(this->value, this->valueType);
|
||||
}
|
||||
|
||||
std::string PortParameter::getOutputValue() {}
|
||||
|
||||
void PortParameter::updateValue(modbus_t *modbus_context, uint16_t portStartAddress) {
|
||||
uint16_t readArray[this->registerSize];
|
||||
int registerCount;
|
||||
registerCount = modbus_read_registers(modbus_context, portStartAddress + this->parameterAddressOffset, this->registerSize, readArray);
|
||||
|
||||
registerCount = 2;
|
||||
readArray[0] = 2312;
|
||||
readArray[1] = 5432;
|
||||
|
||||
if(registerCount == -1){
|
||||
std::cerr << "read_error";
|
||||
return;
|
||||
}
|
||||
else{
|
||||
this->setValueFromRegisters(readArray, registerCount);
|
||||
}
|
||||
}
|
||||
|
||||
PortParameterFloat::PortParameterFloat(std::string name, int decimalPlaces, uint16_t parameterAddressOffset, int registerSize) : PortParameter(name, parameterAddressOffset, registerSize) {
|
||||
this->decimalPlaces = decimalPlaces;
|
||||
|
||||
this->valueType = Float;
|
||||
}
|
||||
|
||||
void PortParameterFloat::setValueFromRegisters(uint16_t *readArray, int registerCount) {
|
||||
this->value.f = readArray[0] / std::pow(10, this->decimalPlaces);
|
||||
}
|
||||
|
||||
std::string PortParameterFloat::getOutputValue() {
|
||||
return std::to_string(this->value.f);
|
||||
}
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
#include <chrono>
|
||||
#include <thread>
|
||||
|
||||
#include "hoymiles.h"
|
||||
#include "modbus.h"
|
||||
#include "dtu.h"
|
||||
|
||||
int main(){
|
||||
|
||||
|
|
@ -21,7 +21,5 @@ int main(){
|
|||
|
||||
hoymilesPort.updateParameters();
|
||||
|
||||
std::shared_ptr<PortParameter> temp{hoymilesPort.getParameterById(0)};
|
||||
float temp2 = temp.get()->getValue();
|
||||
return 0;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue