Added a new window used to edit parameters for my motor inverter control board. Fixed firmware updater - tested to work now!

This commit is contained in:
Collin Kidder
2016-08-09 18:44:53 -04:00
parent 6529b89b45
commit f0e0a8d705
13 changed files with 863 additions and 119 deletions
+14 -1
View File
@@ -98,6 +98,7 @@ MainWindow::MainWindow(QWidget *parent) :
dbcFileWindow = NULL;
fuzzingWindow = NULL;
udsScanWindow = NULL;
motorctrlConfigWindow = NULL;
isoWindow = NULL;
dbcHandler = new DBCHandler;
bDirty = false;
@@ -138,11 +139,12 @@ MainWindow::MainWindow(QWidget *parent) :
connect(ui->listFilters, &QListWidget::itemChanged, this, &MainWindow::filterListItemChanged);
connect(ui->btnFilterAll, &QAbstractButton::clicked, this, &MainWindow::filterSetAll);
connect(ui->btnFilterNone, &QAbstractButton::clicked, this, &MainWindow::filterClearAll);
connect(ui->actionFirmware_Uploader, &QAction::triggered, this, &MainWindow::showFirmwareUploaderWindow);
connect(ui->actionFirmware_Update, &QAction::triggered, this, &MainWindow::showFirmwareUploaderWindow);
connect(ui->actionDBC_File_Manager, &QAction::triggered, this, &MainWindow::showDBCFileWindow);
connect(ui->actionFuzzing, &QAction::triggered, this, &MainWindow::showFuzzingWindow);
connect(ui->actionUDS_Scanner, &QAction::triggered, this, &MainWindow::showUDSScanWindow);
connect(ui->actionISO_TP_Decoder, &QAction::triggered, this, &MainWindow::showISOInterpreterWindow);
connect(ui->actionMotorControlConfig, &QAction::triggered, this, &MainWindow::showMCConfigWindow);
lbStatusConnected.setText(tr("Not connected"));
updateFileStatus();
@@ -978,6 +980,17 @@ void MainWindow::showFuzzingWindow()
fuzzingWindow->show();
}
void MainWindow::showMCConfigWindow()
{
if (!motorctrlConfigWindow)
{
motorctrlConfigWindow = new MotorControllerConfigWindow(model->getListReference());
connect(motorctrlConfigWindow, SIGNAL(sendCANFrame(const CANFrame*,int)), worker, SLOT(sendFrame(const CANFrame*,int)));
connect(motorctrlConfigWindow, SIGNAL(sendFrameBatch(const QList<CANFrame>*)), worker, SLOT(sendFrameBatch(const QList<CANFrame>*)));
}
motorctrlConfigWindow->show();
}
void MainWindow::showUDSScanWindow()
{
if (!udsScanWindow)