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

Add preset modes to ESPHome fan entities (#103781)

Browse Source 
Co-authored-by: J. Nick Koston <nick@koston.org>
This commit is contained in:
Tucker Kern 2023-12-06 09:53:52 -07:00 committed by GitHub
parent c93abd9d20
commit ff21c02cb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
homeassistant/components/esphome/fan.py
View File

@ -105,6 +105,10 @@ class EsphomeFan(EsphomeEntity[FanInfo, FanState], FanEntity):
key=self._key, direction=_FAN_DIRECTIONS.from_hass(direction) key=self._key, direction=_FAN_DIRECTIONS.from_hass(direction)
) )
async def async_set_preset_mode(self, preset_mode: str) -> None:
"""Set the preset mode of the fan."""
await self._client.fan_command(key=self._key, preset_mode=preset_mode)
@property @property
@esphome_state_property @esphome_state_property
def is_on(self) -> bool | None: def is_on(self) -> bool | None:
@ -144,6 +148,17 @@ class EsphomeFan(EsphomeEntity[FanInfo, FanState], FanEntity):
"""Return the current fan direction.""" """Return the current fan direction."""
return _FAN_DIRECTIONS.from_esphome(self._state.direction) return _FAN_DIRECTIONS.from_esphome(self._state.direction)
@property
@esphome_state_property
def preset_mode(self) -> str | None:
"""Return the current fan preset mode."""
return self._state.preset_mode
@property
def preset_modes(self) -> list[str] | None:
"""Return the supported fan preset modes."""
return self._static_info.supported_preset_modes
@callback @callback
def _on_static_info_update(self, static_info: EntityInfo) -> None: def _on_static_info_update(self, static_info: EntityInfo) -> None:
"""Set attrs from static info.""" """Set attrs from static info."""
@ -156,4 +171,6 @@ class EsphomeFan(EsphomeEntity[FanInfo, FanState], FanEntity):
flags |= FanEntityFeature.SET_SPEED flags |= FanEntityFeature.SET_SPEED
if static_info.supports_direction: if static_info.supports_direction:
flags |= FanEntityFeature.DIRECTION flags |= FanEntityFeature.DIRECTION
if static_info.supported_preset_modes:
flags |= FanEntityFeature.PRESET_MODE
self._attr_supported_features = flags self._attr_supported_features = flags

14
tests/components/esphome/test_fan.py
View File

@ -16,12 +16,14 @@ from homeassistant.components.fan import (
ATTR_DIRECTION, ATTR_DIRECTION,
ATTR_OSCILLATING, ATTR_OSCILLATING,
ATTR_PERCENTAGE, ATTR_PERCENTAGE,
ATTR_PRESET_MODE,
DOMAIN as FAN_DOMAIN, DOMAIN as FAN_DOMAIN,
SERVICE_DECREASE_SPEED, SERVICE_DECREASE_SPEED,
SERVICE_INCREASE_SPEED, SERVICE_INCREASE_SPEED,
SERVICE_OSCILLATE, SERVICE_OSCILLATE,
SERVICE_SET_DIRECTION, SERVICE_SET_DIRECTION,
SERVICE_SET_PERCENTAGE, SERVICE_SET_PERCENTAGE,
SERVICE_SET_PRESET_MODE,
SERVICE_TURN_OFF, SERVICE_TURN_OFF,
SERVICE_TURN_ON, SERVICE_TURN_ON,
STATE_ON, STATE_ON,
@ -145,6 +147,7 @@ async def test_fan_entity_with_all_features_new_api(
supports_direction=True, supports_direction=True,
supports_speed=True, supports_speed=True,
supports_oscillation=True, supports_oscillation=True,
supported_preset_modes=["Preset1", "Preset2"],
) )
] ]
states = [ states = [
@ -154,6 +157,7 @@ async def test_fan_entity_with_all_features_new_api(
oscillating=True, oscillating=True,
speed_level=3, speed_level=3,
direction=FanDirection.REVERSE, direction=FanDirection.REVERSE,
preset_mode=None,
) )
] ]
user_service = [] user_service = []
@ -270,6 +274,15 @@ async def test_fan_entity_with_all_features_new_api(
) )
mock_client.fan_command.reset_mock() mock_client.fan_command.reset_mock()
await hass.services.async_call(
FAN_DOMAIN,
SERVICE_SET_PRESET_MODE,
{ATTR_ENTITY_ID: "fan.test_myfan", ATTR_PRESET_MODE: "Preset1"},
blocking=True,
)
mock_client.fan_command.assert_has_calls([call(key=1, preset_mode="Preset1")])
mock_client.fan_command.reset_mock()
async def test_fan_entity_with_no_features_new_api( async def test_fan_entity_with_no_features_new_api(
hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
@ -285,6 +298,7 @@ async def test_fan_entity_with_no_features_new_api(
supports_direction=False, supports_direction=False,
supports_speed=False, supports_speed=False,
supports_oscillation=False, supports_oscillation=False,
supported_preset_modes=[],
) )
] ]
states = [FanState(key=1, state=True)] states = [FanState(key=1, state=True)]