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

odxtools/diaglayers/diaglayer.py

@@ -13,6 +13,7 @@ from ..diagcomm import DiagComm
 from ..diagdatadictionaryspec import DiagDataDictionarySpec
 from ..diagservice import DiagService
 from ..exceptions import DecodeError, odxassert, odxraise
+from ..library import Library
 from ..message import Message
 from ..nameditemlist import NamedItemList, TNamed
 from ..odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId, OdxLinkRef
@@ -23,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
@@ -259,6 +261,14 @@ class DiagLayer:
     def import_refs(self) -> List[OdxLinkRef]:
         return self.diag_layer_raw.import_refs
 
+    @property
+    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

@@ -13,6 +13,7 @@ from ..diagservice import DiagService
 from ..element import IdentifiableElement
 from ..exceptions import odxassert, odxraise, odxrequire
 from ..functionalclass import FunctionalClass
+from ..library import Library
 from ..nameditemlist import NamedItemList
 from ..odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId, OdxLinkRef
 from ..request import Request
@@ -21,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
 
@@ -46,8 +48,8 @@ class DiagLayerRaw(IdentifiableElement):
     import_refs: List[OdxLinkRef]
     state_charts: NamedItemList[StateChart]
     additional_audiences: NamedItemList[AdditionalAudience]
-    # sub_components: List[DiagLayer] # TODO
-    # libraries: List[DiagLayer] # TODO
+    sub_components: NamedItemList[SubComponent]
+    libraries: NamedItemList[Library]
     sdgs: List[SpecialDataGroup]
 
     @property
@@ -149,6 +151,15 @@ class DiagLayerRaw(IdentifiableElement):
             for el in et_element.iterfind("ADDITIONAL-AUDIENCES/ADDITIONAL-AUDIENCE")
         ]
 
+        libraries = [
+            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")
         ]
@@ -168,6 +179,8 @@ class DiagLayerRaw(IdentifiableElement):
             import_refs=import_refs,
             state_charts=NamedItemList(state_charts),
             additional_audiences=NamedItemList(additional_audiences),
+            libraries=NamedItemList(libraries),
+            sub_components=NamedItemList(sub_components),
             sdgs=sdgs,
             **kwargs)
 
@@ -200,6 +213,10 @@ class DiagLayerRaw(IdentifiableElement):
             odxlinks.update(state_chart._build_odxlinks())
         for additional_audience in self.additional_audiences:
             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())
 
@@ -252,6 +269,10 @@ class DiagLayerRaw(IdentifiableElement):
             state_chart._resolve_odxlinks(odxlinks)
         for additional_audience in self.additional_audiences:
             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)
 
@@ -282,5 +303,9 @@ class DiagLayerRaw(IdentifiableElement):
             state_chart._resolve_snrefs(context)
         for additional_audience in self.additional_audiences:
             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/diagservice.py

@@ -42,7 +42,9 @@ class DiagService(DiagComm):
     pos_response_refs: List[OdxLinkRef]
     neg_response_refs: List[OdxLinkRef]
 
-    # TODO: pos_response_suppressable: Optional[PosResponseSuppressable] # (sic!)
+    # note that the spec has a typo here: it calls the corresponding
+    # XML tag POS-RESPONSE-SUPPRESSABLE...
+    # TODO: pos_response_suppressible: Optional[PosResponseSuppressible]
 
     is_cyclic_raw: Optional[bool]
     is_multiple_raw: Optional[bool]

odxtools/library.py

@@ -0,0 +1,66 @@
+# SPDX-License-Identifier: MIT
+from dataclasses import dataclass
+from typing import Any, Dict, List, Optional, cast
+from xml.etree import ElementTree
+
+from .element import IdentifiableElement
+from .exceptions import odxraise, odxrequire
+from .odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId
+from .snrefcontext import SnRefContext
+from .utils import dataclass_fields_asdict
+
+
+@dataclass
+class Library(IdentifiableElement):
+    """
+    A library defines a shared library used for single ECU jobs etc.
+
+    It this is basically equivalent to ProgCode.
+    """
+
+    code_file: str
+    encryption: Optional[str]
+    syntax: str
+    revision: str
+    entrypoint: Optional[str]
+
+    @property
+    def code(self) -> bytes:
+        return self._code
+
+    @staticmethod
+    def from_et(et_element: ElementTree.Element, doc_frags: List[OdxDocFragment]) -> "Library":
+
+        kwargs = dataclass_fields_asdict(IdentifiableElement.from_et(et_element, doc_frags))
+
+        code_file = odxrequire(et_element.findtext("CODE-FILE"))
+        encryption = et_element.findtext("ENCRYPTION")
+        syntax = odxrequire(et_element.findtext("SYNTAX"))
+        revision = odxrequire(et_element.findtext("REVISION"))
+        entrypoint = et_element.findtext("ENTRYPOINT")
+
+        return Library(
+            code_file=code_file,
+            encryption=encryption,
+            syntax=syntax,
+            revision=revision,
+            entrypoint=entrypoint,
+            **kwargs)
+
+    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+        return {self.odx_id: self}
+
+    def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
+        pass
+
+    def _resolve_snrefs(self, context: SnRefContext) -> None:
+        aux_file = odxrequire(context.database).auxiliary_files.get(self.code_file)
+
+        if aux_file is None:
+            odxraise(f"Reference to auxiliary file '{self.code_file}' "
+                     f"could not be resolved")
+            self._code: bytes = cast(bytes, None)
+            return
+
+        self._code = aux_file.read()
+        aux_file.seek(0)

