Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions pymodbus/client/serial.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,11 +218,23 @@ def __init__(
self.socket = None

self.last_frame_end = None

self._t0 = float((1 + 8 + 2)) / self.params.baudrate

"""
The minimum delay is 0.01s and the maximum can be set to 0.05s.
Setting too large a setting affects efficiency.
"""
self._recv_interval = (
(round((100 * self._t0), 2) + 0.01)
if (round((100 * self._t0), 2) + 0.01) < 0.05
else 0.05
)

if isinstance(self.framer, ModbusRtuFramer):
if self.params.baudrate > 19200:
self.silent_interval = 1.75 / 1000 # ms
else:
self._t0 = float((1 + 8 + 2)) / self.params.baudrate
self.inter_char_timeout = 1.5 * self._t0
self.silent_interval = 3.5 * self._t0
self.silent_interval = round(self.silent_interval, 6)
Expand Down Expand Up @@ -318,7 +330,7 @@ def _wait_for_data(self):
if available and available != size:
more_data = True
size = available
time.sleep(0.01)
time.sleep(self._recv_interval)
return size

def recv(self, size):
Expand All @@ -331,7 +343,7 @@ def recv(self, size):
if size is None:
size = self._wait_for_data()
if size > self._in_waiting():
size = self._wait_for_data()
self._wait_for_data()
result = self.socket.read(size)
return result

Expand Down
2 changes: 1 addition & 1 deletion test/test_client_sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ def test_basic_sync_serial_client(self, mock_serial):
self.assertEqual(0, client.send(None))
client.state = 0
self.assertEqual(1, client.send(b"\x00"))
self.assertEqual(b"", client.recv(1))
self.assertEqual(b"\x00", client.recv(1))

# connect/disconnect
self.assertTrue(client.connect())
Expand Down