mirror of https://github.com/simbaja/ha_gehome.git
Merge pull request #91 from elwing00/master
refactored NumberEntity entities
This commit is contained in:
commit
73f3154eba
|
@ -10,10 +10,10 @@ class GeCcmBrewCupsNumber(GeErdNumber, GeCcmCachedValue):
|
|||
|
||||
self._set_value = None
|
||||
|
||||
async def async_set_value(self, value):
|
||||
async def async_set_native_value(self, value):
|
||||
GeCcmCachedValue.set_value(self, value)
|
||||
self.schedule_update_ha_state()
|
||||
|
||||
@property
|
||||
def value(self):
|
||||
return self.get_value(device_value = super().value)
|
||||
def native_value(self):
|
||||
return self.get_value(device_value = super().value)
|
||||
|
|
|
@ -9,14 +9,18 @@ class GeCcmBrewTemperatureNumber(GeErdNumber, GeCcmCachedValue):
|
|||
GeErdNumber.__init__(self, api = api, erd_code = ErdCode.CCM_BREW_TEMPERATURE, min_value=min_temp, max_value=max_temp, mode="slider")
|
||||
GeCcmCachedValue.__init__(self)
|
||||
|
||||
async def async_set_value(self, value):
|
||||
async def async_set_native_value(self, value):
|
||||
GeCcmCachedValue.set_value(self, value)
|
||||
self.schedule_update_ha_state()
|
||||
|
||||
@property
|
||||
def value(self):
|
||||
def native_value(self):
|
||||
return int(self.get_value(device_value = super().value))
|
||||
|
||||
@property
|
||||
def native_unit_of_measurement(self):
|
||||
return TEMP_FAHRENHEIT
|
||||
|
||||
@property
|
||||
def brew_temperature(self) -> int:
|
||||
return self.value
|
||||
return self.value
|
||||
|
|
|
@ -33,13 +33,13 @@ class GeErdNumber(GeErdEntity, NumberEntity):
|
|||
super().__init__(api, erd_code, erd_override, icon_override, device_class_override)
|
||||
self._uom_override = uom_override
|
||||
self._data_type_override = data_type_override
|
||||
self._min_value = min_value
|
||||
self._max_value = max_value
|
||||
self._step_value = step_value
|
||||
self._native_min_value = min_value
|
||||
self._native_max_value = max_value
|
||||
self._native_step = step_value
|
||||
self._mode = mode
|
||||
|
||||
@property
|
||||
def value(self):
|
||||
def native_value(self):
|
||||
try:
|
||||
value = self.appliance.get_erd_value(self.erd_code)
|
||||
return self._convert_value_from_device(value)
|
||||
|
@ -47,7 +47,7 @@ class GeErdNumber(GeErdEntity, NumberEntity):
|
|||
return None
|
||||
|
||||
@property
|
||||
def unit_of_measurement(self) -> Optional[str]:
|
||||
def native_unit_of_measurement(self) -> Optional[str]:
|
||||
return self._get_uom()
|
||||
|
||||
@property
|
||||
|
@ -58,16 +58,16 @@ class GeErdNumber(GeErdEntity, NumberEntity):
|
|||
return self.appliance.get_erd_code_data_type(self.erd_code)
|
||||
|
||||
@property
|
||||
def min_value(self) -> float:
|
||||
return self._convert_value_from_device(self._min_value)
|
||||
def native_min_value(self) -> float:
|
||||
return self._convert_value_from_device(self._native_min_value)
|
||||
|
||||
@property
|
||||
def max_value(self) -> float:
|
||||
return self._convert_value_from_device(self._max_value)
|
||||
def native_max_value(self) -> float:
|
||||
return self._convert_value_from_device(self._native_max_value)
|
||||
|
||||
@property
|
||||
def step(self) -> float:
|
||||
return self._step_value
|
||||
def native_step(self) -> float:
|
||||
return self._native_step
|
||||
|
||||
@property
|
||||
def mode(self) -> float:
|
||||
|
@ -116,7 +116,7 @@ class GeErdNumber(GeErdEntity, NumberEntity):
|
|||
return "mdi:door-closed"
|
||||
return super()._get_icon()
|
||||
|
||||
async def async_set_value(self, value):
|
||||
async def async_set_native_value(self, value):
|
||||
"""Sets the ERD value, assumes that the data type is correct"""
|
||||
|
||||
if self._data_type == ErdDataType.INT:
|
||||
|
@ -125,4 +125,4 @@ class GeErdNumber(GeErdEntity, NumberEntity):
|
|||
try:
|
||||
await self.appliance.async_set_erd_value(self.erd_code, value)
|
||||
except:
|
||||
_LOGGER.warning(f"Could not set {self.name} to {value}")
|
||||
_LOGGER.warning(f"Could not set {self.name} to {value}")
|
||||
|
|
Loading…
Reference in New Issue