Skip to content
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.

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

Not restore alfer line fault (dev 1.3.2) #188

Closed
wants to merge 295 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
295 commits
Select commit Hold shift + click to select a range
6c5ebdd
Updating the documentation for the serial client/servers
bashwork Nov 20, 2011
0c28dfa
adding readme to root
bashwork Dec 5, 2011
a92c341
Fixes issue 56
bashwork Jan 17, 2012
59f8cb0
Fixes issue 1
bashwork Jan 17, 2012
3e48cf3
adding a requirements file for virtualenv folk
bashwork Jan 17, 2012
dd9fb0d
adding more cohesive code to the payload utilities
bashwork Feb 26, 2012
92a52f5
forgot to add the new example to the doc index
bashwork Feb 26, 2012
f91cef1
Fixing the rtu size calculation isse #55 on google code
bashwork Feb 26, 2012
b83e12c
using the endian flag in register factory
bashwork Feb 26, 2012
cb25def
fixing bad documentation
bashwork Mar 13, 2012
707c6df
fixing issue 58 on google code
bashwork Mar 22, 2012
6544edc
Fix binary framer and add start and end tokens
deuxpi Mar 29, 2012
5189c2f
Merge pull request #5 from deuxpi/binary-framer-fix
bashwork Mar 30, 2012
9270f2b
Adding checking in the client for an unconnected socket.
bashwork May 2, 2012
bc4898a
Fixing issue 60 on google code (including ez_setup)
bashwork May 2, 2012
58f3de8
fixing github issue #7
bashwork May 21, 2012
fbf8717
adding tests and two utilities
bashwork May 22, 2012
4b2afcc
adding message parser utility
bashwork May 22, 2012
c71fe2d
Fixing extended message decoding
bashwork May 23, 2012
cbf6e84
ModbusSparseDataBlock handled dictionaries incorrectly (they have an …
gjbroom Jun 7, 2012
178ca95
Merge pull request #8 from gjbroom/patch-1
bashwork Jun 7, 2012
d1de763
Updating the Readme.rst to explain how to install in zero dependency …
bashwork Jun 18, 2012
1f380a4
Fixing issue #10
bashwork Jun 18, 2012
6dc259c
updating the client documentation
bashwork Jun 18, 2012
3b191bd
updating the server context documentation
bashwork Jun 18, 2012
b444383
fixes #9 on github
bashwork Jun 18, 2012
5c47b8e
fixing the factory decoding and adding examples
bashwork Jun 18, 2012
46c58e0
pushing to version 1.0
bashwork Jun 18, 2012
2c84fe4
Fixing a bug in the asynchronous client that slipped through.
bashwork Jun 19, 2012
a57c87d
complete tests for the sync client
bashwork Jun 19, 2012
4f42698
cleaning up some pep8 errors
bashwork Jun 19, 2012
1409221
finished unit tests for async client
bashwork Jun 20, 2012
c7f1121
adding another test to the test-install script
bashwork Jun 20, 2012
c6bf024
finished covering sync client
bashwork Jun 28, 2012
dd4913a
updating documentation
bashwork Jun 29, 2012
f43765d
adding another example, adding debug checks
bashwork Jul 2, 2012
e6e20a4
Fixing the serial implementation of everything
bashwork Jul 2, 2012
c584ebf
fixing incorrect rtu lenght calculation
bashwork Jul 12, 2012
8f2c834
Add optional server_address to Sync and Async TCP/UDP Server API
pjkundert Jul 13, 2012
c232a95
Improve erver_address defaults to passing None
pjkundert Jul 13, 2012
eb2f67d
adding a few messages
bashwork Jul 14, 2012
726a423
Adding a message encoding generator for testing.
bashwork Jul 16, 2012
2f97b9b
adding documentation for message formats
bashwork Jul 16, 2012
e1e81b0
Merge pull request #12 from pjkundert/feature-server-address
bashwork Jul 24, 2012
26c7b04
updating documentation and being pedantic
bashwork Jul 24, 2012
0bf3974
Allowing overloading of message encoding
bashwork Sep 27, 2012
d4791f9
Cleaning up the build tools
bashwork Oct 2, 2012
8285cfb
adding support for pydev
bashwork Oct 4, 2012
dbc902d
fixing broken nosetest (/dev/pts) and pydev issues
bashwork Oct 4, 2012
5ba1915
adding bcd payload builder
bashwork Oct 10, 2012
07a499d
reworking contrib packages
bashwork Oct 11, 2012
7ab52cc
adding bcd payload contrib
bashwork Oct 11, 2012
49d0e5e
moving complex examples to contrib
bashwork Oct 11, 2012
a97322b
syncing version on pypi
bashwork Oct 11, 2012
bfcac1f
adding server rest api
bashwork Oct 12, 2012
ed99242
moving web -> bottle
bashwork Oct 12, 2012
fca1500
fixing documentation
bashwork Oct 12, 2012
f697aed
adding gui base
bashwork Oct 15, 2012
dbd4a45
adding initial manager page
bashwork Oct 17, 2012
89098d0
adding data view
bashwork Oct 17, 2012
7d418f2
fixing error in example
bashwork Nov 21, 2012
b304d74
adding the ability to override sync client framer
bashwork Dec 16, 2012
c335d45
updating the performance test
bashwork Dec 16, 2012
545c50d
fixing documentation
bashwork Dec 17, 2012
814ef1c
fixing memory leak in sync client
bashwork Dec 17, 2012
1e5f89d
adding modicon encoder/decoder
bashwork Jan 9, 2013
85945b7
Fix bogus calculation in ModbusSocketFramer.checkFrame
pitrou Jan 28, 2013
ad8a826
Adding sunspec client example
bashwork Feb 3, 2013
04ee590
adding method to retrieve all the device blocks
bashwork Feb 6, 2013
e6e2485
adding the initial mapper interface
bashwork Feb 7, 2013
727c0f5
adding ideas in progress
bashwork Feb 8, 2013
fd99353
adding a modbus datastore saver
bashwork Feb 13, 2013
bce03ed
making lrc/crc read stdin
bashwork Feb 25, 2013
7f6be9b
adding the callback server example
bashwork Mar 17, 2013
68a9346
adding a periodic updating example
bashwork Mar 17, 2013
ecd072a
fixing documentation
bashwork Mar 17, 2013
a968fdb
adding fix for stuck RTU streams
bashwork Mar 20, 2013
874fba3
fixing documentation error
bashwork Mar 20, 2013
0dff42f
Adding an example for changing framers
bashwork Mar 29, 2013
0b291f1
Merge pull request #16 from pitrou/framing-bug
bashwork Apr 2, 2013
61b2b80
Reworking the transaction managers to be explicit
bashwork Apr 2, 2013
69d8225
Bumping the version and adding a changelog
bashwork Apr 2, 2013
1884452
Fixing a logic error in client code
Apr 3, 2013
14a037d
Fixing 2to3 common warnings
May 13, 2013
f7575ea
Fixed example typo in readme
bashwork Jun 5, 2013
d98b372
Adding slave context delete ability
Jun 5, 2013
3e0e5e5
Fixing google code issue 69
bashwork Jun 19, 2013
7f9e3c9
Fixed docstring in synchronous serial client connect() method
idahogray Jun 20, 2013
ea19769
Merge pull request #24 from idahogray/master
bashwork Jul 8, 2013
1d4aa0a
Fix for issue #21
bashwork Jul 15, 2013
a8abfa2
Allowing options to be passed through
bashwork Jul 15, 2013
4703dfa
Adding source_address to TCP client inputs
bashwork Jul 28, 2013
8614024
Typo
jonmills Oct 11, 2013
d7ba4a3
Typo
jonmills Oct 11, 2013
6006481
Typo
jonmills Oct 11, 2013
b5b257a
Typo
jonmills Oct 11, 2013
2cc252f
Merge pull request #35 from jonmills/master
bashwork Oct 22, 2013
77ea6a9
Adding some new examples
Oct 23, 2013
be82996
Adding a concurrent client example
Oct 28, 2013
637a8f6
Allow specification of client connection handler in Modbus...Server
pjkundert Feb 20, 2014
42ee863
Merge pull request #44 from pjkundert/develop
bashwork Jul 18, 2014
6c6213d
Fixes #46
Jul 18, 2014
f6c7c95
Fixes #48
Jul 18, 2014
8c432d6
Adds the option to drop into zero mode for slaves
Jul 23, 2014
0693806
Fixes #42
Jul 23, 2014
ca02f9c
Bumping the version to 1.3.0
Jul 23, 2014
3ca9a38
add missing self operator
schubduese42 Aug 8, 2014
0ca8b5e
typo: fix spelling of Parameter
karlp Sep 30, 2014
87e35e0
async: missing slaves: add missing imports
karlp Sep 30, 2014
fd850ad
Fix zero_mode argument for ModbusSlaveContext
canpolat Oct 24, 2014
41131ee
Fix typo in constants
canpolat Oct 24, 2014
e0723d1
Adding an example and adding tcp timeout
Jan 5, 2015
6535037
fixes #70
Jan 5, 2015
2389d5e
Endianness now used in packing bytes
patrickfuller Jan 7, 2015
333c224
Merge pull request #67 from canpolat/zero_mode
bashwork Feb 18, 2015
14f68ac
Merge pull request #71 from patrickfuller/master
bashwork Feb 18, 2015
4038e22
Merge pull request #65 from remakeelectric/trivial-typo
bashwork Feb 18, 2015
93730d3
Merge pull request #53 from schubduese42/master
bashwork Feb 18, 2015
8c3a16c
Merge pull request #66 from remakeelectric/async-missing-import
bashwork Feb 18, 2015
e12323c
Adding a libmodbus wrapper
Mar 31, 2015
deadfdb
closes #73
Apr 2, 2015
0a78044
Execute methods of Requests accept context
Apr 2, 2015
bfda8f9
Add Modbus RTU syncronous server example
Apr 2, 2015
56628b1
Signal handlers to stop in shutdown().
estan May 3, 2015
e202e3a
WriteMultipleRegistersRequest: Handle values=None case
sjlongland Jun 3, 2015
9726a58
WriteMultipleRegistersRequest: Handle values=None case
sjlongland Jun 3, 2015
ea98abe
Fix payload tests.
sjlongland Jun 4, 2015
356b225
Fix payload tests.
sjlongland Jun 4, 2015
6247f5f
sync.ModbusUdpClient: Correct reference to settimeout.
sjlongland Jun 4, 2015
3263801
sync.ModbusUdpClient: Correct reference to settimeout.
sjlongland Jun 4, 2015
e7cbe24
test-client-sync: Fix UDP connection test.
sjlongland Jun 4, 2015
e27dbb4
test-client-sync: Fix UDP connection test.
sjlongland Jun 4, 2015
82052fc
Lazily initialize InstallManagementConsole
joshkel Sep 1, 2015
7cf058a
Fixes the UDP client socket timeout bug
Sep 26, 2015
942776f
Merge pull request #99 from joshkel/master
bashwork Sep 26, 2015
acfe818
Merge pull request #88 from vrtsystems/fix-udp-sync-client
bashwork Sep 26, 2015
6c7edfc
Merge pull request #88 from vrtsystems/fix-udp-sync-client
bashwork Sep 26, 2015
8ca7cef
Merge pull request #79 from BartDeWaal/master
bashwork Sep 26, 2015
cd9da27
Merge pull request #79 from BartDeWaal/master
bashwork Sep 26, 2015
5801fa0
Merge pull request #81 from estan/master
bashwork Sep 26, 2015
175abc9
Merge pull request #81 from estan/master
bashwork Sep 26, 2015
6949fbf
Implement mask_write_register method in client mixin
inguin Oct 5, 2015
9b71d5f
Implement mask_write_register method in client mixin
inguin Oct 5, 2015
6903ef9
Merge pull request #100 from inguin/master
bashwork Oct 13, 2015
0b9a2e3
Merge pull request #100 from inguin/master
bashwork Oct 13, 2015
1f529d0
Workaround for bug 101 https://github.com/bashwork/pymodbus/issues/101
dhoomakethu Oct 16, 2015
11f7392
Workaround for bug 101 https://github.com/bashwork/pymodbus/issues/101
dhoomakethu Oct 16, 2015
03277f9
Riptide 1.3.0 pymodbus internal pre-release (riptide1) with dhoomaket…
Oct 20, 2015
5900b66
Riptide 1.3.0 pymodbus internal pre-release (riptide1) with dhoomaket…
Oct 20, 2015
e3205b7
Use a PEP 404 compliant version. Start at rc93101 to usurp any other…
Oct 20, 2015
d42fc9d
Use a PEP 404 compliant version. Start at rc93101 to usurp any other…
Oct 20, 2015
4161e35
Document Riptide specific instructions.
Oct 20, 2015
e38c0d9
Merge branch 'master' into riptide (Workaround for bug 101 bashwork#101)
Oct 21, 2015
7511f4b
Merge branch 'master' into riptide (Workaround for bug 101 bashwork#101)
Oct 21, 2015
334cc20
Include Workaround for bug 101 bashwork#101
Oct 21, 2015
b1f2341
Include Workaround for bug 101 bashwork#101
Oct 21, 2015
f4627e0
Merge branch 'fix-101' into patch-fix-101
dhoomakethu Oct 21, 2015
0bc53d5
Better tag names.
Oct 21, 2015
60a7266
Adding modbus payload example
Oct 22, 2015
94d6861
pymodbus fix for modes RTU error cases.
dhoomakethu Nov 16, 2015
42e6a3e
Merge pull request #1 from dhoomakethu/patch-fix-101-for-serial-modbus
dhoomakethu Nov 17, 2015
1e14754
version bumped to c93103
dhoomakethu Nov 20, 2015
b21aa1b
version bumped to c93103
dhoomakethu Nov 20, 2015
054da1d
Merged in patch-fix-101-for-serial-modbus-version-bumped (pull reques…
Nov 20, 2015
a6b41fc
fixed issue with pymodbus timing over serial
dhoomakethu Dec 23, 2015
c040d58
fixed issue with pymodbus timing over serial
dhoomakethu Dec 23, 2015
15711d5
Add RIPTIDE.md to .gitignore
dhoomakethu Dec 23, 2015
24ebb9d
Merge branch 'master' into timing-enhancements
dhoomakethu Dec 23, 2015
a2e18e5
Merge pull request #2 from dhoomakethu/timing-enhancements
dhoomakethu Dec 23, 2015
d4c57c6
Minor corrections in docs
jbiswas Jan 7, 2016
2ce2535
Merged in timing-enhancements (pull request #3)
dhoomakethu Jan 29, 2016
4fd5847
Fix RTU frame size for MEI Read Device Info request
Feb 24, 2016
b951503
Added test case to cover RTU frame size calculation
Feb 24, 2016
4dcd54c
Merge pull request #115 from hamiltonkibbe/read_device_info_fix
bashwork Jun 6, 2016
29d236e
Merge pull request #112 from jbiswas/master
bashwork Jun 6, 2016
ce4fbbf
ModiconPayloadDecoder __init__ fail
semyont Jul 26, 2016
844c75d
Update README.rst
HynekPetrak Sep 23, 2016
99f16da
Merge pull request #132 from HynekPetrak/master
bashwork Sep 28, 2016
ea6a97b
Merge pull request #130 from semyont/patch-1
bashwork Sep 28, 2016
136c1b6
Merge branch 'master' of https://github.com/bashwork/pymodbus into ri…
dhoomakethu Nov 3, 2016
637e831
bump version to rc93105
dhoomakethu Nov 3, 2016
2f45efb
Deleting an extra 'zero' @ default port
Dec 9, 2016
8103978
Merge pull request #144 from mfrata/patch-1
bashwork Jan 4, 2017
9d3629a
Fix doc typo
francozappa Mar 27, 2017
b593b79
1. fix bug with calculating expected pdu size for messages other than…
dhoomakethu May 5, 2017
6e4bb2e
sync bashwork/pymodbus master
dhoomakethu May 5, 2017
09be206
fix error with pdu size for messages other than read/write coil/regis…
dhoomakethu May 5, 2017
b88996b
fix merge conflicts
dhoomakethu May 5, 2017
b81124b
fix merge conflicts
dhoomakethu May 5, 2017
44e776e
fix version file
dhoomakethu May 5, 2017
37c2701
fix unit test failures
dhoomakethu May 5, 2017
7f11535
cleanup
dhoomakethu May 5, 2017
644760a
Merge pull request #154 from francozappa/fix-typo
dhoomakethu May 12, 2017
1d754c9
#162 preparing for 1.3.0
dhoomakethu May 12, 2017
f1265dd
#162 preparing for 1.3.0 - fix tests on MACOSX
dhoomakethu May 12, 2017
e7a20c6
Merge pull request #163 from riptideio/dev
dhoomakethu May 12, 2017
c92026b
#121 changelog updated
dhoomakethu May 12, 2017
eeb7014
1. preparing for release#162
dhoomakethu May 16, 2017
d728cc5
Merge branch 'master' into dev
dhoomakethu May 16, 2017
7ca9066
Misc update Add __maintainer__ field in setup.py
dhoomakethu May 16, 2017
d677fe5
1. #162, creating universal distribution for py2 and py3
dhoomakethu May 16, 2017
3fa5d00
fix test failures
dhoomakethu May 17, 2017
4697015
fix ReadDeviceInformationRequest encoding probelm
dhoomakethu May 17, 2017
edec5d0
Dev (#164)
dhoomakethu May 17, 2017
e06653d
Update CHANGELOG.rst
dhoomakethu May 17, 2017
b49cea7
Update README.rst
dhoomakethu May 17, 2017
0f8f1be
#166 fix failing tests on python 3.5
dhoomakethu May 20, 2017
08eacf9
Merge branch 'master' into dev
dhoomakethu May 20, 2017
057a371
mis - Updated documentation
dhoomakethu May 20, 2017
4e4f039
#167 updated documentation for CI
dhoomakethu May 20, 2017
b16cf55
#167 disable pep8/flake checks for the time being
dhoomakethu May 20, 2017
4db7e6b
#167, fix install dependencies osx, remove pypy from supported python…
dhoomakethu May 20, 2017
b0d863b
#167, fix install dependencies osx, remove pypy from supported python…
dhoomakethu May 20, 2017
a03bce5
#167 , fix minior error in travis.yml
dhoomakethu May 20, 2017
c0da663
Bump version to 1.3.0rc2
dhoomakethu May 20, 2017
46f735f
Add CI support (#168)
dhoomakethu May 20, 2017
6df49dd
Update README.rst
dhoomakethu May 20, 2017
b208242
Merge branch 'master' into dev
dhoomakethu May 20, 2017
0c90ba7
Update README.rst
dhoomakethu May 20, 2017
216121f
Enhancement ModbusTcpClient Timeout (#140)
semyont May 21, 2017
d863c76
updated gitignore
dhoomakethu May 21, 2017
f7c604b
Merge master
dhoomakethu May 21, 2017
e5e3985
Update README.rst
dhoomakethu May 22, 2017
ed0d54d
Fix #170 and other misc updates
dhoomakethu May 25, 2017
a53ea21
Updated Documents
dhoomakethu May 26, 2017
9773abf
Add coverage.rc to show missing lines with coverage >4.0
dhoomakethu May 26, 2017
fe4bafa
new documentation
dhoomakethu May 26, 2017
10d5ab0
#171 Minor bug fix in BinaryPayloadBuilder.add_string method for python3
dhoomakethu May 27, 2017
52770ff
Updated documentation
dhoomakethu May 27, 2017
faa01f6
Preparing for 1.3.0rc2 release (#172)
dhoomakethu May 27, 2017
c1ece03
Update README.rst
dhoomakethu May 27, 2017
6f5f482
* register_write_message.py: Observe skip_encode option when encoding…
bje- May 29, 2017
1210425
Merge branch 'master' into dev
dhoomakethu May 31, 2017
661c816
Recall socket recv until get a complete response. (#143)
ccatterina Jun 5, 2017
90f9169
Revert "Recall socket recv until get a complete response. (#143)" (#178)
dhoomakethu Jun 5, 2017
939d832
Merge branch 'master' into dev
dhoomakethu Jun 8, 2017
ff79b7e
1. #179 fix error calculating response pdu length for read coil/discr…
dhoomakethu Jun 8, 2017
3166b6d
Enable debug logging for send packets
dhoomakethu Jun 8, 2017
488e5e3
#184 prepare for v1.3.1
dhoomakethu Jun 8, 2017
8f86e77
fix error calculating response pdu length for read coil/discrete inpu…
dhoomakethu Jun 8, 2017
a126e4b
Remote single slave context refers to instance (#133)
fleimgruber Jun 17, 2017
625ae60
Merge branch 'master' into dev
dhoomakethu Jun 17, 2017
bdcadf3
Make examples compatible withg python3
dhoomakethu Jun 17, 2017
559c7b8
Recall socket recv until get a complete response. (#180)
ccatterina Jun 22, 2017
4d96b95
Merge branch 'master' into dev
dhoomakethu Jun 22, 2017
f5f9f2c
fix #165, #174, #169, #175, #147, #146
dhoomakethu Jun 22, 2017
548f2a1
#184 updated changelog
dhoomakethu Jun 22, 2017
247657b
#142 move
dhoomakethu Jun 22, 2017
bd4c551
fix #186 +misc updates
dhoomakethu Jun 26, 2017
d12543c
Not restore alfer line fault (dev 1.3.2)
Jul 3, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[report]
show_missing = True
16 changes: 16 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,19 @@ build/
dist/
pymodbus.egg-info/
.coverage
.vscode
.idea
.noseids

.idea/
.tox/
doc/api/epydoc/html/
.vscode/

__pycache__/
pymodbus/__pycache__/
pymodbus/client/__pycache__/
pymodbus/datastore/__pycache__/
pymodbus/internal/__pycache__/
pymodbus/server/__pycache__/
test/__pycache__/
32 changes: 32 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
sudo: false
language: python
matrix:
include:
- os: linux
python: "2.7"
- os: linux
python: "3.4"
- os: linux
python: "3.5"
- os: linux
python: "3.6"
- os: osx
language: generic
before_install:
- if [ $TRAVIS_OS_NAME = osx ]; then brew update; fi
- if [ $TRAVIS_OS_NAME = osx ]; then brew install openssl; fi

install:
# - scripts/travis.sh pip install pip-accel
- scripts/travis.sh pip install coveralls
- scripts/travis.sh pip install --requirement=requirements-checks.txt
- scripts/travis.sh pip install --requirement=requirements-tests.txt
- scripts/travis.sh LC_ALL=C pip install .
script:
# - scripts/travis.sh make check
- scripts/travis.sh make test
after_success:
- scripts/travis.sh coveralls
branches:
except:
- /^[0-9]/
31 changes: 30 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,35 @@
Version 1.2.0
Version 1.3.2
------------------------------------------------------------
* Fix response length calculation for ModbusASCII protocol
* Fix response length calculation ReportSlaveIdResponse, DiagnosticStatusResponse
* Fix never ending transaction case when response is recieved without header and CRC
* Fix tests

Version 1.3.1
------------------------------------------------------------
* Recall socket recv until get a complete response
* Register_write_message.py: Observe skip_encode option when encoding a single register request
* Fix wrong expected response length for coils and discrete inputs
* Fix decode errors with ReadDeviceInformationRequest and ReportSlaveIdRequest on Python3
* Move MaskWriteRegisterRequest/MaskWriteRegisterResponse to register_write_message.py from file_message.py
* Python3 compatible examples [WIP]
* Misc updates with examples

Version 1.3.0.rc2
------------------------------------------------------------
* Fix encoding problem for ReadDeviceInformationRequest method on python3
* Fix problem with the usage of ord in python3 while cleaning up receive buffer
* Fix struct unpack errors with BinaryPayloadDecoder on python3 - string vs bytestring error
* Calculate expected response size for ReadWriteMultipleRegistersRequest
* Enhancement for ModbusTcpClient, ModbusTcpClient can now accept connection timeout as one of the parameter
* Misc updates

Version 1.3.0.rc1
------------------------------------------------------------
* Timing improvements over MODBUS Serial interface
* Modbus RTU use 3.5 char silence before and after transactions
* Bug fix on FifoTransactionManager , flush stray data before transaction
* Update repository information
* Added ability to ignore missing slaves
* Added ability to revert to ZeroMode
* Passed a number of extra options through the stack
Expand Down
64 changes: 64 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# Makefile for the `pymodbus' package.

WORKON_HOME ?= $(HOME)/.virtualenvs
VIRTUAL_ENV ?= $(WORKON_HOME)/pymodbus
PATH := $(VIRTUAL_ENV)/bin:$(PATH)
MAKE := $(MAKE) --no-print-directory
SHELL = bash

default:
@echo 'Makefile for pymodbus'
@echo
@echo 'Usage:'
@echo
@echo ' make install install the package in a virtual environment'
@echo ' make reset recreate the virtual environment'
@echo ' make check check coding style (PEP-8, PEP-257)'
@echo ' make test run the test suite, report coverage'
@echo ' make tox run the tests on all Python versions'
@echo ' make clean cleanup all temporary files'
@echo

install:
@test -d "$(VIRTUAL_ENV)" || mkdir -p "$(VIRTUAL_ENV)"
@test -x "$(VIRTUAL_ENV)/bin/python" || virtualenv --quiet "$(VIRTUAL_ENV)"
@test -x "$(VIRTUAL_ENV)/bin/pip" || easy_install pip
@pip install --quiet --requirement=requirements.txt
@pip uninstall --yes pymodbus &>/dev/null || true
@pip install --quiet --no-deps --ignore-installed .

reset:
$(MAKE) clean
rm -Rf "$(VIRTUAL_ENV)"
$(MAKE) install

check: install
@pip install --upgrade --quiet --requirement=requirements-checks.txt
@flake8

test: install
@pip install --quiet --requirement=requirements-tests.txt
@nosetests --with-coverage --cover-html
@coverage report --fail-under=90

tox: install
@pip install --quiet tox && tox

docs: install
@pip install --quiet sphinx
@cd doc/sphinx && sphinx-build -nb html -d doctrees . html

publish: install
git push origin && git push --tags origin
$(MAKE) clean
pip install --quiet twine wheel
python setup.py sdist bdist_wheel
twine upload dist/*
$(MAKE) clean

clean:
@rm -Rf *.egg .cache .coverage .tox build dist docs/build htmlcov
@find -depth -type d -name __pycache__ -exec rm -Rf {} \;
@find -type f -name '*.pyc' -delete

.PHONY: default install reset check test tox docs publish clean
44 changes: 41 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
.. image:: https://travis-ci.org/riptideio/pymodbus.svg?branch=master
:target: https://travis-ci.org/riptideio/pymodbus

.. image:: https://badges.gitter.im/Join%20Chat.svg
:target: https://gitter.im/pymodbus_dev/Lobby

.. image:: https://readthedocs.org/projects/pymodbus-n/badge/?version=latest
:target: http://pymodbus-n.readthedocs.io/en/latest/?badge=latest
:alt: Documentation Status

============================================================
Summary
============================================================
Expand Down Expand Up @@ -49,6 +59,9 @@ a user to test as many devices as their base operating system will allow (*allow
in this case means how many Virtual IP addresses are allowed).

For more information please browse the project documentation:

http://riptideio.github.io/pymodbus/
or
http://readthedocs.org/docs/pymodbus/en/latest/index.html

------------------------------------------------------------
Expand All @@ -72,7 +85,8 @@ need, feel free to submit them so others can benefit.
Also, if you have questions, please ask them on the mailing list
so that others can benefit from the results and so that I can
trace them. I get a lot of email and sometimes these requests
get lost in the noise: http://groups.google.com/group/pymodbus
get lost in the noise: http://groups.google.com/group/pymodbus or
at gitter: https://gitter.im/pymodbus_dev/Lobby

------------------------------------------------------------
Installing
Expand Down Expand Up @@ -111,19 +125,43 @@ like your device tested, I accept devices via mail or by IP address.
That said, the current work mainly involves polishing the library as
I get time doing such tasks as:

* Add CI support
* Make PEP-8 compatible and flake8 ready
* Fixing bugs/feature requests
* Architecture documentation
* Functional testing against any reference I can find
* The remaining edges of the protocol (that I think no one uses)


------------------------------------------------------------
Development Instructions
------------------------------------------------------------
The current code base is compatible with both py2 and py3.
Use make to perform a range of activities

::

$ make
Makefile for pymodbus

Usage:

make install install the package in a virtual environment
make reset recreate the virtual environment
make check check coding style (PEP-8, PEP-257)
make test run the test suite, report coverage
make tox run the tests on all Python versions
make clean cleanup all temporary files


------------------------------------------------------------
License Information
------------------------------------------------------------

Pymodbus is built on top of code developed from/by:
* Copyright (c) 2001-2005 S.W.A.C. GmbH, Germany.
* Copyright (c) 2001-2005 S.W.A.C. Bohemia s.r.o., Czech Republic.
* Hynek Petrak <[email protected]>

* Hynek Petrak, https://github.com/HynekPetrak
* Twisted Matrix

Released under the BSD License
Loading