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

Many little fixes to clean up warnings and bugs.

Browse Source
This commit is contained in:
Collin Kidder
2016-12-29 20:50:02 -05:00
parent beea680106
commit 7222870b1e
29 changed files with 69 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framesenderwindow.cpp
+5 -6
View File
@@ -140,9 +140,9 @@ void FrameSenderWindow::processIncomingFrame(CANFrame *frame)
Trigger *thisTrigger = &sendingData[sd].triggers[trig];
qDebug() << "Trigger ID: " << thisTrigger->ID;
qDebug() << "Frame ID: " << frame->ID;
if (thisTrigger->ID > 0 && thisTrigger->ID == frame->ID)
if (thisTrigger->ID > 0 && (uint32_t)thisTrigger->ID == frame->ID)
{
if (thisTrigger->bus == frame->bus || thisTrigger->bus == -1)
if ((uint32_t)thisTrigger->bus == frame->bus || thisTrigger->bus == -1)
{
if (thisTrigger->currCount < thisTrigger->maxCount)
{
@@ -458,7 +458,7 @@ CANFrame* FrameSenderWindow::lookupFrame(int ID, int bus)
{
if (!frameCache.contains(ID)) return NULL;
if (bus == -1 || frameCache[ID].bus == bus) return &frameCache[ID];
if (bus == -1 || frameCache[ID].bus == (unsigned int)bus) return &frameCache[ID];
return NULL;
}
@@ -472,7 +472,7 @@ void FrameSenderWindow::processModifierText(int line)
{
qDebug() << "processModifierText";
QString modString;
bool firstOp = true;
//bool firstOp = true;
bool abort = false;
QString token;
ModifierOp thisOp;
@@ -496,7 +496,6 @@ void FrameSenderWindow::processModifierText(int line)
{
Modifier thisMod;
thisMod.destByte = 0;
firstOp = true;
QString leftSide = Utility::grabAlphaNumeric(mods[i]);
if (leftSide.startsWith("D") && leftSide.length() == 2)
@@ -702,7 +701,7 @@ void FrameSenderWindow::updateGridRow(int idx)
QTableWidgetItem *item = ui->tableSender->item(gridLine, 7);
if (item == NULL) item = new QTableWidgetItem();
item->setText(QString::number(temp->count));
for (int i = 0; i < temp->len; i++)
for (unsigned int i = 0; i < temp->len; i++)
{
dataString.append(Utility::formatNumber(temp->data[i]));
dataString.append(" ");