Merge pull request #560 from pavoni/add-vera-dimmer

Add vera dimmer

homeassistant/components/light/vera.py

@@ -7,12 +7,16 @@ For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/light.vera.html
 """
 import logging
+import time
+
 from requests.exceptions import RequestException
 from homeassistant.components.switch.vera import VeraSwitch
 
-REQUIREMENTS = ['https://github.com/balloob/home-assistant-vera-api/archive/'
+from homeassistant.components.light import ATTR_BRIGHTNESS
-                'a8f823066ead6c7da6fb5e7abaf16fef62e63364.zip'
+
-                '#python-vera==0.1']
+REQUIREMENTS = ['https://github.com/pavoni/home-assistant-vera-api/archive/'
+                'efdba4e63d58a30bc9b36d9e01e69858af9130b8.zip'
+                '#python-vera==0.1.1']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -35,7 +39,10 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
     controller = veraApi.VeraController(base_url)
     devices = []
     try:
-        devices = controller.get_devices(['Switch', 'On/Off Switch'])
+        devices = controller.get_devices([
+            'Switch',
+            'On/Off Switch',
+            'Dimmable Switch'])
     except RequestException:
         # There was a network related error connecting to the vera controller
         _LOGGER.exception("Error communicating with Vera API")
@@ -47,6 +54,28 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
         exclude = extra_data.get('exclude', False)
 
         if exclude is not True:
-            lights.append(VeraSwitch(device, extra_data))
+            lights.append(VeraLight(device, extra_data))
 
     add_devices_callback(lights)
+
+
+class VeraLight(VeraSwitch):
+    """ Represents a Vera Light, including dimmable. """
+
+    @property
+    def state_attributes(self):
+        attr = super().state_attributes or {}
+
+        if self.vera_device.is_dimmable:
+            attr[ATTR_BRIGHTNESS] = self.vera_device.get_brightness()
+
+        return attr
+
+    def turn_on(self, **kwargs):
+        if ATTR_BRIGHTNESS in kwargs and self.vera_device.is_dimmable:
+            self.vera_device.set_brightness(kwargs[ATTR_BRIGHTNESS])
+        else:
+            self.vera_device.switch_on()
+
+        self.last_command_send = time.time()
+        self.is_on_status = True

homeassistant/components/switch/vera.py

@@ -15,9 +15,9 @@ from homeassistant.helpers.entity import ToggleEntity
 from homeassistant.const import (
     ATTR_BATTERY_LEVEL, ATTR_TRIPPED, ATTR_ARMED, ATTR_LAST_TRIP_TIME)
 
-REQUIREMENTS = ['https://github.com/balloob/home-assistant-vera-api/archive/'
+REQUIREMENTS = ['https://github.com/pavoni/home-assistant-vera-api/archive/'
-                'a8f823066ead6c7da6fb5e7abaf16fef62e63364.zip'
+                'efdba4e63d58a30bc9b36d9e01e69858af9130b8.zip'
-                '#python-vera==0.1']
+                '#python-vera==0.1.1']
 
 _LOGGER = logging.getLogger(__name__)
 

requirements_all.txt

@@ -128,7 +128,7 @@ pyfttt==0.3
 https://github.com/balloob/home-assistant-nzb-clients/archive/616cad59154092599278661af17e2a9f2cf5e2a9.zip#python-sabnzbd==0.1
 
 # Vera (*.vera)
-https://github.com/balloob/home-assistant-vera-api/archive/a8f823066ead6c7da6fb5e7abaf16fef62e63364.zip#python-vera==0.1
+https://github.com/pavoni/home-assistant-vera-api/archive/efdba4e63d58a30bc9b36d9e01e69858af9130b8.zip#python-vera==0.1.1
 
 # Sonos (media_player.sonos)
 SoCo==0.11.1