1. Fix tornado async serial client TypeError while processing incoming packet.

2. Fix asyncio examples.
3. Minor update in factory.py, now server logs prints received request instead of only function cod

Author: dhoomakethu

examples/common/async_asyncio_serial_client.py

@@ -49,9 +49,6 @@ async def start_async_test(client):
     # which defaults to `0x00`
     # ----------------------------------------------------------------------- #
     try:
-        log.debug("Reading Coils")
-        rr = client.read_coils(1, 1, unit=UNIT)
-
     # ----------------------------------------------------------------------- #
         # example requests
     # ----------------------------------------------------------------------- #
@@ -137,7 +134,7 @@ async def start_async_test(client):
     # socat -d -d PTY,link=/tmp/ptyp0,raw,echo=0,ispeed=9600 PTY,
     # link=/tmp/ttyp0,raw,echo=0,ospeed=9600
     loop, client = ModbusClient(schedulers.ASYNC_IO, port='/tmp/ptyp0',
-                                baudrate=9600, timeout=2, method="rtu")
+                                baudrate=9600, method="rtu")
     loop.run_until_complete(start_async_test(client.protocol))
     loop.close()
 

examples/common/async_tornado_client_serial.py

@@ -24,7 +24,10 @@
 # configure the client logging
 # ---------------------------------------------------------------------------#
 import logging
-logging.basicConfig()
+
+FORMAT = ('%(asctime)-15s %(threadName)-15s'
+          ' %(levelname)-8s %(module)-15s:%(lineno)-8s %(message)s')
+logging.basicConfig(format=FORMAT)
 log = logging.getLogger()
 log.setLevel(logging.DEBUG)
 

pymodbus/client/asynchronous/tornado/__init__.py

@@ -175,9 +175,11 @@ def callback(*args):
                     data = self.stream.connection.read(waiting)
                     LOGGER.debug(
                         "recv: " + " ".join([hex(byte2int(x)) for x in data]))
+                    unit = self.framer.decode_data(data).get("uid", 0)
                     self.framer.processIncomingPacket(
                         data,
                         self._handle_response,
+                        unit,
                         tid=request.transaction_id
                     )
                     break

pymodbus/factory.py

@@ -124,10 +124,17 @@ def _helper(self, data):
         :returns: The decoded request or illegal function request object
         """
         function_code = byte2int(data[0])
-        _logger.debug("Factory Request[%d]" % function_code)
         request = self.__lookup.get(function_code, lambda: None)()
         if not request:
+            _logger.debug("Factory Request[%d]" % function_code)
             request = IllegalFunctionRequest(function_code)
+        else:
+            fc_string = "%s: %s" % (
+                str(self.__lookup[function_code]).split('.')[-1].rstrip(
+                    "'>"),
+                function_code
+            )
+            _logger.debug("Factory Request[%s]" % fc_string)
         request.decode(data[1:])
 
         if hasattr(request, 'sub_function_code'):