sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-03-17 08:08:16 +00:00
Code Issues Releases Wiki Activity

Refactore ppd42x.py

Browse Source
This commit is contained in:
pi4homez 2019-04-06 17:57:35 +02:00
parent befefbc632
commit a95e3d11ed
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
esphome/components/sensor/ppd42x.py
View File

@ -4,7 +4,7 @@ from esphome import pins
from esphome.components import sensor from esphome.components import sensor
import esphome.config_validation as cv import esphome.config_validation as cv
from esphome.const import CONF_ID, CONF_NAME, CONF_PM_10_0, \ from esphome.const import CONF_ID, CONF_NAME, CONF_PM_10_0, \
CONF_PM_2_5, CONF_PIN, CONF_TYPE, CONF_UPDATE_INTERVAL, CONF_TIMEOUT CONF_PM_2_5, CONF_TYPE, CONF_UPDATE_INTERVAL, CONF_TIMEOUT
from esphome.cpp_generator import Pvariable, get_variable from esphome.cpp_generator import Pvariable, get_variable
from esphome.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphome.cpp_types import App, Component from esphome.cpp_types import App, Component
@ -16,15 +16,17 @@ PPD42XSensor = sensor.sensor_ns.class_('PPD42XSensor', sensor.Sensor)
CONF_PPD42 = 'PPD42' CONF_PPD42 = 'PPD42'
CONF_PPD42NS = 'PPD42NS' CONF_PPD42NS = 'PPD42NS'
CONF_PIN_02_5 = 'pin_2_5'
CONF_PIN_10_0 = 'pin_10_0'
PPD42XType = sensor.sensor_ns.enum('PPD42XType') PPD42XType = sensor.sensor_ns.enum('PPD42XType')
PPD42X_TYPES = { PPD42X_TYPES = {
CONF_PPD42: PPD42XType.PPD42X_TYPE, CONF_PPD42: PPD42XType.PPD42X_TYPE,
CONF_PPD42NS: PPD42XType.PPD42X_TYPE_NS, CONF_PPD42NS: PPD42XType.PPD42X_TYPE_NS,
} }
SENSORS_TO_TYPE = { SENSORS_TO_TYPE = {
CONF_PM_2_5: [CONF_PPD42, CONF_PPD42NS], CONF_PIN_02_5: [CONF_PPD42, CONF_PPD42NS],
CONF_PM_10_0: [CONF_PPD42, CONF_PPD42NS], CONF_PIN_10_0: [CONF_PPD42, CONF_PPD42NS],
} }
@ -38,24 +40,24 @@ def validate_PPD42X_sensors(value):
PLATFORM_SCHEMA = cv.nameable(sensor.PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = cv.nameable(sensor.PLATFORM_SCHEMA.extend({
cv.GenerateID(): cv.declare_variable_id(PPD42XComponent), cv.GenerateID(): cv.declare_variable_id(PPD42XComponent),
vol.Required(CONF_TYPE): cv.one_of(*PPD42X_TYPES, upper=True), vol.Required(CONF_TYPE): cv.one_of(*PPD42X_TYPES, upper=True),
vol.Optional(CONF_PM_2_5): pins.gpio_input_pin_schema, vol.Optional(CONF_PIN_02_5): pins.gpio_input_pin_schema,
vol.Optional(CONF_PM_10_0): pins.gpio_input_pin_schema, vol.Optional(CONF_PIN_10_0): pins.gpio_input_pin_schema,
vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval, vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
vol.Optional(CONF_TIMEOUT): cv.positive_time_period_microseconds, vol.Optional(CONF_TIMEOUT): cv.positive_time_period_microseconds,
}).extend(cv.COMPONENT_SCHEMA.schema), cv.has_at_least_one_key(*SENSORS_TO_TYPE)) }).extend(cv.COMPONENT_SCHEMA.schema))
def to_code(config): def to_code(config):
rhs = App.make_ppd42x(PPD42X_TYPES[config[CONF_TYPE]]) rhs = App.make_ppd42x(PPD42X_TYPES[config[CONF_TYPE]])
ppd = Pvariable(config[CONF_ID], rhs) ppd = Pvariable(config[CONF_ID], rhs)
if CONF_PM_2_5 in config: if CONF_PM_2_5 in config:
for pm_02_5 in get_variable(config.get(CONF_PM_2_5)): for pm_02_5 in get_variable(config.get(CONF_PIN_02_5)):
yield yield
sensor.register_sensor(ppd.make_pm_02_5_sensor(conf_02_5[CONF_NAME]), pm_02_5) sensor.register_sensor(ppd.make_pm_02_5_sensor(config[CONF_NAME]), pm_02_5)
if CONF_PM_10_0 in config: if CONF_PM_10_0 in config:
for pm_10_0 in get_variable(config.get(CONF_PM_10_0): for pm_10_0 in get_variable(config.get(CONF_PM_10_0)):
yield yield
sensor.register_sensor(ppd.make_pm_10_0_sensor(conf_10_0[CONF_NAME]), pm_10_0) sensor.register_sensor(ppd.make_pm_10_0_sensor(config[CONF_NAME]), pm_10_0)
setup_component(ppd, config) setup_component(ppd, config)

8
tests/test1.yaml
View File

@ -505,12 +505,8 @@ sensor:
- platform: ppd42x - platform: ppd42x
id: my_office_ppd42 id: my_office_ppd42
type: PPD42 type: PPD42
pm_2_5: pin_2_5: GPIO32
pin: GPIO32 pin_10_0: GPIO35
name: "ppd42 PM2.5"
pm_10_0:
pin: GPIO35
name: "ppd42 PM10.0"
update_interval: 5min update_interval: 5min
timeout: 30000us # default value timeout: 30000us # default value