odxtools 10.1.0__py3-none-any.whl → 10.2.0__py3-none-any.whl

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>

odxtools/templates/macros/printDynamicLengthField.xml.jinja2

@@ -8,7 +8,7 @@
 {%- macro printDynamicLengthField(dlf) -%}
 <DYNAMIC-LENGTH-FIELD {{-peid.printElementIdAttribs(dlf)}}>
  {{ peid.printElementIdSubtags(dlf)|indent(1) }}
- <BASIC-STRUCTURE-REF ID-REF="{{dlf.structure_ref.ref_id}}" />
+ <BASIC-STRUCTURE-REF {{make_ref_attribs(dlf.structure_ref)}} />
  <OFFSET>{{dlf.offset}}</OFFSET>
  <DETERMINE-NUMBER-OF-ITEMS>
    {%- set dni = dlf.determine_number_of_items %}
@@ -16,7 +16,7 @@
    {%- if dni.bit_position is not none %}
    <BIT-POSITION>{{dni.bit_position}}</BIT-POSITION>
    {%- endif %}
-   <DATA-OBJECT-PROP-REF ID-REF="{{dni.dop_ref.ref_id}}" />
+   <DATA-OBJECT-PROP-REF {{make_ref_attribs(dni.dop_ref)}} />
  </DETERMINE-NUMBER-OF-ITEMS>
 </DYNAMIC-LENGTH-FIELD>
 {%- endmacro -%}

odxtools/templates/macros/printEcuMem.xml.jinja2

@@ -0,0 +1,24 @@
+1{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printAdminData.xml.jinja2') as pad %}
+{%- import('macros/printElementId.xml.jinja2') as peid %}
+{%- import('macros/printMem.xml.jinja2') as pm %}
+{%- import('macros/printPhysMem.xml.jinja2') as ppm %}
+{%- import('macros/printSpecialData.xml.jinja2') as psd %}
+
+{%- macro printEcuMem(ecu_mem) -%}
+<ECU-MEM {{peid.printElementIdAttribs(ecu_mem) | indent(1) }}>
+  {{peid.printElementIdSubtags(ecu_mem)|indent(2) }}
+  {%- if ecu_mem.admin_data is not none %}
+  {{ pad.printAdminData(ecu_mem.admin_data)|indent(2) }}
+  {%- endif %}
+  {{ pm.printMem(ecu_mem.mem)|indent(2) }}
+  {%- if ecu_mem.phys_mem is not none %}
+  {{ ppm.printPhysMem(ecu_mem.phys_mem)|indent(2) }}
+  {%- endif %}
+  {{- psd.printSpecialDataGroups(ecu_mem.sdgs)|indent(2, first=True) }}{#- #}
+</ECU-MEM>
+{%- endmacro -%}

odxtools/templates/macros/printEcuMemConnector.xml.jinja2

@@ -0,0 +1,58 @@
+1{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printAdminData.xml.jinja2') as pad %}
+{%- import('macros/printElementId.xml.jinja2') as peid %}
+{%- import('macros/printIdentDesc.xml.jinja2') as pidd %}
+{%- import('macros/printSpecialData.xml.jinja2') as psd %}
+{%- import('macros/printSessionDesc.xml.jinja2') as psesd %}
+
+{%- macro printEcuMemConnector(ecu_mem_connector) -%}
+<ECU-MEM-CONNECTOR {{peid.printElementIdAttribs(ecu_mem_connector)}}>
+  {{peid.printElementIdSubtags(ecu_mem_connector)|indent(2) }}
+  {%- if ecu_mem_connector.admin_data is not none %}
+  {{ pad.printAdminData(ecu_mem_connector.admin_data)|indent(2) }}
+  {%- endif %}
+  {%- if ecu_mem_connector.flash_classes %}
+  <FLASH-CLASSS>
+    {%- for flash_class in ecu_mem_connector.flash_classes %}
+    <FLASH-CLASS {{peid.printElementIdAttribs(flash_class)}}>
+      {{peid.printElementIdSubtags(flash_class)|indent(6) }}
+    </FLASH-CLASS>
+    {%- endfor %}
+  </FLASH-CLASSS>
+  {%- endif %}
+  {%- if ecu_mem_connector.session_descs %}
+  <SESSION-DESCS>
+    {%- for session_desc in ecu_mem_connector.session_descs %}
+    {{psesd.printSessionDesc(session_desc)}}
+    {%- endfor %}
+  </SESSION-DESCS>
+  {%- endif %}
+  {%- if ecu_mem_connector.ident_descs %}
+  <IDENT-DESCS>
+    {%- for ident_desc in ecu_mem_connector.ident_descs %}
+    {{pidd.printIdentDesc(ident_desc)}}
+    {%- endfor %}
+  </IDENT-DESCS>
+  {%- endif %}
+  <ECU-MEM-REF {{make_ref_attribs(ecu_mem_connector.ecu_mem_ref)}} />
+  {%- if ecu_mem_connector.layer_refs %}
+  <LAYER-REFS>
+    {%- for layer_ref in ecu_mem_connector.layer_refs %}
+    <LAYER-REF {{make_ref_attribs(layer_ref)}} />
+    {%- endfor %}
+  </LAYER-REFS>
+  {%- endif %}
+  {%- if ecu_mem_connector.all_variant_refs %}
+  <ALL-VARIANT-REFS>
+    {%- for all_variant_ref in ecu_mem_connector.all_variant_refs %}
+    <ALL-VARIANT-REF {{make_ref_attribs(all_variant_ref)}} />
+    {%- endfor %}
+  </ALL-VARIANT-REFS>
+  {%- endif %}
+  {{- psd.printSpecialDataGroups(ecu_mem_connector.sdgs)|indent(2, first=True) }}{#- #}
+</ECU-MEM-CONNECTOR>
+{%- endmacro -%}

odxtools/templates/macros/printEndOfPdu.xml.jinja2

@@ -8,7 +8,7 @@
 {%- macro printEndOfPdu(eopdu) -%}
 <END-OF-PDU-FIELD {{-peid.printElementIdAttribs(eopdu)}}>
  {{ peid.printElementIdSubtags(eopdu)|indent(1) }}
- <BASIC-STRUCTURE-REF ID-REF="{{eopdu.structure_ref.ref_id}}" />
+ <BASIC-STRUCTURE-REF {{make_ref_attribs(eopdu.structure_ref)}} />
  {%- if eopdu.max_number_of_items is not none %}
  <MAX-NUMBER-OF-ITEMS>{{eopdu.max_number_of_items}}</MAX-NUMBER-OF-ITEMS>
  {%- endif %}

odxtools/templates/macros/printEnvDataDesc.xml.jinja2

@@ -11,7 +11,7 @@
   <PARAM-SNREF SHORT-NAME="{{env_data_desc.param_snref}}"/>
   <ENV-DATA-REFS>
     {%- for env_data_ref in env_data_desc.env_data_refs %}
-    <ENV-DATA-REF ID-REF="{{env_data_ref.ref_id}}"/>
+    <ENV-DATA-REF {{make_ref_attribs(env_data_ref)}}/>
     {%- endfor %}
   </ENV-DATA-REFS>
 </ENV-DATA-DESC>

odxtools/templates/macros/printExpectedIdent.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 printExpectedIdent(expected_ident) -%}
+<EXPECTED-IDENT {{-peid.printElementIdAttribs(expected_ident)}} >
+  {{ peid.printElementIdSubtags(expected_ident)}}
+  <IDENT-VALUES>
+    {%- for ident_value in expected_ident.ident_values %}
+    <IDENT-VALUE
+      {%- if ident_value.value_type is not none %}
+      {#- #} TYPE="{{ ident_value.value_type.value }}"
+      {%- endif %}
+      {#- #}>{{ident_value.value}}</IDENT-VALUE>
+    {%- endfor %}
+  </IDENT-VALUES>
+</EXPECTED-IDENT>
+{%- endmacro -%}

odxtools/templates/macros/printFlashdata.xml.jinja2

@@ -0,0 +1,43 @@
+{#- -*- 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/printSegment.xml.jinja2') as pseg %}
+{%- import('macros/printSpecialData.xml.jinja2') as psd %}
+
+{%- macro printFlashdata(flashdata) -%}
+<FLASHDATA {{peid.printElementIdAttribs(flashdata)}}
+           {%- if flashdata.datafile is defined %}
+           {#- #} xsi:type="EXTERN-FLASHDATA"
+           {%- elif flashdata.data is defined %}
+           {#- #} xsi:type="INTERN-FLASHDATA"
+           {%- endif %}
+           {#- #}>
+  {{ peid.printElementIdSubtags(flashdata)|indent(2) }}
+  {%- if flashdata.size_length is not none %}
+  <SIZE-LENGTH>{{flashdata.size_length}}</SIZE-LENGTH>
+  {%- endif %}
+  {%- if flashdata.address_length is not none %}
+  <ADDRESS-LENGTH>{{flashdata.address_length}}</ADDRESS-LENGTH>
+  {%- endif %}
+  <DATAFORMAT {{ make_xml_attrib("SELECTION", flashdata.dataformat.selection.value) }}
+              {#- #} {{ make_xml_attrib("USER-SELECTION", flashdata.dataformat.user_selection) }} />
+  {%- if flashdata.encrypt_compress_method is not none %}
+  <ENCRYPT-COMPRESS-METHOD
+    {%- if flashdata.encrypt_compress_method.value_type is not none %}
+    {#- #} TYPE="{{ flashdata.encrypt_compress_method.value_type.value }}"
+    {%- endif %}
+    {#- #}>{{flashdata.encrypt_compress_method.value}}</ENCRYPT-COMPRESS-METHOD>
+  {%- endif %}
+  {%- if flashdata.datafile is defined %}
+  <DATAFILE {{ make_bool_xml_attrib("LATEBOUND-DATAFILE", flashdata.latebound_datafile) }}>
+    {#- #}{{flashdata.datafile.value}}
+  {#- #}</DATAFILE>
+  {%- elif flashdata.data is defined %}
+  <DATA>{{flashdata.data}}</DATA>
+  {%- endif %}
+</FLASHDATA>
+{%- endmacro -%}

odxtools/templates/macros/printIdentDesc.xml.jinja2

@@ -0,0 +1,17 @@
+{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- macro printIdentDesc(ident_desc) -%}
+<IDENT-DESC>
+  <DIAG-COMM-SNREF SHORT-NAME="{{ident_desc.diag_comm_snref}}" />
+  <IDENT-IF-SNREF SHORT-NAME="{{ident_desc.ident_if_snref}}" />
+  {%- if ident_desc.out_param_if_snref is not none %}
+  <OUT-PARAM-IF-SNREF SHORT-NAME="{{ident_desc.out_param_if_snref}}" />
+  {%- endif %}
+  {%- if ident_desc.out_param_if_snpathref is not none %}
+  <OUT-PARAM-IF-SNPATHREF SHORT-NAME-PATH="{{ident_desc.out_param_if_snpathref}}" />
+  {%- endif %}
+</IDENT-DESC>
+{%- endmacro -%}

odxtools/templates/macros/printMem.xml.jinja2

@@ -0,0 +1,35 @@
+{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printDatablock.xml.jinja2') as pdbl %}
+{%- import('macros/printFlashdata.xml.jinja2') as pfd %}
+{%- import('macros/printSession.xml.jinja2') as pses %}
+{%- import('macros/printSpecialData.xml.jinja2') as psd %}
+
+{%- macro printMem(mem) -%}
+<MEM>
+  {%- if mem.sessions %}
+  <SESSIONS>
+    {%- for session in mem.sessions %}
+    {{ pses.printSession(session) | indent(4) }}
+    {%- endfor %}
+  </SESSIONS>
+  {%- endif %}
+  {%- if mem.datablocks %}
+  <DATABLOCKS>
+    {%- for datablock in mem.datablocks %}
+    {{ pdbl.printDatablock(datablock) | indent(4) }}
+    {%- endfor %}
+  </DATABLOCKS>
+  {%- endif %}
+  {%- if mem.flashdatas %}
+  <FLASHDATAS>
+    {%- for flashdata in mem.flashdatas %}
+    {{ pfd.printFlashdata(flashdata) | indent(4) }}
+    {%- endfor %}
+  </FLASHDATAS>
+  {%- endif %}
+</MEM>
+{%- endmacro -%}

odxtools/templates/macros/printMux.xml.jinja2

@@ -18,13 +18,13 @@
     {%- if mux.switch_key.bit_position is not none %}
     <BIT-POSITION>{{mux.switch_key.bit_position}}</BIT-POSITION>
     {%- endif %}
-    <DATA-OBJECT-PROP-REF ID-REF="{{mux.switch_key.dop_ref.ref_id}}"/>
+    <DATA-OBJECT-PROP-REF {{make_ref_attribs(mux.switch_key.dop_ref)}}/>
   </SWITCH-KEY>
   {%- if mux.default_case is not none %}
   <DEFAULT-CASE>
     {{ peid.printElementIdSubtags(mux.default_case)|indent(4) }}
     {%- if mux.default_case.structure_ref is not none %}
-    <STRUCTURE-REF ID-REF="{{mux.default_case.structure_ref.ref_id}}"/>
+    <STRUCTURE-REF {{make_ref_attribs(mux.default_case.structure_ref)}}/>
     {%- endif %}
     {%- if mux.default_case.structure_snref is not none %}
     <STRUCTURE-SNREF SHORT_NAME="{{mux.default_case.structure_snref}}"/>
@@ -37,7 +37,7 @@
     <CASE>
       {{ peid.printElementIdSubtags(case)|indent(6) }}
       {%- if case.structure_ref is not none %}
-      <STRUCTURE-REF ID-REF="{{case.structure_ref.ref_id}}"/>
+      <STRUCTURE-REF {{make_ref_attribs(case.structure_ref)}}/>
       {%- endif %}
       {%- if case.structure_snref is not none %}
       <STRUCTURE-SNREF SHORT_NAME="{{case.structure_snref}}"/>

odxtools/templates/macros/printOdxCategory.xml.jinja2

@@ -12,17 +12,17 @@
 {#- #} {{- peid.printElementIdAttribs(obj) }}
 {%- endmacro -%}
 
-{%- macro printOdxCategorySubtags(obj) -%}
+{%- macro printOdxCategorySubtags(obj) %}
 {{ peid.printElementIdSubtags(obj) }}
 {%- if obj.admin_data %}
-{{pad.printAdminData(obj.admin_data)|indent(2)}}
+{{pad.printAdminData(obj.admin_data)}}
 {%- endif %}
 {%- if obj.company_datas %}
 <COMPANY-DATAS>
 {%- for cd in obj.company_datas %}
-{{pcd.printCompanyData(cd)|indent(3)}}
+{{pcd.printCompanyData(cd)|indent(2)}}
 {%- endfor %}
 </COMPANY-DATAS>
 {%- endif %}
-{{- psd.printSpecialDataGroups(obj.sdgs)|indent(2, first=True) }}
+{{- psd.printSpecialDataGroups(obj.sdgs) }}{#- #}
 {%- endmacro -%}

odxtools/templates/macros/printOwnIdent.xml.jinja2

@@ -0,0 +1,17 @@
+{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printElementId.xml.jinja2') as peid %}
+
+{%- macro printOwnIdent(own_ident) -%}
+<OWN-IDENT {{-peid.printElementIdAttribs(own_ident)}} >
+  {{ peid.printElementIdSubtags(own_ident)}}
+  <IDENT-VALUE
+    {%- if own_ident.ident_value.value_type is not none %}
+    {#- #} TYPE="{{ own_ident.ident_value.value_type.value }}"
+    {%- endif %}
+    {#- #}>{{own_ident.ident_value.value}}</IDENT-VALUE>
+</OWN-IDENT>
+{%- endmacro -%}

odxtools/templates/macros/printParam.xml.jinja2

@@ -49,7 +49,7 @@
  <PHYSICAL-DEFAULT-VALUE>{{param.physical_default_value_raw | e}}</PHYSICAL-DEFAULT-VALUE>
 {%- endif %}
 {%- if param.dop_ref %}
- <DOP-REF ID-REF="{{param.dop_ref.ref_id}}"/>
+ <DOP-REF {{make_ref_attribs(param.dop_ref)}}/>
 {%- elif param.dop_snref %}
  <DOP-SNREF SHORT-NAME="{{param.dop_snref}}"/>
 {%- elif param.diag_coded_type is defined %}
@@ -59,7 +59,7 @@
 {%- endif %}
 {%- if param.parameter_type == "TABLE-KEY" %}
  {%- if param.table_ref %}
- <TABLE-REF ID-REF="{{param.table_ref.ref_id}}"/>
+ <TABLE-REF {{make_ref_attribs(param.table_ref)}}/>
  {%- endif %}
  {%- if param.table_snref %}
  <TABLE-SNREF SHORT-NAME="{{param.table_snref}}"/>
@@ -68,12 +68,12 @@
  <TABLE-ROW-SNREF SHORT-NAME="{{param.table_row_snref}}"/>
  {%- endif %}
  {%- if param.table_row_ref %}
- <TABLE-ROW-REF ID-REF="{{param.table_row_ref.ref_id}}"/>
+ <TABLE-ROW-REF {{make_ref_attribs(param.table_row_ref)}}/>
  {%- endif %}
 {%- endif %}
 {%- if param.parameter_type == "TABLE-STRUCT" %}
  {%- if param.table_key_ref %}
- <TABLE-KEY-REF ID-REF="{{param.table_key_ref.ref_id}}"/>
+ <TABLE-KEY-REF {{make_ref_attribs(param.table_key_ref)}}/>
  {%- endif %}
  {%- if param.table_key_snref %}
  <TABLE-KEY-SNREF SHORT-NAME="{{param.table_key_snref}}"/>

odxtools/templates/macros/printParentRef.xml.jinja2

@@ -4,11 +4,7 @@
 -#}
 
 {%- macro printParentRef(par) -%}
-<PARENT-REF ID-REF="{{par.layer.odx_id.local_id}}"
-{%- if par.layer_ref.ref_docs|length == 1 %}
-            DOCREF="{{par.layer_ref.ref_docs[0].doc_name}}"
-            DOCTYPE="CONTAINER"
-{%- endif %}
+<PARENT-REF {{make_ref_attribs(par.layer_ref)}}
             xsi:type="{{par.layer.variant_type.value}}-REF">
 {%- if par.not_inherited_diag_comms %}
  <NOT-INHERITED-DIAG-COMMS>