Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-22 06:58:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Move remaining SENSOR_SCHEMA to use sensor_schema() (#4471)

Browse source
This commit is contained in:
Jesse Hills 2023-02-20 16:22:37 +13:00 committed by GitHub
parent 247916fe89
commit 50fbbf2d3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 79 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
esphome/components/adc128s102/sensor/__init__.py
View file

@ -16,13 +16,16 @@ ADC128S102Sensor = adc128s102_ns.class_(
) )
CONF_ADC128S102_ID = "adc128s102_id" CONF_ADC128S102_ID = "adc128s102_id"
CONFIG_SCHEMA = sensor.SENSOR_SCHEMA.extend( CONFIG_SCHEMA = (
{ sensor.sensor_schema(ADC128S102Sensor)
cv.GenerateID(): cv.declare_id(ADC128S102Sensor), .extend(
cv.GenerateID(CONF_ADC128S102_ID): cv.use_id(ADC128S102), {
cv.Required(CONF_CHANNEL): cv.int_range(min=0, max=7), cv.GenerateID(CONF_ADC128S102_ID): cv.use_id(ADC128S102),
} cv.Required(CONF_CHANNEL): cv.int_range(min=0, max=7),
).extend(cv.polling_component_schema("60s")) }
)
.extend(cv.polling_component_schema("60s"))
)
async def to_code(config): async def to_code(config):

2
esphome/components/custom/sensor/__init__.py
View file

@ -10,7 +10,7 @@ CONFIG_SCHEMA = cv.Schema(
{ {
cv.GenerateID(): cv.declare_id(CustomSensorConstructor), cv.GenerateID(): cv.declare_id(CustomSensorConstructor),
cv.Required(CONF_LAMBDA): cv.returning_lambda, cv.Required(CONF_LAMBDA): cv.returning_lambda,
cv.Required(CONF_SENSORS): cv.ensure_list(sensor.SENSOR_SCHEMA), cv.Required(CONF_SENSORS): cv.ensure_list(sensor.sensor_schema()),
} }
) )

4
esphome/components/ezo/sensor.py
View file

