odxtools 5.2.6__py3-none-any.whl → 5.3.1__py3-none-any.whl

odxtools/parameters/lengthkeyparameter.py

@@ -10,7 +10,7 @@ from .parameter import ParameterType
 from .parameterwithdop import ParameterWithDOP
 
 if TYPE_CHECKING:
-    from diaglayer import DiagLayer
+    from ..diaglayer import DiagLayer
 
 
 @dataclass
@@ -43,10 +43,15 @@ class LengthKeyParameter(ParameterWithDOP):
     def _resolve_snrefs(self, diag_layer: "DiagLayer") -> None:
         super()._resolve_snrefs(diag_layer)
 
-    def is_required(self):
+    @property
+    def is_required(self) -> bool:
         return False
 
-    def is_optional(self):
+    @property
+    def is_settable(self) -> bool:
+        # length keys can be explicitly set, but they do not need to
+        # be because they can be implicitly determined by the length
+        # of the corresponding field
         return True
 
     def get_coded_value_as_bytes(self, encode_state: EncodeState) -> bytes:

odxtools/parameters/matchingrequestparameter.py

@@ -20,10 +20,12 @@ class MatchingRequestParameter(Parameter):
     def bit_length(self):
         return 8 * self.byte_length
 
-    def is_required(self):
-        return True
+    @property
+    def is_required(self) -> bool:
+        return False
 
-    def is_optional(self):
+    @property
+    def is_settable(self) -> bool:
         return False
 
     def get_coded_value(self, request_value=None):

odxtools/parameters/nrcconstparameter.py

@@ -55,10 +55,12 @@ class NrcConstParameter(Parameter):
     def internal_data_type(self) -> DataType:
         return self.diag_coded_type.base_data_type
 
-    def is_required(self):
+    @property
+    def is_required(self) -> bool:
         return False
 
-    def is_optional(self):
+    @property
+    def is_settable(self) -> bool:
         return False
 
     def get_coded_value(self):

odxtools/parameters/parameter.py

@@ -62,13 +62,28 @@ class Parameter(NamedElement, abc.ABC):
     def bit_length(self) -> Optional[int]:
         return None
 
-    @abc.abstractmethod
-    def is_required(self):
-        pass
+    @property
+    def is_required(self) -> bool:
+        """True if the parameter must be explicitly specified when
+        encoding a message.
 
-    @abc.abstractmethod
-    def is_optional(self):
-        pass
+        Required parameters are always settable, and parameters which
+        have a default value are settable but not required to be
+        specified.
+
+        """
+        raise NotImplementedError
+
+    @property
+    def is_settable(self) -> bool:
+        """True if the parameter can be specified when encoding a
+        message.
+
+        Required parameters are always settable, and parameters which
+        have a default value are settable but not required to be
+        specified.
+        """
+        raise NotImplementedError
 
     @abc.abstractmethod
     def get_coded_value(self):

odxtools/parameters/parameterwithdop.py

@@ -46,7 +46,12 @@ class ParameterWithDOP(Parameter):
         if self.dop_snref:
             spec = diag_layer.diag_data_dictionary_spec
             self._dop = (
-                spec.data_object_props.get(self.dop_snref) or spec.structures.get(self.dop_snref))
+                spec.end_of_pdu_fields.get(self.dop_snref) or
+                spec.dynamic_length_fields.get(self.dop_snref) or
+                spec.data_object_props.get(self.dop_snref) or spec.structures.get(self.dop_snref) or
+                spec.muxs.get(self.dop_snref) or spec.dtc_dops.get(self.dop_snref) or
+                spec.muxs.get(self.dop_snref) or spec.env_data_descs.get(self.dop_snref) or
+                spec.env_datas.get(self.dop_snref))
 
     @property
     def dop(self) -> Optional[DopBase]:

odxtools/parameters/physicalconstantparameter.py

@@ -44,10 +44,12 @@ class PhysicalConstantParameter(ParameterWithDOP):
     def physical_constant_value(self) -> ParameterValue:
         return self._physical_constant_value
 
-    def is_required(self):
+    @property
+    def is_required(self) -> bool:
         return False
 
-    def is_optional(self):
+    @property
+    def is_settable(self) -> bool:
         return False
 
     def get_coded_value(self):

odxtools/parameters/reservedparameter.py

@@ -15,10 +15,12 @@ class ReservedParameter(Parameter):
     def parameter_type(self) -> ParameterType:
         return "RESERVED"
 
