diff --git a/dbchandler.cpp b/dbchandler.cpp index 0c1dc71..d757f25 100644 --- a/dbchandler.cpp +++ b/dbchandler.cpp @@ -15,7 +15,7 @@ void DBCHandler::loadDBCFile(QString filename) QString line; QRegularExpression regex; QRegularExpressionMatch match; - DBC_MESSAGE *currentMessage; + DBC_MESSAGE *currentMessage = NULL; qDebug() << "DBC File: " << filename; diff --git a/filecomparatorwindow.cpp b/filecomparatorwindow.cpp index 1bebe2d..c7dde9c 100644 --- a/filecomparatorwindow.cpp +++ b/filecomparatorwindow.cpp @@ -88,8 +88,8 @@ void FileComparatorWindow::calculateDetails() { QMap interestedIDs; QMap referenceIDs; - QTreeWidgetItem *interestedOnlyBase, *referenceOnlyBase, *sharedBase, *bitmapBaseInterested, *bitmapBaseReference; - QTreeWidgetItem *valuesBase, *detail, *sharedItem, *valuesInterested, *valuesReference; + QTreeWidgetItem *interestedOnlyBase, *referenceOnlyBase = NULL, *sharedBase, *bitmapBaseInterested, *bitmapBaseReference = NULL; + QTreeWidgetItem *valuesBase, *detail, *sharedItem, *valuesInterested, *valuesReference = NULL; uint64_t tmp; bool uniqueInterested = ui->ckUniqueToInterested->isChecked(); diff --git a/framesenderwindow.cpp b/framesenderwindow.cpp index acaa6ef..e0b2452 100644 --- a/framesenderwindow.cpp +++ b/framesenderwindow.cpp @@ -391,27 +391,30 @@ void FrameSenderWindow::doModifiers(int idx) second = fetchOperand(idx, op.second); switch (op.operation) { - case ADDITION: - shadowReg = first + second; - break; - case AND: - shadowReg = first & second; - break; - case DIVISION: - shadowReg = first / second; - break; - case MULTIPLICATION: - shadowReg = first * second; - break; - case OR: - shadowReg = first | second; - break; - case SUBTRACTION: - shadowReg = first - second; - break; - case XOR: - shadowReg = first ^ second; - break; + case ADDITION: + shadowReg = first + second; + break; + case AND: + shadowReg = first & second; + break; + case DIVISION: + shadowReg = first / second; + break; + case MULTIPLICATION: + shadowReg = first * second; + break; + case OR: + shadowReg = first | second; + break; + case SUBTRACTION: + shadowReg = first - second; + break; + case XOR: + shadowReg = first ^ second; + break; + case NOT: + shadowReg = !shadowReg; + break; } } //Finally, drop the result into the proper data byte diff --git a/serialworker.cpp b/serialworker.cpp index dfe80f8..1a004c1 100644 --- a/serialworker.cpp +++ b/serialworker.cpp @@ -395,6 +395,19 @@ void SerialWorker::procRXChar(unsigned char c) } rx_step++; 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; + } }