s7datablock 0.0.2__tar.gz → 0.0.3__tar.gz

{s7datablock-0.0.2 → s7datablock-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: s7datablock
-Version: 0.0.2
+Version: 0.0.3
 Summary: A Python library for interacting with Siemens S7 PLC datablocks
 Project-URL: Homepage, https://github.com/CEAD-group/s7datablock
 Project-URL: Documentation, https://github.com/CEAD-group/s7datablock

{s7datablock-0.0.2 → s7datablock-0.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "s7datablock"
-version = "0.0.2"
+version = "0.0.3"
 description = "A Python library for interacting with Siemens S7 PLC datablocks"
 readme = "README.md"
 authors = [

{s7datablock-0.0.2 → s7datablock-0.0.3}/src/s7datablock/fields.py

@@ -278,9 +278,9 @@ class S7DTL(
 
 
 class S7Time(S7Field[timedelta], s7_type="Time"):
-    """Time duration S7Field type."""
+    """Time duration S7Field type (signed 32-bit milliseconds)."""
 
-    struct_fmt = "I"
+    struct_fmt = ">i"
 
     def unpack(self, buffer: bytearray) -> timedelta:
         ms = struct.unpack(self.struct_fmt, buffer[self.buffer_slice])[0]
@@ -338,4 +338,4 @@ class DBParseResult(NamedTuple):
 class S7Int(S7Field[int], s7_type="Int"):
     """16-bit signed integer S7Field."""
 
-    struct_fmt = "h"
+    struct_fmt = ">h"

s7datablock-0.0.3/tests/test_byte_order.py

@@ -0,0 +1,39 @@
+"""S7 stores every multi-byte value big-endian. These tests decode KNOWN raw bytes,
+so a field format without an explicit ">" fails here instead of round-tripping
+cleanly through pack() and unpack() with the same wrong byte order."""
+
+from datetime import timedelta
+
+import pytest
+
+from s7datablock.fields import S7Field
+
+BIG_ENDIAN_CASES = [
+    ("Int", bytes([0x02, 0xD0]), 720),
+    ("Int", bytes([0xFF, 0xFE]), -2),
+    ("UInt", bytes([0x02, 0xD0]), 720),
+    ("Word", bytes([0x02, 0xD0]), 720),
+    ("DInt", bytes([0x00, 0x01, 0x00, 0x02]), 65538),
+    ("DInt", bytes([0xFF, 0xFF, 0xFF, 0xFE]), -2),
+    ("UDInt", bytes([0x00, 0x01, 0x00, 0x02]), 65538),
+    ("DWord", bytes([0x00, 0x01, 0x00, 0x02]), 65538),
+    ("Real", bytes([0x43, 0x65, 0x00, 0x00]), 229.0),
+    ("Time", bytes([0x00, 0x00, 0x03, 0xE8]), timedelta(seconds=1)),
+    ("Time", bytes([0xFF, 0xFF, 0xFC, 0x18]), timedelta(seconds=-1)),
+    ("Time_of_Day", bytes([0x00, 0x00, 0x03, 0xE8]), timedelta(seconds=1)),
+]
+
+
+@pytest.mark.parametrize("s7_type,raw,expected", BIG_ENDIAN_CASES)
+def test_unpack_reads_big_endian(s7_type, raw, expected):
+    field = S7Field.create(offset=2, s7_type=s7_type)
+    buffer = bytearray(2) + bytearray(raw) + bytearray(2)
+    assert field.unpack(buffer) == expected
+
+
+@pytest.mark.parametrize("s7_type,raw,expected", BIG_ENDIAN_CASES)
+def test_pack_writes_big_endian(s7_type, raw, expected):
+    field = S7Field.create(offset=2, s7_type=s7_type)
+    buffer = bytearray(len(raw) + 4)
+    field.pack(buffer, expected)
+    assert bytes(buffer[2 : 2 + len(raw)]) == raw

{s7datablock-0.0.2 → s7datablock-0.0.3}/uv.lock

@@ -1,5 +1,5 @@
 version = 1
-revision = 2
+revision = 5
 requires-python = ">=3.11"
 
 [[package]]
@@ -218,7 +218,7 @@ wheels = [
 
 [[package]]
 name = "s7datablock"
-version = "0.0.2"
+version = "0.0.3"
 source = { editable = "." }
 dependencies = [
     { name = "pyparsing" },