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

Fix xiaomi miio Air Quality Monitor initialization (#55773)

Browse Source
This commit is contained in:
Maciej Bieniek 2021-09-06 15:30:03 +02:00 committed by GitHub
parent e6a29b6a2a
commit 9ee0d8fefe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
homeassistant/components/xiaomi_miio/const.py
View File

@ -118,6 +118,13 @@ MODEL_AIRQUALITYMONITOR_B1 = "cgllc.airmonitor.b1"
MODEL_AIRQUALITYMONITOR_S1 = "cgllc.airmonitor.s1" MODEL_AIRQUALITYMONITOR_S1 = "cgllc.airmonitor.s1"
MODEL_AIRQUALITYMONITOR_CGDN1 = "cgllc.airm.cgdn1" MODEL_AIRQUALITYMONITOR_CGDN1 = "cgllc.airm.cgdn1"
MODELS_AIR_QUALITY_MONITOR = [
MODEL_AIRQUALITYMONITOR_V1,
MODEL_AIRQUALITYMONITOR_B1,
MODEL_AIRQUALITYMONITOR_S1,
MODEL_AIRQUALITYMONITOR_CGDN1,
]
# Light Models # Light Models
MODELS_LIGHT_EYECARE = ["philips.light.sread1"] MODELS_LIGHT_EYECARE = ["philips.light.sread1"]
MODELS_LIGHT_CEILING = ["philips.light.ceiling", "philips.light.zyceiling"] MODELS_LIGHT_CEILING = ["philips.light.ceiling", "philips.light.zyceiling"]

59
homeassistant/components/xiaomi_miio/sensor.py
View File

@ -68,6 +68,7 @@ from .const import (
MODEL_FAN_ZA1, MODEL_FAN_ZA1,
MODEL_FAN_ZA3, MODEL_FAN_ZA3,
MODEL_FAN_ZA4, MODEL_FAN_ZA4,
MODELS_AIR_QUALITY_MONITOR,
MODELS_HUMIDIFIER_MIIO, MODELS_HUMIDIFIER_MIIO,
MODELS_HUMIDIFIER_MIOT, MODELS_HUMIDIFIER_MIOT,
MODELS_HUMIDIFIER_MJJSQ, MODELS_HUMIDIFIER_MJJSQ,
@ -380,23 +381,11 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
host = config_entry.data[CONF_HOST] host = config_entry.data[CONF_HOST]
token = config_entry.data[CONF_TOKEN] token = config_entry.data[CONF_TOKEN]
model = config_entry.data[CONF_MODEL] model = config_entry.data[CONF_MODEL]
device = hass.data[DOMAIN][config_entry.entry_id].get(KEY_DEVICE)
sensors = []
if model in (MODEL_FAN_ZA1, MODEL_FAN_ZA3, MODEL_FAN_ZA4, MODEL_FAN_P5): if model in (MODEL_FAN_ZA1, MODEL_FAN_ZA3, MODEL_FAN_ZA4, MODEL_FAN_P5):
return return
if model in MODEL_TO_SENSORS_MAP:
sensors = MODEL_TO_SENSORS_MAP[model] if model in MODELS_AIR_QUALITY_MONITOR:
elif model in MODELS_HUMIDIFIER_MIOT:
sensors = HUMIDIFIER_MIOT_SENSORS
elif model in MODELS_HUMIDIFIER_MJJSQ:
sensors = HUMIDIFIER_MJJSQ_SENSORS
elif model in MODELS_HUMIDIFIER_MIIO:
sensors = HUMIDIFIER_MIIO_SENSORS
elif model in MODELS_PURIFIER_MIIO:
sensors = PURIFIER_MIIO_SENSORS
elif model in MODELS_PURIFIER_MIOT:
sensors = PURIFIER_MIOT_SENSORS
else:
unique_id = config_entry.unique_id unique_id = config_entry.unique_id
name = config_entry.title name = config_entry.title
_LOGGER.debug("Initializing with host %s (token %s...)", host, token[:5]) _LOGGER.debug("Initializing with host %s (token %s...)", host, token[:5])
@ -408,19 +397,35 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
name, device, config_entry, unique_id, description name, device, config_entry, unique_id, description
) )
) )
for sensor, description in SENSOR_TYPES.items(): else:
if sensor not in sensors: device = hass.data[DOMAIN][config_entry.entry_id][KEY_DEVICE]
continue sensors = []
entities.append( if model in MODEL_TO_SENSORS_MAP:
XiaomiGenericSensor( sensors = MODEL_TO_SENSORS_MAP[model]
f"{config_entry.title} {description.name}", elif model in MODELS_HUMIDIFIER_MIOT:
device, sensors = HUMIDIFIER_MIOT_SENSORS
config_entry, elif model in MODELS_HUMIDIFIER_MJJSQ:
f"{sensor}_{config_entry.unique_id}", sensors = HUMIDIFIER_MJJSQ_SENSORS
hass.data[DOMAIN][config_entry.entry_id][KEY_COORDINATOR], elif model in MODELS_HUMIDIFIER_MIIO:
description, sensors = HUMIDIFIER_MIIO_SENSORS
elif model in MODELS_PURIFIER_MIIO:
sensors = PURIFIER_MIIO_SENSORS
elif model in MODELS_PURIFIER_MIOT:
sensors = PURIFIER_MIOT_SENSORS
for sensor, description in SENSOR_TYPES.items():
if sensor not in sensors:
continue
entities.append(
XiaomiGenericSensor(
f"{config_entry.title} {description.name}",
device,
config_entry,
f"{sensor}_{config_entry.unique_id}",
hass.data[DOMAIN][config_entry.entry_id][KEY_COORDINATOR],
description,
)
) )
)
async_add_entities(entities) async_add_entities(entities)