odxtools/minmaxlengthtype.py

@@ -74,7 +74,7 @@ class MinMaxLengthType(DiagCodedType):
     @override
     def encode_into_pdu(self, internal_value: AtomicOdxType, encode_state: EncodeState) -> None:
 
-        if not isinstance(internal_value, (bytes, str)):
+        if not isinstance(internal_value, (bytes, str, bytearray)):
             odxraise("MinMaxLengthType is currently only implemented for strings and byte arrays",
                      EncodeError)
 

odxtools/progcode.py

@@ -4,6 +4,8 @@ from typing import Any, Dict, List, Optional, cast
 from xml.etree import ElementTree
 
 from .exceptions import odxraise, odxrequire
+from .library import Library
+from .nameditemlist import NamedItemList
 from .odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId, OdxLinkRef
 from .snrefcontext import SnRefContext
 
@@ -12,9 +14,9 @@ from .snrefcontext import SnRefContext
 class ProgCode:
     """A reference to code that is executed by a single ECU job"""
     code_file: str
+    encryption: Optional[str]
     syntax: str
     revision: str
-    encryption: Optional[str]
     entrypoint: Optional[str]
     library_refs: List[OdxLinkRef]
 
@@ -22,6 +24,10 @@ class ProgCode:
     def code(self) -> bytes:
         return self._code
 
+    @property
+    def libraries(self) -> NamedItemList[Library]:
+        return self._libraries
+
     @staticmethod
     def from_et(et_element: ElementTree.Element, doc_frags: List[OdxDocFragment]) -> "ProgCode":
         code_file = odxrequire(et_element.findtext("CODE-FILE"))
@@ -49,9 +55,7 @@ class ProgCode:
         return {}
 
     def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
-        # TODO: Libraries are currently not internalized.
-        #       Once they are internalized, resolve the `library_refs` references here.
-        pass
+        self._libraries = NamedItemList([odxlinks.resolve(x, Library) for x in self.library_refs])
 
     def _resolve_snrefs(self, context: SnRefContext) -> None:
         aux_file = odxrequire(context.database).auxiliary_files.get(self.code_file)

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/printCompuMethod.xml.jinja2

@@ -92,12 +92,13 @@
 {%- macro printProgCode(pc) -%}
 <PROG-CODE>
   <CODE-FILE>{{pc.code_file}}</CODE-FILE>
-  <SYNTAX>{{pc.syntax}}</SYNTAX>
   {%- if pc.encryption is not none %}
   <ENCRYPTION>{{pc.encryption}}</ENCRYPTION>
   {%- endif %}
+  <SYNTAX>{{pc.syntax}}</SYNTAX>
+  <REVISION>{{pc.revision}}</REVISION>
   {%- if pc.entry_point is not none %}
-  <ENTRY-POINT>{{pc.entry_point}}</ENTRY-POINT>
+  <ENTRYPOINT>{{pc.entrypoint}}</ENTRYPOINT>
   {%- endif %}
   {%- if pc.library_refs %}
   <LIBRARY-REFS>

odxtools/templates/macros/printDiagLayer.xml.jinja2

@@ -22,6 +22,8 @@
 {%- 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 %}
 {%- import('macros/printAdminData.xml.jinja2') as pad %}
@@ -202,5 +204,19 @@
   {%- 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 %}
+  {{ plib.printLibrary(lib)|indent(2) }}
+  {%- endfor %}
+</LIBRARYS>
+{%- endif %}
 {{- psd.printSpecialDataGroups(dlr.sdgs)|indent(0, first=True) }}
 {%- endmacro -%}

odxtools/templates/macros/printLibrary.xml.jinja2

