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

slider and tilt open/close seem to work

Browse Source
This commit is contained in:
Brian Cribbs 2017-04-27 23:42:50 -04:00
parent 0298522fd5
commit 630516f309
2 changed files with 20166 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20061
get-pip.py Normal file
View File

File diff suppressed because it is too large Load Diff

110
homeassistant/components/cover/mqtt.py
View File

@ -11,10 +11,10 @@ import voluptuous as vol
from homeassistant.core import callback
import homeassistant.components.mqtt as mqtt
from homeassistant.components.cover import CoverDevice
from homeassistant.components.cover import CoverDevice, ATTR_TILT_POSITION
from homeassistant.const import (
CONF_NAME, CONF_VALUE_TEMPLATE, CONF_OPTIMISTIC, STATE_OPEN,
STATE_CLOSED)
STATE_CLOSED, STATE_UNKNOWN)
from homeassistant.components.mqtt import (
CONF_STATE_TOPIC, CONF_COMMAND_TOPIC, CONF_QOS, CONF_RETAIN)
import homeassistant.helpers.config_validation as cv
@ -23,27 +23,53 @@ _LOGGER = logging.getLogger(__name__)
DEPENDENCIES = ['mqtt']
CONF_TILT_COMMAND_TOPIC = 'tilt_command_topic'
CONF_TILT_STATUS_TOPIC = 'tilt_status_topic'
CONF_PAYLOAD_OPEN = 'payload_open'
CONF_PAYLOAD_CLOSE = 'payload_close'
CONF_PAYLOAD_STOP = 'payload_stop'
CONF_PAYLOAD_TILT = 'payload_tilt'
CONF_STATE_OPEN = 'state_open'
CONF_STATE_CLOSED = 'state_closed'
CONF_TILT_CLOSED_POSITION = 'tilt_closed_value'
CONF_TILT_OPEN_POSITION = 'tilt_opened_value'
CONF_DEVICE_CLASS = 'device_class'
CONF_TILT_MIN = 'tilt_min'
CONF_TILT_MAX = 'tilt_max'
DEFAULT_NAME = 'MQTT Cover'
DEFAULT_PAYLOAD_OPEN = 'OPEN'
DEFAULT_PAYLOAD_CLOSE = 'CLOSE'
DEFAULT_PAYLOAD_STOP = 'STOP'
DEFAULT_PAYLOAD_TILT = 'TILT'
DEFAULT_OPTIMISTIC = False
DEFAULT_RETAIN = False
DEFAULT_TILT_CLOSED_POSITION = '0'
DEFAULT_TILT_OPEN_POSITION = '100'
DEFAULT_DEVICE_CLASS = 'window'
DEFAULT_TILT_MIN = '0'
DEFAULT_TILT_MAX = '100'
PLATFORM_SCHEMA = mqtt.MQTT_RW_PLATFORM_SCHEMA.extend({
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
vol.Optional(CONF_PAYLOAD_OPEN, default=DEFAULT_PAYLOAD_OPEN): cv.string,
vol.Optional(CONF_PAYLOAD_CLOSE, default=DEFAULT_PAYLOAD_CLOSE): cv.string,
vol.Optional(CONF_PAYLOAD_STOP, default=DEFAULT_PAYLOAD_STOP): cv.string,
vol.Optional(CONF_PAYLOAD_TILT, default=DEFAULT_PAYLOAD_TILT): cv.string,
vol.Optional(CONF_STATE_OPEN, default=STATE_OPEN): cv.string,
vol.Optional(CONF_STATE_CLOSED, default=STATE_CLOSED): cv.string,
vol.Optional(CONF_OPTIMISTIC, default=DEFAULT_OPTIMISTIC): cv.boolean,
vol.Optional(CONF_TILT_CLOSED_POSITION,
default=DEFAULT_TILT_CLOSED_POSITION): cv.string,
vol.Optional(CONF_TILT_OPEN_POSITION,
default=DEFAULT_TILT_OPEN_POSITION): cv.string,
vol.Optional(CONF_DEVICE_CLASS,
default=DEFAULT_DEVICE_CLASS): cv.string,
vol.Optional(CONF_TILT_MIN,
default=DEFAULT_TILT_MIN): cv.string,
vol.Optional(CONF_TILT_MAX,
default=DEFAULT_TILT_MAX): cv.string,
})
@ -58,6 +84,8 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
config.get(CONF_NAME),
config.get(CONF_STATE_TOPIC),
config.get(CONF_COMMAND_TOPIC),
config.get(CONF_TILT_COMMAND_TOPIC),
config.get(CONF_TILT_STATUS_TOPIC),
config.get(CONF_QOS),
config.get(CONF_RETAIN),
config.get(CONF_STATE_OPEN),
@ -65,32 +93,51 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
config.get(CONF_PAYLOAD_OPEN),
config.get(CONF_PAYLOAD_CLOSE),
config.get(CONF_PAYLOAD_STOP),
config.get(CONF_PAYLOAD_TILT),
config.get(CONF_OPTIMISTIC),
value_template,
config.get(CONF_TILT_OPEN_POSITION),
config.get(CONF_TILT_CLOSED_POSITION),
config.get(CONF_DEVICE_CLASS),
config.get(CONF_TILT_MIN),
config.get(CONF_TILT_MAX),
)])
class MqttCover(CoverDevice):
"""Representation of a cover that can be controlled using MQTT."""
def __init__(self, name, state_topic, command_topic, qos, retain,
state_open, state_closed, payload_open, payload_close,
payload_stop, optimistic, value_template):
def __init__(self, name, state_topic, command_topic, tilt_command_topic,
tilt_status_topic, qos, retain, state_open, state_closed,
payload_open, payload_close, payload_stop, payload_tilt,
optimistic, value_template, tilt_open_position,
tilt_closed_position, device_class, tilt_min, tilt_max):
"""Initialize the cover."""
if tilt_command_topic is not None:
_LOGGER.info("MQTT cover configured with tilt topic: " + tilt_command_topic)
self._position = None
self._state = None
self._name = name
self._state_topic = state_topic
self._command_topic = command_topic
self._tilt_command_topic = tilt_command_topic
self._tilt_status_topic = tilt_status_topic
self._qos = qos
self._payload_open = payload_open
self._payload_close = payload_close
self._payload_stop = payload_stop
self._payload_tilt = payload_tilt
self._state_open = state_open
self._state_closed = state_closed
self._retain = retain
self._tilt_open_position = tilt_open_position
self._tilt_closed_position = tilt_closed_position
self._optimistic = optimistic or state_topic is None
self._template = value_template
self._device_class = device_class
self._tilt_value = STATE_UNKNOWN
self._tilt_min = int(tilt_min)
self._tilt_max = int(tilt_max)
@asyncio.coroutine
def async_added_to_hass(self):
@ -98,6 +145,19 @@ class MqttCover(CoverDevice):
This method is a coroutine.
"""
@callback
def tilt_updated(topic, payload, qos):
"""The tilt was updated"""
if (payload.isnumeric() and
self._tilt_min <= int(payload)
and int(payload) <= self._tilt_max):
"""The payload was a valid tilt value"""
tiltRange = self._tilt_max - self._tilt_min
level = round(float(payload) / tiltRange * 100.0)
self._tilt_value = level
_LOGGER.info("Tilt value set to " + str(self._tilt_value))
self.schedule_update_ha_state()
@callback
def message_received(topic, payload, qos):
"""A new MQTT message has been received."""
@ -130,6 +190,10 @@ class MqttCover(CoverDevice):
yield from mqtt.async_subscribe(
self.hass, self._state_topic, message_received, self._qos)
if self._tilt_status_topic is not None:
yield from mqtt.async_subscribe(
self.hass, self._tilt_status_topic, tilt_updated, self._qos)
@property
def should_poll(self):
"""No polling needed."""
@ -153,6 +217,11 @@ class MqttCover(CoverDevice):
"""
return self._position
@property
def device_class(self):
"""Return the class of this device, from component DEVICE_CLASSES."""
return self._device_class
@asyncio.coroutine
def async_open_cover(self, **kwargs):
"""Move the cover up.
@ -190,3 +259,34 @@ class MqttCover(CoverDevice):
mqtt.async_publish(
self.hass, self._command_topic, self._payload_stop, self._qos,
self._retain)
@asyncio.coroutine
def async_open_cover_tilt(self, **kwargs):
"""Tilt the cover open."""
mqtt.async_publish(self.hass, self._tilt_command_topic,
self._tilt_open_position, self._qos, self._retain)
@asyncio.coroutine
def async_close_cover_tilt(self, **kwargs):
"""Tilt the cover closed."""
mqtt.async_publish(self.hass, self._tilt_command_topic,
self._tilt_closed_position, self._qos, self._retain)
@property
def current_cover_tilt_position(self):
"""Return current position of cover tilt"""
return self._tilt_value
def async_set_cover_tilt_position(self, **kwargs):
"""Move the cover tilt to a specific position."""
if ATTR_TILT_POSITION in kwargs:
position = float(kwargs[ATTR_TILT_POSITION])
"""The position needs to be between min and max"""
tiltRange = self._tilt_max - self._tilt_min
percentage = position / 100.0
level = round(tiltRange * percentage)
_LOGGER.info("setting tilt value to " + str(level))
mqtt.async_publish(self.hass, self._tilt_command_topic,
level, self._qos, self._retain)