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

Managed to implement some stuff, need to rewrite reading from DTU

Browse source
This commit is contained in:
TraYali 2024-03-17 21:33:21 +01:00
parent f3f1aa3903
commit 9c3ed916b5
10 changed files with 90 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,10 +1,25 @@
#include <cmath>
#include <string>
#include <iomanip>
#include "portParameters.h"
PortParameterMicroinverterSerialNumber::PortParameterMicroinverterSerialNumber() : PortParameterInt("microinverterSerialNumber", 0x0001, 6), PortParameter("microinverterSerialNumber", 0x1001, 6) {}
PortParameterMicroinverterSerialNumber::PortParameterMicroinverterSerialNumber() : PortParameterInt("microinverterSerialNumber", 0x0001, 6), PortParameter("microinverterSerialNumber", 0x0001, 6) {}
PortParameterPortNumber::PortParameterPortNumber() : PortParameterInt("portNumber", 0x0007, 1), PortParameter("portNumber", 0x007, 1) {}
void PortParameterMicroinverterSerialNumber::setValueFromRegisters(uint16_t *readArray, int registerCount) {
uint16_t readValue;
std::string readValueString = "";
registerCount = std::ceil(registerCount/2);
for (int i{0}; i < registerCount; i++) {
readValue = readArray[i];
std::stringstream readValueStringStream;
readValueStringStream << std::hex << readValue;
readValueString.append(readValueStringStream.str());
}
this->value.i = std::stol(readValueString);
}
PortParameterPortNumber::PortParameterPortNumber() : PortParameterInt("portNumber", 0x0007, 1), PortParameter("portNumber", 0x0007, 1) {}
void PortParameterPortNumber::setValueFromRegisters(uint16_t *readArray, int registerCount) {
if (registerCount > 0) {

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

@ -1,4 +1,6 @@
#include <cmath>
#include <memory>
#include <mutex>
#include "modbus.h"
@ -26,10 +28,13 @@ std::pair<PortParameter::PortParameterValue, PortParameter::PortParameterValueTy
std::string PortParameter::getOutputValue() {}
void PortParameter::updateValue(modbus_t *modbus_context, uint16_t portStartAddress) {
void PortParameter::updateValue(std::shared_ptr<modbus_t*> modbus_context, std::mutex *modbus_context_mutex, uint16_t portStartAddress) {
uint16_t readArray[this->registerSize];
int registerCount;
registerCount = modbus_read_registers(modbus_context, portStartAddress + this->parameterAddressOffset, this->registerSize, readArray);
modbus_context_mutex->lock();
registerCount = modbus_read_registers(*modbus_context.get(), portStartAddress + this->parameterAddressOffset, this->registerSize, readArray);
modbus_context_mutex->unlock();
if(registerCount == -1){
this->age++;
@ -66,13 +71,13 @@ PortParameterInt::PortParameterInt(std::string name, uint16_t parameterAddressOf
void PortParameterInt::setValueFromRegisters(uint16_t *readArray, int registerCount) {
uint16_t readValue;
std::string readValueString = "";
registerCount = std::ceil(registerCount/2);
for (int i{0}; i < registerCount; i++) {
readValue = (readArray[i] & 0xFF00);
this->value.i += readValue * std::pow(10, ((registerCount * 2) - ((registerCount - i) * 2)));
readValue = readArray[i] & 0x00FF;
this->value.i += readValue * std::pow(10, ((registerCount * 2) - ((registerCount - i) * 2)));
readValue = readArray[i];
readValueString.append(std::to_string(readValue));
}
this->value.i = std::stol(readValueString);
}
std::string PortParameterInt::getOutputValue() {