Skip to content

Solve multiple incomming frames #1107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
janiversen merged 1 commit into from
Oct 12, 2022
+18 −14
Merged

Solve multiple incomming frames #1107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 16 additions & 12 deletions pymodbus/framer/rtu_framer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,21 +232,25 @@ def processIncomingPacket(
unit = [unit]
self.addToFrame(data)
single = kwargs.get("single", False)
if self.isFrameReady():
if self.checkFrame():
if self._validate_unit_id(unit, single):
self._process(callback)
while True:
if self.isFrameReady():
if self.checkFrame():
if self._validate_unit_id(unit, single):
self._process(callback)
else:
header_txt = self._header["uid"]
txt = f"Not a valid unit id - {header_txt}, ignoring!!"
_logger.debug(txt)
self.resetFrame()
break
else:
header_txt = self._header["uid"]
txt = f"Not a valid unit id - {header_txt}, ignoring!!"
_logger.debug(txt)
_logger.debug("Frame check failed, ignoring!!")
self.resetFrame()
break
else:
_logger.debug("Frame check failed, ignoring!!")
self.resetFrame()
else:
txt = f"Frame - [{data}] not ready"
_logger.debug(txt)
txt = f"Frame - [{data}] not ready"
_logger.debug(txt)
break

def buildPacket(self, message):
"""Create a ready to send modbus packet.
Expand Down
4 changes: 2 additions & 2 deletions test/test_framers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,8 @@ def test_rtu_incoming_packet(rtu_framer, data): # pylint: disable=redefined-out
"""Test rtu process incoming packet."""
buffer, units, reset_called, process_called = data

with patch.object(rtu_framer, "_process") as mock_process, patch.object(
rtu_framer, "resetFrame"
with patch.object(rtu_framer, "_process", wraps=rtu_framer._process) as mock_process, patch.object( # pylint: disable=protected-access
rtu_framer, "resetFrame", wraps=rtu_framer.resetFrame
) as mock_reset:
rtu_framer.processIncomingPacket(buffer, Mock(), units)
assert mock_process.call_count == (1 if process_called else 0) # nosec
Expand Down