Skip to content

#515 fix repl broadcast #531

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
merged 13 commits into from
Sep 11, 2020
Merged

#515 fix repl broadcast #531

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e402d9f
1. update requirements
dhoomakethu Jul 3, 2020
70c533a
#516 custom data block fix
dhoomakethu Jul 28, 2020
126983b
Fix broadcast error with REPL client #515
dhoomakethu Sep 8, 2020
0301b4a
Fix #509 Wrong unit ID referenced in framers
dhoomakethu Sep 8, 2020
e2dc876
Update documentation for serial forwarder example. Fixes #525
dhoomakethu Sep 8, 2020
dff529c
Merge branch 'dev' into #515-Fix-Repl-Broadcast
dhoomakethu Sep 8, 2020
55bf3ad
Fix unit tests, support python 3.8 for tests, renamed: pymodbus/se…
dhoomakethu Sep 8, 2020
a20a97f
Ignore python3 code syntax while reporting coverage
dhoomakethu Sep 8, 2020
fd34bc2
Fix tests failing on python 3.6 and osx
dhoomakethu Sep 9, 2020
37bf787
Fix typo in makefile
dhoomakethu Sep 9, 2020
f4425f7
Fix test execution errors specific to python3.6
dhoomakethu Sep 9, 2020
d585a2f
Osx travis issue - Fix trial 1
dhoomakethu Sep 10, 2020
85a04d6
Travis reverting xcode to 8.x for mac osx
dhoomakethu Sep 11, 2020
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
Prev Previous commit
Next Next commit
Fix #509 Wrong unit ID referenced in framers
  • Loading branch information
@dhoomakethu
dhoomakethu committed Sep 8, 2020
commit 0301b4ada344c91096e86a42e43f2272be0f5c6d
1 change: 1 addition & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Version 2.4.0
* Add local echo option
* Add exponential backoffs on retries.
* REPL - Support broadcasts.
* Fix framers using wrong unit address.

Version 2.3.0
-----------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion pymodbus/client/asynchronous/asyncio/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ def _dataReceived(self, data):
:param data: The data returned from the server
'''
_logger.debug("recv: " + " ".join([hex(byte2int(x)) for x in data]))
unit = self.framer.decode_data(data).get("uid", 0)
unit = self.framer.decode_data(data).get("unit", 0)
self.framer.processIncomingPacket(data, self._handleResponse, unit=unit)

def _handleResponse(self, reply, **kwargs):
Expand Down
2 changes: 1 addition & 1 deletion pymodbus/client/asynchronous/tornado/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def on_receive(self, *args):
if not data:
return
LOGGER.debug("recv: " + " ".join([hex(byte2int(x)) for x in data]))
unit = self.framer.decode_data(data).get("uid", 0)
unit = self.framer.decode_data(data).get("unit", 0)
self.framer.processIncomingPacket(data, self._handle_response, unit=unit)

def execute(self, request=None):
Expand Down
2 changes: 1 addition & 1 deletion pymodbus/client/asynchronous/twisted/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def dataReceived(self, data):

:param data: The data returned from the server
"""
unit = self.framer.decode_data(data).get("uid", 0)
unit = self.framer.decode_data(data).get("unit", 0)
self.framer.processIncomingPacket(data, self._handleResponse,
unit=unit)

Expand Down
2 changes: 1 addition & 1 deletion pymodbus/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def __str__(self):
return '[%s, version %s]' % (self.package, self.short())


version = Version('pymodbus', 2, 4, 0)
version = Version('pymodbus', 2, 4, 0, 'rc2')


version.__name__ = 'pymodbus' # fix epydoc error
Expand Down