@ -41,9 +41,9 @@ DeviceInformationTrigger = ezo_ns.class_(
LedTrigger = ezo_ns.class_("LedTrigger", automation.Trigger.template(cg.bool_)) LedTrigger = ezo_ns.class_("LedTrigger", automation.Trigger.template(cg.bool_))
CONFIG_SCHEMA = ( CONFIG_SCHEMA = (
sensor.SENSOR_SCHEMA.extend( sensor.sensor_schema(EZOSensor)
.extend(
{ {
cv.GenerateID(): cv.declare_id(EZOSensor),
cv.Optional(CONF_ON_CUSTOM): automation.validate_automation( cv.Optional(CONF_ON_CUSTOM): automation.validate_automation(
{ {
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(CustomTrigger), cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(CustomTrigger),

31
esphome/components/integration/sensor.py
View file

@ -48,20 +48,23 @@ def inherit_accuracy_decimals(decimals, config):
return decimals + 2 return decimals + 2
CONFIG_SCHEMA = sensor.SENSOR_SCHEMA.extend( CONFIG_SCHEMA = (
{ sensor.sensor_schema(IntegrationSensor)
cv.GenerateID(): cv.declare_id(IntegrationSensor), .extend(
cv.Required(CONF_SENSOR): cv.use_id(sensor.Sensor), {
cv.Required(CONF_TIME_UNIT): cv.enum(INTEGRATION_TIMES, lower=True), cv.Required(CONF_SENSOR): cv.use_id(sensor.Sensor),
cv.Optional(CONF_INTEGRATION_METHOD, default="trapezoid"): cv.enum( cv.Required(CONF_TIME_UNIT): cv.enum(INTEGRATION_TIMES, lower=True),
INTEGRATION_METHODS, lower=True cv.Optional(CONF_INTEGRATION_METHOD, default="trapezoid"): cv.enum(
), INTEGRATION_METHODS, lower=True
cv.Optional(CONF_RESTORE, default=False): cv.boolean, ),
cv.Optional("min_save_interval"): cv.invalid( cv.Optional(CONF_RESTORE, default=False): cv.boolean,
"min_save_interval was removed in 2022.8.0. Please use the `preferences` -> `flash_write_interval` to adjust." cv.Optional("min_save_interval"): cv.invalid(
), "min_save_interval was removed in 2022.8.0. Please use the `preferences` -> `flash_write_interval` to adjust."
} ),
).extend(cv.COMPONENT_SCHEMA) }
)
.extend(cv.COMPONENT_SCHEMA)
)
FINAL_VALIDATE_SCHEMA = cv.All( FINAL_VALIDATE_SCHEMA = cv.All(

29
esphome/components/kalman_combinator/sensor.py
View file

@ -23,20 +23,23 @@ CONF_PROCESS_STD_DEV = "process_std_dev"
CONF_STD_DEV = "std_dev" CONF_STD_DEV = "std_dev"
CONFIG_SCHEMA = sensor.SENSOR_SCHEMA.extend(cv.COMPONENT_SCHEMA).extend( CONFIG_SCHEMA = (
{ sensor.sensor_schema(KalmanCombinatorComponent)
cv.GenerateID(): cv.declare_id(KalmanCombinatorComponent), .extend(cv.COMPONENT_SCHEMA)
cv.Required(CONF_PROCESS_STD_DEV): cv.positive_float, .extend(
cv.Required(CONF_SOURCES): cv.ensure_list( {
cv.Schema( cv.Required(CONF_PROCESS_STD_DEV): cv.positive_float,
{ cv.Required(CONF_SOURCES): cv.ensure_list(
cv.Required(CONF_SOURCE): cv.use_id(sensor.Sensor), cv.Schema(
cv.Required(CONF_ERROR): cv.templatable(cv.positive_float), {
} cv.Required(CONF_SOURCE): cv.use_id(sensor.Sensor),
cv.Required(CONF_ERROR): cv.templatable(cv.positive_float),
}
),
), ),
), cv.Optional(CONF_STD_DEV): sensor.sensor_schema(),
cv.Optional(CONF_STD_DEV): sensor.SENSOR_SCHEMA, }
} )
) )
# Inherit some sensor values from the first source, for both the state and the error value # Inherit some sensor values from the first source, for both the state and the error value

19
esphome/components/mcp3008/sensor.py
View file

@ -14,14 +14,17 @@ MCP3008Sensor = mcp3008_ns.class_(
CONF_REFERENCE_VOLTAGE = "reference_voltage" CONF_REFERENCE_VOLTAGE = "reference_voltage"
CONF_MCP3008_ID = "mcp3008_id" CONF_MCP3008_ID = "mcp3008_id"
CONFIG_SCHEMA = sensor.SENSOR_SCHEMA.extend( CONFIG_SCHEMA = (
{ sensor.sensor_schema(MCP3008Sensor)
cv.GenerateID(): cv.declare_id(MCP3008Sensor), .extend(
cv.GenerateID(CONF_MCP3008_ID): cv.use_id(MCP3008), {
cv.Required(CONF_NUMBER): cv.int_, cv.GenerateID(CONF_MCP3008_ID): cv.use_id(MCP3008),
cv.Optional(CONF_REFERENCE_VOLTAGE, default="3.3V"): cv.voltage, cv.Required(CONF_NUMBER): cv.int_,
} cv.Optional(CONF_REFERENCE_VOLTAGE, default="3.3V"): cv.voltage,
).extend(cv.polling_component_schema("1s")) }
)
.extend(cv.polling_component_schema("1s"))
)
async def to_code(config): async def to_code(config):

17
esphome/components/mcp3204/sensor/__init__.py
View file

@ -13,13 +13,16 @@ MCP3204Sensor = mcp3204_ns.class_(
) )
CONF_MCP3204_ID = "mcp3204_id" CONF_MCP3204_ID = "mcp3204_id"
CONFIG_SCHEMA = sensor.SENSOR_SCHEMA.extend( CONFIG_SCHEMA = (
{ sensor.sensor_schema(MCP3204Sensor)
cv.GenerateID(): cv.declare_id(MCP3204Sensor), .extend(
cv.GenerateID(CONF_MCP3204_ID): cv.use_id(MCP3204), {
cv.Required(CONF_NUMBER): cv.int_range(min=0, max=7), cv.GenerateID(CONF_MCP3204_ID): cv.use_id(MCP3204),
} cv.Required(CONF_NUMBER): cv.int_range(min=0, max=7),
).extend(cv.polling_component_schema("60s")) }
)
.extend(cv.polling_component_schema("60s"))
)
async def to_code(config): async def to_code(config):

4
esphome/components/modbus_controller/sensor/__init__.py
View file

@ -32,11 +32,11 @@ ModbusSensor = modbus_controller_ns.class_(
) )
CONFIG_SCHEMA = cv.All( CONFIG_SCHEMA = cv.All(
sensor.SENSOR_SCHEMA.extend(cv.COMPONENT_SCHEMA) sensor.sensor_schema(ModbusSensor)
.extend(cv.COMPONENT_SCHEMA)
.extend(ModbusItemBaseSchema) .extend(ModbusItemBaseSchema)
.extend( .extend(
{ {
cv.GenerateID(): cv.declare_id(ModbusSensor),
cv.Optional(CONF_REGISTER_TYPE): cv.enum(MODBUS_REGISTER_TYPE), cv.Optional(CONF_REGISTER_TYPE): cv.enum(MODBUS_REGISTER_TYPE),
cv.Optional(CONF_VALUE_TYPE, default="U_WORD"): cv.enum(SENSOR_VALUE_TYPE), cv.Optional(CONF_VALUE_TYPE, default="U_WORD"): cv.enum(SENSOR_VALUE_TYPE),
cv.Optional(CONF_REGISTER_COUNT, default=0): cv.positive_int, cv.Optional(CONF_REGISTER_COUNT, default=0): cv.positive_int,

17
esphome/components/tuya/sensor/__init__.py
View file

@ -9,13 +9,16 @@ CODEOWNERS = ["@jesserockz"]
TuyaSensor = tuya_ns.class_("TuyaSensor", sensor.Sensor, cg.Component) TuyaSensor = tuya_ns.class_("TuyaSensor", sensor.Sensor, cg.Component)
CONFIG_SCHEMA = sensor.SENSOR_SCHEMA.extend( CONFIG_SCHEMA = (
{ sensor.sensor_schema(TuyaSensor)
cv.GenerateID(): cv.declare_id(TuyaSensor), .extend(
cv.GenerateID(CONF_TUYA_ID): cv.use_id(Tuya), {
cv.Required(CONF_SENSOR_DATAPOINT): cv.uint8_t, cv.GenerateID(CONF_TUYA_ID): cv.use_id(Tuya),
} cv.Required(CONF_SENSOR_DATAPOINT): cv.uint8_t,
).extend(cv.COMPONENT_SCHEMA) }
)
.extend(cv.COMPONENT_SCHEMA)
)
async def to_code(config): async def to_code(config):