odxtools 10.3.0__py3-none-any.whl → 10.4.0__py3-none-any.whl

odxtools/database.py

@@ -21,6 +21,7 @@ from .diaglayers.protocol import Protocol
 from .ecuconfig import EcuConfig
 from .exceptions import odxraise, odxrequire
 from .flash import Flash
+from .multipleecujobspec import MultipleEcuJobSpec
 from .nameditemlist import NamedItemList
 from .odxdoccontext import OdxDocContext
 from .odxlink import DocType, OdxDocFragment, OdxLinkDatabase, OdxLinkId
@@ -43,6 +44,7 @@ class Database:
         self._comparam_specs = NamedItemList[ComparamSpec]()
         self._ecu_configs = NamedItemList[EcuConfig]()
         self._flashs = NamedItemList[Flash]()
+        self._multiple_ecu_job_specs = NamedItemList[MultipleEcuJobSpec]()
         self._short_name = "odx_database"
 
     def add_pdx_file(self, pdx_file: Union[str, "PathLike[Any]", IO[bytes], ZipFile]) -> None:
@@ -123,6 +125,10 @@ class Database:
         elif category_tag == "FLASH":
             context = OdxDocContext(model_version, (OdxDocFragment(category_sn, DocType.FLASH),))
             self._flashs.append(Flash.from_et(category_et, context))
+        elif category_tag == "MULTIPLE-ECU-JOB-SPEC":
+            context = OdxDocContext(model_version,
+                                    (OdxDocFragment(category_sn, DocType.MULTIPLE_ECU_JOB_SPEC),))
+            self._multiple_ecu_job_specs.append(MultipleEcuJobSpec.from_et(category_et, context))
 
     def refresh(self) -> None:
         # Create wrapper objects
@@ -160,6 +166,9 @@ class Database:
         for flash in self.flashs:
             flash._resolve_odxlinks(self._odxlinks)
 
+        for multiple_ecu_job_spec in self.multiple_ecu_job_specs:
+            multiple_ecu_job_spec._resolve_odxlinks(self._odxlinks)
+
         # resolve short name references for containers which do not do
         # inheritance (we can call directly call _resolve_snrefs())
         context = SnRefContext()
@@ -176,6 +185,8 @@ class Database:
             ecu_config._finalize_init(self, self._odxlinks)
         for flash in self.flashs:
             flash._finalize_init(self, self._odxlinks)
+        for multiple_ecu_job_spec in self.multiple_ecu_job_specs:
+            multiple_ecu_job_spec._finalize_init(self, self._odxlinks)
 
         for subset in self.comparam_subsets:
             subset._resolve_snrefs(context)
@@ -187,6 +198,8 @@ class Database:
             ecu_config._resolve_snrefs(context)
         for flash in self.flashs:
             flash._resolve_snrefs(context)
+        for multiple_ecu_job_spec in self.multiple_ecu_job_specs:
+            multiple_ecu_job_spec._resolve_snrefs(context)
 
     def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         result: dict[OdxLinkId, Any] = {}
@@ -205,6 +218,8 @@ class Database:
 
         for flash in self.flashs:
             result.update(flash._build_odxlinks())
+        for multiple_ecu_job_spec in self.multiple_ecu_job_specs:
+            result.update(multiple_ecu_job_spec._build_odxlinks())
 
         return result
 
@@ -287,6 +302,10 @@ class Database:
     def flashs(self) -> NamedItemList[Flash]:
         return self._flashs
 
+    @property
+    def multiple_ecu_job_specs(self) -> NamedItemList[MultipleEcuJobSpec]:
+        return self._multiple_ecu_job_specs
+
     def __repr__(self) -> str:
         return f"Database(model_version={self.model_version}, " \
             f"protocols={[x.short_name for x in self.protocols]}, " \

odxtools/diaglayers/diaglayer.py

@@ -98,14 +98,7 @@ class DiagLayer:
         if self.import_refs:
             imported_links: dict[OdxLinkId, Any] = {}
             for import_ref in self.import_refs:
-                imported_dl = odxlinks.resolve(import_ref, DiagLayer)
-
-                odxassert(
-                    imported_dl.variant_type == DiagLayerType.ECU_SHARED_DATA,
-                    f"Tried to import references from diagnostic layer "
-                    f"'{imported_dl.short_name}' of type {imported_dl.variant_type.value}. "
-                    f"Only ECU-SHARED-DATA layers may be referenced using the "
-                    f"IMPORT-REF mechanism")
+                imported_dl = odxlinks.resolve(import_ref)
 
                 # TODO: ensure that the imported diagnostic layer has
                 # not been referenced in any PARENT-REF of the current

odxtools/multipleecujob.py

