Skip to content

Improvements for WeMo Insight switches #6001

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.

Sign up for GitHub

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

Merged
robbiet480 merged 10 commits into from
Mar 10, 2017
Merged

Improvements for WeMo Insight switches #6001

Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
29c7987
Improvements for WeMo Insight switches
deftdawg Feb 14, 2017
c404fb7
Update wemo.py
deftdawg Feb 15, 2017
44d274e
Update wemo.py
deftdawg Feb 15, 2017
a718e92
Update wemo.py
deftdawg Feb 15, 2017
b163544
Back to you travis....
deftdawg Feb 15, 2017
e221c8a
Update wemo.py
deftdawg Feb 15, 2017
e9cf5f6
Update wemo.py
deftdawg Feb 15, 2017
f6e46ae
Update wemo.py
deftdawg Feb 15, 2017
ef87d4d
Update device_state_attributes only
deftdawg Feb 23, 2017
fc5e25a
Incorporate comment suggestions
deftdawg Feb 23, 2017
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
22 changes: 22 additions & 0 deletions homeassistant/components/switch/wemo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
https://home-assistant.io/components/switch.wemo/
"""
import logging
from datetime import datetime, timedelta

from homeassistant.components.switch import SwitchDevice
from homeassistant.const import (
Expand Down Expand Up @@ -109,12 +110,33 @@ def device_state_attributes(self):

if self.insight_params or (self.coffeemaker_mode is not None):
attr[ATTR_CURRENT_STATE_DETAIL] = self.detail_state
attr['current_power_w'] = \

@pavoni pavoni Feb 23, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't expect the coffee machine will support these new attributes - so I'd change this so that you only retrieve these attributes for the insight device.

@deftdawg deftdawg Feb 23, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call

@pavoni pavoni Feb 23, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just the existing switch attribute divided by 1000.

At some point we'll change the switch attribute to be W rather than mW anyway. So this is only really helpful until we do that.

My suggestion would be to remove it

self.insight_params['currentpower'] / 1000
attr['today_power_mW_min'] = self.insight_params['todaymw']
attr['total_power_mW_min'] = self.insight_params['totalmw']

@pavoni pavoni Feb 23, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line is duplicated - but it's also a duplicate of the existing current_power_mwh property of the switch - so you can just remove these - and depend on the switch attributes.

@deftdawg deftdawg Feb 23, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will remove in favour of the incorrectly labeled existing ones

attr['on_time_most_recent'] = \
WemoSwitch.as_uptime(self.insight_params['onfor'])
attr['on_time_today'] = \
WemoSwitch.as_uptime(self.insight_params['ontoday'])
attr['on_time_total'] = \
WemoSwitch.as_uptime(self.insight_params['ontotal'])
attr['power_threshold_w'] = \
self.insight_params['powerthreshold'] / 1000

if self.coffeemaker_mode is not None:
attr[ATTR_COFFEMAKER_MODE] = self.coffeemaker_mode

return attr

@staticmethod
def as_uptime(_seconds):
"""Format seconds into uptime string in the format: 00d 00h 00m 00s."""
uptime = datetime(1, 1, 1) + timedelta(seconds=_seconds)
return "{:0>2d}d {:0>2d}h {:0>2d}m {:0>2d}s".format(uptime.day-1,

@balloob balloob Mar 2, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not use the timedelta object directly? It supports days, hours etc https://docs.python.org/3/library/datetime.html#datetime.timedelta

@deftdawg deftdawg Mar 3, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm probably doing something stupid (python noob), but when I try that I get this:

>>> from datetime import datetime, timedelta
>>> uptime = timedelta(days=0,seconds=86401,hours=0,minutes=0)
>>> print ("{:0>2d}d {:0>2d}h {:0>2d}m {:0>2d}s".format(uptime.days, uptime.hours, uptime.minutes, uptime.seconds))
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
AttributeError: 'datetime.timedelta' object has no attribute 'hours'

@balloob balloob Mar 5, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh you're right, I was wrong. Looks like timedelta converts it all to seconds.

uptime.hour,
uptime.minute,
uptime.second)

@property
def current_power_mwh(self):
"""Current power usage in mWh."""
Expand Down