Merge branch 'refs/heads/master' into v1

# Conflicts: # custom_components/xiaomi_miot/__init__.py
al-one · Oct 29, 2024 · 1f59fce · 1f59fce
2 parents 81c803d + 1410332
commit 1f59fce
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/custom_components/xiaomi_miot/__init__.py b/custom_components/xiaomi_miot/__init__.py
@@ -1477,6 +1477,10 @@ def _update_sub_entities(self, properties, services=None, domain=None, option=No
                     from .select import MiotSelectSubEntity
                     self._subs[fnm] = MiotSelectSubEntity(self, p, option=opt)
                     add_selects([self._subs[fnm]], update_before_add=True)
+                elif add_texts and domain == 'text' and p.writeable:
+                    from .text import MiotTextSubEntity
+                    self._subs[fnm] = MiotTextSubEntity(self, p, option=opt)
+                    add_texts([self._subs[fnm]], update_before_add=True)
                 elif add_device_trackers and domain == 'scanner' and (p.is_bool or p.is_integer):
                     from .device_tracker import MiotScannerSubEntity
                     self._subs[fnm] = MiotScannerSubEntity(self, p, option=opt)

diff --git a/custom_components/xiaomi_miot/core/device_customizes.py b/custom_components/xiaomi_miot/core/device_customizes.py
@@ -840,11 +840,11 @@
     'linp.switch.s2dw3': {
         'main_miot_services': 'switch-2',
         'button_actions': 'reboot',
-        'sensor_properties': 'text_a,text_b,text_c,text_d',
-        'switch_properties': 'screen.on,auto-screen-off,auto-screen-brightness,night-mode',
-        'select_properties': 'mode,default-power-on-state,auto-screen-off-time,screen-switch,sensitivity',
+        'switch_properties': 'screen.on,auto_screen_off,auto_screen_brightness,night_mode',
+        'select_properties': 'mode,default_power_on_state,auto_screen_off_time,screen_switch,sensitivity',
         'number_properties': 'brightness',
-        'light_services': 'vd-light-a,vd-light-b,vd-light-c',
+        'text_properties': 'text_a,text_b,text_c,text_s',
+        'light_services': 'vd_light_a,vd_light_b,vd_light_c',
     },
     'lumi.acpartner.mcn02': {
         'miio_cloud_props': [],
@@ -1137,6 +1137,14 @@
         'number_properties': 'function_countdown.warm,function_countdown.blower,'
                              'function_countdown.breath,function_countdown,shutdown',
     },
+    'opple.light.dcfan2': {
+        'sensor_properties': 'temperature',
+        'switch_properties': 'cycle_switch,mode_switch,switch,intelligent_speed,circle_air,bwind_rotate,'
+                             'fan_countdown_switch',
+        'select_properties': 'nursing_value,fan_level,buzzer_status',
+        'number_properties': 'temp_set,fan_countdown_time',
+        'percentage_property': 'fan_advance.speed',
+    },
     'opple.light.yrtd': {
         'switch_properties': 'night_light,time_display,wake_up_at_night,voice',
         'select_properties': 'study_time',