Commit Graph
606 Commits
Author SHA1 Message Date
Andre Hartmann 1b24b1677a CanFrameModel: Remove superflous breaks after return 2017-11-26 18:00:40 +01:00
Andre Hartmann 55273a1b85 CanConnection: Convert switches to enumeration and add documentation
And add or remove default labels to silence Clang compiler warnings.
2017-11-26 18:00:28 +01:00
Andre Hartmann cfc024f98a CanConnectionModel: Remove superflous breaks after return
Clang complained about them.
2017-11-26 16:26:25 +01:00
Andre Hartmann 4c8921ceca FramesView: Fix auto scrolling when frame capturing is suspended
Allow to freely scroll the captured frames window in suspended state.

Fixes #111
2017-11-26 15:44:04 +01:00
Collin Kidder d93c58725c Merge pull request #109 from andre-hartmann/serialbus-cleanup
Serialbus and general cleanup
2017-11-25 19:49:52 -05:00
Andre Hartmann d69947bf2f SerialBusConnection: Use member initialization
And as we have full C++11 support, so its also preferred to use nullptr.
2017-11-25 17:27:47 +01:00
Andre Hartmann 84cb598a0d SerialBusConnection: Improve connect/disconnect handling
* disconnectDevice() already checks mDev_p
* use the error description provided by QCanBus::createDevice()
2017-11-25 17:27:38 +01:00
Andre Hartmann 15aef1afbe SerialBusConnection: Order and condence includes
By practicing the following rules:
(4 and 5 are not needed here)

1. own header
2. project headers
3. Qt headers
4. operating system headers
5. compiler headers
2017-11-25 17:27:28 +01:00
Andre Hartmann 1dd59ed73c SocketCan: Rename to SerialBusConnection
QtCanBus is not limited to SocketCAN, it also supports various
Windows CAN adapters directly.

Also, add the term Connection to describe the inheritance
hierarchy better.
2017-11-25 17:27:19 +01:00
Andre Hartmann 560701e208 Untangle include forrest
Every change in connectionwindow.h led to a heavy project
compile, as the header was included in other headers.

Avoid this by using forward declarations and only include
connectionwindow.h in the C++ files that actually use it.
2017-11-25 17:27:08 +01:00
Andre Hartmann 380e3c9da2 Project: Remove unneeded scope
Qt 4 is not supported at all, as the project requires QtSerialBus.
2017-11-25 17:26:56 +01:00
Andre Hartmann 1f2c5a38a0 Readme: Fix spelling of Qt 2017-11-25 17:26:40 +01:00
Collin Kidder 61443022a7 Merge branch 'master' of github.com:collin80/SavvyCAN into WIP 2017-11-21 19:52:41 -05:00
Collin Kidder 2db2594462 Merge pull request #108 from annerajb/master
add candump/kayak save support
2017-11-21 09:09:16 -05:00
Collin Kidder 1ea9ea4fac Add fault handling code mostly used to detect when the serial port disappears while a GVRET style device is connected. Beginnings of code to add a reconnect button. 2017-11-20 22:07:13 -05:00
Anner J. Bonilla 9b693630b3 add candump save support 2017-11-20 06:08:20 -08:00
Collin Kidder 214f5defd8 Fix a compiling bug on windows (was a bug everywhere but only fatal on windows) 2017-11-10 01:23:15 -05:00
Collin Kidder bba425d4d2 Merge pull request #106 from collin80/WIP
Merge WIP (again...)
2017-11-09 20:15:04 -05:00
Collin Kidder 6ef26de4f7 Update requested GVRET version to 343 which is where stable support
for M2 and CANDue2.2 are found.
2017-11-09 20:13:47 -05:00
Collin Kidder 5d85635cfd Merge pull request #105 from collin80/WIP
Merge Wip Changes into Master
2017-11-09 20:12:25 -05:00
Collin Kidder c398856806 Small fix to make unconnected devices still show up properly in the connection window 2017-11-09 20:07:00 -05:00
Collin Kidder 545f258b8e Make sent frames have a timestamp resolution of microseconds just like incoming frames. Previously sent frame
time stamps were rounded to the nearest millisecond.

