Skip to content

Commit

Permalink
Merge branch 'refs/heads/master' into v1
Browse files Browse the repository at this point in the history
# Conflicts:
#	custom_components/xiaomi_miot/__init__.py
  • Loading branch information
al-one committed Sep 15, 2024
2 parents 8d44878 + f5a8935 commit e844923
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
14 changes: 7 additions & 7 deletions custom_components/xiaomi_miot/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -919,17 +919,17 @@ def supported_features(self):

@property
def device_info(self):
swv = self.device.info.firmware_version
if self.device.info.hardware_version:
swv = f'{swv}@{self.device.info.hardware_version}'
com = (self.model or 'Xiaomi').split('.', 1)[0]
if updater := self._state_attrs.get('state_updater'):
com = f'{com} via {updater}'
swv = self._miio_info.firmware_version
if self._miio_info.hardware_version:
swv = f'{swv}@{self._miio_info.hardware_version}'
updater = self._state_attrs.get('state_updater')
if updater and updater not in ['none']:
swv = f'{swv} ({updater})'
return {
'identifiers': {(DOMAIN, self._unique_did)},
'name': self.device_name,
'model': self.model,
'manufacturer': com,
'manufacturer': (self.model or 'Xiaomi').split('.', 1)[0],
'sw_version': swv,
'suggested_area': self.device.info.room_name,
'configuration_url': f'https://home.miot-spec.com/s/{self.model}',
Expand Down
3 changes: 3 additions & 0 deletions custom_components/xiaomi_miot/core/device_customizes.py
Original file line number Diff line number Diff line change
Expand Up @@ -1201,6 +1201,9 @@
'number_properties': 'target_temperature,timer',
},

'rhj.sensor_occupy.l730a': {
'sensor_properties': 'illumination,no_one_duration,has_someone_duration',
},
'roborock.vacuum.*': {
'sensor_attributes': 'props:clean_area,props:clean_time,brush_life_level',
'sensor_properties': 'vacuum.status',
Expand Down

0 comments on commit e844923

Please sign in to comment.