mirror of
https://github.com/esphome/esphome.git
synced 2025-10-27 21:23:48 +00:00
add-black (#1593)
* Add black Update pre commit Update pre commit add empty line * Format with black
This commit is contained in:
Guillermo Ruffino
committed by
GitHub
GitHub
parent
2b60b0f1fa
commit
69879920eb
@@ -1,15 +1,23 @@
|
||||
import esphome.codegen as cg
|
||||
import esphome.config_validation as cv
|
||||
from esphome.const import CONF_HIGH_VOLTAGE_REFERENCE, CONF_ID, CONF_IIR_FILTER, \
|
||||
CONF_LOW_VOLTAGE_REFERENCE, CONF_MEASUREMENT_DURATION, CONF_SETUP_MODE, CONF_SLEEP_DURATION, \
|
||||
CONF_VOLTAGE_ATTENUATION, ESP_PLATFORM_ESP32
|
||||
from esphome.const import (
|
||||
CONF_HIGH_VOLTAGE_REFERENCE,
|
||||
CONF_ID,
|
||||
CONF_IIR_FILTER,
|
||||
CONF_LOW_VOLTAGE_REFERENCE,
|
||||
CONF_MEASUREMENT_DURATION,
|
||||
CONF_SETUP_MODE,
|
||||
CONF_SLEEP_DURATION,
|
||||
CONF_VOLTAGE_ATTENUATION,
|
||||
ESP_PLATFORM_ESP32,
|
||||
)
|
||||
from esphome.core import TimePeriod
|
||||
|
||||
AUTO_LOAD = ['binary_sensor']
|
||||
AUTO_LOAD = ["binary_sensor"]
|
||||
ESP_PLATFORMS = [ESP_PLATFORM_ESP32]
|
||||
|
||||
esp32_touch_ns = cg.esphome_ns.namespace('esp32_touch')
|
||||
ESP32TouchComponent = esp32_touch_ns.class_('ESP32TouchComponent', cg.Component)
|
||||
esp32_touch_ns = cg.esphome_ns.namespace("esp32_touch")
|
||||
ESP32TouchComponent = esp32_touch_ns.class_("ESP32TouchComponent", cg.Component)
|
||||
|
||||
|
||||
def validate_voltage(values):
|
||||
@@ -17,46 +25,56 @@ def validate_voltage(values):
|
||||
if isinstance(value, float) and value.is_integer():
|
||||
value = int(value)
|
||||
value = cv.string(value)
|
||||
if not value.endswith('V'):
|
||||
value += 'V'
|
||||
if not value.endswith("V"):
|
||||
value += "V"
|
||||
return cv.one_of(*values)(value)
|
||||
|
||||
return validator
|
||||
|
||||
|
||||
LOW_VOLTAGE_REFERENCE = {
|
||||
'0.5V': cg.global_ns.TOUCH_LVOLT_0V5,
|
||||
'0.6V': cg.global_ns.TOUCH_LVOLT_0V6,
|
||||
'0.7V': cg.global_ns.TOUCH_LVOLT_0V7,
|
||||
'0.8V': cg.global_ns.TOUCH_LVOLT_0V8,
|
||||
"0.5V": cg.global_ns.TOUCH_LVOLT_0V5,
|
||||
"0.6V": cg.global_ns.TOUCH_LVOLT_0V6,
|
||||
"0.7V": cg.global_ns.TOUCH_LVOLT_0V7,
|
||||
"0.8V": cg.global_ns.TOUCH_LVOLT_0V8,
|
||||
}
|
||||
HIGH_VOLTAGE_REFERENCE = {
|
||||
'2.4V': cg.global_ns.TOUCH_HVOLT_2V4,
|
||||
'2.5V': cg.global_ns.TOUCH_HVOLT_2V5,
|
||||
'2.6V': cg.global_ns.TOUCH_HVOLT_2V6,
|
||||
'2.7V': cg.global_ns.TOUCH_HVOLT_2V7,
|
||||
"2.4V": cg.global_ns.TOUCH_HVOLT_2V4,
|
||||
"2.5V": cg.global_ns.TOUCH_HVOLT_2V5,
|
||||
"2.6V": cg.global_ns.TOUCH_HVOLT_2V6,
|
||||
"2.7V": cg.global_ns.TOUCH_HVOLT_2V7,
|
||||
}
|
||||
VOLTAGE_ATTENUATION = {
|
||||
'1.5V': cg.global_ns.TOUCH_HVOLT_ATTEN_1V5,
|
||||
'1V': cg.global_ns.TOUCH_HVOLT_ATTEN_1V,
|
||||
'0.5V': cg.global_ns.TOUCH_HVOLT_ATTEN_0V5,
|
||||
'0V': cg.global_ns.TOUCH_HVOLT_ATTEN_0V,
|
||||
"1.5V": cg.global_ns.TOUCH_HVOLT_ATTEN_1V5,
|
||||
"1V": cg.global_ns.TOUCH_HVOLT_ATTEN_1V,
|
||||
"0.5V": cg.global_ns.TOUCH_HVOLT_ATTEN_0V5,
|
||||
"0V": cg.global_ns.TOUCH_HVOLT_ATTEN_0V,
|
||||
}
|
||||
|
||||
CONFIG_SCHEMA = cv.Schema({
|
||||
cv.GenerateID(): cv.declare_id(ESP32TouchComponent),
|
||||
cv.Optional(CONF_SETUP_MODE, default=False): cv.boolean,
|
||||
cv.Optional(CONF_IIR_FILTER, default='0ms'): cv.positive_time_period_milliseconds,
|
||||
cv.Optional(CONF_SLEEP_DURATION, default='27306us'):
|
||||
cv.All(cv.positive_time_period, cv.Range(max=TimePeriod(microseconds=436906))),
|
||||
cv.Optional(CONF_MEASUREMENT_DURATION, default='8192us'):
|
||||
cv.All(cv.positive_time_period, cv.Range(max=TimePeriod(microseconds=8192))),
|
||||
cv.Optional(CONF_LOW_VOLTAGE_REFERENCE, default='0.5V'):
|
||||
validate_voltage(LOW_VOLTAGE_REFERENCE),
|
||||
cv.Optional(CONF_HIGH_VOLTAGE_REFERENCE, default='2.7V'):
|
||||
validate_voltage(HIGH_VOLTAGE_REFERENCE),
|
||||
cv.Optional(CONF_VOLTAGE_ATTENUATION, default='0V'): validate_voltage(VOLTAGE_ATTENUATION),
|
||||
}).extend(cv.COMPONENT_SCHEMA)
|
||||
CONFIG_SCHEMA = cv.Schema(
|
||||
{
|
||||
cv.GenerateID(): cv.declare_id(ESP32TouchComponent),
|
||||
cv.Optional(CONF_SETUP_MODE, default=False): cv.boolean,
|
||||
cv.Optional(
|
||||
CONF_IIR_FILTER, default="0ms"
|
||||
): cv.positive_time_period_milliseconds,
|
||||
cv.Optional(CONF_SLEEP_DURATION, default="27306us"): cv.All(
|
||||
cv.positive_time_period, cv.Range(max=TimePeriod(microseconds=436906))
|
||||
),
|
||||
cv.Optional(CONF_MEASUREMENT_DURATION, default="8192us"): cv.All(
|
||||
cv.positive_time_period, cv.Range(max=TimePeriod(microseconds=8192))
|
||||
),
|
||||
cv.Optional(CONF_LOW_VOLTAGE_REFERENCE, default="0.5V"): validate_voltage(
|
||||
LOW_VOLTAGE_REFERENCE
|
||||
),
|
||||
cv.Optional(CONF_HIGH_VOLTAGE_REFERENCE, default="2.7V"): validate_voltage(
|
||||
HIGH_VOLTAGE_REFERENCE
|
||||
),
|
||||
cv.Optional(CONF_VOLTAGE_ATTENUATION, default="0V"): validate_voltage(
|
||||
VOLTAGE_ATTENUATION
|
||||
),
|
||||
}
|
||||
).extend(cv.COMPONENT_SCHEMA)
|
||||
|
||||
|
||||
def to_code(config):
|
||||
@@ -69,12 +87,23 @@ def to_code(config):
|
||||
sleep_duration = int(round(config[CONF_SLEEP_DURATION].total_microseconds * 0.15))
|
||||
cg.add(touch.set_sleep_duration(sleep_duration))
|
||||
|
||||
measurement_duration = int(round(config[CONF_MEASUREMENT_DURATION].total_microseconds *
|
||||
7.99987793))
|
||||
measurement_duration = int(
|
||||
round(config[CONF_MEASUREMENT_DURATION].total_microseconds * 7.99987793)
|
||||
)
|
||||
cg.add(touch.set_measurement_duration(measurement_duration))
|
||||
|
||||
cg.add(touch.set_low_voltage_reference(
|
||||
LOW_VOLTAGE_REFERENCE[config[CONF_LOW_VOLTAGE_REFERENCE]]))
|
||||
cg.add(touch.set_high_voltage_reference(
|
||||
HIGH_VOLTAGE_REFERENCE[config[CONF_HIGH_VOLTAGE_REFERENCE]]))
|
||||
cg.add(touch.set_voltage_attenuation(VOLTAGE_ATTENUATION[config[CONF_VOLTAGE_ATTENUATION]]))
|
||||
cg.add(
|
||||
touch.set_low_voltage_reference(
|
||||
LOW_VOLTAGE_REFERENCE[config[CONF_LOW_VOLTAGE_REFERENCE]]
|
||||
)
|
||||
)
|
||||
cg.add(
|
||||
touch.set_high_voltage_reference(
|
||||
HIGH_VOLTAGE_REFERENCE[config[CONF_HIGH_VOLTAGE_REFERENCE]]
|
||||
)
|
||||
)
|
||||
cg.add(
|
||||
touch.set_voltage_attenuation(
|
||||
VOLTAGE_ATTENUATION[config[CONF_VOLTAGE_ATTENUATION]]
|
||||
)
|
||||
)
|
||||
|
||||
@@ -1,14 +1,20 @@
|
||||
import esphome.codegen as cg
|
||||
import esphome.config_validation as cv
|
||||
from esphome.components import binary_sensor
|
||||
from esphome.const import CONF_NAME, CONF_PIN, CONF_THRESHOLD, ESP_PLATFORM_ESP32, CONF_ID
|
||||
from esphome.const import (
|
||||
CONF_NAME,
|
||||
CONF_PIN,
|
||||
CONF_THRESHOLD,
|
||||
ESP_PLATFORM_ESP32,
|
||||
CONF_ID,
|
||||
)
|
||||
from esphome.pins import validate_gpio_pin
|
||||
from . import esp32_touch_ns, ESP32TouchComponent
|
||||
|
||||
ESP_PLATFORMS = [ESP_PLATFORM_ESP32]
|
||||
DEPENDENCIES = ['esp32_touch']
|
||||
DEPENDENCIES = ["esp32_touch"]
|
||||
|
||||
CONF_ESP32_TOUCH_ID = 'esp32_touch_id'
|
||||
CONF_ESP32_TOUCH_ID = "esp32_touch_id"
|
||||
|
||||
TOUCH_PADS = {
|
||||
4: cg.global_ns.TOUCH_PAD_NUM0,
|
||||
@@ -31,19 +37,27 @@ def validate_touch_pad(value):
|
||||
return value
|
||||
|
||||
|
||||
ESP32TouchBinarySensor = esp32_touch_ns.class_('ESP32TouchBinarySensor', binary_sensor.BinarySensor)
|
||||
ESP32TouchBinarySensor = esp32_touch_ns.class_(
|
||||
"ESP32TouchBinarySensor", binary_sensor.BinarySensor
|
||||
)
|
||||
|
||||
CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend({
|
||||
cv.GenerateID(): cv.declare_id(ESP32TouchBinarySensor),
|
||||
cv.GenerateID(CONF_ESP32_TOUCH_ID): cv.use_id(ESP32TouchComponent),
|
||||
cv.Required(CONF_PIN): validate_touch_pad,
|
||||
cv.Required(CONF_THRESHOLD): cv.uint16_t,
|
||||
})
|
||||
CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
|
||||
{
|
||||
cv.GenerateID(): cv.declare_id(ESP32TouchBinarySensor),
|
||||
cv.GenerateID(CONF_ESP32_TOUCH_ID): cv.use_id(ESP32TouchComponent),
|
||||
cv.Required(CONF_PIN): validate_touch_pad,
|
||||
cv.Required(CONF_THRESHOLD): cv.uint16_t,
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
def to_code(config):
|
||||
hub = yield cg.get_variable(config[CONF_ESP32_TOUCH_ID])
|
||||
var = cg.new_Pvariable(config[CONF_ID], config[CONF_NAME], TOUCH_PADS[config[CONF_PIN]],
|
||||
config[CONF_THRESHOLD])
|
||||
var = cg.new_Pvariable(
|
||||
config[CONF_ID],
|
||||
config[CONF_NAME],
|
||||
TOUCH_PADS[config[CONF_PIN]],
|
||||
config[CONF_THRESHOLD],
|
||||
)
|
||||
yield binary_sensor.register_binary_sensor(var, config)
|
||||
cg.add(hub.register_touch_pad(var))
|
||||
|
||||
Reference in New Issue
Block a user