Merge branch 'release/2022.3.3.1'

Author: syssi

README.md

@@ -48,6 +48,7 @@ This custom component is more or less the beta version of the [official componen
 | Mijia Smart Sterilization Humidifier S  | deerma.humidifier.mjjsq  | MJJSQ03DY  | 4.5L, <=39dB, 450mL/h, 40W  |
 | Mijia Intelligent Sterilization Humidifier (EU version?) | deerma.humidifier.jsq  | ZNJSQ01DEM  | 4.5L, <=38dB, 300mL/h, 24W  |
 | Mijia Intelligent Sterilization Humidifier (EU version?) | deerma.humidifier.jsq5  | ZNJSQ01DEM  | 4.5L, <=38dB, 300mL/h, 24W  |
+| Mijia Smart Sterilization Humidifier S (EU version?) | deerma.humidifier.jsqs  | MJJSQ03DY  | 4.5L, <=39dB, 450mL/h, 40W  |
 | Mijia Intelligent Sterilization Humidifier SCK0A45  | deerma.humidifier.jsq1  | SCKOA45, SCK0A45  | 4.5L, <=38dB, 300mL/h, 25W |
 | Zero Fog Humidifier    | shuii.humidifier.jsq001   | | |
 | New Widetech Internet Dehumidifier  | nwt.derh.wdh318efw1  | WDH318EFW1  | 2.7L tank, 38dB, 18L/d, 240W |
@@ -458,7 +459,7 @@ This model uses newer MiOT communication protocol.
 
 This paragraph was moved to [docs/dmaker-airfresh-t2017.md](docs/dmaker-airfresh-t2017.md).
 
-### Air Humidifier MJJSQ and JSQ1 and JSQ5 (deerma.humidifier.mjjsq, deerma.humidifier.jsq1, deerma.humidifier.jsq5)
+### Air Humidifier MJJSQ, JSQ1, JSQ5 and JSQS (deerma.humidifier.mjjsq, deerma.humidifier.jsq1, deerma.humidifier.jsq5, deerma.humidifier.jsqs)
 
 * Power (on, off)
 * Preset modes (low, medium, high, humidity)

custom_components/xiaomi_miio_airpurifier/fan.py

@@ -7,8 +7,6 @@
 
 from miio import (  # pylint: disable=import-error
     AirDogX3,
-    AirDogX5,
-    AirDogX7SM,
     AirFresh,
     AirFreshA1,
     AirFreshT2017,
@@ -25,9 +23,7 @@
     Fan1C,
     FanLeshow,
     FanP5,
-    FanP9,
-    FanP10,
-    FanP11,
+    FanMiot,
 )
 from miio.airfresh import (  # pylint: disable=import-error, import-error
     LedBrightness as AirfreshLedBrightness,
@@ -1179,26 +1175,18 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
     elif model == MODEL_FAN_P5:
         fan = FanP5(host, token, model=model)
         device = XiaomiFanP5(name, fan, model, unique_id, retries)
-    elif model == MODEL_FAN_P9:
-        fan = FanP9(host, token, model=model)
-        device = XiaomiFanMiot(name, fan, model, unique_id, retries)
-    elif model == MODEL_FAN_P10:
-        fan = FanP10(host, token, model=model)
-        device = XiaomiFanMiot(name, fan, model, unique_id, retries)
-    elif model == MODEL_FAN_P11:
-        fan = FanP11(host, token, model=model)
+    elif model in [MODEL_FAN_P9, MODEL_FAN_P10, MODEL_FAN_P11]:
+        fan = FanMiot(host, token, model=model)
         device = XiaomiFanMiot(name, fan, model, unique_id, retries)
     elif model == MODEL_FAN_LESHOW_SS4:
         fan = FanLeshow(host, token, model=model)
         device = XiaomiFanLeshow(name, fan, model, unique_id, retries)
-    elif model == MODEL_AIRPURIFIER_AIRDOG_X3:
-        air_purifier = AirDogX3(host, token)
-        device = XiaomiAirDog(name, air_purifier, model, unique_id, retries)
-    elif model == MODEL_AIRPURIFIER_AIRDOG_X5:
-        air_purifier = AirDogX5(host, token)
-        device = XiaomiAirDog(name, air_purifier, model, unique_id, retries)
-    elif model == MODEL_AIRPURIFIER_AIRDOG_X7SM:
-        air_purifier = AirDogX7SM(host, token)
+    elif model in [
+        MODEL_AIRPURIFIER_AIRDOG_X3,
+        MODEL_AIRPURIFIER_AIRDOG_X5,
+        MODEL_AIRPURIFIER_AIRDOG_X7SM,
+    ]:
+        air_purifier = AirDogX3(host, token, model=model)
         device = XiaomiAirDog(name, air_purifier, model, unique_id, retries)
     elif model in [MODEL_FAN_1C, MODEL_FAN_P8]:
         fan = Fan1C(host, token, model=model)

custom_components/xiaomi_miio_airpurifier/manifest.json

@@ -1,14 +1,14 @@
 {
   "domain": "xiaomi_miio_airpurifier",
   "name": "Xiaomi Mi Air Purifier, Air Humidifier, Air Fresh and Pedestal Fan Integration",
-  "version": "2022.3.3",
+  "version": "2022.3.3.1",
   "iot_class": "local_polling",
   "config_flow": false,
   "documentation": "https://github.com/syssi/xiaomi_airpurifier",
   "issue_tracker": "https://github.com/syssi/xiaomi_airpurifier/issues",
   "requirements": [
     "construct==2.10.56",
-    "python-miio>=0.5.10"
+    "python-miio>=0.5.11"
   ],
   "dependencies": [],
   "codeowners": [