Allow disabling of strict parsing of CAN frames

The dbcfeeder now supports a new command line switch '--lax'
which can be used to disable strict parsing of CAN frames.

This is helpful with CAN dump files that contains frames that do
not contain the default 8 bytes of data.

Signed-off-by: Kai Hudalla <kai.hudalla@bosch.io>

dbc2val/dbcfeeder.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 ########################################################################
-# Copyright (c) 2020 Robert Bosch GmbH
+# Copyright (c) 2020,2023 Robert Bosch GmbH
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -117,6 +117,7 @@ def start(
         mappingfile,
         candumpfile=None,
         use_j1939=False,
+        use_strict_parsing=False,
         grpc_metadata=None,
     ):
         log.debug("Use mapping: {}".format(mappingfile))
@@ -128,11 +129,15 @@ def start(
                 rxqueue=self._can_queue,
                 dbcfile=dbcfile,
                 mapper=self._mapper,
+                use_strict_parsing=use_strict_parsing,
             )
         else:
             log.info("Use DBC reader")
             self._reader = dbcreader.DBCReader(
-                rxqueue=self._can_queue, dbcfile=dbcfile, mapper=self._mapper
+                rxqueue=self._can_queue,
+                dbcfile=dbcfile,
+                mapper=self._mapper,
+                use_strict_parsing=use_strict_parsing,
             )
 
         if candumpfile:
@@ -268,7 +273,7 @@ def _run(self):
                                 else:
                                    log.error("Unknown error setting {}: {}".format(target, resp))
                         else:
-                            log.error("Unsupported server type: %s", server_type)
+                            log.error("Unsupported server type: %s", self._server_type)
 
             except kuksa_client.grpc.VSSClientError:
                 log.error("Failed to update datapoints", exc_info=True)
@@ -342,7 +347,12 @@ def main(argv):
         choices=[server_type.value for server_type in ServerType],
         type=ServerType,
     )
-
+    parser.add_argument(
+        "--lax",
+        dest="strict",
+        help="Disable strict parsing of CAN frames",
+        action="store_false",
+    )
     args = parser.parse_args()
 
     config = parse_config(args.config)
@@ -472,6 +482,7 @@ def signal_handler(signal_received, frame):
         mappingfile=mappingfile,
         candumpfile=candumpfile,
         use_j1939=use_j1939,
+        use_strict_parsing=args.strict,
         grpc_metadata=grpc_metadata,
     )
 

dbc2val/dbcreader.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 
 ########################################################################
-# Copyright (c) 2020 Robert Bosch GmbH
+# Copyright (c) 2020,2023 Robert Bosch GmbH
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,16 +23,17 @@
 import threading
 import time
 import logging
+from queue import Queue
 
 log = logging.getLogger(__name__)
 
 
 class DBCReader:
-    def __init__(self, rxqueue, dbcfile, mapper):
+    def __init__(self, rxqueue: Queue, dbcfile: str, mapper: str, use_strict_parsing: bool):
         self.queue = rxqueue
         self.mapper = mapper
         log.info("Reading DBC file {}".format(dbcfile))
-        self.db = cantools.database.load_file(dbcfile)
+        self.db = cantools.database.load_file(dbcfile, strict = use_strict_parsing)
         self.canidwl = self.get_whitelist()
         log.info("CAN ID whitelist={}".format(self.canidwl))
         self.parseErr = 0

dbc2val/j1939reader.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 
 ########################################################################
-# Copyright (c) 2020 Robert Bosch GmbH
+# Copyright (c) 2020,2023 Robert Bosch GmbH
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 
 import cantools
 import j1939
+from queue import Queue
 
 log = logging.getLogger(__name__)
 
@@ -40,7 +41,7 @@ class J1939Reader(j1939.ControllerApplication):
     # This CA produces simulated sensor values and cyclically sends them to
     # the bus with the PGN 0xFEF6 (Intake Exhaust Conditions 1)
 
-    def __init__(self, rxqueue, dbcfile, mapper):
+    def __init__(self, rxqueue: Queue, dbcfile: str, mapper: str, use_strict_parsing: bool):
         # compose the name descriptor for the new ca
         name = j1939.Name(
             arbitrary_address_capable=0,
@@ -58,7 +59,7 @@ def __init__(self, rxqueue, dbcfile, mapper):
         j1939.ControllerApplication.__init__(self, name, device_address_preferred)
         # adaptation
         self.queue = rxqueue
-        self.db = cantools.database.load_file(dbcfile)
+        self.db = cantools.database.load_file(dbcfile, strict = use_strict_parsing)
         self.mapper = mapper
         self.canidwl = self.get_whitelist()
         self.parseErr = 0