@@ -0,0 +1,178 @@
+# SPDX-License-Identifier: MIT
+from dataclasses import dataclass, field
+from typing import Any
+from xml.etree import ElementTree
+
+from .admindata import AdminData
+from .audience import Audience
+from .diaglayers.diaglayer import DiagLayer
+from .element import IdentifiableElement
+from .exceptions import odxrequire
+from .functionalclass import FunctionalClass
+from .inputparam import InputParam
+from .nameditemlist import NamedItemList
+from .negoutputparam import NegOutputParam
+from .odxdoccontext import OdxDocContext
+from .odxlink import OdxLinkDatabase, OdxLinkId, OdxLinkRef
+from .odxtypes import odxstr_to_bool
+from .outputparam import OutputParam
+from .progcode import ProgCode
+from .snrefcontext import SnRefContext
+from .specialdatagroup import SpecialDataGroup
+from .utils import dataclass_fields_asdict
+
+
+@dataclass(kw_only=True)
+class MultipleEcuJob(IdentifiableElement):
+    """A multiple ECU job is a diagnostic communication primitive.
+
+    A multiple ECU job is more complex than a diagnostic service and is
+    not provided natively by the ECU.  In particular, the job is
+    defined in external programs which are referenced by the attribute
+    `.prog_codes`.
+
+    In contrast to "single ECU jobs", a multiple ECU job only involves
+    calls to services provided by more than one ECU.
+
+    Multiple ECU jobs are defined in section 7.3.11 of the ASAM MCD-2
+    standard.
+    """
+
+    admin_data: AdminData | None = None
+    sdgs: list[SpecialDataGroup] = field(default_factory=list)
+    functional_class_refs: list[OdxLinkRef] = field(default_factory=list)
+    prog_codes: list[ProgCode] = field(default_factory=list)
+    input_params: NamedItemList[InputParam] = field(default_factory=NamedItemList)
+    output_params: NamedItemList[OutputParam] = field(default_factory=NamedItemList)
+    neg_output_params: NamedItemList[NegOutputParam] = field(default_factory=NamedItemList)
+    diag_layer_refs: list[OdxLinkRef] = field(default_factory=list)
+    audience: Audience | None = None
+    semantic: str | None = None
+    is_executable_raw: bool | None = None
+
+    @property
+    def functional_classes(self) -> NamedItemList[FunctionalClass]:
+        return self._functional_classes
+
+    @property
+    def diag_layers(self) -> NamedItemList[DiagLayer]:
+        return self._diag_layers
+
+    @property
+    def is_executable(self) -> bool:
+        return self.is_executable_raw in (True, None)
+
+    @staticmethod
+    def from_et(et_element: ElementTree.Element, context: OdxDocContext) -> "MultipleEcuJob":
+        kwargs = dataclass_fields_asdict(IdentifiableElement.from_et(et_element, context))
+
+        admin_data = None
+        if (admin_data_elem := et_element.find("ADMIN-DATA")) is not None:
+            admin_data = AdminData.from_et(admin_data_elem, context)
+        sdgs = [SpecialDataGroup.from_et(sdge, context) for sdge in et_element.iterfind("SDGS/SDG")]
+        functional_class_refs = [
+            odxrequire(OdxLinkRef.from_et(el, context))
+            for el in et_element.iterfind("FUNCT-CLASS-REFS/FUNCT-CLASS-REF")
+        ]
+        prog_codes = [
+            ProgCode.from_et(pc_elem, context)
+            for pc_elem in et_element.iterfind("PROG-CODES/PROG-CODE")
+        ]
+
+        input_params = NamedItemList([
+            InputParam.from_et(el, context)
+            for el in et_element.iterfind("INPUT-PARAMS/INPUT-PARAM")
+        ])
+        output_params = NamedItemList([
+            OutputParam.from_et(el, context)
+            for el in et_element.iterfind("OUTPUT-PARAMS/OUTPUT-PARAM")
+        ])
+        neg_output_params = NamedItemList([
+            NegOutputParam.from_et(el, context)
+            for el in et_element.iterfind("NEG-OUTPUT-PARAMS/NEG-OUTPUT-PARAM")
+        ])
+        diag_layer_refs = [
+            odxrequire(OdxLinkRef.from_et(el, context))
+            for el in et_element.iterfind("DIAG-LAYER-REFS/DIAG-LAYER-REF")
+        ]
+        audience = None
+        if (aud_elem := et_element.find("AUDIENCE")) is not None:
+            audience = Audience.from_et(aud_elem, context)
+
+        semantic = et_element.attrib.get("SEMANTIC")
+        is_executable_raw = odxstr_to_bool(et_element.attrib.get("IS-EXECUTABLE"))
+
+        return MultipleEcuJob(
+            admin_data=admin_data,
+            sdgs=sdgs,
+            functional_class_refs=functional_class_refs,
+            prog_codes=prog_codes,
+            input_params=input_params,
+            output_params=output_params,
+            neg_output_params=neg_output_params,
+            diag_layer_refs=diag_layer_refs,
+            audience=audience,
+            semantic=semantic,
+            is_executable_raw=is_executable_raw,
+            **kwargs)
+
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
+        result = {self.odx_id: self}
+
+        if self.admin_data is not None:
+            result.update(self.admin_data._build_odxlinks())
+        for sdg in self.sdgs:
+            result.update(sdg._build_odxlinks())
+        for prog_code in self.prog_codes:
+            result.update(prog_code._build_odxlinks())
+        for input_param in self.input_params:
+            result.update(input_param._build_odxlinks())
+        for output_param in self.output_params:
+            result.update(output_param._build_odxlinks())
+        for neg_output_param in self.neg_output_params:
+            result.update(neg_output_param._build_odxlinks())
+        if self.audience is not None:
+            result.update(self.audience._build_odxlinks())
+
+        return result
+
+    def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
+        if self.admin_data is not None:
+            self.admin_data._resolve_odxlinks(odxlinks)
+        for sdg in self.sdgs:
+            sdg._resolve_odxlinks(odxlinks)
+        for prog_code in self.prog_codes:
+            prog_code._resolve_odxlinks(odxlinks)
+        for input_param in self.input_params:
+            input_param._resolve_odxlinks(odxlinks)
+        for output_param in self.output_params:
+            output_param._resolve_odxlinks(odxlinks)
+        for neg_output_param in self.neg_output_params:
+            neg_output_param._resolve_odxlinks(odxlinks)
+        if self.audience is not None:
+            self.audience._resolve_odxlinks(odxlinks)
+
+        self._functional_classes = NamedItemList(
+            [odxlinks.resolve(fc_ref, FunctionalClass) for fc_ref in self.functional_class_refs])
+        self._diag_layers = NamedItemList(
+            [odxlinks.resolve(dl_ref, DiagLayer) for dl_ref in self.diag_layer_refs])
+
+    def _resolve_snrefs(self, context: SnRefContext) -> None:
+        context.multiple_ecu_job = self
+
+        if self.admin_data is not None:
+            self.admin_data._resolve_snrefs(context)
+        for sdg in self.sdgs:
+            sdg._resolve_snrefs(context)
+        for prog_code in self.prog_codes:
+            prog_code._resolve_snrefs(context)
+        for input_param in self.input_params:
+            input_param._resolve_snrefs(context)
+        for output_param in self.output_params:
+            output_param._resolve_snrefs(context)
+        for neg_output_param in self.neg_output_params:
+            neg_output_param._resolve_snrefs(context)
+        if self.audience is not None:
+            self.audience._resolve_snrefs(context)
+
+        context.multiple_ecu_job = None

odxtools/multipleecujobspec.py

@@ -0,0 +1,142 @@
+# SPDX-License-Identifier: MIT
+from copy import copy
+from dataclasses import dataclass, field
+from typing import TYPE_CHECKING, Any
+from xml.etree import ElementTree
+
+from .additionalaudience import AdditionalAudience
+from .diagdatadictionaryspec import DiagDataDictionarySpec
+from .diaglayers.ecushareddata import EcuSharedData
+from .functionalclass import FunctionalClass
+from .multipleecujob import MultipleEcuJob
+from .nameditemlist import NamedItemList
+from .odxcategory import OdxCategory
+from .odxdoccontext import OdxDocContext
+from .odxlink import OdxLinkDatabase, OdxLinkId, OdxLinkRef
+from .snrefcontext import SnRefContext
+from .utils import dataclass_fields_asdict
+
+if TYPE_CHECKING:
+    from .database import Database
+
+
+@dataclass(kw_only=True)
+class MultipleEcuJobSpec(OdxCategory):
+    multiple_ecu_jobs: NamedItemList[MultipleEcuJob] = field(default_factory=NamedItemList)
+    diag_data_dictionary_spec: DiagDataDictionarySpec | None = None
+    functional_classes: NamedItemList[FunctionalClass] = field(default_factory=NamedItemList)
+    additional_audiences: NamedItemList[AdditionalAudience] = field(default_factory=NamedItemList)
+    import_refs: list[OdxLinkRef] = field(default_factory=list)
+
+    @property
+    def imported_layers(self) -> NamedItemList[EcuSharedData]:
+        """The resolved IMPORT-REFs
+
+        ODXLINK defined by ECU-SHARED-DATA layers referenced via
+        IMPORT-REF ought to be treated as if they where defined
+        locally.
+        """
+        return self._imported_layers
+
+    @staticmethod
+    def from_et(et_element: ElementTree.Element, context: OdxDocContext) -> "MultipleEcuJobSpec":
+
+        base_obj = OdxCategory.from_et(et_element, context)
+        kwargs = dataclass_fields_asdict(base_obj)
+
+        multiple_ecu_jobs = NamedItemList([
+            MultipleEcuJob.from_et(el, context)
+            for el in et_element.iterfind("MULTIPLE-ECU-JOBS/MULTIPLE-ECU-JOB")
+        ])
+        diag_data_dictionary_spec = None
+        if (ddds_elem := et_element.find("DIAG-DATA-DICTIONARY-SPEC")) is not None:
+            diag_data_dictionary_spec = DiagDataDictionarySpec.from_et(ddds_elem, context)
+        functional_classes = NamedItemList([
+            FunctionalClass.from_et(el, context)
+            for el in et_element.iterfind("FUNCT-CLASSS/FUNCT-CLASS")
+        ])
+        additional_audiences = NamedItemList([
+            AdditionalAudience.from_et(el, context)
+            for el in et_element.iterfind("ADDITIONAL-AUDIENCES/ADDITIONAL-AUDIENCE")
+        ])
+        import_refs = [
+            OdxLinkRef.from_et(el, context) for el in et_element.iterfind("IMPORT-REFS/IMPORT-REF")
+        ]
+
+        return MultipleEcuJobSpec(
+            multiple_ecu_jobs=multiple_ecu_jobs,
+            diag_data_dictionary_spec=diag_data_dictionary_spec,
+            functional_classes=functional_classes,
+            additional_audiences=additional_audiences,
+            import_refs=import_refs,
+            **kwargs)
+
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
+        odxlinks = super()._build_odxlinks()
+
+        for multiple_ecu_job in self.multiple_ecu_jobs:
+            odxlinks.update(multiple_ecu_job._build_odxlinks())
+
+        if self.diag_data_dictionary_spec is not None:
+            odxlinks.update(self.diag_data_dictionary_spec._build_odxlinks())
+
+        for functional_class in self.functional_classes:
+            odxlinks.update(functional_class._build_odxlinks())
+
+        for additional_audience in self.additional_audiences:
+            odxlinks.update(additional_audience._build_odxlinks())
+
+        return odxlinks
+
+    def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
+        # deal with the import refs: IDs defined therein are to be
+        # handled like they were local.
+        self._imported_layers: NamedItemList[EcuSharedData] = NamedItemList()
+        if self.import_refs:
+            extended_odxlinks = copy(odxlinks)
+            imported_links: dict[OdxLinkId, Any] = {}
+            for import_ref in self.import_refs:
+                imported_dl = odxlinks.resolve(import_ref, EcuSharedData)
+                self._imported_layers.append(imported_dl)
+
+                # replace the document fragments of the ODX id with
+                # the those of the muliple-ecu-spec. (be aware that
+                # the "original" locations are still available.)
+                imported_dl_links = imported_dl._build_odxlinks()
+                for link_id, obj in imported_dl_links.items():
+                    link_id = OdxLinkId(link_id.local_id, self.odx_id.doc_fragments)
+                    imported_links[link_id] = obj
+
+                extended_odxlinks.update(imported_links, overwrite=False)
+        else:
+            extended_odxlinks = odxlinks
+
+        for multiple_ecu_job in self.multiple_ecu_jobs:
+            multiple_ecu_job._resolve_odxlinks(extended_odxlinks)
+
+        if self.diag_data_dictionary_spec is not None:
+            self.diag_data_dictionary_spec._resolve_odxlinks(extended_odxlinks)
+
+        for functional_class in self.functional_classes:
+            functional_class._resolve_odxlinks(extended_odxlinks)
+
+        for additional_audiences in self.additional_audiences:
+            additional_audiences._resolve_odxlinks(extended_odxlinks)
+
+    def _finalize_init(self, database: "Database", odxlinks: OdxLinkDatabase) -> None:
+        super()._finalize_init(database, odxlinks)
+
+    def _resolve_snrefs(self, context: SnRefContext) -> None:
+        super()._resolve_snrefs(context)
+
+        for multiple_ecu_job in self.multiple_ecu_jobs:
+            multiple_ecu_job._resolve_snrefs(context)
+
+        if self.diag_data_dictionary_spec is not None:
+            self.diag_data_dictionary_spec._resolve_snrefs(context)
+
+        for functional_class in self.functional_classes:
+            functional_class._resolve_snrefs(context)
+
+        for additional_audiences in self.additional_audiences:
+            additional_audiences._resolve_snrefs(context)

