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

2016-12-08 20:50:35 -05:00
parent ddfac100d2 ef8b6ca755
commit 9e592d916c
16 changed files with 970 additions and 27 deletions
@@ -27,6 +27,7 @@
 #include "udsscanwindow.h"
 #include "re/sniffer/snifferwindow.h"
 #include "isotp_interpreterwindow.h"
+#include "motorcontrollerconfigwindow.h"

 class ConnectionWindow;

@@ -66,6 +67,7 @@ private slots:
    void showScriptingWindow();
    void showDBCFileWindow();
    void showFuzzingWindow();
+    void showMCConfigWindow();
    void showUDSScanWindow();
    void showISOInterpreterWindow();
    void showSnifferWindow();
@@ -140,6 +142,7 @@ private:
    UDSScanWindow *udsScanWindow;
    ISOTP_InterpreterWindow *isoWindow;
    SnifferWindow* snifferWindow;
+    MotorControllerConfigWindow *motorctrlConfigWindow;

    //various private storage
    QLabel lbStatusConnected;