-    def is_required(self):
+    @property
+    def is_required(self) -> bool:
         return False
 
-    def is_optional(self):
+    @property
+    def is_settable(self) -> bool:
         return False
 
     @property

odxtools/parameters/systemparameter.py

@@ -13,11 +13,13 @@ class SystemParameter(ParameterWithDOP):
     def parameter_type(self) -> ParameterType:
         return "SYSTEM"
 
-    def is_required(self):
+    @property
+    def is_required(self) -> bool:
         raise NotImplementedError("SystemParameter.is_required is not implemented yet.")
 
-    def is_optional(self):
-        raise NotImplementedError("SystemParameter.is_optional is not implemented yet.")
+    @property
+    def is_settable(self) -> bool:
+        raise NotImplementedError("SystemParameter.is_settable is not implemented yet.")
 
     def get_coded_value(self):
         raise NotImplementedError("Encoding a SystemParameter is not implemented yet.")

odxtools/parameters/tableentryparameter.py

@@ -14,11 +14,13 @@ class TableEntryParameter(Parameter):
     def parameter_type(self) -> ParameterType:
         return "TABLE-ENTRY"
 
-    def is_required(self):
+    @property
+    def is_required(self) -> bool:
         raise NotImplementedError("TableKeyParameter.is_required is not implemented yet.")
 
-    def is_optional(self):
-        raise NotImplementedError("TableKeyParameter.is_optional is not implemented yet.")
+    @property
+    def is_settable(self) -> bool:
+        raise NotImplementedError("TableKeyParameter.is_settable is not implemented yet.")
 
     def get_coded_value(self):
         raise NotImplementedError("Encoding a TableKeyParameter is not implemented yet.")

odxtools/parameters/tablekeyparameter.py

@@ -84,11 +84,15 @@ class TableKeyParameter(Parameter):
     def table_row(self) -> Optional["TableRow"]:
         return self._table_row
 
-    def is_required(self):
-        return self._table_row is None
+    @property
+    def is_required(self) -> bool:
+        # TABLE-KEY parameters can be implicitly determined from the
+        # corresponding TABLE-STRUCT
+        return False
 
-    def is_optional(self):
-        return not self.is_required()
+    @property
+    def is_settable(self) -> bool:
+        return True
 
     def get_coded_value(self, physical_value=None) -> Any:
         key_dop = self.table.key_dop

odxtools/parameters/tablestructparameter.py

@@ -50,11 +50,13 @@ class TableStructParameter(Parameter):
     def table_key(self) -> TableKeyParameter:
         return self._table_key
 
+    @property
     def is_required(self):
         return True
 
