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

mainwindow.cpp

@@ -79,6 +79,7 @@ MainWindow::MainWindow(QWidget *parent) :
     dbcFileWindow = NULL;
     fuzzingWindow = NULL;
     udsScanWindow = NULL;
+    motorctrlConfigWindow = NULL;
     isoWindow = NULL;
     snifferWindow = NULL;
     dbcHandler = new DBCHandler;
@@ -119,12 +120,13 @@ 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->actionSniffer, &QAction::triggered, this, &MainWindow::showSnifferWindow);
+    connect(ui->actionMotorControlConfig, &QAction::triggered, this, &MainWindow::showMCConfigWindow);
 
     connect(CANConManager::getInstance(), &CANConManager::framesReceived, model, &CANFrameModel::addFrames);
 
@@ -273,7 +275,6 @@ MainWindow::~MainWindow()
         snifferWindow = NULL;
     }
 
-
     delete model;
     delete elapsedTime;
     delete dbcHandler;
@@ -917,6 +918,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)