deprecated some sub entities

al-one · Oct 31, 2024 · ca2c312 · ca2c312
1 parent 75da37b
commit ca2c312
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 103 deletions.
diff --git a/custom_components/xiaomi_miot/binary_sensor.py b/custom_components/xiaomi_miot/binary_sensor.py
@@ -152,10 +152,6 @@ async def async_added_to_hass(self):
         if rev is not None:
             self._vars['reverse_state'] = rev
 
-    async def async_update_for_main_entity(self):
-        await super().async_update_for_main_entity()
-        self._update_sub_entities(['illumination', 'no_motion_duration'], domain='sensor')
-
     @property
     def is_on(self):
         ret = self._state
@@ -221,7 +217,6 @@ async def async_update_for_main_entity(self):
         if self.custom_config_bool('use_ble_object', True):
             await self.async_update_ble_data()
         await super().async_update_for_main_entity()
-        self._update_sub_entities(['illumination', 'no_motion_duration'], domain='sensor')
 
     async def async_update_ble_data(self):
         did = self.miot_did
@@ -312,43 +307,6 @@ def __init__(self, config, miot_service: MiotService):
                 self._prop_state.name if self._prop_state else 'status',
             )
 
-    async def async_update(self):
-        await super().async_update()
-        if not self._available:
-            return
-        from .fan import MiotModesSubEntity
-        add_fans = self._add_entities.get('fan')
-        pls = self._miot_service.get_properties(
-            'mode', 'washing_strength', 'nozzle_position', 'heat_level',
-        )
-        seat = self._miot_service.spec.get_service('seat')
-        if seat:
-            prop = seat.get_property('heat_level')
-            if prop:
-                pls.append(prop)
-            else:
-                self._update_sub_entities(
-                    ['heating', 'deodorization'],
-                    [seat],
-                    domain='switch',
-                )
-        for p in pls:
-            if not p.value_list and not p.value_range:
-                continue
-            if p.name in self._subs:
-                self._subs[p.name].update()
-            elif add_fans:
-                opt = None
-                if p.name in ['heat_level']:
-                    opt = {
-                        'power_property': p.service.bool_property('heating'),
-                    }
-                self._subs[p.name] = MiotModesSubEntity(self, p, opt)
-                add_fans([self._subs[p.name]], update_before_add=True)
-
-        if self._prop_power:
-            self._update_sub_entities(self._prop_power, None, 'switch')
-
     @property
     def icon(self):
         return 'mdi:toilet'

diff --git a/custom_components/xiaomi_miot/climate.py b/custom_components/xiaomi_miot/climate.py
@@ -263,9 +263,6 @@ async def async_update(self):
                     continue
                 self._update_sub_entities(p, None, 'switch')
 
-            if self._miot_service.name in ['ptc_bath_heater']:
-                self._update_sub_entities(None, ['light', 'light_bath_heater'], domain='light')
-
             if self._miot_service.get_action('start_wash'):
                 pnm = 'action_wash'
                 prop = self._miot_service.get_property('status')

diff --git a/custom_components/xiaomi_miot/core/device_customizes.py b/custom_components/xiaomi_miot/core/device_customizes.py
@@ -2217,7 +2217,7 @@
     },
     {
         'class': MiotLightConv,
-        'services': ['night_light', 'ambient_light', 'plant_light'],
+        'services': ['night_light', 'ambient_light', 'plant_light', 'light_bath_heater'],
     },
     {
         'class': MiotLightConv,

diff --git a/custom_components/xiaomi_miot/humidifier.py b/custom_components/xiaomi_miot/humidifier.py
@@ -100,11 +100,6 @@ async def async_update(self):
                 num = round(num * fac)
             self._attr_target_humidity = num
 
-        if self._prop_water_level and self._prop_water_level.writeable:
-            self._update_sub_entities(
-                [self._prop_water_level.name],
-                domain='number_select',
-            )
         add_fans = self._add_entities.get('fan')
         for p in self._mode_props:
             pnm = p.full_name

diff --git a/custom_components/xiaomi_miot/sensor.py b/custom_components/xiaomi_miot/sensor.py
@@ -219,15 +219,6 @@ async def async_update(self):
                     })
         self._prop_state.description_to_dict(self._state_attrs)
 
-    async def async_update_for_main_entity(self):
-        await super().async_update_for_main_entity()
-
-        self._update_sub_entities(
-            ['motor_control', 'backrest_angle', 'leg_rest_angle'],
-            ['bed', 'backrest_control', 'leg_rest_control'],
-            domain='cover',
-        )
-
     @property
     def device_class(self):
         """Return the class of this entity."""
@@ -266,31 +257,6 @@ def __init__(self, config, miot_service: MiotService):
                 'Idle', 'Completed', 'Shutdown', 'CookFinish', 'Pause', 'Paused', 'Fault', 'Error', 'Stop', 'Off',
             )
 
-    async def async_update(self):
-        await super().async_update()
-        if not self._available:
-            return
-        if self._prop_state:
-            self._update_sub_entities(
-                ['target_temperature'],
-                domain='number',
-            )
-            add_selects = self._add_entities.get('select')
-            pls = self._miot_service.get_properties(
-                'mode', 'cook_mode', 'heat_level', 'target_time', 'target_temperature',
-            )
-            for p in pls:
-                if p.name in self._subs:
-                    self._subs[p.name].update_from_parent()
-                elif not (p.value_list or p.value_range):
-                    continue
-                elif add_selects:
-                    from .select import MiotSelectSubEntity
-                    if p.writeable:
-                        self._subs[p.name] = MiotSelectSubEntity(self, p)
-                    if p.name in self._subs:
-                        add_selects([self._subs[p.name]], update_before_add=True)
-
     @property
     def is_on(self):
         val = self._prop_state.from_dict(self._state_attrs)

diff --git a/custom_components/xiaomi_miot/switch.py b/custom_components/xiaomi_miot/switch.py
@@ -111,24 +111,6 @@ async def async_added_to_hass(self):
                 self._subs[fnm] = MiotSwitchActionSubEntity(self, prop, act)
                 add_switches([self._subs[fnm]], update_before_add=True)
 
-    async def async_update(self):
-        await super().async_update()
-        if not self._available:
-            return
-        self._update_sub_entities(
-            ['heat_level'],
-            ['massager'],
-            domain='fan',
-            option={
-                'power_property': self._miot_service.get_property('heating'),
-            },
-        )
-        self._update_sub_entities(
-            ['mode', 'massage_strength', 'massage_part', 'massage_manipulation'],
-            ['massager'],
-            domain='number_select' if self.entry_config_version >= 0.3 else 'fan',
-        )
-
 
 class SwitchSubEntity(ToggleSubEntity, BaseEntity):
     def __init__(self, parent, attr='switch', option=None, **kwargs):