from scrach

esphome/components/sensor/ppd42x.py

@@ -4,7 +4,7 @@ from esphome.components import sensor, uart
 from esphome.components.uart import UARTComponent
 import esphome.config_validation as cv
 from esphome.const import CONF_FORMALDEHYDE, CONF_HUMIDITY, CONF_ID, CONF_NAME, CONF_PM_10_0, \
-    CONF_PM_1_0, CONF_PM_2_5, CONF_TEMPERATURE, CONF_TYPE, CONF_UART_ID
+    CONF_PM_2_5, CONF_TYPE, CONF_UART_ID
 from esphome.cpp_generator import Pvariable, get_variable
 from esphome.cpp_helpers import setup_component
 from esphome.cpp_types import App, Component
@@ -14,27 +14,22 @@ DEPENDENCIES = ['uart']
 PPD42XComponent = sensor.sensor_ns.class_('PPD42XComponent', uart.UARTDevice, Component)
 PPD42XSensor = sensor.sensor_ns.class_('PPD42XSensor', sensor.Sensor)
 
-CONF_PPD42X = 'PPD42X'
-CONF_PMS5003T = 'PMS5003T'
-CONF_PMS5003ST = 'PMS5003ST'
+CONF_PPD42 = 'PPD42'
+CONF_PPD42NJ = 'PPD42NJ'
+CONF_PPD42NS = 'PPD42NS'
 
 PPD42XType = sensor.sensor_ns.enum('PPD42XType')
 PPD42X_TYPES = {
-    CONF_PPD42X: PPD42XType.PPD42X_TYPE_X003,
-    CONF_PMS5003T: PPD42XType.PPD42X_TYPE_5003T,
-    CONF_PMS5003ST: PPD42XType.PPD42X_TYPE_5003ST,
+    CONF_PPD42: PPD42XType.PPD42X_TYPE,
+    CONF_PPD42NJ: PPD42XType.PPD42X_TYPE_NJ,
+    CONF_PPD42NS: PPD42XType.PPD42X_TYPE_NS,
 }
 
 SENSORS_TO_TYPE = {
-    CONF_PM_1_0: [CONF_PPD42X],
-    CONF_PM_2_5: [CONF_PPD42X, CONF_PMS5003T, CONF_PMS5003ST],
-    CONF_PM_10_0: [CONF_PPD42X],
-    CONF_TEMPERATURE: [CONF_PMS5003T, CONF_PMS5003ST],
-    CONF_HUMIDITY: [CONF_PMS5003T, CONF_PMS5003ST],
-    CONF_FORMALDEHYDE: [CONF_PMS5003ST],
+    CONF_PM_2_5: [CONF_PPD42, CONF_PPD42NJ, CONF_PPD42NS],
+    CONF_PM_10_0: [CONF_PPD42],
 }
 
-
 def validate_ppd42x_sensors(value):
     for key, types in SENSORS_TO_TYPE.items():
         if key in value and value[CONF_TYPE] not in types:
@@ -51,12 +46,8 @@ PLATFORM_SCHEMA = vol.All(sensor.PLATFORM_SCHEMA.extend({
     cv.GenerateID(CONF_UART_ID): cv.use_variable_id(UARTComponent),
     vol.Required(CONF_TYPE): cv.one_of(*PPD42X_TYPES, upper=True),
 
-    vol.Optional(CONF_PM_1_0): cv.nameable(PPD42X_SENSOR_SCHEMA),
     vol.Optional(CONF_PM_2_5): cv.nameable(PPD42X_SENSOR_SCHEMA),
     vol.Optional(CONF_PM_10_0): cv.nameable(PPD42X_SENSOR_SCHEMA),
-    vol.Optional(CONF_TEMPERATURE): cv.nameable(PPD42X_SENSOR_SCHEMA),
-    vol.Optional(CONF_HUMIDITY): cv.nameable(PPD42X_SENSOR_SCHEMA),
-    vol.Optional(CONF_FORMALDEHYDE): cv.nameable(PPD42X_SENSOR_SCHEMA),
 }).extend(cv.COMPONENT_SCHEMA.schema), cv.has_at_least_one_key(*SENSORS_TO_TYPE))
 
 
@@ -67,10 +58,6 @@ def to_code(config):
     rhs = App.make_ppd42x(uart_, PPD42X_TYPES[config[CONF_TYPE]])
     pms = Pvariable(config[CONF_ID], rhs)
 
-    if CONF_PM_1_0 in config:
-        conf = config[CONF_PM_1_0]
-        sensor.register_sensor(pms.make_pm_1_0_sensor(conf[CONF_NAME]), conf)
-
     if CONF_PM_2_5 in config:
         conf = config[CONF_PM_2_5]
         sensor.register_sensor(pms.make_pm_2_5_sensor(conf[CONF_NAME]), conf)
@@ -79,18 +66,6 @@ def to_code(config):
         conf = config[CONF_PM_10_0]
         sensor.register_sensor(pms.make_pm_10_0_sensor(conf[CONF_NAME]), conf)
 
-    if CONF_TEMPERATURE in config:
-        conf = config[CONF_TEMPERATURE]
-        sensor.register_sensor(pms.make_temperature_sensor(conf[CONF_NAME]), conf)
-
-    if CONF_HUMIDITY in config:
-        conf = config[CONF_HUMIDITY]
-        sensor.register_sensor(pms.make_humidity_sensor(conf[CONF_NAME]), conf)
-
-    if CONF_FORMALDEHYDE in config:
-        conf = config[CONF_FORMALDEHYDE]
-        sensor.register_sensor(pms.make_formaldehyde_sensor(conf[CONF_NAME]), conf)
-
     setup_component(pms, config)
 
 

tests/test2.yaml

@@ -79,20 +79,22 @@ sensor:
       name: "Xiaomi MiJia Humidity"
     battery_level:
       name: "Xiaomi MiJia Battery Level"
+
   - platform: ppd42x
-    type: PPD42X
+    type: PPD42
     pm_2_5:
       name: "PM 2.5 Concentration"
     pm_10_0:
       name: "PM 10.0 Concentration"
   - platform: ppd42x
-    type: PMS5003T
+    type: PPD42NJ
     pm_2_5:
       name: "PM 2.5 Concentration"
   - platform: ppd42x
-    type: PMS5003ST
+    type: PPD42NS
     pm_10_0:
       name: "PM 10.0 Concentration"
+      
   - platform: pmsx003
     type: PMSX003
     pm_2_5:

tests/test3.yaml

@@ -45,17 +45,17 @@ deep_sleep:
 
 sensor:
   - platform: ppd42x
-    type: PPD42X
+    type: PPD42
     pm_2_5:
       name: "PM 2.5 Concentration"
     pm_10_0:
       name: "PM 10.0 Concentration"
   - platform: ppd42x
-    type: PMS5003T
+    type: PPD42NJ
     pm_2_5:
       name: "PM 2.5 Concentration"
   - platform: ppd42x
-    type: PMS5003ST
+    type: PPD42NS
     pm_10_0:
       name: "PM 10.0 Concentration"