Merge pull request #1206 from turbokongen/rfxtrx-newprotocols

Supporting electricity sensors with ELEC2/3 protocol from latest pyRFXtrx (0.4)

homeassistant/components/sensor/rfxtrx.py

@@ -21,7 +21,9 @@ DATA_TYPES = OrderedDict([
     ('Humidity', '%'),
     ('Barometer', ''),
     ('Wind direction', ''),
-    ('Rain rate', '')])
+    ('Rain rate', ''),
+    ('Energy usage', 'W'),
+    ('Total usage', 'W')])
 _LOGGER = logging.getLogger(__name__)