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

Release for adding short names

Browse source
This commit is contained in:
TraYali 2024-03-20 20:17:15 +01:00
parent a0d06edf7b
commit 25fef43d66
10 changed files with 49 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,8 +8,9 @@
#include "portParametersGeneric.h"
PortParameter::PortParameter(std::string name, uint16_t parameterAddressOffset, int registerSize) {
PortParameter::PortParameter(std::string name, std::string shortName, uint16_t parameterAddressOffset, int registerSize) {
this->name = name;
this->shortName = shortName;
this->parameterAddressOffset = parameterAddressOffset;
this->registerSize = registerSize;
@ -33,9 +34,7 @@ void PortParameter::updateValue(std::shared_ptr<class modbus> modbus, uint16_t p
uint16_t readArray[this->registerSize];
int registerCount;
// modbus_context_mutex->lock();
registerCount = modbus.get()->modbus_read_holding_registers(portStartAddress + this->parameterAddressOffset, this->registerSize, readArray);
// modbus_context_mutex->unlock();
if(registerCount != 0){
this->age++;
@ -47,7 +46,7 @@ void PortParameter::updateValue(std::shared_ptr<class modbus> modbus, uint16_t p
}
}
PortParameterFloat::PortParameterFloat(std::string name, int decimalPlaces, uint16_t parameterAddressOffset, int registerSize) : PortParameter(name, 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->valueType = Float;
@ -68,7 +67,7 @@ std::string PortParameterFloat::getOutputValue() {
return valueStringStream.str().append(separator.append(std::to_string(this->age)));
}
PortParameterInt::PortParameterInt(std::string name, uint16_t parameterAddressOffset, int registerSize) : PortParameter(name, parameterAddressOffset, registerSize) {
PortParameterInt::PortParameterInt(std::string name, std::string shortName, uint16_t parameterAddressOffset, int registerSize) : PortParameter(name, shortName, parameterAddressOffset, registerSize) {
this->valueType = Int;
this->value.i = 0;