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

Additional work to clean up warnings and make the code more robust.

Browse Source
This commit is contained in:
Collin Kidder
2015-08-26 22:22:24 -04:00
parent 004b430ca7
commit 629ad5ec6c
4 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbchandler.cpp
+1 -1
View File
@@ -15,7 +15,7 @@ void DBCHandler::loadDBCFile(QString filename)
QString line; QString line;
QRegularExpression regex; QRegularExpression regex;
QRegularExpressionMatch match; QRegularExpressionMatch match;
DBC_MESSAGE *currentMessage; DBC_MESSAGE *currentMessage = NULL;
qDebug() << "DBC File: " << filename; qDebug() << "DBC File: " << filename;
filecomparatorwindow.cpp
+2 -2
View File
@@ -88,8 +88,8 @@ void FileComparatorWindow::calculateDetails()
{ {
QMap<int, FrameData> interestedIDs; QMap<int, FrameData> interestedIDs;
QMap<int, FrameData> referenceIDs; QMap<int, FrameData> referenceIDs;
QTreeWidgetItem *interestedOnlyBase, *referenceOnlyBase, *sharedBase, *bitmapBaseInterested, *bitmapBaseReference; QTreeWidgetItem *interestedOnlyBase, *referenceOnlyBase = NULL, *sharedBase, *bitmapBaseInterested, *bitmapBaseReference = NULL;
QTreeWidgetItem *valuesBase, *detail, *sharedItem, *valuesInterested, *valuesReference; QTreeWidgetItem *valuesBase, *detail, *sharedItem, *valuesInterested, *valuesReference = NULL;
uint64_t tmp; uint64_t tmp;
bool uniqueInterested = ui->ckUniqueToInterested->isChecked(); bool uniqueInterested = ui->ckUniqueToInterested->isChecked();
framesenderwindow.cpp
+24 -21
View File
@@ -391,27 +391,30 @@ void FrameSenderWindow::doModifiers(int idx)
second = fetchOperand(idx, op.second); second = fetchOperand(idx, op.second);
switch (op.operation) switch (op.operation)
{ {
case ADDITION: case ADDITION:
shadowReg = first + second; shadowReg = first + second;
break; break;
case AND: case AND:
shadowReg = first & second; shadowReg = first & second;
break; break;
case DIVISION: case DIVISION:
shadowReg = first / second; shadowReg = first / second;
break; break;
case MULTIPLICATION: case MULTIPLICATION:
shadowReg = first * second; shadowReg = first * second;
break; break;
case OR: case OR:
shadowReg = first | second; shadowReg = first | second;
break; break;
case SUBTRACTION: case SUBTRACTION:
shadowReg = first - second; shadowReg = first - second;
break; break;
case XOR: case XOR:
shadowReg = first ^ second; shadowReg = first ^ second;
break; break;
case NOT:
shadowReg = !shadowReg;
break;
} }
} }
//Finally, drop the result into the proper data byte //Finally, drop the result into the proper data byte
serialworker.cpp
+13
View File
@@ -395,6 +395,19 @@ void SerialWorker::procRXChar(unsigned char c)
} }
rx_step++; rx_step++;
break; break;
case TIME_SYNC:
rx_state = IDLE;
break;
case SET_DIG_OUTPUTS:
rx_state = IDLE;
break;
case SETUP_CANBUS:
rx_state = IDLE;
break;
case SET_SINGLEWIRE_MODE:
rx_state = IDLE;
break;
} }
} }