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

odxtools/templates/macros/printBaseVariant.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 %}
+
+{%- macro printBaseVariant(base_variant) -%}
+<BASE-VARIANT {{- phe.printHierarchyElementAttribs(base_variant) -}}>
+  {{ phe.printHierarchyElementSubtags(base_variant) | indent(2) }}
+  {%- set dlr = base_variant.base_variant_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.base_variant_patterns %}
+  <BASE-VARIANT-PATTERNS>
+    {%- for vp in dlr.base_variant_patterns -%}
+    {{ pvpat.printBaseVariantPattern(vp)|indent(4) }}
+    {%- endfor -%}
+  </BASE-VARIANT-PATTERNS>
+  {%- endif %}
+#}
+
+  {%- if dlr.parent_refs %}
+  <PARENT-REFS>
+    {%- for parent in dlr.parent_refs -%}
+    {{ pparref.printParentRef(parent)|indent(4) }}
+    {%- endfor %}
+  </PARENT-REFS>
+  {%- endif %}
+</BASE-VARIANT>
+{%- endmacro %}

odxtools/templates/macros/printCompanyData.xml.jinja2

@@ -5,9 +5,10 @@
 
 {%- import('macros/printElementId.xml.jinja2') as peid %}
 {%- import('macros/printSpecialData.xml.jinja2') as psd %}
+{%- import('macros/printDescription.xml.jinja2') as pd %}
 
 {%- macro printCompanyData(company_data) %}
-<COMPANY-DATA ID="{{company_data.odx_id.local_id}}">
+<COMPANY-DATA {{-peid.printElementIdAttribs(company_data)}}>
  {{ peid.printElementIdSubtags(company_data)|indent(1) }}
  {%- if company_data.roles is not none %}
  <ROLES>
@@ -19,7 +20,7 @@
  {%- if company_data.team_members is not none %}
  <TEAM-MEMBERS>
   {%- for team_member in company_data.team_members %}
-  <TEAM-MEMBER ID="{{team_member.odx_id.local_id}}">
+  <TEAM-MEMBER {{-peid.printElementIdAttribs(team_member)}}>
    {{ peid.printElementIdSubtags(team_member)|indent(3) }}
    {%- if team_member.roles is not none %}
    <ROLES>
@@ -81,11 +82,7 @@
      {%- endif %}
     </XDOC>
     {%- endif %}
-    {%- if rd.description is not none %}
-    <DESC>
-{{rd.description}}
-    </DESC>
-    {%- endif %}
+    {{pd.printDescription(rd.description)}}
    </RELATED-DOC>
   {%- endfor %}
   </RELATED-DOCS>

odxtools/templates/macros/printComparam.xml.jinja2

@@ -38,19 +38,21 @@
 {%- endmacro %}
 
 {%- macro printSimpleComparam(cp) %}
