From 1b7ca8f0ce3449c622b017ea4a140dc6488d6b2e Mon Sep 17 00:00:00 2001
From: Komi Atchoglo <komi.atchoglo@stud.uni-due.de>
Date: Thu, 9 Feb 2023 20:50:10 +0100
Subject: [PATCH 1/2] Bug: Fixed caused by passing wrong arg

* Fixed a bug: `got multiple values for keyword argument 'slave'`
---
 pymodbus/repl/client/mclient.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pymodbus/repl/client/mclient.py b/pymodbus/repl/client/mclient.py
index 2bc40fd0f..d4093909c 100644
--- a/pymodbus/repl/client/mclient.py
+++ b/pymodbus/repl/client/mclient.py
@@ -224,7 +224,7 @@ def readwrite_registers(
         read_count,
         write_address,
         write_registers,
-        unit=Defaults.Slave,
+        slave=Defaults.Slave,
         **kwargs,
     ):
         """Read `read_count` number of holding registers.

From afc6b4af54ac530440cc63d6f84a8c4eb0328cec Mon Sep 17 00:00:00 2001
From: Komi Atchoglo <komi.atchoglo@stud.uni-due.de>
Date: Thu, 9 Feb 2023 21:03:46 +0100
Subject: [PATCH 2/2] Bug: Fixed missing parameter changes

---
 pymodbus/repl/client/mclient.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pymodbus/repl/client/mclient.py b/pymodbus/repl/client/mclient.py
index d4093909c..bcf2e1cb3 100644
--- a/pymodbus/repl/client/mclient.py
+++ b/pymodbus/repl/client/mclient.py
@@ -236,7 +236,7 @@ def readwrite_registers(
         :param read_count: Number of registers to read
         :param write_address: register offset to write to
         :param write_registers: List of register values to write (comma separated)
-        :param unit: Modbus slave unit ID
+        :param slave: Modbus slave unit ID
         :param kwargs:
         :return:
         """
@@ -245,7 +245,7 @@ def readwrite_registers(
             read_count=read_count,
             write_address=write_address,
             write_registers=write_registers,
-            unit=unit,
+            slave=slave,
             **kwargs,
         )
         if not resp.isError():
@@ -257,7 +257,7 @@ def mask_write_register(
         address=0x0000,
         and_mask=0xFFFF,
         or_mask=0x0000,
-        unit=Defaults.Slave,
+        slave=Defaults.Slave,
         **kwargs,
     ):
         """Mask content of holding register at `address` with `and_mask` and `or_mask`.
@@ -265,12 +265,12 @@ def mask_write_register(
         :param address: Reference address of register
         :param and_mask: And Mask
         :param or_mask: OR Mask
-        :param unit: Modbus slave unit ID
+        :param slave: Modbus slave unit ID
         :param kwargs:
         :return:
         """
         resp = super().mask_write_register(  # pylint: disable=no-member
-            address=address, and_mask=and_mask, or_mask=or_mask, unit=unit, **kwargs
+            address=address, and_mask=and_mask, or_mask=or_mask, slave=slave, **kwargs
         )
         if not resp.isError():
             return {
@@ -303,14 +303,14 @@ def read_device_information(self, read_code=None, object_id=0x00, **kwargs):
             }
         return ExtendedRequestSupport._process_exception(resp)
 
-    def report_slave_id(self, unit=Defaults.Slave, **kwargs):
+    def report_slave_id(self, slave=Defaults.Slave, **kwargs):
         """Report information about remote slave ID.
 
-        :param unit: Modbus slave unit ID
+        :param slave: Modbus slave unit ID
         :param kwargs:
         :return:
         """
-        request = ReportSlaveIdRequest(unit, **kwargs)
+        request = ReportSlaveIdRequest(slave, **kwargs)
         resp = self.execute(request)  # pylint: disable=no-member
         if not resp.isError():
             return {