From aea6042fe194d5b1037d64d64d37362ed5758575 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sun, 11 Jan 2015 21:21:18 -0800 Subject: [PATCH] Getting thermostat component ready for release --- homeassistant/components/demo.py | 14 +-- homeassistant/components/http/frontend.py | 2 +- .../components/http/www_static/frontend.html | 12 ++- .../polymer/cards/state-card-thermostat.html | 26 +++--- .../polymer/components/domain-icon.html | 5 +- .../resources/home-assistant-icons.html | 11 ++- .../components/thermostat/__init__.py | 89 ++++++++++++------- homeassistant/components/thermostat/nest.py | 51 ++++++----- 8 files changed, 121 insertions(+), 89 deletions(-) diff --git a/homeassistant/components/demo.py b/homeassistant/components/demo.py index 3db878b7ae8..4076ca63159 100644 --- a/homeassistant/components/demo.py +++ b/homeassistant/components/demo.py @@ -10,12 +10,14 @@ import homeassistant as ha import homeassistant.loader as loader from homeassistant.helpers import extract_entity_ids from homeassistant.const import ( - SERVICE_TURN_ON, SERVICE_TURN_OFF, STATE_ON, STATE_OFF, - ATTR_ENTITY_PICTURE, ATTR_ENTITY_ID, CONF_LATITUDE, CONF_LONGITUDE) + SERVICE_TURN_ON, SERVICE_TURN_OFF, + STATE_ON, STATE_OFF, TEMP_CELCIUS, + ATTR_ENTITY_PICTURE, ATTR_ENTITY_ID, ATTR_UNIT_OF_MEASUREMENT, + CONF_LATITUDE, CONF_LONGITUDE) from homeassistant.components.light import ( ATTR_XY_COLOR, ATTR_RGB_COLOR, ATTR_BRIGHTNESS, GROUP_NAME_ALL_LIGHTS) from homeassistant.components.thermostat import ( - ATTR_TARGET_TEMPERATURE, ATTR_AWAY_MODE) + ATTR_CURRENT_TEMPERATURE, ATTR_AWAY_MODE) from homeassistant.util import split_entity_id, color_RGB_to_xy DOMAIN = "demo" @@ -161,10 +163,10 @@ def setup(hass, config): }) # Nest demo - hass.states.set("thermostat.Nest", "15.6", + hass.states.set("thermostat.Nest", "23", { - 'unit_of_measurement': '°C', - ATTR_TARGET_TEMPERATURE: '23.6', + ATTR_UNIT_OF_MEASUREMENT: TEMP_CELCIUS, + ATTR_CURRENT_TEMPERATURE: '18', ATTR_AWAY_MODE: STATE_OFF }) diff --git a/homeassistant/components/http/frontend.py b/homeassistant/components/http/frontend.py index 7908edf33f1..ae20b77249b 100644 --- a/homeassistant/components/http/frontend.py +++ b/homeassistant/components/http/frontend.py @@ -1,2 +1,2 @@ """ DO NOT MODIFY. Auto-generated by build_frontend script """ -VERSION = "7dec66ac57c858565b26db16e150a3b5" +VERSION = "7484b7aecbe15593d924b47daf4a89df" diff --git a/homeassistant/components/http/www_static/frontend.html b/homeassistant/components/http/www_static/frontend.html index 0d3aa902643..d2870ef5ba4 100644 --- a/homeassistant/components/http/www_static/frontend.html +++ b/homeassistant/components/http/www_static/frontend.html @@ -50,18 +50,16 @@ if(this.removeAttribute(a),d)return j(this,a,c);var e=c,f=m(this,a,e);return j(t