fix remaining pymodbus errors

Author: GimmickNG

simulator/modbus/base.py

@@ -471,11 +471,11 @@ async def set_mapping_key(device_name: RemoteDeviceType) -> Tuple[RemoteDeviceTy
             client = AsyncModbusClient(host=device_ip, port=device_port, timeout=300000)
             await client.connect()
             if not client.connected:
-                print(perf_counter(), type(self).__name__, device_name, "@", device_ip, ":", device_port, "=>", type(client.protocol))
+                print(perf_counter(), type(self).__name__, device_name, "@", device_ip, ":", device_port, "=>", type(client))
             mapping: RemoteDeviceMapping = {
                 "ip": IPString(device_ip),
                 "port": device_port,
-                "client": client.protocol,
+                "client": client,
                 "tags": device_class.create_tag_database()
             }
             return (device_name, mapping)

utils/otdump.py

@@ -21,10 +21,10 @@
 async def connect(ip: str, port: int, timeout: float = 1) -> Optional[ModbusBaseClient]:
     client = AsyncModbusClient(host=ip, port=port, timeout=timeout, loop=asyncio.get_running_loop())
     await client.connect()
-    if client.protocol is None:
+    if not client.connected:
         await client.close()
         return None
-    return client.protocol
+    return client
 
 async def read_tags(
     client: ModbusBaseClient,

utils/otset.py

@@ -79,7 +79,7 @@ async def run_tasks(address, class_name, tag_values) -> bool:
     client = AsyncModbusClient(host=ip, port=port, timeout=1, loop=asyncio.get_running_loop())
     await client.connect()
 
-    if client.protocol is not None and class_name in class_list:
+    if client.connected and class_name in class_list:
         device_class = class_list[class_name]
         tag_database = device_class.create_tag_database()
         parsed_tag_values: List[Tuple[Tag, RegisterValue]] = []
@@ -92,7 +92,7 @@ async def run_tasks(address, class_name, tag_values) -> bool:
             if new_value is not None:
                 parsed_tag_values.append((tag_type, new_value))
         if len(parsed_tag_values):
-            await tell_device(client.protocol, args.unit_id, *parsed_tag_values)
+            await tell_device(client, args.unit_id, *parsed_tag_values)
             return True
     return False