Skip to content

Commit

Permalink
Merge remote-tracking branch 'landonr/main' into DISABLE_ALL_LIBRARY_…
Browse files Browse the repository at this point in the history
…WARNINGS
  • Loading branch information
Your Name committed Jul 3, 2023
2 parents ea5bcc5 + 25466e5 commit d177262
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 11 deletions.
2 changes: 1 addition & 1 deletion components/tdisplays3/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import esphome.codegen as cg

dependencies = ["display"]
DEPENDENCIES = ["display"]

tdisplays3_ns = cg.esphome_ns.namespace("tdisplays3")
29 changes: 19 additions & 10 deletions components/tdisplays3/display.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
import esphome.codegen as cg
import esphome.config_validation as cv

from esphome import pins
from esphome.components import display
from esphome.const import (
CONF_HEIGHT,
CONF_ID,
CONF_LAMBDA,
CONF_WIDTH,
CONF_HEIGHT,
CONF_ID,
CONF_LAMBDA,
CONF_WIDTH,
CONF_CS_PIN,
CONF_DC_PIN,
CONF_RESET_PIN,
CONF_NUMBER,
)
from . import tdisplays3_ns

DEPENDENCIES = ["esp32"]

AUTO_LOAD = ["psram"]
DEPENDENCIES = ["esp32"]

CONF_BACKLIGHT = "backlight"
CONF_LOAD_FONTS = "load_fonts"
Expand All @@ -32,10 +37,14 @@
cv.Optional(CONF_LOAD_FONTS, default=False): cv.boolean,
cv.Optional(CONF_LOAD_SMOOTH_FONTS, default=False): cv.boolean,
cv.Optional(CONF_DISABLE_ALL_LIBRARY_WARNINGS, default=False): cv.boolean,
cv.Optional(CONF_RESET_PIN, default=5): pins.gpio_output_pin_schema,
cv.Optional(CONF_CS_PIN, default=6): pins.gpio_output_pin_schema,
cv.Optional(CONF_DC_PIN, default=7): pins.gpio_output_pin_schema,
}
).extend(cv.polling_component_schema("5s")),
)


async def to_code(config):
# Add platformio build_flags for the correct TFT_eSPI settings for the T-Display-S3
# This allows using current, unpatched versions of TFT_eSPI
Expand All @@ -48,9 +57,9 @@ async def to_code(config):
cg.add_build_flag("-DTFT_PARALLEL_8_BIT")
cg.add_build_flag(f"-DTFT_WIDTH={config[CONF_WIDTH]}")
cg.add_build_flag(f"-DTFT_HEIGHT={config[CONF_HEIGHT]}")
cg.add_build_flag("-DTFT_RST=5")
cg.add_build_flag("-DTFT_CS=6")
cg.add_build_flag("-DTFT_DC=7")
cg.add_build_flag(f"-DTFT_RST={config[CONF_RESET_PIN][CONF_NUMBER]}")
cg.add_build_flag(f"-DTFT_CS={config[CONF_CS_PIN][CONF_NUMBER]}")
cg.add_build_flag(f"-DTFT_DC={config[CONF_DC_PIN][CONF_NUMBER]}")
cg.add_build_flag("-DTFT_WR=8")
cg.add_build_flag("-DTFT_RD=9")
cg.add_build_flag("-DTFT_D0=39")
Expand All @@ -70,7 +79,7 @@ async def to_code(config):
cg.add_build_flag("-DLOAD_FONT7")
cg.add_build_flag("-DLOAD_FONT8")
cg.add_build_flag("-DLOAD_GFXFF")

if config[CONF_LOAD_SMOOTH_FONTS]:
cg.add_build_flag("-DSMOOTH_FONT")
cg.add_library("FS", None)
Expand Down

0 comments on commit d177262

Please sign in to comment.