Merge pull request #67 from collin80/WIP2

Merge WIP2 changes into Master

README.md

@@ -1,6 +1,6 @@
 # SavvyCAN
 QT based cross platform canbus tool 
-(C) 2015-2016 EVTV and Collin Kidder
+(C) 2015-2017 EVTV and Collin Kidder
 
 A QT5 based cross platform tool which can be used to load, save, and capture canbus frames.
 This tool is designed to help with visualization, reverse engineering, debugging, and
@@ -14,7 +14,7 @@ You are highly recommended to use the CANDue board from EVTV:
 The CANDue board must be running the GVRET firmware which can also be found
 within the collin80 repos.
 
-It is very soon to be possible to use any SocketCAN compatible device
+It is now possible to use any SocketCAN compatible device
 under LINUX. There may, however, be some loss of some functionality as
 some functions of SavvyCAN are designed for use directly with the
 EVTVDue and CANDue 2.0 boards.
@@ -40,6 +40,10 @@ of this program. It can load and save in several formats:
 
 9. Vehicle Spy log files
 
+10. CANDump / Kayak (Read only)
+
+11. PCAN Viewer (Read Only)
+
 Requires QScintilla library available at:
 
 https://www.riverbankcomputing.com/software/qscintilla/download
@@ -50,18 +54,20 @@ http://www.qcustomplot.com/
 
 However, this source code is integrated into the source for SavvyCAN and one isn't required to download it separately.
 
-This project will soon require 5.6.0 or higher because of an upcoming dependency on QSerialBus but currently
-should compile with QT 5.5
+This project requires 5.6.0 or higher because of a dependency on QSerialBus which is an optional download
+with QT 5.6 (so, be sure to select it)
 
-Instructions for compiling with Ubuntu:
+Instructions for compiling:
 
-sudo apt-get install qt5-default qtdeclarative5-dev libqt5serialport5-dev libudev-dev
+Download the newest stable version of Qt directly from qt.io (You need 5.6.x or newer)
 
 download and extract QScintilla (see above for link), assume it is extracted in QScintilla-gpl-2.9.1
 
 cd ~/QScintilla-gpl-2.9.1/Qt4Qt5
 
-qmake qscintilla.pro
+You will need to either put your copy of QT into your path or specify the path to qmake directly
+
+~/Qt/5.7/gcc_64/bin/qmake qscintilla.pro
 
 make
 
@@ -75,7 +81,7 @@ git clone https://github.com/collin80/SavvyCAN.git
 
 cd SavvyCAN
 
-qmake
+~/Qt/5.7/gcc_64/bin/qmake
 
 make
 

SavvyCAN.pro

@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += core gui
+QT       += core gui serialbus
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets serialport printsupport qml
 
@@ -17,99 +17,122 @@ TEMPLATE = app
 
 
 SOURCES += main.cpp\
-        mainwindow.cpp \
+    mainwindow.cpp \
     canframemodel.cpp \
     utility.cpp \
     qcustomplot.cpp \
-    graphingwindow.cpp \
-    frameinfowindow.cpp \
-    newgraphdialog.cpp \
     frameplaybackwindow.cpp \
-    serialworker.cpp \
     candatagrid.cpp \
-    flowviewwindow.cpp \
     framesenderwindow.cpp \
-    dbchandler.cpp \
-    dbcmaineditor.cpp \
-    dbcsignaleditor.cpp \
     framefileio.cpp \
-    filecomparatorwindow.cpp \
     mainsettingsdialog.cpp \
     firmwareuploaderwindow.cpp \
-    discretestatewindow.cpp \
-    connectionwindow.cpp \
     scriptingwindow.cpp \
     scriptcontainer.cpp \
     canfilter.cpp \
-    rangestatewindow.cpp \
-    dbc_classes.cpp \
-    dbcloadsavewindow.cpp \
-    fuzzingwindow.cpp \
-    udsscanwindow.cpp \
     can_structs.cpp \
-    isotp_interpreterwindow.cpp \
-    isotp_handler.cpp \
-    motorcontrollerconfigwindow.cpp
+    motorcontrollerconfigwindow.cpp \
+    connections/canconnection.cpp \
+    connections/socketcan.cpp \
+    connections/canconfactory.cpp \
+    connections/gvretserial.cpp \
+    connections/canconmanager.cpp \
+    re/sniffer/snifferitem.cpp \
+    re/sniffer/sniffermodel.cpp \
+    re/sniffer/snifferwindow.cpp \
+    dbc/dbc_classes.cpp \
+    dbc/dbchandler.cpp \
+    dbc/dbcloadsavewindow.cpp \
+    dbc/dbcmaineditor.cpp \
+    dbc/dbcsignaleditor.cpp \
+    re/discretestatewindow.cpp \
+    re/filecomparatorwindow.cpp \
+    re/flowviewwindow.cpp \
+    re/frameinfowindow.cpp \
+    re/fuzzingwindow.cpp \
+    re/isotp_handler.cpp \
+    re/isotp_interpreterwindow.cpp \
+    re/rangestatewindow.cpp \
+    re/udsscanwindow.cpp \
+    connections/canbus.cpp \
+    connections/canconnectionmodel.cpp \
+    connections/connectionwindow.cpp \
+    re/graphingwindow.cpp \
+    re/newgraphdialog.cpp \
+    bisectwindow.cpp
 
 HEADERS  += mainwindow.h \
     can_structs.h \
     canframemodel.h \
     utility.h \
     qcustomplot.h \
