odxtools 6.6.1__py3-none-any.whl → 9.3.0__py3-none-any.whl

odxtools/templates/macros/printDynDefinedSpec.xml.jinja2

@@ -0,0 +1,48 @@
+{#- -*- mode: sgml; tab-width: 2; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- macro printDynDefinedSpec(dd_spec) -%}
+<DYN-DEFINED-SPEC>
+{%- if dd_spec.dyn_id_def_mode_infos %}
+<DYN-ID-DEF-MODE-INFOS>
+  {%- for diddmi in dd_spec.dyn_id_def_mode_infos %}
+  <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}}" />
+    {%- 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}}" />
+    {%- endif %}
+    {%- if diddmi.read_dyn_def_message_snref is not none %}
+    <READ-DYN-DEF-MESSAGE-SNREF SHORT-NAME="{{diddmi.read_dyn_def_message_snref}}" />
+    {%- endif %}
+    {%- if diddmi.supported_dyn_ids %}
+    <SUPPORTED-DYN-IDS>
+      {%- for dynid in diddmi.supported_dyn_ids %}
+      <SUPPORTED-DYN-ID>{{ dynid.hex() }}</SUPPORTED-DYN-ID>
+      {%- endfor %}
+    </SUPPORTED-DYN-IDS>
+    {%- endif %}
+    {%- if diddmi.selection_table_refs %}
+    <SELECTION-TABLE-REFS>
+      {%- for seltref in diddmi.selection_table_refs %}
+        {%- if hasattr(seltref, "ref_id") %}
+	<SELECTION-TABLE-REF ID-REF="{{ seltref.ref_id }}" />
+        {%- else %}
+	<SELECTION-TABLE-SNREF SHORT-NAME="{{ seltref }}" />
+        {%- endif %}
+      {%- endfor %}
+    </SELECTION-TABLE-REFS>
+    {%- endif %}
+  </DYN-ID-DEF-MODE-INFO>
+  {%- endfor %}
+</DYN-ID-DEF-MODE-INFOS>
+{%- endif %}
+</DYN-DEFINED-SPEC>
+{%- endmacro -%}

odxtools/templates/macros/printDynamicEndmarkerField.xml.jinja2

@@ -0,0 +1,16 @@
+{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printElementId.xml.jinja2') as peid %}
+
+{%- 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}}">
+   <TERMINATION-VALUE>{{demf.dyn_end_dop_ref.termination_value_raw}}</TERMINATION-VALUE>
+ </DYN-END-DOP-REF>
+</DYNAMIC-ENDMARKER-FIELD>
+{%- endmacro -%}

odxtools/templates/macros/printDynamicLengthField.xml.jinja2

@@ -6,7 +6,7 @@
 {%- import('macros/printElementId.xml.jinja2') as peid %}
 
 {%- macro printDynamicLengthField(dlf) -%}
-<DYNAMIC-LENGTH-FIELD ID="{{dlf.odx_id.local_id}}">
+<DYNAMIC-LENGTH-FIELD {{-peid.printElementIdAttribs(dlf)}}>
  {{ peid.printElementIdSubtags(dlf)|indent(1) }}
  <BASIC-STRUCTURE-REF ID-REF="{{dlf.structure_ref.ref_id}}" />
  <OFFSET>{{dlf.offset}}</OFFSET>

odxtools/templates/macros/printEcuSharedData.xml.jinja2

