t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A few bug fixes

Browse Source
This commit is contained in:
Collin Kidder
2017-08-13 20:27:15 -04:00
parent 0b7a3d7c18
commit fb634fe9b5
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
canframemodel.cpp
+1 -1
View File
@@ -294,7 +294,7 @@ QVariant CANFrameModel::data(const QModelIndex &index, int role) const
if (msg != NULL) if (msg != NULL)
{ {
tempString.append("\n"); tempString.append("\n");
tempString.append(msg->name + " " + msg->comment + "\n"); tempString.append(msg->name + "\n" + msg->comment + "\n");
for (int j = 0; j < msg->sigHandler->getCount(); j++) for (int j = 0; j < msg->sigHandler->getCount(); j++)
{ {
QString sigString; QString sigString;
dbc/dbc_classes.cpp
+1 -1
View File
@@ -104,8 +104,8 @@ bool DBC_SIGNAL::processAsText(const CANFrame &frame, QString &outString)
foundVal = true; foundVal = true;
break; break;
} }
if (!foundVal) outputString += QString::number(endResult) + unitName;
} }
if (!foundVal) outputString += QString::number(endResult) + unitName;
} }
else //otherwise display the actual number and unit (if it exists) else //otherwise display the actual number and unit (if it exists)
{ {
motorcontrollerconfigwindow.cpp
+2 -2
View File
@@ -200,13 +200,13 @@ void MotorControllerConfigWindow::timerTick()
} }
else //save current value of all data items else //save current value of all data items
{ {
uint16 thisValue; uint16_t thisValue;
qDebug() << "Transmission: " << QString::number(transmitStep); qDebug() << "Transmission: " << QString::number(transmitStep);
QString cellVal = ui->tableParams->item(transmitStep, 1)->text(); QString cellVal = ui->tableParams->item(transmitStep, 1)->text();
if (params[transmitStep].paramType != HEX) if (params[transmitStep].paramType != HEX)
thisValue = (uint16_t)QString::number(cellVal); thisValue = (uint16_t)Utility::ParseStringToNum(cellVal);
else else
thisValue = (uint16_t)Utility::ParseStringToNum(cellVal); thisValue = (uint16_t)Utility::ParseStringToNum(cellVal);