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

Fixed compile errors in motor config window. But, it's broken anyway

Browse Source
This commit is contained in:
Collin Kidder
2017-08-17 20:10:03 -04:00
parent 670fd56869
commit 964ad01498
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorcontrollerconfigwindow.cpp
+4 -4
View File
@@ -68,7 +68,7 @@ void MotorControllerConfigWindow::updatedFrames(int numFrames)
if (params[i].paramID == paramID) if (params[i].paramID == paramID)
{ {
params[i].value = thisFrame.data[4] + (thisFrame.data[5] * 256); params[i].value = thisFrame.data[4] + (thisFrame.data[5] * 256);
if (params[i].paramType == ASCII) item = new QTableWidgetItem(QString::fromUtf8((char *)params[i].value, 2)); if (params[i].paramType == ASCII) item = new QTableWidgetItem(); //QString::fromUtf8((char *)params[i].value, 2));
if (params[i].paramType == HEX) item = new QTableWidgetItem(Utility::formatHexNum(params[i].value)); if (params[i].paramType == HEX) item = new QTableWidgetItem(Utility::formatHexNum(params[i].value));
if (params[i].paramType == DEC) if (params[i].paramType == DEC)
{ {
@@ -80,7 +80,7 @@ void MotorControllerConfigWindow::updatedFrames(int numFrames)
} }
if (params[i].signedType == Q15) item = new QTableWidgetItem(QString::number(params[i].value / 32768.0)); if (params[i].signedType == Q15) item = new QTableWidgetItem(QString::number(params[i].value / 32768.0));
} }
ui->tableParams->setItem(i, 1, item);
break; break;
} }
} }
@@ -189,7 +189,7 @@ void MotorControllerConfigWindow::timerTick()
outFrame.data[6] = 0; //reserved outFrame.data[6] = 0; //reserved
outFrame.data[7] = 0; //reserved outFrame.data[7] = 0; //reserved
emit sendCANFrame(&outFrame, 0); CANConManager::getInstance()->sendFrame(outFrame);
transmitStep++; transmitStep++;
if (transmitStep == params.length()) if (transmitStep == params.length())
@@ -225,7 +225,7 @@ void MotorControllerConfigWindow::timerTick()
outFrame.data[6] = 0; //reserved outFrame.data[6] = 0; //reserved
outFrame.data[7] = 0; //reserved outFrame.data[7] = 0; //reserved
emit sendCANFrame(&outFrame, 0); CANConManager::getInstance()->sendFrame(outFrame);
} }
transmitStep++; transmitStep++;