[WIP] [arxml] add some basic support for flexray and ethernet data (#426)

* [arxml] add some basic support for flexray and ethernet data
* extract most of relevant flexray info (#432)
* starting rework ARXML
* fix dbc for py8
* support for container-pdus with "none" type
* fix for container id byteorder
* fix for secured-ipdus in container
* fix for byteorder big endian header_ids of container-i-pdus
* once again header_id
* Header_id again
* fix for missing compu method
* make SOME/IP at least work a bixt #283
* interprete OPAQUE as intel
* dbc allow '"' in Values
* fix container-pdu without header but with offset
* arxml: fix for container-ipdus, containing same pdu multiple times
* fix enum support for py2.7

Author: ebroecker

.travis.yml

@@ -15,8 +15,6 @@ matrix:
       dist: xenial
       sudo: true
     - python: 3.8
-    - python: 2.7
-      env: TOXENV=old_tests
     - python: 3.7
       dist: xenial
       sudo: true

requirements.test.py2.txt

@@ -19,3 +19,4 @@ xlwt==1.3.0
 xlrd==1.1.0
 click==7.0
 lxml==4.5.2
+enum34==1.1.10

requirements.tox.txt

@@ -7,3 +7,4 @@ tox==3.7.0
 typing==3.6.6; python_version < '3.5'
 virtualenv==16.4.1
 click==7.0
+enum34==1.1.10; python_version <= '2.7'

requirements.txt

@@ -8,3 +8,4 @@ future
 attrs>=18.1.0
 typing; python_version < '3.5'
 pathlib2
+enum34; python_version <= '2.7'

src/canmatrix/canmatrix.py

@@ -857,6 +857,8 @@ class Frame(object):
     # ('sendType', '_sendType', str, None),
 
     pdus = attr.ib(factory=list)  # type: typing.MutableSequence[Pdu]
+    header_id = attr.ib(default=None)  #type: int
+    # header_id
 
 
     @property
@@ -1522,6 +1524,12 @@ def update(self):  # type: () -> None
             return
         self.definition = 'ENUM "' + '","' .join(self.values) +'"'
 
+import enum
+
+class matrix_class(enum.Enum):
+    CAN = 1
+    FLEXRAY = 2
+    SOMEIP = 3
 
 @attr.s(cmp=False)
 class CanMatrix(object):
@@ -1537,6 +1545,7 @@ class CanMatrix(object):
     value_tables (global defined values)
     """
 
+    type = attr.ib(default=matrix_class.CAN)  #type: matrix_class
     attributes = attr.ib(factory=dict)  # type: typing.MutableMapping[str, typing.Any]
     ecus = attr.ib(factory=list)  # type: typing.MutableSequence[Ecu]
     frames = attr.ib(factory=list)  # type: typing.MutableSequence[Frame]

src/canmatrix/formats/arxml.py

@@ -117,7 +117,7 @@ def dump(in_db, f, **options):
     dbc_export_comment_encoding = options.get("dbcExportCommentEncoding",  dbc_export_encoding)
     compatibility = options.get('compatibility', True)
     dbc_unique_signal_names_per_frame = options.get("dbcUniqueSignalNames", compatibility)
-    ignore_encoding_errors= options.get("ignoreEncodingErrors",  "")
+    ignore_encoding_errors= options.get("ignoreEncodingErrors",  "ignore")
     write_val_table = options.get("writeValTable", True)
 
     whitespace_replacement = options.get("whitespaceReplacement", '_')
@@ -424,8 +424,11 @@ def dump(in_db, f, **options):
                      frame.arbitration_id.to_compound_integer() +
                      output_names[frame][signal]).encode(dbc_export_encoding, ignore_encoding_errors))
                 for attr_name, val in sorted(signal.values.items(), key=lambda x: int(x[0])):
+                    if '"' in val:
+                        val = val.replace('"', '\\"')
                     f.write(
                         (' ' + str(attr_name) + ' "' + val + '"').encode(dbc_export_encoding, ignore_encoding_errors))
+
                 f.write(";\n".encode(dbc_export_encoding, ignore_encoding_errors))
 
     # SIG_VALTYPE

src/canmatrix/formats/dbc.py

@@ -172,16 +172,22 @@ def dump(db, file, **options):
     worksheet.col(head_start + 1).width = 5555
 
     frame_hash = {}
-    logger.debug("Length of db.frames is %d", len(db.frames))
-    for frame in db.frames:
-        if frame.is_complex_multiplexed:
-            logger.error("export complex multiplexers is not supported - ignoring frame %s", frame.name)
-            continue
-        frame_hash[int(frame.arbitration_id.id)] = frame
+    if db.type == canmatrix.matrix_class.CAN:
+        logger.debug("Length of db.frames is %d", len(db.frames))
+        for frame in db.frames:
+            if frame.is_complex_multiplexed:
+                logger.error("export complex multiplexers is not supported - ignoring frame %s", frame.name)
+                continue
+            frame_hash[int(frame.arbitration_id.id)] = frame
+    else:
+        frame_hash = {a.name:a for a in db.frames}
+
 
     # set row to first Frame (row = 0 is header)
     row = 1
 
+
+
     # iterate over the frames
     for idx in sorted(frame_hash.keys()):
 

src/canmatrix/formats/xls.py

@@ -30,11 +30,18 @@
 def get_frame_info(db, frame):
     # type: (canmatrix.CanMatrix, canmatrix.Frame) -> typing.List[str]
     ret_array = []  # type: typing.List[str]
-    # frame-id
-    if frame.arbitration_id.extended:
-        ret_array.append("%3Xxh" % frame.arbitration_id.id)
-    else:
-        ret_array.append("%3Xh" % frame.arbitration_id.id)
+
+    if db.type == canmatrix.matrix_class.CAN:
+        # frame-id
+        if frame.arbitration_id.extended:
+            ret_array.append("%3Xxh" % frame.arbitration_id.id)
+        else:
+            ret_array.append("%3Xh" % frame.arbitration_id.id)
+    elif db.type == canmatrix.matrix_class.FLEXRAY:
+        ret_array.append("TODO")
+    elif db.type == canmatrix.matrix_class.SOMEIP:
+        ret_array.append("%3Xh" % frame.header_id)
+
     # frame-Name
     ret_array.append(frame.name)
 

src/canmatrix/formats/xls_common.py

@@ -195,12 +195,15 @@ def dump(db, filename, **options):
 
     write_excel_line(worksheet, 0, 0, row_array, sty_header)
 
-    frame_hash = {}
-    logger.debug("DEBUG: Length of db.frames is %d", len(db.frames))
-    for frame in db.frames:
-        if frame.is_complex_multiplexed:
-            logger.error("Export complex multiplexers is not supported - frame %s might be uncomplete", frame.name)
-        frame_hash[int(frame.arbitration_id.id)] = frame
+    if db.type == canmatrix.matrix_class.CAN:
+        frame_hash = {}
+        logger.debug("DEBUG: Length of db.frames is %d", len(db.frames))
+        for frame in db.frames:
+            if frame.is_complex_multiplexed:
+                logger.error("Export complex multiplexers is not supported - frame %s might be uncomplete", frame.name)
+            frame_hash[int(frame.arbitration_id.id)] = frame
+    else:
+        frame_hash = {a.name:a for a in db.frames}
 
     # set row to first Frame (row = 0 is header)
     row = 1