ASCII.

Author: janiversen

pymodbus/message/ascii.py

@@ -48,15 +48,14 @@ def decode(self, data: bytes) -> tuple[int, int, int, bytes]:
         if not (used_len := data.find(self.END)):
             Log.debug("Incomplete frame: {} wait for more data", data, ":hex")
             return 0, 0, 0, self.EMPTY
+
+        dev_id = int(data[1:3], 16)
         lrc = int(data[used_len - 2: used_len], 16)
         msg = a2b_hex(data[1 : used_len - 2])
         if not self.check_LRC(msg, lrc):
             Log.debug("LRC wrong in frame: {} skipping", data, ":hex")
             return used_len+2, 0, 0, self.EMPTY
-
-        dev_id = int(data[1:3], 16)
-        _fc = int(data[3:5], 16).to_bytes(1,'big')
-        return used_len+2, 0, dev_id, msg
+        return used_len+2, 0, dev_id, msg[1:]
 
     def encode(self, data: bytes, device_id: int, _tid: int) -> bytes:
         """Decode message."""

pymodbus/message/message.py

@@ -79,9 +79,9 @@ def callback_data(self, data: bytes, addr: tuple | None = None) -> int:
         tot_len = len(data)
         start = 0
         while True:
-            used_len, tid, device_id, data = self.msg_handle.decode(data[start:])
-            if data:
-                self.callback_request_response(data, device_id, tid)
+            used_len, tid, device_id, msg = self.msg_handle.decode(data[start:])
+            if msg:
+                self.callback_request_response(msg, device_id, tid)
             if not used_len:
                 return start
             start += used_len

test/message/test_ascii.py

@@ -40,24 +40,23 @@ def test_roundtrip_LRC(self):
     @pytest.mark.parametrize(
         ("packet", "used_len", "id", "res"),
         [
-            (b":010100010001FC\r\n", 17, 1, b'\x00\x01\x00\x00'),
+            (b':010100010001FC\r\n', 17, 1, b'\x01\x00\x01\x00\x01'),
+            (b':00010001000AF4\r\n', 17, 0, b'\x01\x00\x01\x00\x0a'),
+            (b':01010001000AF3\r\n', 17, 1, b'\x01\x00\x01\x00\x0a'),
+            (b':61620001000A32\r\n', 17, 97, b'\x62\x00\x01\x00\x0a'),
+            (b':01270001000ACD\r\n', 17, 1, b'\x27\x00\x01\x00\x0a'),
         ],
     )
     def test_decode(self, frame, packet, used_len, id, res):
         """Test decode."""
-        return
         res_len, tid, dev_id, data = frame.decode(packet)
-        assert res_len == len(packet)
+        assert res_len == used_len
+        assert data == res
         assert not tid
         assert dev_id == id
-        assert data == res
 
 
-    # OK: b":010100010001FC\r\n"
-    # OK: b':00010001000AF4\r\n'
-    # OK: b':01010001000AF3\r\n'
     # NO: b':01270001000ACD\r\n'
-    # OK: b':61620001000AF4\r\n'
     # remember:
     # -- split packet
     # -- double packet

test/message/test_message.py

@@ -44,6 +44,8 @@ async def test_message_callback(self, dummy_message, data, res_len, cx, rc):
         assert msg.callback_request_response.call_count == cx
         if cx:
             msg.callback_request_response.assert_called_with(b'12345', 0, 0)
+        else:
+            msg.callback_request_response.assert_not_called()
 
     async def test_message_build_send(self, dummy_message):
         """Test message type."""