jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-20 11:47:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate to voluptuous (#3092)

Browse Source
This commit is contained in:
Fabian Affolter 2016-09-03 10:56:41 +02:00 committed by GitHub
parent 795121d5a8
commit 5dc63c17c8
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
homeassistant/components/sensor/dht.py
View File

@ -7,7 +7,12 @@ https://home-assistant.io/components/sensor.dht/
import logging import logging
from datetime import timedelta from datetime import timedelta
from homeassistant.const import TEMP_FAHRENHEIT import voluptuous as vol
from homeassistant.components.sensor import PLATFORM_SCHEMA
import homeassistant.helpers.config_validation as cv
from homeassistant.const import (
TEMP_FAHRENHEIT, CONF_NAME, CONF_MONITORED_CONDITIONS)
from homeassistant.helpers.entity import Entity from homeassistant.helpers.entity import Entity
from homeassistant.util import Throttle from homeassistant.util import Throttle
from homeassistant.util.temperature import celsius_to_fahrenheit from homeassistant.util.temperature import celsius_to_fahrenheit
@ -18,18 +23,29 @@ REQUIREMENTS = ['http://github.com/adafruit/Adafruit_Python_DHT/archive/'
'#Adafruit_DHT==1.3.0'] '#Adafruit_DHT==1.3.0']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
CONF_PIN = 'pin' CONF_PIN = 'pin'
CONF_SENSOR = 'sensor' CONF_SENSOR = 'sensor'
DEFAULT_NAME = 'DHT Sensor'
# DHT11 is able to deliver data once per second, DHT22 once every two
MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=30)
SENSOR_TEMPERATURE = 'temperature' SENSOR_TEMPERATURE = 'temperature'
SENSOR_HUMIDITY = 'humidity' SENSOR_HUMIDITY = 'humidity'
SENSOR_TYPES = { SENSOR_TYPES = {
SENSOR_TEMPERATURE: ['Temperature', None], SENSOR_TEMPERATURE: ['Temperature', None],
SENSOR_HUMIDITY: ['Humidity', '%'] SENSOR_HUMIDITY: ['Humidity', '%']
} }
DEFAULT_NAME = "DHT Sensor"
# Return cached results if last scan was less then this time ago PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
# DHT11 is able to deliver data once per second, DHT22 once every two vol.Required(CONF_SENSOR): cv.string,
MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=30) vol.Required(CONF_PIN): cv.string,
vol.Optional(CONF_MONITORED_CONDITIONS, default=[]):
vol.All(cv.ensure_list, [vol.In(SENSOR_TYPES)]),
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
})
def setup_platform(hass, config, add_devices, discovery_info=None): def setup_platform(hass, config, add_devices, discovery_info=None):
@ -46,23 +62,18 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
sensor = available_sensors.get(config.get(CONF_SENSOR)) sensor = available_sensors.get(config.get(CONF_SENSOR))
pin = config.get(CONF_PIN) pin = config.get(CONF_PIN)
if not sensor or not pin: if not sensor:
_LOGGER.error( _LOGGER.error("DHT sensor type is not supported")
"Config error " return False
"Please check your settings for DHT, sensor not supported.")
return None
data = DHTClient(Adafruit_DHT, sensor, pin) data = DHTClient(Adafruit_DHT, sensor, pin)
dev = [] dev = []
name = config.get('name', DEFAULT_NAME) name = config.get(CONF_NAME)
try: try:
for variable in config['monitored_conditions']: for variable in config[CONF_MONITORED_CONDITIONS]:
if variable not in SENSOR_TYPES: dev.append(DHTSensor(
_LOGGER.error('Sensor type: "%s" does not exist', variable) data, variable, SENSOR_TYPES[variable][1], name))
else:
dev.append(
DHTSensor(data, variable, SENSOR_TYPES[variable][1], name))
except KeyError: except KeyError:
pass pass
@ -109,8 +120,7 @@ class DHTSensor(Entity):
if (temperature >= -20) and (temperature < 80): if (temperature >= -20) and (temperature < 80):
self._state = temperature self._state = temperature
if self.temp_unit == TEMP_FAHRENHEIT: if self.temp_unit == TEMP_FAHRENHEIT:
self._state = round(celsius_to_fahrenheit(temperature), self._state = round(celsius_to_fahrenheit(temperature), 1)
1)
elif self.type == SENSOR_HUMIDITY: elif self.type == SENSOR_HUMIDITY:
humidity = round(data[SENSOR_HUMIDITY], 1) humidity = round(data[SENSOR_HUMIDITY], 1)
if (humidity >= 0) and (humidity <= 100): if (humidity >= 0) and (humidity <= 100):