Merge branch 'release/0.6.4'

syssi · Feb 28, 2021 · 6cd2235 · 6cd2235
2 parents 2356588 + 4881a99
commit 6cd2235
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/.github/workflows/combined.yaml → .github/workflows/ci.yaml b/.github/workflows/combined.yaml → .github/workflows/ci.yaml
@@ -4,6 +4,7 @@ on:
   pull_request:
   schedule:
     - cron: '0 0 * * *'
+
 jobs:
   ci:
     runs-on: ubuntu-latest
@@ -14,15 +15,16 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-python@v2
         name: Setup Python
+        with:
+          python-version: '3.8.x'
       - uses: actions/cache@v2
         name: Cache
         with:
           path: |
             ~/.cache/pip
           key: custom-component-ci
-      - uses: hacs/integration/action@main
+      - uses: hacs/action@main
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CATEGORY: integration
       - uses: KTibow/ha-blueprint@stable
         name: CI

diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ This custom component is more or less the beta version of the [official componen
 | Air Humidifier         | zhimi.humidifier.v1    | | |
 | Air Humidifier CA1     | zhimi.humidifier.ca1   | | |
 | Smartmi Humidifier Evaporator 2  | zhimi.humidifier.ca4   | CJXJSQ04ZM  | |
-| Air Humidifier CB1     | zhimi.humidifier.cb1   | | |
+| Smartmi Evaporative Humidifier   | zhimi.humidifier.cb1   | CJXJSQ02ZM, SKV6001EU  | 8W, 240x240x363mm  |
 | 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 SCK0A45  | deerma.humidifier.jsq1    | SCKOA45, SCK0A45  | 4.5L, <=38dB, 300mL/h, 25W |
@@ -49,9 +49,9 @@ This custom component is more or less the beta version of the [official componen
 | Pedestal Fan Fan ZA3   | zhimi.fan.za3          | | |
 | Pedestal Fan Fan ZA4   | zhimi.fan.za4          | | |
 | Pedestal Fan Fan P5    | dmaker.fan.p5          | | |
-| Pedestal Fan Fan P9     | dmaker.fan.p9         | | Supported as soon as python-miio 0.5.4 is released.  |
-| Pedestal Fan Fan P10    | dmaker.fan.p10        | | Supported as soon as python-miio 0.5.4 is released.  |
-| Mijia Pedestal Fan      | dmaker.fan.p11        | BPLDS03DM  | Supported as soon as python-miio 0.5.4 is released. 2800mAh, 24W, <=58dB  |
+| Pedestal Fan Fan P9     | dmaker.fan.p9         | | |
+| Pedestal Fan Fan P10    | dmaker.fan.p10        | | |
+| Mijia Pedestal Fan      | dmaker.fan.p11        | BPLDS03DM  | 2800mAh, 24W, <=58dB  |
 
 Support unknown / Testing required:
 - Mijia Humidifier 4L (MJJSQ04DY), 300ml/h, 25W, <=38dB: Please create an issue if you own this device.
@@ -360,6 +360,7 @@ This model uses newer MiOT communication protocol.
   - `motor_speed`
   - `power_time`
   - `water_level`
+  - `use_time`
 
 ### Air Humidifier CB (zhimi.humidifier.cb1)
 

diff --git a/custom_components/xiaomi_miio_airpurifier/fan.py b/custom_components/xiaomi_miio_airpurifier/fan.py
@@ -451,6 +451,7 @@
     ATTR_MOTOR_SPEED: "motor_speed",
     ATTR_POWER_TIME: "power_time",
     ATTR_WATER_LEVEL: "water_level",
+    ATTR_USE_TIME: "use_time",
 }
 
 AVAILABLE_ATTRIBUTES_AIRHUMIDIFIER_MJJSQ = {

diff --git a/custom_components/xiaomi_miio_airpurifier/manifest.json b/custom_components/xiaomi_miio_airpurifier/manifest.json
@@ -1,6 +1,7 @@
 {
   "domain": "xiaomi_miio_airpurifier",
   "name": "Xiaomi Mi Air Purifier, Air Humidifier, Air Fresh and Pedestal Fan Integration",
+  "version": "0.6.4",
   "config_flow": false,
   "documentation": "https://github.com/syssi/xiaomi_airpurifier",
   "issue_tracker": "https://github.com/syssi/xiaomi_airpurifier/issues",

diff --git a/docs/dmaker-airfresh-t2017.md b/docs/dmaker-airfresh-t2017.md
@@ -118,6 +118,10 @@ sensor:
         icon_template: mdi:thermometer
       xiaomi_fresh_air_ventilator_current_speed:
         friendly_name: Current speed
+        value_template: '{{ states.fan.xiaomi_fresh_air_ventilator.attributes.control_speed }}'
+        icon_template: mdi:speedometer
+      xiaomi_fresh_air_ventilator_favorite_speed:
+        friendly_name: Favorite speed
         value_template: '{{ states.fan.xiaomi_fresh_air_ventilator.attributes.favorite_speed }}'
         icon_template: mdi:speedometer
       xiaomi_fresh_air_ventilator_ptc_status:
@@ -282,6 +286,7 @@ entities:
   - entity: input_select.xiaomi_fresh_air_ventilator_ptc_level
   - entity: sensor.xiaomi_fresh_air_ventilator_ptc_status
   - entity: sensor.xiaomi_fresh_air_ventilator_current_speed
+  - entity: sensor.xiaomi_fresh_air_ventilator_favorite_speed
   - entity: sensor.xiaomi_fresh_air_ventilator_co2
   - entity: sensor.xiaomi_fresh_air_ventilator_pm25
   - entity: sensor.xiaomi_fresh_air_ventilator_temperature