odxtools 8.2.1__py3-none-any.whl → 8.3.1__py3-none-any.whl

odxtools/diaglayers/diaglayer.py

@@ -24,6 +24,7 @@ from ..servicebinner import ServiceBinner
 from ..singleecujob import SingleEcuJob
 from ..snrefcontext import SnRefContext
 from ..specialdatagroup import SpecialDataGroup
+from ..subcomponent import SubComponent
 from ..unitgroup import UnitGroup
 from .diaglayerraw import DiagLayerRaw
 from .diaglayertype import DiagLayerType
@@ -261,9 +262,13 @@ class DiagLayer:
         return self.diag_layer_raw.import_refs
 
     @property
-    def libraries(self) -> List[Library]:
+    def libraries(self) -> NamedItemList[Library]:
         return self.diag_layer_raw.libraries
 
+    @property
+    def sub_components(self) -> NamedItemList[SubComponent]:
+        return self.diag_layer_raw.sub_components
+
     @property
     def sdgs(self) -> List[SpecialDataGroup]:
         return self.diag_layer_raw.sdgs

odxtools/diaglayers/diaglayerraw.py

@@ -22,6 +22,7 @@ from ..singleecujob import SingleEcuJob
 from ..snrefcontext import SnRefContext
 from ..specialdatagroup import SpecialDataGroup
 from ..statechart import StateChart
+from ..subcomponent import SubComponent
 from ..utils import dataclass_fields_asdict
 from .diaglayertype import DiagLayerType
 
@@ -47,7 +48,7 @@ class DiagLayerRaw(IdentifiableElement):
     import_refs: List[OdxLinkRef]
     state_charts: NamedItemList[StateChart]
     additional_audiences: NamedItemList[AdditionalAudience]
-    # sub_components: List[DiagLayer] # TODO
+    sub_components: NamedItemList[SubComponent]
     libraries: NamedItemList[Library]
     sdgs: List[SpecialDataGroup]
 
@@ -154,6 +155,11 @@ class DiagLayerRaw(IdentifiableElement):
             Library.from_et(el, doc_frags) for el in et_element.iterfind("LIBRARYS/LIBRARY")
         ]
 
+        sub_components = [
+            SubComponent.from_et(el, doc_frags)
+            for el in et_element.iterfind("SUB-COMPONENTS/SUB-COMPONENT")
+        ]
+
         sdgs = [
             SpecialDataGroup.from_et(sdge, doc_frags) for sdge in et_element.iterfind("SDGS/SDG")
         ]
@@ -174,6 +180,7 @@ class DiagLayerRaw(IdentifiableElement):
             state_charts=NamedItemList(state_charts),
             additional_audiences=NamedItemList(additional_audiences),
             libraries=NamedItemList(libraries),
+            sub_components=NamedItemList(sub_components),
             sdgs=sdgs,
             **kwargs)
 
@@ -208,6 +215,8 @@ class DiagLayerRaw(IdentifiableElement):
             odxlinks.update(additional_audience._build_odxlinks())
         for library in self.libraries:
             odxlinks.update(library._build_odxlinks())
+        for sub_comp in self.sub_components:
+            odxlinks.update(sub_comp._build_odxlinks())
         for sdg in self.sdgs:
             odxlinks.update(sdg._build_odxlinks())
 
@@ -262,6 +271,8 @@ class DiagLayerRaw(IdentifiableElement):
             additional_audience._resolve_odxlinks(odxlinks)
         for library in self.libraries:
             library._resolve_odxlinks(odxlinks)
+        for sub_component in self.sub_components:
+            sub_component._resolve_odxlinks(odxlinks)
         for sdg in self.sdgs:
             sdg._resolve_odxlinks(odxlinks)
 
@@ -294,5 +305,7 @@ class DiagLayerRaw(IdentifiableElement):
             additional_audience._resolve_snrefs(context)
         for library in self.libraries:
             library._resolve_snrefs(context)
+        for sub_component in self.sub_components:
+            sub_component._resolve_snrefs(context)
         for sdg in self.sdgs:
             sdg._resolve_snrefs(context)

