Skip to content

Import fixes #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
luisjimenezg wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Import fixes #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e56025
Add module name in import statements
luisjimenezg Sep 13, 2023
684e998
Rename a nonexisting function call
luisjimenezg Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions easymodbus/modbusClient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion easymodbus/modbus_protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
4 changes: 1 addition & 3 deletions easymodbus/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down