Merge pull request #3110 from home-assistant/rfxtrx_sensor_cleanup

rfxtrx sensor clean up

homeassistant/components/sensor/rfxtrx.py

@@ -9,6 +9,7 @@
 
 import homeassistant.components.rfxtrx as rfxtrx
 import homeassistant.helpers.config_validation as cv
+from homeassistant.const import CONF_PLATFORM
 from homeassistant.helpers.entity import Entity
 from homeassistant.util import slugify
 from homeassistant.components.rfxtrx import (
@@ -20,7 +21,7 @@
 _LOGGER = logging.getLogger(__name__)
 
 PLATFORM_SCHEMA = vol.Schema({
-    vol.Required("platform"): rfxtrx.DOMAIN,
+    vol.Required(CONF_PLATFORM): rfxtrx.DOMAIN,
     vol.Optional(CONF_DEVICES, default={}): vol.All(dict, rfxtrx.valid_sensor),
     vol.Optional(ATTR_AUTOMATIC_ADD, default=False):  cv.boolean,
 }, extra=vol.ALLOW_EXTRA)
@@ -31,7 +32,7 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
     # pylint: disable=too-many-locals
     from RFXtrx import SensorEvent
     sensors = []
-    for packet_id, entity_info in config['devices'].items():
+    for packet_id, entity_info in config[CONF_DEVICES].items():
         event = rfxtrx.get_rfx_object(packet_id)
         device_id = "sensor_" + slugify(event.device.id_string.lower())
         if device_id in rfxtrx.RFX_DEVICES:
@@ -41,7 +42,7 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
         sub_sensors = {}
         data_types = entity_info[ATTR_DATA_TYPE]
         if len(data_types) == 0:
-            data_types = ["Unknown"]
+            data_types = ['']
             for data_type in DATA_TYPES:
                 if data_type in event.values:
                     data_types = [data_type]
@@ -52,7 +53,6 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
             sensors.append(new_sensor)
             sub_sensors[_data_type] = new_sensor
         rfxtrx.RFX_DEVICES[device_id] = sub_sensors
-
     add_devices_callback(sensors)
 
     def sensor_update(event):
@@ -75,7 +75,6 @@ def sensor_update(event):
                                 sensors[key].entity_id,
                         }
                     )
-
             return
 
         # Add entity if not exist and the automatic_add is True
@@ -86,7 +85,7 @@ def sensor_update(event):
         _LOGGER.info("Automatic add rfxtrx.sensor: %s",
                      pkt_id)
 
-        data_type = "Unknown"
+        data_type = ''
         for _data_type in DATA_TYPES:
             if _data_type in event.values:
                 data_type = _data_type
@@ -119,9 +118,9 @@ def __str__(self):
     @property
     def state(self):
         """Return the state of the sensor."""
-        if self.event and self.data_type in self.event.values:
-            return self.event.values[self.data_type]
-        return None
+        if not self.event:
+            return None
+        return self.event.values.get(self.data_type)
 
     @property
     def name(self):
@@ -131,8 +130,9 @@ def name(self):
     @property
     def device_state_attributes(self):
         """Return the state attributes."""
-        if self.event:
-            return self.event.values
+        if not self.event:
+            return None
+        return self.event.values
 
     @property
     def unit_of_measurement(self):