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

Merge branch 'master' into fix_customsendcrash

Browse Source
This commit is contained in:
Andy Huska
2022-11-02 16:52:20 -05:00
parent 42fe841f0a 753cb43e48
commit 01d793f21f
10 changed files with 233 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/connectionwindow.cpp
+9 -1
View File
@@ -365,6 +365,7 @@ void ConnectionWindow::saveBusSettings()
bus.setSpeed(ui->cbBusSpeed->currentText().toInt());
bus.setActive(ui->ckEnable->isChecked());
bus.setListenOnly(ui->ckListenOnly->isChecked());
bus.setCanFD(ui->canFDEnable->isChecked());
conn_p->setBusSettings(offset, bus);
}
}
@@ -381,7 +382,8 @@ void ConnectionWindow::populateBusDetails(int offset)
{
//bool ret;
//int numBuses;
ui->canFDEnable->setVisible(false);
ui->canFDEnable_label->setVisible(false);
CANConnection* conn_p = connModel->getAtIdx(selIdx);
CANBus bus;
if(!conn_p) return;
@@ -396,6 +398,12 @@ void ConnectionWindow::populateBusDetails(int offset)
//ui->lblBusNum->setText(QString::number(busBase + offset));
ui->ckListenOnly->setChecked(bus.isListenOnly());
ui->ckEnable->setChecked(bus.isActive());
if (conn_p->getType() == CANCon::type::SERIALBUS)
{
ui->canFDEnable->setVisible(true);
ui->canFDEnable_label->setVisible(true);
ui->canFDEnable->setChecked(bus.isCanFD());
}
bool found = false;
for (int i = 0; i < ui->cbBusSpeed->count(); i++)