diff --git a/.gitignore b/.gitignore index e464c60..3c29af1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /build +*.pro.user diff --git a/MainWindow.cpp b/MainWindow.cpp index 79a9def..c35518b 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -118,12 +118,12 @@ void MainWindow::handlePackage(int index) parameterModel_->setItem(0, 1, new QStandardItem(QString::number(inputVoltage))); quint16 coolantTemperatureIndex = (message->getByte(4) << 2) + ((message->getByte(7) & 0x30) >> 4); - if (coolantTemperatureIndex > 4095) + if (coolantTemperatureIndex > 1023) { coolantTemperatureIndex = 0; } - quint16 coolantTemperature = FlashTdegr[coolantTemperatureIndex] - 55; + qint16 coolantTemperature = FlashTdegr[coolantTemperatureIndex << 2] - 55; parameterModel_->setItem(5, 1, new QStandardItem(QString::number(coolantTemperature))); quint16 outputPhaseCurrent = (message->getByte(3) << 2) + ((message->getByte(7) & 0x0C) >> 2); diff --git a/TkrMonitor.pro.user b/TkrMonitor.pro.user index b2f8fd4..1a25bb9 100644 --- a/TkrMonitor.pro.user +++ b/TkrMonitor.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -582,7 +582,6 @@ true true true - C:/Users/yshuvakin/Documents/GitHub/TkrMonitor/build/Desktop_Qt_5_15_2_MSVC2019_32bit-Debug 1