Skip to content

Commit 7596232

Browse files
committed
fix kwarg
1 parent 63ed627 commit 7596232

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

classes/transports/modbus_rtu.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class modbus_rtu(modbus_base):
1919
baudrate : int = 9600
2020
client : ModbusSerialClient
2121

22-
pymodbus_address_arg = 'unit'
22+
pymodbus_slave_arg = 'unit'
2323

2424
def __init__(self, settings : SectionProxy, protocolSettings : protocol_settings = None):
2525
#logger = logging.getLogger(__name__)
@@ -44,8 +44,8 @@ def __init__(self, settings : SectionProxy, protocolSettings : protocol_settings
4444
self.addresses = [address]
4545

4646
# pymodbus compatability; unit was renamed to address
47-
if 'address' in inspect.signature(ModbusSerialClient.read_holding_registers).parameters:
48-
self.pymodbus_address_arg = 'address'
47+
if 'slave' in inspect.signature(ModbusSerialClient.read_holding_registers).parameters:
48+
self.pymodbus_slave_arg = 'slave'
4949

5050

5151
# Get the signature of the __init__ method
@@ -68,8 +68,8 @@ def read_registers(self, start, count=1, registry_type : Registry_Type = Registr
6868
kwargs = {'unit': int(self.addresses[0]), **kwargs}
6969

7070
#compatability
71-
if self.pymodbus_address_arg != 'unit':
72-
kwargs['address'] = kwargs.pop('unit')
71+
if self.pymodbus_slave_arg != 'unit':
72+
kwargs['slave'] = kwargs.pop('unit')
7373

7474
if registry_type == Registry_Type.INPUT:
7575
return self.client.read_input_registers(start, count, **kwargs)
@@ -84,8 +84,8 @@ def write_register(self, register : int, value : int, **kwargs):
8484
kwargs = {'unit': self.addresses[0], **kwargs}
8585

8686
#compatability
87-
if self.pymodbus_address_arg != 'unit':
88-
kwargs['address'] = kwargs.pop('unit')
87+
if self.pymodbus_slave_arg != 'unit':
88+
kwargs['slave'] = kwargs.pop('unit')
8989

9090
self.client.write_register(register, value, **kwargs) #function code 0x06 writes to holding register
9191

0 commit comments

Comments
 (0)