EndOfPduField, StaticField: set the origin position during encoding

Note that this does not make a difference because all items of fields
are structures, which need to set the origin position to the beginning
of the structure anyway, but IMO it is conceptually clearer to
explicitly set the origin position in fields as well.

Signed-off-by: Andreas Lauser <[email protected]>
Signed-off-by: Gerrit Ecke <[email protected]>

Author: andlaus

odxtools/endofpdufield.py

@@ -71,6 +71,10 @@ def decode_from_pdu(self, decode_state: DecodeState) -> ParameterValue:
         odxassert(not decode_state.cursor_bit_position,
                   "No bit position can be specified for end-of-pdu fields!")
 
+        orig_origin = decode_state.origin_byte_position
+        orig_cursor = decode_state.cursor_byte_position
+        decode_state.origin_byte_position = decode_state.cursor_byte_position
+
         result: List[ParameterValue] = []
         while decode_state.cursor_byte_position < len(decode_state.coded_message):
             # ATTENTION: the ODX specification is very misleading
@@ -79,4 +83,7 @@ def decode_from_pdu(self, decode_state: DecodeState) -> ParameterValue:
             # repeated are identical, not their values
             result.append(self.structure.decode_from_pdu(decode_state))
 
+        decode_state.origin_byte_position = orig_origin
+        decode_state.cursor_byte_position = max(orig_cursor, decode_state.cursor_byte_position)
+
         return result

odxtools/staticfield.py

@@ -88,6 +88,10 @@ def decode_from_pdu(self, decode_state: DecodeState) -> ParameterValue:
         odxassert(decode_state.cursor_bit_position == 0,
                   "No bit position can be specified for static length fields!")
 
+        orig_origin = decode_state.origin_byte_position
+        orig_cursor = decode_state.cursor_byte_position
+        decode_state.origin_byte_position = decode_state.cursor_byte_position
+
         result: List[ParameterValue] = []
         for _ in range(self.fixed_number_of_items):
             orig_cursor = decode_state.cursor_byte_position
@@ -101,4 +105,7 @@ def decode_from_pdu(self, decode_state: DecodeState) -> ParameterValue:
 
             decode_state.cursor_byte_position = orig_cursor + self.item_byte_size
 
+        decode_state.origin_byte_position = orig_origin
+        decode_state.cursor_byte_position = max(orig_cursor, decode_state.cursor_byte_position)
+
         return result