-    def is_optional(self):
-        return False
+    @property
+    def is_settable(self):
+        return True
 
     def get_coded_value(self, physical_value=None):
         raise EncodeError("TableStructParameters cannot be converted to "

odxtools/parameters/valueparameter.py

@@ -47,11 +47,13 @@ class ValueParameter(ParameterWithDOP):
     def physical_default_value(self) -> Optional[AtomicOdxType]:
         return self._physical_default_value
 
+    @property
     def is_required(self) -> bool:
-        return self.physical_default_value is None
+        return self._physical_default_value is None
 
-    def is_optional(self) -> bool:
-        return not self.is_required()
+    @property
+    def is_settable(self) -> bool:
+        return True
 
     def get_coded_value(self, physical_value: Optional[AtomicOdxType] = None):
         if physical_value is not None:

odxtools/positioneddataobjectproperty.py

@@ -0,0 +1,74 @@
+# SPDX-License-Identifier: MIT
+from dataclasses import dataclass
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple
+from xml.etree import ElementTree
+
+from .dataobjectproperty import DataObjectProperty
+from .decodestate import DecodeState
+from .encodestate import EncodeState
+from .exceptions import odxrequire
+from .odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId, OdxLinkRef
+
+if TYPE_CHECKING:
+    from .diaglayer import DiagLayer
+
+
+@dataclass
+class PositionedDataObjectProperty:
+    """
+    This class represents a wrapper for DataObjectProperty that adds position information
+    used by Switch Key in the Multiplexer.
+    used by Number Of Items in the DynamicLengthField.
+    """
+
+    byte_position: int
+    bit_position: Optional[int]
+    dop_ref: OdxLinkRef
+
+    def __post_init__(self):
+        self._dop: DataObjectProperty = None  # type: ignore
+
+    @staticmethod
+    def from_et(et_element: ElementTree.Element,
+                doc_frags: List[OdxDocFragment]) -> "PositionedDataObjectProperty":
+        byte_position = int(odxrequire(et_element.findtext("BYTE-POSITION", "0")))
+        bit_position_str = et_element.findtext("BIT-POSITION")
+        bit_position = int(bit_position_str) if bit_position_str is not None else None
+        dop_ref = odxrequire(OdxLinkRef.from_et(et_element.find("DATA-OBJECT-PROP-REF"), doc_frags))
+
+        return PositionedDataObjectProperty(
+            byte_position=byte_position,
+            bit_position=bit_position,
+            dop_ref=dop_ref,
+        )
+
+    @property
+    def dop(self) -> DataObjectProperty:
+        return self._dop
+
+    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+        return {}
+
+    def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
+        self._dop = odxrequire(odxlinks.resolve(self.dop_ref, DataObjectProperty))
+
+    def _resolve_snrefs(self, diag_layer: "DiagLayer") -> None:
+        pass
+
+    def convert_physical_to_bytes(self, physical_value, encode_state: EncodeState) -> bytes:
+
+        bit_position = self.bit_position if self.bit_position is not None else 0
+        dop_bytes = self.dop.convert_physical_to_bytes(physical_value, encode_state, bit_position)
+
+        return b'\0' * self.byte_position + dop_bytes
+
+    def convert_bytes_to_physical(self, decode_state: DecodeState) -> Tuple[Any, int]:
+
+        byte_code = decode_state.coded_message[decode_state.next_byte_position:]
+        state = DecodeState(
+            coded_message=byte_code[self.byte_position:],
+            parameter_values=dict(),
+            next_byte_position=0,
+        )
+        bit_position_int = (self.bit_position if self.bit_position is not None else 0)
+        return self.dop.convert_bytes_to_physical(state, bit_position=bit_position_int)

odxtools/progcode.py

@@ -1,10 +1,9 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from enum import Enum
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, cast
+from typing import TYPE_CHECKING, Any, Dict, List, Optional
 from xml.etree import ElementTree
 
-from .exceptions import odxraise, odxrequire
+from .exceptions import odxrequire
 from .odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId, OdxLinkRef
 
 if TYPE_CHECKING:

odxtools/tablerow.py

@@ -3,11 +3,10 @@ from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any, Dict, List, Optional
 from xml.etree import ElementTree
 
-from odxtools.element import IdentifiableElement
-
 from .basicstructure import BasicStructure
 from .createsdgs import create_sdgs_from_et
 from .dataobjectproperty import DataObjectProperty
+from .element import IdentifiableElement
 from .exceptions import odxassert, odxrequire
 from .odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId, OdxLinkRef
 from .odxtypes import AtomicOdxType

odxtools/templates/macros/printAudience.xml.jinja2

@@ -3,17 +3,11 @@
  # SPDX-License-Identifier: MIT
 -#}
 
+{%- import('macros/printElementID.xml.jinja2') as peid %}
+
 {%- macro printAdditionalAudience(audience) -%}
 <ADDITIONAL-AUDIENCE ID="{{audience.odx_id.local_id}}">
- <SHORT-NAME>{{audience.short_name}}</SHORT-NAME>
-{%- if audience.long_name %}
- <LONG-NAME>{{audience.long_name}}</LONG-NAME>
-{%- endif %}
-{%- if audience.description is string and audience.description.strip() %}
- <DESC>
-{{audience.description}}
- </DESC>
-{%- endif %}
+ {{ peid.printElementID(audience)|indent(1) }}
 </ADDITIONAL-AUDIENCE>
 {%- endmacro -%}
 

odxtools/templates/macros/printCompanyData.xml.jinja2

@@ -3,19 +3,12 @@
  # SPDX-License-Identifier: MIT
 -#}
 
+{%- import('macros/printElementID.xml.jinja2') as peid %}
 {%- import('macros/printSpecialData.xml.jinja2') as psd %}
 
 {%- macro printCompanyData(company_data) -%}
 <COMPANY-DATA ID="{{company_data.odx_id.local_id}}">
- <SHORT-NAME>{{company_data.short_name|e}}</SHORT-NAME>
- {%- if company_data.long_name is not none %}
- <LONG-NAME>{{company_data.long_name|e}}</LONG-NAME>
- {%- endif %}
- {%- if company_data.description is not none %}
- <DESC>
-{{company_data.description}}
- </DESC>
- {%- endif %}
+ {{ peid.printElementID(company_data)|indent(1) }}
  {%- if company_data.roles is not none %}
  <ROLES>
   {%- for role in company_data.roles %}
@@ -27,15 +20,7 @@
  <TEAM-MEMBERS>
   {%- for team_member in company_data.team_members %}
   <TEAM-MEMBER ID="{{team_member.odx_id.local_id}}">
-   <SHORT-NAME>{{team_member.short_name|e}}</SHORT-NAME>
-   {%- if company_data.long_name is not none %}
-   <LONG-NAME>{{team_member.long_name|e}}</LONG-NAME>
-   {%- endif %}
-   {%- if company_data.description is not none %}
-   <DESC>
-{{team_member.description}}
-   </DESC>
-   {%- endif %}
+   {{ peid.printElementID(team_member)|indent(3) }}
    {%- if team_member.roles is not none %}
    <ROLES>
     {%- for role in team_member.roles %}
@@ -75,15 +60,7 @@
    <RELATED-DOC>
     {%- if rd.xdoc  is not none %}
     <XDOC>
-     <SHORT-NAME>{{rd.xdoc.short_name|e}}</SHORT-NAME>
-     {%- if rd.xdoc.long_name is not none %}
-     <LONG-NAME>{{rd.xdoc.long_name|e}}</LONG-NAME>
-     {%- endif %}
-     {%- if rd.xdoc.description is not none %}
-     <DESC>
-{{rd.xdoc.description}}
-     </DESC>
-     {%- endif %}
+     {{ peid.printElementID(rd.xdoc)|indent(5) }}
      {%- if rd.xdoc.number is not none %}
      <NUMBER>{{rd.xdoc.number|e}}</NUMBER>
      {%- endif %}

odxtools/templates/macros/printComparam.xml.jinja2

@@ -3,6 +3,8 @@
  # SPDX-License-Identifier: MIT
 -#}
 
+{%- import('macros/printElementID.xml.jinja2') as peid %}
+
 {%- macro printComplexValue(cv) %}
 <COMPLEX-VALUE>
   {%- for val in cv %}
@@ -41,15 +43,7 @@
           CPTYPE="{{cp.cptype.value}}"
          {{make_xml_attrib("DISPLAY-LEVEL", cp.display_level)}}
           CPUSAGE="{{cp.cpusage.value}}">
- <SHORT-NAME>{{cp.short_name}}</SHORT-NAME>
- {%- if cp.long_name and cp.long_name.strip() %}
- <LONG-NAME>{{cp.long_name|e}}</LONG-NAME>
- {%- endif %}
- {%- if cp.description and cp.description.strip() %}
- <DESC>
- {{cp.description}}
- </DESC>
- {%- endif %}
+ {{ peid.printElementID(cp)|indent(1) }}
  <PHYSICAL-DEFAULT-VALUE>{{cp.physical_default_value}}</PHYSICAL-DEFAULT-VALUE>
  <DATA-OBJECT-PROP-REF ID-REF="{{cp.dop_ref.ref_id}}" />
 </COMPARAM>
@@ -63,15 +57,7 @@
                   CPUSAGE="{{cp.cpusage.value}}"
                  {{make_bool_xml_attrib("ALLOW-MULTIPLE-VALUES", cp.allow_multiple_values_raw)}}
                   {#- #}>
- <SHORT-NAME>{{cp.short_name}}</SHORT-NAME>
- {%- if cp.long_name and cp.long_name.strip() %}
- <LONG-NAME>{{cp.long_name|e}}</LONG-NAME>
- {%- endif %}
- {%- if cp.description and cp.description.strip() %}
- <DESC>
- {{cp.description}}
- </DESC>
- {%- endif %}
+ {{ peid.printElementID(cp)|indent(1) }}
  {%- for sub_cp in cp.comparams %}
  {{- printGenericComparam(sub_cp) | indent(1, first=True) }}
  {%- endfor %}

odxtools/templates/macros/printDOP.xml.jinja2

@@ -3,6 +3,7 @@
  # 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 %}
 
@@ -164,13 +165,7 @@
 
 {%- macro printDOP(dop, tag_name) %}
 <{{tag_name}} ID="{{dop.odx_id.local_id}}">
- <SHORT-NAME>{{dop.short_name}}</SHORT-NAME>
- {%- if dop.long_name %}
- <LONG-NAME>{{dop.long_name|e}}</LONG-NAME>
- {%- endif %}
- {%- if dop.description %}
- <DESC>{{dop.description}}</DESC>
- {%- endif %}
+ {{ peid.printElementID(dop)|indent(1) }}
  {%- if dop.admin_data %}
  {{- pad.printAdminData(dop.admin_data)|indent(2, first=True) }}
  {%- endif %}
@@ -192,8 +187,7 @@
 
 {%- macro printDTCDOP(dop) %}
 <DTC-DOP ID="{{dop.odx_id.local_id}}">
- <SHORT-NAME>{{dop.short_name}}</SHORT-NAME>
- <LONG-NAME>{{dop.long_name|e}}</LONG-NAME>
+ {{ peid.printElementID(dop)|indent(1) }}
  {{- psd.printSpecialDataGroups(dop.sdgs)|indent(1, first=True) }}
  {{- printDiagCodedType(dop.diag_coded_type)|indent(1, first=True) }}
  {{- printPhysicalType(dop.physical_type)|indent(1, first=True) }}

odxtools/templates/macros/printDynamicLengthField.xml.jinja2

@@ -0,0 +1,22 @@
+{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printElementID.xml.jinja2') as peid %}
+
+{%- macro printDynamicLengthField(dlf) -%}
+<DYNAMIC-LENGTH-FIELD ID="{{dlf.odx_id.local_id}}">
+ {{ peid.printElementID(dlf)|indent(1) }}
+ <BASIC-STRUCTURE-REF ID-REF="{{dlf.structure_ref.ref_id}}" />
+ <OFFSET>{{dlf.offset}}</OFFSET>
+ <DETERMINE-NUMBER-OF-ITEMS>
+   {%- set dni = dlf.determine_number_of_items %}
+   <BYTE-POSITION>{{dni.byte_position}}</BYTE-POSITION>
+   {%- if dni.bit_position is not none %}
+   <BIT-POSITION>{{dni.bit_position}}</BIT-POSITION>
+   {%- endif %}
+   <DATA-OBJECT-PROP-REF ID-REF="{{dni.dop_ref.ref_id}}" />
+ </DETERMINE-NUMBER-OF-ITEMS>
+</DYNAMIC-LENGTH-FIELD>
+{%- endmacro -%}

odxtools/templates/macros/printElementID.xml.jinja2

@@ -3,12 +3,12 @@
  # SPDX-License-Identifier: MIT
 -#}
 
-{%- macro printElementID(element) -%}
-<SHORT-NAME>{{ element.short_name }}</SHORT-NAME>
-{%- if element.long_name is string and element.long_name.strip() %}
-<LONG-NAME>{{ element.long_name|e }}</LONG-NAME>
+{%- macro printElementID(obj) -%}
+<SHORT-NAME>{{ obj.short_name }}</SHORT-NAME>
+{%- if obj.long_name %}
+<LONG-NAME>{{ obj.long_name|e }}</LONG-NAME>
 {%- endif %}
-{%- if element.description is string and element.description.strip() %}
-<DESC>{{ element.description }}</DESC>
+{%- if obj.description %}
+<DESC>{{ obj.description }}</DESC>
 {%- endif %}
 {%- endmacro -%}

odxtools/templates/macros/printEndOfPdu.xml.jinja2

@@ -3,10 +3,11 @@
  # SPDX-License-Identifier: MIT
 -#}
 
+{%- import('macros/printElementID.xml.jinja2') as peid %}
+
 {%- macro printEndOfPdu(eopdu) -%}
 <END-OF-PDU-FIELD ID="{{eopdu.odx_id.local_id}}">
- <SHORT-NAME>{{eopdu.short_name}}</SHORT-NAME>
- <LONG-NAME>{{eopdu.long_name|e}}</LONG-NAME>
+ {{ peid.printElementID(eopdu)|indent(1) }}
  <BASIC-STRUCTURE-REF ID-REF="{{eopdu.structure_ref.ref_id}}" />
 </END-OF-PDU-FIELD>
 {%- endmacro -%}

odxtools/templates/macros/printEnvData.xml.jinja2

@@ -3,12 +3,12 @@
  # SPDX-License-Identifier: MIT
 -#}
 
+{%- import('macros/printElementID.xml.jinja2') as peid %}
 {%- import('macros/printParam.xml.jinja2') as pparam %}
 
 {%- macro printEnvData(env_data) %}
 <ENV-DATA ID="{{env_data.odx_id.local_id}}">
-    <SHORT-NAME>{{env_data.short_name}}</SHORT-NAME>
-    <LONG-NAME>{{env_data.long_name}}</LONG-NAME>
+    {{ peid.printElementID(env_data)|indent(1) }}
     <PARAMS>
       {%- for param in env_data.parameters %}
       {{pparam.printParam(param) | indent(6, first=True) }}

odxtools/templates/macros/printEnvDataDesc.xml.jinja2

@@ -3,10 +3,11 @@
  # SPDX-License-Identifier: MIT
 -#}
 
+{%- import('macros/printElementID.xml.jinja2') as peid %}
+
 {%- macro printEnvDataDesc(env_data_desc) %}
 <ENV-DATA-DESC ID="{{env_data_desc.odx_id.local_id}}">
-  <SHORT-NAME>{{env_data_desc.short_name}}</SHORT-NAME>
-  <LONG-NAME>{{env_data_desc.long_name}}</LONG-NAME>
+  {{ peid.printElementID(env_data_desc)|indent(1) }}
   <PARAM-SNREF SHORT-NAME="{{env_data_desc.param_snref}}"/>
   <ENV-DATA-REFS>
     {%- for env_data_ref in env_data_desc.env_data_refs %}

odxtools/templates/macros/printFunctionalClass.xml.jinja2

@@ -4,16 +4,10 @@
  # SPDX-License-Identifier: MIT
 -#}
 
+{%- import('macros/printElementID.xml.jinja2') as peid %}
+
 {%- macro printFunctionalClass(fc) -%}
 <FUNCT-CLASS ID="{{fc.odx_id.local_id}}">
- <SHORT-NAME>{{fc.short_name}}</SHORT-NAME>
-{%- if fc.long_name is string and fc.long_name.strip() %}
- <LONG-NAME>{{fc.long_name}}</LONG-NAME>
-{%- endif %}
-{%- if fc.description is string and fc.description.strip() %}
- <DESC>
-{{fc.description}}
- </DESC>
-{%- endif %}
+ {{ peid.printElementID(fc)|indent(1) }}
 </FUNCT-CLASS>
 {%- endmacro -%}

odxtools/templates/macros/printMux.xml.jinja2

@@ -3,10 +3,11 @@
  # SPDX-License-Identifier: MIT
 -#}
 
+{%- import('macros/printElementID.xml.jinja2') as peid %}
+
 {%- macro printMux(mux) %}
 <MUX ID="{{mux.odx_id.local_id}}">
-  <SHORT-NAME>{{mux.short_name}}</SHORT-NAME>
-  <LONG-NAME>{{mux.long_name|e}}</LONG-NAME>
+  {{ peid.printElementID(mux)|indent(1) }}
   <BYTE-POSITION>{{mux.byte_position}}</BYTE-POSITION>
   <SWITCH-KEY>
     <BYTE-POSITION>{{mux.switch_key.byte_position}}</BYTE-POSITION>
@@ -17,20 +18,26 @@
   </SWITCH-KEY>
   {%- if mux.default_case is not none %}
   <DEFAULT-CASE>
-    <SHORT-NAME>{{mux.default_case.short_name}}</SHORT-NAME>
-    <LONG-NAME>{{mux.default_case.long_name}}</LONG-NAME>
+    {{ peid.printElementID(mux.default_case)|indent(4) }}
     {%- if mux.default_case.structure_ref is not none %}
     <STRUCTURE-REF ID-REF="{{mux.default_case.structure_ref.ref_id}}"/>
     {%- endif %}
+    {%- if mux.default_case.structure_snref is not none %}
+    <STRUCTURE-SNREF SHORT_NAME="{{mux.default_case.structure_snref}}"/>
+    {%- endif %}
   </DEFAULT-CASE>
   {%- endif %}
   {%- if mux.cases %}
   <CASES>
     {%- for case in mux.cases %}
     <CASE>
-      <SHORT-NAME>{{case.short_name}}</SHORT-NAME>
-      <LONG-NAME>{{case.long_name}}</LONG-NAME>
+      {{ peid.printElementID(case)|indent(6) }}
+      {%- if case.structure_ref is not none %}
       <STRUCTURE-REF ID-REF="{{case.structure_ref.ref_id}}"/>
+      {%- endif %}
+      {%- 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>
     </CASE>