Merge branch 'refs/heads/master' into v1

# Conflicts: # custom_components/xiaomi_miot/manifest.json
al-one · Nov 18, 2024 · e4f7b32 · e4f7b32
2 parents f610c34 + c23fcd8
commit e4f7b32
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 31 deletions.
diff --git a/.github/ISSUE_TEMPLATE/device-issue.yml b/.github/ISSUE_TEMPLATE/device-issue.yml
@@ -59,3 +59,4 @@ body:
       description: |
         > [⚙️ Settings > System > ✍️ Logs](https://my.home-assistant.io/redirect/logs) > 🔍 Filter `miot`
         > [⚙️ 配置 > 系统 > ✍️ 日志](https://my.home-assistant.io/redirect/logs) > 🔍 筛选 `miot`
+        > [🐞 获取调试日志](https://github.com/al-one/hass-xiaomi-miot/issues/500#debug)
diff --git a/custom_components/xiaomi_miot/core/device_customizes.py b/custom_components/xiaomi_miot/core/device_customizes.py
@@ -525,6 +525,14 @@
         'sensor_properties': 'realtime_heart_rate,realtime_breath_rate,realtime_sleepstage',
         'switch_properties': 'fast_update_switch',
     },
+    'devcea.light.ls2307': {
+        'interval_seconds': 60,
+        'exclude_miot_properties': 'update,colorful_set',
+        'switch_properties': 'flex_switch,ac_status,power_on_state,custom_sleep_aid,custom_weak_up',
+        'select_properties': 'ambient_light.mode',
+        'number_properties': 'default_brightness,default_temperature,sleep_aid_time,wake_up_time,'
+                             'gradient_duration_on,gradient_duration_of,gradient_duration_aj,ambient_light.color',
+    },
     'deye.derh.u20a3': {
         'target_humidity_ratio': 9.0909,
     },
@@ -826,7 +834,7 @@
     'leishi.light.*': {
         'exclude_miot_services': 'scenes,scene,scens,remote',
         'exclude_miot_properties': 'default.user_save,professional_setting.delay',
-        'switch_properties': 'flex_switch',
+        'switch_properties': 'flex_switch,wind_reverse',
         'select_properties': 'default.default',
     },
     'leshi.light.wy0b01': {
@@ -1814,35 +1822,7 @@
         'brightness_for_off': 2,
     },
     'zhimi.fan.fb1': {
-        'extend_miot_specs': [
-            {
-                'iid': 2,
-                'properties': [
-                    {'iid': 5, 'value-range': [30, 120, 30]},
-                    {'iid': 6, 'value-range': [30, 90, 30]},
-                ],
-            },
-            {
-                'iid': 5,
-                'properties': [
-                    {
-                        'iid': 6,
-                        'value-list': [
-                            {'value': 'left', 'description': 'Turn Left'},
-                            {'value': 'right', 'description': 'Turn Right'},
-                        ],
-                    },
-                    {
-                        'iid': 7,
-                        'value-list': [
-                            {'value': 'up', 'description': 'Turn Up'},
-                            {'value': 'down', 'description': 'Turn Down'},
-                        ],
-                    },
-                ],
-            },
-        ],
-        'switch_properties': 'alarm,horizontal_swing,vertical_swing,oscillating,h_swing_back,v_swing_back',
+        'switch_properties': 'alarm,horizontal_swing,vertical_swing,oscillating,h_swing_back,v_swing_back,brightness',
         'number_properties': 'timing',
         'percentage_property': 'stepless_fan_level',
         'select_properties': 'mode,horizontal_angle,vertical_angle',

diff --git a/custom_components/xiaomi_miot/core/miot_local_devices.py b/custom_components/xiaomi_miot/core/miot_local_devices.py
@@ -373,6 +373,7 @@
     'leishi.light.eps112',
     'leishi.light.eps118',
     'leishi.light.eps121',
+    'leishi.light.eps125',
     'leishi.light.eps126',
     'leishi.light.eps127',
     'leishi.light.nvc001',

diff --git a/custom_components/xiaomi_miot/core/miot_specs_extend.json b/custom_components/xiaomi_miot/core/miot_specs_extend.json
@@ -1681,6 +1681,34 @@
     }
   ],
 
+  "zhimi.fan.fb1": [
+    {
+      "iid": 2,
+      "properties": [
+          {"iid": 5, "value-range": [30, 120, 30]},
+          {"iid": 6, "value-range": [30, 90, 30]}
+      ]
+    },
+    {
+        "iid": 5,
+        "properties": [
+            {
+                "iid": 6,
+                "value-list": [
+                    {"value": "left", "description": "Turn Left"},
+                    {"value": "right", "description": "Turn Right"}
+                ]
+            },
+            {
+                "iid": 7,
+                "value-list": [
+                    {"value": "up", "description": "Turn Up"},
+                    {"value": "down", "description": "Turn Down"}
+                ]
+            }
+        ]
+    }
+  ],
   "zhimi.fan.za4": [
     {
       "iid": 2,
@@ -1692,7 +1720,7 @@
       ]
     }
   ],
-  
+
   "zhimi.humidifier.ca4": [
     {
       "iid": 2,