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

Rewritten the backend, made it hella faster

Browse source
This commit is contained in:
TraYali 2024-03-28 19:44:54 +01:00
parent 4209d2767e
commit d7b59ea326
11 changed files with 176 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,12 +15,12 @@ PortParameter::PortParameter(std::string name, std::string shortName, uint16_t p
this->parameterAddressOffset = parameterAddressOffset;
this->registerSize = registerSize;
this->age = 0;
// this->age = 0;
}
PortParameter::~PortParameter() {}
void PortParameter::setValueFromRegisters(uint16_t *readArray, int registerCount) {}
void PortParameter::setValueFromRegisters(uint8_t *readArray, int portOffset) {}
std::pair<PortParameter::PortParameterValue, PortParameter::PortParameterValueType> PortParameter::getValue() {
return std::pair<PortParameter::PortParameterValue, PortParameter::PortParameterValueType>(this->value, this->valueType);
@ -30,21 +30,21 @@ std::string PortParameter::getOutputValue() {
return "yeet";
}
void PortParameter::updateValue(std::shared_ptr<class modbus> modbus, uint16_t portStartAddress) {
uint16_t readArray[this->registerSize];
int registerCount;
// void PortParameter::updateValue(std::shared_ptr<class modbus> modbus, uint16_t portStartAddress) {
// uint16_t readArray[this->registerSize];
// int registerCount;
registerCount = modbus.get()->modbus_read_holding_registers(portStartAddress + this->parameterAddressOffset, this->registerSize, readArray);
// registerCount = modbus.get()->modbus_read_holding_registers(portStartAddress + this->parameterAddressOffset, this->registerSize, readArray);
if(registerCount != 0){
this->age++;
}
else{
registerCount = this->registerSize;
this->setValueFromRegisters(readArray, registerCount);
this->age = 0;
}
}
// if(registerCount != 0){
// this->age++;
// }
// else{
// registerCount = this->registerSize;
// this->setValueFromRegisters(readArray, registerCount);
// this->age = 0;
// }
// }
PortParameterFloat::PortParameterFloat(std::string name, std::string shortName, int decimalPlaces, uint16_t parameterAddressOffset, int registerSize) : PortParameter(name, shortName, parameterAddressOffset, registerSize) {
this->decimalPlaces = decimalPlaces;
@ -54,17 +54,20 @@ PortParameterFloat::PortParameterFloat(std::string name, std::string shortName,
this->value.f = 0;
}
void PortParameterFloat::setValueFromRegisters(uint16_t *readArray, int registerCount) {
float temp = readArray[0];
temp = temp / std::pow(10, this->decimalPlaces);
this->value.f = temp;
void PortParameterFloat::setValueFromRegisters(uint8_t *registers, int addressOffset) {
std::string readValueString{""};
for(int i{0}; i<this->registerSize; i++) {
std::stringstream readValueStringStream;
readValueStringStream << (int) registers[addressOffset + this->parameterAddressOffset + i];
readValueString.append(readValueStringStream.str().c_str());
}
this->value.f = std::stoll(readValueString) / std::pow(10, this->decimalPlaces);
}
std::string PortParameterFloat::getOutputValue() {
std::string separator{"_age"};
std::stringstream valueStringStream;
valueStringStream << std::fixed << std::setprecision(this->decimalPlaces) << this->value.f;
return valueStringStream.str().append(separator.append(std::to_string(this->age)));
return valueStringStream.str();
}
PortParameterInt::PortParameterInt(std::string name, std::string shortName, uint16_t parameterAddressOffset, int registerSize) : PortParameter(name, shortName, parameterAddressOffset, registerSize) {
@ -73,18 +76,16 @@ PortParameterInt::PortParameterInt(std::string name, std::string shortName, uint
this->value.i = 0;
}
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];
readValueString.append(std::to_string(readValue));
void PortParameterInt::setValueFromRegisters(uint8_t *registers, int addressOffset) {
std::string readValueString{""};
for (int i{0}; i < this->registerSize; i++) {
std::stringstream readValueStringStream;
readValueStringStream << (int) registers[addressOffset + this->parameterAddressOffset + i];
readValueString.append(readValueStringStream.str().c_str());
}
this->value.i = std::stoll(readValueString);
}
std::string PortParameterInt::getOutputValue() {
std::string separator{"_age"};
return std::to_string(this->value.i).append(separator.append(std::to_string(this->age)));
return std::to_string(this->value.i);
}