Merge pull request #15 from iMicknl/add_occupancy_and_async

iMicknl · Jun 4, 2020 · 14d94f9 · 14d94f9
2 parents 1a9bfc0 + 5f2b138
commit 14d94f9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ If your device is not supported, it will show the following message in the loggi
 | GarageDoor        | cover                   |
 | ContactSensor     | binary_sensor           |
 | SmokeSensor       | binary_sensor           |
-| MotionSensor      | binary_sensor           |
+| OccupancySensor   | binary_sensor           |
 | Light             | light                   |
 | Awning            | cover                   |
 
@@ -52,4 +52,3 @@ If your device is not supported, it will show the following message in the loggi
 | RemoteController |
 | Alarm            |
 | HeatingSystem    |
-
diff --git a/custom_components/tahoma/__init__.py b/custom_components/tahoma/__init__.py
@@ -21,7 +21,7 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-#TODO Deprecate EXCLUDE for the native method of disabling entities
+# TODO Deprecate EXCLUDE for the native method of disabling entities
 CONFIG_SCHEMA = vol.Schema(
     {
         DOMAIN: vol.Schema(
@@ -61,10 +61,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
     password = entry.data[CONF_PASSWORD]
 
     try:
-        controller = TahomaApi(username, password)
-        controller.get_setup()
-        devices = controller.get_devices()
-        scenes = controller.get_action_groups()
+        controller = await hass.async_add_executor_job(TahomaApi, username, password)
+        await hass.async_add_executor_job(controller.get_setup)
+        devices = await hass.async_add_executor_job(controller.get_devices)
+        scenes = await hass.async_add_executor_job(controller.get_action_groups)
 
     # TODO Add better exception handling
     except RequestException:

diff --git a/custom_components/tahoma/binary_sensor.py b/custom_components/tahoma/binary_sensor.py
@@ -68,8 +68,9 @@ def update(self):
             )
 
         if CORE_OCCUPANCY_STATE in self.tahoma_device.active_states:
-            self.current_value = self.tahoma_device.active_states.get(
-                CORE_OCCUPANCY_STATE
+            self.current_value = (
+                self.tahoma_device.active_states.get(CORE_OCCUPANCY_STATE)
+                == "personInside"
             )
 
         if CORE_SMOKE_STATE in self.tahoma_device.active_states:

diff --git a/custom_components/tahoma/const.py b/custom_components/tahoma/const.py
@@ -9,7 +9,7 @@
 
 from homeassistant.components.binary_sensor import (
     DEVICE_CLASS_SMOKE,
-    DEVICE_CLASS_MOTION,
+    DEVICE_CLASS_OCCUPANCY,
     DEVICE_CLASS_OPENING
 )
 
@@ -34,7 +34,7 @@
     "GarageDoor": "cover",
     "ContactSensor": "binary_sensor",
     "SmokeSensor": "binary_sensor",
-    "MotionSensor": "binary_sensor",
+    "OccupancySensor": "binary_sensor",
     "ExteriorVenetianBlind": "cover",
     "Awning": "cover"
 }
@@ -53,7 +53,7 @@
 
 TAHOMA_BINARY_SENSOR_DEVICE_CLASSES = {
     "SmokeSensor": DEVICE_CLASS_SMOKE,
-    "MotionSensor": DEVICE_CLASS_MOTION,
+    "OccupancySensor": DEVICE_CLASS_OCCUPANCY,
     "ContactSensor": DEVICE_CLASS_OPENING 
 }
 

diff --git a/custom_components/tahoma/tahoma_device.py b/custom_components/tahoma/tahoma_device.py
@@ -73,6 +73,7 @@ def device_state_attributes(self):
             ]
 
         # TODO Parse 'lowBattery' for low battery warning. 'dead' for not available.
+        # "dead", "lowBattery", "maintenanceRequired", "noDefect"
         if CORE_SENSOR_DEFECT_STATE in self.tahoma_device.active_states:
             attr[ATTR_BATTERY_LEVEL] = self.tahoma_device.active_states[
                 CORE_SENSOR_DEFECT_STATE