Changed temperature parsing
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,2 +1,3 @@
|
|||||||
|
|
||||||
/build
|
/build
|
||||||
|
*.pro.user
|
||||||
|
|||||||
@@ -118,12 +118,12 @@ void MainWindow::handlePackage(int index)
|
|||||||
parameterModel_->setItem(0, 1, new QStandardItem(QString::number(inputVoltage)));
|
parameterModel_->setItem(0, 1, new QStandardItem(QString::number(inputVoltage)));
|
||||||
|
|
||||||
quint16 coolantTemperatureIndex = (message->getByte(4) << 2) + ((message->getByte(7) & 0x30) >> 4);
|
quint16 coolantTemperatureIndex = (message->getByte(4) << 2) + ((message->getByte(7) & 0x30) >> 4);
|
||||||
if (coolantTemperatureIndex > 4095)
|
if (coolantTemperatureIndex > 1023)
|
||||||
{
|
{
|
||||||
coolantTemperatureIndex = 0;
|
coolantTemperatureIndex = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
quint16 coolantTemperature = FlashTdegr[coolantTemperatureIndex] - 55;
|
qint16 coolantTemperature = FlashTdegr[coolantTemperatureIndex << 2] - 55;
|
||||||
parameterModel_->setItem(5, 1, new QStandardItem(QString::number(coolantTemperature)));
|
parameterModel_->setItem(5, 1, new QStandardItem(QString::number(coolantTemperature)));
|
||||||
|
|
||||||
quint16 outputPhaseCurrent = (message->getByte(3) << 2) + ((message->getByte(7) & 0x0C) >> 2);
|
quint16 outputPhaseCurrent = (message->getByte(3) << 2) + ((message->getByte(7) & 0x0C) >> 2);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE QtCreatorProject>
|
<!DOCTYPE QtCreatorProject>
|
||||||
<!-- Written by QtCreator 13.0.2, 2024-07-03T19:04:16. -->
|
<!-- Written by QtCreator 13.0.2, 2024-07-06T23:05:55. -->
|
||||||
<qtcreator>
|
<qtcreator>
|
||||||
<data>
|
<data>
|
||||||
<variable>EnvironmentId</variable>
|
<variable>EnvironmentId</variable>
|
||||||
@@ -582,7 +582,6 @@
|
|||||||
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
|
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
|
||||||
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
|
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
|
||||||
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
|
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
|
||||||
<value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/yshuvakin/Documents/GitHub/TkrMonitor/build/Desktop_Qt_5_15_2_MSVC2019_32bit-Debug</value>
|
|
||||||
</valuemap>
|
</valuemap>
|
||||||
<value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
|
<value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
|
||||||
</valuemap>
|
</valuemap>
|
||||||
|
|||||||
Reference in New Issue
Block a user