arxml: read data related to E2E-protection (#594)

* read informations about E2E-Profiles (of I-Signalgroup) into the canmatrix-object
* also read informations about E2E-Profiles (of I-Signalgroup) into the canmatrix-object if a Container-PDU is processed

Co-authored-by: Markus Konrad <[email protected]>
Co-authored-by: Eduard Bröcker <[email protected]>

Author: 3 people

Diff for: src/canmatrix/canmatrix.py

@@ -465,6 +465,7 @@ class SignalGroup(object):
     name = attr.ib()  # type: str
     id = attr.ib()  # type: int
     signals = attr.ib(factory=list, repr=False)  # type: typing.MutableSequence[Signal]
+    e2e_trans = attr.ib(default=None)
 
     def add_signal(self, signal):  # type: (Signal) -> None
         """Add a Signal to SignalGroup.
@@ -788,15 +789,15 @@ def add_signal(self, signal):
         """
         self.signals.append(signal)
         return self.signals[len(self.signals) - 1]
-    def add_signal_group(self, Name, Id, signalNames):
+    def add_signal_group(self, Name, Id, signalNames, e2e_trans=None):
         # type: (str, int, typing.Sequence[str]) -> None
         """Add new SignalGroup to the Frame. Add given signals to the group.
 
         :param str Name: Group name
         :param int Id: Group id
         :param list of str signalNames: list of Signal names to add. Non existing names are ignored.
         """
-        newGroup = SignalGroup(Name, Id)
+        newGroup = SignalGroup(Name, Id, e2e_trans=e2e_trans)
         self.signalGroups.append(newGroup)
         for signal in signalNames:
             signal = signal.strip()
@@ -996,15 +997,15 @@ def __iter__(self):  # type: () -> typing.Iterator[Signal]
 
         return iter(self.signals)
 
-    def add_signal_group(self, Name, Id, signalNames):
+    def add_signal_group(self, Name, Id, signalNames, e2e_trans=None):
         # type: (str, int, typing.Sequence[str]) -> None
         """Add new SignalGroup to the Frame. Add given signals to the group.
 
         :param str Name: Group name
         :param int Id: Group id
         :param list of str signalNames: list of Signal names to add. Non existing names are ignored.
         """
-        newGroup = SignalGroup(Name, Id)
+        newGroup = SignalGroup(Name, Id, e2e_trans=e2e_trans)
         self.signalGroups.append(newGroup)
         for signal in signalNames:
             signal = signal.strip()

Diff for: src/canmatrix/formats/arxml.py

@@ -973,10 +973,22 @@ def dump(dbs, f, **options):
 frames_cache = {}  # type: typing.Dict[_Element, canmatrix.Frame]
 
 
-def get_sys_signals(sys_signal, sys_signal_array, frame, group_id, ea):
+def get_signalgrp_and_signals(sys_signal, sys_signal_array, frame, group_id, ea):
     # type: (_Element, typing.Sequence[_Element], canmatrix.Frame, int, str) -> None
     members = [ea.get_element_name(signal) for signal in sys_signal_array]
-    frame.add_signal_group(ea.get_element_name(sys_signal), group_id, members)
+
+    # get data related to E2E-Protection
+    transform_ele = ea.follow_ref(sys_signal, "TRANSFORMER-REF")
+    e2e_transform = None
+    if transform_ele is not None:
+        e2e_transform = {
+            'profile': ea.get_child(transform_ele, "PROFILE-NAME").text,
+        }
+        data_id_elems = ea.get_children(ea.get_child(sys_signal, "TRANSFORMATION-I-SIGNAL-PROPSS"), "DATA-ID")
+        if data_id_elems is not None:
+            e2e_transform['data_ids'] = [int(x.text) for x in data_id_elems]
+
+    frame.add_signal_group(ea.get_element_name(sys_signal), group_id, members, e2e_transform)
 
 
 def decode_compu_method(compu_method, ea, float_factory):
@@ -1087,12 +1099,9 @@ def get_signals(signal_array, frame, ea, multiplex_id, float_factory, bit_offset
             isignal = ea.follow_ref(signal, "I-SIGNAL-GROUP-REF")
             if isignal is not None:
                 logger.debug("get_signals: found I-SIGNAL-GROUP ")
-
                 isignal_array = ea.follow_all_ref(isignal, "I-SIGNAL-REF")
+                get_signalgrp_and_signals(isignal, isignal_array, frame, group_id, ea)
 
-                system_signal_array = [ea.follow_ref(isignal, "SYSTEM-SIGNAL-REF") for isignal in isignal_array]
-                system_signal_group = ea.follow_ref(isignal, "SYSTEM-SIGNAL-GROUP-REF")
-                get_sys_signals(system_signal_group, system_signal_array, frame, group_id, ea)
                 group_id = group_id + 1
                 continue
         if isignal is None: