jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 21:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

More generic use of up and down commands plus a workaround for SOMFY controller. (#2852)

Browse Source 
* Support older devices

* Update with workaround

* Inverted up and down

* Make dual arguments
This commit is contained in:
John Arild Berentsen 2016-08-20 13:59:23 +02:00 committed by GitHub
parent a50463d2f1
commit 6e672b7bee
1 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
homeassistant/components/rollershutter/zwave.py
View File

@ -15,6 +15,15 @@ from homeassistant.components.rollershutter import RollershutterDevice
COMMAND_CLASS_SWITCH_MULTILEVEL = 0x26 # 38 COMMAND_CLASS_SWITCH_MULTILEVEL = 0x26 # 38
COMMAND_CLASS_SWITCH_BINARY = 0x25 # 37 COMMAND_CLASS_SWITCH_BINARY = 0x25 # 37
SOMFY = 0x47
SOMFY_ZRTSI = 0x5a52
SOMFY_ZRTSI_CONTROLLER = (SOMFY, SOMFY_ZRTSI)
WORKAROUND = 'workaround'
DEVICE_MAPPINGS = {
SOMFY_ZRTSI_CONTROLLER: WORKAROUND
}
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -48,8 +57,18 @@ class ZwaveRollershutter(zwave.ZWaveDeviceEntity, RollershutterDevice):
self._lozwmgr.create() self._lozwmgr.create()
self._node = value.node self._node = value.node
self._current_position = None self._current_position = None
self._workaround = None
dispatcher.connect( dispatcher.connect(
self.value_changed, ZWaveNetwork.SIGNAL_VALUE_CHANGED) self.value_changed, ZWaveNetwork.SIGNAL_VALUE_CHANGED)
if (value.node.manufacturer_id.strip() and
value.node.product_id.strip()):
specific_sensor_key = (int(value.node.manufacturer_id, 16),
int(value.node.product_type, 16))
if specific_sensor_key in DEVICE_MAPPINGS:
if DEVICE_MAPPINGS[specific_sensor_key] == WORKAROUND:
_LOGGER.debug("Controller without positioning feedback")
self._workaround = 1
def value_changed(self, value): def value_changed(self, value):
"""Called when a value has changed on the network.""" """Called when a value has changed on the network."""
@ -71,20 +90,23 @@ class ZwaveRollershutter(zwave.ZWaveDeviceEntity, RollershutterDevice):
@property @property
def current_position(self): def current_position(self):
"""Return the current position of Zwave roller shutter.""" """Return the current position of Zwave roller shutter."""
if self._current_position is not None: if not self._workaround:
if self._current_position <= 5: if self._current_position is not None:
return 100 if self._current_position <= 5:
elif self._current_position >= 95: return 100
return 0 elif self._current_position >= 95:
else: return 0
return 100 - self._current_position else:
return 100 - self._current_position
def move_up(self, **kwargs): def move_up(self, **kwargs):
"""Move the roller shutter up.""" """Move the roller shutter up."""
for value in self._node.get_values( for value in self._node.get_values(
class_id=COMMAND_CLASS_SWITCH_MULTILEVEL).values(): class_id=COMMAND_CLASS_SWITCH_MULTILEVEL).values():
if value.command_class == zwave.COMMAND_CLASS_SWITCH_MULTILEVEL \ if value.command_class == zwave.COMMAND_CLASS_SWITCH_MULTILEVEL \
and value.label == 'Open': and value.label == 'Open' or \
value.command_class == zwave.COMMAND_CLASS_SWITCH_MULTILEVEL \
and value.label == 'Down':
self._lozwmgr.pressButton(value.value_id) self._lozwmgr.pressButton(value.value_id)
break break
@ -93,6 +115,8 @@ class ZwaveRollershutter(zwave.ZWaveDeviceEntity, RollershutterDevice):
for value in self._node.get_values( for value in self._node.get_values(
class_id=COMMAND_CLASS_SWITCH_MULTILEVEL).values(): class_id=COMMAND_CLASS_SWITCH_MULTILEVEL).values():
if value.command_class == zwave.COMMAND_CLASS_SWITCH_MULTILEVEL \ if value.command_class == zwave.COMMAND_CLASS_SWITCH_MULTILEVEL \
and value.label == 'Up' or \
value.command_class == zwave.COMMAND_CLASS_SWITCH_MULTILEVEL \
and value.label == 'Close': and value.label == 'Close':
self._lozwmgr.pressButton(value.value_id) self._lozwmgr.pressButton(value.value_id)
break break
@ -106,6 +130,8 @@ class ZwaveRollershutter(zwave.ZWaveDeviceEntity, RollershutterDevice):
for value in self._node.get_values( for value in self._node.get_values(
class_id=COMMAND_CLASS_SWITCH_MULTILEVEL).values(): class_id=COMMAND_CLASS_SWITCH_MULTILEVEL).values():
if value.command_class == zwave.COMMAND_CLASS_SWITCH_MULTILEVEL \ if value.command_class == zwave.COMMAND_CLASS_SWITCH_MULTILEVEL \
and value.label == 'Open': and value.label == 'Open' or \
value.command_class == zwave.COMMAND_CLASS_SWITCH_MULTILEVEL \
and value.label == 'Down':
self._lozwmgr.releaseButton(value.value_id) self._lozwmgr.releaseButton(value.value_id)
break break