From 4c58b5ccb5ddfecf1dcc1f662b3067a89932b608 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Fri, 24 Feb 2023 13:38:49 +0100 Subject: [PATCH 1/2] Solve problem due to mypy changes. --- pymodbus/server/simulator/http_server.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pymodbus/server/simulator/http_server.py b/pymodbus/server/simulator/http_server.py index 537aaf8a1..3961ff406 100644 --- a/pymodbus/server/simulator/http_server.py +++ b/pymodbus/server/simulator/http_server.py @@ -128,6 +128,7 @@ def __init__( "socket": ModbusSocketFramer, "tls": ModbusTlsFramer, } + custom_actions_dict = None if custom_actions_module: actions_module = importlib.import_module(custom_actions_module) custom_actions_dict = actions_module.custom_actions_dict From 7d0cd67f5d3249aab99a9d13403720896a143976 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Fri, 24 Feb 2023 13:52:35 +0100 Subject: [PATCH 2/2] part2. --- pymodbus/server/simulator/http_server.py | 7 ++++--- pymodbus/server/simulator/main.py | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pymodbus/server/simulator/http_server.py b/pymodbus/server/simulator/http_server.py index 3961ff406..82f74fef0 100644 --- a/pymodbus/server/simulator/http_server.py +++ b/pymodbus/server/simulator/http_server.py @@ -128,10 +128,11 @@ def __init__( "socket": ModbusSocketFramer, "tls": ModbusTlsFramer, } - custom_actions_dict = None if custom_actions_module: actions_module = importlib.import_module(custom_actions_module) custom_actions_dict = actions_module.custom_actions_dict + else: + custom_actions_dict = None server = setup["server_list"][modbus_server] server["loop"] = asyncio.get_running_loop() if server["comm"] != "serial": @@ -503,8 +504,8 @@ async def build_json_server(self, params, json_dict): def helper_build_filter(self, params): """Build list of registers matching filter.""" - range_start = params.get("range_start", -1) - range_stop = params.get("range_stop", range_start) + range_start = int(params.get("range_start", -1)) + range_stop = int(params.get("range_stop", range_start)) reg_action = int(params["action"]) reg_writeable = "writeable" in params reg_type = int(params["type"]) diff --git a/pymodbus/server/simulator/main.py b/pymodbus/server/simulator/main.py index 79961333b..09af4928a 100755 --- a/pymodbus/server/simulator/main.py +++ b/pymodbus/server/simulator/main.py @@ -109,6 +109,8 @@ def get_commandline(): async def run_main(): """Run server async.""" cmd_args = get_commandline() + cmd_args["http_port"] = 8081 + cmd_args["json_file"] = "./pymodbus/server/simulator/setup.json" task = ModbusSimulatorServer(**cmd_args) await task.run_forever()