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

move EcobeeData class and Throttle to the main ecobee component, this way the sensor and thermostat will use the same throttled updating object.

Browse source
This commit is contained in:
nkgilley@gmail.com 2015-11-21 12:24:06 -05:00
parent 44abc31057
commit 8dc0de1d05
2 changed files with 21 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
homeassistant/components/ecobee.py
View file

@ -1,5 +1,5 @@
"""
homeassistant.components.zwave
homeassistant.components.ecobee
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Connects Home Assistant to the Ecobee API and maintains tokens.
@ -12,6 +12,7 @@ api_key: asdflaksf
from homeassistant.loader import get_component
from homeassistant import bootstrap
from homeassistant.util import Throttle
from homeassistant.const import (
EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP,
EVENT_PLATFORM_DISCOVERED, ATTR_SERVICE, ATTR_DISCOVERED, CONF_API_KEY)
@ -57,7 +58,7 @@ def request_configuration(network, hass):
hass, "Ecobee", ecobee_configuration_callback,
description=(
'Please authorize this app at https://www.ecobee.com/consumer'
'portal/index.html with pin code: ' + NETWORK.pin),
'portal/index.html with pin code: ' + network.pin),
description_image="/static/images/config_ecobee_thermostat.png",
submit_caption="I have authorized the app."
)
@ -75,6 +76,20 @@ def setup_ecobee(hass, network):
configurator.request_done(_CONFIGURING.pop('ecobee'))
# pylint: disable=too-few-public-methods
class EcobeeData(object):
""" Gets the latest data and update the states. """
def __init__(self, config_file):
from pyecobee import Ecobee
self.ecobee = Ecobee(config_file)
@Throttle(MIN_TIME_BETWEEN_UPDATES)
def update(self):
""" Get the latest data from pyecobee. """
self.ecobee.update()
def setup(hass, config):
"""
Setup Ecobee.
@ -87,7 +102,7 @@ def setup(hass, config):
if 'ecobee' in _CONFIGURING:
return
from pyecobee import Ecobee, config_from_file
from pyecobee import config_from_file
# Create ecobee.conf if it doesn't exist
if not os.path.isfile(hass.config.path(ECOBEE_CONFIG_FILE)):
@ -97,9 +112,9 @@ def setup(hass, config):
jsonconfig = {"API_KEY": config[DOMAIN].get(CONF_API_KEY)}
config_from_file(hass.config.path(ECOBEE_CONFIG_FILE), jsonconfig)
NETWORK = Ecobee(hass.config.path(ECOBEE_CONFIG_FILE))
NETWORK = EcobeeData(hass.config.path(ECOBEE_CONFIG_FILE))
setup_ecobee(hass, NETWORK)
setup_ecobee(hass, NETWORK.ecobee)
# Ensure component is loaded
bootstrap.setup_component(hass, 'thermostat', config)

26
homeassistant/components/thermostat/ecobee.py
View file

@ -26,8 +26,6 @@ thermostat:
from homeassistant.components.thermostat import (ThermostatDevice, STATE_COOL,
STATE_IDLE, STATE_HEAT)
from homeassistant.const import (TEMP_FAHRENHEIT, STATE_ON, STATE_OFF)
from homeassistant.util import Throttle
from datetime import timedelta
import logging
DEPENDENCIES = ['ecobee']
@ -37,39 +35,17 @@ _LOGGER = logging.getLogger(__name__)
ECOBEE_CONFIG_FILE = 'ecobee.conf'
_CONFIGURING = {}
# Return cached results if last scan was less then this time ago
MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=180)
def setup_platform(hass, config, add_devices, discovery_info=None):
""" Setup Platform """
_LOGGER.error("ecobee !!!!")
if discovery_info is None:
return
data = EcobeeData(discovery_info[0])
setup_ecobee(hass, data, add_devices)
def setup_ecobee(hass, data, add_devices):
""" Setup ecobee thermostat """
data = discovery_info[0]
add_devices(Thermostat(data, index)
for index in range(len(data.ecobee.thermostats)))
# pylint: disable=too-few-public-methods
class EcobeeData(object):
""" Gets the latest data and update the states. """
def __init__(self, network):
self.ecobee = network
@Throttle(MIN_TIME_BETWEEN_UPDATES)
def update(self):
""" Get the latest data from pyecobee. """
self.ecobee.update()
class Thermostat(ThermostatDevice):
""" Thermostat class for Ecobee """