Mirrors
/
ha_gehome
mirror of https://github.com/simbaja/ha_gehome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/simbaja/ha_components into dev

This commit is contained in:
Jack Simbach 2022-09-04 22:44:37 -04:00
parent 669772fd51 7abdc23878
commit b77fb6e889
3 changed files with 69 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
custom_components/ge_home/entities/fridge/ge_abstract_fridge.py
View File

@ -6,6 +6,7 @@ import logging
from typing import Any, Dict, List, Optional
from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS, TEMP_FAHRENHEIT
from homeassistant.util.temperature import convert as convert_temperature
from gehomesdk import (
ErdCode,
@ -26,6 +27,14 @@ _LOGGER = logging.getLogger(__name__)
class GeAbstractFridge(GeAbstractWaterHeater):
"""Mock a fridge or freezer as a water heater."""
# These values are from the Fisher & Paykel RF610AA in imperial units
# They're to be used as hardcoded limits when ErdCode.SETPOINT_LIMITS is unavailable.
temp_limits = {}
temp_limits["fridge_min"] = 32
temp_limits["fridge_max"] = 46
temp_limits["freezer_min"] = -6
temp_limits["freezer_max"] = 7
@property
def heater_type(self) -> str:
raise NotImplementedError
@ -40,7 +49,11 @@ class GeAbstractFridge(GeAbstractWaterHeater):
@property
def operation_list(self) -> List[str]:
return [OP_MODE_NORMAL, OP_MODE_SABBATH, self.turbo_mode]
try:
return [OP_MODE_NORMAL, OP_MODE_SABBATH, self.turbo_mode]
except:
_LOGGER.debug("Turbo mode not supported.")
return [OP_MODE_NORMAL, OP_MODE_SABBATH]
@property
def unique_id(self) -> str:
@ -63,11 +76,15 @@ class GeAbstractFridge(GeAbstractWaterHeater):
@property
def current_temperature(self) -> int:
"""Return the current temperature."""
current_temps = self.appliance.get_erd_value(ErdCode.CURRENT_TEMPERATURE)
current_temp = getattr(current_temps, self.heater_type)
if current_temp is None:
_LOGGER.exception(f"{self.name} has None for current_temperature (available: {self.available})!")
return current_temp
try:
current_temps = self.appliance.get_erd_value(ErdCode.CURRENT_TEMPERATURE)
current_temp = getattr(current_temps, self.heater_type)
if current_temp is None:
_LOGGER.exception(f"{self.name} has None for current_temperature (available: {self.available})!")
return current_temp
except:
_LOGGER.debug("Device doesn't report current temperature.")
return None
async def async_set_temperature(self, **kwargs):
target_temp = kwargs.get(ATTR_TEMPERATURE)
@ -95,21 +112,32 @@ class GeAbstractFridge(GeAbstractWaterHeater):
@property
def min_temp(self):
"""Return the minimum temperature."""
return getattr(self.setpoint_limits, f"{self.heater_type}_min")
"""Return the minimum temperature if available, otherwise use hardcoded limits."""
try:
return getattr(self.setpoint_limits, f"{self.heater_type}_min")
except:
_LOGGER.debug("No temperature setpoint limits available. Using hardcoded limits.")
return convert_temperature(self.temp_limits[f"{self.heater_type}_min"], TEMP_FAHRENHEIT, self.temperature_unit)
@property
def max_temp(self):
"""Return the maximum temperature."""
return getattr(self.setpoint_limits, f"{self.heater_type}_max")
"""Return the maximum temperature if available, otherwise use hardcoded limits."""
try:
return getattr(self.setpoint_limits, f"{self.heater_type}_max")
except:
_LOGGER.debug("No temperature setpoint limits available. Using hardcoded limits.")
return convert_temperature(self.temp_limits[f"{self.heater_type}_max"], TEMP_FAHRENHEIT, self.temperature_unit)
@property
def current_operation(self) -> str:
"""Get the current operation mode."""
if self.appliance.get_erd_value(ErdCode.SABBATH_MODE):
return OP_MODE_SABBATH
if self.appliance.get_erd_value(self.turbo_erd_code):
return self.turbo_mode
try:
if self.appliance.get_erd_value(self.turbo_erd_code):
return self.turbo_mode
except:
_LOGGER.debug("Turbo mode not supported.")
return OP_MODE_NORMAL
async def async_set_sabbath_mode(self, sabbath_on: bool = True):

9
custom_components/ge_home/entities/fridge/ge_freezer.py
View File

@ -26,7 +26,10 @@ class GeFreezer(GeAbstractFridge):
@property
def door_state_attrs(self) -> Optional[Dict[str, Any]]:
door_status = self.door_status.freezer
if door_status and door_status != ErdDoorStatus.NA:
return {ATTR_DOOR_STATUS: self._stringify(door_status)}
try:
door_status = self.door_status.freezer
if door_status and door_status != ErdDoorStatus.NA:
return {ATTR_DOOR_STATUS: self._stringify(door_status)}
except:
_LOGGER.debug("Device does not report door status.")
return {}

42
custom_components/ge_home/entities/fridge/ge_fridge.py
View File

@ -36,23 +36,27 @@ class GeFridge(GeAbstractFridge):
@property
def door_state_attrs(self) -> Dict[str, Any]:
"""Get state attributes for the doors."""
data = {}
door_status = self.door_status
if not door_status:
try:
data = {}
door_status = self.door_status
if not door_status:
return {}
door_right = door_status.fridge_right
door_left = door_status.fridge_left
drawer = door_status.drawer
if door_right and door_right != ErdDoorStatus.NA:
data["right_door"] = door_status.fridge_right.name.title()
if door_left and door_left != ErdDoorStatus.NA:
data["left_door"] = door_status.fridge_left.name.title()
if drawer and drawer != ErdDoorStatus.NA:
data["drawer"] = door_status.drawer.name.title()
if data:
all_closed = all(v == "Closed" for v in data.values())
data[ATTR_DOOR_STATUS] = "Closed" if all_closed else "Open"
return data
except:
_LOGGER.debug("Device does not report door status.")
return {}
door_right = door_status.fridge_right
door_left = door_status.fridge_left
drawer = door_status.drawer
if door_right and door_right != ErdDoorStatus.NA:
data["right_door"] = door_status.fridge_right.name.title()
if door_left and door_left != ErdDoorStatus.NA:
data["left_door"] = door_status.fridge_left.name.title()
if drawer and drawer != ErdDoorStatus.NA:
data["drawer"] = door_status.drawer.name.title()
if data:
all_closed = all(v == "Closed" for v in data.values())
data[ATTR_DOOR_STATUS] = "Closed" if all_closed else "Open"
return data