-    graphingwindow.h \
-    frameinfowindow.h \
-    newgraphdialog.h \
     frameplaybackwindow.h \
-    serialworker.h \
     candatagrid.h \
-    flowviewwindow.h \
     framesenderwindow.h \
     can_trigger_structs.h \
-    dbc_classes.h \
-    dbchandler.h \
-    dbcmaineditor.h \
-    dbcsignaleditor.h \
     framefileio.h \
     config.h \
-    filecomparatorwindow.h \
     mainsettingsdialog.h \
     firmwareuploaderwindow.h \
-    discretestatewindow.h \
-    connectionwindow.h \
     scriptingwindow.h \
     scriptcontainer.h \
     canfilter.h \
-    rangestatewindow.h \
-    dbcloadsavewindow.h \
-    fuzzingwindow.h \
-    udsscanwindow.h \
-    isotp_interpreterwindow.h \
-    isotp_handler.h \
-    motorcontrollerconfigwindow.h
+    utils/lfqueue.h \
+    motorcontrollerconfigwindow.h \
+    connections/canconnection.h \
+    connections/socketcan.h \
+    connections/canconconst.h \
+    connections/canconfactory.h \
+    connections/gvretserial.h \
+    connections/canconmanager.h \
+    re/sniffer/snifferitem.h \
+    re/sniffer/sniffermodel.h \
+    re/sniffer/snifferwindow.h \
+    dbc/dbc_classes.h \
+    dbc/dbchandler.h \
+    dbc/dbcloadsavewindow.h \
+    dbc/dbcmaineditor.h \
+    dbc/dbcsignaleditor.h \
+    re/discretestatewindow.h \
+    re/filecomparatorwindow.h \
+    re/flowviewwindow.h \
+    re/frameinfowindow.h \
+    re/fuzzingwindow.h \
+    re/isotp_handler.h \
+    re/isotp_interpreterwindow.h \
+    re/rangestatewindow.h \
+    re/udsscanwindow.h \
+    connections/canbus.h \
+    connections/canconnectionmodel.h \
+    connections/connectionwindow.h \
+    re/graphingwindow.h \
+    re/newgraphdialog.h \
+    bisectwindow.h
 
-FORMS    += mainwindow.ui \
-    graphingwindow.ui \
-    frameinfowindow.ui \
-    newgraphdialog.ui \
-    frameplaybackwindow.ui \
-    candatagrid.ui \
-    flowviewwindow.ui \
-    framesenderwindow.ui \
-    dbcmaineditor.ui \
-    dbcsignaleditor.ui \
-    filecomparatorwindow.ui \
-    mainsettingsdialog.ui \
-    firmwareuploaderwindow.ui \
-    discretestatewindow.ui \
-    connectionwindow.ui \
-    scriptingwindow.ui \
-    rangestatewindow.ui \
-    dbcloadsavewindow.ui \
-    fuzzingwindow.ui \
-    udsscanwindow.ui \
-    isotp_interpreterwindow.ui \
-    deltawindow.ui \
-    motorcontrollerconfigwindow.ui
+FORMS    += ui/candatagrid.ui \
+    ui/connectionwindow.ui \
+    ui/dbcloadsavewindow.ui \
+    ui/dbcmaineditor.ui \
+    ui/dbcsignaleditor.ui \
+    ui/discretestatewindow.ui \
+    ui/filecomparatorwindow.ui \
+    ui/firmwareuploaderwindow.ui \
+    ui/flowviewwindow.ui \
+    ui/frameinfowindow.ui \
+    ui/frameplaybackwindow.ui \
+    ui/framesenderwindow.ui \
+    ui/fuzzingwindow.ui \
+    ui/graphingwindow.ui \
+    ui/isotp_interpreterwindow.ui \
+    ui/mainsettingsdialog.ui \
+    ui/mainwindow.ui \
+    ui/motorcontrollerconfigwindow.ui \
+    ui/newgraphdialog.ui \
+    ui/rangestatewindow.ui \
+    ui/scriptingwindow.ui \
+    ui/snifferwindow.ui \
+    ui/udsscanwindow.ui \
+    ui/bisectwindow.ui
 
 DISTFILES +=