Marc Kleine-Budde
287469245c
Merge pull request #123 from twasilczyk/slcand-android
...
Don't fail when it wasn't possible to fetch the interface name.
2025-04-06 10:11:38 +02:00
Tomasz Wasilczyk
7a318636e7
slcand: Don't fail when it wasn't possible to fetch the interface name.
...
On some systems SIOCGIFNAME may fail with ENOTTY, but the actual
slcanX interface gets properly configured. Instead of crashing hard on
such case, let's gracefuly degrade and just not display the interface
name.
2025-04-06 10:03:36 +02:00
Marc Kleine-Budde
7fb81e6779
Merge pull request #593 from yegorich/static-libs
...
CMakeLists.txt: add an option to control shared library creation
2025-03-12 09:27:14 +01:00
Yegor Yefremov
a904183b4e
CMakeLists.txt: add an option to control shared library creation
...
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
2025-03-11 18:19:08 +01:00
Marc Kleine-Budde
e2172546aa
Merge pull request #591 from zeljkoavramovic/master
...
README.md : mention new canerrsim tool and add a link to existing J1939 kernel module installation document
2025-03-03 15:47:02 +01:00
Zeljko Avramovic
705b3202a9
added new canerrsim tool and a link to already existing can-j1939-install-kernel-module.md
2025-03-03 15:27:02 +01:00
Marc Kleine-Budde
31a59be02f
Merge pull request #588 from marckleinebudde/makefile-detect-libgps
...
Makefile: rely on pkg-config to detect presence of libgps
2025-03-03 13:24:18 +01:00
Marc Kleine-Budde
4d908bd7cf
Merge pull request #590 from marckleinebudde/fix-makefile-into-ci
...
github-actions: fix used compiler
2025-03-03 13:22:57 +01:00
Marc Kleine-Budde
837e2bb343
github-actions: fix used compiler
...
Fixes: 130e0dced2 ("github-actions: compile with gcc and clang using Makefile")
2025-03-03 13:20:50 +01:00
Marc Kleine-Budde
ec16ef97ff
Makefile: rely on pkg-config to detect presence of libgps
...
Link: 71b2aec834 (commitcomment-153191516)
Fixes: 71b2aec ("j1939-vehicle-position-srv: Introduce J1939 and NMEA 2000 Vehicle Position Server")
2025-03-03 13:14:05 +01:00
Marc Kleine-Budde
651c8818dd
Merge pull request #589 from marckleinebudde/integrate-makefile-into-ci
...
github-actions: compile with gcc and clang using Makefile
2025-03-03 13:13:02 +01:00
Marc Kleine-Budde
130e0dced2
github-actions: compile with gcc and clang using Makefile
2025-03-03 13:08:26 +01:00
Marc Kleine-Budde
ff90f4ec21
Merge pull request #586 from marckleinebudde/fix-typo-update-gitignore
...
Fix typos and update gitignore
2025-03-03 10:24:07 +01:00
Marc Kleine-Budde
e3ee283443
gitignore: ignore new tools if building with Makefile
2025-03-03 10:18:25 +01:00
Marc Kleine-Budde
e8130a3575
treewide: fix typos
2025-03-03 10:18:25 +01:00
Marc Kleine-Budde
1250c12a30
Merge pull request #585 from marckleinebudde/fix-makefile
...
Makefile: remove erroneous '\'
2025-03-03 10:14:53 +01:00
Marc Kleine-Budde
9b5b030877
Makefile: remove erroneous '\'
...
This should at least fix the `No rule to make target` error:
```
cc -O2 -Wall -Wno-parentheses -Wsign-compare -I. -Iinclude -DAF_CAN=PF_CAN -DPF_CAN=29 -DSO_RXQ_OVFL=40 -DSCM_TIMESTAMPING_OPT_STATS=54 -DCLOCK_TAI=11 -DSO_TXTIME=61 -DSCM_TXTIME=SO_TXTIME -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -c -o j1939_vehicle_position/j1939_vehicle_position_srv.o j1939_vehicle_position/j1939_vehicle_position_srv.c
j1939_vehicle_position/j1939_vehicle_position_srv.c:7:10: fatal error: gps.h: No such file or directory
7 | #include <gps.h>
| ^~~~~~~
compilation terminated.
make: *** [<builtin>: j1939_vehicle_position/j1939_vehicle_position_srv.o] Error 1
make: *** No rule to make target 'cc', needed by 'j1939-vehicle-position-srv'.
make: *** No rule to make target '-lgps', needed by 'j1939-vehicle-position-srv'.
make: *** No rule to make target '-o', needed by 'j1939-vehicle-position-srv'.
```
Link: 71b2aec834 (commitcomment-153191516)
Fixes: 71b2aec834 ("j1939-vehicle-position-srv: Introduce J1939 and NMEA 2000 Vehicle Position Server")
2025-03-03 10:09:48 +01:00
Marc Kleine-Budde
da3914c491
Merge pull request #528 from marckleinebudde/canerrsim
...
canerrsim
2025-03-02 17:19:38 +01:00
Marc Kleine-Budde
18b1e7970a
Merge pull request #553 from olerem/j1939_vehicle_position
...
J1939 vehicle position
2025-03-02 17:19:09 +01:00
Zeljko Avramovic
491cabea07
canerrsim: add
...
Link: https://github.com/linux-can/can-utils/issues/525#issue-2311379340
2025-03-02 17:16:21 +01:00
Marc Kleine-Budde
f1cea504a4
Merge pull request #583 from yegorich/typos
...
isobusfs: fix typos
2025-03-02 17:09:17 +01:00
Marc Kleine-Budde
900c7e9f6e
Merge pull request #584 from yegorich/fix-switch-case
...
slcand.c: add the missing case colon
2025-03-02 17:08:23 +01:00
Yegor Yefremov
b208876e65
slcand.c: add the missing case colon
...
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
2025-03-02 15:51:45 +01:00
Yegor Yefremov
72a9fd8ccd
isobusfs: fix typos
...
Typos were found with codespell.
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
2025-03-02 15:44:40 +01:00
Marc Kleine-Budde
e448d542e8
github-actions: install libgps-dev where available
2025-03-01 22:30:29 +01:00
Oleksij Rempel
71b2aec834
j1939-vehicle-position-srv: Introduce J1939 and NMEA 2000 Vehicle Position Server
...
This patch adds `j1939-vehicle-position-srv`, a server for sending
vehicle position data over CAN using J1939 or NMEA 2000 protocols. It
retrieves GPS data from gpsd or simulates data if gpsd is unavailable.
By default, it operates in J1939 profile but can switch to NMEA 2000
with the `-p nmea2000` option.
Usage Examples:
1. With gpsd:
j1939acd -r 64-95 -c /tmp/1122334455667789.jacd 1122334455667789 vcan0 &
j1939-vehicle-position-srv -i vcan0 -n 0x1122334455667789
2. In simulation mode without gpsd:
j1939-vehicle-position-srv -i vcan0 -s -p nmea2000
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
[Yegor: add CMakeLists.txt integration]
Co-developed-by: Yegor Yefremov <yegorslists@googlemail.com>
2025-03-01 22:29:11 +01:00
Marc Kleine-Budde
a24bff8b08
Merge pull request #582 from yegorich/clangd
...
CMakeLists.txt: enable CMAKE_EXPORT_COMPILE_COMMANDS by default
2025-03-01 16:47:48 +01:00
Yegor Yefremov
fe9ea67814
CMakeLists.txt: enable CMAKE_EXPORT_COMPILE_COMMANDS by default
...
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
2025-03-01 16:15:08 +01:00
Oleksij Rempel
e8559479fb
libj1939: Add function to connect a socket
...
Introduce `libj1939_connect_socket` function to handle socket
connections.
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
2025-03-01 13:28:52 +01:00
Marc Kleine-Budde
6050aa155d
Merge pull request #581 from yegorich/cmake-linting
...
CMakeLists.txt: remove unneeded spaces
2025-03-01 12:33:50 +01:00
Yegor Yefremov
302184f383
CMakeLists.txt: remove unneeded spaces
...
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
2025-03-01 10:51:12 +01:00
Oliver Hartkopp
c542c9ada7
gitignore: remove accidentally added Makefile item
...
Fixes: 4577316bd6 ("Update .gitignore")
Link: https://github.com/linux-can/can-utils/pull/577#issuecomment-2690362731
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2025-02-28 21:34:03 +01:00
Khem Raj
2b8c7c5f4b
Include time.h for timespec struct definition
...
Fixes
git/isobusfs/../libj1939.h:33:18: error: field has incomplete type 'struct timespec'
33 | struct timespec next_send_time;
| ^
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2025-02-14 12:41:31 +01:00
Jan Engelhardt
4577316bd6
Update .gitignore
2025-02-14 12:40:42 +01:00
Marc Kleine-Budde
4364d655b8
Merge pull request #576 from jengelh/master
...
build: give libisobusfs a version
2025-02-12 16:55:15 +01:00
Jan Engelhardt
2e71e396c5
build: give libisobusfs a version
2025-02-10 15:32:27 +01:00
Marc Kleine-Budde
01083a64eb
Merge pull request #573 from hartkopp/canxl-asc-conversion
...
CANXL support for ASC conversion tools
2025-01-24 15:39:01 +01:00
Oliver Hartkopp
008f9f8e22
asc2log: add option to disable direction info
...
The ASC file provides an information whether the CAN frame is sent (Tx)
or received (Rx) on the local CAN node.
With the new '-d' option the generation of this information is disabled
for the log file generation to simplify the comparision of log files.
E.g. log1 -> asc -> log2 always created the T/R information in the log2
file which is then hard to compare to the log1 file which might not
have the T/R information at all.
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2025-01-24 15:08:46 +01:00
Oliver Hartkopp
66e7c08beb
log2asc: add CAN XL support
...
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2025-01-24 15:04:43 +01:00
Oliver Hartkopp
4b66e8c56f
asc2log: shrink string buffer for header analysis
...
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2025-01-24 14:59:57 +01:00
Oliver Hartkopp
e6e3253972
asc2log: shrink string buffer for CAN identifier
...
Since using the %n feature the tmp1 buffer is only used for the handling
of the CAN identifier. So this buffer can be shrinked for that use case.
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2025-01-24 14:56:16 +01:00
Oliver Hartkopp
6d69bef837
asc2log: add CAN CC and CAN FD support for CAN XL message events
...
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2025-01-24 14:51:52 +01:00
Oliver Hartkopp
4d8b247258
asc2log: make use of sscanf consumed characters feature
...
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2025-01-24 14:48:32 +01:00
Oliver Hartkopp
0e9c53f6d3
asc2log: add CAN XL support for CAN XL message events
...
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2025-01-24 14:33:59 +01:00
Oliver Hartkopp
99c5c14790
can.h: canxl: support Remote Request Substitution bit access
...
The Remote Request Substitution bit is a dominant bit ("0") in the CAN XL
frame. As some CAN XL controllers support to access this bit a new
CANXL_RRS value has been defined for the canxl_frame.flags element.
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2025-01-24 14:22:21 +01:00
Oliver Hartkopp
df8e08fa70
asc2log: prepare helper functions for CAN XL frame handling
...
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2025-01-24 14:22:21 +01:00
Oliver Hartkopp
cb5ab07f34
asc2log: handle and skip TxRq messages
...
TxRq messages are internal measurement messages that document the time of
a transmission request (to the CAN driver) to be checked against the real
transmission time, when the CAN message has been sent.
There is no such feature in the SocketCAN log format, so we detect this
tag but skip TxRq messages in the ASC log files.
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2025-01-24 14:22:21 +01:00
Oliver Hartkopp
0e692bf42e
asc2log: unify multi-line comments
...
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2025-01-24 14:21:59 +01:00
Marc Kleine-Budde
0984817438
Merge pull request #571 from marckleinebudde/cangen-canbusload
...
cangen, canbusload: new features
2025-01-22 15:54:06 +01:00
Zhu Yi
b3da2f62b9
canbusload: support busload visualization
...
Add '-v' option for visualize busload, the output shows a moving
histogram of the past 90 seconds.
canbusload 2024-09-23 17:19:33 (exact bitstuffing)
can0@500k 487 55558 31048 0 99% |XXXXXXXXXXXXXXXXXXX.|
100%|..........................................................................................
95%|..............................................................................XXXXXXXXXXXX
90%|.............................................................................XXXXXXXXXXXXX
85%|.............................................................................XXXXXXXXXXXXX
80%|.............................................................................XXXXXXXXXXXXX
75%|.............................................................................XXXXXXXXXXXXX
70%|.............................................................................XXXXXXXXXXXXX
65%|.............................................................................XXXXXXXXXXXXX
60%|............................................................................XXXXXXXXXXXXXX
55%|............................................................................XXXXXXXXXXXXXX
50%|............................................................................XXXXXXXXXXXXXX
45%|............................................................................XXXXXXXXXXXXXX
40%|............................................................................XXXXXXXXXXXXXX
35%|.........................................XXX................................XXXXXXXXXXXXXX
30%|.........................................XXXX...............................XXXXXXXXXXXXXX
25%|........................................XXXXXX.............................XXXXXXXXXXXXXXX
20%|XXXXXXXX...............................XXXXXXXXXXXXXXXXX....XXXXXXXXXXX...XXXXXXXXXXXXXXXX
15%|XXXXXXXXX.............................XXXXXXXXXXXXXXXXXXXX.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
10%|XXXXXXXXX.XXXXXXXXXXXXXXXXXXX..XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
5%|XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
Signed-off-by: Zhu Yi <yi.zhu5@cn.bosch.com>
Signed-off-by: Hubert Streidl <hubert.streidl@de.bosch.com>
Signed-off-by: Mark Jonas <mark.jonas@de.bosch.com>
Link: https://lore.kernel.org/r/20250120162332.19157-3-mark.jonas@de.bosch.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2025-01-20 18:07:16 +01:00