odxtools 10.1.1__py3-none-any.whl → 10.2.1__py3-none-any.whl

odxtools/sessiondesc.py

@@ -0,0 +1,101 @@
+# SPDX-License-Identifier: MIT
+from dataclasses import dataclass, field
+from typing import Any, cast
+from xml.etree import ElementTree
+
+from .audience import Audience
+from .direction import Direction
+from .element import NamedElement
+from .exceptions import odxraise, odxrequire
+from .flashclass import FlashClass
+from .nameditemlist import NamedItemList
+from .odxdoccontext import OdxDocContext
+from .odxlink import OdxLinkDatabase, OdxLinkId, OdxLinkRef
+from .ownident import OwnIdent
+from .snrefcontext import SnRefContext
+from .specialdatagroup import SpecialDataGroup
+from .utils import dataclass_fields_asdict
+
+
+@dataclass(kw_only=True)
+class SessionDesc(NamedElement):
+    partnumber: str | None = None
+    priority: int | None = None
+    session_snref: str
+    diag_comm_snref: str | None = None
+    flash_class_refs: list[OdxLinkRef] = field(default_factory=list)
+    sdgs: list[SpecialDataGroup] = field(default_factory=list)
+    audience: Audience | None = None
+    own_ident: OwnIdent | None = None
+    oid: str | None = None
+    direction: Direction
+
+    @property
+    def flash_classes(self) -> NamedItemList[FlashClass]:
+        return self._flash_classes
+
+    @staticmethod
+    def from_et(et_element: ElementTree.Element, context: OdxDocContext) -> "SessionDesc":
+
+        kwargs = dataclass_fields_asdict(NamedElement.from_et(et_element, context))
+
+        partnumber = et_element.findtext("PARTNUMBER")
+        priority = None
+        if (priority_str := et_element.findtext("PRIORITY")) is not None:
+            try:
+                priority = int(priority_str)
+            except Exception as e:
+                odxraise(f"Cannot parse PRIORITY: {e}")
+        session_snref = None
+        if (session_snref_elem := odxrequire(et_element.find("SESSION-SNREF"))) is not None:
+            session_snref = odxrequire(session_snref_elem.attrib.get("SHORT-NAME"))
+        diag_comm_snref = None
+        if (diag_comm_snref_elem := et_element.find("DIAG-COMM-SNREF")) is not None:
+            diag_comm_snref = odxrequire(diag_comm_snref_elem.attrib.get("SHORT-NAME"))
+        flash_class_refs = [
+            OdxLinkRef.from_et(el, context)
+            for el in et_element.iterfind("FLASH-CLASS-REFS/FLASH-CLASS-REF")
+        ]
+        sdgs = [SpecialDataGroup.from_et(sdge, context) for sdge in et_element.iterfind("SDGS/SDG")]
+        audience = None
+        if (audience_elem := et_element.find("AUDIENCE")) is not None:
+            audience = Audience.from_et(audience_elem, context)
+        own_ident = None
+        if (own_ident_elem := et_element.find("OWN-IDENT")) is not None:
+            own_ident = OwnIdent.from_et(own_ident_elem, context)
+        direction_str = odxrequire(et_element.attrib.get("DIRECTION"))
+        try:
+            direction = Direction(direction_str)
+        except ValueError:
+            odxraise(f"Encountered unknown DIRECTION '{direction_str}'")
+            direction = cast(Direction, None)
+        oid = et_element.attrib.get("OID")
+
+        return SessionDesc(
+            partnumber=partnumber,
+            priority=priority,
+            session_snref=session_snref,
+            diag_comm_snref=diag_comm_snref,
+            flash_class_refs=flash_class_refs,
+            sdgs=sdgs,
+            audience=audience,
+            own_ident=own_ident,
+            direction=direction,
+            oid=oid,
+            **kwargs)
+
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
+        odxlinks: dict[OdxLinkId, Any] = {}
+
+        if self.own_ident is not None:
+            odxlinks.update(self.own_ident._build_odxlinks())
+
+        return odxlinks
+
+    def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
+        self._flash_classes = NamedItemList(
+            [odxlinks.resolve(ref, FlashClass) for ref in self.flash_class_refs])
+
+    def _resolve_snrefs(self, context: SnRefContext) -> None:
+        # TODO: resolve session_snref and diag_comm_snref
+        pass

odxtools/sessionsubelemtype.py

@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: MIT
+from enum import Enum
+
+from .odxtypes import DataType
+
+
+class SessionSubElemType(Enum):
+    A_UINT32 = "A_UINT32"
+    A_BYTEFIELD = "A_BYTEFIELD"
+    A_ASCIISTRING = "A_ASCIISTRING"
+
+    @property
+    def data_type(self) -> DataType:
+        return DataType(self.value)

odxtools/sizedeffilter.py

@@ -0,0 +1,33 @@
+# SPDX-License-Identifier: MIT
+from dataclasses import dataclass
+from typing import Any
+from xml.etree import ElementTree
+
+from .exceptions import odxrequire
+from .filter import Filter
+from .odxdoccontext import OdxDocContext
+from .odxlink import OdxLinkDatabase, OdxLinkId
+from .snrefcontext import SnRefContext
+from .utils import dataclass_fields_asdict
+
+
+@dataclass(kw_only=True)
+class SizedefFilter(Filter):
+    filter_size: int
+
+    @staticmethod
+    def from_et(et_element: ElementTree.Element, context: OdxDocContext) -> "SizedefFilter":
+        kwargs = dataclass_fields_asdict(Filter.from_et(et_element, context))
+
+        filter_size = int(odxrequire(et_element.findtext("FILTER-SIZE")) or "0")
+
+        return SizedefFilter(filter_size=filter_size, **kwargs)
+
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
+        return super()._build_odxlinks()
+
+    def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
+        super()._resolve_odxlinks(odxlinks)
+
+    def _resolve_snrefs(self, context: SnRefContext) -> None:
+        super()._resolve_snrefs(context)

odxtools/sizedefphyssegment.py

@@ -0,0 +1,33 @@
+# SPDX-License-Identifier: MIT
+from dataclasses import dataclass
+from typing import Any
+from xml.etree import ElementTree
+
+from .exceptions import odxrequire
+from .odxdoccontext import OdxDocContext
+from .odxlink import OdxLinkDatabase, OdxLinkId
+from .physsegment import PhysSegment
+from .snrefcontext import SnRefContext
+from .utils import dataclass_fields_asdict
+
+
+@dataclass(kw_only=True)
+class SizedefPhysSegment(PhysSegment):
+    size: int
+
+    @staticmethod
+    def from_et(et_element: ElementTree.Element, context: OdxDocContext) -> "SizedefPhysSegment":
+        kwargs = dataclass_fields_asdict(PhysSegment.from_et(et_element, context))
+
+        size = int(odxrequire(et_element.findtext("SIZE")) or "0")
+
+        return SizedefPhysSegment(size=size, **kwargs)
+
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
+        return super()._build_odxlinks()
+
+    def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
+        super()._resolve_odxlinks(odxlinks)
+
+    def _resolve_snrefs(self, context: SnRefContext) -> None:
+        super()._resolve_snrefs(context)

odxtools/specialdata.py

@@ -6,6 +6,7 @@ from xml.etree import ElementTree
 from .odxdoccontext import OdxDocContext
 from .odxlink import OdxLinkDatabase, OdxLinkId
 from .snrefcontext import SnRefContext
+from .utils import strip_indent
 
 
 @dataclass(kw_only=True)
@@ -19,7 +20,7 @@ class SpecialData:
     def from_et(et_element: ElementTree.Element, context: OdxDocContext) -> "SpecialData":
         semantic_info = et_element.get("SI")
         text_identifier = et_element.get("TI")
-        value = et_element.text or ""
+        value = strip_indent(et_element.text) or ""
 
         return SpecialData(
             semantic_info=semantic_info, text_identifier=text_identifier, value=value)

odxtools/subcomponentparamconnector.py

@@ -77,7 +77,7 @@ class SubComponentParamConnector(IdentifiableElement):
                                 odxrequire(context.diag_layer).diag_comms, DiagService)
         self._service = service
 
-        if self._service.request is not None:
+        if self._service.request is None:
             odxraise()
             return
         if not self._service.positive_responses:

odxtools/targetaddroffset.py

@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: MIT
+from dataclasses import dataclass
+from xml.etree import ElementTree
+
+from .odxdoccontext import OdxDocContext
+
+
+@dataclass(kw_only=True)
+class TargetAddrOffset:
+
+    @staticmethod
+    def from_et(et_element: ElementTree.Element, context: OdxDocContext) -> "TargetAddrOffset":
+        return TargetAddrOffset()

odxtools/templates/comparam-spec.odx-c.xml.jinja2

@@ -12,6 +12,7 @@
 <?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(comparam_spec.short_name, "COMPARAM-SPEC") }}
  <COMPARAM-SPEC  {{- poc.printOdxCategoryAttribs(comparam_spec) }}>
    {{- poc.printOdxCategorySubtags(comparam_spec)|indent(3) }}
    {%- if comparam_spec.prot_stacks %}

odxtools/templates/comparam-subset.odx-cs.xml.jinja2

@@ -15,6 +15,7 @@
 <?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(comparam_subset.short_name, "COMPARAM-SUBSET") }}
  <COMPARAM-SUBSET  {{- poc.printOdxCategoryAttribs(comparam_subset) }} {{make_xml_attrib("CATEGORY", comparam_subset.category)}}>
    {{- poc.printOdxCategorySubtags(comparam_subset)|indent(3) }}
    {%- if comparam_subset.comparams %}

odxtools/templates/diag_layer_container.odx-d.xml.jinja2

@@ -14,6 +14,7 @@
 <?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(dlc.short_name, "CONTAINER") }}
  <DIAG-LAYER-CONTAINER {{- poc.printOdxCategoryAttribs(dlc) }}>
   {{- poc.printOdxCategorySubtags(dlc)|indent(3) }}
 {%- if dlc.protocols %}
@@ -44,7 +45,7 @@
  {%- endfor %}
   </BASE-VARIANTS>
 {%- endif %}
-{%- if  dlc.ecu_variants %}
+{%- if dlc.ecu_variants %}
   <ECU-VARIANTS>
  {%- for dl in dlc.ecu_variants %}
   {{pecuv.printEcuVariant(dl)|indent(3)}}

odxtools/templates/flash.odx-f.xml.jinja2

@@ -0,0 +1,42 @@
+{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+ #
+ # This template writes an .odx-cs file for a communication
+ # parameter subset.
+-#}
+{%- import('macros/printOdxCategory.xml.jinja2') as poc %}
+{%- import('macros/printEcuMem.xml.jinja2') as pem %}
+{%- import('macros/printEcuMemConnector.xml.jinja2') as pemc %}
+{%- 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(flash.short_name, "FLASH") }}
+  <FLASH {{- poc.printOdxCategoryAttribs(flash) }}>
+    {{- poc.printOdxCategorySubtags(flash)|indent(4) }}
+    {%- if flash.ecu_mems %}
+    <ECU-MEMS>
+      {%- for ecu_mem in flash.ecu_mems %}
+      {{ pem.printEcuMem(ecu_mem) | indent(6) }}
+      {%- endfor %}
+    </ECU-MEMS>
+    {%- endif %}
+    {%- if flash.ecu_mem_connectors %}
+    <ECU-MEM-CONNECTORS>
+      {%- for ecu_mem_connector in flash.ecu_mem_connectors %}
+      {{ pemc.printEcuMemConnector(ecu_mem_connector) | indent(6) }}
+      {%- endfor %}
+    </ECU-MEM-CONNECTORS>
+    {%- endif %}
+    {%- if flash.additional_audiences %}
+    <ADDITIONAL-AUDIENCES>
+      {%- for audience in flash.additional_audiences %}
+      {{ paud.printAdditionalAudience(audience) | indent(6) }}
+      {%- endfor %}
+    </ADDITIONAL-AUDIENCES>
+    {%- endif %}
+  </FLASH>
+</ODX>

odxtools/templates/macros/printAdminData.xml.jinja2

@@ -14,9 +14,9 @@
  <COMPANY-DOC-INFOS>
   {%- for cdi in admin_data.company_doc_infos %}
   <COMPANY-DOC-INFO>
-    <COMPANY-DATA-REF ID-REF="{{cdi.company_data_ref.ref_id}}" />
+    <COMPANY-DATA-REF {{make_ref_attribs(cdi.company_data_ref)}} />
    {%- if cdi.team_member_ref is not none %}
-    <TEAM-MEMBER-REF ID-REF="{{cdi.team_member_ref.ref_id}}" />
+    <TEAM-MEMBER-REF {{make_ref_attribs(cdi.team_member_ref)}} />
     {%- endif %}
    {%- if cdi.doc_label is not none %}
     <DOC-LABEL>{{cdi.doc_label|e}}</DOC-LABEL>
@@ -31,7 +31,7 @@
   {%- for doc_revision in admin_data.doc_revisions %}
   <DOC-REVISION>
    {%- if doc_revision.team_member_ref is not none %}
-   <TEAM-MEMBER-REF ID-REF="{{doc_revision.team_member_ref.ref_id}}" />
+   <TEAM-MEMBER-REF {{make_ref_attribs(doc_revision.team_member_ref)}} />
    {%- endif %}
    {%- if doc_revision.revision_label is not none %}
    <REVISION-LABEL>{{doc_revision.revision_label|e}}</REVISION-LABEL>
@@ -47,7 +47,7 @@
    <COMPANY-REVISION-INFOS>
      {%- for cri in doc_revision.company_revision_infos %}
      <COMPANY-REVISION-INFO>
-       <COMPANY-DATA-REF ID-REF="{{cri.company_data_ref.ref_id}}" />
+       <COMPANY-DATA-REF {{make_ref_attribs(cri.company_data_ref)}} />
        {%- if cri.revision_label is not none %}
        <REVISION-LABEL>{{cri.revision_label|e}}</REVISION-LABEL>
        {%- endif %}

odxtools/templates/macros/printAudience.xml.jinja2

@@ -7,7 +7,7 @@
 
 {%- macro printAdditionalAudience(audience) -%}
 <ADDITIONAL-AUDIENCE {{-peid.printElementIdAttribs(audience)}}>
- {{ peid.printElementIdSubtags(audience)|indent(1) }}
+  {{ peid.printElementIdSubtags(audience)|indent(2) }}
 </ADDITIONAL-AUDIENCE>
 {%- endmacro -%}
 
@@ -20,14 +20,14 @@
 {%- if audience.enabled_audience_refs %}
  <ENABLED-AUDIENCE-REFS>
 {%- for ref in audience.enabled_audience_refs %}
-  <ENABLED-AUDIENCE-REF ID-REF="{{ref.ref_id}}" />
+  <ENABLED-AUDIENCE-REF {{make_ref_attribs(ref)}} />
 {%- endfor %}
  </ENABLED-AUDIENCE-REFS>
 {%- endif%}
 {%- if audience.disabled_audience_refs %}
  <DISABLED-AUDIENCE-REFS>
 {%- for ref in audience.disabled_audience_refs %}
-  <DISABLED-AUDIENCE-REF ID-REF="{{ref.ref_id}}" />
+  <DISABLED-AUDIENCE-REF {{make_ref_attribs(ref)}} />
 {%- endfor %}
  </DISABLED-AUDIENCE-REFS>
 {%- endif%}

odxtools/templates/macros/printChecksum.xml.jinja2

@@ -0,0 +1,36 @@
+{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printElementId.xml.jinja2') as peid %}
+
+{%- macro printChecksum(checksum) -%}
+<CHECKSUM {{-peid.printElementIdAttribs(checksum)|indent(2) }}{# -#}>
+  {{ peid.printElementIdSubtags(checksum)|indent(2) }}
+  {%- if checksum.fillbyte is not none %}
+  {%- set num_nibbles = (checksum.fillbyte.bit_length() + 7) // 8 * 2 %}
+  <FILLBYTE>{{ ("%%0%dX" | format(num_nibbles | int)) | format(checksum.fillbyte | int) }}</FILLBYTE>
+  {%- endif %}
+  {%- set num_nibbles = (checksum.source_start_address.bit_length() + 7) // 8 * 2 %}
+  <SOURCE-START-ADDRESS>{{ ("%%0%dX" | format(num_nibbles | int)) | format(checksum.source_start_address | int) }}</SOURCE-START-ADDRESS>
+  {%- if checksum.compressed_size is not none %}
+  <COMPRESSED-SIZE>{{ checksum.compressed_size }}</COMPRESSED-SIZE>
+  {%- endif %}
+  {%- if checksum.checksum_alg is not none %}
+  <CHECKSUM-ALG>{{checksum.checksum_alg}}</CHECKSUM-ALG>
+  {%- endif %}
+  {%- if checksum.source_end_address is not none %}
+  {%- set num_nibbles = (checksum.source_end_address.bit_length() + 7) // 8 * 2 %}
+  <SOURCE-END-ADDRESS>{{ ("%%0%dX" | format(num_nibbles | int)) | format(checksum.source_end_address | int) }}</SOURCE-END-ADDRESS>
+  {%- endif %}
+  {%- if checksum.uncompressed_size is not none %}
+  <UNCOMPRESSED-SIZE>{{ checksum.uncompressed_size }}</UNCOMPRESSED-SIZE>
+  {%- endif %}
+  <CHECKSUM-RESULT
+    {%- if checksum.checksum_result.value_type is not none %}
+    {#- #} TYPE="{{ checksum.checksum_result.value_type.value }}"
+    {%- endif %}
+    {#- #}>{{checksum.checksum_result.value}}</CHECKSUM-RESULT>
+</CHECKSUM>
+{%- endmacro -%}

odxtools/templates/macros/printComparam.xml.jinja2

@@ -45,7 +45,7 @@
           CPUSAGE="{{cp.cpusage.value}}">
   {{ peid.printElementIdSubtags(cp)|indent(1) }}
   <PHYSICAL-DEFAULT-VALUE>{{cp.physical_default_value_raw}}</PHYSICAL-DEFAULT-VALUE>
- <DATA-OBJECT-PROP-REF ID-REF="{{cp.dop_ref.ref_id}}" />
+ <DATA-OBJECT-PROP-REF {{make_ref_attribs(cp.dop_ref)}} />
 </COMPARAM>
 {%- endmacro %}
 

odxtools/templates/macros/printComparamRef.xml.jinja2

@@ -7,9 +7,7 @@
 {#- -#}
 
 {%- macro printComparamRef(cp) %}
-<COMPARAM-REF ID-REF="{{cp.spec_ref.ref_id}}"
-              DOCREF="{{cp.spec_ref.ref_docs[0].doc_name}}"
-              DOCTYPE="COMPARAM-SUBSET">
+<COMPARAM-REF {{make_ref_attribs(cp.spec_ref)}}>
   {%- if cp.value is string %}
   <SIMPLE-VALUE>{{cp.value}}</SIMPLE-VALUE>
   {{ pd.printDescription(cp.description) }}

odxtools/templates/macros/printCompuMethod.xml.jinja2

@@ -103,7 +103,7 @@
   {%- if pc.library_refs %}
   <LIBRARY-REFS>
     {%- for libref in pc.library_refs %}
-    <LIBRARY-REF ID-REF="{{libref.ref_id}}" />
+    <LIBRARY-REF {{make_ref_attribs(libref)}} />
     {%- endfor %}
   </LIBRARY-REFS>
   {%- endif %}

odxtools/templates/macros/printDOP.xml.jinja2

@@ -113,7 +113,7 @@
  {{- printInternalConstr(dop.internal_constr, False)|indent(1) }}
  {%- endif %}
  {%- if dop.unit_ref %}
- <UNIT-REF ID-REF="{{ dop.unit_ref.ref_id }}" />
+ <UNIT-REF {{make_ref_attribs(dop.unit_ref)}} />
  {%- endif %}
  {%- if dop.physical_constr %}
  {{- printInternalConstr(dop.internal_constr, True)|indent(1) }}
@@ -131,7 +131,7 @@
  <DTCS>
  {%- for dtc in dop.dtcs_raw %}
  {%- if hasattr(dtc, "ref_id") %}
-  <DTC-REF ID-REF="{{dtc.ref_id}}" />
+  <DTC-REF {{make_ref_attribs(dtc)}} />
  {%- else %}
   <DTC {{-peid.printElementIdAttribs(dtc)}}>
    <SHORT-NAME>{{dtc.short_name}}</SHORT-NAME>
@@ -159,7 +159,7 @@
        {%- endfor %}
      </NOT-INHERITED-DTC-SNREFS>
      {%- endif %}
-     <DTC-DOP-REF ID-REF="{{linked_dtc_dop.dtc_dop_ref.ref_id}}" />
+     <DTC-DOP-REF {{make_ref_attribs(linked_dtc_dop.dtc_dop_ref)}} />
    </LINKED-DTC-DOP>
    {%- endfor %}
  </LINKED-DTC-DOPS>

odxtools/templates/macros/printDatablock.xml.jinja2

@@ -0,0 +1,78 @@
+{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printElementId.xml.jinja2') as peid %}
+{%- import('macros/printOwnIdent.xml.jinja2') as poi %}
+{%- import('macros/printSecurity.xml.jinja2') as psec %}
+{%- import('macros/printSegment.xml.jinja2') as pseg %}
+{%- import('macros/printSpecialData.xml.jinja2') as psd %}
+
+{%- macro printDatablock(datablock) -%}
+<DATABLOCK {{peid.printElementIdAttribs(datablock)}} TYPE="{{datablock.data_type}}">
+  {{ peid.printElementIdSubtags(datablock)|indent(1) }}
+  {%- if datablock.logical_block_index is not none %}
+  {%- set num_nibbles = (datablock.logical_block_index.bit_length() + 7) // 8 * 2 %}
+  <LOGICAL-BLOCK-INDEX>{{("%%0%dX" | format(num_nibbles | int)) | format(datablock.logical_block_index | int)}}</LOGICAL-BLOCK-INDEX>
+  {%- endif %}
+  {%- if datablock.flashdata_ref is not none %}
+  <FLASHDATA-REF {{make_ref_attribs(datablock.flashdata_ref)}} />
+  {%- endif %}
+  {%- if datablock.filters %}
+  <FILTERS>
+    {%- for filter in datablock.filters %}
+    {%- if filter.filter_end %}
+    <FILTER xsi:type="ADDRDEF-FILTER">
+      {%- set num_nibbles = (filter.filter_start.bit_length() + 7) // 8 * 2 %}
+      <FILTER-START>{{ ("%%0%dX" | format(num_nibbles | int)) | format(filter.filter_start | int) }}</FILTER-START>
+      {%- set num_nibbles = (filter.filter_end.bit_length() + 7) // 8 * 2 %}
+      <FILTER-END>{{ ("%%0%dX" | format(num_nibbles | int)) | format(filter.filter_end | int) }}</FILTER-END>
+    </FILTER>
+    {%- elif filter.filter_size %}
+    <FILTER xsi:type="SIZEDEF-FILTER">
+      {%- set num_nibbles = (filter.filter_start.bit_length() + 7) // 8 * 2 %}
+      <FILTER-START>{{ ("%%0%dX" | format(num_nibbles | int)) | format(filter.filter_start | int) }}</FILTER-START>
+      <FILTER-SIZE>{{filter.filter_size}}</FILTER-SIZE>
+    </FILTER>
+    {%- endif %}
+    {%- endfor %}
+  </FILTERS>
+  {%- endif %}
+  {%- if datablock.segments %}
+  <SEGMENTS>
+    {%- for segment in datablock.segments %}
+    {{ pseg.printSegment(segment) | indent(4) }}
+    {%- endfor %}
+  </SEGMENTS>
+  {%- endif %}
+  {%- if datablock.target_addr_offset is not none %}
+  {%- if datablock.target_addr_offset.positive_offset is defined %}
+  <TARGET-ADDR-OFFSET xsi:type="POS-OFFSET">
+    {%- set num_nibbles = (datablock.target_addr_offset.positive_offset.bit_length() + 7) // 8 * 2 %}
+    <POSITIVE-OFFSET>{{("%%0%dX" | format(num_nibbles | int)) | format(datablock.target_addr_offset.positive_offset | int)}}</POSITIVE-OFFSET>
+  </TARGET-ADDR-OFFSET>
+  {%- elif datablock.target_addr_offset.negative_offset is defined %}
+  <TARGET-ADDR-OFFSET xsi:type="NEG-OFFSET">
+    {%- set num_nibbles = (datablock.target_addr_offset.negative_offset.bit_length() + 7) // 8 * 2 %}
+    <NEGATIVE-OFFSET>{{("%%0%dX" | format(num_nibbles | int)) | format(datablock.target_addr_offset.negative_offset | int)}}</NEGATIVE-OFFSET>
+  </TARGET-ADDR-OFFSET>
+  {%- endif %}
+  {%- endif %}
+  {%- if datablock.own_idents %}
+  <OWN-IDENTS>
+    {%- for own_ident in datablock.own_idents %}
+    {{ poi.printOwnIdent(own_ident)|indent(4) }}
+    {%- endfor %}
+  </OWN-IDENTS>
+  {%- endif %}
+  {%- if datablock.securities %}
+  <SECURITYS>
+    {%- for security in datablock.securities %}
+    {{ psec.printSecurity(security)|indent(4) }}
+    {%- endfor %}
+  </SECURITYS>
+  {%- endif %}
+  {{- psd.printSpecialDataGroups(datablock.sdgs)|indent(2, first=True) }}{#- #}
+</DATABLOCK>
+{%- endmacro -%}

odxtools/templates/macros/printDiagComm.xml.jinja2

@@ -28,7 +28,7 @@
  {%- if dc.functional_class_refs %}
  <FUNCT-CLASS-REFS>
   {%- for ref in dc.functional_class_refs %}
-  <FUNCT-CLASS-REF ID-REF="{{ref.ref_id}}" />
+  <FUNCT-CLASS-REF {{make_ref_attribs(ref)}} />
   {%- endfor %}
  </FUNCT-CLASS-REFS>
  {%- endif%}
@@ -45,7 +45,7 @@
  {%- if dc.related_diag_comm_refs %}
  <RELATED-DIAG-COMM-REFS>
   {%- for ref in dc.related_diag_comm_refs %}
-  <RELATED-DIAG-COMM-REF ID-REF="{{ref.ref_id}}">
+  <RELATED-DIAG-COMM-REF {{make_ref_attribs(ref)}}>
    <RELATION-TYPE>{{ref.relation_type}}</RELATION-TYPE>
   </RELATED-DIAG-COMM-REF>
   {%- endfor %}

odxtools/templates/macros/printDiagLayer.xml.jinja2

@@ -33,6 +33,7 @@
 {%- endmacro -%}
 
 {%- macro printDiagLayerSubtags(dl) -%}
+{{- set_layer_docfrag(dl.short_name) }}
 {%- set dlr = dl.diag_layer_raw %}
 {{ peid.printElementIdSubtags(dlr)|indent(1) }}
 {%- if dlr.admin_data is not none %}
@@ -149,7 +150,7 @@
 
   {%- if hasattr(dc, "ref_id") %}
   {#- -> reference to a diag-comm object #}
-  <DIAG-COMM-REF ID-REF="{{dc.ref_id}}" />
+  <DIAG-COMM-REF {{make_ref_attribs(dc)}} />
   {%- elif hasattr(dc, "request") %}
   {#- -> service #}
   {{ ps.printService(dc)|indent(2) }}

odxtools/templates/macros/printDiagVariable.xml.jinja2

@@ -14,7 +14,7 @@
   {%- if diag_variable.admin_data is not none %}
   {{ pad.printAdminData(diag_variable.admin_data)|indent(2) }}
   {%- endif %}
-  <VARIABLE-GROUP-REF ID-REF="{{ diag_var.ref_id }}" />
+  <VARIABLE-GROUP-REF {{make_ref_attribs(diag_var)}} />
   {%- if diag_variable.sw_variables %}
    <SW-VARIABLES>
     {%- for sw_var in diag_variable.sw_variables %}
@@ -34,19 +34,19 @@
       {{ pd.printDescription(comm_relation.description) }}
       <RELATION-TYPE>{{comm_relation.relation_type}}</RELATION-TYPE>
       {%- if comm_relation.diag_comm_ref is not none %}
-      <DIAG-COMM-REF ID-REF="{{comm_relation.diag_comm_ref.ref_id}}" />
+      <DIAG-COMM-REF {{make_ref_attribs(comm_relation.diag_comm_ref)}} />
       {%- endif %}
       {%- if comm_relation.diag_comm_snref is not none %}
       <DIAG-COMM-SNREF SHORT-NAME="{{comm_relation.diag_comm_snref}}" />
       {%- endif %}
       {%- if comm_relation.in_param_if_ref is not none %}
-      <IN-PARAM-IF-REF ID-REF="{{comm_relation.in_param_if_ref.ref_id}}" />
+      <IN-PARAM-IF-REF {{make_ref_attribs(comm_relation.in_param_if_ref)}} />
       {%- endif %}
       {%- if comm_relation.in_param_if_snref is not none %}
       <IN-PARAM-IF-SNREF SHORT-NAME="{{comm_relation.in_param_if_snref}}" />
       {%- endif %}
       {%- if comm_relation.out_param_if_ref is not none %}
-      <OUT-PARAM-IF-REF ID-REF="{{comm_relation.out_param_if_ref.ref_id}}" />
+      <OUT-PARAM-IF-REF {{make_ref_attribs(comm_relation.out_param_if_ref)}} />
       {%- endif %}
       {%- if comm_relation.out_param_if_snref is not none %}
       <OUT-PARAM-IF-SNREF SHORT-NAME="{{comm_relation.out_param_if_snref}}" />

odxtools/templates/macros/printDynDefinedSpec.xml.jinja2

@@ -11,13 +11,13 @@
   <DYN-ID-DEF-MODE-INFO>
     <DEF-MODE>{{ diddmi.def_mode }}</DEF-MODE>
     {%- if diddmi.clear_dyn_def_message_ref is not none %}
-    <CLEAR-DYN-DEF-MESSAGE-REF ID-REF="{{diddmi.clear_dyn_def_message_ref.ref_id}}" />
+    <CLEAR-DYN-DEF-MESSAGE-REF {{make_ref_attribs(diddmi.clear_dyn_def_message_ref)}} />
     {%- endif %}
     {%- if diddmi.clear_dyn_def_message_snref is not none %}
     <CLEAR-DYN-DEF-MESSAGE-SNREF SHORT-NAME="{{diddmi.clear_dyn_def_message_snref}}" />
     {%- endif %}
     {%- if diddmi.read_dyn_def_message_ref is not none %}
-    <READ-DYN-DEF-MESSAGE-REF ID-REF="{{diddmi.read_dyn_def_message_ref.ref_id}}" />
+    <READ-DYN-DEF-MESSAGE-REF {{make_ref_attribs(diddmi.read_dyn_def_message_ref)}} />
     {%- endif %}
     {%- if diddmi.read_dyn_def_message_snref is not none %}
     <READ-DYN-DEF-MESSAGE-SNREF SHORT-NAME="{{diddmi.read_dyn_def_message_snref}}" />
@@ -33,7 +33,7 @@
     <SELECTION-TABLE-REFS>
       {%- for seltref in diddmi.selection_table_refs %}
         {%- if hasattr(seltref, "ref_id") %}
-	<SELECTION-TABLE-REF ID-REF="{{ seltref.ref_id }}" />
+	<SELECTION-TABLE-REF {{make_ref_attribs(seltref)}} />
         {%- else %}
 	<SELECTION-TABLE-SNREF SHORT-NAME="{{ seltref }}" />
         {%- endif %}

odxtools/templates/macros/printDynamicEndmarkerField.xml.jinja2

@@ -8,8 +8,8 @@
 {%- macro printStaticField(demf) -%}
 <DYNAMIC-ENDMARKER-FIELD {{-peid.printElementIdAttribs(demf)}}>
  {{ peid.printElementIdSubtags(demf)|indent(1) }}
- <BASIC-STRUCTURE-REF ID-REF="{{demf.structure_ref.ref_id}}" />
- <DYN-END-DOP-REF ID-REF="{{demf.dyn_end_dop_ref.ref_id}}">
+ <BASIC-STRUCTURE-REF {{make_ref_attribs(demf.structure_ref)}} />
+ <DYN-END-DOP-REF {{make_ref_attribs(demf.dyn_end_dop_ref)}}>
    <TERMINATION-VALUE>{{demf.dyn_end_dop_ref.termination_value_raw}}</TERMINATION-VALUE>
  </DYN-END-DOP-REF>
 </DYNAMIC-ENDMARKER-FIELD>