adding the ability to override sync client framer

itomsu · Dec 16, 2012 · bdbcc51 · bdbcc51
1 parent 766109b
commit bdbcc51
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/examples/common/synchronous-client.py b/examples/common/synchronous-client.py
@@ -35,6  35,12 @@
 # you can use an existing device, the reference implementation in the tools
 # directory, or start a pymodbus server.
 #
 # If you use the UDP or TCP clients, you can override the framer being used
 # to use a custom implementation (say RTU over TCP). By default they use the
 # socket framer::
 #
 #    client = ModbusClient('localhost', port=5020, framer=ModbusRtuFramer)
 #
 # It should be noted that you can supply an ipv4 or an ipv6 host address for
 # both the UDP and TCP clients.
 #---------------------------------------------------------------------------# 
@@ -55,7  61,6 @@
 # Keep both of these cases in mind when testing as the following will
 # _only_ pass with the supplied async modbus server (script supplied).
 #---------------------------------------------------------------------------# 
-#import pdb;pdb.set_trace()
 rq = client.write_coil(1, True)
 rr = client.read_coils(1,1)
 assert(rq.function_code < 0x80)     # test that we are not an error

diff --git a/pymodbus/client/async.py b/pymodbus/client/async.py
@@ -45,6  45,7 @@ def process():
 import logging
 _logger = logging.getLogger(__name__)
 
 
 #---------------------------------------------------------------------------#
 # A manager for the transaction identifiers
 #---------------------------------------------------------------------------#

diff --git a/pymodbus/client/sync.py b/pymodbus/client/sync.py
@@ -115,18  115,19 @@ class ModbusTcpClient(BaseModbusClient):
     ''' Implementation of a modbus tcp client
     '''
 
-    def __init__(self, host='127.0.0.1', port=Defaults.Port):
     def __init__(self, host='127.0.0.1', port=Defaults.Port, framer=ModbusSocketFramer):
         ''' Initialize a client instance
 
         :param host: The host to connect to (default 127.0.0.1)
         :param port: The modbus port to connect to (default 502)
         :param framer: The modbus framer to use (default ModbusSocketFramer)
 
         .. note:: The host argument will accept ipv4 and ipv6 hosts
         '''
         self.host = host
         self.port = port
         self.socket = None
-        BaseModbusClient.__init__(self, ModbusSocketFramer(ClientDecoder()))
         BaseModbusClient.__init__(self, framer(ClientDecoder()))
 
     def connect(self):
         ''' Connect to the modbus tcp server
@@ -187,16  188,17 @@ class ModbusUdpClient(BaseModbusClient):
     ''' Implementation of a modbus udp client
     '''
 
-    def __init__(self, host='127.0.0.1', port=Defaults.Port):
     def __init__(self, host='127.0.0.1', port=Defaults.Port, framer=ModbusSocketFramer):
         ''' Initialize a client instance
 
         :param host: The host to connect to (default 127.0.0.1)
         :param port: The modbus port to connect to (default 502)
         :param framer: The modbus framer to use (default ModbusSocketFramer)
         '''
         self.host = host
         self.port = port
         self.socket = None
-        BaseModbusClient.__init__(self, ModbusSocketFramer(ClientDecoder()))
         BaseModbusClient.__init__(self, framer(ClientDecoder()))
 
     @classmethod
     def _get_address_family(cls, address):
@@ -307,6  309,7 @@ def __implementation(method):
         if   method == 'ascii':  return ModbusAsciiFramer(ClientDecoder())
         elif method == 'rtu':    return ModbusRtuFramer(ClientDecoder())
         elif method == 'binary': return ModbusBinaryFramer(ClientDecoder())
         elif method == 'socket': return ModbusSocketFramer(ClientDecoder())
         raise ParameterException("Invalid framer method requested")
 
     def connect(self):