evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tellstick sensor configuration cleanup (#21402)

Browse source 
* Cleaned up named sensor handling for future

Breaking change for tellstick sensor configuration.

* Fixed linting of long lines and closing bracket

Linting warning for long line and not using best practice for visual indentation of closing bracket.
Who's a good boy..

* Whitespace on line was not cleaned.

* Removed spaces to clean up

* More.. whitespace. Sloppy.

* Constants from const, altered loops, added dictionary for sensor names.

* Fixed whitespace

* Inverted condition and created guard clause

* Changed condition from not ... in to not in.

* Fixed bad indentation on L91 and 92
This commit is contained in:
endor 2019-03-13 12:20:15 +01:00 • committed by Martin Hjelmare
parent 007bf2bcb5
commit 18daee9af6
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
homeassistant/components/tellstick/sensor.py
View file

@ -5,7 +5,7 @@ from collections import namedtuple
import voluptuous as vol import voluptuous as vol
from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.components.sensor import PLATFORM_SCHEMA
from homeassistant.const import TEMP_CELSIUS from homeassistant.const import TEMP_CELSIUS, CONF_ID, CONF_NAME
from homeassistant.helpers.entity import Entity from homeassistant.helpers.entity import Entity
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
@ -20,15 +20,18 @@ CONF_ONLY_NAMED = 'only_named'
CONF_TEMPERATURE_SCALE = 'temperature_scale' CONF_TEMPERATURE_SCALE = 'temperature_scale'
DEFAULT_DATATYPE_MASK = 127 DEFAULT_DATATYPE_MASK = 127
DEFAULT_ONLY_NAMED = False
DEFAULT_TEMPERATURE_SCALE = TEMP_CELSIUS DEFAULT_TEMPERATURE_SCALE = TEMP_CELSIUS
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Optional(CONF_ONLY_NAMED, default=DEFAULT_ONLY_NAMED): cv.boolean,
vol.Optional(CONF_TEMPERATURE_SCALE, default=DEFAULT_TEMPERATURE_SCALE): vol.Optional(CONF_TEMPERATURE_SCALE, default=DEFAULT_TEMPERATURE_SCALE):
cv.string, cv.string,
vol.Optional(CONF_DATATYPE_MASK, default=DEFAULT_DATATYPE_MASK): vol.Optional(CONF_DATATYPE_MASK, default=DEFAULT_DATATYPE_MASK):
cv.positive_int, cv.positive_int,
vol.Optional(CONF_ONLY_NAMED, default=[]):
vol.All(cv.ensure_list, [vol.Schema({
vol.Required(CONF_ID): cv.positive_int,
vol.Required(CONF_NAME): cv.string,
})])
}) })
@ -69,20 +72,26 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
sensors = [] sensors = []
datatype_mask = config.get(CONF_DATATYPE_MASK) datatype_mask = config.get(CONF_DATATYPE_MASK)
if config[CONF_ONLY_NAMED]:
named_sensors = {
named_sensor[CONF_ID]: named_sensor[CONF_NAME]
for named_sensor in config[CONF_ONLY_NAMED]}
for tellcore_sensor in tellcore_lib.sensors(): for tellcore_sensor in tellcore_lib.sensors():
try: if not config[CONF_ONLY_NAMED]:
sensor_name = config[tellcore_sensor.id]
except KeyError:
if config.get(CONF_ONLY_NAMED):
continue
sensor_name = str(tellcore_sensor.id) sensor_name = str(tellcore_sensor.id)
else:
if tellcore_sensor.id not in named_sensors:
continue
sensor_name = named_sensors[tellcore_sensor.id]
for datatype in sensor_value_descriptions: for datatype in sensor_value_descriptions:
if datatype & datatype_mask: if datatype & datatype_mask and \
if tellcore_sensor.has_value(datatype): tellcore_sensor.has_value(datatype):
sensor_info = sensor_value_descriptions[datatype] sensor_info = sensor_value_descriptions[datatype]
sensors.append(TellstickSensor( sensors.append(TellstickSensor(
sensor_name, tellcore_sensor, datatype, sensor_info)) sensor_name, tellcore_sensor,
datatype, sensor_info))
add_entities(sensors) add_entities(sensors)