odxtools/outputparam.py

@@ -38,7 +38,7 @@ class OutputParam(IdentifiableElement):
         return OutputParam(dop_base_ref=dop_base_ref, semantic=semantic, **kwargs)
 
     def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
-        return {}
+        return {self.odx_id: self}
 
     def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
         self._dop = odxlinks.resolve(self.dop_base_ref, DopBase)

odxtools/snrefcontext.py

@@ -6,6 +6,7 @@ if TYPE_CHECKING:
     from .database import Database
     from .diaglayers.diaglayer import DiagLayer
     from .diagservice import DiagService
+    from .multipleecujob import MultipleEcuJob
     from .parameters.parameter import Parameter
     from .request import Request
     from .response import Response
@@ -23,6 +24,7 @@ class SnRefContext:
     diag_layer: Optional["DiagLayer"] = None
     diag_service: Optional["DiagService"] = None
     single_ecu_job: Optional["SingleEcuJob"] = None
+    multiple_ecu_job: Optional["MultipleEcuJob"] = None
     request: Optional["Request"] = None
     response: Optional["Response"] = None
     parameters: list["Parameter"] | None = None

odxtools/templates/macros/printAdminData.xml.jinja2

@@ -26,7 +26,7 @@
   {%- endfor %}
  </COMPANY-DOC-INFOS>
  {%- endif %}
- {%- if admin_data.doc_revisions is not none %}
+ {%- if admin_data.doc_revisions %}
  <DOC-REVISIONS>
   {%- for doc_revision in admin_data.doc_revisions %}
   <DOC-REVISION>

odxtools/templates/macros/printDiagDataDictionarySpec.xml.jinja2

