Skip to content

Fix Lutron component broken by #6580 #6739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
thecynic wants to merge 1 commit into from
Closed

Fix Lutron component broken by #6580 #6739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions homeassistant/components/light/lutron.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import logging

from homeassistant.components.light import (
ATTR_BRIGHTNESS, SUPPORT_BRIGHTNESS, Light)
ATTR_BRIGHTNESS, DOMAIN, SUPPORT_BRIGHTNESS, Light)
from homeassistant.components.lutron import (
LutronDevice, LUTRON_DEVICES, LUTRON_CONTROLLER)

Expand Down Expand Up @@ -42,7 +42,8 @@ class LutronLight(LutronDevice, Light):
def __init__(self, hass, area_name, lutron_device, controller):
"""Initialize the light."""
self._prev_brightness = None
LutronDevice.__init__(self, hass, area_name, lutron_device, controller)
LutronDevice.__init__(self, hass, DOMAIN, area_name, lutron_device,
controller)

@property
def supported_features(self):
Expand Down
10 changes: 6 additions & 4 deletions homeassistant/components/lutron.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import logging

from homeassistant.helpers import discovery
from homeassistant.helpers.entity import Entity
from homeassistant.helpers.entity import (Entity, generate_entity_id)

REQUIREMENTS = ['https://github.com/thecynic/pylutron/archive/v0.1.0.zip#'
'pylutron==0.1.0']
Expand Down Expand Up @@ -50,14 +50,16 @@ def setup(hass, base_config):
class LutronDevice(Entity):
"""Representation of a Lutron device entity."""

def __init__(self, hass, area_name, lutron_device, controller):
def __init__(self, hass, domain, area_name, lutron_device, controller):
"""Initialize the device."""
self._lutron_device = lutron_device
self._controller = controller
self._area_name = area_name

self.hass = hass
self.object_id = '{} {}'.format(area_name, lutron_device.name)
object_id = '{} {}'.format(area_name, lutron_device.name)
self.entity_id = generate_entity_id(domain + '.{}', object_id,
hass=hass)

self._controller.subscribe(self._lutron_device, self._update_callback)

Expand All @@ -68,7 +70,7 @@ def _update_callback(self, _device):
@property
def name(self):
"""Return the name of the device."""
return self._lutron_device.name
return '{} {}'.format(self._area_name, self._lutron_device.name)

@property
def should_poll(self):
Expand Down