Set required_features field when registering fan services (#30516)
* Set required_features on fan services * Fix mqtt fan test * Update fan.py
This commit is contained in:
1 parent
a58c796641
commit
8257ea30c0
3 files changed
+35
-31
No files matched your search
@@ -79,17 +79,22 @@ async def async_setup(hass, config: dict):
|
||||
component.async_register_entity_service(SERVICE_TURN_OFF, {}, "async_turn_off")
|
||||
component.async_register_entity_service(SERVICE_TOGGLE, {}, "async_toggle")
|
||||
component.async_register_entity_service(
|
||||
SERVICE_SET_SPEED, {vol.Required(ATTR_SPEED): cv.string}, "async_set_speed"
|
||||
SERVICE_SET_SPEED,
|
||||
{vol.Required(ATTR_SPEED): cv.string},
|
||||
"async_set_speed",
|
||||
[SUPPORT_SET_SPEED],
|
||||
)
|
||||
component.async_register_entity_service(
|
||||
SERVICE_OSCILLATE,
|
||||
{vol.Required(ATTR_OSCILLATING): cv.boolean},
|
||||
"async_oscillate",
|
||||
[SUPPORT_OSCILLATE],
|
||||
)
|
||||
component.async_register_entity_service(
|
||||
SERVICE_SET_DIRECTION,
|
||||
{vol.Optional(ATTR_DIRECTION): cv.string},
|
||||
"async_set_direction",
|
||||
[SUPPORT_DIRECTION],
|
||||
)
|
||||
|
||||
return True
|
||||
|
||||
@@ -121,45 +121,42 @@ class BaseHomeKitFan(HomeKitEntity, FanEntity):
|
||||
|
||||
async def async_set_direction(self, direction):
|
||||
"""Set the direction of the fan."""
|
||||
if self.supported_features & SUPPORT_DIRECTION:
|
||||
await self._accessory.put_characteristics(
|
||||
[
|
||||
{
|
||||
"aid": self._aid,
|
||||
"iid": self._chars["rotation.direction"],
|
||||
"value": DIRECTION_TO_HK[direction],
|
||||
}
|
||||
]
|
||||
)
|
||||
await self._accessory.put_characteristics(
|
||||
[
|
||||
{
|
||||
"aid": self._aid,
|
||||
"iid": self._chars["rotation.direction"],
|
||||
"value": DIRECTION_TO_HK[direction],
|
||||
}
|
||||
]
|
||||
)
|
||||
|
||||
async def async_set_speed(self, speed):
|
||||
"""Set the speed of the fan."""
|
||||
if speed == SPEED_OFF:
|
||||
return await self.async_turn_off()
|
||||
|
||||
if self.supported_features & SUPPORT_SET_SPEED:
|
||||
await self._accessory.put_characteristics(
|
||||
[
|
||||
{
|
||||
"aid": self._aid,
|
||||
"iid": self._chars["rotation.speed"],
|
||||
"value": SPEED_TO_PCNT[speed],
|
||||
}
|
||||
]
|
||||
)
|
||||
await self._accessory.put_characteristics(
|
||||
[
|
||||
{
|
||||
"aid": self._aid,
|
||||
"iid": self._chars["rotation.speed"],
|
||||
"value": SPEED_TO_PCNT[speed],
|
||||
}
|
||||
]
|
||||
)
|
||||
|
||||
async def async_oscillate(self, oscillating: bool):
|
||||
"""Oscillate the fan."""
|
||||
if self.supported_features & SUPPORT_OSCILLATE:
|
||||
await self._accessory.put_characteristics(
|
||||
[
|
||||
{
|
||||
"aid": self._aid,
|
||||
"iid": self._chars["swing-mode"],
|
||||
"value": 1 if oscillating else 0,
|
||||
}
|
||||
]
|
||||
)
|
||||
await self._accessory.put_characteristics(
|
||||
[
|
||||
{
|
||||
"aid": self._aid,
|
||||
"iid": self._chars["swing-mode"],
|
||||
"value": 1 if oscillating else 0,
|
||||
}
|
||||
]
|
||||
)
|
||||
|
||||
async def async_turn_on(self, speed=None, **kwargs):
|
||||
"""Turn the specified fan on."""
|
||||
|
||||
Reference in new issue
Block a user