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

odxtools/templates/macros/printCompuMethod.xml.jinja2

@@ -0,0 +1,147 @@
+{#- -*- 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/printSpecialData.xml.jinja2') as psd %}
+{%- import('macros/printDescription.xml.jinja2') as pd %}
+
+
+{%- macro printLimit(tag_name, limit_obj) -%}
+{%- if limit_obj is not none %}
+<{{tag_name}}
+{%- if limit_obj.interval_type is not none %}
+  {{- make_xml_attrib("INTERVAL-TYPE", limit_obj.interval_type.value) }}
+  {%- endif %}
+{%- if limit_obj.value_raw is none %}
+  {#- #}/>
+{%- else %}
+  {#- #}>{{- limit_obj.value_raw | e }}</{{tag_name}}>
+{%- endif -%}
+{%- endif -%}
+{%- endmacro -%}
+
+{%- macro printCompuInverseValue(civ) -%}
+<COMPU-INVERSE-VALUE>
+  {%- if civ.v is not none %}
+  <V>{{civ.v}}</V>
+  {%- endif %}
+  {%- if civ.vt is not none %}
+  <VT>{{civ.vt | e}}</VT>
+  {%- endif %}
+</COMPU-INVERSE-VALUE>
+{%- endmacro -%}
+
+{%- macro printCompuDefaultValue(cdv) -%}
+<COMPU-DEFAULT-VALUE>
+  {%- if cdv.v is not none %}
+  <V>{{cdv.v}}</V>
+  {%- endif %}
+  {%- if cdv.vt is not none %}
+  <VT>{{cdv.vt | e}}</VT>
+  {%- endif %}
+  {%- if cdv.compu_inverse_value is not none %}
+  {{printCompuInverseValue(cdv.compu_inverse_value)}}
+  {%- endif %}
+</COMPU-DEFAULT-VALUE>
+{%- endmacro -%}
+
+{%- macro printCompuScale(cs) -%}
+<COMPU-SCALE>
+  {%- if cs.short_label is not none %}
+  <SHORT-LABEL>{{cs.short_label|e}}</SHORT-LABEL>
+  {%- endif %}
+  {{- pd.printDescription(cs.description)|indent(2, first=True) }}
+  {{- printLimit("LOWER-LIMIT", cs.lower_limit)|indent(2, first=True) }}
+  {{- printLimit("UPPER-LIMIT", cs.upper_limit)|indent(2, first=True) }}
+  {%- if cs.compu_inverse_value is not none %}
+  {{printCompuInverseValue(cs.compu_inverse_value)}}
+  {%- endif %}
+  {%- if cs.compu_const is not none %}
+  <COMPU-CONST>
+    {%- if cs.compu_const.v is not none %}
+    <V>{{cs.compu_const.v}}</V>
+    {%- endif %}
+    {%- if cs.compu_const.vt is not none %}
+    <VT>{{cs.compu_const.vt | e}}</VT>
+    {%- endif %}
+  </COMPU-CONST>
+  {%- endif %}
+  {%- set crc = cs.compu_rational_coeffs %}
+  {%- if crc is not none %}
+  <COMPU-RATIONAL-COEFFS>
+    <COMPU-NUMERATOR>
+      {%- for v in crc.numerators %}
+      <V>{{v}}</V>
+      {%- endfor %}
+    </COMPU-NUMERATOR>
+    {%- if crc.denominators %}
+    <COMPU-DENOMINATOR>
+      {%- for v in crc.denominators %}
+      <V>{{v}}</V>
+      {%- endfor %}
+    </COMPU-DENOMINATOR>
+    {%- endif %}
+  </COMPU-RATIONAL-COEFFS>
+  {%- endif %}
+</COMPU-SCALE>
+{%- endmacro -%}
+
+{%- macro printProgCode(pc) -%}
+<PROG-CODE>
+  <CODE-FILE>{{pc.code_file}}</CODE-FILE>
+  {%- if pc.encryption is not none %}
+  <ENCRYPTION>{{pc.encryption}}</ENCRYPTION>
+  {%- endif %}
+  <SYNTAX>{{pc.syntax}}</SYNTAX>
+  <REVISION>{{pc.revision}}</REVISION>
+  {%- if pc.entry_point is not none %}
+  <ENTRYPOINT>{{pc.entrypoint}}</ENTRYPOINT>
+  {%- endif %}
+  {%- if pc.library_refs %}
+  <LIBRARY-REFS>
+    {%- for libref in pc.library_refs %}
+    <LIBRARY-REF ID-REF="{{libref.ref_id}}" />
+    {%- endfor %}
+  </LIBRARY-REFS>
+  {%- endif %}
+</PROG-CODE>
+{%- endmacro -%}
+
+{%- macro printCompuMethod(cm) -%}
+<COMPU-METHOD>
+ <CATEGORY>{{cm.category.value}}</CATEGORY>
+ {%- if cm.compu_internal_to_phys is not none %}
+ <COMPU-INTERNAL-TO-PHYS>
+  <COMPU-SCALES>
+    {%- for cs in cm.compu_internal_to_phys.compu_scales %}
+    {{ printCompuScale(cs) | indent(3) }}
+    {%- endfor %}
+  </COMPU-SCALES>
+  {%- if cm.compu_internal_to_phys.prog_code is not none %}
+  {{ printProgCode(cm.compu_internal_to_phys.prog_code) | indent(3) }}
+  {%- endif %}
+  {%- if cm.compu_internal_to_phys.compu_default_value is not none %}
+  {{ printCompuDefaultValue(cm.compu_internal_to_phys.compu_default_value) | indent(3) }}
+  {%- endif %}
+ </COMPU-INTERNAL-TO-PHYS>
+ {%- endif %}
+ {%- if cm.compu_phys_to_internal is not none %}
+ <COMPU-PHYS-TO-INTERNAL>
+  <COMPU-SCALES>
+    {%- for cs in cm.compu_phys_to_internal.compu_scales %}
+    {{ printCompuScale(cs) | indent(3) }}
+    {%- endfor %}
+  </COMPU-SCALES>
+  {%- if cm.compu_phys_to_internal.prog_code is not none %}
+  {{ printProgCode(cm.compu_phys_to_internal.prog_code) | indent(3) }}
+  {%- endif %}
+  {%- if cm.compu_phys_to_internal.compu_default_value is not none %}
+  {{ printCompuDefaultValue(cm.compu_phys_to_internal.compu_default_value) | indent(3) }}
+  {%- endif %}
+ </COMPU-PHYS-TO-INTERNAL>
+ {%- endif %}
+</COMPU-METHOD>
+{%- endmacro -%}

odxtools/templates/macros/printDOP.xml.jinja2

@@ -6,6 +6,9 @@
 {%- import('macros/printElementId.xml.jinja2') as peid %}
 {%- import('macros/printAdminData.xml.jinja2') as pad %}
 {%- import('macros/printSpecialData.xml.jinja2') as psd %}
+{%- import('macros/printCompuMethod.xml.jinja2') as pcm %}
+{%- import('macros/printDescription.xml.jinja2') as pd %}
+
 
 {%- macro printDiagCodedType(dct) -%}
 <DIAG-CODED-TYPE {{-make_xml_attrib("BASE-DATA-TYPE", dct.base_data_type.value)}}
@@ -30,7 +33,6 @@
 </DIAG-CODED-TYPE>
 {%- endmacro -%}
 
-
 {%- macro printPhysicalType(physical_type) %}
 {%- if physical_type.display_radix is not none %}
 <PHYSICAL-TYPE BASE-DATA-TYPE="{{physical_type.base_data_type.value}}" DISPLAY-RADIX="{{physical_type.display_radix.name}}" />
@@ -43,27 +45,14 @@
 {%- endif %}
 {%- endmacro -%}
 
-{%- macro printLimitValue(lv) -%}
-{%- if hasattr(lv, 'hex') -%}
-{#- bytes or bytarray limit #}
-{{lv.hex()}}
-{%- else -%}
-{{lv}}
-{%- endif -%}
-{%- endmacro -%}
-
 {%- macro printScaleConstr(sc) %}
 <SCALE-CONSTR VALIDITY="{{sc.validity.value}}">
   {%- if sc.short_label is not none %}
   <SHORT-LABEL>{{sc.short_label|e}}</SHORT-LABEL>
   {%- endif %}
-  {%- if sc.description and sc.description.strip() %}
-  <DESC>
-    {{sc.description}}
-  </DESC>
-  {%- endif %}
-  <LOWER-LIMIT>{{printLimitValue(sc.lower_limit.value)}}</LOWER-LIMIT>
-  <UPPER-LIMIT>{{printLimitValue(sc.upper_limit.value)}}</UPPER-LIMIT>
+  {{pd.printDescription(sc.description)}}
+  {{pcm.printLimit("LOWER-LIMIT", sc.lower_limit) }}
+  {{pcm.printLimit("UPPER-LIMIT", sc.upper_limit) }}
 </SCALE-CONSTR>
 {%- endmacro -%}
 
@@ -73,12 +62,8 @@
 {%- else %}
 <INTERNAL-CONSTR>
 {%- endif %}
-  {%- if ic.lower_limit %}
-  <LOWER-LIMIT>{{printLimitValue(ic.lower_limit.value)}}</LOWER-LIMIT>
-  {%- endif %}
-  {%- if ic.upper_limit %}
-  <UPPER-LIMIT>{{printLimitValue(ic.upper_limit.value)}}</UPPER-LIMIT>
-  {%- endif %}
+  {{pcm.printLimit("LOWER-LIMIT", ic.lower_limit) }}
+  {{pcm.printLimit("UPPER-LIMIT", ic.upper_limit) }}
   {%- if ic.scale_constrs %}
   <SCALE-CONSTRS>
   {%- for sc in ic.scale_constrs %}
@@ -93,117 +78,6 @@
 {%- endif %}
 {%- endmacro -%}
 
-{%- macro printCompuMethod(cm) -%}
-<COMPU-METHOD>
- <CATEGORY>{{cm.category}}</CATEGORY>
- {%- if cm.category == "TEXTTABLE" %}
- <COMPU-INTERNAL-TO-PHYS>
-  <COMPU-SCALES>
-  {%- for cs in cm.internal_to_phys %}
-   <COMPU-SCALE>
-   {%- if cs.short_label and cs.short_label.strip() %}
-    <SHORT-LABEL>{{cs.short_label|e}}</SHORT-LABEL>
-   {%- endif %}
-   {%- if cs.description and cs.description.strip() %}
-    <DESC>
-    {{cs.description}}
-    </DESC>
-   {%- endif %}
-   {%- if cs.lower_limit is not none %}
-     <LOWER-LIMIT>{{printLimitValue(cs.lower_limit.value)}}</LOWER-LIMIT>
-   {%- endif %}
-   {%- if cs.upper_limit is not none %}
-     <UPPER-LIMIT>{{printLimitValue(cs.upper_limit.value)}}</UPPER-LIMIT>
-   {%- endif %}
-   {%- if cs.compu_inverse_value is not none %}
-    <COMPU-INVERSE-VALUE>
-     <V>{{cs.compu_inverse_value}}</V>
-    </COMPU-INVERSE-VALUE>
-   {%- endif %}
-    <COMPU-CONST>
-     <VT>{{cs.compu_const | e}}</VT>
-    </COMPU-CONST>
-   </COMPU-SCALE>
-  {%- endfor %}
-  </COMPU-SCALES>
-  {%- if cm.compu_default_value is not none %}
-  <COMPU-DEFAULT-VALUE>
-    <VT>{{cm.compu_default_value.compu_const}}</VT>
-    {%- if cm.compu_default_value.compu_inverse_value is not none %}
-    <COMPU-INVERSE-VALUE>
-     <V>{{cm.compu_default_value.compu_inverse_value}}</V>
-    </COMPU-INVERSE-VALUE>
-    {%- endif %}
-  </COMPU-DEFAULT-VALUE>
-  {%- endif %}
- </COMPU-INTERNAL-TO-PHYS>
- {%- elif cm.category == "LINEAR" %}
- <COMPU-INTERNAL-TO-PHYS>
-		<COMPU-SCALES>
-			<COMPU-SCALE>
-   {%- if cm.internal_lower_limit is not none and cm.internal_lower_limit.interval_type.value != "INFINITE" %}
-				<LOWER-LIMIT>{{printLimitValue(cm.internal_lower_limit.value)}}</LOWER-LIMIT>
-   {%- endif %}
-   {%- if cm.internal_upper_limit is not none and cm.internal_upper_limit.interval_type.value != "INFINITE" %}
-				<UPPER-LIMIT>{{printLimitValue(cm.internal_upper_limit.value)}}</UPPER-LIMIT>
-   {%- endif %}
-				<COMPU-RATIONAL-COEFFS>
-					<COMPU-NUMERATOR>
-						<V>{{cm.offset}}</V>
-						<V>{{cm.factor}}</V>
-					</COMPU-NUMERATOR>
-   {%- if cm.denominator != 1 %}
-					<COMPU-DENOMINATOR>
-							<V>{{cm.denominator}}</V>
-					</COMPU-DENOMINATOR>
-   {%- endif %}
-				</COMPU-RATIONAL-COEFFS>
-			</COMPU-SCALE>
-		</COMPU-SCALES>
-	</COMPU-INTERNAL-TO-PHYS>
- {%- elif cm.category == "SCALE-LINEAR" %}
- <COMPU-INTERNAL-TO-PHYS>
-		<COMPU-SCALES>
-  {%- for lm in cm.linear_methods %}
- 		<COMPU-SCALE>
-   {%- if lm.internal_lower_limit is not none and lm.internal_lower_limit.interval_type.value != "INFINITE" %}
-				<LOWER-LIMIT>{{printLimitValue(lm.internal_lower_limit.value)}}</LOWER-LIMIT>
-   {%- endif %}
-   {%- if lm.internal_upper_limit is not none and lm.internal_upper_limit.interval_type.value != "INFINITE" %}
-				<UPPER-LIMIT>{{printLimitValue(lm.internal_upper_limit.value)}}</UPPER-LIMIT>
-   {%- endif %}
-				<COMPU-RATIONAL-COEFFS>
-					<COMPU-NUMERATOR>
-							<V>{{lm.offset}}</V>
-							<V>{{lm.factor}}</V>
-					</COMPU-NUMERATOR>
-   {%- if lm.denominator != 1 %}
-					<COMPU-DENOMINATOR>
-							<V>{{lm.denominator}}</V>
-					</COMPU-DENOMINATOR>
-   {%- endif %}
-				</COMPU-RATIONAL-COEFFS>
-			</COMPU-SCALE>
-  {%- endfor %}
-		</COMPU-SCALES>
- </COMPU-INTERNAL-TO-PHYS>
- {%- elif cm.category == "TAB-INTP" %}
- <COMPU-INTERNAL-TO-PHYS>
-  <COMPU-SCALES>
-  {%- for idx in range( cm.internal_points | length ) %}
-   <COMPU-SCALE>
-    <LOWER-LIMIT INTERVAL-TYPE="CLOSED">{{ printLimitValue(cm.internal_points[idx]) }}</LOWER-LIMIT>
-    <COMPU-CONST>
-     <V>{{ cm.physical_points[idx] }}</V>
-    </COMPU-CONST>
-   </COMPU-SCALE>
-  {%- endfor %}
-  </COMPU-SCALES>
- </COMPU-INTERNAL-TO-PHYS>
- {%- endif %}
-</COMPU-METHOD>
-{%- endmacro -%}
-
 {%- macro printDopBaseAttribs(dop) %}
 {{- make_xml_attrib("ID", dop.odx_id.local_id) }}
 {{- make_xml_attrib("OID", dop.oid) }}
@@ -229,7 +103,7 @@
 {%- macro printDataObjectProp(dop) %}
 <DATA-OBJECT-PROP {{- printDopBaseAttribs(dop) }}>
  {{- printDopBaseSubtags(dop) }}
- {{- printCompuMethod(dop.compu_method)|indent(1) }}
+ {{- pcm.printCompuMethod(dop.compu_method)|indent(1) }}
  {{- printDiagCodedType(dop.diag_coded_type)|indent(1) }}
  {{- printPhysicalType(dop.physical_type)|indent(1) }}
  {%- if dop.internal_constr %}
@@ -250,13 +124,13 @@
  {{- printDopBaseSubtags(dop)|indent(1) }}
  {{- printDiagCodedType(dop.diag_coded_type)|indent(1) }}
  {{- printPhysicalType(dop.physical_type)|indent(1) }}
- {{- printCompuMethod(dop.compu_method)|indent(1) }}
+ {{- pcm.printCompuMethod(dop.compu_method)|indent(1) }}
  <DTCS>
  {%- for dtc in dop.dtcs_raw %}
  {%- if hasattr(dtc, "ref_id") %}
   <DTC-REF ID-REF="{{dtc.ref_id}}" />
  {%- else %}
-  <DTC ID="{{dtc.odx_id.local_id}}">
+  <DTC {{-peid.printElementIdAttribs(dtc)}}>
    <SHORT-NAME>{{dtc.short_name}}</SHORT-NAME>
    <TROUBLE-CODE>{{dtc.trouble_code}}</TROUBLE-CODE>
   {%- if dtc.display_trouble_code is not none   %}
@@ -271,5 +145,21 @@
  {%- endif %}
  {%- endfor %}
  </DTCS>
+ {%- if dop.linked_dtc_dops_raw   %}
+ <LINKED-DTC-DOPS>
+   {%- for linked_dtc_dop in dop.linked_dtc_dops_raw %}
+   <LINKED-DTC-DOP>
+     {%- if linked_dtc_dop.not_inherited_dtc_snrefs  %}
+     <NOT-INHERITED-DTC-SNREFS>
+       {%- for ni_snref in linked_dtc_dop.not_inherited_dtc_snrefs %}
+       <NOT-INHERITED-DTC-SNREF SHORT-NAME="{{ni_snref}}" />
+       {%- endfor %}
+     </NOT-INHERITED-DTC-SNREFS>
+     {%- endif %}
+     <DTC-DOP-REF ID-REF="{{linked_dtc_dop.dtc_dop_ref.ref_id}}" />
+   </LINKED-DTC-DOP>
+   {%- endfor %}
+ </LINKED-DTC-DOPS>
+ {%- endif %}
 </DTC-DOP>
 {%- endmacro -%}

odxtools/templates/macros/printDescription.xml.jinja2

@@ -0,0 +1,18 @@
+{#- -*- mode: sgml; tab-width: 1; sgml-basic-offset: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- macro printDescription(desc) %}
+{%- if desc is not none %}
+<DESC {{- make_xml_attrib("TI", desc.text_identifier)}}>{{desc.text}}
+{%- if desc.external_docs %}
+<EXTERNAL-DOCS>
+ {%- for ed in desc.external_docs %}
+ <EXTERNAL-DOC HREF="{{ed}}" />
+ {%- endfor %}
+</EXTERNAL-DOCS>
+{%- endif -%}
+</DESC>
+{%- endif %}
+{%- endmacro %}

odxtools/templates/macros/printDiagComm.xml.jinja2

@@ -9,7 +9,7 @@
 {%- import('macros/printSpecialData.xml.jinja2') as psd %}
 
 {%- macro printDiagCommAttribs(dc) -%}
-ID="{{dc.odx_id.local_id}}"
+{{-peid.printElementIdAttribs(dc)}}
 {{-make_xml_attrib("SEMANTIC", dc.semantic)}}
 {{-make_xml_attrib("DIAGNOSTIC-CLASS", dc.diagnostic_class and dc.diagnostic_class.value)}}
 {{-make_bool_xml_attrib("IS-MANDATORY", dc.is_mandatory_raw)}}

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 -%}