evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify code, due to better error catching in modbus. (#100483)

Browse source
This commit is contained in:
jan iversen 2023-09-16 13:49:37 +02:00 • committed by GitHub
parent 30d604c851
commit 48dc81eff0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
homeassistant/components/modbus/binary_sensor.py
View file

@ -122,10 +122,7 @@ class ModbusBinarySensor(BasePlatform, RestoreEntity, BinarySensorEntity):
self._result = result.bits self._result = result.bits
else: else:
self._result = result.registers self._result = result.registers
if len(self._result) >= 1:
self._attr_is_on = bool(self._result[0] & 1) self._attr_is_on = bool(self._result[0] & 1)
else:
self._attr_available = False
self.async_write_ha_state() self.async_write_ha_state()
if self._coordinator: if self._coordinator:

5
homeassistant/components/modbus/climate.py
View file

@ -247,10 +247,6 @@ class ModbusThermostat(BaseStructPlatform, RestoreEntity, ClimateEntity):
# remark "now" is a dummy parameter to avoid problems with # remark "now" is a dummy parameter to avoid problems with
# async_track_time_interval # async_track_time_interval
# do not allow multiple active calls to the same platform
if self._call_active:
return
self._call_active = True
self._attr_target_temperature = await self._async_read_register( self._attr_target_temperature = await self._async_read_register(
CALL_TYPE_REGISTER_HOLDING, self._target_temperature_register CALL_TYPE_REGISTER_HOLDING, self._target_temperature_register
) )
@ -282,7 +278,6 @@ class ModbusThermostat(BaseStructPlatform, RestoreEntity, ClimateEntity):
if onoff == 0: if onoff == 0:
self._attr_hvac_mode = HVACMode.OFF self._attr_hvac_mode = HVACMode.OFF
self._call_active = False
self.async_write_ha_state() self.async_write_ha_state()
async def _async_read_register( async def _async_read_register(

5
homeassistant/components/modbus/cover.py
View file

@ -138,14 +138,9 @@ class ModbusCover(BasePlatform, CoverEntity, RestoreEntity):
"""Update the state of the cover.""" """Update the state of the cover."""
# remark "now" is a dummy parameter to avoid problems with # remark "now" is a dummy parameter to avoid problems with
# async_track_time_interval # async_track_time_interval
# do not allow multiple active calls to the same platform
if self._call_active:
return
self._call_active = True
result = await self._hub.async_pb_call( result = await self._hub.async_pb_call(
self._slave, self._address, 1, self._input_type self._slave, self._address, 1, self._input_type
) )
self._call_active = False
if result is None: if result is None:
if self._lazy_errors: if self._lazy_errors:
self._lazy_errors -= 1 self._lazy_errors -= 1

2
homeassistant/components/modbus/modbus.py
View file

@ -261,7 +261,7 @@ class ModbusHub:
"""Initialize the Modbus hub.""" """Initialize the Modbus hub."""
if CONF_CLOSE_COMM_ON_ERROR in client_config: if CONF_CLOSE_COMM_ON_ERROR in client_config:
async_create_issue( # pragma: no cover async_create_issue(
hass, hass,
DOMAIN, DOMAIN,
"deprecated_close_comm_config", "deprecated_close_comm_config",