sven/can-utils
1
0
Fork 0
mirror of https://github.com/linux-can/can-utils.git synced 2026-08-05 06:20:00 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,115 Commits 1 Branch 9 Tags
8c94f3f72ac85318b99b2b8c9504ec507134afb4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Kleine-BuddeandGitHub 8c94f3f72a Merge pull request #508 from marckleinebudde/mcp251xfd-regmap-fix-compiler-warning 
mcp251xfd-regmap: fix compiler warning
 2024-03-19 11:45:32 +01:00
Marc Kleine-Budde d294cd928c mcp251xfd-regmap: fix compiler warning 
Fix the following compiler warning:

| mcp251xfd/mcp251xfd-regmap.c:38:4: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
|                         fscanf(reg_file, "%*[^\n]\n");
|                         ^~~~~~ ~~~~~~~~~~~~~~~~~~~~~

Reported-by: https://github.com/Chaitanya84
Link: https://github.com/linux-can/can-utils/pull/506
 2024-03-19 09:30:59 +01:00
Marc Kleine-BuddeandGitHub c6f4cbcaa7 Merge pull request #501 from gyatskov/master 
Fix musl armv7 build: Include time.h in isobusfs_{cmn_dh,srv_cm}
 2024-02-20 11:29:34 +01:00
Marc Kleine-BuddeandGitHub 68e0827fad Merge pull request #500 from marckleinebudde/isobus 
isobus: clean up build system integration, fix cmake
 2024-02-19 10:17:52 +01:00
Marc Kleine-Budde 50e3d46b8b cmake: fix build of isobusfs tools 
Reported-by: https://github.com/pschichtel
Link: https://github.com/linux-can/can-utils/issues/497
Fixes: 42edaeaf52 ("Implement ISOBUS File Server (FS) Interface as a Personal Project")
 2024-02-19 09:45:30 +01:00
Marc Kleine-BuddeandGitHub 53ea0d0218 Merge pull request #499 from marckleinebudde/cleanups 
Cleanups
 2024-02-19 09:44:58 +01:00
Marc Kleine-Budde d4712c6c55 GNUmakefile: isobus: include scripts in tarball 
Fixes: 42edaeaf52 ("Implement ISOBUS File Server (FS) Interface as a Personal Project")
 2024-02-19 09:44:32 +01:00
Marc Kleine-Budde 8bdcccf1a1 GNumakefile: isobus: don't link against libj1939 
Fixes: 42edaeaf52 ("Implement ISOBUS File Server (FS) Interface as a Personal Project")
 2024-02-19 09:44:32 +01:00
Marc Kleine-Budde eb0e0a30d4 makefile: isobus: remove dependencies to libj1939.h 
Fixes: 42edaeaf52 ("Implement ISOBUS File Server (FS) Interface as a Personal Project")
 2024-02-19 09:44:32 +01:00
Marc Kleine-Budde f5670b41d9 makefile: isobus: don't link against libj1939 2024-02-19 09:44:32 +01:00
Marc Kleine-Budde 9e57777ecd gitignore: ignore isobusfs dirstamp 
Fixes: 42edaeaf52 ("Implement ISOBUS File Server (FS) Interface as a Personal Project")
 2024-02-19 09:39:39 +01:00
Marc Kleine-Budde f5ba001bc9 gitignore: sort alphabetically 
Fixes: 9c38c16437 ("can-calc-bit-timing: move into subdir")
 2024-02-19 09:39:21 +01:00
Marc Kleine-Budde e4ba924b21 slcanpty: print_usage(): factor out help text into separate function 
...and use single fprintf() call only.
 2024-02-19 08:46:31 +01:00
Marc Kleine-Budde 7683efab41 slcanpty: convert towards kernel coding style 2024-02-19 08:45:55 +01:00
Marc Kleine-Budde 4c2f81f790 Makefile: sort alphabetically 
Fixes: a9260eab76 ("Makefile: fix isobusfs tools build")
 2024-02-19 08:43:36 +01:00
Marc Kleine-BuddeandGitHub 1a2992e15c Merge pull request #496 from marckleinebudde/isobus 
isobusfs_cmn: isobusfs_get_timeout_ms(): fix print on 32 bit archs
 2024-02-13 16:15:38 +01:00
Marc Kleine-Budde 7c56863047 isobusfs_cmn: isobusfs_get_timeout_ms(): fix print on 32 bit archs 
Fixes the following warning:

| isobusfs/isobusfs_cmn.c: In function 'isobusfs_get_timeout_ms':
| isobusfs/isobusfs_cmn.c:140:51: warning: format '%ld' expects argument of type 'long int', but argument 2 has type 'int64_t' {aka 'long long int'} [-Wformat=]
|   140 |                         warn("timeout too long: %ld ms", time_diff);
|       |                                                 ~~^      ~~~~~~~~~
|       |                                                   |      |
|       |                                                   |      int64_t {aka long long int}
|       |                                                   long int
|       |                                                 %lld
 2024-02-13 14:08:27 +01:00
Marc Kleine-BuddeandGitHub e547c3241e Merge pull request #495 from olerem/isobusfs-license 
isobusfs: change license to LGPL-2.0-or-later
 2024-02-09 11:25:24 +01:00
Marc Kleine-BuddeandGitHub 8a2619c68d Merge pull request #487 from olerem/isobusfs 
Implement ISOBUS File Server (FS) Interface as a Personal Project
 2024-02-02 16:04:03 +01:00
Marc Kleine-BuddeandGitHub 186bd96717 Merge pull request #493 from marckleinebudde/canfdtest 
canfdtest: with -vvv verbosity also print the MSG_DONTROUTE and MSG_CONFIRM flags
 2024-01-17 11:16:27 +01:00
Marc Kleine-Budde 18f710efb9 canfdtest: with -vvv verbosity also print the MSG_DONTROUTE and MSG_CONFIRM flags 2024-01-17 10:13:32 +01:00
Marc Kleine-BuddeandGitHub 3f78f77e60 Merge pull request #492 from marckleinebudde/canfdtest 
canfdtest: add support for loopback testing
 2024-01-17 09:37:42 +01:00
Marc Kleine-Budde fc2aad8704 canfdtest: add support for loopback testing 2024-01-17 09:31:40 +01:00
Marc Kleine-BuddeandGitHub 78aeedf5fe Merge pull request #491 from marckleinebudde/canfdtest 
canfdtest: fix detection of own frames
 2024-01-17 09:00:12 +01:00
Marc Kleine-Budde 655b0633e5 canfdtest: fix detection of own frames 
Use the correct flag MSG_CONFIRM to detect frames generated on this
socket.

Fixes: c35ed80b3d ("canfdtest: use struct msghdr::msg_flags to detect own frames")
 2024-01-17 08:51:22 +01:00
Marc Kleine-BuddeandGitHub 8ab42e4309 Merge pull request #488 from marckleinebudde/canfdtest 
canfdtest: fix filter for extended frames and some cleanups
 2024-01-16 17:25:21 +01:00
Marc Kleine-Budde 046b9d3b8f canfdtest: use can0 per default 2024-01-14 15:16:16 +01:00
Marc Kleine-BuddeandGitHub 5ba9daf7ed Merge pull request #489 from marckleinebudde/cansend 
cansend: coding style cleanups
 2024-01-14 15:08:42 +01:00
Marc Kleine-Budde 50b66ca403 cansend: usage(): use a single call to fprintf() 
This makes the printed text in the code easier to read.
 2024-01-14 15:00:18 +01:00
Marc Kleine-Budde 82be1b348b cansend: convert towards kernel coding style 2024-01-14 15:00:18 +01:00
Marc Kleine-Budde 2b07d15264 canfdtest: normalize_canid(): introduce and make use of it 2024-01-14 14:51:27 +01:00
Marc Kleine-Budde c35ed80b3d canfdtest: use struct msghdr::msg_flags to detect own frames 
...instead of relying on the can_id_ping.
 2024-01-14 14:50:52 +01:00
