From 2232915ea830071f9039b221f286ded7fc60096a Mon Sep 17 00:00:00 2001
From: jan iversen <jancasacondor@gmail.com>
Date: Sun, 8 Aug 2021 06:10:08 +0200
Subject: [PATCH] Add parameter to delay sending of requests in modbus (#54203)

---
 homeassistant/components/modbus/__init__.py |  2 ++
 homeassistant/components/modbus/const.py    |  1 +
 homeassistant/components/modbus/modbus.py   | 11 +++++++++--
 tests/components/modbus/test_init.py        |  2 ++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/modbus/__init__.py b/homeassistant/components/modbus/__init__.py
index 16be39230db..43aa49e6da7 100644
--- a/homeassistant/components/modbus/__init__.py
+++ b/homeassistant/components/modbus/__init__.py
@@ -66,6 +66,7 @@ from .const import (
     CONF_INPUT_TYPE,
     CONF_MAX_TEMP,
     CONF_MIN_TEMP,
+    CONF_MSG_WAIT,
     CONF_PARITY,
     CONF_PRECISION,
     CONF_RETRIES,
@@ -283,6 +284,7 @@ MODBUS_SCHEMA = vol.Schema(
         vol.Optional(CONF_DELAY, default=0): cv.positive_int,
         vol.Optional(CONF_RETRIES, default=3): cv.positive_int,
         vol.Optional(CONF_RETRY_ON_EMPTY, default=False): cv.boolean,
+        vol.Optional(CONF_MSG_WAIT): cv.positive_int,
         vol.Optional(CONF_BINARY_SENSORS): vol.All(
             cv.ensure_list, [BINARY_SENSOR_SCHEMA]
         ),
diff --git a/homeassistant/components/modbus/const.py b/homeassistant/components/modbus/const.py
index 10eb07f801e..ef6d7c3fc32 100644
--- a/homeassistant/components/modbus/const.py
+++ b/homeassistant/components/modbus/const.py
@@ -30,6 +30,7 @@ CONF_INPUTS = "inputs"
 CONF_INPUT_TYPE = "input_type"
 CONF_MAX_TEMP = "max_temp"
 CONF_MIN_TEMP = "min_temp"
+CONF_MSG_WAIT = "message_wait_milliseconds"
 CONF_PARITY = "parity"
 CONF_REGISTER = "register"
 CONF_REGISTER_TYPE = "register_type"
diff --git a/homeassistant/components/modbus/modbus.py b/homeassistant/components/modbus/modbus.py
index 77d8b669c24..dad91f26a12 100644
--- a/homeassistant/components/modbus/modbus.py
+++ b/homeassistant/components/modbus/modbus.py
@@ -39,6 +39,7 @@ from .const import (
     CONF_BAUDRATE,
     CONF_BYTESIZE,
     CONF_CLOSE_COMM_ON_ERROR,
+    CONF_MSG_WAIT,
     CONF_PARITY,
     CONF_RETRIES,
     CONF_RETRY_ON_EMPTY,
@@ -227,6 +228,12 @@ class ModbusHub:
                 self._pb_params["framer"] = ModbusRtuFramer
 
         Defaults.Timeout = client_config[CONF_TIMEOUT]
+        if CONF_MSG_WAIT in client_config:
+            self._msg_wait = client_config[CONF_MSG_WAIT] / 1000
+        elif self._config_type == CONF_SERIAL:
+            self._msg_wait = 30 / 1000
+        else:
+            self._msg_wait = 0
 
     def _log_error(self, text: str, error_state=True):
         log_text = f"Pymodbus: {text}"
@@ -322,7 +329,7 @@ class ModbusHub:
             result = await self.hass.async_add_executor_job(
                 self._pymodbus_call, unit, address, value, use_call
             )
-            if self._config_type == "serial":
+            if self._msg_wait:
                 # small delay until next request/response
-                await asyncio.sleep(30 / 1000)
+                await asyncio.sleep(self._msg_wait)
             return result
diff --git a/tests/components/modbus/test_init.py b/tests/components/modbus/test_init.py
index 8b8d063bf02..b9f6420604f 100644
--- a/tests/components/modbus/test_init.py
+++ b/tests/components/modbus/test_init.py
@@ -40,6 +40,7 @@ from homeassistant.components.modbus.const import (
     CONF_BYTESIZE,
     CONF_DATA_TYPE,
     CONF_INPUT_TYPE,
+    CONF_MSG_WAIT,
     CONF_PARITY,
     CONF_STOPBITS,
     CONF_SWAP,
@@ -245,6 +246,7 @@ async def test_exception_struct_validator(do_config):
             CONF_PORT: "usb01",
             CONF_PARITY: "E",
             CONF_STOPBITS: 1,
+            CONF_MSG_WAIT: 100,
         },
         {
             CONF_TYPE: "serial",