Broadcast with Handle Local Echo (#1737)

pymodbus-dev · Aug 16, 2023 · 85890dc · 85890dc
1 parent e11fe6b
commit 85890dc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/pymodbus/transaction.py b/pymodbus/transaction.py
@@ -296,6 +296,9 @@ def _transact(self, packet, response_length, full=False, broadcast=False):
                 )
                 self.client.state = ModbusTransactionState.PROCESSING_REPLY
                 return size, None
+            if self.client.comm_params.handle_local_echo is True:
+                if self._recv(size, full) != packet:
+                    return b"", "Wrong local echo"
             if broadcast:
                 if size:
                     Log.debug(
@@ -310,9 +313,6 @@ def _transact(self, packet, response_length, full=False, broadcast=False):
                     'to "WAITING FOR REPLY"'
                 )
                 self.client.state = ModbusTransactionState.WAITING_FOR_REPLY
-            if self.client.comm_params.handle_local_echo is True:
-                if self._recv(size, full) != packet:
-                    return b"", "Wrong local echo"
             result = self._recv(response_length, full)
             # result2 = self._recv(response_length, full)
             Log.debug("RECV: {}", result, ":hex")

diff --git a/test/test_transaction.py b/test/test_transaction.py
@@ -192,6 +192,18 @@ def test_execute(self, mock_time):
         response = trans.execute(request)
         assert response == b"Broadcast write sent - no response expected"
 
+        # Broadcast w/ Local echo
+        client.comm_params.handle_local_echo = True
+        client.params.broadcast_enable = True
+        recv = trans._recv = mock.MagicMock(  # pylint: disable=protected-access
+            return_value=b"deadbeef"
+        )
+        request.slave_id = 0
+        response = trans.execute(request)
+        assert response == b"Broadcast write sent - no response expected"
+        recv.assert_called_once_with(8, False)
+        client.comm_params.handle_local_echo = False
+
     # ----------------------------------------------------------------------- #
     # Dictionary based transaction manager
     # ----------------------------------------------------------------------- #