@@ -0,0 +1,21 @@
+{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printElementId.xml.jinja2') as peid %}
+
+{%- macro printLibrary(library) %}
+<LIBRARY{#- #} {{-peid.printElementIdAttribs(library)}}{# -#}>
+  {{ peid.printElementIdSubtags(library)|indent(1) }}
+  <CODE-FILE>{{library.code_file}}</CODE-FILE>
+  {%- if library.encryption is not none %}
+  <ENCRYPTION>{{library.encryption}}</ENCRYPTION>
+  {%- endif %}
+  <SYNTAX>{{library.syntax}}</SYNTAX>
+  <REVISION>{{library.revision}}</REVISION>
+  {%- if library.entrypoint is not none %}
+  <ENTRYPOINT>{{library.entrypoint}}</ENTRYPOINT>
+  {%- endif %}
+</LIBRARY>
+{%- endmacro %}

odxtools/templates/macros/printSingleEcuJob.xml.jinja2

@@ -5,13 +5,14 @@
 
 {%- import('macros/printElementId.xml.jinja2') as peid %}
 {%- import('macros/printDiagComm.xml.jinja2') as pdc %}
+{%- import('macros/printCompuMethod.xml.jinja2') as pcm %}
 
 {%- macro printSingleEcuJob(job) -%}
 <SINGLE-ECU-JOB {{pdc.printDiagCommAttribs(job)|indent(1) }}>
   {{pdc.printDiagCommSubtags(job) | indent(2, first=True) }}
   <PROG-CODES>
     {%- for prog in job.prog_codes %}
-    {{ printProgCode(prog)|indent(4) }}
+    {{ pcm.printProgCode(prog)|indent(4) }}
     {%- endfor %}
   </PROG-CODES>
   {%- if job.input_params %}
@@ -39,28 +40,6 @@
 {%- endmacro -%}
 
 
-{%- macro printProgCode(prog) -%}
-<PROG-CODE>
- <CODE-FILE>{{prog.code_file}}</CODE-FILE>
-{%- if prog.encryption %}
- <ENCRYPTION>{{prog.encryption}}</ENCRYPTION>
-{%- endif %}
- <SYNTAX>{{prog.syntax}}</SYNTAX>
- <REVISION>{{prog.revision}}</REVISION>
-{%- if prog.entrypoint %}
- <ENTRYPOINT>{{prog.entrypoint}}</ENTRYPOINT>
-{%- endif %}
-{%- if prog.library_refs %}
- <LIBRARY-REFS>
- {%- for ref in prog.library_refs %}
-   <LIBRARY-REF ID-REF="{{ref.ref_id}}" />
- {%- endfor %}
- </LIBRARY-REFS>
-{%- endif %}
-</PROG-CODE>
-{%- endmacro -%}
-
-
 {%- macro printInputParam(param) -%}
 <INPUT-PARAM {{-make_xml_attrib("OID", param.oid)}}
              {{-make_xml_attrib("SEMANTIC", param.semantic)}}>

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.0'
-__version_tuple__ = version_tuple = (8, 2, 0)
+__version__ = version = '8.3.1'
+__version_tuple__ = version_tuple = (8, 3, 1)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odxtools
-Version: 8.2.0
+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.0.dist-info → odxtools-8.3.1.dist-info}/RECORD

@@ -29,7 +29,7 @@ odxtools/diagcomm.py,sha256=j8esUkogoxHBwIEUBkAoXe28jX3vaRnnrgCR_gdP6VY,8110
 odxtools/diagdatadictionaryspec.py,sha256=2zy5f-xnfGI0bnjPOEwG_IJxfsHhXZoOfdIS_fOr3L0,10552
 odxtools/diaglayercontainer.py,sha256=0JC6ioUGe5c8FzXRotyGEGMMDz8fzKCsK204tGN3cAo,6524
 odxtools/diagnostictroublecode.py,sha256=jKtO8JqU0HRpeSyrcHn4s21N4Jj-p19WVP-qw2H98gY,2459
-odxtools/diagservice.py,sha256=ZNj7XbBPcNkrG0MLd8WoFcCneBmz9uU2Lpi8gtUF0mQ,10188
+odxtools/diagservice.py,sha256=y1_qKI7kJXDWpjpw91loIdf-K7Ozo45BsYiOhVYGuXg,10291
 odxtools/diagvariable.py,sha256=KUyRCV-H5xKITWYk9wxDnaS_N2nwDFGQzHaQRfNndKA,3829
 odxtools/docrevision.py,sha256=m57a4lCWeR6QvNNxtwUNpLXAMgSq29ks1HorxoipFVk,2698
 odxtools/dopbase.py,sha256=JMqlMNKyZJlXwcBFROetCIy1RsK-V_mSCR0MDuA-G5Y,2493
@@ -53,10 +53,11 @@ odxtools/inputparam.py,sha256=lyffK4UBG2d_0JzIaf1QZCsPXFti6gejiIWRSdr-CYA,1841
 odxtools/internalconstr.py,sha256=QKEkaOcrFoL9xID-oHWWkeg-vtcPV6RFOW1fX2K3pwg,1363
 odxtools/isotp_state_machine.py,sha256=O6v29IK7p_4gFqrr-fahnbp9Qmo78EEQfEwRsA_Vfjw,13339
 odxtools/leadinglengthinfotype.py,sha256=mtq38k74hEh_CUY7NbVwdCc_aqKr7v5ABoS_SlKVXyI,4185
+odxtools/library.py,sha256=E_A6K6jcEoUdXh4h4sQILj7_JM-6X5OUUWSM47G69CU,2067
 odxtools/loadfile.py,sha256=hi8jVE7B1G9gklsb7MrGrp4aOAI65j0kNwvDeEEEN2k,1744
 odxtools/matchingparameter.py,sha256=2cqaxFCZ28GvvUKCIM-jas3ae4eYGbULbkBlb3aH5RY,2232
 odxtools/message.py,sha256=07GekN1MbYXm7HaUITDKTj2lBmGK-LB9W8gtBmfAOew,1057
-odxtools/minmaxlengthtype.py,sha256=eF78Zb77f6Q6-JXdP3AjqmqNWo4KhGWb-_PVHT7Exmg,8906
+odxtools/minmaxlengthtype.py,sha256=FxcfbuPEmXgYava3h0EPF43I5yTZW_lUcgTqOF5mnes,8917
 odxtools/modification.py,sha256=oyyFsYHixy6XHOdqqTCx3IIkTAKlSN9wxBpNpvhUaJA,838
 odxtools/multiplexer.py,sha256=flHlorv9grEMj8pNAWQJNrxhptnDxSsFERO7gpKYRME,10235
 odxtools/multiplexercase.py,sha256=qfxWJzfJLYAsnhFGheUWDsUaIte2dSRJ0nadiN9SXDw,3176
@@ -73,7 +74,7 @@ odxtools/paramlengthinfotype.py,sha256=vhgvCPIRnyCF9t8yhkYf5MsHXQhWWeEgz_kS8AbiO
 odxtools/parentref.py,sha256=kcY3VMyVaIUWD0iVNX8sD9qeI4peU8gijboquu0zD7E,3751
 odxtools/physicaldimension.py,sha256=CEH7Ura4gqsqlBUxBW08ea9Pxh_Od8JruYQ8o9qOGME,3269
 odxtools/physicaltype.py,sha256=oYjOhdrTVCJcLLBYgy6pxKsZHpuwm1vZ8svwSjsUB6E,2699
-odxtools/progcode.py,sha256=ZoGf6X7qH3TT8zSr3bQAYwPb0Il4V6vSLWgdTnlj88Y,2169
+odxtools/progcode.py,sha256=Cx8ziCmQm2OfhinAuRrFrMuoThU7hgA6zNQKAT-AT0A,2276
 odxtools/protstack.py,sha256=nb2RR4OEaGX6lJ6drHejJU-tkB1p0Ok0KLZhNMTdsEc,2012
 odxtools/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 odxtools/relateddoc.py,sha256=zb5Ea9vkd31kxTP4s5_PLF3LuCoUcG8rgLckStHVRDc,1301
@@ -92,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
@@ -102,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=U2ZY-8DRa3-0sBp4eiNaB9C5lBxec9hW73W6_0hd4_Q,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
@@ -138,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=QGRS2jeqAsR8GbNRzX5u-rzQy-pNG9l5HRMyArX3-I0,15930
-odxtools/diaglayers/diaglayerraw.py,sha256=dC8PvvdRCvvp-J_74sFecqBoTYaMj1E5A8b6grtlvvs,11936
+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
@@ -177,11 +179,11 @@ odxtools/templates/macros/printBasicStructure.xml.jinja2,sha256=V5oWGZesU_U5pvPO
 odxtools/templates/macros/printCompanyData.xml.jinja2,sha256=jcNmQBOGDw7wcKdam72NIJSOTxthfkPJvrmw24MBiYQ,2981
 odxtools/templates/macros/printComparam.xml.jinja2,sha256=e3hPCswAymJteQIUNoc7FOwsK_FrbJOvJooWdEx_vuQ,2408
 odxtools/templates/macros/printComparamRef.xml.jinja2,sha256=rBhrdUnp605fsUN9SaljpyaAojzaLBvTbkOuduKod18,1274
-odxtools/templates/macros/printCompuMethod.xml.jinja2,sha256=6eW1IgjPDwtW9qvA24Tx1wFtGFfJ0k10Gne5HoQpy4U,4394
+odxtools/templates/macros/printCompuMethod.xml.jinja2,sha256=9DilxMWnqOsXu7bNNlDqls-lEqcr_GPzhZum8rzDJP0,4430
 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=NKrQ9JTxxhdHTHYFo_ZzyoClJJkZC3ISObhWCJOXUq4,6449
+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
@@ -196,6 +198,7 @@ odxtools/templates/macros/printEnvDataDesc.xml.jinja2,sha256=rBpPf51LFx5oNx_XjeT
 odxtools/templates/macros/printFunctionalClass.xml.jinja2,sha256=TpOQTj-hlNLtIfcSTVzU-gRrfaWrgsTrIFMqm_1M6Qs,329
 odxtools/templates/macros/printFunctionalGroup.xml.jinja2,sha256=zIeZbhf8haXhgJJUPiOnMe3lvqvfye4-zmwWDQJxFtQ,1159
 odxtools/templates/macros/printHierarchyElement.xml.jinja2,sha256=GD6iNIE0Wu0QsJ8uLtwEV8N9t6mIhI00_KpCVzOVQBM,651
+odxtools/templates/macros/printLibrary.xml.jinja2,sha256=wp8vZzHPLZayWZh6BOQ56kGyHSeyrlNacdlxBw9d0N0,683
 odxtools/templates/macros/printMux.xml.jinja2,sha256=68IiPY_mIJQqQiqce3jUphqp3-xLfmEBL7CSb3Cz7eI,1869
 odxtools/templates/macros/printParam.xml.jinja2,sha256=bdp-r1arWod-vV9ODUZn_QThtAAqkm31SqdJeGItJ1M,3183
 odxtools/templates/macros/printParentRef.xml.jinja2,sha256=RllVKt2RgrMnWfsujGnBUiABwV2y4_ZfINYy7LXenPM,896
@@ -204,18 +207,19 @@ odxtools/templates/macros/printProtocol.xml.jinja2,sha256=1DXoRSq6z4dhpZnXWH3x9J
 odxtools/templates/macros/printRequest.xml.jinja2,sha256=yq4xGSlQCioT7FRivyx40Cjs2CYr9EK6NLZf0W4wGW0,717
 odxtools/templates/macros/printResponse.xml.jinja2,sha256=GsOYmnoh4ewhWg3FUdcovHuJxvuIjsSrXNtbcnnAQcM,683
 odxtools/templates/macros/printService.xml.jinja2,sha256=zvjOCELEx4yim2FtdNKiExTsDPkAfQAP4Gf_QsondfQ,1546
-odxtools/templates/macros/printSingleEcuJob.xml.jinja2,sha256=SXUgO57KQFahI3fv9tRWlEyWeSr0sYXwQ8vq8lqo0eI,2645
+odxtools/templates/macros/printSingleEcuJob.xml.jinja2,sha256=6phi3VxGllusm6KGgrjWiOj7g80ojHyxvesqmHvuNhs,2174
 odxtools/templates/macros/printSpecialData.xml.jinja2,sha256=0eIFh9cWXfFrQN_f8G_lz3fUqmtysxY6tSN4DbuFY40,1386
 odxtools/templates/macros/printState.xml.jinja2,sha256=BNnTEyczp43iP9Bn_plMLRsJsasra4sRyvmgODuZQYg,315
 odxtools/templates/macros/printStateChart.xml.jinja2,sha256=XW1EhF1k8ogbEDt-QMjSOojKl4vjxXkq6BwJWR9GJsI,951
 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.0.dist-info/LICENSE,sha256=NeGPFQdTa6EKeON3aShVlPAIquJnbbiOfj0suz6rzyQ,1074
-odxtools-8.2.0.dist-info/METADATA,sha256=jp34I9k6-icmiR1fzWzxwyMO6Biyd7CA1BnvWLUelxU,44084
-odxtools-8.2.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-odxtools-8.2.0.dist-info/entry_points.txt,sha256=_sBDzuNoT8LbbCjfc-OJiUt5WPrtOq_x-rr9txhrPjY,53
-odxtools-8.2.0.dist-info/top_level.txt,sha256=pdS02kE5ZdgsaBRZDpX3NBFlaSx3zotsqX4E4V6tXEI,9
-odxtools-8.2.0.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,,

{odxtools-8.2.0.dist-info → odxtools-8.3.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any