From: Scott Murray Date: Tue, 7 Jun 2022 20:25:40 +0000 (-0400) Subject: simple_can_simulator: support different interface for LIN messages X-Git-Tag: 13.91.0~7 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=98596c38c74586f97e1c808c923c6064755086dc;p=AGL%2Fmeta-agl-demo.git simple_can_simulator: support different interface for LIN messages Add a "--lin-interface" option to simple_can_simulator.py to allow specifying a different CAN interface for the cruise control LIN messages from the steering wheel in the demo setup. This allows pointing at the sllin0 interface in the full demo setup that is configured with the agl-demo-preload feature. Previously the CAN messages for the LIN events were bridged to the primary CAN interface, but this has proven unreliable in practice. Bug-AGL: SPEC-4431 Signed-off-by: Scott Murray Change-Id: I1bb0e429b849ed1e25cbd9ee8fb887e973d33081 --- diff --git a/recipes-demo/simple-can-simulator/files/simple_can_simulator.py b/recipes-demo/simple-can-simulator/files/simple_can_simulator.py index 83f88706e..3d6c85d54 100755 --- a/recipes-demo/simple-can-simulator/files/simple_can_simulator.py +++ b/recipes-demo/simple-can-simulator/files/simple_can_simulator.py @@ -350,13 +350,18 @@ class StatusMessageSender(object): def main(): parser = argparse.ArgumentParser(description='Simple CAN vehicle simulator.') parser.add_argument('interface', type=str, help='interface name (e.g. vcan0)') + parser.add_argument('--lin-interface', help='Separate LIN interface name (e.g. sllin0)') parser.add_argument('-v', '--verbose', help='increase output verbosity', action='store_true') args = parser.parse_args() + lin_interface = args.lin_interface + if lin_interface == None: + lin_interface = args.interface + try: can_sock = CANSocket(args.interface) diag_can_sock = CANSocket(args.interface) - steeringwheel_can_sock = CANSocket(args.interface) + steeringwheel_can_sock = CANSocket(lin_interface) except OSError as e: sys.stderr.write('Could not listen on interface {0}\n'.format(args.interface)) sys.exit(e.errno)