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

odxtools/templates/macros/printDiagLayer.xml.jinja2

@@ -0,0 +1,222 @@
+{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printElementId.xml.jinja2') as peid %}
+{%- import('macros/printDOP.xml.jinja2') as pdop %}
+{%- import('macros/printTable.xml.jinja2') as pt %}
+{%- import('macros/printFunctionalClass.xml.jinja2') as pfc %}
+{%- import('macros/printStructure.xml.jinja2') as pst %}
+{%- import('macros/printEndOfPdu.xml.jinja2') as peopdu %}
+{%- import('macros/printStaticField.xml.jinja2') as psf %}
+{%- import('macros/printDynamicLengthField.xml.jinja2') as pdlf %}
+{%- import('macros/printDynamicEndmarkerField.xml.jinja2') as pdemf %}
+{%- import('macros/printMux.xml.jinja2') as pm %}
+{%- import('macros/printEnvData.xml.jinja2') as ped %}
+{%- import('macros/printEnvDataDesc.xml.jinja2') as pedd %}
+{%- import('macros/printUnitSpec.xml.jinja2') as punit %}
+{%- import('macros/printService.xml.jinja2') as ps %}
+{%- import('macros/printSingleEcuJob.xml.jinja2') as psej %}
+{%- import('macros/printRequest.xml.jinja2') as prq %}
+{%- import('macros/printResponse.xml.jinja2') as presp %}
+{%- import('macros/printStateChart.xml.jinja2') as psc %}
+{%- import('macros/printAudience.xml.jinja2') as paud %}
+{%- import('macros/printSubComponent.xml.jinja2') as psubcomp %}
+{%- import('macros/printLibrary.xml.jinja2') as plib %}
+{%- import('macros/printSpecialData.xml.jinja2') as psd %}
+{%- import('macros/printEcuVariantPattern.xml.jinja2') as pvpat %}
+{%- import('macros/printAdminData.xml.jinja2') as pad %}
+
+{%- macro printDiagLayerAttribs(dl) -%}
+{#- #} {{-peid.printElementIdAttribs(dl)}}{# -#}
+{%- endmacro -%}
+
+{%- macro printDiagLayerSubtags(dl) -%}
+{%- set dlr = dl.diag_layer_raw %}
+{{ peid.printElementIdSubtags(dlr)|indent(1) }}
+{%- if dlr.admin_data is not none %}
+{{ pad.printAdminData(dlr.admin_data) }}
+{%- endif %}
+{%- if dlr.company_datas %}
+<COMPANY-DATAS>
+{%- for cd in dlr.company_datas %}
+{{ pcd.printCompanyData(cd) }}
+{%- endfor %}
+</COMPANY-DATAS>
+{%- endif %}
+{%- if dlr.functional_classes %}
+<FUNCT-CLASSS>
+  {%- for fc in dlr.functional_classes %}
+  {{ pfc.printFunctionalClass(fc)|indent(3) }}
+  {%- endfor%}
+</FUNCT-CLASSS>
+{%- endif %}
+{%- if dlr.diag_data_dictionary_spec is not none %}
+{%- set ddds = dlr.diag_data_dictionary_spec  %}
+<DIAG-DATA-DICTIONARY-SPEC>
+  {%- if ddds.dtc_dops  %}
+  <DTC-DOPS>
+    {%- for dop in ddds.dtc_dops -%}
+    {{ pdop.printDtcDop(dop)|indent(3) }}
+    {%- endfor %}
+  </DTC-DOPS>
+  {%- endif %}
+  {%- if ddds.env_data_descs  %}
+  <ENV-DATA-DESCS>
+    {%- for env_data_desc in ddds.env_data_descs -%}
+    {{ pedd.printEnvDataDesc(env_data_desc)|indent(3) }}
+    {%- endfor %}
+  </ENV-DATA-DESCS>
+  {%- endif %}
+  {%- if ddds.data_object_props %}
+  <DATA-OBJECT-PROPS>
+    {%- for dop in ddds.data_object_props %}
+    {{- pdop.printDataObjectProp(dop)|indent(3) }}
+    {%- endfor %}
+  </DATA-OBJECT-PROPS>
+  {%- endif %}
+  {%- if ddds.structures %}
+  <STRUCTURES>
+    {%- for st in ddds.structures %}
+    {{ pst.printStructure(st)|indent(3) }}
+    {%- endfor %}
+  </STRUCTURES>
+  {%- endif %}
+  {%- if ddds.static_fields %}
+  <STATIC-FIELDS>
+    {%- for sf in ddds.static_fields %}
+    {{ psf.printStaticField(sf)|indent(3) }}
+    {%- endfor %}
+  </STATIC-FIELDS>
+  {%- endif %}
+  {%- if ddds.dynamic_length_fields %}
+  <DYNAMIC-LENGTH-FIELDS>
+    {%- for dlf in ddds.dynamic_length_fields %}
+    {{ pdlf.printDynamicLengthField(dlf)|indent(3) }}
+    {%- endfor %}
+  </DYNAMIC-LENGTH-FIELDS>
+  {%- endif %}
+  {%- if ddds.dynamic_endmarker_fields %}
+  <DYNAMIC-ENDMARKER-FIELDS>
+    {%- for demf in ddds.dynamic_endmarker_fields %}
+    {{ pdemf.printDynamicEndmarkerField(demf)|indent(3) }}
+    {%- endfor %}
+  </DYNAMIC-ENDMARKER-FIELDS>
+  {%- endif %}
+  {%- if ddds.end_of_pdu_fields %}
+  <END-OF-PDU-FIELDS>
+    {%- for eopdu in ddds.end_of_pdu_fields %}
+    {{ peopdu.printEndOfPdu(eopdu)|indent(3) }}
+    {%- endfor %}
+  </END-OF-PDU-FIELDS>
+  {%- endif %}
+  {%- if ddds.muxs %}
+  <MUXS>
+    {%- for mux in ddds.muxs %}
+    {{ pm.printMux(mux)|indent(3) }}
+    {%- endfor %}
+  </MUXS>
+  {%- endif %}
+  {%- if ddds.env_datas %}
+  <ENV-DATAS>
+    {%- for env_data in ddds.env_datas %}
+    {{ ped.printEnvData(env_data)|indent(3) }}
+    {%- endfor %}
+  </ENV-DATAS>
+  {%- endif %}
+  {%- if ddds.unit_spec %}
+  {{ punit.printUnitSpec(ddds.unit_spec)|indent(2) }}
+  {%- endif %}
+  {%- if ddds.tables  %}
+  <TABLES>
+    {%- for table in ddds.tables -%}
+    {{ pt.printTable(table)|indent(3) }}
+    {%- endfor %}
+  </TABLES>
+  {{- psd.printSpecialDataGroups(ddds.sdgs)|indent(2, first=True) }}
+  {%- endif %}
+</DIAG-DATA-DICTIONARY-SPEC>
+{%- endif %}
+{%- if dlr.diag_comms_raw %}
+<DIAG-COMMS>
+  {%- for dc in dlr.diag_comms_raw %}
+
+  {#- use some serious duck typing to determine the kind of diag-comm
+  #- object. this would not be necessary if something like
+  #- isinstance() was available in jinja...
+  #}
+
+  {%- if hasattr(dc, "ref_id") %}
+  {#- -> reference to a diag-comm object #}
+  <DIAG-COMM-REF ID-REF="{{dc.ref_id}}" />
+  {%- elif hasattr(dc, "request") %}
+  {#- -> service #}
+  {{ ps.printService(dc)|indent(2) }}
+  {%- elif hasattr(dc, "prog_codes") %}
+  {#- -> single-ECU job #}
+  {{ psej.printSingleEcuJob(dc)|indent(2) }}
+  {%- else %}
+  <!-- Error: database contains an unrecognized DIAG-COMM. -->
+  {%- endif %}
+  {%- endfor %}
+</DIAG-COMMS>
+{%- endif %}
+{%- if dlr.requests %}
+<REQUESTS>
+  {%- for req in dlr.requests %}
+  {{ prq.printRequest(req)|indent(2) }}
+  {%- endfor %}
+</REQUESTS>
+{%- endif %}
+{%- if dlr.positive_responses %}
+<POS-RESPONSES>
+  {%- for resp in dlr.positive_responses %}
+  {{ presp.printResponse(resp, "POS-RESPONSE")|indent(2) }}
+  {%- endfor %}
+</POS-RESPONSES>
+{%- endif %}
+{%- if dlr.negative_responses %}
+<NEG-RESPONSES>
+  {%- for resp in dlr.negative_responses %}
+  {{ presp.printResponse(resp, "NEG-RESPONSE")|indent(2) }}
+  {%- endfor %}
+</NEG-RESPONSES>
+{%- endif %}
+{%- if dlr.global_negative_responses %}
+<GLOBAL-NEG-RESPONSES>
+  {%- for resp in dlr.global_negative_responses %}
+  {{ presp.printResponse(resp, "GLOBAL-NEG-RESPONSE")|indent(2) }}
+  {%- endfor %}
+</GLOBAL-NEG-RESPONSES>
+{%- endif %}
+{%- if dlr.state_charts %}
+<STATE-CHARTS>
+  {%- for sc in dlr.state_charts %}
+  {{ psc.printStateChart(sc) }}
+  {%- endfor %}
+</STATE-CHARTS>
+{%- endif %}
+{%- if dlr.additional_audiences %}
+<ADDITIONAL-AUDIENCES>
+  {%- for audience in dlr.additional_audiences %}
+  {{ paud.printAdditionalAudience(audience)|indent(2) }}
+  {%- endfor %}
+</ADDITIONAL-AUDIENCES>
+{%- endif %}
+{%- if dlr.sub_components %}
+<SUB-COMPONENTS>
+  {%- for sc in dlr.sub_components %}
+  {{ psubcomp.printSubComponent(sc)|indent(2) }}
+  {%- endfor %}
+</SUB-COMPONENTS>
+{%- endif %}
+{%- if dlr.libraries %}
+<LIBRARYS>
+  {%- for lib in dlr.libraries %}
+  {{ plib.printLibrary(lib)|indent(2) }}
+  {%- endfor %}
+</LIBRARYS>
+{%- endif %}
+{{- psd.printSpecialDataGroups(dlr.sdgs)|indent(0, first=True) }}
+{%- endmacro -%}

odxtools/templates/macros/printDiagVariable.xml.jinja2

@@ -0,0 +1,66 @@
+{#- -*- mode: sgml; tab-width: 2; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+{%- import('macros/printElementId.xml.jinja2') as peid %}
+{%- import('macros/printAdminData.xml.jinja2') as pad %}
+{%- import('macros/printDescription.xml.jinja2') as pd %}
+
+{%- macro printDiagVariable(diag_var) -%}
+<DIAG-VARIABLE {{-peid.printElementIdAttribs(diag_var)}}>
+  {{ peid.printElementIdSubtags(diag_variable)|indent(2) }}
+  {%- 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 }}" />
+  {%- if diag_variable.sw_variables %}
+  <SW-VARIABLES>
+    {%- for sw_var in diag_variable.sw_variables %}
+    <SW-VARIABLE {{-peid.printElementIdAttribs(sw_var)}}>
+      {{ peid.printElementIdSubtags(sw_var)|indent(6) }}
+      {%- if sw_var.origin is not none %}
+      <ORIGIN>{{ sw_var.origin }}</ORIGIN>
+      {%- endif %}
+    </SW-VARIABLE>
+    {%- endfor %}
+  </SW-VARIABLES>
+  {%- endif %}
+  {%- if diag_variable.comm_relations %}
+  <COMM-RELATIONS>
+    {%- for comm_relation in diag_variable.comm_relations %}
+    <COMM-RELATION>
+      {{ 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}}" />
+      {%- 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}}" />
+      {%- 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}}" />
+      {%- endif %}
+      {%- if comm_relation.out_param_if_snref is not none %}
+      <OUT-PARAM-IF-SNREF SHORT-NAME="{{comm_relation.out_param_if_snref}}" />
+      {%- endif %}
+      {%- if comm_relation.value_type_raw is not none %}
+      <VALUE-TYPE>{{comm_relation.value_type_raw.value}}</VALUE-TYPE>
+      {%- endif %}
+    <COMM-RELATION>
+    {%- endfor %}
+  </COMM-RELATIONS>
+  {%- endif %}
+</DIAG-VARIABLE>
+{%- endmacro -%}
+
+{%- macro printVariableGroup(var_group) -%}
+<VARIABLE-GROUP {{-peid.printElementIdAttribs(var_group)}}>
+  {{ peid.printElementIdSubtags(diag_variable)|indent(2) }}
+</VARIABLE-GROUP>
+{%- endmacro -%}

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,10 +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) }}
@@ -41,8 +42,8 @@
       {%- if case.structure_snref is not none %}
       <STRUCTURE-SNREF SHORT_NAME="{{case.structure_snref}}"/>
       {%- endif %}
-      {{ pdop.printLimit("LOWER-LIMIT", case.lower_limit) }}
-      {{ pdop.printLimit("UPPER-LIMIT", case.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 -%}