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

Conflicts: connectionwindow.cpp
2016-05-06 14:49:54 -04:00
parent 8f7dc4a34b a8c817bcd0
commit d0505de5f6
5 changed files with 70 additions and 24 deletions
@@ -58,7 +58,10 @@ private slots:
    void handleDisableAll();
    void handleRevert();
    void handleNewConn();
+    void handleEnableAll();
+    void handleDisableAll();
    void receiveBusStatus(int bus, int speed, int status);
+    void connectionSuccess(CANConnection *conn);

 private:
    Ui::ConnectionWindow *ui;