feedc0de/homeassistant-core
1
0
Fork 0
forked from home-assistant/core
Code Pull Requests Activity

Revert "Use DeviceInfo in shelly (#58520)" (#59315)

Browse Source 
This reverts commit df6351f86b.
This commit is contained in:
Shay Levy
2021-11-08 01:29:29 +02:00
committed by Paulus Schoutsen
parent e1b8e2ded3
commit 250160f007
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
homeassistant/components/shelly/entity.py
View File

@@ -282,9 +282,6 @@ class ShellyBlockEntity(entity.Entity):
self.wrapper = wrapper self.wrapper = wrapper
self.block = block self.block = block
self._name = get_block_entity_name(wrapper.device, block) self._name = get_block_entity_name(wrapper.device, block)
self._attr_device_info = DeviceInfo(
connections={(device_registry.CONNECTION_NETWORK_MAC, wrapper.mac)}
)
@property @property
def name(self) -> str: def name(self) -> str:
@@ -296,6 +293,13 @@ class ShellyBlockEntity(entity.Entity):
"""If device should be polled.""" """If device should be polled."""
return False return False
@property
def device_info(self) -> DeviceInfo:
"""Device info."""
return {
"connections": {(device_registry.CONNECTION_NETWORK_MAC, self.wrapper.mac)}
}
@property @property
def available(self) -> bool: def available(self) -> bool:
"""Available.""" """Available."""
@@ -344,9 +348,9 @@ class ShellyRpcEntity(entity.Entity):
self.wrapper = wrapper self.wrapper = wrapper
self.key = key self.key = key
self._attr_should_poll = False self._attr_should_poll = False
self._attr_device_info = DeviceInfo( self._attr_device_info = {
connections={(device_registry.CONNECTION_NETWORK_MAC, wrapper.mac)} "connections": {(device_registry.CONNECTION_NETWORK_MAC, wrapper.mac)}
) }
self._attr_unique_id = f"{wrapper.mac}-{key}" self._attr_unique_id = f"{wrapper.mac}-{key}"
self._attr_name = get_rpc_entity_name(wrapper.device, key) self._attr_name = get_rpc_entity_name(wrapper.device, key)
@@ -490,15 +494,19 @@ class ShellyRestAttributeEntity(update_coordinator.CoordinatorEntity):
self.description = description self.description = description
self._name = get_block_entity_name(wrapper.device, None, self.description.name) self._name = get_block_entity_name(wrapper.device, None, self.description.name)
self._last_value = None self._last_value = None
self._attr_device_info = DeviceInfo(
connections={(device_registry.CONNECTION_NETWORK_MAC, wrapper.mac)}
)
@property @property
def name(self) -> str: def name(self) -> str:
"""Name of sensor.""" """Name of sensor."""
return self._name return self._name
@property
def device_info(self) -> DeviceInfo:
"""Device info."""
return {
"connections": {(device_registry.CONNECTION_NETWORK_MAC, self.wrapper.mac)}
}
@property @property
def entity_registry_enabled_default(self) -> bool: def entity_registry_enabled_default(self) -> bool:
"""Return if it should be enabled by default.""" """Return if it should be enabled by default."""