mirror of
https://github.com/Threnklyn/esphome-dev.git
synced 2026-05-22 13:48:29 +02:00
NP v/d Spek
5393a09872
* Introduce calibration settings for all touchscreen drivers. this will override the common values. The x,y coordinates only calculated when the right calibrations are set. * resolve issues reported by CI * remove unneeded spaces and newlines * Forgot to remove some obsolete code * remove get_setup_priority from xpt2046 * remove media_player changes. * media_player: removed to much, * Update suggestions * referd back the `get_setup_priority` removal so it can be moved into a othe PR. * tt21100: restore init read * fix spacing * load native display dimensions instead of using internal dimensons. and load it only onse on setup * moved `update_touches()` to protexted section * adding Clydes PR#6049 * add multitouch test script * Update all Touchscreen replacing `get_*_internal` to `get_native_*` * fixed some CI recomendations * couple of fixes * make sure the display is running before touchscreen is setup * fix clang * revert back last changes * xpt2046: change log level for testing * logging information * add test file * fix polling issue with the for example the xpt2046 * fixed some CI issues * fixed some CI issues * restore mirror parameter discriptions * same for the swap_xy * same for the transform * remove the above const from const.py * and put the above const bacl const.py * Merge branch 'nvds-touchscreen-fix1' of https://github.com/nielsnl68/esphome into nvds-touchscreen-fix1 * and put the above const bacl const.py * [tt21100] making interupt pin optional * [tt21100] making interupt pin optional (now complete) * update the display part based on @clyde' s changes. * fix issue with ft6x36 touvhscreen * reverd back touch check. add comment * add some extra checks to the ft6x36 * add an other log and a typo fixed * okay an other fix. * add an extra check like others do and fix data type * [ft6336] fix update race when ts is touched. * [touchscreen] update some log's with a verbose level. * fix clang issues * fix the clang issues * fix the clang issues * fix virtual issue. * fix the clang issues * an other clang issues * remove anti-aliased fonts support. It does not belong here. * remove anti-aliased fonts support. It does not belong here. * rename test script * Moving the test files to there right location. * rename the test files * clean up the code * add a new line * clang fixings * clang fixings * remove comment * remove comment * Update esphome/components/touchscreen/__init__.py Co-authored-by: guillempages <guillempages@users.noreply.github.com> * Update esphome/components/touchscreen/__init__.py Co-authored-by: guillempages <guillempages@users.noreply.github.com> * Update esphome/components/touchscreen/__init__.py Co-authored-by: guillempages <guillempages@users.noreply.github.com> * Update esphome/components/touchscreen/touchscreen.cpp * Update esphome/components/touchscreen/touchscreen.cpp * [ft63x6] add threshold --------- Co-authored-by: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com> Co-authored-by: guillempages <guillempages@users.noreply.github.com>
69 lines
2.5 KiB
Python
69 lines
2.5 KiB
Python
import esphome.codegen as cg
|
|
import esphome.config_validation as cv
|
|
|
|
from esphome import pins
|
|
from esphome.components import spi, touchscreen
|
|
from esphome.const import CONF_ID, CONF_THRESHOLD, CONF_INTERRUPT_PIN
|
|
|
|
CODEOWNERS = ["@numo68", "@nielsnl68"]
|
|
DEPENDENCIES = ["spi"]
|
|
|
|
XPT2046_ns = cg.esphome_ns.namespace("xpt2046")
|
|
XPT2046Component = XPT2046_ns.class_(
|
|
"XPT2046Component",
|
|
touchscreen.Touchscreen,
|
|
spi.SPIDevice,
|
|
)
|
|
|
|
CONF_CALIBRATION_X_MIN = "calibration_x_min"
|
|
CONF_CALIBRATION_X_MAX = "calibration_x_max"
|
|
CONF_CALIBRATION_Y_MIN = "calibration_y_min"
|
|
CONF_CALIBRATION_Y_MAX = "calibration_y_max"
|
|
|
|
CONFIG_SCHEMA = cv.All(
|
|
touchscreen.TOUCHSCREEN_SCHEMA.extend(
|
|
cv.Schema(
|
|
{
|
|
cv.GenerateID(): cv.declare_id(XPT2046Component),
|
|
cv.Optional(CONF_INTERRUPT_PIN): cv.All(
|
|
pins.internal_gpio_input_pin_schema
|
|
),
|
|
cv.Optional(CONF_THRESHOLD, default=400): cv.int_range(min=0, max=4095),
|
|
cv.Optional(
|
|
touchscreen.CONF_CALIBRATION
|
|
): touchscreen.calibration_schema(4095),
|
|
cv.Optional(CONF_CALIBRATION_X_MIN): cv.invalid(
|
|
"Deprecated: use the new 'calibration' configuration variable"
|
|
),
|
|
cv.Optional(CONF_CALIBRATION_X_MAX): cv.invalid(
|
|
"Deprecated: use the new 'calibration' configuration variable"
|
|
),
|
|
cv.Optional(CONF_CALIBRATION_Y_MIN): cv.invalid(
|
|
"Deprecated: use the new 'calibration' configuration variable"
|
|
),
|
|
cv.Optional(CONF_CALIBRATION_Y_MAX): cv.invalid(
|
|
"Deprecated: use the new 'calibration' configuration variable"
|
|
),
|
|
cv.Optional(CONF_CALIBRATION_Y_MAX): cv.invalid(
|
|
"Deprecated: use the new 'calibration' configuration variable"
|
|
),
|
|
cv.Optional("report_interval"): cv.invalid(
|
|
"Deprecated: use the 'update_interval' configuration variable"
|
|
),
|
|
},
|
|
)
|
|
).extend(spi.spi_device_schema()),
|
|
)
|
|
|
|
|
|
async def to_code(config):
|
|
var = cg.new_Pvariable(config[CONF_ID])
|
|
await spi.register_spi_device(var, config)
|
|
await touchscreen.register_touchscreen(var, config)
|
|
|
|
cg.add(var.set_threshold(config[CONF_THRESHOLD]))
|
|
|
|
if CONF_INTERRUPT_PIN in config:
|
|
pin = await cg.gpio_pin_expression(config[CONF_INTERRUPT_PIN])
|
|
cg.add(var.set_irq_pin(pin))
|