- Added support for getting power on SP2101W devices (returns None on SP1101W)

.coveragerc

@@ -53,6 +53,7 @@ omit =
     homeassistant/components/sensor/systemmonitor.py
     homeassistant/components/sensor/time_date.py
     homeassistant/components/sensor/transmission.py
+    homeassistant/components/sensor/edimax.py
     homeassistant/components/switch/hikvisioncam.py
     homeassistant/components/switch/wemo.py
     homeassistant/components/thermostat/nest.py

homeassistant/components/switch/edimax.py

@@ -9,6 +9,7 @@ import logging
 from homeassistant.components.switch import SwitchDevice
 from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
 
+
 # pylint: disable=unused-argument
 def setup_platform(hass, config, add_devices_callback, discovery_info=None):
     """ Find and return Edimax Smart Plugs. """
@@ -24,14 +25,14 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
         return
 
     host = config.get(CONF_HOST)
-    auth=(config.get(CONF_USERNAME, 'admin'),
-          config.get(CONF_PASSWORD, '1234'))
+    auth = (config.get(CONF_USERNAME, 'admin'),
+            config.get(CONF_PASSWORD, '1234'))
 
     if not host:
-        logging.getLogger(__name__).error('Missing config variable %s', CONF_HOST)
+        logging.getLogger(__name__).error(
+            'Missing config variable %s', CONF_HOST)
         return False
 
-
     add_devices_callback([SmartPlugSwitch(SmartPlug(host, auth))])
 
 
@@ -46,6 +47,22 @@ class SmartPlugSwitch(SwitchDevice):
         #TODO: dynamically get name from device using requests
         return 'Edimax Smart Plug'
 
+    @property
+    def current_power_mwh(self):
+        """ Current power usage in mwh. """
+        try:
+            return float(self.smartplug.now_power) / 1000000.0
+        except ValueError:
+            return None
+
+    @property
+    def today_power_mw(self):
+        """ Today total power usage in mw. """
+        try:
+            return float(self.smartplug.now_energy_day) / 1000.0
+        except ValueError:
+            return None
+
     @property
     def is_on(self):
         """ True if switch is on. """
@@ -57,4 +74,4 @@ class SmartPlugSwitch(SwitchDevice):
 
     def turn_off(self):
         """ Turns the switch off. """
-        self.smartplug.state = 'OFF'
+        self.smartplug.state = 'OFF'