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

Preliminary pass at converting connection system to use a more generic

Browse Source 
approach and support more devices and multiple devices at the same time.
This commit is contained in:
Collin Kidder
2016-03-19 21:40:21 -04:00
parent 8a886ddcc9
commit e7ded7737a
15 changed files with 739 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firmwareuploaderwindow.cpp
+3 -3
View File
@@ -80,7 +80,7 @@ void FirmwareUploaderWindow::gotTargettedFrame(int frameLoc)
if ((frame.data[6] == ((token >> 16) & 0xFF)) && (frame.data[7] == ((token >> 24) & 0xFF)))
{
qDebug() << "starting firmware process";
MainWindow::getReference()->setTargettedID(baseAddress + 0x20);
//MainWindow::getReference()->setTargettedID(baseAddress + 0x20);
transferInProgress = true;
sendFirmwareChunk();
}
@@ -163,7 +163,7 @@ void FirmwareUploaderWindow::handleStartStopTransfer()
bus = ui->spinBus->value();
baseAddress = Utility::ParseStringToNum(ui->txtBaseAddr->text());
qDebug() << "Base address: " + QString::number(baseAddress);
MainWindow::getReference()->setTargettedID(baseAddress + 0x10);
//MainWindow::getReference()->setTargettedID(baseAddress + 0x10);
CANFrame *output = new CANFrame;
output->extended = false;
output->len = 8;
@@ -181,7 +181,7 @@ void FirmwareUploaderWindow::handleStartStopTransfer()
else //stop anything in process
{
ui->btnStartStop->setText("Start Upload");
MainWindow::getReference()->setTargettedID(-1);
//MainWindow::getReference()->setTargettedID(-1);
}
}