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

More fixes for compiler warnings - cleaning up code and making assumptions more clear

Browse Source
This commit is contained in:
Collin Kidder
2019-08-12 22:02:07 -04:00
parent ce427a75b0
commit b6a15a28cd
6 changed files with 78 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
canframemodel.cpp
+3 -3
View File
@@ -209,12 +209,12 @@ uint64_t CANFrameModel::getCANFrameVal(int row, Column col)
if (frame.isReceived) return 1;
return 0;
case Column::Bus:
return frame.bus;
return static_cast<uint64_t>(frame.bus);
case Column::Length:
return frame.len;
return static_cast<uint64_t>(frame.len);
case Column::ASCII: //sort both the same for now
case Column::Data:
for (uint32_t i = 0; i < frame.len; i++) temp += ((uint64_t)frame.data[i] << (56 - (8 * i)));
for (int i = 0; i < frame.len; i++) temp += (static_cast<uint64_t>(frame.data[i]) << (56 - (8 * i)));
//qDebug() << temp;
return temp;
case Column::NUM_COLUMN: