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

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>

odxtools/templates/macros/printPhysMem.xml.jinja2

@@ -0,0 +1,20 @@
+{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printElementId.xml.jinja2') as peid %}
+{%- import('macros/printPhysSegment.xml.jinja2') as ppseg %}
+
+{%- macro printPhysMem(phys_mem) -%}
+<PHYS-MEM {{peid.printElementIdAttribs(phys_mem)}}>
+  {{ peid.printElementIdSubtags(phys_mem)|indent(1) }}
+  {%- if phys_mem.phys_segments %}
+  <PHYS-SEGMENTS>
+  {%- for phys_segment in phys_mem.phys_segments %}
+    {{ ppseg.printPhysSegment(phys_segment)|indent(4) }}
+  {%- endfor %}
+  </PHYS-SEGMENTS>
+  {%- endif %}
+</PHYS-MEM>
+{%- endmacro -%}

odxtools/templates/macros/printPhysSegment.xml.jinja2

@@ -0,0 +1,33 @@
+{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printElementId.xml.jinja2') as peid %}
+
+{%- macro printPhysSegment(phys_segment) -%}
+<PHYS-SEGMENT {{-peid.printElementIdAttribs(phys_segment)}}
+              {%- if phys_segment.size is defined %}
+              {#- #}xsi:type="SIZEDEF-PHYS-SEGMENT"
+              {%- elif phys_segment.end_address is defined %}
+              {#- #}xsi:type="ADDRDEF-PHYS-SEGMENT"
+              {%- endif %}
+              {#- #}>
+  {{ peid.printElementIdSubtags(phys_segment)|indent(2) }}
+  {%- if phys_segment.fillbyte is not none %}
+  {%- set num_nibbles = (phys_segment.fillbyte.bit_length() + 7) // 8 * 2 %}
+  <FILLBYTE>{{ ("%%0%dX" | format(num_nibbles | int)) | format(phys_segment.fillbyte | int) }}</FILLBYTE>
+  {%- endif %}
+  {%- if phys_segment.block_size is not none %}
+  <BLOCK-SIZE>{{ phys_segment.block_size }}</BLOCK-SIZE>
+  {%- endif %}
+  {%- set num_nibbles = (phys_segment.start_address.bit_length() + 7) // 8 * 2 %}
+  <START-ADDRESS>{{ ("%%0%dX" | format(num_nibbles | int)) | format(phys_segment.start_address | int) }}</START-ADDRESS>
+  {%- if phys_segment.size is defined %}
+  <SIZE>{{phys_segment.size}}</SIZE>
+  {%- elif phys_segment.end_address is defined %}
+  {%- set num_nibbles = (phys_segment.end_address.bit_length() + 7) // 8 * 2 %}
+  <END-ADDRESS>{{ ("%%0%dX" | format(num_nibbles | int)) | format(phys_segment.end_address | int) }}</END-ADDRESS>
+  {%- endif %}
+</PHYS-SEGMENT>
+{%- endmacro -%}

odxtools/templates/macros/printPreConditionStateRef.xml.jinja2

@@ -4,7 +4,7 @@
 -#}
 
 {%- macro printPreConditionStateRef(ps_ref) -%}
-<PRE-CONDITION-STATE-REF ID-REF="{{ps_ref.ref_id}}">
+<PRE-CONDITION-STATE-REF {{make_ref_attribs(ps_ref)}}>
   {%- if ps_ref.value is not none %}
   <VALUE>{{ ps_ref.value }}</VALUE>
   {%- endif %}

odxtools/templates/macros/printProtStack.xml.jinja2

@@ -14,7 +14,7 @@
  {%- if ps.comparam_subset_refs %}
  <COMPARAM-SUBSET-REFS>
   {%- for csr in ps.comparam_subset_refs %}
-  <COMPARAM-SUBSET-REF ID-REF="{{csr.ref_id}}" DOCREF="{{csr.ref_id}}" DOCTYPE="COMPARAM-SUBSET"/>
+  <COMPARAM-SUBSET-REF {{make_ref_attribs(csr)}}/>
   {%- endfor %}
  </COMPARAM-SUBSET-REFS>
  {%- endif %}

odxtools/templates/macros/printProtocol.xml.jinja2

@@ -13,7 +13,7 @@
   {%- set dlr = protocol.protocol_raw %}
 
   {%- set cps_docfrag = dlr.comparam_spec_ref.ref_docs[-1] %}
-  <COMPARAM-SPEC-REF ID-REF="{{dlr.comparam_spec_ref.ref_id}}" DOCREF="{{cps_docfrag.doc_name}}" DOCTYPE="{{cps_docfrag.doc_type.value}}" />
+  <COMPARAM-SPEC-REF {{make_ref_attribs(dlr.comparam_spec_ref)}} />
 
   {%- if dlr.prot_stack_snref is not none %}
   <PROT-STACK-SNREF SHORT-NAME="{{ dlr.prot_stack_snref }}" />

odxtools/templates/macros/printSecurity.xml.jinja2

@@ -0,0 +1,37 @@
+{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- macro printSecurity(security) -%}
+<SECURITY>
+  {%- if security.security_method is not none %}
+  <SECURITY-METHOD
+    {%- if security.security_method.value_type is not none %}
+    {#- #} TYPE="{{ security.security_method.value_type.value }}"
+    {%- endif %}
+    {#- #}>{{security.security_method.value}}</SECURITY-METHOD>
+  {%- endif %}
+  {%- if security.fw_signature is not none %}
+  <FW-SIGNATURE
+    {%- if security.fw_signature.value_type is not none %}
+    {#- #} TYPE="{{ security.fw_signature.value_type.value }}"
+    {%- endif %}
+    {#- #}>{{security.fw_signature.value}}</FW-SIGNATURE>
+  {%- endif %}
+  {%- if security.fw_checksum is not none %}
+  <FW-CHECKSUM
+    {%- if security.fw_checksum.value_type is not none %}
+    {#- #} TYPE="{{ security.fw_checksum.value_type.value }}"
+    {%- endif %}
+    {#- #}>{{security.fw_checksum.value}}</FW-CHECKSUM>
+  {%- endif %}
+  {%- if security.validity_for is not none %}
+  <VALIDITY-FOR
+    {%- if security.validity_for.value_type is not none %}
+    {#- #} TYPE="{{ security.validity_for.value_type.value }}"
+    {%- endif %}
+    {#- #}>{{security.validity_for.value}}</VALIDITY-FOR>
+  {%- endif %}
+</SECURITY>
+{%- endmacro -%}

odxtools/templates/macros/printSegment.xml.jinja2

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

odxtools/templates/macros/printService.xml.jinja2

@@ -56,19 +56,19 @@
   </COMPARAM-REFS>
   {%- endif%}
   {%- if service.request_ref %}
-  <REQUEST-REF ID-REF="{{service.request_ref.ref_id}}"/>
+  <REQUEST-REF {{make_ref_attribs(service.request_ref)}}/>
   {%- endif %}
   {%- if service.pos_response_refs %}
   <POS-RESPONSE-REFS>
     {%- for ref in service.pos_response_refs %}
-    <POS-RESPONSE-REF ID-REF="{{ref.ref_id}}" />
+    <POS-RESPONSE-REF {{make_ref_attribs(ref)}} />
     {%- endfor %}
   </POS-RESPONSE-REFS>
   {%- endif%}
   {%- if service.neg_response_refs %}
   <NEG-RESPONSE-REFS>
     {%- for ref in service.neg_response_refs %}
-    <NEG-RESPONSE-REF ID-REF="{{ref.ref_id}}" />
+    <NEG-RESPONSE-REF {{make_ref_attribs(ref)}} />
     {%- endfor %}
   </NEG-RESPONSE-REFS>
   {%- endif%}

odxtools/templates/macros/printSession.xml.jinja2

@@ -0,0 +1,45 @@
+{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printChecksum.xml.jinja2') as pcs %}
+{%- import('macros/printElementId.xml.jinja2') as peid %}
+{%- import('macros/printExpectedIdent.xml.jinja2') as pei %}
+{%- import('macros/printSecurity.xml.jinja2') as psec %}
+{%- import('macros/printSpecialData.xml.jinja2') as psd %}
+
+{%- macro printSession(session) -%}
+<SESSION {{-peid.printElementIdAttribs(session)|indent(2) }}{# -#}>
+  {{ peid.printElementIdSubtags(session)|indent(2) }}
+  {%- if session.expected_idents %}
+  <EXPECTED-IDENTS>
+    {%- for expected_ident in session.expected_idents %}
+    {{ pei.printExpectedIdent(expected_ident)|indent(4) }}
+    {%- endfor %}
+  </EXPECTED-IDENTS>
+  {%- endif %}
+  {%- if session.checksums %}
+  <CHECKSUMS>
+    {%- for checksum in session.checksums %}
+    {{ pcs.printChecksum(checksum)|indent(4) }}
+    {%- endfor %}
+  </CHECKSUMS>
+  {%- endif %}
+  {%- if session.securities %}
+  <SECURITYS>
+    {%- for security in session.securities %}
+    {{ psec.printSecurity(security)|indent(4) }}
+    {%- endfor %}
+  </SECURITYS>
+  {%- endif %}
+  {%- if session.datablock_refs %}
+  <DATABLOCK-REFS>
+    {%- for datablock_ref in session.datablock_refs %}
+    <DATABLOCK-REF {{make_ref_attribs(datablock_ref)}} />
+    {%- endfor %}
+  </DATABLOCK-REFS>
+  {%- endif %}
+  {{- psd.printSpecialDataGroups(session.sdgs)|indent(2, first=True) }}
+</SESSION>
+{%- endmacro -%}

odxtools/templates/macros/printSessionDesc.xml.jinja2

@@ -0,0 +1,40 @@
+{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printAudience.xml.jinja2') as paud %}
+{%- import('macros/printElementId.xml.jinja2') as peid %}
+{%- import('macros/printOwnIdent.xml.jinja2') as poid %}
+{%- import('macros/printSpecialData.xml.jinja2') as psd %}
+
+{%- macro printSessionDesc(session_desc) -%}
+<SESSION-DESC {#- #} {{- make_xml_attrib("OID", session_desc.oid) -}}
+              {#- #} DIRECTION="{{session_desc.direction.value}}">
+  {{ peid.printElementIdSubtags(session_desc)}}
+  {%- if session_desc.partnumber is not none %}
+  <PARTNUMBER>{{session_desc.partnumber}}</PARTNUMBER>
+  {%- endif %}
+  {%- if session_desc.priority is not none %}
+  <PRIORITY>{{session_desc.priority}}</PRIORITY>
+  {%- endif %}
+  <SESSION-SNREF SHORT-NAME="{{ session_desc.session_snref }}" />
+  {%- if session_desc.diag_comm_snref is not none %}
+  <DIAG-COMM-SNREF SHORT-NAME="{{ session_desc.diag_comm_snref }}" />
+  {%- endif %}
+  {%- if session_desc.flash_class_refs %}
+  <FLASH-CLASS-REFS>
+    {%- for flash_class_ref in session_desc.flash_class_refs %}
+    <FLASH-CLASS-REF {{make_ref_attribs(flash_class_ref)}} />
+    {%- endfor %}
+  </FLASH-CLASS-REFS>
+  {%- endif %}
+  {{- psd.printSpecialDataGroups(session_desc.sdgs)|indent(2, first=True) }}{#- #}
+  {%- if session_desc.audience is not none %}
+  {{ paud.printAudience(session_desc.audience) | indent(2) }}
+  {%- endif %}
+  {%- if session_desc.own_ident is not none %}
+  {{poid.printOwnIdent(session_desc.own_ident) | indent(2)}}
+  {%- endif %}
+</SESSION-DESC>
+{%- endmacro -%}

odxtools/templates/macros/printSingleEcuJob.xml.jinja2

@@ -47,7 +47,7 @@
 {%- if param.physical_default_value is not none %}
  <PHYSICAL-DEFAULT-VALUE>{{param.physical_default_value | e}}</PHYSICAL-DEFAULT-VALUE>
 {%- endif %}
- <DOP-BASE-REF ID-REF="{{param.dop_base_ref.ref_id}}" />
+ <DOP-BASE-REF {{make_ref_attribs(param.dop_base_ref)}} />
 </INPUT-PARAM>
 {%- endmacro -%}
 
@@ -56,7 +56,7 @@
               {{-make_xml_attrib("OID", param.oid)}}
               {{-make_xml_attrib("SEMANTIC", param.semantic)}}>
  {{ peid.printElementIdSubtags(param)|indent(1) }}
- <DOP-BASE-REF ID-REF="{{param.dop_base_ref.ref_id}}" />
+ <DOP-BASE-REF {{make_ref_attribs(param.dop_base_ref)}} />
 </OUTPUT-PARAM>
 {%- endmacro -%}
 
@@ -64,6 +64,6 @@
 {%- macro printNegOutputParam(param) -%}
 <NEG-OUTPUT-PARAM>
  {{ peid.printElementIdSubtags(param)|indent(1) }}
- <DOP-BASE-REF ID-REF="{{param.dop_base_ref.ref_id}}" />
+ <DOP-BASE-REF {{make_ref_attribs(param.dop_base_ref)}} />
 </NEG-OUTPUT-PARAM>
 {%- endmacro -%}

odxtools/templates/macros/printSpecialData.xml.jinja2

@@ -25,7 +25,7 @@
 {%- macro printSpecialDataGroup(sdg) %}
 <SDG {{-make_xml_attrib("SI", sdg.semantic_info)}}>
  {%- if sdg.sdg_caption_ref %}
- <SDG-CAPTION-REF ID-REF="{{sdg.sdg_caption_ref.ref_id}}" />
+ <SDG-CAPTION-REF {{make_ref_attribs(sdg.sdg_caption_ref)}} />
  {%- elif sdg.sdg_caption %}
  {{- printSdgCaption(sdg.sdg_caption) | indent(1, first=True) }}
  {%- endif %}
@@ -49,4 +49,4 @@
  {%- endfor %}
 </SDGS>
 {%- endif %}
-{%- endmacro %}
+{#- #}{%- endmacro %}

odxtools/templates/macros/printStateTransitionRef.xml.jinja2

@@ -4,7 +4,7 @@
 -#}
 
 {%- macro printStateTransitionRef(st_ref) -%}
-<STATE-TRANSITION-REF ID-REF="{{st_ref.ref_id}}">
+<STATE-TRANSITION-REF {{make_ref_attribs(st_ref)}}>
   {%- if st_ref.value is not none %}
   <VALUE>{{ st_ref.value }}</VALUE>
   {%- endif %}

odxtools/templates/macros/printStaticField.xml.jinja2

@@ -8,7 +8,7 @@
 {%- macro printStaticField(sf) -%}
 <STATIC-FIELD {{-peid.printElementIdAttribs(sf)}}>
  {{ peid.printElementIdSubtags(sf)|indent(1) }}
- <BASIC-STRUCTURE-REF ID-REF="{{sf.structure_ref.ref_id}}" />
+ <BASIC-STRUCTURE-REF {{make_ref_attribs(sf.structure_ref)}} />
  <FIXED-NUMBER-OF-ITEMS>{{sf.fixed_number_of_items}}</FIXED-NUMBER-OF-ITEMS>
  <ITEM-BYTE-SIZE>{{sf.item_byte_size}}</ITEM-BYTE-SIZE>
 </STATIC-FIELD>

odxtools/templates/macros/printSubComponent.xml.jinja2

@@ -40,7 +40,7 @@
 {%- macro printTableRowConnector(conn) %}
 <TABLE-ROW-CONNECTOR>
   {{ peid.printElementIdSubtags(conn)|indent(2) }}
-  <TABLE-REF ID-REF="{{ conn.table_ref.ref_id }}" />
+  <TABLE-REF {{make_ref_attribs(conn.table_ref)}} />
   <TABLE-ROW-SNREF {{- make_xml_attrib("SHORT-NAME", conn.table_row_snref ) }} />
 </TABLE-ROW-CONNECTOR>
 {%- endmacro %}
@@ -48,7 +48,7 @@
 {%- macro printEnvDataConnector(conn) %}
 <ENV-DATA-CONNECTOR>
   {{ peid.printElementIdSubtags(conn)|indent(2) }}
-  <ENV-DATA-DESC-REF ID-REF="{{ conn.env_data_desc_ref.ref_id }}" />
+  <ENV-DATA-DESC-REF {{make_ref_attribs(conn.env_data_desc_ref)}} />
   <ENV-DATA-SNREF {{- make_xml_attrib("SHORT-NAME", conn.env_data_snref ) }} />
 </ENV-DATA-CONNECTOR>
 {%- endmacro %}
@@ -56,7 +56,7 @@
 {%- macro printDtcConnector(conn) %}
 <DTC-CONNECTOR>
   {{ peid.printElementIdSubtags(conn)|indent(2) }}
-  <DTC-DOP-REF ID-REF="{{ conn.dtc_dop_ref.ref_id }}" />
+  <DTC-DOP-REF {{make_ref_attribs(conn.dtc_dop_ref)}} />
   <DOP-SNREF {{- make_xml_attrib("SHORT-NAME", conn.dtc_snref ) }} />
 </DTC-CONNECTOR>
 {%- endmacro %}

odxtools/templates/macros/printTable.xml.jinja2

@@ -16,7 +16,7 @@
        {{-make_xml_attrib("SEMANTIC", table.semantic)}}>
  {{ peid.printElementIdSubtags(table)|indent(1) }}
 {%- if table.key_dop_ref %}
- <KEY-DOP-REF ID-REF="{{ table.key_dop_ref.ref_id }}" />
+ <KEY-DOP-REF {{make_ref_attribs(table.key_dop_ref)}} />
 {%- endif %}
  {%- for table_row in table.table_rows_raw %}
  {%- if hasattr(table_row, "key") %}
@@ -25,13 +25,13 @@
   {{-peid.printElementIdSubtags(table_row)}}
   <KEY>{{table_row.key|e}}</KEY>
   {%- if table_row.dop_ref is not none %}
-  <DATA-OBJECT-PROP-REF ID-REF="{{ table_row.dop_ref.ref_id }}" />
+  <DATA-OBJECT-PROP-REF {{make_ref_attribs(table_row.dop_ref)}} />
   {%- endif %}
   {%- if table_row.dop_snref is not none %}
   <DATA-OBJECT-PROP-SNREF SHORT-NAME="{{ table_row.dop_snref }}" />
   {%- endif %}
   {%- if table_row.structure_ref is not none %}
-  <STRUCTURE-REF ID-REF="{{ table_row.structure_ref.ref_id }}" />
+  <STRUCTURE-REF {{make_ref_attribs(table_row.structure_ref)}} />
   {%- endif %}
   {%- if table_row.structure_snref is not none %}
   <STRUCTURE-SNREF SHORT-NAME="{{ table_row.structure_snref }}" />
@@ -43,7 +43,7 @@
   {%- if table_row.functional_class_refs %}
   <FUNCT-CLASS-REFS>
     {%- for fc_ref in table_row.functional_class_refs %}
-    <FUNCT-CLASS-REF ID-REF="{{ fc_ref.ref_id }}" />
+    <FUNCT-CLASS-REF {{make_ref_attribs(fc_ref)}} />
     {%- endfor %}
   </FUNCT-CLASS-REFS>
   {%- endif %}
@@ -66,7 +66,7 @@
   {%- endif %}
  </TABLE-ROW>
  {%- else %}
- <TABLE-ROW-REF ID-REF="{{ table_row.ref_id }}" />
+ <TABLE-ROW-REF {{make_ref_attribs(table_row)}} />
  {%- endif %}
 {%- endfor %}
  {%- if table_diag_comm_connectors %}
@@ -75,7 +75,7 @@
   <TABLE-DIAG-COMM-CONNECTOR>
    <SEMANTIC>{{tdcc.semantic}}</SEMANTIC>
    {%- if tdcc.diag_comm_ref %}
-   <DIAG-COMM-REF ID-REF="{{ tdcc.diag_comm_ref.ref_id }}" />
+   <DIAG-COMM-REF {{make_ref_attribs(tdcc.diag_comm_ref)}} />
    {%- elif tdcc.diag_comm_snref %}
    <DIAG-COMM-SNREF SHORT-NAME="{{ tdcc.diag_comm_snref }}" />
    {%- endif %}

odxtools/templates/macros/printUnitSpec.xml.jinja2

@@ -49,7 +49,7 @@
  <OFFSET-SI-TO-UNIT>{{ unit.offset_si_to_unit }}</OFFSET-SI-TO-UNIT>
  {%- endif %}
  {%- if unit.physical_dimension_ref %}
- <PHYSICAL-DIMENSION-REF ID-REF="{{ unit.physical_dimension_ref.ref_id }}" />
+ <PHYSICAL-DIMENSION-REF {{make_ref_attribs(unit.physical_dimension_ref)}} />
  {%- endif %}
 </UNIT>
 {%- endmacro -%}
@@ -61,7 +61,7 @@
  {%- if group.unit_refs %}
  <UNIT-REFS>
  {%- for ref in group.unit_refs %}
-  <UNIT-REF ID-REF="{{ ref.ref_id }}" />
+  <UNIT-REF {{make_ref_attribs(ref)}} />
  {%- endfor %}
  </UNIT-REFS>
  {%- endif %}