diff --git a/homeassistant/components/tado/__init__.py b/homeassistant/components/tado/__init__.py index ab64183a142..228ac48bcb2 100644 --- a/homeassistant/components/tado/__init__.py +++ b/homeassistant/components/tado/__init__.py @@ -168,7 +168,7 @@ class TadoConnector: self._password = password self._fallback = fallback - self.device_id = None + self.home_id = None self.tado = None self.zones = None self.devices = None @@ -188,7 +188,7 @@ class TadoConnector: # Load zones and devices self.zones = self.tado.getZones() self.devices = self.tado.getDevices() - self.device_id = self.tado.getMe()["homes"][0]["id"] + self.home_id = self.tado.getMe()["homes"][0]["id"] @Throttle(MIN_TIME_BETWEEN_UPDATES) def update(self): @@ -218,14 +218,14 @@ class TadoConnector: _LOGGER.debug( "Dispatching update to %s %s %s: %s", - self.device_id, + self.home_id, sensor_type, sensor, data, ) dispatcher_send( self.hass, - SIGNAL_TADO_UPDATE_RECEIVED.format(self.device_id, sensor_type, sensor), + SIGNAL_TADO_UPDATE_RECEIVED.format(self.home_id, sensor_type, sensor), ) def get_capabilities(self, zone_id): diff --git a/homeassistant/components/tado/binary_sensor.py b/homeassistant/components/tado/binary_sensor.py index 852ff6ae544..279633b07b1 100644 --- a/homeassistant/components/tado/binary_sensor.py +++ b/homeassistant/components/tado/binary_sensor.py @@ -63,7 +63,7 @@ class TadoDeviceSensor(TadoDeviceEntity, BinarySensorEntity): self.device_variable = device_variable - self._unique_id = f"{device_variable} {self.device_id} {tado.device_id}" + self._unique_id = f"{device_variable} {self.device_id} {tado.home_id}" self._state = None @@ -74,7 +74,7 @@ class TadoDeviceSensor(TadoDeviceEntity, BinarySensorEntity): async_dispatcher_connect( self.hass, SIGNAL_TADO_UPDATE_RECEIVED.format( - self._tado.device_id, "device", self.device_id + self._tado.home_id, "device", self.device_id ), self._async_update_callback, ) diff --git a/homeassistant/components/tado/climate.py b/homeassistant/components/tado/climate.py index 438b7a21394..423205f15b2 100644 --- a/homeassistant/components/tado/climate.py +++ b/homeassistant/components/tado/climate.py @@ -203,11 +203,11 @@ class TadoClimate(TadoZoneEntity, ClimateEntity): ): """Initialize of Tado climate entity.""" self._tado = tado - super().__init__(zone_name, tado.device_id, zone_id) + super().__init__(zone_name, tado.home_id, zone_id) self.zone_id = zone_id self.zone_type = zone_type - self._unique_id = f"{zone_type} {zone_id} {tado.device_id}" + self._unique_id = f"{zone_type} {zone_id} {tado.home_id}" self._ac_device = zone_type == TYPE_AIR_CONDITIONING self._supported_hvac_modes = supported_hvac_modes @@ -245,7 +245,7 @@ class TadoClimate(TadoZoneEntity, ClimateEntity): async_dispatcher_connect( self.hass, SIGNAL_TADO_UPDATE_RECEIVED.format( - self._tado.device_id, "zone", self.zone_id + self._tado.home_id, "zone", self.zone_id ), self._async_update_callback, ) diff --git a/homeassistant/components/tado/entity.py b/homeassistant/components/tado/entity.py index fa2ce2f3aff..03900fdeeb5 100644 --- a/homeassistant/components/tado/entity.py +++ b/homeassistant/components/tado/entity.py @@ -35,10 +35,10 @@ class TadoDeviceEntity(Entity): class TadoZoneEntity(Entity): """Base implementation for Tado zone.""" - def __init__(self, zone_name, device_id, zone_id): + def __init__(self, zone_name, home_id, zone_id): """Initialize a Tado zone.""" super().__init__() - self._device_zone_id = f"{device_id}_{zone_id}" + self._device_zone_id = f"{home_id}_{zone_id}" self.zone_name = zone_name @property diff --git a/homeassistant/components/tado/sensor.py b/homeassistant/components/tado/sensor.py index a937aea25e4..4e8f69b17c8 100644 --- a/homeassistant/components/tado/sensor.py +++ b/homeassistant/components/tado/sensor.py @@ -78,12 +78,12 @@ class TadoZoneSensor(TadoZoneEntity, Entity): def __init__(self, tado, zone_name, zone_id, zone_variable): """Initialize of the Tado Sensor.""" self._tado = tado - super().__init__(zone_name, tado.device_id, zone_id) + super().__init__(zone_name, tado.home_id, zone_id) self.zone_id = zone_id self.zone_variable = zone_variable - self._unique_id = f"{zone_variable} {zone_id} {tado.device_id}" + self._unique_id = f"{zone_variable} {zone_id} {tado.home_id}" self._state = None self._state_attributes = None @@ -96,7 +96,7 @@ class TadoZoneSensor(TadoZoneEntity, Entity): async_dispatcher_connect( self.hass, SIGNAL_TADO_UPDATE_RECEIVED.format( - self._tado.device_id, "zone", self.zone_id + self._tado.home_id, "zone", self.zone_id ), self._async_update_callback, ) diff --git a/homeassistant/components/tado/water_heater.py b/homeassistant/components/tado/water_heater.py index 2755d14a3a3..3fcdb6426fb 100644 --- a/homeassistant/components/tado/water_heater.py +++ b/homeassistant/components/tado/water_heater.py @@ -133,10 +133,10 @@ class TadoWaterHeater(TadoZoneEntity, WaterHeaterEntity): """Initialize of Tado water heater entity.""" self._tado = tado - super().__init__(zone_name, tado.device_id, zone_id) + super().__init__(zone_name, tado.home_id, zone_id) self.zone_id = zone_id - self._unique_id = f"{zone_id} {tado.device_id}" + self._unique_id = f"{zone_id} {tado.home_id}" self._device_is_active = False @@ -161,7 +161,7 @@ class TadoWaterHeater(TadoZoneEntity, WaterHeaterEntity): async_dispatcher_connect( self.hass, SIGNAL_TADO_UPDATE_RECEIVED.format( - self._tado.device_id, "zone", self.zone_id + self._tado.home_id, "zone", self.zone_id ), self._async_update_callback, )