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

Additional implementation of new connection system. The GVRET code can

Browse Source 
now connect and run its thread.
This commit is contained in:
Collin Kidder
2016-03-26 20:17:10 -04:00
parent e7ded7737a
commit 0bd3a3b95b
14 changed files with 126 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connectionwindow.cpp
+37 -1
View File
@@ -88,8 +88,44 @@ void ConnectionWindow::handleOKButton()
{
if (ui->rbGVRET->isChecked())
{
SerialWorker *serial = new SerialWorker(canModel, 0);
SerialWorker *serial = new SerialWorker(canModel, connModel->rowCount());
connModel->addConnection(serial);
qDebug() << "Setup initial connection object";
CAN_Bus bus;
bus.active = true;
bus.busNum = serial->getBusBase();
bus.connection = serial;
bus.listenOnly = ui->ckListenOnly->isChecked();
bus.singleWire = ui->ckSingleWire->isChecked();
if (ui->cbSpeed->currentIndex() < 1) bus.speed = 0; //default speed
else if (ui->cbSpeed->currentIndex() == 1)
{
bus.speed = 0;
bus.active = false;
}
else bus.speed = ui->cbSpeed->currentText().toInt();
connModel->addBus(bus);
int numBuses = serial->getNumBuses();
for (int i = 1; i < numBuses; i++)
{
bus.active = false;
bus.listenOnly = false;
bus.singleWire = false;
bus.speed = 250000;
bus.busNum = serial->getBusBase() + i;
bus.connection = serial;
connModel->addBus(bus);
qDebug() << "Added bus " << bus.busNum;
}
//call through signal/slot interface without using connect
QMetaObject::invokeMethod(serial, "updatePortName",
Qt::QueuedConnection,
Q_ARG(QString, ui->cbPort->currentText()));
}
else if (ui->rbKvaser->isChecked())
{