mirror of
https://github.com/home-assistant/core.git
synced 2025-07-25 22:27:07 +00:00
Don't set friendly_name in Zha entity. (#19991)
Use @property name instead of setting friendly_name device state attr.
This commit is contained in:
parent
6cba51fd0e
commit
5ab3c7b765
@ -13,7 +13,7 @@ from homeassistant.components.zha.const import (
|
|||||||
ATTR_VALUE, ATTR_MANUFACTURER, ATTR_COMMAND, SERVER, ATTR_COMMAND_TYPE,
|
ATTR_VALUE, ATTR_MANUFACTURER, ATTR_COMMAND, SERVER, ATTR_COMMAND_TYPE,
|
||||||
ATTR_ARGS, IN, OUT, CLIENT_COMMANDS, SERVER_COMMANDS)
|
ATTR_ARGS, IN, OUT, CLIENT_COMMANDS, SERVER_COMMANDS)
|
||||||
from homeassistant.components.zha.helpers import bind_configure_reporting
|
from homeassistant.components.zha.helpers import bind_configure_reporting
|
||||||
from homeassistant.const import ATTR_ENTITY_ID, CONF_FRIENDLY_NAME
|
from homeassistant.const import ATTR_ENTITY_ID
|
||||||
from homeassistant.core import callback
|
from homeassistant.core import callback
|
||||||
from homeassistant.helpers import entity
|
from homeassistant.helpers import entity
|
||||||
from homeassistant.helpers.device_registry import CONNECTION_ZIGBEE
|
from homeassistant.helpers.device_registry import CONNECTION_ZIGBEE
|
||||||
@ -34,6 +34,7 @@ class ZhaEntity(entity.Entity):
|
|||||||
**kwargs):
|
**kwargs):
|
||||||
"""Init ZHA entity."""
|
"""Init ZHA entity."""
|
||||||
self._device_state_attributes = {}
|
self._device_state_attributes = {}
|
||||||
|
self._name = None
|
||||||
ieee = endpoint.device.ieee
|
ieee = endpoint.device.ieee
|
||||||
ieeetail = ''.join(['%02x' % (o, ) for o in ieee[-4:]])
|
ieeetail = ''.join(['%02x' % (o, ) for o in ieee[-4:]])
|
||||||
if manufacturer and model is not None:
|
if manufacturer and model is not None:
|
||||||
@ -45,10 +46,7 @@ class ZhaEntity(entity.Entity):
|
|||||||
endpoint.endpoint_id,
|
endpoint.endpoint_id,
|
||||||
kwargs.get(ENTITY_SUFFIX, ''),
|
kwargs.get(ENTITY_SUFFIX, ''),
|
||||||
)
|
)
|
||||||
self._device_state_attributes[CONF_FRIENDLY_NAME] = "{} {}".format(
|
self._name = "{} {}".format(manufacturer, model)
|
||||||
manufacturer,
|
|
||||||
model,
|
|
||||||
)
|
|
||||||
else:
|
else:
|
||||||
self.entity_id = "{}.zha_{}_{}{}".format(
|
self.entity_id = "{}.zha_{}_{}{}".format(
|
||||||
self._domain,
|
self._domain,
|
||||||
@ -233,6 +231,11 @@ class ZhaEntity(entity.Entity):
|
|||||||
cluster = self._out_clusters[cluster_id]
|
cluster = self._out_clusters[cluster_id]
|
||||||
return cluster
|
return cluster
|
||||||
|
|
||||||
|
@property
|
||||||
|
def name(self):
|
||||||
|
"""Return Entity's default name."""
|
||||||
|
return self._name
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def zcl_reporting_config(self):
|
def zcl_reporting_config(self):
|
||||||
"""Return a dict of ZCL attribute reporting configuration.
|
"""Return a dict of ZCL attribute reporting configuration.
|
||||||
@ -302,10 +305,7 @@ class ZhaEntity(entity.Entity):
|
|||||||
'identifiers': {(DOMAIN, ieee)},
|
'identifiers': {(DOMAIN, ieee)},
|
||||||
ATTR_MANUFACTURER: self._endpoint.manufacturer,
|
ATTR_MANUFACTURER: self._endpoint.manufacturer,
|
||||||
'model': self._endpoint.model,
|
'model': self._endpoint.model,
|
||||||
'name': self._device_state_attributes.get(
|
'name': self.name or ieee,
|
||||||
CONF_FRIENDLY_NAME,
|
|
||||||
ieee
|
|
||||||
),
|
|
||||||
'via_hub': (DOMAIN, self.hass.data[DATA_ZHA][DATA_ZHA_BRIDGE_ID]),
|
'via_hub': (DOMAIN, self.hass.data[DATA_ZHA][DATA_ZHA_BRIDGE_ID]),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user