Marc Kleine-Budde f110bf4cde canfdtest: can_echo_gen(): use modulo instead of if to handle wrap arounds 2023-12-24 13:44:13 +01:00
Marc Kleine-Budde 7bb00837d0 canfdtest: can_echo_gen(): introduce struct canfd_frame *tx_frame; 2023-12-24 13:44:13 +01:00
Marc Kleine-Budde 874b0d9fae canfdtest: can_echo_gen(): decrease scope of struct canfd_frame rx_frame 2023-12-24 13:44:13 +01:00
Marc Kleine-Budde 104072f038 canfdtest: make use of bool 2023-12-24 13:44:13 +01:00
Marc Kleine-Budde 146fd949c9 canfdtest: don't initialize global variables to 0 2023-12-24 13:44:13 +01:00
Marc Kleine-Budde 0be95b5318 canfdtest: fix filter for extended CAN frames 
Fixes: 8e66a0bae3 ("canfdtest: Add extended frame format support")
Cc: RICCIARDI-Adrien <adrien.ricciardi@hotmail.fr>
 2023-12-24 13:44:13 +01:00
Marc Kleine-BuddeandGitHub c41f9cb21b Merge pull request #486 from taotieren/cmake 
update CMakeLists.txt
 2023-12-24 12:49:02 +01:00
Marc Kleine-BuddeandGitHub 31432ae9ce Merge pull request #480 from marckleinebudde/cansequence 
cansequence: add missing "--strict" to long_options
 2023-12-11 09:42:50 +01:00
Marc Kleine-BuddeandGitHub 04f1514810 Merge pull request #481 from marckleinebudde/can-calc-bittiming 
can-calc-bit-timing: add rockchip_canfd
 2023-12-11 09:42:36 +01:00
Marc Kleine-BuddeandGitHub 76002c0892 Merge pull request #482 from marckleinebudde/codingstyle 
Codingstyle
 2023-12-11 09:41:45 +01:00
Marc Kleine-Budde d1e9d9765a can-calc-bit-timing: add rockchip_canfd 2023-12-11 09:37:33 +01:00
Marc Kleine-Budde f73ad6a613 cangen: convert towards kernel coding style 2023-12-11 09:37:09 +01:00
Marc Kleine-Budde 697901f9ef candump: convert towards kernel coding style 2023-12-11 09:37:09 +01:00
Marc Kleine-Budde fe6ee6d33f cansend: convert towards kernel coding style 2023-12-11 09:37:09 +01:00
Marc Kleine-Budde 493c74815f canfdtest: convert towards kernel coding style 2023-12-11 09:37:09 +01:00
Marc Kleine-Budde ef6c39ebd6 cansequence: add missing "--strict" to long_options 
Fixes: 642190647e ("cansequence: add option to ignore classical CAN frames")
 2023-12-05 10:38:23 +01:00
Marc Kleine-BuddeandGitHub 88f0c75334 Merge pull request #476 from marckleinebudde/cansequence 
cansequence: cleanups and add support for CAN-FD
 2023-11-29 18:35:43 +01:00
Marc Kleine-Budde 642190647e cansequence: add option to ignore classical CAN frames 2023-11-29 18:28:32 +01:00
Marc Kleine-Budde bd835f2ca2 cansequence: add support to send and receive CAN-FD 2023-11-29 18:24:19 +01:00
Marc Kleine-Budde 6695f6f557 cansequence: print_usage(): clarify help for -e, --extended option 2023-11-29 18:24:19 +01:00
Marc Kleine-Budde 92a99c33ad cansequence: print_usage(): convert tabs to spaces in help text 2023-11-29 18:24:19 +01:00
Marc Kleine-Budde 0b0bce87c4 cansequence: also show help for option "-?" 
This avoids the "invalid option" error message in the auto generated
man pages.

| DESCRIPTION
|       ./cansequence: invalid option -- '?'
 2023-11-29 18:24:19 +01:00