Note, however, that this time stamp is when we first tried to send the frame to hardware,
not when the hardware sent the frame. That will probably be later on but there's no way
to know for sure if/when it will send the frame.
2017-11-08 21:20:17 -05:00
Collin Kidder ed2cd7bd8c Reimplemented the ability to chain multiple log files and run them in sequences. 2017-11-08 21:09:20 -05:00
Collin Kidder 3bf19fdbc4 Moved a lot of the frame playback window functionality to a new class. This allows the functionality to be run
on a separate thread. The performance is a lot better and "use original timing" is now reasonably accurate.
2017-11-08 20:38:19 -05:00
Collin Kidder 10738396c2 Merge branch 'master' of github.com:collin80/SavvyCAN into WIP 2017-11-04 22:11:10 -04:00
Collin Kidder da5fba0460 Merge pull request #103 from FabianInostroza/master
Fix DBC handler and DBCFile. Initialize as j1939 to false by default.
2017-11-04 21:16:50 -04:00
Fabián Inostroza 077cb223e0 Fix DBC handler and DBCFile. Initialize j1939 attribute to false by default. 2017-11-03 01:12:18 -03:00
Collin Kidder 8c77e1c7ce Merge branch 'master' of github.com:collin80/SavvyCAN 2017-10-26 21:27:54 -04:00
Collin Kidder f51b48c907 Add a Leaf DBC file to examples 2017-10-26 21:27:32 -04:00
Collin Kidder b8fbfce6c7 Merge pull request #101 from Semant1ka/sort_col
Add sorting after table header click for main and isotp windows
2017-10-26 21:18:39 -04:00
semant1ka 78f229d2a9 move even handlers to move aproppriate places 2017-10-26 22:13:03 +03:00
semant1ka 0883709f58 enbale sorting for main window and isotp 2017-10-26 21:55:51 +03:00
Ubuntu 88bd90f51a try basic code from SO 2017-10-25 12:19:26 -07:00
Collin Kidder 9c9ab1933b Add mode to playback window to it to approximate the original frame
timings from the file/capture.
2017-10-24 21:27:55 -04:00
Collin Kidder 45692d3ad5 Merge branch 'master' of github.com:collin80/SavvyCAN 2017-10-24 18:28:52 -04:00
Collin Kidder c59038410e Add Think City DBC file as another example 2017-10-24 18:28:15 -04:00
Collin Kidder 84f9a5083d Fix sending bug in UDS code 2017-10-24 18:27:35 -04:00
Collin Kidder bc4e823d3d CAN Connection Window mostly done now. 2017-10-23 19:45:08 -04:00
Collin Kidder 0519e2d2c9 More work on supporting swcan - it's there now! Untested as of yet. 2017-10-22 20:42:02 -04:00
Collin Kidder ac976643f4 Further work to get more buses working on the GVRET/M2RET devices 2017-10-22 20:15:18 -04:00
Collin Kidder 62c70374ab Merge pull request #100 from collin80/master
Bring in J1939 additions from FabianInostroza
2017-10-22 16:39:18 -04:00
Collin Kidder 2801851313 Merge pull request #99 from FabianInostroza/j1939dbc
Manage J1939 databases
2017-10-22 16:37:21 -04:00
Fabián Inostroza 4028eb5b5c Check frame size before attemping to decode signal. 2017-10-22 03:46:00 -03:00
Fabián Inostroza c32dbee306 Remove commented line. 2017-10-22 03:41:14 -03:00
Fabián Inostroza 218e3141d2 Controls and code for using a J1939 database. 2017-10-22 03:35:36 -03:00
Fabián Inostroza 9020f97784 Ignore generated files. 2017-10-22 03:22:23 -03:00
Collin Kidder 9e85925782 Merge branch 'master' of github.com:collin80/SavvyCAN 2017-10-19 08:59:06 -04:00
Collin Kidder 383ee8fe19 Big changes to connection window to make it more intuitive. Also
brings window closer to supporting M2RET devices better.
2017-10-18 21:48:13 -04:00
Collin Kidder bb3fee1a12 Slight change to description of P2 in UDS decoder. 2017-10-18 21:47:47 -04:00
Collin Kidder 39d0173d64 Merge pull request #97 from adamvoss/patch-1
Provide a link pertaining to downloading Qt
2017-10-18 19:25:29 -04:00