feedc0de/homeassistant-core
1
0
Fork 0
forked from home-assistant/core
Code Pull Requests Activity

Hot fix version of Apply modbus interval patch (#51487)

Browse Source
This commit is contained in:
Paulus Schoutsen
2021-06-04 10:02:42 -07:00
committed by GitHub
parent a3c5022956
commit 6f4302ff70
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
homeassistant/components/modbus/__init__.py
View File

@@ -99,7 +99,6 @@ from .const import (
DEFAULT_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL,
DEFAULT_STRUCTURE_PREFIX, DEFAULT_STRUCTURE_PREFIX,
DEFAULT_TEMP_UNIT, DEFAULT_TEMP_UNIT,
MINIMUM_SCAN_INTERVAL,
MODBUS_DOMAIN as DOMAIN, MODBUS_DOMAIN as DOMAIN,
PLATFORMS, PLATFORMS,
) )
@@ -139,27 +138,30 @@ def control_scan_interval(config: dict) -> dict:
for entry in hub[conf_key]: for entry in hub[conf_key]:
scan_interval = entry.get(CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL) scan_interval = entry.get(CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL)
if scan_interval < MINIMUM_SCAN_INTERVAL: if scan_interval == 0:
if scan_interval == 0: continue
continue if scan_interval < 5:
_LOGGER.warning( _LOGGER.warning(
"%s %s scan_interval(%d) is adjusted to minimum(%d)", "%s %s scan_interval(%d) is lower than 5 seconds, "
"which may cause Home Assistant stability issues",
component, component,
entry.get(CONF_NAME), entry.get(CONF_NAME),
scan_interval, scan_interval,
MINIMUM_SCAN_INTERVAL,
) )
scan_interval = MINIMUM_SCAN_INTERVAL
entry[CONF_SCAN_INTERVAL] = scan_interval entry[CONF_SCAN_INTERVAL] = scan_interval
minimum_scan_interval = min(scan_interval, minimum_scan_interval) minimum_scan_interval = min(scan_interval, minimum_scan_interval)
if CONF_TIMEOUT in hub and hub[CONF_TIMEOUT] > minimum_scan_interval - 1: if (
CONF_TIMEOUT in hub
and hub[CONF_TIMEOUT] > minimum_scan_interval - 1
and minimum_scan_interval > 1
):
_LOGGER.warning( _LOGGER.warning(
"Modbus %s timeout(%d) is adjusted(%d) due to scan_interval", "Modbus %s timeout(%d) is adjusted(%d) due to scan_interval",
hub.get(CONF_NAME, ""), hub.get(CONF_NAME, ""),
hub[CONF_TIMEOUT], hub[CONF_TIMEOUT],
minimum_scan_interval - 1, minimum_scan_interval - 1,
) )
hub[CONF_TIMEOUT] = minimum_scan_interval - 1 hub[CONF_TIMEOUT] = minimum_scan_interval - 1
return config return config

1
homeassistant/components/modbus/const.py
View File

@@ -90,7 +90,6 @@ SERVICE_WRITE_REGISTER = "write_register"
# integration names # integration names
DEFAULT_HUB = "modbus_hub" DEFAULT_HUB = "modbus_hub"
MINIMUM_SCAN_INTERVAL = 5 # seconds
DEFAULT_SCAN_INTERVAL = 15 # seconds DEFAULT_SCAN_INTERVAL = 15 # seconds
DEFAULT_SLAVE = 1 DEFAULT_SLAVE = 1
DEFAULT_STRUCTURE_PREFIX = ">f" DEFAULT_STRUCTURE_PREFIX = ">f"