Marc Kleine-Budde e8a808e2ab cansequence: convert extended, receive from int -> bool 2023-11-29 18:24:19 +01:00
Marc Kleine-Budde 5c433340c3 cansequence: convert towards kernel coding style 2023-11-29 17:23:00 +01:00
Marc Kleine-BuddeandGitHub 39f6d37e47 Merge pull request #475 from marckleinebudde/can-calc-bit-timing 
can-calc-bit-timing: add verbose mode to print bit timing limits
 2023-11-29 12:02:42 +01:00
Marc Kleine-Budde 85da9de8d8 can-calc-bit-timing: add verbose mode to print bit timing limits 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2023-11-29 11:39:56 +01:00
Marc Kleine-BuddeandGitHub 2abf88cee4 Merge pull request #473 from tisyang/master 
timestamp formatting: always use 64-bit for timesstamp formatting.
 2023-11-28 08:47:45 +01:00
Marc Kleine-BuddeandGitHub 97c8ccdbbf Merge pull request #472 from marckleinebudde/cansequence 
cansequence: print counter received data as hex
 2023-11-24 08:17:49 +01:00
Marc Kleine-Budde 5e3397ee71 cansequence: print counter received data as hex 
In the CAN universe, most data is displayed in hex. Change the verbose
output to hex, to ease debugging.
 2023-11-24 08:04:55 +01:00
Marc Kleine-BuddeandGitHub 41ea759237 Merge pull request #468 from marckleinebudde/j1939spy 
J1939spy: remove verbose option
 2023-10-17 10:13:34 +02:00
Marc Kleine-Budde 574df84a5d j1939spy: remove verbose option 
If j1939spy is started with the verbose option "-v" or "--verbose", it
will print the error "j1939spy: listening: Success" and exit. Remove
this option altogether.

Fixes: c50b5a39de ("can-j1939: add jspy 'sniffer' program")
 2023-10-17 09:51:27 +02:00
Marc Kleine-Budde 51ee436e75 j1939spy: convert towards kernel coding style 2023-10-17 09:50:26 +02:00
Marc Kleine-BuddeandGitHub 46fae98b76 Merge pull request #466 from marckleinebudde/fix-canbusload 
canbusload: main(): switch from pselect() to select()
 2023-10-06 14:23:27 +02:00
Marc Kleine-Budde 8e2caa8f8a canbusload: main(): switch from pselect() to select() 
We don't need to block any signals, so a select() is sufficient. This
also fixes the problem that sigmask is uninitialized and may block the
sig ARLM, which make canbusload hang until a CAN frame is recieved.

Closes: https://github.com/linux-can/can-utils/issues/465
 2023-10-06 12:32:42 +02:00
Marc Kleine-BuddeandGitHub c5b64802a1 Merge pull request #464 from marckleinebudde/can-calc-bittiming 
can-calc-bit-timing: at91_can: add 66 MHz CAN clock for sama5d3
 2023-10-05 12:58:34 +02:00
Marc Kleine-Budde 0e428e36a5 can-calc-bit-timing: at91_can: add 66 MHz CAN clock for sama5d3 2023-10-05 12:52:57 +02:00
Marc Kleine-BuddeandGitHub 4b5b524256 Merge pull request #462 from marckleinebudde/lib 
lib: coding style cleanups + fix printing of CAN_ERR_CNT
 2023-09-27 16:30:18 +02:00
Marc Kleine-Budde 7d59157d4d lib: snprintf_can_error_frame(): don't bail out if CAN_ERR_CNT is set 
If CAN_ERR_CNT is set, the snprintf_can_error_frame() bails out, as it
cannot decode CAN_ERR_CNT.

Fixes: 21fb43532e ("lib: snprintf_can_error_frame: print counter errors if CAN_ERR_CNT is set")
 2023-09-27 16:26:50 +02:00
Marc Kleine-Budde 0a43e84bcd lib: convert towards kernel coding style 2023-09-27 16:26:50 +02:00
Marc Kleine-BuddeandGitHub 1be7e0e51d Merge pull request #461 from marckleinebudde/canbusload 
canbusload: coding style cleanups + use less screen estate in redraw mode
 2023-09-27 12:46:15 +02:00
