Maintenance 2nd (#4106)
* Add link to docs * Fix link * Update line breaks * Update ordering * Align vera platofrm to only use add_devices (instead od add_devices_callback) * Remove line break * Use consts * Update ordering * Update ordering * Use const, create default name, use string formatting * Update ordering * Use const * Update import style * Update ordering and line breaks * update line breaks * Set default port * Set defaults and update ordering * Update ordering * Minor style updates * Update ordering, defaults, line breaks, and readability * Use constants * Add line breaks * use string formatting * Update line breaks * Update logger
This commit is contained in:
1 parent
e6ece4bf6d
commit
9f2aae1357
28 files changed
+272
-271
No files matched your search
@@ -13,21 +13,27 @@ from homeassistant.components.sensor import PLATFORM_SCHEMA
|
||||
from homeassistant.helpers.entity import Entity
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
from homeassistant.util import Throttle
|
||||
from homeassistant.const import CONF_MONITORED_CONDITIONS, CONF_NAME
|
||||
|
||||
from homeassistant.const import (
|
||||
CONF_MONITORED_CONDITIONS, CONF_NAME, CONF_MAC)
|
||||
|
||||
REQUIREMENTS = ['miflora==0.1.9']
|
||||
|
||||
LOGGER = logging.getLogger(__name__)
|
||||
UPDATE_INTERVAL = 1200
|
||||
MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=UPDATE_INTERVAL)
|
||||
CONF_MAC = 'mac'
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
CONF_CACHE = 'cache_value'
|
||||
CONF_FORCE_UPDATE = 'force_update'
|
||||
CONF_MEDIAN = 'median'
|
||||
CONF_TIMEOUT = 'timeout'
|
||||
CONF_RETRIES = 'retries'
|
||||
CONF_CACHE = 'cache_value'
|
||||
CONF_TIMEOUT = 'timeout'
|
||||
|
||||
DEFAULT_FORCE_UPDATE = False
|
||||
DEFAULT_MEDIAN = 3
|
||||
DEFAULT_NAME = 'Mi Flora'
|
||||
DEFAULT_RETRIES = 2
|
||||
DEFAULT_TIMEOUT = 10
|
||||
|
||||
UPDATE_INTERVAL = 1200
|
||||
MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=UPDATE_INTERVAL)
|
||||
|
||||
# Sensor types are defined like: Name, units
|
||||
SENSOR_TYPES = {
|
||||
@@ -42,10 +48,10 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
|
||||
vol.Required(CONF_MONITORED_CONDITIONS):
|
||||
vol.All(cv.ensure_list, [vol.In(SENSOR_TYPES)]),
|
||||
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
|
||||
vol.Optional(CONF_MEDIAN, default=3): cv.positive_int,
|
||||
vol.Optional(CONF_FORCE_UPDATE, default=False): cv.boolean,
|
||||
vol.Optional(CONF_TIMEOUT, default=10): cv.positive_int,
|
||||
vol.Optional(CONF_RETRIES, default=2): cv.positive_int,
|
||||
vol.Optional(CONF_MEDIAN, default=DEFAULT_MEDIAN): cv.positive_int,
|
||||
vol.Optional(CONF_FORCE_UPDATE, default=DEFAULT_FORCE_UPDATE): cv.boolean,
|
||||
vol.Optional(CONF_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
|
||||
vol.Optional(CONF_RETRIES, default=DEFAULT_RETRIES): cv.positive_int,
|
||||
vol.Optional(CONF_CACHE, default=UPDATE_INTERVAL): cv.positive_int,
|
||||
})
|
||||
|
||||
@@ -55,8 +61,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
|
||||
from miflora import miflora_poller
|
||||
|
||||
cache = config.get(CONF_CACHE)
|
||||
poller = miflora_poller.MiFloraPoller(config.get(CONF_MAC),
|
||||
cache_timeout=cache)
|
||||
poller = miflora_poller.MiFloraPoller(
|
||||
config.get(CONF_MAC), cache_timeout=cache)
|
||||
force_update = config.get(CONF_FORCE_UPDATE)
|
||||
median = config.get(CONF_MEDIAN)
|
||||
poller.ble_timeout = config.get(CONF_TIMEOUT)
|
||||
@@ -72,12 +78,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
|
||||
if len(prefix) > 0:
|
||||
name = "{} {}".format(prefix, name)
|
||||
|
||||
devs.append(MiFloraSensor(poller,
|
||||
parameter,
|
||||
name,
|
||||
unit,
|
||||
force_update,
|
||||
median))
|
||||
devs.append(MiFloraSensor(
|
||||
poller, parameter, name, unit, force_update, median))
|
||||
|
||||
add_devices(devs)
|
||||
|
||||
@@ -85,8 +87,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
|
||||
class MiFloraSensor(Entity):
|
||||
"""Implementing the MiFlora sensor."""
|
||||
|
||||
# pylint: disable=too-many-instance-attributes,too-many-arguments
|
||||
def __init__(self, poller, parameter, name, unit, force_update, median=3):
|
||||
# pylint: disable=too-many-instance-attributes,too-many-arguments
|
||||
def __init__(self, poller, parameter, name, unit, force_update, median):
|
||||
"""Initialize the sensor."""
|
||||
self.poller = poller
|
||||
self.parameter = parameter
|
||||
@@ -128,19 +130,19 @@ class MiFloraSensor(Entity):
|
||||
This uses a rolling median over 3 values to filter out outliers.
|
||||
"""
|
||||
try:
|
||||
LOGGER.debug("Polling data for %s", self.name)
|
||||
_LOGGER.debug("Polling data for %s", self.name)
|
||||
data = self.poller.parameter_value(self.parameter)
|
||||
except IOError as ioerr:
|
||||
LOGGER.info("Polling error %s", ioerr)
|
||||
_LOGGER.info("Polling error %s", ioerr)
|
||||
data = None
|
||||
return
|
||||
|
||||
if data is not None:
|
||||
LOGGER.debug("%s = %s", self.name, data)
|
||||
_LOGGER.debug("%s = %s", self.name, data)
|
||||
self.data.append(data)
|
||||
else:
|
||||
LOGGER.info("Did not receive any data from Mi Flora sensor %s",
|
||||
self.name)
|
||||
_LOGGER.info("Did not receive any data from Mi Flora sensor %s",
|
||||
self.name)
|
||||
# Remove old data from median list or set sensor value to None
|
||||
# if no data is available anymore
|
||||
if len(self.data) > 0:
|
||||
@@ -149,13 +151,13 @@ class MiFloraSensor(Entity):
|
||||
self._state = None
|
||||
return
|
||||
|
||||
LOGGER.debug("Data collected: %s", self.data)
|
||||
_LOGGER.debug("Data collected: %s", self.data)
|
||||
if len(self.data) > self.median_count:
|
||||
self.data = self.data[1:]
|
||||
|
||||
if len(self.data) == self.median_count:
|
||||
median = sorted(self.data)[int((self.median_count - 1) / 2)]
|
||||
LOGGER.debug("Median is: %s", median)
|
||||
_LOGGER.debug("Median is: %s", median)
|
||||
self._state = median
|
||||
else:
|
||||
LOGGER.debug("Not yet enough data for median calculation")
|
||||
_LOGGER.debug("Not yet enough data for median calculation")
|
||||
Reference in new issue
Block a user