odxtools/subcomponent.py

@@ -0,0 +1,288 @@
+# SPDX-License-Identifier: MIT
+from dataclasses import dataclass
+from typing import Any, Dict, List, Optional
+from xml.etree import ElementTree
+
+from .diagnostictroublecode import DiagnosticTroubleCode
+from .diagservice import DiagService
+from .dtcdop import DtcDop
+from .element import IdentifiableElement, NamedElement
+from .environmentdata import EnvironmentData
+from .environmentdatadescription import EnvironmentDataDescription
+from .exceptions import odxraise, odxrequire
+from .matchingparameter import MatchingParameter
+from .nameditemlist import NamedItemList
+from .odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId, OdxLinkRef, resolve_snref
+from .parameters.parameter import Parameter
+from .snrefcontext import SnRefContext
+from .table import Table
+from .tablerow import TableRow
+from .utils import dataclass_fields_asdict
+
+
+@dataclass
+class SubComponentPattern:
+    matching_parameters: List[MatchingParameter]
+
+    @staticmethod
+    def from_et(et_element: ElementTree.Element,
+                doc_frags: List[OdxDocFragment]) -> "SubComponentPattern":
+
+        matching_parameters = [
+            MatchingParameter.from_et(el, doc_frags)
+            for el in et_element.iterfind("MATCHING-PARAMETERS/MATCHING-PARAMETER")
+        ]
+
+        return SubComponentPattern(matching_parameters=matching_parameters)
+
+
+@dataclass
+class SubComponentParamConnector(IdentifiableElement):
+    diag_comm_snref: str
+
+    # TODO: we currently only support SNREFs, not SNPATHREFs
+    out_param_if_refs: List[str]
+    in_param_if_refs: List[str]
+
+    @property
+    def service(self) -> DiagService:
+        return self._service
+
+    @property
+    def out_param_ifs(self) -> NamedItemList[Parameter]:
+        return self._out_param_ifs
+
+    @property
+    def in_param_ifs(self) -> NamedItemList[Parameter]:
+        return self._in_param_ifs
+
+    @staticmethod
+    def from_et(et_element: ElementTree.Element,
+                doc_frags: List[OdxDocFragment]) -> "SubComponentParamConnector":
+        kwargs = dataclass_fields_asdict(IdentifiableElement.from_et(et_element, doc_frags))
+
+        diag_comm_snref = odxrequire(
+            odxrequire(et_element.find("DIAG-COMM-SNREF")).get("SHORT-NAME"))
+
+        out_param_if_refs = []
+        for elem in et_element.find("OUT-PARAM-IF-REFS") or []:
+            if elem.tag != "OUT-PARAM-IF-SNREF":
+                odxraise("Currently, only SNREFS are supported for OUT-PARAM-IF-REFS")
+                continue
+
+            out_param_if_refs.append(odxrequire(elem.get("SHORT-NAME")))
+
+        in_param_if_refs = []
+        for elem in et_element.find("IN-PARAM-IF-REFS") or []:
+            if elem.tag != "IN-PARAM-IF-SNREF":
+                odxraise("Currently, only SNREFS are supported for IN-PARAM-IF-REFS")
+                continue
+
+            in_param_if_refs.append(odxrequire(elem.get("SHORT-NAME")))
+
+        return SubComponentParamConnector(
+            diag_comm_snref=diag_comm_snref,
+            out_param_if_refs=out_param_if_refs,
+            in_param_if_refs=in_param_if_refs,
+            **kwargs)
+
+    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+        return {}
+
+    def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
+        pass
+
+    def _resolve_snrefs(self, context: SnRefContext) -> None:
+        service = resolve_snref(self.diag_comm_snref,
+                                odxrequire(context.diag_layer).diag_comms, DiagService)
+        self._service = service
+
+        if self._service.request is not None:
+            odxraise()
+            return
+        if not self._service.positive_responses:
+            odxraise()
+            return
+        request = odxrequire(service.request)
+        response = service.positive_responses[0]
+
+        in_param_ifs = []
+        for x in self.in_param_if_refs:
+            in_param_ifs.append(resolve_snref(x, request.parameters, Parameter))
+
+        out_param_ifs = []
+        for x in self.out_param_if_refs:
+            out_param_ifs.append(resolve_snref(x, response.parameters, Parameter))
+
+        self._in_param_ifs = NamedItemList(in_param_ifs)
+        self._out_param_ifs = NamedItemList(out_param_ifs)
+
+
+@dataclass
+class TableRowConnector(NamedElement):
+    table_ref: OdxLinkRef
+    table_row_snref: str
+
+    @property
+    def table(self) -> Table:
+        return self._table
+
+    @property
+    def table_row(self) -> TableRow:
+        return self._table_row
+
+    @staticmethod
+    def from_et(et_element: ElementTree.Element,
+                doc_frags: List[OdxDocFragment]) -> "TableRowConnector":
+        kwargs = dataclass_fields_asdict(NamedElement.from_et(et_element, doc_frags))
+
+        table_ref = odxrequire(OdxLinkRef.from_et(et_element.find("TABLE-REF"), doc_frags))
+        table_row_snref_el = odxrequire(et_element.find("TABLE-ROW-SNREF"))
+        table_row_snref = odxrequire(table_row_snref_el.get("SHORT-NAME"))
+
+        return TableRowConnector(table_ref=table_ref, table_row_snref=table_row_snref, **kwargs)
+
+    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+        return {}
+
+    def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
+        self._table = odxlinks.resolve(self.table_ref, Table)
+
+    def _resolve_snrefs(self, context: SnRefContext) -> None:
+        self._table_row = resolve_snref(self.table_row_snref, self._table.table_rows, TableRow)
+
+
+@dataclass
+class DtcConnector(NamedElement):
+    dtc_dop_ref: OdxLinkRef
+    dtc_snref: str
+
+    @property
+    def dtc_dop(self) -> DtcDop:
+        return self._dtc_dop
+
+    @property
+    def dtc(self) -> DiagnosticTroubleCode:
+        return self._dtc
+
+    @staticmethod
+    def from_et(et_element: ElementTree.Element, doc_frags: List[OdxDocFragment]) -> "DtcConnector":
+        kwargs = dataclass_fields_asdict(NamedElement.from_et(et_element, doc_frags))
+
+        dtc_dop_ref = odxrequire(OdxLinkRef.from_et(et_element.find("DTC-DOP-REF"), doc_frags))
+        dtc_snref_el = odxrequire(et_element.find("DTC-SNREF"))
+        dtc_snref = odxrequire(dtc_snref_el.get("SHORT-NAME"))
+
+        return DtcConnector(dtc_dop_ref=dtc_dop_ref, dtc_snref=dtc_snref, **kwargs)
+
+    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+        return {}
+
+    def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
+        self._dtc_dop = odxlinks.resolve(self.dtc_dop_ref, DtcDop)
+
+    def _resolve_snrefs(self, context: SnRefContext) -> None:
+        self._dtc = resolve_snref(self.dtc_snref, self._dtc_dop.dtcs, DiagnosticTroubleCode)
+
+
+@dataclass
+class EnvDataConnector(NamedElement):
+    env_data_desc_ref: OdxLinkRef
+    env_data_snref: str
+
+    @property
+    def env_data_desc(self) -> EnvironmentDataDescription:
+        return self._env_data_desc
+
+    @property
+    def env_data(self) -> EnvironmentData:
+        return self._env_data
+
+    @staticmethod
+    def from_et(et_element: ElementTree.Element,
+                doc_frags: List[OdxDocFragment]) -> "EnvDataConnector":
+        kwargs = dataclass_fields_asdict(NamedElement.from_et(et_element, doc_frags))
+
+        env_data_desc_ref = odxrequire(
+            OdxLinkRef.from_et(et_element.find("ENV-DATA-DESC-REF"), doc_frags))
+        env_data_snref_el = odxrequire(et_element.find("ENV-DATA-SNREF"))
+        env_data_snref = odxrequire(env_data_snref_el.get("SHORT-NAME"))
+
+        return EnvDataConnector(
+            env_data_desc_ref=env_data_desc_ref, env_data_snref=env_data_snref, **kwargs)
+
+    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+        return {}
+
+    def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
+        self._env_data_desc = odxlinks.resolve(self.env_data_desc_ref, EnvironmentDataDescription)
+
+    def _resolve_snrefs(self, context: SnRefContext) -> None:
+        self._env_data = resolve_snref(self.env_data_snref, self._env_data_desc.env_datas,
+                                       EnvironmentData)
+
+
+@dataclass
+class SubComponent(IdentifiableElement):
+    """Sub-components describe collections of related diagnostic variables
+
+    Note that the communication paradigm via diagnostic variables is
+    somewhat uncommon. If your ECU does not define any, there's no
+    need for it to define sub-components.
+
+    """
+
+    #sub_component_patterns: NamedItemList[SubComponentPattern]
+    sub_component_param_connectors: NamedItemList[SubComponentParamConnector]
+    table_row_connectors: NamedItemList[TableRowConnector]
+    env_data_connectors: NamedItemList[EnvDataConnector]
+    dtc_connectors: NamedItemList[DtcConnector]
+
+    semantic: Optional[str]
+
+    @staticmethod
+    def from_et(et_element: ElementTree.Element, doc_frags: List[OdxDocFragment]) -> "SubComponent":
+        kwargs = dataclass_fields_asdict(IdentifiableElement.from_et(et_element, doc_frags))
+
+        semantic = et_element.get("SEMANTIC")
+
+        sub_component_param_connectors = [
+            SubComponentParamConnector.from_et(el, doc_frags) for el in et_element.iterfind(
+                "SUB-COMPONENT-PARAM-CONNECTORS/SUB-COMPONENT-PARAM-CONNECTOR")
+        ]
+        table_row_connectors = [
+            TableRowConnector.from_et(el, doc_frags)
+            for el in et_element.iterfind("TABLE-ROW-CONNECTORS/TABLE-ROW-CONNECTOR")
+        ]
+        env_data_connectors = [
+            EnvDataConnector.from_et(el, doc_frags)
+            for el in et_element.iterfind("ENV-DATA-CONNECTORS/ENV-DATA-CONNECTOR")
+        ]
+        dtc_connectors = [
+            DtcConnector.from_et(el, doc_frags)
+            for el in et_element.iterfind("DTC-CONNECTORS/DTC-CONNECTOR")
+        ]
+
+        return SubComponent(
+            semantic=semantic,
+            sub_component_param_connectors=NamedItemList(sub_component_param_connectors),
+            table_row_connectors=NamedItemList(table_row_connectors),
+            env_data_connectors=NamedItemList(env_data_connectors),
+            dtc_connectors=NamedItemList(dtc_connectors),
+            **kwargs)
+
+    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+        result = {}
+
+        for dtc_conn in self.dtc_connectors:
+            result.update(dtc_conn._build_odxlinks())
+
+        return result
+
+    def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
+        for dtc_conn in self.dtc_connectors:
+            dtc_conn._resolve_odxlinks(odxlinks)
+
+    def _resolve_snrefs(self, context: SnRefContext) -> None:
+        for dtc_conn in self.dtc_connectors:
+            dtc_conn._resolve_snrefs(context)

