From 26b0b85a67fcce9678f152b0e5a7de56beaa014e Mon Sep 17 00:00:00 2001 From: Kirill Kulakov Date: Sun, 5 Mar 2023 19:55:37 -0600 Subject: [PATCH 1/3] Add sensor illuminance sensor support xiaomi s2 air purifier --- homeassistant/components/xiaomi_miio/sensor.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/homeassistant/components/xiaomi_miio/sensor.py b/homeassistant/components/xiaomi_miio/sensor.py index bbf2764ceb6f65..607d0b9a53d73d 100644 --- a/homeassistant/components/xiaomi_miio/sensor.py +++ b/homeassistant/components/xiaomi_miio/sensor.py @@ -69,6 +69,7 @@ MODEL_AIRPURIFIER_V2, MODEL_AIRPURIFIER_V3, MODEL_AIRPURIFIER_ZA1, + MODEL_AIRPURIFIER_MA2, MODEL_FAN_P5, MODEL_FAN_V2, MODEL_FAN_V3, @@ -467,6 +468,15 @@ class XiaomiMiioSensorDescription(SensorEntityDescription): ATTR_HUMIDITY, ATTR_TEMPERATURE, ) +PURIFIER_MA2_SENSORS = ( + ATTR_FILTER_LIFE_REMAINING, + ATTR_FILTER_USE, + ATTR_HUMIDITY, + ATTR_MOTOR_SPEED, + ATTR_PM25, + ATTR_TEMPERATURE, + ATTR_USE_TIME, +) PURIFIER_V2_SENSORS = ( ATTR_FILTER_LIFE_REMAINING, ATTR_FILTER_USE, @@ -564,6 +574,7 @@ class XiaomiMiioSensorDescription(SensorEntityDescription): MODEL_AIRPURIFIER_V2: PURIFIER_V2_SENSORS, MODEL_AIRPURIFIER_V3: PURIFIER_V3_SENSORS, MODEL_AIRPURIFIER_ZA1: PURIFIER_ZA1_SENSORS, + MODEL_AIRPURIFIER_MA2: PURIFIER_MA2_SENSORS, MODEL_FAN_V2: FAN_V2_V3_SENSORS, MODEL_FAN_V3: FAN_V2_V3_SENSORS, MODEL_FAN_ZA5: FAN_ZA5_SENSORS, From b25af360157490c5140049781f4625b3bb7b28fa Mon Sep 17 00:00:00 2001 From: Kirill Kulakov Date: Sun, 5 Mar 2023 19:55:37 -0600 Subject: [PATCH 2/3] Add sensor illuminance sensor support xiaomi s2 air purifier --- homeassistant/components/xiaomi_miio/sensor.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/homeassistant/components/xiaomi_miio/sensor.py b/homeassistant/components/xiaomi_miio/sensor.py index bbf2764ceb6f65..72bb5c64e6e3ac 100644 --- a/homeassistant/components/xiaomi_miio/sensor.py +++ b/homeassistant/components/xiaomi_miio/sensor.py @@ -69,6 +69,7 @@ MODEL_AIRPURIFIER_V2, MODEL_AIRPURIFIER_V3, MODEL_AIRPURIFIER_ZA1, + MODEL_AIRPURIFIER_MA2, MODEL_FAN_P5, MODEL_FAN_V2, MODEL_FAN_V3, @@ -418,6 +419,7 @@ class XiaomiMiioSensorDescription(SensorEntityDescription): ATTR_PURIFY_VOLUME, ATTR_TEMPERATURE, ATTR_USE_TIME, + ATTR_ILLUMINANCE, ) PURIFIER_4_LITE_SENSORS = ( ATTR_FILTER_LIFE_REMAINING, @@ -467,6 +469,15 @@ class XiaomiMiioSensorDescription(SensorEntityDescription): ATTR_HUMIDITY, ATTR_TEMPERATURE, ) +PURIFIER_MA2_SENSORS = ( + ATTR_FILTER_LIFE_REMAINING, + ATTR_FILTER_USE, + ATTR_HUMIDITY, + ATTR_MOTOR_SPEED, + ATTR_PM25, + ATTR_TEMPERATURE, + ATTR_USE_TIME, +) PURIFIER_V2_SENSORS = ( ATTR_FILTER_LIFE_REMAINING, ATTR_FILTER_USE, @@ -564,6 +575,7 @@ class XiaomiMiioSensorDescription(SensorEntityDescription): MODEL_AIRPURIFIER_V2: PURIFIER_V2_SENSORS, MODEL_AIRPURIFIER_V3: PURIFIER_V3_SENSORS, MODEL_AIRPURIFIER_ZA1: PURIFIER_ZA1_SENSORS, + MODEL_AIRPURIFIER_MA2: PURIFIER_MA2_SENSORS, MODEL_FAN_V2: FAN_V2_V3_SENSORS, MODEL_FAN_V3: FAN_V2_V3_SENSORS, MODEL_FAN_ZA5: FAN_ZA5_SENSORS, From 7fe3fda633496b22012e5cab1d5762837c28090b Mon Sep 17 00:00:00 2001 From: Kirill Kulakov Date: Sun, 5 Mar 2023 20:38:31 -0600 Subject: [PATCH 3/3] fix sorting --- homeassistant/components/xiaomi_miio/sensor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/xiaomi_miio/sensor.py b/homeassistant/components/xiaomi_miio/sensor.py index 8fde2bcbcdd32c..249774519d0832 100644 --- a/homeassistant/components/xiaomi_miio/sensor.py +++ b/homeassistant/components/xiaomi_miio/sensor.py @@ -64,12 +64,12 @@ MODEL_AIRPURIFIER_4_LITE_RMA1, MODEL_AIRPURIFIER_4_LITE_RMB1, MODEL_AIRPURIFIER_4_PRO, + MODEL_AIRPURIFIER_MA2, MODEL_AIRPURIFIER_PRO, MODEL_AIRPURIFIER_PRO_V7, MODEL_AIRPURIFIER_V2, MODEL_AIRPURIFIER_V3, MODEL_AIRPURIFIER_ZA1, - MODEL_AIRPURIFIER_MA2, MODEL_FAN_P5, MODEL_FAN_V2, MODEL_FAN_V3,