@@ -0,0 +1,30 @@
+{#- -*- mode: sgml; tab-width: 2; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printDiagLayer.xml.jinja2') as pdl %}
+
+{%- macro printEcuSharedData(ecu_shared_data) -%}
+<ECU-SHARED-DATA {{- pdl.printDiagLayerAttribs(ecu_shared_data) -}}>
+  {{ pdl.printDiagLayerSubtags(ecu_shared_data) | indent(2) }}
+  {%- set dlr = ecu_shared_data.ecu_shared_data_raw %}
+
+  {%- if dlr.diag_variables %}
+  <DIAG-VARIABLES>
+    {%- for dv in dlr.diag_variables -%}
+    {{ pdv.printDiagVariable(dv)|indent(4) }}
+    {%- endfor -%}
+  </DIAG-VARIABLES>
+  {%- endif %}
+
+  {%- if dlr.variable_groups %}
+  <VARIABLE-GROUPS>
+    {%- for vg in dlr.variable_groups -%}
+    {{ pdv.printVariableGroup(vg)|indent(4) }}
+    {%- endfor -%}
+  </VARIABLE-GROUPS>
+  {%- endif %}
+
+</ECU-SHARED-DATA>
+{%- endmacro %}

odxtools/templates/macros/printEcuVariant.xml.jinja2

@@ -0,0 +1,53 @@
+{#- -*- mode: sgml; tab-width: 2; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printHierarchyElement.xml.jinja2') as phe %}
+{%- import('macros/printComparamRef.xml.jinja2') as pcom %}
+{%- import('macros/printParentRef.xml.jinja2') as pparref %}
+{%- import('macros/printEcuVariantPattern.xml.jinja2') as pvpat %}
+{%- import('macros/printDynDefinedSpec.xml.jinja2') as pdynspec %}
+
+{%- macro printEcuVariant(ecu_variant) -%}
+<ECU-VARIANT {{- phe.printHierarchyElementAttribs(ecu_variant) -}}>
+  {{ phe.printHierarchyElementSubtags(ecu_variant) | indent(2) }}
+  {%- set dlr = ecu_variant.diag_layer_raw %}
+
+  {%- if dlr.diag_variables %}
+  <DIAG-VARIABLES>
+    {%- for dv in dlr.diag_variables -%}
+    {{ pdv.printDiagVariable(dv)|indent(4) }}
+    {%- endfor -%}
+  </DIAG-VARIABLES>
+  {%- endif %}
+
+  {%- if dlr.variable_groups %}
+  <VARIABLE-GROUPS>
+    {%- for vg in dlr.variable_groups -%}
+    {{ pdv.printVariableGroup(vg)|indent(4) }}
+    {%- endfor -%}
+  </VARIABLE-GROUPS>
+  {%- endif %}
+
+  {%- if dlr.dyn_defined_spec %}
+  {{ pdynspec.printPrintDefinedSpec(dlr.dyn_defined_spec)|indent(4) }}
+  {%- endif %}
+
+  {%- if dlr.ecu_variant_patterns %}
+  <ECU-VARIANT-PATTERNS>
+    {%- for vp in dlr.ecu_variant_patterns -%}
+    {{ pvpat.printEcuVariantPattern(vp)|indent(4) }}
+    {%- endfor -%}
+  </ECU-VARIANT-PATTERNS>
+  {%- endif %}
+
+  {%- if dlr.parent_refs %}
+  <PARENT-REFS>
+    {%- for parent in dlr.parent_refs -%}
+    {{ pparref.printParentRef(parent)|indent(4) }}
+    {%- endfor %}
+  </PARENT-REFS>
+  {%- endif %}
+</ECU-VARIANT>
+{%- endmacro %}

odxtools/templates/macros/printEcuVariantPattern.xml.jinja2

@@ -9,7 +9,7 @@
 
 {%- macro printMatchingParameter(mp) -%}
 <MATCHING-PARAMETER>
-  <EXPECTED-VALUE>{{mp.expected_value}}</EXPECTED-VALUE>
+  <EXPECTED-VALUE>{{mp.expected_value | e}}</EXPECTED-VALUE>
   <DIAG-COMM-SNREF SHORT-NAME="{{mp.diag_comm_snref}}" />
   {#- TODO: OUT-PARAM-IF-SNPATHREF #}
   <OUT-PARAM-IF-SNREF SHORT-NAME="{{mp.out_param_if}}" />

odxtools/templates/macros/printElementId.xml.jinja2

@@ -3,12 +3,17 @@
  # SPDX-License-Identifier: MIT
 -#}
 
+{%- import('macros/printDescription.xml.jinja2') as pd %}
+
+{%- macro printElementIdAttribs(obj) -%}
+{#- #} {{- make_xml_attrib("ID", obj.odx_id.local_id) }}
+{#- #} {{- make_xml_attrib("OID", getattr(obj, "oid", none)) -}}
+{%- endmacro -%}
+
 {%- macro printElementIdSubtags(obj) -%}
 <SHORT-NAME>{{ obj.short_name }}</SHORT-NAME>
 {%- if obj.long_name %}
 <LONG-NAME>{{ obj.long_name|e }}</LONG-NAME>
 {%- endif %}
-{%- if obj.description %}
-<DESC>{{ obj.description }}</DESC>
-{%- endif %}
+{{- pd.printDescription(obj.description) }}
 {%- endmacro -%}

odxtools/templates/macros/printEndOfPdu.xml.jinja2

@@ -6,7 +6,7 @@
 {%- import('macros/printElementId.xml.jinja2') as peid %}
 
 {%- macro printEndOfPdu(eopdu) -%}
-<END-OF-PDU-FIELD ID="{{eopdu.odx_id.local_id}}">
+<END-OF-PDU-FIELD {{-peid.printElementIdAttribs(eopdu)}}>
  {{ peid.printElementIdSubtags(eopdu)|indent(1) }}
  <BASIC-STRUCTURE-REF ID-REF="{{eopdu.structure_ref.ref_id}}" />
  {%- if eopdu.max_number_of_items is not none %}

odxtools/templates/macros/printEnvDataDesc.xml.jinja2

@@ -6,7 +6,7 @@
 {%- import('macros/printElementId.xml.jinja2') as peid %}
 
 {%- macro printEnvDataDesc(env_data_desc) %}
-<ENV-DATA-DESC ID="{{env_data_desc.odx_id.local_id}}">
+<ENV-DATA-DESC {{-peid.printElementIdAttribs(env_data_desc)}}>
   {{ peid.printElementIdSubtags(env_data_desc)|indent(1) }}
   <PARAM-SNREF SHORT-NAME="{{env_data_desc.param_snref}}"/>
   <ENV-DATA-REFS>

odxtools/templates/macros/printFunctionalClass.xml.jinja2

@@ -7,7 +7,7 @@
 {%- import('macros/printElementId.xml.jinja2') as peid %}
 
 {%- macro printFunctionalClass(fc) -%}
-<FUNCT-CLASS ID="{{fc.odx_id.local_id}}">
+<FUNCT-CLASS {{-peid.printElementIdAttribs(fc)}}>
  {{ peid.printElementIdSubtags(fc)|indent(1) }}
 </FUNCT-CLASS>
 {%- endmacro -%}

odxtools/templates/macros/printFunctionalGroup.xml.jinja2

@@ -0,0 +1,40 @@
+{#- -*- mode: sgml; tab-width: 2; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printHierarchyElement.xml.jinja2') as phe %}
+{%- import('macros/printComparamRef.xml.jinja2') as pcom %}
+{%- import('macros/printParentRef.xml.jinja2') as pparref %}
+
+{%- macro printFunctionalGroup(functional_group) -%}
+<FUNCTIONAL-GROUP {{- phe.printHierarchyElementAttribs(functional_group) -}}>
+  {{ phe.printHierarchyElementSubtags(functional_group) | indent(2) }}
+
+  {%- set dlr = functional_group.functional_group_raw %}
+
+  {%- if dlr.diag_variables %}
+  <DIAG-VARIABLES>
+    {%- for dv in dlr.diag_variables -%}
+    {{ pdv.printDiagVariable(dv)|indent(4) }}
+    {%- endfor -%}
+  </DIAG-VARIABLES>
+  {%- endif %}
+
+  {%- if dlr.variable_groups %}
+  <VARIABLE-GROUPS>
+    {%- for vg in dlr.variable_groups -%}
+    {{ pdv.printVariableGroup(vg)|indent(4) }}
+    {%- endfor -%}
+  </VARIABLE-GROUPS>
+  {%- endif %}
+
+  {%- if dlr.parent_refs %}
+  <PARENT-REFS>
+    {%- for parent in dlr.parent_refs -%}
+    {{ pparref.printParentRef(parent)|indent(4) }}
+    {%- endfor %}
+  </PARENT-REFS>
+  {%- endif %}
+</FUNCTIONAL-GROUP>
+{%- endmacro %}

odxtools/templates/macros/printHierarchyElement.xml.jinja2

@@ -0,0 +1,24 @@
+{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printDiagLayer.xml.jinja2') as pdl %}
+{%- import('macros/printComparamRef.xml.jinja2') as pcom %}
+
+{%- macro printHierarchyElementAttribs(helem) -%}
+{{- pdl.printDiagLayerAttribs(helem) -}}
+{%- endmacro -%}
+
+{%- macro printHierarchyElementSubtags(helem) -%}
+{%- set dlr = helem.hierarchy_element_raw %}
+{{- pdl.printDiagLayerSubtags(helem) }}
+{%- if dlr.comparam_refs %}
+<COMPARAM-REFS>
+  {%- for cp in dlr.comparam_refs -%}
+  {{ pcom.printComparamRef(cp)|indent(2) }}
+  {%- endfor %}
+</COMPARAM-REFS>
+{%- endif %}
+
+{%- endmacro %}

odxtools/templates/macros/printLibrary.xml.jinja2

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

odxtools/templates/macros/printMux.xml.jinja2

@@ -4,9 +4,11 @@
 -#}
 
 {%- import('macros/printElementId.xml.jinja2') as peid %}
+{%- import('macros/printCompuMethod.xml.jinja2') as pcm %}
+{%- import('macros/printDOP.xml.jinja2') as pdop %}
 
 {%- macro printMux(mux) %}
-<MUX ID="{{mux.odx_id.local_id}}"
+<MUX {{-peid.printElementIdAttribs(mux)}}
      {{-make_bool_xml_attrib("IS-VISIBLE", mux.is_visible_raw)}}
      {#- #}>
   {{ peid.printElementIdSubtags(mux)|indent(1) }}
@@ -40,8 +42,8 @@
       {%- if case.structure_snref is not none %}
       <STRUCTURE-SNREF SHORT_NAME="{{case.structure_snref}}"/>
       {%- endif %}
-      <LOWER-LIMIT>{{case.lower_limit}}</LOWER-LIMIT>
-      <UPPER-LIMIT>{{case.upper_limit}}</UPPER-LIMIT>
+      {{ pcm.printLimit("LOWER-LIMIT", case.lower_limit) }}
+      {{ pcm.printLimit("UPPER-LIMIT", case.upper_limit) }}
     </CASE>
     {%- endfor %}
   </CASES>

odxtools/templates/macros/printOdxCategory.xml.jinja2

@@ -0,0 +1,28 @@
+{#- -*- 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/printCompanyData.xml.jinja2') as pcd -%}
+{%- import('macros/printSpecialData.xml.jinja2') as psd %}
+
+{%- macro printOdxCategoryAttribs(obj) -%}
+{#- #} {{- peid.printElementIdAttribs(obj) }}
+{%- endmacro -%}
+
+{%- macro printOdxCategorySubtags(obj) -%}
+{{ peid.printElementIdSubtags(obj) }}
+{%- if obj.admin_data %}
+{{pad.printAdminData(obj.admin_data)|indent(2)}}
+{%- endif %}
+{%- if obj.company_datas %}
+<COMPANY-DATAS>
+{%- for cd in obj.company_datas %}
+{{pcd.printCompanyData(cd)|indent(3)}}
+{%- endfor %}
+</COMPANY-DATAS>
+{%- endif %}
+{{- psd.printSpecialDataGroups(obj.sdgs)|indent(2, first=True) }}
+{%- endmacro -%}

odxtools/templates/macros/printParam.xml.jinja2

@@ -8,17 +8,17 @@
 {%- import('macros/printSpecialData.xml.jinja2') as psd %}
 
 {%- macro printParam(param) -%}
-{%- if param.semantic is not none %}
-{%-  set semattrib = " SEMANTIC=\""+param.semantic+"\"" -%}
-{%- else %}
-{%-  set semattrib = "" -%}
-{%- endif -%}
-{%- if param.parameter_type == "TABLE-KEY" and param.odx_id is not none  %}
-<PARAM {{semattrib}} ID="{{param.odx_id.local_id}}" xsi:type="{{param.parameter_type}}">
+{%- set semattrib = make_xml_attrib("SEMANTIC", param.semantic) -%}
+{%- if param.parameter_type == "TABLE-KEY"  %}
+<PARAM {{ semattrib }}
+       {{-peid.printElementIdAttribs(param)}}
+       xsi:type="{{param.parameter_type}}">
 {%- elif param.parameter_type == "SYSTEM" %}
-<PARAM SYSPARAM="{{param.sysparam}}" xsi:type="{{param.parameter_type}}">
+<PARAM {{ semattrib }}
+  {{- make_xml_attrib("SYSPARAM", param.sysparam) }}
+  xsi:type="{{param.parameter_type}}">
 {%- else %}
-<PARAM {{semattrib}} xsi:type="{{param.parameter_type}}">
+<PARAM {{ semattrib }} xsi:type="{{param.parameter_type}}">
 {%- endif%}
  {{ peid.printElementIdSubtags(param)|indent(1) }}
  {{- psd.printSpecialDataGroups(param.sdgs)|indent(1, first=True) }}
@@ -35,8 +35,6 @@
 {%- endif %}
 {%- if param.coded_value is defined %}
  <CODED-VALUE>{{param.coded_value}}</CODED-VALUE>
-{%- elif param.physical_constant_value_raw is defined %}
- <PHYS-CONSTANT-VALUE>{{param.physical_constant_value_raw}}</PHYS-CONSTANT-VALUE>
 {%- elif param.coded_values is defined %}
  <CODED-VALUES>
  {%- for coded_value in param.coded_values %}
@@ -44,19 +42,20 @@
  {%- endfor %}
  </CODED-VALUES>
 {%- endif %}
-{%- if param.physical_default_value_raw %}
- <PHYSICAL-DEFAULT-VALUE>{{param.physical_default_value_raw}}</PHYSICAL-DEFAULT-VALUE>
+{%- if param.physical_constant_value_raw is defined %}
+ <PHYS-CONSTANT-VALUE>{{param.physical_constant_value_raw}}</PHYS-CONSTANT-VALUE>
+{%- endif %}
+{%- if param.physical_default_value_raw is defined and param.physical_default_value_raw is not none %}
+ <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}}"/>
 {%- elif param.dop_snref %}
- <DOP-SNREF SN="{{param.dop_snref}}"/>
+ <DOP-SNREF SHORT-NAME="{{param.dop_snref}}"/>
 {%- elif param.diag_coded_type is defined %}
  {{pdop.printDiagCodedType(param.diag_coded_type)|indent(2)}}
-{%- elif param.parameter_type != "MATCHING-REQUEST-PARAM" %}
- {%- if param.bit_length is defined and param.bit_length is not none %}
-  <BIT-LENGTH>{{param.bit_length}}</BIT-LENGTH>
- {%- endif %}
+{%- elif param.bit_length is defined and param.bit_length is not none %}
+ <BIT-LENGTH>{{param.bit_length}}</BIT-LENGTH>
 {%- endif %}
 {%- if param.parameter_type == "TABLE-KEY" %}
  {%- if param.table_ref %}
@@ -77,7 +76,7 @@
  <TABLE-KEY-REF ID-REF="{{param.table_key_ref.ref_id}}"/>
  {%- endif %}
  {%- if param.table_key_snref %}
- <TABLE-KEY-SNREF SHORT-NAME="{{param.table_ref}}"/>
+ <TABLE-KEY-SNREF SHORT-NAME="{{param.table_key_snref}}"/>
  {%- endif %}
 {%- endif %}
 </PARAM>

odxtools/templates/macros/printProtStack.xml.jinja2

@@ -7,7 +7,7 @@
 {%- import('macros/printSpecialData.xml.jinja2') as psd %}
 
 {%- macro printProtStack(ps) %}
-<PROT-STACK ID="{{ps.odx_id.local_id}}">
+<PROT-STACK {{-peid.printElementIdAttribs(ps)}}>
  {{ peid.printElementIdSubtags(ps) | indent(1) }}
  <PDU-PROTOCOL-TYPE>{{ ps.pdu_protocol_type }}</PDU-PROTOCOL-TYPE>
  <PHYSICAL-LINK-TYPE>{{ ps.physical_link_type }}</PHYSICAL-LINK-TYPE>

odxtools/templates/macros/printProtocol.xml.jinja2

@@ -0,0 +1,30 @@
+{#- -*- mode: sgml; tab-width: 2; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printHierarchyElement.xml.jinja2') as phe %}
+{%- import('macros/printComparamRef.xml.jinja2') as pcom %}
+{%- import('macros/printParentRef.xml.jinja2') as pparref %}
+
+{%- macro printProtocol(protocol) -%}
+<PROTOCOL {{- phe.printHierarchyElementAttribs(protocol) -}}>
+  {{ phe.printHierarchyElementSubtags(protocol) | indent(2) }}
+  {%- 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}}" />
+
+  {%- if dlr.prot_stack_snref is not none %}
+  <PROT-STACK-SNREF SHORT-NAME="{{ dlr.prot_stack_snref }}" />
+  {%- endif %}
+
+  {%- if dlr.parent_refs %}
+  <PARENT-REFS>
+    {%- for parent in dlr.parent_refs -%}
+    {{ pparref.printParentRef(parent)|indent(4) }}
+    {%- endfor %}
+  </PARENT-REFS>
+  {%- endif %}
+</PROTOCOL>
+{%- endmacro %}

odxtools/templates/macros/printRequest.xml.jinja2

@@ -9,7 +9,7 @@
 {%- import('macros/printSpecialData.xml.jinja2') as psd %}
 
 {%- macro printRequest(request) -%}
-<REQUEST ID="{{request.odx_id.local_id}}">
+<REQUEST {{-peid.printElementIdAttribs(request)}}>
  {{ peid.printElementIdSubtags(request)|indent(1) }}
 {%- if request.parameters %}
  <PARAMS>

odxtools/templates/macros/printResponse.xml.jinja2

@@ -8,7 +8,7 @@
 {%- import('macros/printSpecialData.xml.jinja2') as psd %}
 
 {%- macro printResponse(resp, tag_name="POS-RESPONSE") -%}
-<{{tag_name}} ID="{{resp.odx_id.local_id}}">
+<{{tag_name}} {{-peid.printElementIdAttribs(resp)}}>
  {{ peid.printElementIdSubtags(resp)|indent(1) }}
 {%- if resp.parameters %}
  <PARAMS>

odxtools/templates/macros/printService.xml.jinja2

@@ -4,6 +4,7 @@
 -#}
 
 {%- import('macros/printDiagComm.xml.jinja2') as pdc %}
+{%- import('macros/printComparamRef.xml.jinja2') as pcom %}
 
 {%- macro printService(service) -%}
 <DIAG-SERVICE {{pdc.printDiagCommAttribs(service) | indent(1) }}
@@ -18,8 +19,8 @@
   {{pdc.printDiagCommSubtags(service) | indent(1, first=True) }}
   {%- if service.comparam_refs %}
   <COMPARAM-REFS>
-    {%- for ref in service.comparam_refs %}
-    <COMPARAM-REF ID-REF="{{ref.ref_id}}" />
+    {%- for cpref in service.comparam_refs %}
+    {{ pcom.printComparamRef(cpref)|indent(4) }}
     {%- endfor %}
   </COMPARAM-REFS>
   {%- endif%}

odxtools/templates/macros/printSingleEcuJob.xml.jinja2

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

odxtools/templates/macros/printSpecialData.xml.jinja2

@@ -17,7 +17,7 @@
 {%- endmacro %}
 
 {%- macro printSdgCaption(sdg_caption) %}
-<SDG-CAPTION ID="{{sdg_caption.odx_id.local_id}}">
+<SDG-CAPTION {{-peid.printElementIdAttribs(sdg_caption)}}>
  {{ peid.printElementIdSubtags(sdg_caption)|indent(1) }}
 </SDG-CAPTION>
 {%- endmacro %}

odxtools/templates/macros/printState.xml.jinja2

@@ -6,7 +6,7 @@
 {%- import('macros/printElementId.xml.jinja2') as peid %}
 
 {%- macro printState(state) -%}
-<STATE ID="{{state.odx_id.local_id}}">
+<STATE {{-peid.printElementIdAttribs(state)}}>
  {{ peid.printElementIdSubtags(state)|indent(1) }}
 </STATE>
 {%- endmacro -%}

odxtools/templates/macros/printStateChart.xml.jinja2

@@ -8,7 +8,7 @@
 {%- import('macros/printStateTransition.xml.jinja2') as pst %}
 
 {%- macro printStateChart(state_chart) -%}
-<STATE-CHART ID="{{state_chart.odx_id.local_id}}">
+<STATE-CHART {{-peid.printElementIdAttribs(state_chart)}}>
  {{ peid.printElementIdSubtags(state_chart)|indent(1) }}
  <SEMANTIC>{{state_chart.semantic}}</SEMANTIC>
  {%- if state_chart.state_transitions %}

odxtools/templates/macros/printStateTransition.xml.jinja2

@@ -6,7 +6,7 @@
 {%- import('macros/printElementId.xml.jinja2') as peid %}
 
 {%- macro printStateTransition(state_transition) -%}
-<STATE-TRANSITION ID="{{state_transition.odx_id.local_id}}">
+<STATE-TRANSITION {{-peid.printElementIdAttribs(state_transition)}}>
  {{ peid.printElementIdSubtags(state_transition)|indent(1) }}
  <SOURCE-SNREF SHORT-NAME="{{state_transition.source_snref}}" />
  <TARGET-SNREF SHORT-NAME="{{state_transition.target_snref}}" />

odxtools/templates/macros/printStaticField.xml.jinja2

@@ -0,0 +1,15 @@
+{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printElementId.xml.jinja2') as peid %}
+
+{%- macro printStaticField(sf) -%}
+<STATIC-FIELD {{-peid.printElementIdAttribs(sf)}}>
+ {{ peid.printElementIdSubtags(sf)|indent(1) }}
+ <BASIC-STRUCTURE-REF ID-REF="{{sf.structure_ref.ref_id}}" />
+ <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>
+{%- endmacro -%}

odxtools/templates/macros/printStructure.xml.jinja2

@@ -7,7 +7,7 @@
 {%- import('macros/printParam.xml.jinja2') as pp %}
 
 {%- macro printStructure(st) -%}
-<STRUCTURE ID="{{st.odx_id.local_id}}">
+<STRUCTURE {{-peid.printElementIdAttribs(st)}}>
  {{ peid.printElementIdSubtags(st)|indent(1) }}
 {%- if st.byte_size is not none %}
  <BYTE-SIZE>{{st.byte_size}}</BYTE-SIZE>