#333 Fix infinite sleep loop

Author: dhoomakethu

pymodbus/framer/rtu_framer.py

@@ -92,7 +92,7 @@ def checkFrame(self):
             crc = self._buffer[frame_size - 2:frame_size]
             crc_val = (byte2int(crc[0]) << 8) + byte2int(crc[1])
             return checkCRC(data, crc_val)
-        except (IndexError, KeyError):
+        except (IndexError, KeyError, struct.error):
             return False
 
     def advanceFrame(self):
@@ -243,9 +243,8 @@ def sendPacket(self, message):
         :param message: Message to be sent over the bus
         :return:
         """
-        # _logger.debug("Current transaction state - {}".format(
-        #     ModbusTransactionState.to_string(self.client.state))
-        # )
+        start = time.time()
+        timeout = start + self.client.timeout
         while self.client.state != ModbusTransactionState.IDLE:
             if self.client.state == ModbusTransactionState.TRANSACTION_COMPLETE:
                 ts = round(time.time(), 6)
@@ -267,8 +266,13 @@ def sendPacket(self, message):
                     time.sleep(self.client.silent_interval)
                 self.client.state = ModbusTransactionState.IDLE
             else:
-                _logger.debug("Sleeping")
-                time.sleep(self.client.silent_interval)
+                if time.time() > timeout:
+                    _logger.debug("Spent more time than the read time out, "
+                                  "resetting the transaction to IDLE")
+                    self.client.state = ModbusTransactionState.IDLE
+                else:
+                    _logger.debug("Sleeping")
+                    time.sleep(self.client.silent_interval)
         size = self.client.send(message)
         # if size:
         #     _logger.debug("Changing transaction state from 'SENDING' "

pymodbus/version.py

@@ -41,7 +41,7 @@ def __str__(self):
         return '[%s, version %s]' % (self.package, self.short())
 
 
-version = Version('pymodbus', 2, 0, 1)
+version = Version('pymodbus', 2, 0, 2)
 
 
 version.__name__ = 'pymodbus'  # fix epydoc error