Compare commits

...

11 Commits

Author SHA1 Message Date
Paulus Schoutsen a031d64a44 Merge pull request #2880 from home-assistant/hotfix-026-3
Hotfix 026 3
2016-08-18 22:48:02 -07:00
Paulus Schoutsen a548eb6c7f Version bump to 0.26.3 2016-08-18 22:46:34 -07:00
Paulus Schoutsen 2b10a1ac20 Fix media player art (#2879) 2016-08-18 22:46:17 -07:00
Paulus Schoutsen f61f0623f8 Merge pull request #2827 from home-assistant/hotfix-0-26-2
Hotfix 0 26 2
2016-08-14 21:25:11 -07:00
Paulus Schoutsen c4b714a10d Version bump to 0.26.2 2016-08-14 21:22:28 -07:00
Greg Dowling 8a8551132f Bump to pywemo 0.4.5 - fixes bug with requests 2.11.0 (#2818) 2016-08-14 21:22:06 -07:00
Paulus Schoutsen a6bbd749e4 Merge pull request #2817 from home-assistant/hotfix-0-26-1
Hotfix 0 26 1
2016-08-14 01:26:19 -07:00
Paulus Schoutsen 32051c042c Version bump to 0.26.1 2016-08-14 01:21:57 -07:00
John Arild Berentsen c16a29b930 Fix unknown unit of measurement for hvac and thermostat component (#2816)
* Fix unknown unit of measurement for hvac and thermostat component

* Simplify
2016-08-14 01:21:36 -07:00
Heiko Rothe 12ce3deffc Check for existence of system mode on Honeywell thermostats (#2815)
* Check for existence of system mode on Honeywell thermostats

* Return None instead of undefined

* Use getattr instead of if/else
2016-08-14 01:21:28 -07:00
Open Home Automation 7c041f0797 Bugfix: removed conf_platform (#2811)
* Bugfix: removed conf_platform

* Remove unused import

* Fix for wrong update
2016-08-14 01:21:18 -07:00
9 changed files with 22 additions and 14 deletions
+3 -2
View File
@@ -120,8 +120,9 @@ class ZWaveHvac(ZWaveDeviceEntity, HvacDevice):
# Current Temp
for value in self._node.get_values(
class_id=COMMAND_CLASS_SENSOR_MULTILEVEL).values():
self._current_temperature = int(value.data)
self._unit = value.units
if value.label == 'Temperature':
self._current_temperature = int(value.data)
self._unit = value.units
# Fan Mode
for value in self._node.get_values(
class_id=COMMAND_CLASS_THERMOSTAT_FAN_MODE).values():
@@ -667,6 +667,7 @@ class MediaPlayerDevice(Entity):
class MediaPlayerImageView(HomeAssistantView):
"""Media player view to serve an image."""
requires_auth = False
url = "/api/media_player_proxy/<entity(domain=media_player):entity_id>"
name = "api:media_player:image"
+1 -2
View File
@@ -7,7 +7,7 @@ https://home-assistant.io/components/sensor.serial_pm/
import logging
import voluptuous as vol
from homeassistant.const import CONF_NAME, CONF_PLATFORM
from homeassistant.const import CONF_NAME
from homeassistant.helpers.entity import Entity
import homeassistant.helpers.config_validation as cv
from homeassistant.components.sensor import PLATFORM_SCHEMA
@@ -21,7 +21,6 @@ CONF_SERIAL_DEVICE = "serial_device"
CONF_BRAND = "brand"
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Required(CONF_PLATFORM): 'serial_pm',
vol.Optional(CONF_NAME, default=""): cv.string,
vol.Required(CONF_SERIAL_DEVICE): cv.string,
vol.Required(CONF_BRAND): cv.string,
@@ -139,7 +139,7 @@ class RoundThermostat(ThermostatDevice):
@property
def operation(self: ThermostatDevice) -> str:
"""Get the current operation of the system."""
return self.device.system_mode
return getattr(self.device, 'system_mode', None)
@property
def is_away_mode_on(self):
@@ -148,7 +148,8 @@ class RoundThermostat(ThermostatDevice):
def set_hvac_mode(self: ThermostatDevice, hvac_mode: str) -> None:
"""Set the HVAC mode for the thermostat."""
self.device.system_mode = hvac_mode
if hasattr(self.device, 'system_mode'):
self.device.system_mode = hvac_mode
def turn_away_mode_on(self):
"""Turn away on.
@@ -231,7 +232,7 @@ class HoneywellUSThermostat(ThermostatDevice):
@property
def operation(self: ThermostatDevice) -> str:
"""Return current operation ie. heat, cool, idle."""
return self._device.system_mode
return getattr(self._device, 'system_mode', None)
def set_temperature(self, temperature):
"""Set target temperature."""
@@ -261,4 +262,5 @@ class HoneywellUSThermostat(ThermostatDevice):
def set_hvac_mode(self: ThermostatDevice, hvac_mode: str) -> None:
"""Set the system mode (Cool, Heat, etc)."""
self._device.system_mode = hvac_mode
if hasattr(self._device, 'system_mode'):
self._device.system_mode = hvac_mode
+3 -2
View File
@@ -91,8 +91,9 @@ class ZWaveThermostat(zwave.ZWaveDeviceEntity, ThermostatDevice):
# current Temp
for _, value in self._node.get_values_for_command_class(
COMMAND_CLASS_SENSOR_MULTILEVEL).items():
self._current_temperature = int(value.data)
self._unit = value.units
if value.label == 'Temperature':
self._current_temperature = int(value.data)
self._unit = value.units
# operation state
for _, value in self._node.get_values(
+1 -1
View File
@@ -10,7 +10,7 @@ from homeassistant.components.discovery import SERVICE_WEMO
from homeassistant.helpers import discovery
from homeassistant.const import EVENT_HOMEASSISTANT_STOP
REQUIREMENTS = ['pywemo==0.4.3']
REQUIREMENTS = ['pywemo==0.4.5']
DOMAIN = 'wemo'
+1 -1
View File
@@ -1,7 +1,7 @@
# coding: utf-8
"""Constants used by Home Assistant components."""
__version__ = "0.26.0"
__version__ = "0.26.3"
REQUIRED_PYTHON_VER = (3, 4)
PLATFORM_FORMAT = '{}.{}'
+1 -1
View File
@@ -374,7 +374,7 @@ pyuserinput==0.1.9
pyvera==0.2.15
# homeassistant.components.wemo
pywemo==0.4.3
pywemo==0.4.5
# homeassistant.components.thermostat.radiotherm
radiotherm==1.2
+5 -1
View File
@@ -2,6 +2,7 @@
import unittest
from unittest.mock import patch
from homeassistant import bootstrap
from homeassistant.const import HTTP_HEADER_HA_AUTH
import homeassistant.components.media_player as mp
import homeassistant.components.http as http
@@ -13,6 +14,8 @@ from tests.common import get_test_home_assistant, get_test_instance_port
SERVER_PORT = get_test_instance_port()
HTTP_BASE_URL = 'http://127.0.0.1:{}'.format(SERVER_PORT)
API_PASSWORD = "test1234"
HA_HEADERS = {HTTP_HEADER_HA_AUTH: API_PASSWORD}
hass = None
@@ -26,7 +29,8 @@ def setUpModule(): # pylint: disable=invalid-name
hass = get_test_home_assistant()
bootstrap.setup_component(hass, http.DOMAIN, {
http.DOMAIN: {
http.CONF_SERVER_PORT: SERVER_PORT
http.CONF_SERVER_PORT: SERVER_PORT,
http.CONF_API_PASSWORD: API_PASSWORD,
},
})