@@ -0,0 +1,107 @@
+{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printAdminData.xml.jinja2') as pad %}
+{%- import('macros/printDOP.xml.jinja2') as pdop %}
+{%- import('macros/printTable.xml.jinja2') as pt %}
+{%- import('macros/printStructure.xml.jinja2') as pst %}
+{%- import('macros/printEndOfPdu.xml.jinja2') as peopdu %}
+{%- import('macros/printStaticField.xml.jinja2') as psf %}
+{%- import('macros/printDynamicLengthField.xml.jinja2') as pdlf %}
+{%- import('macros/printDynamicEndmarkerField.xml.jinja2') as pdemf %}
+{%- import('macros/printMux.xml.jinja2') as pm %}
+{%- import('macros/printEnvData.xml.jinja2') as ped %}
+{%- import('macros/printEnvDataDesc.xml.jinja2') as pedd %}
+{%- import('macros/printUnitSpec.xml.jinja2') as punit %}
+{%- import('macros/printSpecialData.xml.jinja2') as psd %}
+
+{%- macro printDiagDataDictionarySpec(ddds) -%}
+<DIAG-DATA-DICTIONARY-SPEC>
+  {%- if ddds.admin_data is not none %}
+  {{- pad.printAdminData(ddds.admin_data)|indent(2) }}
+  {%- endif %}
+  {%- if ddds.dtc_dops  %}
+  <DTC-DOPS>
+    {%- for dop in ddds.dtc_dops -%}
+    {{ pdop.printDtcDop(dop)|indent(4) }}
+    {%- endfor %}
+  </DTC-DOPS>
+  {%- endif %}
+  {%- if ddds.env_data_descs  %}
+  <ENV-DATA-DESCS>
+    {%- for env_data_desc in ddds.env_data_descs -%}
+    {{ pedd.printEnvDataDesc(env_data_desc)|indent(4) }}
+    {%- endfor %}
+  </ENV-DATA-DESCS>
+  {%- endif %}
+  {%- if ddds.data_object_props %}
+  <DATA-OBJECT-PROPS>
+    {%- for dop in ddds.data_object_props %}
+    {{- pdop.printDataObjectProp(dop)|indent(4) }}
+    {%- endfor %}
+  </DATA-OBJECT-PROPS>
+  {%- endif %}
+  {%- if ddds.structures %}
+  <STRUCTURES>
+    {%- for st in ddds.structures %}
+    {{ pst.printStructure(st)|indent(4) }}
+    {%- endfor %}
+  </STRUCTURES>
+  {%- endif %}
+  {%- if ddds.static_fields %}
+  <STATIC-FIELDS>
+    {%- for sf in ddds.static_fields %}
+    {{ psf.printStaticField(sf)|indent(4) }}
+    {%- endfor %}
+  </STATIC-FIELDS>
+  {%- endif %}
+  {%- if ddds.dynamic_length_fields %}
+  <DYNAMIC-LENGTH-FIELDS>
+    {%- for dlf in ddds.dynamic_length_fields %}
+    {{ pdlf.printDynamicLengthField(dlf)|indent(4) }}
+    {%- endfor %}
+  </DYNAMIC-LENGTH-FIELDS>
+  {%- endif %}
+  {%- if ddds.dynamic_endmarker_fields %}
+  <DYNAMIC-ENDMARKER-FIELDS>
+    {%- for demf in ddds.dynamic_endmarker_fields %}
+    {{ pdemf.printDynamicEndmarkerField(demf)|indent(4) }}
+    {%- endfor %}
+  </DYNAMIC-ENDMARKER-FIELDS>
+  {%- endif %}
+  {%- if ddds.end_of_pdu_fields %}
+  <END-OF-PDU-FIELDS>
+    {%- for eopdu in ddds.end_of_pdu_fields %}
+    {{ peopdu.printEndOfPdu(eopdu)|indent(4) }}
+    {%- endfor %}
+  </END-OF-PDU-FIELDS>
+  {%- endif %}
+  {%- if ddds.muxs %}
+  <MUXS>
+    {%- for mux in ddds.muxs %}
+    {{ pm.printMux(mux)|indent(4) }}
+    {%- endfor %}
+  </MUXS>
+  {%- endif %}
+  {%- if ddds.env_datas %}
+  <ENV-DATAS>
+    {%- for env_data in ddds.env_datas %}
+    {{ ped.printEnvData(env_data)|indent(4) }}
+    {%- endfor %}
+  </ENV-DATAS>
+  {%- endif %}
+  {%- if ddds.unit_spec %}
+  {{ punit.printUnitSpec(ddds.unit_spec)|indent(2) }}
+  {%- endif %}
+  {%- if ddds.tables  %}
+  <TABLES>
+    {%- for table in ddds.tables -%}
+    {{ pt.printTable(table)|indent(4) }}
+    {%- endfor %}
+  </TABLES>
+  {%- endif %}
+  {{- psd.printSpecialDataGroups(ddds.sdgs)|indent(2, first=True) }}
+</DIAG-DATA-DICTIONARY-SPEC>
+{%- endmacro -%}

odxtools/templates/macros/printDiagLayer.xml.jinja2

@@ -4,18 +4,10 @@
 -#}
 
 {%- import('macros/printElementId.xml.jinja2') as peid %}
-{%- import('macros/printDOP.xml.jinja2') as pdop %}
-{%- import('macros/printTable.xml.jinja2') as pt %}
+{%- import('macros/printAdminData.xml.jinja2') as pad %}
+{%- import('macros/printCompanyData.xml.jinja2') as pcd %}
 {%- import('macros/printFunctionalClass.xml.jinja2') as pfc %}
-{%- import('macros/printStructure.xml.jinja2') as pst %}
-{%- import('macros/printEndOfPdu.xml.jinja2') as peopdu %}
-{%- import('macros/printStaticField.xml.jinja2') as psf %}
-{%- import('macros/printDynamicLengthField.xml.jinja2') as pdlf %}
-{%- import('macros/printDynamicEndmarkerField.xml.jinja2') as pdemf %}
-{%- import('macros/printMux.xml.jinja2') as pm %}
-{%- import('macros/printEnvData.xml.jinja2') as ped %}
-{%- import('macros/printEnvDataDesc.xml.jinja2') as pedd %}
-{%- import('macros/printUnitSpec.xml.jinja2') as punit %}
+{%- import('macros/printDiagDataDictionarySpec.xml.jinja2') as pddds %}
 {%- import('macros/printService.xml.jinja2') as ps %}
 {%- import('macros/printSingleEcuJob.xml.jinja2') as psej %}
 {%- import('macros/printRequest.xml.jinja2') as prq %}
@@ -25,8 +17,6 @@
 {%- 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 %}
 
 {%- macro printDiagLayerAttribs(dl) -%}
 {#- #} {{-peid.printElementIdAttribs(dl)}}{# -#}
@@ -54,90 +44,7 @@
 </FUNCT-CLASSS>
 {%- endif %}
 {%- if dlr.diag_data_dictionary_spec is not none %}
-{%- set ddds = dlr.diag_data_dictionary_spec  %}
-<DIAG-DATA-DICTIONARY-SPEC>
-  {%- if ddds.dtc_dops  %}
-  <DTC-DOPS>
-    {%- for dop in ddds.dtc_dops -%}
-    {{ pdop.printDtcDop(dop)|indent(3) }}
-    {%- endfor %}
-  </DTC-DOPS>
-  {%- endif %}
-  {%- if ddds.env_data_descs  %}
-  <ENV-DATA-DESCS>
-    {%- for env_data_desc in ddds.env_data_descs -%}
-    {{ pedd.printEnvDataDesc(env_data_desc)|indent(3) }}
-    {%- endfor %}
-  </ENV-DATA-DESCS>
-  {%- endif %}
-  {%- if ddds.data_object_props %}
-  <DATA-OBJECT-PROPS>
-    {%- for dop in ddds.data_object_props %}
-    {{- pdop.printDataObjectProp(dop)|indent(3) }}
-    {%- endfor %}
-  </DATA-OBJECT-PROPS>
-  {%- endif %}
-  {%- if ddds.structures %}
-  <STRUCTURES>
-    {%- for st in ddds.structures %}
-    {{ pst.printStructure(st)|indent(3) }}
-    {%- endfor %}
-  </STRUCTURES>
-  {%- endif %}
-  {%- if ddds.static_fields %}
-  <STATIC-FIELDS>
-    {%- for sf in ddds.static_fields %}
-    {{ psf.printStaticField(sf)|indent(3) }}
-    {%- endfor %}
-  </STATIC-FIELDS>
-  {%- endif %}
-  {%- if ddds.dynamic_length_fields %}
-  <DYNAMIC-LENGTH-FIELDS>
-    {%- for dlf in ddds.dynamic_length_fields %}
-    {{ pdlf.printDynamicLengthField(dlf)|indent(3) }}
-    {%- endfor %}
-  </DYNAMIC-LENGTH-FIELDS>
-  {%- endif %}
-  {%- if ddds.dynamic_endmarker_fields %}
-  <DYNAMIC-ENDMARKER-FIELDS>
-    {%- for demf in ddds.dynamic_endmarker_fields %}
-    {{ pdemf.printDynamicEndmarkerField(demf)|indent(3) }}
-    {%- endfor %}
-  </DYNAMIC-ENDMARKER-FIELDS>
-  {%- endif %}
-  {%- if ddds.end_of_pdu_fields %}
-  <END-OF-PDU-FIELDS>
-    {%- for eopdu in ddds.end_of_pdu_fields %}
-    {{ peopdu.printEndOfPdu(eopdu)|indent(3) }}
-    {%- endfor %}
-  </END-OF-PDU-FIELDS>
-  {%- endif %}
-  {%- if ddds.muxs %}
-  <MUXS>
-    {%- for mux in ddds.muxs %}
-    {{ pm.printMux(mux)|indent(3) }}
-    {%- endfor %}
-  </MUXS>
-  {%- endif %}
-  {%- if ddds.env_datas %}
-  <ENV-DATAS>
-    {%- for env_data in ddds.env_datas %}
-    {{ ped.printEnvData(env_data)|indent(3) }}
-    {%- endfor %}
-  </ENV-DATAS>
-  {%- endif %}
-  {%- if ddds.unit_spec %}
-  {{ punit.printUnitSpec(ddds.unit_spec)|indent(2) }}
-  {%- endif %}
-  {%- if ddds.tables  %}
-  <TABLES>
-    {%- for table in ddds.tables -%}
-    {{ pt.printTable(table)|indent(3) }}
-    {%- endfor %}
-  </TABLES>
-  {%- endif %}
-  {{- psd.printSpecialDataGroups(ddds.sdgs)|indent(2, first=True) }}
-</DIAG-DATA-DICTIONARY-SPEC>
+{{ pddds.printDiagDataDictionarySpec(dlr.diag_data_dictionary_spec) }}
 {%- endif %}
 {%- if dlr.diag_comms_raw %}
 <DIAG-COMMS>
@@ -191,6 +98,13 @@
   {%- endfor %}
 </GLOBAL-NEG-RESPONSES>
 {%- endif %}
+{%- if dlr.import_refs %}
+<IMPORT-REFS>
+  {%- for ir in dlr.import_refs %}
+  <IMPORT-REF {{make_ref_attribs(ir)}} />
+  {%- endfor %}
+</IMPORT-REFS>
+{%- endif %}
 {%- if dlr.state_charts %}
 <STATE-CHARTS>
   {%- for sc in dlr.state_charts %}

odxtools/templates/macros/printElementId.xml.jinja2

@@ -6,7 +6,9 @@
 {%- import('macros/printDescription.xml.jinja2') as pd %}
 
 {%- macro printElementIdAttribs(obj) -%}
+{%- if obj.odx_id is defined %}
 {#- #} {{- make_xml_attrib("ID", obj.odx_id.local_id) }}
+{%- endif %}
 {#- #} {{- make_xml_attrib("OID", getattr(obj, "oid", none)) -}}
 {%- endmacro -%}
 

odxtools/templates/macros/printFunctionalClass.xml.jinja2

@@ -9,9 +9,9 @@
 
 {%- macro printFunctionalClass(fc) -%}
 <FUNCT-CLASS {{-peid.printElementIdAttribs(fc)}}>
- {{ peid.printElementIdSubtags(fc)|indent(1) }}
- {%- if fc.admin_data is not none -%}
- {{ pad.printAdminData(fc.admin_data)|indent(1) }}
- {%- endif -%}
+  {{ peid.printElementIdSubtags(fc)|indent(2) }}
+  {%- if fc.admin_data is not none %}
+  {{ pad.printAdminData(fc.admin_data)|indent(2) }}
+  {%- endif %}
 </FUNCT-CLASS>
 {%- endmacro -%}

odxtools/templates/macros/printMultipleEcuJob.xml.jinja2

@@ -0,0 +1,77 @@
+1{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printElementId.xml.jinja2') as peid %}
+{%- import('macros/printAdminData.xml.jinja2') as pad %}
+{%- import('macros/printSpecialData.xml.jinja2') as psd %}
+{%- import('macros/printCompuMethod.xml.jinja2') as pcm %}
+{%- import('macros/printAudience.xml.jinja2') as paud %}
+
+{%- macro printMultipleEcuJob(multiple_ecu_job) -%}
+<MULTIPLE-ECU-JOB {{peid.printElementIdAttribs(multiple_ecu_job)}}
+                  {{-make_xml_attrib("SEMANTIC", multiple_ecu_job.semantic)}}
+                  {{-make_bool_xml_attrib("IS-EXECUTABLE", multiple_ecu_job.is_executable_raw)}}>
+  {{peid.printElementIdSubtags(multiple_ecu_job)|indent(2) }}
+  {%- if multiple_ecu_job.admin_data is not none %}
+  {{- pad.printAdminData(multiple_ecu_job.admin_data)|indent(2) }}
+  {%- endif %}
+  {{- psd.printSpecialDataGroups(multiple_ecu_job.sdgs)|indent(2, first=True) }}{#- #}
+  {%- if multiple_ecu_job.functional_class_refs %}
+  <FUNCT-CLASS-REFS>
+    {%- for fc_ref in multiple_ecu_job.functional_class_refs %}
+    <FUNCT-CLASS-REF {{make_ref_attribs(fc_ref)}} />
+    {%- endfor %}
+  </FUNCT-CLASS-REFS>
+  {%- endif %}
+  <PROG-CODES>
+    {%- for pc in multiple_ecu_job.prog_codes %}
+    {{pcm.printProgCode(pc)|indent(4)}}
+    {%- endfor %}
+  </PROG-CODES>
+  {%- if multiple_ecu_job.input_params %}
+  <INPUT-PARAMS>
+    {%- for ip in multiple_ecu_job.input_params %}
+    <INPUT-PARAM {{ peid.printElementIdAttribs(ip) }} {{make_xml_attrib("SEMANTIC", ip.semantic)}}>
+      {{peid.printElementIdSubtags(ip)|indent(4)}}
+      {%- if ip.physical_default_value is not none %}
+      <PHYSICAL-DEFAULT-VALUE>{{ip.physical_default_value | e}}</PHYSICAL-DEFAULT-VALUE>
+      {%- endif %}
+      <DOP-BASE-REF {{make_ref_attribs(ip.dop_base_ref)}} />
+    </INPUT-PARAM>
+    {%- endfor %}
+  </INPUT-PARAMS>
+  {%- endif %}
+  {%- if multiple_ecu_job.output_params %}
+  <OUTPUT-PARAMS>
+    {%- for op in multiple_ecu_job.output_params %}
+    <OUTPUT-PARAM {{ peid.printElementIdAttribs(op) }} {{make_xml_attrib("SEMANTIC", op.semantic)}}>
+      {{peid.printElementIdSubtags(op)|indent(4)}}
+      <DOP-BASE-REF {{make_ref_attribs(op.dop_base_ref)}} />
+    </OUTPUT-PARAM>
+    {%- endfor %}
+  </OUTPUT-PARAMS>
+  {%- endif %}
+  {%- if multiple_ecu_job.neg_output_params %}
+  <NEG-OUTPUT-PARAMS>
+    {%- for nop in multiple_ecu_job.neg_output_params %}
+    <NEG-OUTPUT-PARAM {{ peid.printElementIdAttribs(nop) }}>
+      {{peid.printElementIdSubtags(nop)|indent(4)}}
+      <DOP-BASE-REF {{make_ref_attribs(nop.dop_base_ref)}} />
+    </NEG-OUTPUT-PARAM>
+    {%- endfor %}
+  </NEG-OUTPUT-PARAMS>
+  {%- endif %}
+  {%- if multiple_ecu_job.diag_layer_refs %}
+  <DIAG-LAYER-REFS>
+    {%- for dl_ref in multiple_ecu_job.diag_layer_refs %}
+    <DIAG-LAYER-REF {{make_ref_attribs(dl_ref)}} />
+    {%- endfor %}
+  </DIAG-LAYER-REFS>
+  {%- endif %}
+  {%- if multiple_ecu_job.audience is not none %}
+  {{ paud.printAudience(multiple_ecu_job.audience) | indent(2) }}
+  {%- endif %}
+</MULTIPLE-ECU-JOB>
+{%- endmacro -%}

odxtools/templates/multiple-ecu-job-spec.odx-m.xml.jinja2

@@ -0,0 +1,51 @@
+{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+ #
+ # This template writes an .odx-f file containing descriptions of firmware
+ # blobs that can be flashed to ECUs.
+-#}
+{%- import('macros/printOdxCategory.xml.jinja2') as poc %}
+{%- import('macros/printMultipleEcuJob.xml.jinja2') as pmecuj %}
+{%- import('macros/printDiagDataDictionarySpec.xml.jinja2') as pddds %}
+{%- import('macros/printFunctionalClass.xml.jinja2') as pfc %}
+{%- import('macros/printAudience.xml.jinja2') as paud %}
+{#- -#}
+
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!-- Written using odxtools {{odxtools_version}} -->
+<ODX MODEL-VERSION="2.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="odx.xsd">
+  {{- set_category_docfrag(multiple_ecu_job_spec.short_name, "MULTIPLE-ECU-JOB-SPEC") }}
+  <MULTIPLE-ECU-JOB-SPEC {{- poc.printOdxCategoryAttribs(multiple_ecu_job_spec) }}>
+    {{- poc.printOdxCategorySubtags(multiple_ecu_job_spec)|indent(4) }}
+    <MULTIPLE-ECU-JOBS>
+      {%- for mecuj in multiple_ecu_job_spec.multiple_ecu_jobs %}
+      {{ pmecuj.printMultipleEcuJob(mecuj) | indent(6) }}
+      {%- endfor %}
+    </MULTIPLE-ECU-JOBS>
+    {%- if multiple_ecu_job_spec.diag_data_dictionary_spec is not none %}
+    {{ pddds.printDiagDataDictionarySpec(multiple_ecu_job_spec.diag_data_dictionary_spec) }}
+    {%- endif %}
+    {%- if multiple_ecu_job_spec.functional_classes %}
+    <FUNCT-CLASSS>
+      {%- for fc in multiple_ecu_job_spec.functional_classes %}
+      {{ pfc.printFunctionalClass(fc)|indent(6) }}
+      {%- endfor%}
+    </FUNCT-CLASSS>
+    {%- endif %}
+    {%- if multiple_ecu_job_spec.additional_audiences %}
+    <ADDITIONAL-AUDIENCES>
+      {%- for audience in multiple_ecu_job_spec.additional_audiences %}
+      {{ paud.printAdditionalAudience(audience) | indent(6) }}
+      {%- endfor %}
+    </ADDITIONAL-AUDIENCES>
+    {%- endif %}
+    {%- if multiple_ecu_job_spec.import_refs %}
+    <IMPORT-REFS>
+      {%- for ir in multiple_ecu_job_spec.import_refs %}
+      <IMPORT-REF {{make_ref_attribs(ir)}} />
+      {%- endfor %}
+    </IMPORT-REFS>
+    {%- endif %}
+  </MULTIPLE-ECU-JOB-SPEC>
+</ODX>

odxtools/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '10.3.0'
-__version_tuple__ = version_tuple = (10, 3, 0)
+__version__ = version = '10.4.0'
+__version_tuple__ = version_tuple = (10, 4, 0)

odxtools/writepdxfile.py

@@ -166,20 +166,50 @@ def write_pdx_file(
         jinja_env.globals["set_layer_docfrag"] = lambda lname: set_layer_docfrag(jinja_vars, lname)
         jinja_env.globals["make_ref_attribs"] = lambda ref: make_ref_attribs(jinja_vars, ref)
 
-        # write the communication parameter subsets
-        comparam_subset_tpl = jinja_env.get_template("comparam-subset.odx-cs.xml.jinja2")
-        for comparam_subset in database.comparam_subsets:
-            zf_file_name = f"{comparam_subset.short_name}.odx-cs"
+        # write the flash description objects
+        flash_tpl = jinja_env.get_template("flash.odx-f.xml.jinja2")
+        for flash in database.flashs:
+            zf_file_name = f"{flash.short_name}.odx-f"
             zf_file_cdate = datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S")
-            zf_mime_type = "application/x-asam.odx.odx-cs"
+            zf_mime_type = "application/x-asam.odx.odx-f"
 
-            jinja_vars["comparam_subset"] = comparam_subset
+            jinja_vars["flash"] = flash
 
             file_index.append((zf_file_name, zf_file_cdate, zf_mime_type))
 
-            zf.writestr(zf_file_name, comparam_subset_tpl.render(**jinja_vars))
+            zf.writestr(zf_file_name, flash_tpl.render(**jinja_vars))
 
-            del jinja_vars["comparam_subset"]
+            del jinja_vars["flash"]
+
+        # write the actual diagnostic data.
+        dlc_tpl = jinja_env.get_template("diag_layer_container.odx-d.xml.jinja2")
+        for dlc in database.diag_layer_containers:
+            jinja_vars["dlc"] = dlc
+
+            file_name = f"{dlc.short_name}.odx-d"
+            file_cdate = datetime.datetime.now()
+            creation_date = file_cdate.strftime("%Y-%m-%dT%H:%M:%S")
+            mime_type = "application/x-asam.odx.odx-d"
+
+            file_index.append((file_name, creation_date, mime_type))
+            zf.writestr(file_name, dlc_tpl.render(**jinja_vars))
+            del jinja_vars["dlc"]
+
+        # write the multiple ECU jobs specs
+        multiple_ecu_jobs_spec_tpl = jinja_env.get_template(
+            "multiple-ecu-job-spec.odx-m.xml.jinja2")
+        for multiple_ecu_jobs_spec in database.multiple_ecu_job_specs:
+            zf_file_name = f"{multiple_ecu_jobs_spec.short_name}.odx-m"
+            zf_file_cdate = datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S")
+            zf_mime_type = "application/x-asam.odx.odx-m"
+
+            jinja_vars["multiple_ecu_jobs_spec"] = multiple_ecu_jobs_spec
+
+            file_index.append((zf_file_name, zf_file_cdate, zf_mime_type))
+
+            zf.writestr(zf_file_name, multiple_ecu_jobs_spec_tpl.render(**jinja_vars))
+
+            del jinja_vars["multiple_ecu_jobs_spec"]
 
         # write the communication parameter specs
         comparam_spec_tpl = jinja_env.get_template("comparam-spec.odx-c.xml.jinja2")
@@ -196,34 +226,20 @@ def write_pdx_file(
 
             del jinja_vars["comparam_spec"]
 
-        # write the actual diagnostic data.
-        dlc_tpl = jinja_env.get_template("diag_layer_container.odx-d.xml.jinja2")
-        for dlc in database.diag_layer_containers:
-            jinja_vars["dlc"] = dlc
-
-            file_name = f"{dlc.short_name}.odx-d"
-            file_cdate = datetime.datetime.now()
-            creation_date = file_cdate.strftime("%Y-%m-%dT%H:%M:%S")
-            mime_type = "application/x-asam.odx.odx-d"
-
-            file_index.append((file_name, creation_date, mime_type))
-            zf.writestr(file_name, dlc_tpl.render(**jinja_vars))
-            del jinja_vars["dlc"]
-
-        # write the flash description objects
-        flash_tpl = jinja_env.get_template("flash.odx-f.xml.jinja2")
-        for flash in database.flashs:
-            zf_file_name = f"{flash.short_name}.odx-f"
+        # write the communication parameter subsets
+        comparam_subset_tpl = jinja_env.get_template("comparam-subset.odx-cs.xml.jinja2")
+        for comparam_subset in database.comparam_subsets:
+            zf_file_name = f"{comparam_subset.short_name}.odx-cs"
             zf_file_cdate = datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S")
-            zf_mime_type = "application/x-asam.odx.odx-f"
+            zf_mime_type = "application/x-asam.odx.odx-cs"
 
-            jinja_vars["flash"] = flash
+            jinja_vars["comparam_subset"] = comparam_subset
 
             file_index.append((zf_file_name, zf_file_cdate, zf_mime_type))
 
-            zf.writestr(zf_file_name, flash_tpl.render(**jinja_vars))
+            zf.writestr(zf_file_name, comparam_subset_tpl.render(**jinja_vars))
 
-            del jinja_vars["flash"]
+            del jinja_vars["comparam_subset"]
 
         # write the ECU-config objects
         ecu_config_tpl = jinja_env.get_template("ecu_config.odx-e.xml.jinja2")

{odxtools-10.3.0.dist-info → odxtools-10.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: odxtools
-Version: 10.3.0
+Version: 10.4.0
 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-10.3.0.dist-info → odxtools-10.4.0.dist-info}/RECORD

@@ -32,7 +32,7 @@ odxtools/configitem.py,sha256=yXlFyuaRMYLa2HmUoWdq_TOabEYf3Vpz6SCXuMO2828,3237
 odxtools/configrecord.py,sha256=f0GLG_PIj0MBFhHPT59_0PhvzYwDLKCw8XLLIKWpoVw,6567
 odxtools/createanycomparam.py,sha256=KHsN027D7AoDx6kKjQ_0f84Us_UQD54Ps0fR1-p09n8,587
 odxtools/createanydiagcodedtype.py,sha256=eLyqOminWq7yI8WGIPsUHbm7_J4IkaJP0rsoDQDpUUM,1178
-odxtools/database.py,sha256=Rc79c--TACKmqgIoufUYv2iFI_gzmG_U8ulSRLuKRTY,12056
+odxtools/database.py,sha256=vioK3yLowla35rX-c6RHIK6SKCa--CNBwvIqKy1wE08,13148
 odxtools/datablock.py,sha256=ILjjna50PyLFApnLM4cduxQ77P9I-Sr7kzrMZ_ebX6M,6306
 odxtools/datafile.py,sha256=k_SatFNGhf7x1P-Iiyh7iphDufNkql6OZGA0HJFJXnk,658
 odxtools/dataformat.py,sha256=1yiZj0gmEmqJikpKHP-IW7xSFsuHI40TVcuOfJ1JWLA,1320
@@ -107,6 +107,8 @@ odxtools/mem.py,sha256=M0M7G7vAmoYV1njP6PpSe-N_KjmRCEZKMMmytSuC79k,2976
 odxtools/message.py,sha256=7FZV5iVy1KTN-h7CO6OSKjdp89Yuci3_2h-Alj19Q_4,869
 odxtools/minmaxlengthtype.py,sha256=MfmH_D4o-JDOHIgUSyC-jW2xwvHCsGm57tnBYlYGndI,9621
 odxtools/modification.py,sha256=BNm3MgYa8TNccG1t76IyDCMzbz4xJpFgdgCqPKqDDSA,947
+odxtools/multipleecujob.py,sha256=oRGY2B2hN-TXmMwICUZEippSCTWuWmKBnodcdoBYYT4,7293
+odxtools/multipleecujobspec.py,sha256=VBj16TFuEU3N6bi_55j3CznrBU5GOgBdzQYqsHaW4Uc,5996
 odxtools/multiplexer.py,sha256=qay6yE_Wxne86CH9HQuZ2VrwL7_bLh3dPqeI6AfqQG8,11634
 odxtools/multiplexercase.py,sha256=bs-mAnkd7MY_hOaQtoYT-pEMGKPfUOFpt1YJuIECL8w,3082
 odxtools/multiplexerdefaultcase.py,sha256=RI3SrEwfE8WiPr-TBoafzNwAO9vF57nMKZnYwD8iZXA,2030
@@ -120,7 +122,7 @@ odxtools/odxdoccontext.py,sha256=QjdOp7jwtJVgyGwzPBH_a35xqdS24WJmlF6uNqLrp9U,460
 odxtools/odxlink.py,sha256=me0Y5yoXv6HsFGPQjo99hSt1GxpzllJlwIy0nhgpcdQ,10807
 odxtools/odxtypes.py,sha256=uhlKergX9Mutax_gf-bsyf_LJwF-t18HoYt2OXcimf0,8208
 odxtools/optionitem.py,sha256=kihbKVgPSNNqIT6aL2Ac5gNhluXUbTaXenYvn4hgmho,2914
-odxtools/outputparam.py,sha256=oijoIXChUY7Jwds4x7OeIiyp5VTEivi61Sj5oVPjQMY,1477
+odxtools/outputparam.py,sha256=q974Fa-fre1NcwK8RMRUD50D7GXBYq4gvEHOopZOe6s,1494
 odxtools/ownident.py,sha256=beX1glfBfG-s9hMD6qT_cGMZLln7LYt2X8uY4R_-_Zo,1146
 odxtools/parameterinfo.py,sha256=OeHQK1Ockq-CZgEXl1XWPH9UZ7vEW2_OSRnF1BZPRnY,11198
 odxtools/paramlengthinfotype.py,sha256=tBVKJHmC2jyeUiY4fRuq8FGx3UQoHJOjVzozMAEyTbM,4931
@@ -153,7 +155,7 @@ odxtools/sessionsubelemtype.py,sha256=k3dL5TT6AYIJQ_U7W78ad6pNz4SH1pge4m62epRtT7
 odxtools/singleecujob.py,sha256=181jUAefl5LPdkdV4jOB_x_6LlVmw8YyuI3fAfxqXd8,4116
 odxtools/sizedeffilter.py,sha256=CYLo4293-dJMw5pNYzUIIr6d6sb_zHZSxM6ZYcpHFKM,1084
 odxtools/sizedefphyssegment.py,sha256=6Ykna8Fq-0Yu1puAOU_qbhFPauqD1ueylxDXkybgQBY,1084
-odxtools/snrefcontext.py,sha256=zuY3SU16YvgDKvKF7vocCA6f92iXQUKR6sFrLm7U2YU,958
+odxtools/snrefcontext.py,sha256=mb1-07gaGpncDFzpNINGwzJFJf2S-GnmqqKT2zq5rv0,1061
 odxtools/specialdata.py,sha256=6AvvLiP8TC37wlBVFzFuwtBx2z3q7gIQZgy0RD5qB3s,1140
 odxtools/specialdatagroup.py,sha256=GnlaePVPNbcQ6MyLEIb5N567BPKMwW7qhwalD43p680,3134
 odxtools/specialdatagroupcaption.py,sha256=xYiwSQyxbzRnWGzd5bj-CPcBudEvxtxZ4mPCpizJN1M,1003
@@ -193,9 +195,9 @@ odxtools/validtype.py,sha256=exe5OIqoIWgsgEm1t54pyk-U2m61DgBWI0Gew8rNYFc,194
 odxtools/variablegroup.py,sha256=o2hHupTvYSAJgOK8YOG9-VjXZpOMQ9vp9Sssu6RvN6E,834
 odxtools/variantmatcher.py,sha256=9qCg0ln3B1_zdNw-imFZ1DCECGdH4oa8_oGhC2gyl_g,8331
 odxtools/variantpattern.py,sha256=Mt2iXrlHvdo2EZtWq_tTqOqD-MxsaMUumQLcOpTkFR8,1406
-odxtools/version.py,sha256=l3ET6ASSL16dZtet-ppmR_MsErP2kLj0yDnEBXEt-is,513
+odxtools/version.py,sha256=19M94hjIavZZJFdX2XJTnMIikXzunL4QfRwNieuLnp8,513
 odxtools/writediagcommconnector.py,sha256=pkpIX8msn82L3S9mAL_ebXdoqZ8f-SK9eeFX8FXqgaA,3256
-odxtools/writepdxfile.py,sha256=nXrOTF3WypCDtirCuXj59TzDYaU9ZxTNBMdehlHwktM,9753
+odxtools/writepdxfile.py,sha256=_pestzsUMngFLWeOsG3t70vk2L36TgnFcEhbPONdTnY,10489
 odxtools/xdoc.py,sha256=Ymir_UH5dz8h-T4_kVCm2M_zyip7lDSnQ_wJvu-BCAA,1463
 odxtools/cli/__init__.py,sha256=T7ano_FIyzBASxYpmcA5VJXU5bQLIy_Qk0HE_SDKelY,106
 odxtools/cli/_parser_utils.py,sha256=p0L9NYYnml5ydfD22oC04EMhz8PKHgU40GPOPkybZwg,1116
@@ -232,7 +234,7 @@ odxtools/compumethods/tabintpcompumethod.py,sha256=Jb57a3xKtFreZmwDdvKbmPQ4Dg0fR
 odxtools/compumethods/texttablecompumethod.py,sha256=0aLSPsOsb3XgP1aj13CkpDfSi4PIZID6ErnAXiQgtZo,5957
 odxtools/diaglayers/basevariant.py,sha256=urQiHezdLQ2TM6X8LfPTQHIMELxAP_CKFiHxZI3JKzQ,4660
 odxtools/diaglayers/basevariantraw.py,sha256=y7yujzGooVuPuX0bAtCNcvSCSrKQObgmyNABI5Pypyc,4994
-odxtools/diaglayers/diaglayer.py,sha256=3IlRq6Z0WkTYMOn8KUay8dPJm0FqnJWkphgyEdT23C8,17106
+odxtools/diaglayers/diaglayer.py,sha256=oR-oxtv2QZxxHMirY2q7ns2inFKx25Qq60hq9WCeRrA,16697
 odxtools/diaglayers/diaglayerraw.py,sha256=cS3w4FcjuTPZ06wyfXPRrI99X_zsx9vjbaDwFCyGzn4,13059
 odxtools/diaglayers/diaglayertype.py,sha256=o1Vz6ycSqkDGNxNErcqpXUs0SAk9c4NSmxPDGWlufOE,1316
 odxtools/diaglayers/ecushareddata.py,sha256=2mg6bS50oSJlpqYDgRfXqPbkZHSvY4fFF3b_VwBhPwE,3336
@@ -267,7 +269,8 @@ odxtools/templates/diag_layer_container.odx-d.xml.jinja2,sha256=WL__gfOYnta-cHDG
 odxtools/templates/ecu_config.odx-e.xml.jinja2,sha256=pc7tBjJIkDXqaH8l09efZ2NnAl4v2zszLWLpT3Cp5xI,1581
 odxtools/templates/flash.odx-f.xml.jinja2,sha256=kgToXyDbAfS2qJ2nNamF8Wh1cCX0Wl9Rt5L5EKc0Wuw,1572
 odxtools/templates/index.xml.jinja2,sha256=Z1bcntvvky7NoH0Q0CRJgUORwf3g96PFPGeOpi7VATw,647
-odxtools/templates/macros/printAdminData.xml.jinja2,sha256=uG5BzloGpnW3FrmlqyMHGlaEtA1X3lZ-iJsOtWtDGPY,2598
+odxtools/templates/multiple-ecu-job-spec.odx-m.xml.jinja2,sha256=IbNchTHNQyKFzmpIKr1qxhfZaZAlk8NjoXGJiFbXMsU,2181
+odxtools/templates/macros/printAdminData.xml.jinja2,sha256=_faltyDPBghsk_AKb-WAiun9MXIMpvTvxATgA9UYQHE,2586
 odxtools/templates/macros/printAudience.xml.jinja2,sha256=IkEKH5sPcoaLhS2aqTUBmwoh3GxtSpOp8-g_niktU5c,1320
 odxtools/templates/macros/printBaseVariant.xml.jinja2,sha256=Ovf7NvO5jzy_9w1-iXi_q2dedoEfsQOYCK_WASkcITQ,1451
 odxtools/templates/macros/printBaseVariantPattern.xml.jinja2,sha256=foL_DmH4mWFzPObZ3VjPixdzbomAA5jK7GLpAhJsKVE,1192
@@ -287,7 +290,8 @@ odxtools/templates/macros/printDatablock.xml.jinja2,sha256=Eyvvtig2TknUXS4svdYly
 odxtools/templates/macros/printDescription.xml.jinja2,sha256=95Zamh5YtS5d-R3RVdOZV5xqb9syho_L0-CFq0PPJdI,589
 odxtools/templates/macros/printDiagComm.xml.jinja2,sha256=pw0cB-eHWL9sG_iTPRSR9D4z_vdw3oasQ76NWRL1pUY,2378
 odxtools/templates/macros/printDiagCommDataConnector.xml.jinja2,sha256=jWnhlpsM-IvjYDbY19xG5vLy6DDUdfhP-vDDgNfIUWk,2917
-odxtools/templates/macros/printDiagLayer.xml.jinja2,sha256=ZbeKP0UtJfV-yCL-fZ4GzCCj-ndlLk9iIHhPOr0clmw,6943
+odxtools/templates/macros/printDiagDataDictionarySpec.xml.jinja2,sha256=7mtgWV9VWFQv8ZPE6VbONna-MWufsdfSwmXID-hFYHg,3364
+odxtools/templates/macros/printDiagLayer.xml.jinja2,sha256=eoHepbwCRpKc7E-H43C3oL07qAl1qm25rYtv7x5BxKo,4218
 odxtools/templates/macros/printDiagVariable.xml.jinja2,sha256=SuJKQvlfaUEJo7kvNnKQeKyRBL_agxzZ7Hek16OdpoE,3178
 odxtools/templates/macros/printDynDefinedSpec.xml.jinja2,sha256=AuvP0Rvfd29o4xkBSxpIcS6g7OBMyfBTf1pMlS11Sus,1746
 odxtools/templates/macros/printDynamicEndmarkerField.xml.jinja2,sha256=xO_FxjCecLwE1FU16AlT_NDKb261w5z3oE8I-kxux74,591
@@ -297,19 +301,20 @@ odxtools/templates/macros/printEcuMemConnector.xml.jinja2,sha256=eS_m0zyXxJK0lYW
 odxtools/templates/macros/printEcuSharedData.xml.jinja2,sha256=WK08eoDFEjj9o3eOuy__H0r9ioo688rTuQp6uXE6Tdo,820
 odxtools/templates/macros/printEcuVariant.xml.jinja2,sha256=Nsgj2VUWZvSDFPQsn6wv75M9TaryOB-tlQYCVq9hDEM,1594
 odxtools/templates/macros/printEcuVariantPattern.xml.jinja2,sha256=YoYyzmxerJLJzUNoQ8H-JBnOqiwpVdODqk2KNRdWKWo,844
-odxtools/templates/macros/printElementId.xml.jinja2,sha256=Oe4sgtBB_VhTz6uJzaiTCpQki2ulKKfpBq56FVgBC-I,570
+odxtools/templates/macros/printElementId.xml.jinja2,sha256=1Ykzcq2hF5qAFE5Q8Wb9j8_fSEuNmwxkZcbBaHE78yA,615
 odxtools/templates/macros/printEndOfPdu.xml.jinja2,sha256=ezcZpkRnOGXKkExVXceI9EKudoZAx2ch7qMOsfDVzoU,681
 odxtools/templates/macros/printEnvData.xml.jinja2,sha256=2Goatqb66d-pCf9wqJDXn1EZWNhkQ8FJANKQMOnxuJs,609
 odxtools/templates/macros/printEnvDataDesc.xml.jinja2,sha256=RSICw9XQzIhkGbbI9rvdKCmM50DHuVpPjnsXxVGe2bY,590
 odxtools/templates/macros/printExpectedIdent.xml.jinja2,sha256=YdAjL8GEfs3jv8vAIDxZbMc2KSDGlun5NVsb7VhQWug,665
 odxtools/templates/macros/printFlashdata.xml.jinja2,sha256=9hvB93SW_0xSxrBXgiRgAcqPWa4vR3C_8yMTxjq8Cvk,1815
-odxtools/templates/macros/printFunctionalClass.xml.jinja2,sha256=o6_YZhmULzsC2WJZEpV8Z8iEW6myztY9FwNli9t42LM,490
+odxtools/templates/macros/printFunctionalClass.xml.jinja2,sha256=OajJ-DvcWu5Hk9HHBWF5IpgopYJEkW9kC9Ip_dM8LFI,492
 odxtools/templates/macros/printFunctionalGroup.xml.jinja2,sha256=zIeZbhf8haXhgJJUPiOnMe3lvqvfye4-zmwWDQJxFtQ,1159
 odxtools/templates/macros/printHierarchyElement.xml.jinja2,sha256=GD6iNIE0Wu0QsJ8uLtwEV8N9t6mIhI00_KpCVzOVQBM,651
 odxtools/templates/macros/printIdentDesc.xml.jinja2,sha256=r4FX9zurKH0gBi_lTUJBHL8aurF7wVmE0jLpleJK7Ak,614
 odxtools/templates/macros/printItemValue.xml.jinja2,sha256=z7mxGVuLGMCvD8QA4JuxDuQt7v0c2TSDf6VcX9PZxZE,1199
 odxtools/templates/macros/printLibrary.xml.jinja2,sha256=wp8vZzHPLZayWZh6BOQ56kGyHSeyrlNacdlxBw9d0N0,683
 odxtools/templates/macros/printMem.xml.jinja2,sha256=aZ3bYZ5LMDzsBQGDa5SCiVCkaHOI4OBgvWJ1w8jSQPU,935
+odxtools/templates/macros/printMultipleEcuJob.xml.jinja2,sha256=amlu1l4D6wRi2cnTiFa9vQeKHjTig0r4hsls2jhGBAs,3082
 odxtools/templates/macros/printMux.xml.jinja2,sha256=lSJEOac8paS57A_pA0vzNNiDUMvizTvLrY7Poau5LR4,1875
 odxtools/templates/macros/printOdxCategory.xml.jinja2,sha256=82uLhYpQfi9eE_3d8_JUk_LFh3uiwfC2o34l14DI0II,829
 odxtools/templates/macros/printOwnIdent.xml.jinja2,sha256=NuEUrmFiyNE-f95EKMuk4Pn_SCSn5iEkbqr02s0sV2Y,544
@@ -338,9 +343,9 @@ odxtools/templates/macros/printStructure.xml.jinja2,sha256=M8p82SlgKaDk6nJA-0wr6
 odxtools/templates/macros/printSubComponent.xml.jinja2,sha256=R3DxnK6NysUQL84uf2kGYMoF_VVym2l7H-J0JZ1uLKc,3416
 odxtools/templates/macros/printTable.xml.jinja2,sha256=iMmq4tSFl_nc44HNdFqzk4XLYjrbQ73cKm7kMVdRLmc,3336
 odxtools/templates/macros/printUnitSpec.xml.jinja2,sha256=pgZdrPdWi3OGtDIFNpEDz_TQs103uuRQoDdmGkNffOM,2878
-odxtools-10.3.0.dist-info/licenses/LICENSE,sha256=NeGPFQdTa6EKeON3aShVlPAIquJnbbiOfj0suz6rzyQ,1074
-odxtools-10.3.0.dist-info/METADATA,sha256=_CHHDpFXH3dskoC9eXGLocoSszuinHrzhmDb49x9w2Y,44054
-odxtools-10.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-odxtools-10.3.0.dist-info/entry_points.txt,sha256=_sBDzuNoT8LbbCjfc-OJiUt5WPrtOq_x-rr9txhrPjY,53
-odxtools-10.3.0.dist-info/top_level.txt,sha256=pdS02kE5ZdgsaBRZDpX3NBFlaSx3zotsqX4E4V6tXEI,9
-odxtools-10.3.0.dist-info/RECORD,,
+odxtools-10.4.0.dist-info/licenses/LICENSE,sha256=NeGPFQdTa6EKeON3aShVlPAIquJnbbiOfj0suz6rzyQ,1074
+odxtools-10.4.0.dist-info/METADATA,sha256=4ECV1XPqKUcNCxO-fjRG5tDsf_g0sYNS-ywa3yCMFEs,44054
+odxtools-10.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+odxtools-10.4.0.dist-info/entry_points.txt,sha256=_sBDzuNoT8LbbCjfc-OJiUt5WPrtOq_x-rr9txhrPjY,53
+odxtools-10.4.0.dist-info/top_level.txt,sha256=pdS02kE5ZdgsaBRZDpX3NBFlaSx3zotsqX4E4V6tXEI,9
+odxtools-10.4.0.dist-info/RECORD,,