Solve serial unrequested frame. (#2219)

Author: janiversen

pymodbus/framer/rtu_framer.py

@@ -82,6 +82,7 @@ def is_frame_ready(self):
                 try:
                     self._header["uid"] = int(self._buffer[0])
                     self._header["tid"] = int(self._buffer[0])
+                    self._header["tid"] = 0  # fix for now
                     func_code = int(self._buffer[1])
                     pdu_class = self.decoder.lookupPduClass(func_code)
                     size = pdu_class.calculateRtuFrameSize(self._buffer)
@@ -119,6 +120,7 @@ def check_frame(self):
             try:
                 self._header["uid"] = int(self._buffer[0])
                 self._header["tid"] = int(self._buffer[0])
+                self._header["tid"] = 0  # fix for now
                 func_code = int(self._buffer[1])
                 pdu_class = self.decoder.lookupPduClass(func_code)
                 size = pdu_class.calculateRtuFrameSize(self._buffer)

pymodbus/transaction.py

@@ -460,7 +460,9 @@ def getTransaction(self, tid):
         Log.debug("Getting transaction {}", tid)
         if not tid:
             if self.transactions:
-                return self.transactions.popitem()[1]
+                ret = self.transactions.popitem()[1]
+                self.transactions.clear()
+                return ret
             return None
         return self.transactions.pop(tid, None)
 

test/test_framers.py

@@ -223,7 +223,7 @@ def callback(data):
                     "crc": b"\x49\xAD",
                     "uid": 17,
                     "len": 11,
-                    "tid": 17,
+                    "tid": 0,
                 },
             ),
             (
@@ -232,7 +232,7 @@ def callback(data):
                     "crc": b"\x49\xAD",
                     "uid": 17,
                     "len": 11,
-                    "tid": 17,
+                    "tid": 0,
                 },
             ),
         ],