evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1395 from MartinHjelmare/fix-mysensors-switch-light

Browse source 
Fix mysensors switch & light types
This commit is contained in:
Paulus Schoutsen 2016-02-24 19:56:36 -08:00
commit 621a6e0ea0
2 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
homeassistant/components/light/mysensors.py
View file

@ -33,11 +33,9 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
pres = gateway.const.Presentation pres = gateway.const.Presentation
set_req = gateway.const.SetReq set_req = gateway.const.SetReq
map_sv_types = { map_sv_types = {
pres.S_LIGHT: [set_req.V_LIGHT],
pres.S_DIMMER: [set_req.V_DIMMER], pres.S_DIMMER: [set_req.V_DIMMER],
} }
device_class_map = { device_class_map = {
pres.S_LIGHT: MySensorsLightPlain,
pres.S_DIMMER: MySensorsLightDimmer, pres.S_DIMMER: MySensorsLightDimmer,
} }
if float(gateway.version) >= 1.5: if float(gateway.version) >= 1.5:
@ -45,7 +43,6 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
map_sv_types.update({ map_sv_types.update({
pres.S_RGB_LIGHT: [set_req.V_RGB], pres.S_RGB_LIGHT: [set_req.V_RGB],
}) })
map_sv_types[pres.S_LIGHT].append(set_req.V_STATUS)
map_sv_types[pres.S_DIMMER].append(set_req.V_PERCENTAGE) map_sv_types[pres.S_DIMMER].append(set_req.V_PERCENTAGE)
device_class_map.update({ device_class_map.update({
pres.S_RGB_LIGHT: MySensorsLightRGB, pres.S_RGB_LIGHT: MySensorsLightRGB,
@ -263,25 +260,6 @@ class MySensorsLight(Light):
self._values[value_type] = value self._values[value_type] = value
class MySensorsLightPlain(MySensorsLight):
"""Light child class to MySensorsLight."""
def turn_on(self, **kwargs):
"""Turn the device on."""
self._turn_on_light()
def turn_off(self, **kwargs):
"""Turn the device off."""
ret = self._turn_off_light()
self._turn_off_main(value_type=ret[
ATTR_VALUE_TYPE], value=ret[ATTR_VALUE])
def update(self):
"""Update the controller with the latest value from a sensor."""
self._update_main()
self._update_light()
class MySensorsLightDimmer(MySensorsLight): class MySensorsLightDimmer(MySensorsLight):
"""Dimmer child class to MySensorsLight.""" """Dimmer child class to MySensorsLight."""

2
homeassistant/components/switch/mysensors.py
View file

@ -32,6 +32,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
pres.S_DOOR: [set_req.V_ARMED], pres.S_DOOR: [set_req.V_ARMED],
pres.S_MOTION: [set_req.V_ARMED], pres.S_MOTION: [set_req.V_ARMED],
pres.S_SMOKE: [set_req.V_ARMED], pres.S_SMOKE: [set_req.V_ARMED],
pres.S_LIGHT: [set_req.V_LIGHT],
pres.S_LOCK: [set_req.V_LOCK_STATUS], pres.S_LOCK: [set_req.V_LOCK_STATUS],
} }
if float(gateway.version) >= 1.5: if float(gateway.version) >= 1.5:
@ -43,6 +44,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
pres.S_VIBRATION: [set_req.V_ARMED], pres.S_VIBRATION: [set_req.V_ARMED],
pres.S_MOISTURE: [set_req.V_ARMED], pres.S_MOISTURE: [set_req.V_ARMED],
}) })
map_sv_types[pres.S_LIGHT].append(set_req.V_STATUS)
devices = {} devices = {}
gateway.platform_callbacks.append(mysensors.pf_callback_factory( gateway.platform_callbacks.append(mysensors.pf_callback_factory(