odxtools 10.2.1__py3-none-any.whl → 10.4.0__py3-none-any.whl

odxtools/templates/macros/printDiagCommDataConnector.xml.jinja2

@@ -0,0 +1,66 @@
+1{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printAdminData.xml.jinja2') as pad %}
+{%- import('macros/printElementId.xml.jinja2') as peid %}
+{%- import('macros/printConfigItems.xml.jinja2') as pcits %}
+{%- import('macros/printSpecialData.xml.jinja2') as psd %}
+
+{%- macro printDiagCommDataConnector(connector) -%}
+<DIAG-COMM-DATA-CONNECTOR>
+  <UNCOMPRESSED-SIZE>{{connector.uncompressed_size}}</UNCOMPRESSED-SIZE>
+  {%- set num_nibbles = (connector.source_start_address.bit_length() + 7) // 8 * 2 %}
+  <SOURCE-START-ADDRESS>{{ ("%%0%dX" | format(num_nibbles | int)) | format(connector.source_start_address | int) }}</SOURCE-START-ADDRESS>
+  {%- if connector.read_diag_comm_connector is not none %}
+  {%- set rdcc = connector.read_diag_comm_connector %}
+  <READ-DIAG-COMM-CONNECTOR>
+    {%- if rdcc.read_param_values %}
+    <READ-PARAM-VALUES>
+       {%- for rpv in rdcc.read_param_values %}
+       <READ-PARAM-VALUE {{ make_xml_attrib("SEMANTIC", rpv.semantic) }}>
+         <PHYS-CONSTANT-VALUE>{{ rpv.phys_constant_value | e }}</PHYS-CONSTANT-VALUE>
+         {%- if rpv.in_param_if_snref is not none %}
+         <IN-PARAM-IF-SNREF SHORT-NAME="{{rpv.in_param_if_snref}}" />
+         {%- endif %}
+         {%- if rpv.in_param_if_snpathref is not none %}
+         <IN-PARAM-IF-SNPATHREF SHORT-NAME-PATH="{{rpv.in_param_if_snpathref}}" />
+         {%- endif %}
+       </READ-PARAM-VALUE>
+       {%- endfor %}
+    </READ-PARAM-VALUES>
+    {%- endif %}
+    {%- if rdcc.read_diag_comm_ref is not none %}
+    <READ-DIAG-COMM-REF {{make_ref_attribs(rdcc.read_diag_comm_ref)}} />
+    {%- endif %}
+    {%- if rdcc.read_diag_comm_snref is not none %}
+    <READ-DIAG-COMM-SNREF SHORT-NAME="{{rdcc.read_diag_comm_snref}}" />
+    {%- endif %}
+    {%- if rdcc.read_data_snref is not none %}
+    <READ-DATA-SNREF SHORT-NAME="{{rdcc.read_data_snref}}" />
+    {%- endif %}
+    {%- if rdcc.read_data_snpathref is not none %}
+    <READ-DATA-SNPATHREF SHORT-NAME-PATH="{{rdcc.read_data_snpathref}}" />
+    {%- endif %}
+  </READ-DIAG-COMM-CONNECTOR>
+  {%- endif %}
+  {%- if connector.write_diag_comm_connector is not none %}
+  {%- set wdcc = connector.write_diag_comm_connector %}
+  <WRITE-DIAG-COMM-CONNECTOR>
+    {%- if wdcc.write_diag_comm_ref is not none %}
+    <WRITE-DIAG-COMM-REF {{make_ref_attribs(wdcc.write_diag_comm_ref)}} />
+    {%- endif %}
+    {%- if wdcc.write_diag_comm_snref is not none %}
+    <WRITE-DIAG-COMM-SNREF SHORT-NAME="{{wdcc.write_diag_comm_snref}}" />
+    {%- endif %}
+    {%- if wdcc.write_data_snref is not none %}
+    <WRITE-DATA-SNREF SHORT-NAME="{{wdcc.write_data_snref}}" />
+    {%- endif %}
+    {%- if wdcc.write_data_snpathref is not none %}
+    <WRITE-DATA-SNPATHREF SHORT-NAME-PATH="{{wdcc.write_data_snpathref}}" />
+    {%- endif %}
+  </WRITE-DIAG-COMM-CONNECTOR>
+  {%- endif %}
+</DIAG-COMM-DATA-CONNECTOR>
+{%- endmacro -%}

odxtools/templates/macros/printDiagDataDictionarySpec.xml.jinja2

@@ -0,0 +1,107 @@
+{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printAdminData.xml.jinja2') as pad %}
+{%- import('macros/printDOP.xml.jinja2') as pdop %}
+{%- import('macros/printTable.xml.jinja2') as pt %}
+{%- 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/printSpecialData.xml.jinja2') as psd %}
+
+{%- macro printDiagDataDictionarySpec(ddds) -%}
+<DIAG-DATA-DICTIONARY-SPEC>
+  {%- if ddds.admin_data is not none %}
+  {{- pad.printAdminData(ddds.admin_data)|indent(2) }}
+  {%- endif %}
+  {%- if ddds.dtc_dops  %}
+  <DTC-DOPS>
+    {%- for dop in ddds.dtc_dops -%}
+    {{ pdop.printDtcDop(dop)|indent(4) }}
+    {%- 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(4) }}
+    {%- endfor %}
+  </ENV-DATA-DESCS>
+  {%- endif %}
+  {%- if ddds.data_object_props %}
+  <DATA-OBJECT-PROPS>
+    {%- for dop in ddds.data_object_props %}
+    {{- pdop.printDataObjectProp(dop)|indent(4) }}
+    {%- endfor %}
+  </DATA-OBJECT-PROPS>
+  {%- endif %}
+  {%- if ddds.structures %}
+  <STRUCTURES>
+    {%- for st in ddds.structures %}
+    {{ pst.printStructure(st)|indent(4) }}
+    {%- endfor %}
+  </STRUCTURES>
+  {%- endif %}
+  {%- if ddds.static_fields %}
+  <STATIC-FIELDS>
+    {%- for sf in ddds.static_fields %}
+    {{ psf.printStaticField(sf)|indent(4) }}
+    {%- endfor %}
+  </STATIC-FIELDS>
+  {%- endif %}
+  {%- if ddds.dynamic_length_fields %}
+  <DYNAMIC-LENGTH-FIELDS>
+    {%- for dlf in ddds.dynamic_length_fields %}
+    {{ pdlf.printDynamicLengthField(dlf)|indent(4) }}
+    {%- endfor %}
+  </DYNAMIC-LENGTH-FIELDS>
+  {%- endif %}
+  {%- if ddds.dynamic_endmarker_fields %}
+  <DYNAMIC-ENDMARKER-FIELDS>
+    {%- for demf in ddds.dynamic_endmarker_fields %}
+    {{ pdemf.printDynamicEndmarkerField(demf)|indent(4) }}
+    {%- 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(4) }}
+    {%- endfor %}
+  </END-OF-PDU-FIELDS>
+  {%- endif %}
+  {%- if ddds.muxs %}
+  <MUXS>
+    {%- for mux in ddds.muxs %}
+    {{ pm.printMux(mux)|indent(4) }}
+    {%- endfor %}
+  </MUXS>
+  {%- endif %}
+  {%- if ddds.env_datas %}
+  <ENV-DATAS>
+    {%- for env_data in ddds.env_datas %}
+    {{ ped.printEnvData(env_data)|indent(4) }}
+    {%- 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(4) }}
+    {%- endfor %}
+  </TABLES>
+  {%- endif %}
+  {{- psd.printSpecialDataGroups(ddds.sdgs)|indent(2, first=True) }}
+</DIAG-DATA-DICTIONARY-SPEC>
+{%- endmacro -%}

odxtools/templates/macros/printDiagLayer.xml.jinja2

@@ -4,18 +4,10 @@
 -#}
 
 {%- import('macros/printElementId.xml.jinja2') as peid %}
-{%- import('macros/printDOP.xml.jinja2') as pdop %}
-{%- import('macros/printTable.xml.jinja2') as pt %}
+{%- import('macros/printAdminData.xml.jinja2') as pad %}
+{%- import('macros/printCompanyData.xml.jinja2') as pcd %}
 {%- 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/printDiagDataDictionarySpec.xml.jinja2') as pddds %}
 {%- import('macros/printService.xml.jinja2') as ps %}
 {%- import('macros/printSingleEcuJob.xml.jinja2') as psej %}
 {%- import('macros/printRequest.xml.jinja2') as prq %}
@@ -25,8 +17,6 @@
 {%- 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)}}{# -#}
@@ -54,90 +44,7 @@
 </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>
-  {%- endif %}
-  {{- psd.printSpecialDataGroups(ddds.sdgs)|indent(2, first=True) }}
-</DIAG-DATA-DICTIONARY-SPEC>
+{{ pddds.printDiagDataDictionarySpec(dlr.diag_data_dictionary_spec) }}
 {%- endif %}
 {%- if dlr.diag_comms_raw %}
 <DIAG-COMMS>
@@ -191,6 +98,13 @@
   {%- endfor %}
 </GLOBAL-NEG-RESPONSES>
 {%- endif %}
+{%- if dlr.import_refs %}
+<IMPORT-REFS>
+  {%- for ir in dlr.import_refs %}
+  <IMPORT-REF {{make_ref_attribs(ir)}} />
+  {%- endfor %}
+</IMPORT-REFS>
+{%- endif %}
 {%- if dlr.state_charts %}
 <STATE-CHARTS>
   {%- for sc in dlr.state_charts %}

odxtools/templates/macros/printElementId.xml.jinja2

@@ -6,7 +6,9 @@
 {%- import('macros/printDescription.xml.jinja2') as pd %}
 
 {%- macro printElementIdAttribs(obj) -%}
+{%- if obj.odx_id is defined %}
 {#- #} {{- make_xml_attrib("ID", obj.odx_id.local_id) }}
+{%- endif %}
 {#- #} {{- make_xml_attrib("OID", getattr(obj, "oid", none)) -}}
 {%- endmacro -%}
 

odxtools/templates/macros/printExpectedIdent.xml.jinja2

@@ -14,7 +14,7 @@
       {%- if ident_value.value_type is not none %}
       {#- #} TYPE="{{ ident_value.value_type.value }}"
       {%- endif %}
-      {#- #}>{{ident_value.value}}</IDENT-VALUE>
+      {#- #}>{{ident_value.value_raw}}</IDENT-VALUE>
     {%- endfor %}
   </IDENT-VALUES>
 </EXPECTED-IDENT>

odxtools/templates/macros/printFlashdata.xml.jinja2

@@ -30,10 +30,10 @@
     {%- 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>
+    {#- #}>{{flashdata.encrypt_compress_method.value_raw}}</ENCRYPT-COMPRESS-METHOD>
   {%- endif %}
   {%- if flashdata.datafile is defined %}
-  <DATAFILE {{ make_bool_xml_attrib("LATEBOUND-DATAFILE", flashdata.latebound_datafile) }}>
+  <DATAFILE {{ make_bool_xml_attrib("LATEBOUND-DATAFILE", flashdata.datafile.latebound_datafile) }}>
     {#- #}{{flashdata.datafile.value}}
   {#- #}</DATAFILE>
   {%- elif flashdata.data is defined %}

odxtools/templates/macros/printFunctionalClass.xml.jinja2

@@ -9,9 +9,9 @@
 
 {%- macro printFunctionalClass(fc) -%}
 <FUNCT-CLASS {{-peid.printElementIdAttribs(fc)}}>
- {{ peid.printElementIdSubtags(fc)|indent(1) }}
- {%- if fc.admin_data is not none -%}
- {{ pad.printAdminData(fc.admin_data)|indent(1) }}
- {%- endif -%}
+  {{ peid.printElementIdSubtags(fc)|indent(2) }}
+  {%- if fc.admin_data is not none %}
+  {{ pad.printAdminData(fc.admin_data)|indent(2) }}
+  {%- endif %}
 </FUNCT-CLASS>
 {%- endmacro -%}

odxtools/templates/macros/printItemValue.xml.jinja2

@@ -0,0 +1,31 @@
+1{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printAudience.xml.jinja2') as paud %}
+{%- import('macros/printSpecialData.xml.jinja2') as psd %}
+
+{%- macro printItemValue(item_value) -%}
+<ITEM-VALUE>
+  {%- if item_value.phys_constant_value is not none %}
+  <PHYS-CONSTANT-VALUE>{{item_value.phys_constant_value | e}}</PHYS-CONSTANT-VALUE>
+  {%- endif %}
+  {%- if item_value.meaning is not none %}
+  <MEANING {{- make_xml_attrib("TI", item_value.meaning.text_identifier) }}>{{item_value.meaning|e}}</MEANING>
+  {%- endif %}
+  {%- if item_value.key is not none %}
+  <KEY>{{item_value.key | e}}</KEY>
+  {%- endif %}
+  {%- if item_value.rule is not none %}
+  <RULE>{{item_value.rule | e}}</RULE>
+  {%- endif %}
+  {%- if item_value.description is not none %}
+  <DESCRIPTION {{- make_xml_attrib("TI", item_value.description.text_identifier) }}>{{item_value.description|e}}</DESCRIPTION>
+  {%- endif %}
+  {{- psd.printSpecialDataGroups(item_value.sdgs)|indent(2, first=True) }}{#- #}
+  {%- if item_value.audience is not none %}
+  {{ paud.printAudience(item_value.audience) | indent(2) }}
+  {%- endif %}
+</ITEM-VALUE>
+{%- endmacro -%}

odxtools/templates/macros/printMultipleEcuJob.xml.jinja2

@@ -0,0 +1,77 @@
+1{#- -*- 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/printCompuMethod.xml.jinja2') as pcm %}
+{%- import('macros/printAudience.xml.jinja2') as paud %}
+
+{%- macro printMultipleEcuJob(multiple_ecu_job) -%}
+<MULTIPLE-ECU-JOB {{peid.printElementIdAttribs(multiple_ecu_job)}}
+                  {{-make_xml_attrib("SEMANTIC", multiple_ecu_job.semantic)}}
+                  {{-make_bool_xml_attrib("IS-EXECUTABLE", multiple_ecu_job.is_executable_raw)}}>
+  {{peid.printElementIdSubtags(multiple_ecu_job)|indent(2) }}
+  {%- if multiple_ecu_job.admin_data is not none %}
+  {{- pad.printAdminData(multiple_ecu_job.admin_data)|indent(2) }}
+  {%- endif %}
+  {{- psd.printSpecialDataGroups(multiple_ecu_job.sdgs)|indent(2, first=True) }}{#- #}
+  {%- if multiple_ecu_job.functional_class_refs %}
+  <FUNCT-CLASS-REFS>
+    {%- for fc_ref in multiple_ecu_job.functional_class_refs %}
+    <FUNCT-CLASS-REF {{make_ref_attribs(fc_ref)}} />
+    {%- endfor %}
+  </FUNCT-CLASS-REFS>
+  {%- endif %}
+  <PROG-CODES>
+    {%- for pc in multiple_ecu_job.prog_codes %}
+    {{pcm.printProgCode(pc)|indent(4)}}
+    {%- endfor %}
+  </PROG-CODES>
+  {%- if multiple_ecu_job.input_params %}
+  <INPUT-PARAMS>
+    {%- for ip in multiple_ecu_job.input_params %}
+    <INPUT-PARAM {{ peid.printElementIdAttribs(ip) }} {{make_xml_attrib("SEMANTIC", ip.semantic)}}>
+      {{peid.printElementIdSubtags(ip)|indent(4)}}
+      {%- if ip.physical_default_value is not none %}
+      <PHYSICAL-DEFAULT-VALUE>{{ip.physical_default_value | e}}</PHYSICAL-DEFAULT-VALUE>
+      {%- endif %}
+      <DOP-BASE-REF {{make_ref_attribs(ip.dop_base_ref)}} />
+    </INPUT-PARAM>
+    {%- endfor %}
+  </INPUT-PARAMS>
+  {%- endif %}
+  {%- if multiple_ecu_job.output_params %}
+  <OUTPUT-PARAMS>
+    {%- for op in multiple_ecu_job.output_params %}
+    <OUTPUT-PARAM {{ peid.printElementIdAttribs(op) }} {{make_xml_attrib("SEMANTIC", op.semantic)}}>
+      {{peid.printElementIdSubtags(op)|indent(4)}}
+      <DOP-BASE-REF {{make_ref_attribs(op.dop_base_ref)}} />
+    </OUTPUT-PARAM>
+    {%- endfor %}
+  </OUTPUT-PARAMS>
+  {%- endif %}
+  {%- if multiple_ecu_job.neg_output_params %}
+  <NEG-OUTPUT-PARAMS>
+    {%- for nop in multiple_ecu_job.neg_output_params %}
+    <NEG-OUTPUT-PARAM {{ peid.printElementIdAttribs(nop) }}>
+      {{peid.printElementIdSubtags(nop)|indent(4)}}
+      <DOP-BASE-REF {{make_ref_attribs(nop.dop_base_ref)}} />
+    </NEG-OUTPUT-PARAM>
+    {%- endfor %}
+  </NEG-OUTPUT-PARAMS>
+  {%- endif %}
+  {%- if multiple_ecu_job.diag_layer_refs %}
+  <DIAG-LAYER-REFS>
+    {%- for dl_ref in multiple_ecu_job.diag_layer_refs %}
+    <DIAG-LAYER-REF {{make_ref_attribs(dl_ref)}} />
+    {%- endfor %}
+  </DIAG-LAYER-REFS>
+  {%- endif %}
+  {%- if multiple_ecu_job.audience is not none %}
+  {{ paud.printAudience(multiple_ecu_job.audience) | indent(2) }}
+  {%- endif %}
+</MULTIPLE-ECU-JOB>
+{%- endmacro -%}

odxtools/templates/macros/printOwnIdent.xml.jinja2

@@ -12,6 +12,6 @@
     {%- 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.ident_value.value_raw}}</IDENT-VALUE>
 </OWN-IDENT>
 {%- endmacro -%}

odxtools/templates/macros/printSecurity.xml.jinja2

@@ -10,28 +10,28 @@
     {%- if security.security_method.value_type is not none %}
     {#- #} TYPE="{{ security.security_method.value_type.value }}"
     {%- endif %}
-    {#- #}>{{security.security_method.value}}</SECURITY-METHOD>
+    {#- #}>{{security.security_method.value_raw}}</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>
+    {#- #}>{{security.fw_signature.value_raw}}</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>
+    {#- #}>{{security.fw_checksum.value_raw}}</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>
+    {#- #}>{{security.validity_for.value_raw}}</VALIDITY-FOR>
   {%- endif %}
 </SECURITY>
 {%- endmacro -%}

odxtools/templates/macros/printSegment.xml.jinja2

@@ -25,7 +25,7 @@
     {%- 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>
+    {#- #}>{{segment.encrypt_compress_method.value_raw | e}}</ENCRYPT-COMPRESS-METHOD>
   {%- endif %}
 </SEGMENT>
 {%- endmacro -%}

odxtools/templates/multiple-ecu-job-spec.odx-m.xml.jinja2

@@ -0,0 +1,51 @@
+{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+ #
+ # This template writes an .odx-f file containing descriptions of firmware
+ # blobs that can be flashed to ECUs.
+-#}
+{%- import('macros/printOdxCategory.xml.jinja2') as poc %}
+{%- import('macros/printMultipleEcuJob.xml.jinja2') as pmecuj %}
+{%- import('macros/printDiagDataDictionarySpec.xml.jinja2') as pddds %}
+{%- import('macros/printFunctionalClass.xml.jinja2') as pfc %}
+{%- import('macros/printAudience.xml.jinja2') as paud %}
+{#- -#}
+
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!-- Written using odxtools {{odxtools_version}} -->
+<ODX MODEL-VERSION="2.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="odx.xsd">
+  {{- set_category_docfrag(multiple_ecu_job_spec.short_name, "MULTIPLE-ECU-JOB-SPEC") }}
+  <MULTIPLE-ECU-JOB-SPEC {{- poc.printOdxCategoryAttribs(multiple_ecu_job_spec) }}>
+    {{- poc.printOdxCategorySubtags(multiple_ecu_job_spec)|indent(4) }}
+    <MULTIPLE-ECU-JOBS>
+      {%- for mecuj in multiple_ecu_job_spec.multiple_ecu_jobs %}
+      {{ pmecuj.printMultipleEcuJob(mecuj) | indent(6) }}
+      {%- endfor %}
+    </MULTIPLE-ECU-JOBS>
+    {%- if multiple_ecu_job_spec.diag_data_dictionary_spec is not none %}
+    {{ pddds.printDiagDataDictionarySpec(multiple_ecu_job_spec.diag_data_dictionary_spec) }}
+    {%- endif %}
+    {%- if multiple_ecu_job_spec.functional_classes %}
+    <FUNCT-CLASSS>
+      {%- for fc in multiple_ecu_job_spec.functional_classes %}
+      {{ pfc.printFunctionalClass(fc)|indent(6) }}
+      {%- endfor%}
+    </FUNCT-CLASSS>
+    {%- endif %}
+    {%- if multiple_ecu_job_spec.additional_audiences %}
+    <ADDITIONAL-AUDIENCES>
+      {%- for audience in multiple_ecu_job_spec.additional_audiences %}
+      {{ paud.printAdditionalAudience(audience) | indent(6) }}
+      {%- endfor %}
+    </ADDITIONAL-AUDIENCES>
+    {%- endif %}
+    {%- if multiple_ecu_job_spec.import_refs %}
+    <IMPORT-REFS>
+      {%- for ir in multiple_ecu_job_spec.import_refs %}
+      <IMPORT-REF {{make_ref_attribs(ir)}} />
+      {%- endfor %}
+    </IMPORT-REFS>
+    {%- endif %}
+  </MULTIPLE-ECU-JOB-SPEC>
+</ODX>

odxtools/validbasevariant.py

@@ -0,0 +1,62 @@
+# SPDX-License-Identifier: MIT
+from dataclasses import dataclass
+from itertools import chain
+from typing import Any
+from xml.etree import ElementTree
+
+from .diaglayers.basevariant import BaseVariant
+from .diaglayers.ecuvariant import EcuVariant
+from .exceptions import odxrequire
+from .nameditemlist import NamedItemList
+from .odxdoccontext import OdxDocContext
+from .odxlink import OdxLinkDatabase, OdxLinkId, resolve_snref
+from .snrefcontext import SnRefContext
+
+
+@dataclass(kw_only=True)
+class ValidBaseVariant:
+    ecu_variant_snrefs: list[str]
+    base_variant_snref: str
+
+    @property
+    def ecu_variants(self) -> NamedItemList[EcuVariant]:
+        return self._ecu_variants
+
+    @property
+    def base_variant(self) -> BaseVariant:
+        return self._base_variant
+
+    @staticmethod
+    def from_et(et_element: ElementTree.Element, context: OdxDocContext) -> "ValidBaseVariant":
+        ecu_variant_snrefs = []
+        for ecuv_snref_elem in et_element.iterfind("ECU-VARIANT-SNREFS/ECU-VARIANT-SNREF"):
+            ecu_variant_snrefs.append(odxrequire(ecuv_snref_elem.attrib["SHORT-NAME"]))
+
+        basev_snref_elem = odxrequire(et_element.find("BASE-VARIANT-SNREF"))
+        base_variant_snref = odxrequire(basev_snref_elem.attrib["SHORT-NAME"])
+
+        return ValidBaseVariant(
+            ecu_variant_snrefs=ecu_variant_snrefs, base_variant_snref=base_variant_snref)
+
+    def __post_init__(self) -> None:
+        self._ecu_variants: NamedItemList[EcuVariant]
+        self._base_variant: BaseVariant
+
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
+        result: dict[OdxLinkId, Any] = {}
+        return result
+
+    def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
+        pass
+
+    def _resolve_snrefs(self, context: SnRefContext) -> None:
+        db = odxrequire(context.database)
+
+        ecu_variants = chain(*[dlc.ecu_variants for dlc in db.diag_layer_containers])
+        base_variants = chain(*[dlc.base_variants for dlc in db.diag_layer_containers])
+
+        self._ecu_variants = NamedItemList[EcuVariant]()
+        for ev_snref in self.ecu_variant_snrefs:
+            self._ecu_variants.append(resolve_snref(ev_snref, ecu_variants, EcuVariant))
+
+        self._base_variant = resolve_snref(self.base_variant_snref, base_variants, BaseVariant)

odxtools/validityfor.py

@@ -5,17 +5,26 @@ from xml.etree import ElementTree
 
 from .exceptions import odxraise, odxrequire
 from .odxdoccontext import OdxDocContext
+from .odxtypes import AtomicOdxType, DataType
 from .sessionsubelemtype import SessionSubElemType
 
 
 @dataclass(kw_only=True)
 class ValidityFor:
-    value: str
+    value_raw: str
     value_type: SessionSubElemType
 
+    @property
+    def value(self) -> AtomicOdxType:
+        return self._value
+
+    @property
+    def data_type(self) -> DataType:
+        return self._data_type
+
     @staticmethod
     def from_et(et_element: ElementTree.Element, context: OdxDocContext) -> "ValidityFor":
-        value = et_element.text or ""
+        value_raw = et_element.text or ""
 
         value_type_str = odxrequire(et_element.get("TYPE"))
         try:
@@ -25,6 +34,10 @@ class ValidityFor:
             odxraise(f"Encountered unknown SESSION-SUB-ELEM-TYPE type '{value_type_str}'")
 
         return ValidityFor(
-            value=value,
+            value_raw=value_raw,
             value_type=value_type,
         )
+
+    def __post_init__(self) -> None:
+        self._data_type = DataType(self.value_type.value)
+        self._value = self._data_type.from_string(self.value_raw.strip())