fix: don't remove entities when car is asleep

alandtse · Nov 21, 2022 · 0f770dc · 0f770dc
1 parent 00eeaa5
commit 0f770dc
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 14 deletions.
diff --git a/custom_components/tesla_custom/base.py b/custom_components/tesla_custom/base.py
@@ -8,6 +8,7 @@
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import slugify
+from homeassistant.util.unit_system import METRIC_SYSTEM
 
 from . import TeslaDataUpdateCoordinator
 from .const import ATTRIBUTION, DOMAIN
@@ -68,7 +69,7 @@ def __init__(
         self._car = car
         self._unit_system = (
             CONF_UNIT_SYSTEM_METRIC
-            if self.hass.config.units.is_metric
+            if self.hass.config.units is METRIC_SYSTEM
             else CONF_UNIT_SYSTEM_IMPERIAL
         )
 

diff --git a/custom_components/tesla_custom/button.py b/custom_components/tesla_custom/button.py
@@ -25,8 +25,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry, async_add_entitie
         entities.append(TeslaCarFlashLights(hass, car, coordinator))
         entities.append(TeslaCarWakeUp(hass, car, coordinator))
         entities.append(TeslaCarForceDataUpdate(hass, car, coordinator))
-        if car.homelink_device_count:
-            entities.append(TeslaCarTriggerHomelink(hass, car, coordinator))
+        entities.append(TeslaCarTriggerHomelink(hass, car, coordinator))
 
     async_add_entities(entities, True)
 
@@ -132,6 +131,13 @@ def __init__(
         super().__init__(hass, car, coordinator)
         self.type = "homelink"
         self._attr_icon = "mdi:garage"
+        # Entity is only enabled upon first install if garages have been paired to homelink
+        self._enabled_by_default = self._car.homelink_device_count
+
+    @property
+    def available(self) -> bool:
+        """Return True if Homelink devices are nearby"""
+        return super().available and self._car.homelink_nearby
 
     async def async_press(self):
         """Send the command."""

diff --git a/custom_components/tesla_custom/manifest.json b/custom_components/tesla_custom/manifest.json
@@ -5,7 +5,7 @@
   "documentation": "https://github.com/alandtse/tesla/wiki",
   "issue_tracker": "https://github.com/alandtse/tesla/issues",
   "requirements": [
-    "teslajsonpy==3.2.0"
+    "teslajsonpy==3.2.1"
   ],
   "codeowners": [
     "@alandtse"

diff --git a/custom_components/tesla_custom/switch.py b/custom_components/tesla_custom/switch.py
@@ -21,10 +21,8 @@ async def async_setup_entry(hass: HomeAssistant, config_entry, async_add_entitie
     entities = []
 
     for car in cars.values():
-        if car.steering_wheel_heater:
-            entities.append(TeslaCarHeatedSteeringWheel(hass, car, coordinator))
-        if car.sentry_mode_available:
-            entities.append(TeslaCarSentryMode(hass, car, coordinator))
+        entities.append(TeslaCarHeatedSteeringWheel(hass, car, coordinator))
+        entities.append(TeslaCarSentryMode(hass, car, coordinator))
         entities.append(TeslaCarPolling(hass, car, coordinator))
         entities.append(TeslaCarCharger(hass, car, coordinator))
 
@@ -44,6 +42,13 @@ def __init__(
         super().__init__(hass, car, coordinator)
         self.type = "heated steering"
         self._attr_icon = "mdi:steering"
+        # Entity is only enabled upon first install if steering wheel heater is available
+        self._enabled_by_default = self._car.steering_wheel_heater
+
+    @property
+    def available(self) -> bool:
+        """Return True if steering wheel heater is available"""
+        return super().available and self._car.steering_wheel_heater
 
     @property
     def is_on(self):
@@ -140,6 +145,13 @@ def __init__(
         super().__init__(hass, car, coordinator)
         self.type = "sentry mode"
         self._attr_icon = "mdi:shield-car"
+        # Entity is only enabled upon first install if sentry mode is available
+        self._enabled_by_default = self._car.sentry_mode_available
+
+    @property
+    def available(self) -> bool:
+        """Return True if sentry mode switch is available"""
+        return super().available and self._car.sentry_mode_available
 
     @property
     def is_on(self):

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0"
 
 [tool.poetry.dependencies]
 python = "^3.10"
-teslajsonpy = "^3.2.0"
+teslajsonpy = "^3.2.1"
 
 [tool.poetry.dev-dependencies]
 homeassistant = ">=2021.10.0"

diff --git a/tests/mock_data/car.py b/tests/mock_data/car.py
@@ -260,5 +260,41 @@
     "charge_state": None,
     "gui_settings": None,
     "vehicle_state": None,
-    "vehicle_config": None,
+    "vehicle_config": {
+        "can_accept_navigation_requests": True,
+        "can_actuate_trunks": True,
+        "car_special_type": "base",
+        "car_type": "models",
+        "charge_port_type": "US",
+        "dashcam_clip_save_supported": False,
+        "default_charge_to_max": False,
+        "driver_assist": "MonoCam",
+        "ece_restrictions": False,
+        "efficiency_package": "Default",
+        "eu_vehicle": False,
+        "exterior_color": "White",
+        "front_drive_unit": "NoneOrSmall",
+        "has_air_suspension": False,
+        "has_ludicrous_mode": False,
+        "has_seat_cooling": False,
+        "headlamp_type": "Hid",
+        "interior_trim_type": "AllBlack",
+        "motorized_charge_port": True,
+        "plg": True,
+        "pws": False,
+        "rear_drive_unit": "Small",
+        "rear_seat_heaters": 0,
+        "rear_seat_type": 1,
+        "rhd": False,
+        "roof_color": "Colored",
+        "seat_type": 1,
+        "spoiler_type": "None",
+        "sun_roof_installed": 0,
+        "third_row_seats": "None",
+        "timestamp": 1661641175269,
+        "trim_badging": "85d",
+        "use_range_badging": False,
+        "utc_offset": -25200,
+        "wheel_type": "Base19",
+    },
 }