odxtools/templates/macros/printDiagLayer.xml.jinja2

@@ -22,6 +22,7 @@
 {%- import('macros/printResponse.xml.jinja2') as presp %}
 {%- import('macros/printStateChart.xml.jinja2') as psc %}
 {%- import('macros/printAudience.xml.jinja2') as paud %}
+{%- import('macros/printSubComponent.xml.jinja2') as psubcomp %}
 {%- import('macros/printLibrary.xml.jinja2') as plib %}
 {%- import('macros/printSpecialData.xml.jinja2') as psd %}
 {%- import('macros/printEcuVariantPattern.xml.jinja2') as pvpat %}
@@ -203,6 +204,13 @@
   {%- endfor %}
 </ADDITIONAL-AUDIENCES>
 {%- endif %}
+{%- if dlr.sub_components %}
+<SUB-COMPONENTS>
+  {%- for sc in dlr.sub_components %}
+  {{ psubcomp.printSubComponent(sc)|indent(2) }}
+  {%- endfor %}
+</SUB-COMPONENTS>
+{%- endif %}
 {%- if dlr.libraries %}
 <LIBRARYS>
   {%- for lib in dlr.libraries %}

odxtools/templates/macros/printSubComponent.xml.jinja2

@@ -0,0 +1,104 @@
+{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+#
+# SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printElementId.xml.jinja2') as peid %}
+{%- import('macros/printEcuVariantPattern.xml.jinja2') as pevp %}
+
+{%- macro printSubComponentPattern(pat) %}
+<SUB-COMPONENT-PATTERN>
+  <MATCHING-PARAMETERS>
+    {%- for mp in pat.matching_parameters %}
+    {{ pvp.printMatchingParameter(mp)|indent(4) }}
+    {%- endfor %}
+  </MATCHING-PARAMETERS>
+</SUB-COMPONENT-PATTERN>
+{%- endmacro %}
+
+{%- macro printSubComponentParamConnector(conn) %}
+<SUB-COMPONENT-PARAM-CONNECTOR{#- #} {{-peid.printElementIdAttribs(conn)}}>
+  {{ peid.printElementIdSubtags(conn)|indent(2) }}
+  <DIAG-COMM-SNREF {{- make_xml_attrib("SHORT-NAME", conn.diag_comm_snref ) }} />
+  {%- if conn.out_param_if_refs %}
+  <OUT-PARAM-IF-REFS>
+    {%- for snref in conn.out_param_if_refs %}
+    <OUT-PARAM-IF-SNREF SHORT-NAME="{{snref}}" />
+    {%- endfor %}
+  </OUT-PARAM-IF-REFS>
+  {%- endif %}
+  {%- if conn.in_param_if_refs %}
+  <IN-PARAM-IF-REFS>
+    {%- for snref in conn.in_param_if_refs %}
+    <IN-PARAM-IF-SNREF SHORT-NAME="{{snref}}" />
+    {%- endfor %}
+  </IN-PARAM-IF-REFS>
+  {%- endif %}
+</SUB-COMPONENT-PARAM-CONNECTOR>
+{%- endmacro %}
+
+{%- macro printTableRowConnector(conn) %}
+<TABLE-ROW-CONNECTOR>
+  {{ peid.printElementIdSubtags(conn)|indent(2) }}
+  <TABLE-REF ID-REF="{{ conn.table_ref.ref_id }}" />
+  <TABLE-ROW-SNREF {{- make_xml_attrib("SHORT-NAME", conn.table_row_snref ) }} />
+</TABLE-ROW-CONNECTOR>
+{%- endmacro %}
+
+{%- macro printEnvDataConnector(conn) %}
+<ENV-DATA-CONNECTOR>
+  {{ peid.printElementIdSubtags(conn)|indent(2) }}
+  <ENV-DATA-DESC-REF ID-REF="{{ conn.env_data_desc_ref.ref_id }}" />
+  <ENV-DATA-SNREF {{- make_xml_attrib("SHORT-NAME", conn.env_data_snref ) }} />
+</ENV-DATA-CONNECTOR>
+{%- endmacro %}
+
+{%- macro printDtcConnector(conn) %}
+<DTC-CONNECTOR>
+  {{ peid.printElementIdSubtags(conn)|indent(2) }}
+  <DTC-DOP-REF ID-REF="{{ conn.dtc_dop_ref.ref_id }}" />
+  <DOP-SNREF {{- make_xml_attrib("SHORT-NAME", conn.dtc_snref ) }} />
+</DTC-CONNECTOR>
+{%- endmacro %}
+
+{%- macro printSubComponent(sc) %}
+<SUB-COMPONENT{#- #} {{-peid.printElementIdAttribs(sc)}}
+              {{- make_xml_attrib("SEMANTIC", sc.semantic) }}>
+  {{ peid.printElementIdSubtags(sc)|indent(2) }}
+  {%- if sc.sub_component_patterns %}
+  <SUB-COMPONENT-PATTERNS>
+    {%- for scp in sc.sub_component_patterns %}
+    {{ printSubComponentPattern(scp)|indent(4) }}
+    {%- endfor %}
+  </SUB-COMPONENT-PATTERNS>
+  {%- endif %}
+  {%- if sc.sub_component_param_connectors %}
+  <SUB-COMPONENT-PARAM-CONNECTORS>
+    {%- for conn in sc.sub_component_param_connectors %}
+    {{ printSubComponentParamConnector(conn)|indent(4) }}
+    {%- endfor %}
+  </SUB-COMPONENT-PARAM-CONNECTORS>
+  {%- endif %}
+  {%- if sc.table_row_connectors %}
+  <TABLE-ROW-CONNECTORS>
+    {%- for conn in sc.table_row_connectors %}
+    {{ printTableRowConnector(conn)|indent(4) }}
+    {%- endfor %}
+  </TABLE-ROW-CONNECTORS>
+  {%- endif %}
+  {%- if sc.env_data_connectors %}
+  <ENV-DATA-CONNECTORS>
+    {%- for conn in sc.env_data_connectors %}
+    {{ printEnvDataConnector(conn)|indent(4) }}
+    {%- endfor %}
+  </ENV-DATA-CONNECTORS>
+  {%- endif %}
+  {%- if sc.dtc_connectors %}
+  <DTC-CONNECTORS>
+    {%- for conn in sc.dtc_connectors %}
+    {{ printDtcConnector(conn)|indent(4) }}
+    {%- endfor %}
+  </DTC-CONNECTORS>
+  {%- endif %}
+</SUB-COMPONENT>
+{%- endmacro %}

odxtools/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '8.2.1'
-__version_tuple__ = version_tuple = (8, 2, 1)
+__version__ = version = '8.3.1'
+__version_tuple__ = version_tuple = (8, 3, 1)

{odxtools-8.2.1.dist-info → odxtools-8.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odxtools
-Version: 8.2.1
+Version: 8.3.1
 Summary: Utilities to work with the ODX standard for automotive diagnostics
 Author-email: Katrin Bauer <katrin.bauer@mbition.io>, Andreas Lauser <andreas.lauser@mbition.io>, Ayoub Kaanich <kayoub5@live.com>
 Maintainer-email: Andreas Lauser <andreas.lauser@mbition.io>, Ayoub Kaanich <kayoub5@live.com>

{odxtools-8.2.1.dist-info → odxtools-8.3.1.dist-info}/RECORD

@@ -93,6 +93,7 @@ odxtools/statechart.py,sha256=ZT8amPjec25pexwnOAPiifGEmKa68rliOILLnB6tNJc,2956
 odxtools/statetransition.py,sha256=axZ1ePyyWAsxslTI5KDjZxC42uNyoPc6N7cNIhP5pxE,1860
 odxtools/staticfield.py,sha256=NBZa5UZD4BD4UekpqF5bq_IzFjxUafmvpCHIEptOl-s,4434
 odxtools/structure.py,sha256=W8uX1YQuJUApKfeLxYqlnU3EZ3AjTqcYpCUStR43ORI,582
+odxtools/subcomponent.py,sha256=OPnpbliL7OTfYy9dR0hpQclyqQiTUEa2e2n7GmIoZVE,10401
 odxtools/swvariable.py,sha256=tp8XJUokYOcAUkrQLM92IYDf7evIefwZR_DgMm33iYQ,622
 odxtools/table.py,sha256=zgpVveH8neSNhdcsPp0jG4f6H00M0NKCuAME8MSrf-Q,4024
 odxtools/tablerow.py,sha256=hOi7FCX7TiCRxErCD1hKU6h2hT5_8V3ghtt8dJXOiQY,6307
@@ -103,7 +104,7 @@ odxtools/unitgroup.py,sha256=_WNpnYFmkiHQnOY8XhIviiQLXziY3kplH--7ufAWXyI,2067
 odxtools/unitspec.py,sha256=RMdEQoLrPhGt9vo32fkwbTqymicHFkFQnydFoi3uBog,2924
 odxtools/utils.py,sha256=PJFXkG74BzoheurrDYOwHZ6EuIcr1sdxf1tQGk6zSgs,1122
 odxtools/variablegroup.py,sha256=--5sMDOMUg4I3hFyoVOFcGCTOrctrrMADdmH3Mn4wHk,848
-odxtools/version.py,sha256=ry4mLPoauQf45skJo220Mc_ipdigukiUFwiTCQkO_wU,411
+odxtools/version.py,sha256=j47e8zDIT9nXsPhJuJRzlh56ZyB-E1uGl-54XUFn9kk,411
 odxtools/writepdxfile.py,sha256=ZEoNkSxheqnXm836-HOpd04O6ipMXYKFzXZy6PM0YLc,7813
 odxtools/xdoc.py,sha256=gDq-8l8x-Tj1ZJOttPxZchcO5_jEPwcXxMgT29VgTS0,1433
 odxtools/cli/__init__.py,sha256=T7ano_FIyzBASxYpmcA5VJXU5bQLIy_Qk0HE_SDKelY,106
@@ -139,8 +140,8 @@ odxtools/compumethods/tabintpcompumethod.py,sha256=Gyf2qV5y53SHIcum5d5HQVGszoZCd
 odxtools/compumethods/texttablecompumethod.py,sha256=vDYafbM0YaipjfN0NSlCFMiIPvp8waMNj3thNcwuYgk,5929
 odxtools/diaglayers/basevariant.py,sha256=mXS-SF-tcwtdV-rxZZCH6_yqdA-yhtMX1SGo1MS8w7k,4452
 odxtools/diaglayers/basevariantraw.py,sha256=A9h6p2Ri0sPPTW217rtEdNpAt5g6t0MwP9sgXqZ8pFo,4673
-odxtools/diaglayers/diaglayer.py,sha256=kiziALQ4wUAz8aLSHSQzMAJ65c39rkww2zf3eAI6h4Q,16062
-odxtools/diaglayers/diaglayerraw.py,sha256=kE5hoz6Yv5zGRoAD4Z2dD44Mrvn6EUitBm3K8aChV5o,12403
+odxtools/diaglayers/diaglayer.py,sha256=aCL4dMehy-Q4JXp7ReRYxL0RwSJk-w2V7tvX7nN4ilg,16237
+odxtools/diaglayers/diaglayerraw.py,sha256=rQEH3Jzg6bzTmu0EyYhAoBlsL6qVm7Z46o2xlbL0nEo,12970
 odxtools/diaglayers/diaglayertype.py,sha256=FXL-EVBdrAURuHSHo9OthFuEYEybQO66aMB1o2GxVdI,1340
 odxtools/diaglayers/ecushareddata.py,sha256=QoV50wQIrJ2-faLtU1P7RrjdacbhPY2BfUtVtIyWqCM,3347
 odxtools/diaglayers/ecushareddataraw.py,sha256=cvkBhqTLOAey7Pt1bjQ3Jkkenp-D3Zh5djpB4ZWWUvw,3375
@@ -182,7 +183,7 @@ odxtools/templates/macros/printCompuMethod.xml.jinja2,sha256=9DilxMWnqOsXu7bNNlD
 odxtools/templates/macros/printDOP.xml.jinja2,sha256=t-6U0gZLdV2n6-YW5pkVFnHNVTAOnfqMch-mk_fGyjo,5146
 odxtools/templates/macros/printDescription.xml.jinja2,sha256=7jcYEIXr7hbbKqSvIUIgXaQSXV4dKAR9UhY352BZct8,452
 odxtools/templates/macros/printDiagComm.xml.jinja2,sha256=_SByYBYzPG9t7VNnAohFAXsgng9VrQcSacXH923wRzY,2239
-odxtools/templates/macros/printDiagLayer.xml.jinja2,sha256=psPPZK6yj8e4QURnA1leySY9YDOV8Wj_UiMj2-f2Vw4,6656
+odxtools/templates/macros/printDiagLayer.xml.jinja2,sha256=gQQhNGpVQRfVichgJdwBS6gMvoLfi-nlGat9imlW62Y,6901
 odxtools/templates/macros/printDiagVariable.xml.jinja2,sha256=sQEU42Onf0WkRJZJyNUgeeGICc3MZaQJPQ0YKY6lRrU,2656
 odxtools/templates/macros/printDynDefinedSpec.xml.jinja2,sha256=uX3C40VmlbH7sndlJNyTvq8upzaoq8vCk6S93gtpFIY,1742
 odxtools/templates/macros/printDynamicEndmarkerField.xml.jinja2,sha256=6BmxPKesQvfy46iTiPSFu_iJffC6umZ_YRsTEd-0y5Q,587
@@ -213,11 +214,12 @@ odxtools/templates/macros/printStateChart.xml.jinja2,sha256=XW1EhF1k8ogbEDt-QMjS
 odxtools/templates/macros/printStateTransition.xml.jinja2,sha256=J2t0yU82UBegUSH9sAbnkdgEYPTUU0A7I-CokuPQxDo,510
 odxtools/templates/macros/printStaticField.xml.jinja2,sha256=fkV07zrL2pTo6b5ZPD14V0uC1aEk2P4roXyDhp-ah38,521
 odxtools/templates/macros/printStructure.xml.jinja2,sha256=CJUPZv_9lko63C5fNpOn5LlQqLCuS--qyhtx4NyD5Rk,567
+odxtools/templates/macros/printSubComponent.xml.jinja2,sha256=ETo-k0K7px5nu9kgVjgDnjPoy8rYRfzq5ojvsZhM3Rw,3416
 odxtools/templates/macros/printTable.xml.jinja2,sha256=5DQjjJ-UxQ75ntov0S0LGnm_V7YWtKadBpNbmV1aBb8,1501
 odxtools/templates/macros/printUnitSpec.xml.jinja2,sha256=opS6_Gr94WlAtREEyX4sLo-D-17Gni9Wvr3y1nfVgSA,2715
-odxtools-8.2.1.dist-info/LICENSE,sha256=NeGPFQdTa6EKeON3aShVlPAIquJnbbiOfj0suz6rzyQ,1074
-odxtools-8.2.1.dist-info/METADATA,sha256=XJFo9HuR5ut_oT-x6eOcoV_R2a5PQr9umexDRlXQPZg,44084
-odxtools-8.2.1.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-odxtools-8.2.1.dist-info/entry_points.txt,sha256=_sBDzuNoT8LbbCjfc-OJiUt5WPrtOq_x-rr9txhrPjY,53
-odxtools-8.2.1.dist-info/top_level.txt,sha256=pdS02kE5ZdgsaBRZDpX3NBFlaSx3zotsqX4E4V6tXEI,9
-odxtools-8.2.1.dist-info/RECORD,,
+odxtools-8.3.1.dist-info/LICENSE,sha256=NeGPFQdTa6EKeON3aShVlPAIquJnbbiOfj0suz6rzyQ,1074
+odxtools-8.3.1.dist-info/METADATA,sha256=Ithh6Q0qSLSpzHYKciZ3NA-hZNdvaItrk4kaRL8WHXw,44084
+odxtools-8.3.1.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+odxtools-8.3.1.dist-info/entry_points.txt,sha256=_sBDzuNoT8LbbCjfc-OJiUt5WPrtOq_x-rr9txhrPjY,53
+odxtools-8.3.1.dist-info/top_level.txt,sha256=pdS02kE5ZdgsaBRZDpX3NBFlaSx3zotsqX4E4V6tXEI,9
+odxtools-8.3.1.dist-info/RECORD,,