From 85239336054eb2a2fb64d43563e70edc4f134da5 Mon Sep 17 00:00:00 2001 From: Sergey Isachenko Date: Thu, 8 Feb 2018 10:34:26 +0300 Subject: [PATCH] Fixes for tesla. New sensors. (#12225) * fixes #11970 * long line fix --- homeassistant/components/sensor/tesla.py | 20 +++++++++++++------- homeassistant/components/tesla.py | 2 +- requirements_all.txt | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/homeassistant/components/sensor/tesla.py b/homeassistant/components/sensor/tesla.py index 4534c8d6203..74e74262710 100644 --- a/homeassistant/components/sensor/tesla.py +++ b/homeassistant/components/sensor/tesla.py @@ -10,7 +10,8 @@ import logging from homeassistant.components.sensor import ENTITY_ID_FORMAT from homeassistant.components.tesla import DOMAIN as TESLA_DOMAIN from homeassistant.components.tesla import TeslaDevice -from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT +from homeassistant.const import ( + TEMP_CELSIUS, TEMP_FAHRENHEIT, LENGTH_KILOMETERS, LENGTH_MILES) from homeassistant.helpers.entity import Entity _LOGGER = logging.getLogger(__name__) @@ -66,18 +67,23 @@ class TeslaSensor(TeslaDevice, Entity): """Update the state from the sensor.""" _LOGGER.debug("Updating sensor: %s", self._name) self.tesla_device.update() + units = self.tesla_device.measurement + if self.tesla_device.bin_type == 0x4: if self.type == 'outside': self.current_value = self.tesla_device.get_outside_temp() else: self.current_value = self.tesla_device.get_inside_temp() - - tesla_temp_units = self.tesla_device.measurement - - if tesla_temp_units == 'F': + if units == 'F': self._unit = TEMP_FAHRENHEIT else: self._unit = TEMP_CELSIUS else: - self.current_value = self.tesla_device.battery_level() - self._unit = "%" + self.current_value = self.tesla_device.get_value() + if self.tesla_device.bin_type == 0x5: + self._unit = units + elif self.tesla_device.bin_type in (0xA, 0xB): + if units == 'LENGTH_MILES': + self._unit = LENGTH_MILES + else: + self._unit = LENGTH_KILOMETERS diff --git a/homeassistant/components/tesla.py b/homeassistant/components/tesla.py index 4f76b70432e..76b5c00d9d4 100644 --- a/homeassistant/components/tesla.py +++ b/homeassistant/components/tesla.py @@ -16,7 +16,7 @@ from homeassistant.helpers import discovery from homeassistant.helpers.entity import Entity from homeassistant.util import slugify -REQUIREMENTS = ['teslajsonpy==0.0.19'] +REQUIREMENTS = ['teslajsonpy==0.0.23'] DOMAIN = 'tesla' diff --git a/requirements_all.txt b/requirements_all.txt index 149bf6d7154..166f835c029 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1161,7 +1161,7 @@ tellduslive==0.10.4 temperusb==1.5.3 # homeassistant.components.tesla -teslajsonpy==0.0.19 +teslajsonpy==0.0.23 # homeassistant.components.thingspeak thingspeak==0.4.1