Merge branch 'master' of github.com:collin80/SavvyCAN

This commit is contained in:
Collin Kidder
2023-02-14 19:48:07 -05:00
2 changed files with 10 additions and 0 deletions
+9
View File
@@ -77,6 +77,9 @@ UDSScanWindow::UDSScanWindow(const QVector<CANFrame> *frames, QWidget *parent) :
//not handling show no reply, max reply delay, reply offset, increment //not handling show no reply, max reply delay, reply offset, increment
int numBuses = CANConManager::getInstance()->getNumBuses(); int numBuses = CANConManager::getInstance()->getNumBuses();
for (int n = 0; n < numBuses; n++) ui->cbBuses->addItem(QString::number(n)); for (int n = 0; n < numBuses; n++) ui->cbBuses->addItem(QString::number(n));
connect(ui->cbBuses, &QComboBox::currentTextChanged, this, &UDSScanWindow::setBusToScan);
installEventFilter(this); installEventFilter(this);
addNewScan(); addNewScan();
@@ -334,6 +337,12 @@ void UDSScanWindow::setSessType()
if (currEditEntry) currEditEntry->sessType = ui->cbSessType->currentIndex(); if (currEditEntry) currEditEntry->sessType = ui->cbSessType->currentIndex();
} }
void UDSScanWindow::setBusToScan()
{
if (inhibitUpdates) return;
if (currEditEntry) currEditEntry->busToScan = ui->cbBuses->currentIndex();
}
void UDSScanWindow::setNoReplyVal() void UDSScanWindow::setNoReplyVal()
{ {
if (inhibitUpdates) return; if (inhibitUpdates) return;
+1
View File
@@ -81,6 +81,7 @@ private slots:
void setIncrementVal(); void setIncrementVal();
void setReplyOffset(); void setReplyOffset();
void setSessType(); void setSessType();
void setBusToScan();
private: private:
Ui::UDSScanWindow *ui; Ui::UDSScanWindow *ui;