Remove unused attributes from Econet (#99242)

This commit is contained in:
Joost Lekkerkerker 2023-09-04 09:15:01 +02:00 committed by GitHub
parent f545389549
commit f4f98010f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 28 deletions

View File

@ -13,7 +13,7 @@ from pyeconet.errors import (
) )
from homeassistant.config_entries import ConfigEntry from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_EMAIL, CONF_PASSWORD, Platform, UnitOfTemperature from homeassistant.const import CONF_EMAIL, CONF_PASSWORD, Platform
from homeassistant.core import HomeAssistant, callback from homeassistant.core import HomeAssistant, callback
from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.exceptions import ConfigEntryNotReady
from homeassistant.helpers.device_registry import DeviceInfo from homeassistant.helpers.device_registry import DeviceInfo
@ -137,8 +137,3 @@ class EcoNetEntity(Entity):
manufacturer="Rheem", manufacturer="Rheem",
name=self._econet.device_name, name=self._econet.device_name,
) )
@property
def temperature_unit(self):
"""Return the unit of measurement."""
return UnitOfTemperature.FAHRENHEIT

View File

@ -16,7 +16,7 @@ from homeassistant.components.climate import (
HVACMode, HVACMode,
) )
from homeassistant.config_entries import ConfigEntry from homeassistant.config_entries import ConfigEntry
from homeassistant.const import ATTR_TEMPERATURE from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
@ -62,23 +62,21 @@ async def async_setup_entry(
class EcoNetThermostat(EcoNetEntity, ClimateEntity): class EcoNetThermostat(EcoNetEntity, ClimateEntity):
"""Define a Econet thermostat.""" """Define an Econet thermostat."""
_attr_temperature_unit = UnitOfTemperature.FAHRENHEIT
def __init__(self, thermostat): def __init__(self, thermostat):
"""Initialize.""" """Initialize."""
super().__init__(thermostat) super().__init__(thermostat)
self._running = thermostat.running self._attr_hvac_modes = []
self._poll = True
self.econet_state_to_ha = {}
self.ha_state_to_econet = {}
self.op_list = []
for mode in self._econet.modes: for mode in self._econet.modes:
if mode not in [ if mode not in [
ThermostatOperationMode.UNKNOWN, ThermostatOperationMode.UNKNOWN,
ThermostatOperationMode.EMERGENCY_HEAT, ThermostatOperationMode.EMERGENCY_HEAT,
]: ]:
ha_mode = ECONET_STATE_TO_HA[mode] ha_mode = ECONET_STATE_TO_HA[mode]
self.op_list.append(ha_mode) self._attr_hvac_modes.append(ha_mode)
@property @property
def supported_features(self) -> ClimateEntityFeature: def supported_features(self) -> ClimateEntityFeature:
@ -142,14 +140,6 @@ class EcoNetThermostat(EcoNetEntity, ClimateEntity):
"""Return true if aux heater.""" """Return true if aux heater."""
return self._econet.mode == ThermostatOperationMode.EMERGENCY_HEAT return self._econet.mode == ThermostatOperationMode.EMERGENCY_HEAT
@property
def hvac_modes(self):
"""Return hvac operation ie. heat, cool mode.
Needs to be one of HVAC_MODE_*.
"""
return self.op_list
@property @property
def hvac_mode(self) -> HVACMode: def hvac_mode(self) -> HVACMode:
"""Return hvac operation ie. heat, cool, mode. """Return hvac operation ie. heat, cool, mode.

View File

@ -16,7 +16,7 @@ from homeassistant.components.water_heater import (
WaterHeaterEntityFeature, WaterHeaterEntityFeature,
) )
from homeassistant.config_entries import ConfigEntry from homeassistant.config_entries import ConfigEntry
from homeassistant.const import ATTR_TEMPERATURE, STATE_OFF from homeassistant.const import ATTR_TEMPERATURE, STATE_OFF, UnitOfTemperature
from homeassistant.core import HomeAssistant, callback from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
@ -56,20 +56,20 @@ async def async_setup_entry(
class EcoNetWaterHeater(EcoNetEntity, WaterHeaterEntity): class EcoNetWaterHeater(EcoNetEntity, WaterHeaterEntity):
"""Define a Econet water heater.""" """Define an Econet water heater."""
_attr_should_poll = True # Override False default from EcoNetEntity
_attr_temperature_unit = UnitOfTemperature.FAHRENHEIT
def __init__(self, water_heater): def __init__(self, water_heater):
"""Initialize.""" """Initialize."""
super().__init__(water_heater) super().__init__(water_heater)
self._running = water_heater.running self._running = water_heater.running
self._attr_should_poll = True # Override False default from EcoNetEntity
self.water_heater = water_heater self.water_heater = water_heater
self.econet_state_to_ha = {}
self.ha_state_to_econet = {}
@callback @callback
def on_update_received(self): def on_update_received(self):
"""Update was pushed from the ecoent API.""" """Update was pushed from the econet API."""
if self._running != self.water_heater.running: if self._running != self.water_heater.running:
# Water heater running state has changed so check usage on next update # Water heater running state has changed so check usage on next update
self._attr_should_poll = True self._attr_should_poll = True