Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

0.27.1 #3060

Merged
merged 24 commits into from
Aug 30, 2016
Merged

0.27.1 #3060

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
7940648
0.28.0.dev0
robbiet480 Aug 28, 2016
17a57d3
Fixes wrong statevalue and problem with zwave setpoint (#3017)
turbokongen Aug 28, 2016
3313995
fix voluptuous and cover autodiscovery (#3022)
pvizeli Aug 28, 2016
2a5ca1c
Map Modes to setpoint indexes (#3023)
turbokongen Aug 28, 2016
2d8bc75
Ecobee (#3025)
turbokongen Aug 28, 2016
821b3d7
Bug fix for asuswrt device_tracker. Issue #3015 (#3016)
Danielhiversen Aug 28, 2016
b6ad0bf
Allow user to configure server id to perform speed test against (#3008)
Aug 29, 2016
1699885
Fix media_player descriptions and select_source (#3030)
MartinHjelmare Aug 29, 2016
39402af
Remove units for humidity in Wundeground sensor (#3018)
arsaboo Aug 29, 2016
62bbda1
Bug fix for asuswrt device_tracker. Issue #3015
Aug 29, 2016
6275cff
Merge pull request #3036 from home-assistant/bug_fix_asuwrt
Danielhiversen Aug 29, 2016
1b718c6
Fix bug in wemo discovery caused by voluptuous addition. (#3027)
pavoni Aug 29, 2016
008e300
Upgrade TwitterAPI to 2.4.2 (#3043)
fabaff Aug 29, 2016
c1794d1
Upgrade sendgrid to 3.2.10 (#3044)
fabaff Aug 29, 2016
4e04436
Use voluptuous for smtp (#3048)
pvizeli Aug 29, 2016
650ec1a
Added option to use effect:random for Flux Led light bulbs
tchellomello Aug 29, 2016
16e0187
Merge pull request #3051 from tchellomello/added_random_effect_flux_led
Danielhiversen Aug 30, 2016
55d3053
Device tracker component & platform validation. No more home_range. (…
kellerza Aug 30, 2016
cf9b49a
update ha-ffmpeg version to 0.9 (#3059)
pvizeli Aug 30, 2016
7ceb22a
Ecobee (#3055)
turbokongen Aug 30, 2016
eec96ea
Migrate to voluptuous (#2954)
fabaff Aug 30, 2016
9a4447c
0.28.1
robbiet480 Aug 30, 2016
d907902
0.27.1 NOT 0.28.1, thanks for the catch @arsaboo
robbiet480 Aug 30, 2016
e9354bb
Make pep8 happy
robbiet480 Aug 30, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Ecobee (#3055)
* Added in list for opreation

* Added attribute to reflect the old operation

* fix humidity
  • Loading branch information
turbokongen authored Aug 30, 2016
commit 7ceb22a08b53a1dfe4fb870592dbc5c432632b70
40 changes: 22 additions & 18 deletions homeassistant/components/climate/ecobee.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ def __init__(self, data, thermostat_index, hold_temp):
self.thermostat_index)
self._name = self.thermostat['name']
self.hold_temp = hold_temp
self._operation_list = ['auto', 'auxHeatOnly', 'cool',
'heat', 'off']

def update(self):
"""Get the latest state from the thermostat."""
Expand Down Expand Up @@ -124,11 +126,6 @@ def target_temperature_high(self):
"""Return the upper bound temperature we try to reach."""
return int(self.thermostat['runtime']['desiredCool'] / 10)

@property
def current_humidity(self):
"""Return the current humidity."""
return self.thermostat['runtime']['actualHumidity']

@property
def desired_fan_mode(self):
"""Return the desired fan mode of operation."""
Expand All @@ -147,20 +144,15 @@ def current_operation(self):
"""Return current operation."""
return self.operation_mode

@property
def operation_list(self):
"""Return the operation modes list."""
return self._operation_list

@property
def operation_mode(self):
"""Return current operation ie. heat, cool, idle."""
status = self.thermostat['equipmentStatus']
if status == '':
return STATE_IDLE
elif 'Cool' in status:
return STATE_COOL
elif 'auxHeat' in status:
return STATE_HEAT
elif 'heatPump' in status:
return STATE_HEAT
else:
return status
return self.thermostat['settings']['hvacMode']

@property
def mode(self):
Expand All @@ -176,11 +168,23 @@ def fan_min_on_time(self):
def device_state_attributes(self):
"""Return device specific state attributes."""
# Move these to Thermostat Device and make them global
status = self.thermostat['equipmentStatus']
operation = None
if status == '':
operation = STATE_IDLE
elif 'Cool' in status:
operation = STATE_COOL
elif 'auxHeat' in status:
operation = STATE_HEAT
elif 'heatPump' in status:
operation = STATE_HEAT
else:
operation = status
return {
"humidity": self.current_humidity,
"humidity": self.thermostat['runtime']['actualHumidity'],
"fan": self.fan,
"mode": self.mode,
"hvac_mode": self.thermostat['settings']['hvacMode'],
"operation": operation,
"fan_min_on_time": self.fan_min_on_time
}

Expand Down