YShuvakin/StandBatteryView
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Now statuses have different colors. Various minor fixes

Browse Source
This commit is contained in:
Yury Shuvakin
2025-08-15 18:53:38 +09:00
parent 978f6ee04d
commit b861ce003c
11 changed files with 124 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
CanController.cpp
View File

@@ -238,19 +238,19 @@ void CanController::handleControlParameters(const CanMessage* message, qsizetype
quint16 capacity = 0;
stream >> capacity;
batteries_.at(batteryIndex)->setControlCapacity(parameterToVariant(capacity));
batteries_.at(batteryIndex)->setControlCapacity(doubleParameterToVariant(capacity));
quint16 temperature = 0;
stream >> temperature;
batteries_.at(batteryIndex)->setControlTemperature(parameterToVariant(temperature));
batteries_.at(batteryIndex)->setControlTemperature(intParameterToVariant(temperature));
quint16 current = 0;
qint16 current = 0;
stream >> current;
batteries_.at(batteryIndex)->setControlCurrent(parameterToVariant(current));
batteries_.at(batteryIndex)->setControlCurrent(intParameterToVariant(current));
quint16 voltage = 0;
stream >> voltage;
batteries_.at(batteryIndex)->setControlVoltage(parameterToVariant(voltage));
batteries_.at(batteryIndex)->setControlVoltage(doubleParameterToVariant(voltage));
}
void CanController::handleMeasuredParameters(const CanMessage* message, qsizetype batteryIndex)
@@ -260,19 +260,19 @@ void CanController::handleMeasuredParameters(const CanMessage* message, qsizetyp
quint16 capacity = 0;
stream >> capacity;
batteries_.at(batteryIndex)->setMeasuredCapacity(parameterToVariant(capacity));
batteries_.at(batteryIndex)->setMeasuredCapacity(doubleParameterToVariant(capacity));
quint16 temperature = 0;
stream >> temperature;
batteries_.at(batteryIndex)->setMeasuredTemperature(parameterToVariant(temperature));
batteries_.at(batteryIndex)->setMeasuredTemperature(intParameterToVariant(temperature));
quint16 current = 0;
qint16 current = 0;
stream >> current;
batteries_.at(batteryIndex)->setMeasuredCurrent(parameterToVariant(current));
batteries_.at(batteryIndex)->setMeasuredCurrent(intParameterToVariant(current));
quint16 voltage = 0;
stream >> voltage;
batteries_.at(batteryIndex)->setMeasuredVoltage(parameterToVariant(voltage));
batteries_.at(batteryIndex)->setMeasuredVoltage(doubleParameterToVariant(voltage));
}
void CanController::handleStatusParameters(const CanMessage* message, qsizetype batteryIndex)
@@ -290,7 +290,7 @@ void CanController::handleStatusParameters(const CanMessage* message, qsizetype
stream.skipRawData(1);
quint16 status = 0;
quint32 status = 0;
stream >> status;
batteries_.at(batteryIndex)->addStatus(status);
}
@@ -350,7 +350,3 @@ QList<quint16> CanController::registerAddresses() const
return {0x200, 0x280, 0x300, 0x380, 0x400, 0x480, 0x500, 0x580};
}
QVariant CanController::parameterToVariant(quint16 parameter) const
{
return parameter == 0xFFFF ? QVariant() : QVariant::fromValue(parameter / 10.0);
}