Marc Kleine-Budde 84919edbaa canbusload: redraw mode: use less screen estate 
Use less screen estate by not printing unneeded newlines in redraw
mode.
 2023-09-27 12:40:38 +02:00
Marc Kleine-Budde 92adbda471 canbusload: convert towards kernel coding style 2023-09-27 12:38:48 +02:00
Marc Kleine-BuddeandGitHub 3490282fc7 Merge pull request #460 from marckleinebudde/can-calc-bittiming-add-tq-help-text 
can-calc-bit-timing: print_usage(): add --tq parameter to help text
 2023-09-19 11:23:41 +02:00
Marc Kleine-Budde 47472cabc3 can-calc-bit-timing: print_usage(): add --tq parameter to help text 
In 913311fc15 ("can-calc-bit-timing: add support to decode user
supplied bit timing parameters") support to decide user supplied bit
timing parameters was added. However, it was forgotten to add --tq to
the help text.

Add help text for the --tq paramter.

Reported-by: https://github.com/EnricoMontecaggi
Closes: https://github.com/linux-can/can-utils/issues/459
Fixes: 913311fc15 ("can-calc-bit-timing: add support to decode user supplied bit timing parameters")
 2023-09-19 11:18:16 +02:00
Marc Kleine-BuddeandGitHub 39d6bba36a Merge pull request #458 from marckleinebudde/cansequence-error-messages 
cansequence: error messages
 2023-09-19 09:07:20 +02:00
Marc Kleine-Budde c8cf342cb2 cansequence: main(): error handling: add "()" to function name in error message 
Commit 0be066bee6 ("cansequence: main(): allow to bind on "any"
interface") converted from SIOCGIFINDEX ioctl() to if_nametoindex()
and adjusted the error message, but forgot the "()" after the function
name, which is used in the rest of the error messages in this file.

Add the missing "()".

Fixes: 0be066bee6 ("cansequence: main(): allow to bind on "any" interface")
 2023-09-19 08:57:44 +02:00
Marc Kleine-Budde e7c03ee93b cansequence: do_receive(): fix error message if recvmsg() fails 
In commit 9567230494 ("cansequence: print out dropped packages by
socket counter"), the read() syscall was replaced by recvmsg(). Adjust
error message accordingly.

Fixes: 9567230494 ("cansequence: print out dropped packages by socket counter")
 2023-09-19 08:55:53 +02:00
Marc Kleine-BuddeandGitHub 096d42ab98 Merge pull request #457 from marckleinebudde/cansequence-version 
cansequence: remove --version option from help text
 2023-09-18 17:15:37 +02:00
Marc Kleine-Budde d7a51a5494 cansequence: remove --version option from help text 
It is not implemented and not supported by any of the can-utils, so
remove it.

Reported-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2023-09-18 17:09:00 +02:00
Marc Kleine-BuddeandGitHub 2f9958c699 Merge pull request #447 from triveria/refactor-canplayer 
Format code of canplayer
 2023-09-05 11:51:56 +02:00
Marc Kleine-BuddeandGitHub 33b2ae6f88 Merge pull request #454 from marckleinebudde/fix-poll-errno 
Fix poll errno
 2023-08-28 16:19:46 +02:00
Marc Kleine-Budde 87e6af1025 j1939cat: do_send(): fix errno check 
"errno" hold the positive error value.

Link: https://github.com/linux-can/can-utils/issues/448
Fixes: cc155d2f63 ("j1939cat: make use of new RX UAPI")
Fixes: 19d41bec45 ("jcat: allow to re-send rest of the buffer if we was interrupted")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2023-08-28 16:11:29 +02:00
Marc Kleine-Budde 87a6788e6d cansequence: do_send(): fix errno check 
"errno" hold the positive error value.

Link: https://github.com/linux-can/can-utils/issues/448
Reported-by:  Adien Akhmad <adien.akhmad@gmail.com>
Suggested-by: Oliver Hartkopp <socketcan@hartkopp.net>
Fixes: fb5903f226 ("[cansequece] added various improvements")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2023-08-28 16:11:24 +02:00
Marc Kleine-BuddeandGitHub 3aa72b8208 Merge pull request #445 from marckleinebudde/ccls-cleanups 
ccls related cleanups
 2023-08-01 22:05:58 +02:00
Marc Kleine-Budde 1d7d37c6ac gitignore: add ccls related files 2023-08-01 21:45:43 +02:00
Marc Kleine-Budde ac0059db12 calc-bit-timing: include compat.h to make ccls happy 2023-08-01 21:45:43 +02:00
Marc Kleine-Budde fd0837f7e6 can-calc-bit-timing: move kernel compatibility stuff into own header 2023-08-01 21:45:43 +02:00
Marc Kleine-BuddeandGitHub 90baa696cd Merge pull request #444 from marckleinebudde/can-calc-bittiming-v6.3 
can-calc-bit-timing: import bit timing calculation algorithm from v6.3
 2023-08-01 14:19:05 +02:00
Marc Kleine-Budde ca304faad3 can-calc-bit-timing: import bit timing calculation algorithm from v6.3 2023-08-01 14:13:43 +02:00
Marc Kleine-Budde dc77f54bc1 can-calc-bit-timing: import 64 bit math helpers from kernel 2023-08-01 14:13:43 +02:00
Marc Kleine-BuddeandOliver Hartkopp 0be066bee6 cansequence: main(): allow to bind on "any" interface 
This is handy for running cansequence during an ifdown/ifup or a
rmmod/insmod cycle.
 2023-07-07 08:34:11 +02:00
Marc Kleine-BuddeandOliver Hartkopp 87def9b1fa cansequence: main(): use C99 initializers for struct sockaddr_can addr 
By using C99 initializers for struct sockaddr_can addr the not
assigned members are automatically set to 0x0, resulting in not
passing uninitialized memory to the bind() syscall.

Also remove the printing of the socket family, type and proto, this
was interesting back in the days, when the numbers were not fixed, yet.
 2023-07-07 08:34:11 +02:00
Marc Kleine-BuddeandGitHub ba5d7de30d Merge pull request #438 from marckleinebudde/candump-cleanup 
candump: main(): use C99 initializers for struct sockaddr_can addr
 2023-07-04 09:41:18 +02:00
Marc Kleine-Budde 6c7542a3ff candump: main(): use C99 initializers for struct sockaddr_can addr 
By using C99 initializers for struct sockaddr_can addr the not
assigned members are automatically set to 0x0, resulting in not
passing uninitialized memory to the bind() syscall.
 2023-07-04 09:19:08 +02:00
Marc Kleine-BuddeandGitHub 9e08e2272b Merge pull request #424 from yashi/canbusload-add-error-message 
canbusload: Enhance error message for missing bitrate
 2023-06-02 14:09:12 +02:00
Marc Kleine-BuddeandGitHub 4cfc12e218 Merge pull request #426 from passgat/no-mmu 
Add support for Linux/no-mmu with vfork
 2023-05-09 10:15:10 +02:00
Marc Kleine-BuddeandGitHub e44db7366b Merge pull request #430 from marckleinebudde/cangen-fix 
cangen: main(): avoid loop initial declaration
 2023-04-30 21:02:48 +02:00
Marc Kleine-Budde 085b5546a5 cangen: main(): avoid loop initial declaration 
| cangen.c: In function ‘parse_dataoptarg’:
| cangen.c:422:2: error: ‘for’ loop initial declarations are only allowed in C99 mode
|   for (int i = 0; i < CANFD_MAX_DLEN && i < arglen / 2; i++) {
|   ^
| cangen.c:422:2: note: use option -std=c99 or -std=gnu99 to compile your code
| cangen.c: In function ‘main’:
| cangen.c:796:4: error: ‘for’ loop initial declarations are only allowed in C99 mode
|     for (int i = 0; i < frame.len; i++) {
|     ^

Reported-by: https://github.com/yannS2016
Link: https://github.com/linux-can/can-utils/issues/428
Fixes: e409aa4c8c ("cangen: new generation mode - partially randomized payload (-D)")
 2023-04-30 21:01:19 +02:00