jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-27 23:27:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix modbus switch "old style" config problem (#49352)

Browse Source 
Fix that using CONF_HUB in switch, changed the hub for all
subsequent switches.
This commit is contained in:
jan iversen 2021-04-19 19:35:32 +02:00 committed by GitHub
parent a5806b59f2
commit 8acc3f0b03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
homeassistant/components/modbus/binary_sensor.py
View File

@ -89,10 +89,11 @@ async def async_setup_platform(
for entry in discovery_info[CONF_BINARY_SENSORS]: for entry in discovery_info[CONF_BINARY_SENSORS]:
if CONF_HUB in entry: if CONF_HUB in entry:
# from old config! # from old config!
discovery_info[CONF_NAME] = entry[CONF_HUB] hub: ModbusHub = hass.data[MODBUS_DOMAIN][entry[CONF_HUB]]
else:
hub: ModbusHub = hass.data[MODBUS_DOMAIN][discovery_info[CONF_NAME]]
if CONF_SCAN_INTERVAL not in entry: if CONF_SCAN_INTERVAL not in entry:
entry[CONF_SCAN_INTERVAL] = DEFAULT_SCAN_INTERVAL entry[CONF_SCAN_INTERVAL] = DEFAULT_SCAN_INTERVAL
hub: ModbusHub = hass.data[MODBUS_DOMAIN][discovery_info[CONF_NAME]]
sensors.append( sensors.append(
ModbusBinarySensor( ModbusBinarySensor(
hub, hub,

5
homeassistant/components/modbus/sensor.py
View File

@ -167,10 +167,11 @@ async def async_setup_platform(
if CONF_HUB in entry: if CONF_HUB in entry:
# from old config! # from old config!
discovery_info[CONF_NAME] = entry[CONF_HUB] hub: ModbusHub = hass.data[MODBUS_DOMAIN][entry[CONF_HUB]]
else:
hub: ModbusHub = hass.data[MODBUS_DOMAIN][discovery_info[CONF_NAME]]
if CONF_SCAN_INTERVAL not in entry: if CONF_SCAN_INTERVAL not in entry:
entry[CONF_SCAN_INTERVAL] = DEFAULT_SCAN_INTERVAL entry[CONF_SCAN_INTERVAL] = DEFAULT_SCAN_INTERVAL
hub: ModbusHub = hass.data[MODBUS_DOMAIN][discovery_info[CONF_NAME]]
sensors.append( sensors.append(
ModbusRegisterSensor( ModbusRegisterSensor(
hub, hub,

5
homeassistant/components/modbus/switch.py
View File

@ -123,8 +123,9 @@ async def async_setup_platform(
for entry in discovery_info[CONF_SWITCHES]: for entry in discovery_info[CONF_SWITCHES]:
if CONF_HUB in entry: if CONF_HUB in entry:
# from old config! # from old config!
discovery_info[CONF_NAME] = entry[CONF_HUB] hub: ModbusHub = hass.data[MODBUS_DOMAIN][entry[CONF_HUB]]
hub: ModbusHub = hass.data[MODBUS_DOMAIN][discovery_info[CONF_NAME]] else:
hub: ModbusHub = hass.data[MODBUS_DOMAIN][discovery_info[CONF_NAME]]
if entry[CONF_INPUT_TYPE] == CALL_TYPE_COIL: if entry[CONF_INPUT_TYPE] == CALL_TYPE_COIL:
switches.append(ModbusCoilSwitch(hub, entry)) switches.append(ModbusCoilSwitch(hub, entry))
else: else: