4858b2b307
Merge pull request #334 from hartkopp/cansniffer-fd
...
cansniffer: add CAN FD support
2022-01-22 17:11:08 +01:00
8ffcc187e9
cansniffer: make ASCII output switchable in CAN FD mode
...
In CAN FD mode the length of the output line becomes very long.
Therefore disable the ASCII output in CAN FD mode by default but
make it switchable with a new '@' command in interactive input mode.
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2022-01-22 14:51:20 +01:00
c3129b678a
cansniffer: add CAN FD support
...
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2022-01-22 14:48:14 +01:00
540dcaa821
cansniffer: convert to struct canfd_frame for FD support
...
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2022-01-22 13:50:03 +01:00
fb186ed6c8
cansniffer: add error handling for read/write of sniffsets
...
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2022-01-22 13:49:23 +01:00
66631a3e23
can-calc-bit-timing: add more bittiming constants and sort them
...
Import all bit timing constants from the kernel (v5.16-rc1) and sort
them by the occurrence in drivers/net/can/Makefile.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-19 21:59:58 +01:00
e7b5920b10
can-calc-bit-timing: beautify btr register printing
...
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-19 21:39:30 +01:00
2636640aa7
can-calc-bit-timing: import bit timing calculation algorithm from v3.18
...
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-19 21:39:30 +01:00
f42e968bcf
can-calc-bit-timing: add support for additional bit timing calculation algorithms
...
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-19 21:39:30 +01:00
f9c9f6841b
can-calc-bit-timing: document kernel commit of current bit timing calculation algorithm
...
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-19 07:21:38 +01:00
8d01589500
can-calc-bit-timing: move struct definitions
...
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-19 07:21:38 +01:00
046d9f88ee
can-calc-bit-timing: add option to specify explicit data bit timing
2022-01-19 07:21:38 +01:00
36d76ba07a
can-calc-bit-timing: add support for calculation of CAN-FD bit timings
...
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-19 07:21:38 +01:00
04123b3b36
can-calc-bit-timing: print_bittiming(): skip bit timing without ref clock
...
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-19 07:21:38 +01:00
2829512f9b
can-calc-bit-timing: add nop printf_btr
...
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-16 12:25:01 +01:00
7ec433f6a6
can-calc-bit-timing: prepare for different can_bittiming (i.e. CAN-FD)
...
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-16 12:24:42 +01:00
7bc81678bb
can-calc-bit-timing: rename rate -> bitrate
...
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-16 12:24:42 +01:00
927f70e588
can-calc-bit-timing: rename spt -> sample_point
...
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-16 12:24:42 +01:00
9b63929974
can-calc-bit-timing: mark several structs and members as const
...
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-16 12:24:04 +01:00
258ea5a9ba
can-calc-bit-timing: fix whitespace
...
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-15 15:10:19 +01:00
4c07a11f81
Merge pull request #331 from marckleinebudde/fix-typo
...
libj1939.h: fix typo
2022-01-03 10:58:52 +01:00
3394e1fa18
libj1939.h: fix typo
...
Fixes: e370ad5256
2022-01-03 10:58:05 +01:00
9e5b6266b1
Merge pull request #330 from marckleinebudde/fix-types
...
testj1939: fix 64-bit types for some platforms
2022-01-03 10:47:39 +01:00
e370ad5256
testj1939: fix 64-bit types for some platforms
...
Revert commit that introduced PRIx64 to print an __u64, and added
define to get the same types on all platforms.
With __SANE_USERSPACE_TYPES__ the Linux headers use an unsigned long
long for __u64 on all platforms, especially MIPS64.
Fixes: eb9cfac954
2022-01-03 10:44:29 +01:00
fd1d61490c
Merge pull request #328 from marckleinebudde/fix-musl
...
CMakeLists: unconditionally define _GNU_SOURCE
2021-12-30 13:00:59 +01:00
da642181a9
CMakeLists: unconditionally define _GNU_SOURCE
...
This fixes compilation on musl libc.
Link: https://github.com/linux-can/can-utils/pull/326
Reported-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2021-12-30 12:57:12 +01:00
6bd7ced052
Merge pull request #325 from neheb/patch-1
...
mcp251xfd: add missing libgen.h header
2021-12-16 10:05:09 +01:00
9ca68a12c7
Merge pull request #327 from neheb/patch-3
...
use PRIx64
2021-12-16 10:04:04 +01:00
eb9cfac954
use PRIx64
...
This is the proper specifier for uint64_t.
2021-12-15 18:08:13 -08:00
7dd714907b
mcp251xfd: add missing libgen.h header
...
Needed for the basename() function under musl.
2021-12-15 18:00:39 -08:00
a705182b28
candump: trivial typo exchange sentence point with closing bracket
...
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2021-11-28 20:14:43 +01:00
0d84033fa4
canplayer: introduce option to limit the number of processed frames
...
Analogue to the '-n <count>' option to limit the number of processed CAN
frames in candump and cangen this option makes sense in canplayer too.
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2021-10-30 13:02:42 +02:00
ab9bd4f287
Merge pull request #318 from jgressma/feat/canfdtest-custom-can-ids-squashed
...
canfdtest: enables program use alongside existing CAN bus traffic
2021-10-25 15:33:09 +02:00
2dde06801a
canfdtest: adds support for custom CAN IDs
...
This change enables the use of this app alongside the traffic
typically found on a CAN bus.
2021-10-25 11:20:58 +02:00
607b643e0f
Merge pull request #319 from marckleinebudde/fix-j1939cat
...
j1939cat: properly fix printf format string to work both on 32 and 64 bit systems
2021-10-21 11:24:12 +02:00
eb0eb78896
j1939cat: properly fix printf format string to work both on 32 and 64 bit systems
...
Fixes: 7b8457ce9fcc155d2f63
2021-10-21 11:20:12 +02:00
0edab8a402
cangen: improve help text to point out decimal places for the gap value
...
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2021-10-20 06:12:27 +02:00
622fcbb9b3
Makefile: remove obsolete requirements for lib.h
...
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2021-10-19 08:57:22 +02:00
02e8b1ff39
Merge pull request #316 from Rubusch/lothar/cansniffer
...
cansniffer: fix detection of invalid provided CAN interface, refacs
2021-10-19 08:43:20 +02:00
9fd2b2e617
Makefile: clean mcp251xfd/*.o
...
make distclean depend on clean target in Makefile
Signed-off-by: Lothar Rubusch <l.rubusch@gmail.com>
2021-10-18 22:30:21 +01:00
8bf57429fc
cansniffer: simplify conditional cases
...
refactoring, reduce some levels of indention
Signed-off-by: Lothar Rubusch <l.rubusch@gmail.com>
2021-10-18 22:30:21 +01:00
93a6cd6dfb
cansniffer: simplify, avoiding else case indention
...
refactoring
Signed-off-by: Lothar Rubusch <l.rubusch@gmail.com>
2021-10-18 22:08:44 +01:00
d9368a6003
cansniffer: simplify logic
...
refactoring
Signed-off-by: Lothar Rubusch <l.rubusch@gmail.com>
2021-10-18 22:08:05 +01:00
c36bdc743f
cansniffer: fix warning on unused variable
...
make use of former (not really) used "ret" in main()
Signed-off-by: Lothar Rubusch <l.rubusch@gmail.com>
2021-10-18 22:02:21 +01:00
f7307b8290
can-utils: check for return values of if_nametoindex()
...
if_nametoindex() returns zero and a specific errno in the case the network
interface does not exist. The missing check leads to the use of the 'any'
CAN device but leaves the user alone as the user gets no error message.
Reported-by: Lothar Rubusch <lotophagon@protonmail.com>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2021-10-18 09:37:46 +02:00
5a3d1703d2
Merge pull request #314 from gibsson/master
...
j1939cat: fix comparison signs issue
2021-10-13 16:48:40 +02:00
57cc73d413
j1939cat: fix comparison signs issue
...
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
2021-10-13 16:32:32 +02:00
4236614ab6
Merge pull request #315 from marckleinebudde/can-calc-bit-timing
...
can-calc-bit-timing: can_fixup_bittiming(): change type of tseg1 and alltseg to unsigned int
2021-10-13 15:25:26 +02:00
e03f3e1049
can-calc-bit-timing: can_fixup_bittiming(): change type of tseg1 and alltseg to unsigned int
...
All timing calculation is done with unsigned integers, so change type
of tseg1 and alltseg to unsigned int, too.
Link: https://lore.kernel.org/all/20211013130653.1513627-1-mkl@pengutronix.de
Link: https://github.com/linux-can/can-utils/pull/314
Reported-by: Gary Bisson <bisson.gary@gmail.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2021-10-13 15:21:56 +02:00
7b8457ce9f
j1939cat: fix long long unsigned int warning in x_name printf
...
warning: format ‘%llx’ expects argument of type ‘long long unsigned int’, but argument 8 has type ‘uint64_t’ {aka ‘long unsigned int’} [-Wformat=]
Fixes: cc155d2f63
2021-10-11 20:54:22 +02:00
Marc Kleine-Budde
Oliver Hartkopp
Rosen Penev
Jean Gressmann
Lothar Rubusch
Gary Bisson