From 7e560256c04e645fe6227673733914adb872106d Mon Sep 17 00:00:00 2001 From: Luis Jimenez Date: Wed, 13 Sep 2023 09:21:06 +0200 Subject: [PATCH 1/2] Add module name in import statements --- easymodbus/modbusClient.py | 2 +- easymodbus/modbus_protocol.py | 2 +- easymodbus/run.py | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/easymodbus/modbusClient.py b/easymodbus/modbusClient.py index 059646a..86a8d2c 100644 --- a/easymodbus/modbusClient.py +++ b/easymodbus/modbusClient.py @@ -11,7 +11,7 @@ import time from logging.handlers import RotatingFileHandler import math -from modbus_protocol import * +from easymodbus.modbus_protocol import * class ModbusClient(object): diff --git a/easymodbus/modbus_protocol.py b/easymodbus/modbus_protocol.py index c832f39..d7fc552 100644 --- a/easymodbus/modbus_protocol.py +++ b/easymodbus/modbus_protocol.py @@ -1,7 +1,7 @@ import logging from dataclasses import dataclass from enum import Enum, IntEnum -import modbusException as Exceptions +import easymodbus.modbusException as Exceptions class ModbusType(Enum): diff --git a/easymodbus/run.py b/easymodbus/run.py index 9d5dfa2..7cc0e5c 100644 --- a/easymodbus/run.py +++ b/easymodbus/run.py @@ -5,9 +5,7 @@ @author: Stefan Rossmann ''' -# @UnresolvedImport -from modbusClient import * -# @UnresolvedImport +from easymodbus.modbusClient import * modbusClient = ModbusClient('127.0.0.1', 502) #modbusClient = ModbusClient('COM4') From 684e99843cea7e087d6e1e2e2d7a382171b83697 Mon Sep 17 00:00:00 2001 From: Luis Jimenez Date: Wed, 13 Sep 2023 09:22:29 +0200 Subject: [PATCH 2/2] Rename a nonexisting function call --- easymodbus/modbusClient.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easymodbus/modbusClient.py b/easymodbus/modbusClient.py index 86a8d2c..abad6f0 100644 --- a/easymodbus/modbusClient.py +++ b/easymodbus/modbusClient.py @@ -191,7 +191,7 @@ def read_input_registers(self, starting_address, quantity): """ logging.info("Request to read Input Registers (FC04), starting address: {0}, quantity: {1}" .format(str(starting_address), str(quantity))) - return_value = self.read_analogs(starting_address, quantity, FunctionCode.READ_INPUT_REGISTERS) + return_value = self.execute_read_order(starting_address, quantity, FunctionCode.READ_INPUT_REGISTERS) logging.info("Response to Input Registers (FC04), values: {0}" .format(str(return_value))) return return_value