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

Emulated Hue + Alexa: Fix devices not discovered and error response (#30013 & #29899) (#31413)

Browse source 
* Revert "Emulated Hue: changed the reported fallback device-type to fix Alexa compatibility issues (#30013)"

This reverts commit ddc8d9e25c.

* Revert "Emulated Hue: updated tests (#30013)"

This reverts commit 90df461e75.

* Emulated Hue + Alexa: changed the fallback device-type again to "Dimmable Light" (#30013) after collective debugging; fixed brightness for on/off-devices and scripts to prevent "device malfunction" response from Alexa (#29899)

* Emulated Hue + Alexa: lint (#30013, #29899)
This commit is contained in:
Martin 2020-02-02 23:52:00 +01:00 • committed by Paulus Schoutsen
parent 3cbd426c52
commit 2c1b465215
2 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
homeassistant/components/emulated_hue/hue_api.py
View file

@ -688,27 +688,25 @@ def entity_to_json(config, entity):
retval["state"].update( retval["state"].update(
{HUE_API_STATE_COLORMODE: "ct", HUE_API_STATE_CT: state[STATE_COLOR_TEMP]} {HUE_API_STATE_COLORMODE: "ct", HUE_API_STATE_CT: state[STATE_COLOR_TEMP]}
) )
elif ( elif entity_features & (
entity_features
& (
SUPPORT_BRIGHTNESS SUPPORT_BRIGHTNESS
| SUPPORT_SET_POSITION | SUPPORT_SET_POSITION
| SUPPORT_SET_SPEED | SUPPORT_SET_SPEED
| SUPPORT_VOLUME_SET | SUPPORT_VOLUME_SET
| SUPPORT_TARGET_TEMPERATURE | SUPPORT_TARGET_TEMPERATURE
) ):
) or entity.domain == script.DOMAIN:
# Dimmable light (Zigbee Device ID: 0x0100) # Dimmable light (Zigbee Device ID: 0x0100)
# Supports groups, scenes, on/off and dimming # Supports groups, scenes, on/off and dimming
retval["type"] = "Dimmable light" retval["type"] = "Dimmable light"
retval["modelid"] = "HASS123" retval["modelid"] = "HASS123"
retval["state"].update({HUE_API_STATE_BRI: state[STATE_BRIGHTNESS]}) retval["state"].update({HUE_API_STATE_BRI: state[STATE_BRIGHTNESS]})
else: else:
# On/off plug-in unit (Zigbee Device ID: 0x0000) # Dimmable light (Zigbee Device ID: 0x0100)
# Supports groups and on/off control # Supports groups, scenes, on/off and dimming
# Used for compatibility purposes with Alexa instead of "On/off light" # Reports fixed brightness for compatibility with Alexa.
retval["type"] = "On/off plug-in unit" retval["type"] = "Dimmable light"
retval["modelid"] = "HASS321" retval["modelid"] = "HASS123"
retval["state"].update({HUE_API_STATE_BRI: HUE_API_STATE_BRI_MAX})
return retval return retval

2
tests/components/emulated_hue/test_hue_api.py
View file

@ -238,7 +238,7 @@ async def test_light_without_brightness_supported(hass_hue, hue_client):
) )
assert light_without_brightness_json["state"][HUE_API_STATE_ON] is True assert light_without_brightness_json["state"][HUE_API_STATE_ON] is True
assert light_without_brightness_json["type"] == "On/off plug-in unit" assert light_without_brightness_json["type"] == "Dimmable light"
async def test_light_without_brightness_can_be_turned_off(hass_hue, hue_client): async def test_light_without_brightness_can_be_turned_off(hass_hue, hue_client):