Refine climate

Yonsm · Aug 2, 2023 · 9714b63 · 9714b63
1 parent 9cf43de
commit 9714b63
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 62 deletions.
diff --git a/.HA_VERSION b/.HA_VERSION
@@ -1 +1 @@
-2023.4.1
+2023.4.4
diff --git a/automations/sleeping.yaml b/automations/sleeping.yaml
@@ -9,24 +9,24 @@
       data:
         entity_id: fan.zhu_wo_xin_feng_ji
         preset_mode: 静音
-    # - service: climate.set_temperature
-    #   data:
-    #     entity_id: climate.zhu_wo_kong_diao
-    #     temperature: 20
-    #     hvac_mode: cool
-    # - service: climate.set_temperature
-    #   data:
-    #     entity_id: climate.er_tong_fang_kong_diao
-    #     temperature: 25
-    #     hvac_mode: cool
-    # - service: climate.set_fan_mode
-    #   data:
-    #     entity_id: climate.zhu_wo_kong_diao
-    #     fan_mode: 五档
-    # - service: climate.set_fan_mode
-    #   data:
-    #     entity_id: climate.er_tong_fang_kong_diao
-    #     fan_mode: 五档
+    - service: climate.set_temperature
+      data:
+        entity_id: climate.zhu_wo_kong_diao
+        temperature: 20
+        hvac_mode: cool
+    - service: climate.set_temperature
+      data:
+        entity_id: climate.er_tong_fang_kong_diao
+        temperature: 24
+        hvac_mode: cool
+    - service: climate.set_fan_mode
+      data:
+        entity_id: climate.zhu_wo_kong_diao
+        fan_mode: 五档
+    - service: climate.set_fan_mode
+      data:
+        entity_id: climate.er_tong_fang_kong_diao
+        fan_mode: 五档
 
 - alias: 睡眠开始
   trigger:
@@ -50,23 +50,23 @@
     - platform: time
       at: '00:00:01'
   action:
-    #- service: shell_command.magic_off
-    # - service: climate.set_fan_mode
-    #   data:
-    #     entity_id: climate.zhu_wo_kong_diao
-    #     fan_mode: 一档
-    # - service: climate.set_fan_mode
-    #   data:
-    #     entity_id: climate.er_tong_fang_kong_diao
-    #     fan_mode: 一档
-    # - service: climate.set_temperature
-    #   data:
-    #     entity_id: climate.zhu_wo_kong_diao
-    #     temperature: 22
-    # - service: climate.set_temperature
-    #   data:
-    #     entity_id: climate.er_tong_fang_kong_diao
-    #     temperature: 27
+    - service: shell_command.magic_off
+    - service: climate.set_fan_mode
+      data:
+        entity_id: climate.zhu_wo_kong_diao
+        fan_mode: 一档
+    - service: climate.set_fan_mode
+      data:
+        entity_id: climate.er_tong_fang_kong_diao
+        fan_mode: 一档
+    - service: climate.set_temperature
+      data:
+        entity_id: climate.zhu_wo_kong_diao
+        temperature: 23
+    - service: climate.set_temperature
+      data:
+        entity_id: climate.er_tong_fang_kong_diao
+        temperature: 27
 
 - alias: 睡眠早起
   trigger:
@@ -95,24 +95,24 @@
       data:
         entity_id: fan.zhu_wo_xin_feng_ji
         preset_mode: 中档
-    # - service: climate.set_fan_mode
-    #   data:
-    #     entity_id: climate.zhu_wo_kong_diao
-    #     fan_mode: 自动
-    # - service: climate.set_fan_mode
-    #   data:
-    #     entity_id: climate.er_tong_fang_kong_diao
-    #     fan_mode: 自动
-    # - service: fan.turn_off
-    #   entity_id: fan.er_tong_fang_feng_shan
-    # - service: fan.turn_off
-    #   entity_id: fan.shu_fang_feng_shan
+    - service: climate.set_fan_mode
+      data:
+        entity_id: climate.zhu_wo_kong_diao
+        fan_mode: 自动
+    - service: climate.set_fan_mode
+      data:
+        entity_id: climate.er_tong_fang_kong_diao
+        fan_mode: 自动
+    - service: fan.turn_off
+      entity_id: fan.er_tong_fang_feng_shan
+    - service: fan.turn_off
+      entity_id: fan.shu_fang_feng_shan
     # - service: fan.turn_off
     #   entity_id: fan.zhu_wo_feng_shan
-    # - service: climate.turn_off
-    #   entity_id: climate.zhu_wo_kong_diao
-    # - service: climate.turn_off
-    #   entity_id: climate.er_tong_fang_kong_diao
+    - service: climate.turn_off
+      entity_id: climate.zhu_wo_kong_diao
+    - service: climate.turn_off
+      entity_id: climate.er_tong_fang_kong_diao
     # - service: climate.turn_off
     #   entity_id: climate.shu_fang_kong_diao
     - condition: time

diff --git a/configuration.yaml b/configuration.yaml
@@ -196,8 +196,12 @@ media_player:
 vacuum:
   - platform: zhimijia
     model: viomi.washer.v13
-    name: 浴室洗衣机
+    name: 阳台洗衣机
     did: 410056542
+  - platform: zhimijia
+    model: viomi.washer.v53
+    name: 浴室洗衣机
+    did: 619765138
 #   - platform: xiaomi_miio
 #     name: 扫地机
 #     host: SaoDiJi

diff --git a/fans.yaml b/fans.yaml
@@ -1,14 +1,14 @@
-# - platform: zhimijia
-#   model: zhimi.fan.v3
-#   name: 儿童房风扇
-#   did: 63038010
-# - platform: zhimijia
-#   model: zhimi.fan.fa1
-#   name: 书房风扇
-#   did: 242978949
+- platform: zhimijia
+  model: zhimi.fan.v3
+  name: 儿童房风扇
+  did: 63038010
+- platform: zhimijia
+  model: zhimi.fan.fa1
+  name: 书房风扇
+  did: 242978949
 # - platform: zhimijia
 #   model: zhimi.fan.za3
-#   name: 长辈房风扇
+#   name: 定南风扇
 #   did: 106565511
 - platform: zhimijia
   model: zhimi.airfresh.va2