-<COMPARAM ID="{{cp.odx_id.local_id}}"
+<COMPARAM {{-peid.printElementIdAttribs(cp)}}
           PARAM-CLASS="{{cp.param_class}}"
           CPTYPE="{{cp.cptype.value}}"
          {{make_xml_attrib("DISPLAY-LEVEL", cp.display_level)}}{#- #}
           CPUSAGE="{{cp.cpusage.value}}">
   {{ peid.printElementIdSubtags(cp)|indent(1) }}
-  <PHYSICAL-DEFAULT-VALUE>{{cp.physical_default_value}}</PHYSICAL-DEFAULT-VALUE>
+  {%- if cp.physical_default_value is not none %}
+  <PHYSICAL-DEFAULT-VALUE>{{cp.physical_default_value | e}}</PHYSICAL-DEFAULT-VALUE>
+  {%- endif %}
  <DATA-OBJECT-PROP-REF ID-REF="{{cp.dop_ref.ref_id}}" />
 </COMPARAM>
 {%- endmacro %}
 
 {%- macro printComplexComparam(cp) %}
-<COMPLEX-COMPARAM ID="{{cp.odx_id.local_id}}"
+<COMPLEX-COMPARAM {{-peid.printElementIdAttribs(cp)}}
                   PARAM-CLASS="{{cp.param_class}}"
                   CPTYPE="{{cp.cptype.value}}"
                  {{make_xml_attrib("DISPLAY-LEVEL", cp.display_level)}}{#- #}
@@ -61,7 +63,7 @@
  {%- for sub_cp in cp.subparams %}
  {{- printAnyComparam(sub_cp) | indent(1, first=True) }}
  {%- endfor %}
- {%- if  cp.physical_default_value is not none %}
+ {%- if cp.physical_default_value is not none %}
  {{ printComplexValue(cp.physical_default_value, "COMPLEX-PHYSICAL-DEFAULT-VALUE") | indent(1) }}
  {%- endif %}
 </COMPLEX-COMPARAM>

odxtools/templates/macros/printComparamRef.xml.jinja2

@@ -3,6 +3,7 @@
  # SPDX-License-Identifier: MIT
 -#}
 {%- import('macros/printComparam.xml.jinja2') as pcp %}
+{%- import('macros/printDescription.xml.jinja2') as pd %}
 {#- -#}
 
 {%- macro printComparamRef(cp) %}
@@ -11,27 +12,19 @@
               DOCTYPE="COMPARAM-SUBSET">
   {%- if cp.value is string %}
   <SIMPLE-VALUE>{{cp.value}}</SIMPLE-VALUE>
-  {%- if cp.description %}
-  <DESC>{{cp.description}}</DESC>
-  {%- endif %}
+  {{ pd.printDescription(cp.description) }}
   {%- elif cp.value is iterable %}
   {%- if hasattr(cp.value, "hex") %}
   {#- the value has a hex() method. assume that is a bytes or bytestring #}
   <SIMPLE-VALUE>{{cp.value.hex().upper()}}</SIMPLE-VALUE>
-  {%- if cp.description %}
-  <DESC>{{cp.description}}</DESC>
-  {%- endif %}
+  {{ pd.printDescription(cp.description) }}
   {%- else %}
   {{ pcp.printComplexValue(cp.value)|indent(1) }}
-  {%- if cp.description %}
-  <DESC>{{cp.description}}</DESC>
-  {%- endif %}
+  {{ pd.printDescription(cp.description) }}
   {%- endif %}
   {%- else %}
   <SIMPLE-VALUE>{{cp.value}}</SIMPLE-VALUE>
-  {%- if cp.description %}
-  <DESC>{{cp.description}}</DESC>
-  {%- endif %}
+  {{ pd.printDescription(cp.description) }}
   {%- endif %}
   {%- if cp.prot_stack_snref is not none %}
   <PROT-STACK-SNREF SHORT-NAME="{{cp.prot_stack_snref}}"/>

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,39 +45,14 @@
 {%- endif %}
 {%- endmacro -%}
 
-{%- 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 %}
-  {#- #}>
-  {%- if hasattr(limit_obj._value, 'hex') -%}
-  {#- bytes or bytarray limit #}
-  {{- limit_obj._value.hex().upper() }}
-  {%- else -%}
-  {{- limit_obj._value }}
-  {%- endif -%}
-</{{tag_name}}>
-{%- endif -%}
-{%- 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 %}
-  {{printLimit("LOWER-LIMIT", sc.lower_limit) }}
-  {{printLimit("UPPER-LIMIT", sc.upper_limit) }}
+  {{pd.printDescription(sc.description)}}
+  {{pcm.printLimit("LOWER-LIMIT", sc.lower_limit) }}
+  {{pcm.printLimit("UPPER-LIMIT", sc.upper_limit) }}
 </SCALE-CONSTR>
 {%- endmacro -%}
 
@@ -85,8 +62,8 @@
 {%- else %}
 <INTERNAL-CONSTR>
 {%- endif %}
-  {{printLimit("LOWER-LIMIT", ic.lower_limit) }}
-  {{printLimit("UPPER-LIMIT", ic.upper_limit) }}
+  {{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 %}
@@ -101,105 +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 %}
-   {{printLimit("LOWER-LIMIT", cs.lower_limit) }}
-   {{printLimit("UPPER-LIMIT", cs.upper_limit) }}
-   {%- 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>
-     {{printLimit("LOWER-LIMIT", cm.internal_lower_limit) }}
-     {{printLimit("UPPER-LIMIT", cm.internal_upper_limit) }}
-				<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>
-    {{printLimit("LOWER-LIMIT", lm.internal_lower_limit) }}
-    {{printLimit("UPPER-LIMIT", lm.internal_upper_limit) }}
-				<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>{{ 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) }}
@@ -225,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 %}
@@ -246,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   %}
@@ -267,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)}}