From 033706adcfbb89e138d35e1fb9fbdb4011eecdcd Mon Sep 17 00:00:00 2001 From: Florent Date: Mon, 25 Aug 2025 16:21:23 +0200 Subject: [PATCH] lib_build: fix ST7789 so we don't have to add helpers/ui in INC_DIRS --- build_as_lib.py | 8 +------- src/helpers/ui/ST7789Display.h | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/build_as_lib.py b/build_as_lib.py index 43e06fdd..59091556 100644 --- a/build_as_lib.py +++ b/build_as_lib.py @@ -9,10 +9,9 @@ src_filter = [ '+', '+', '+', + '+', ] -use_display = False - # add build and include dirs according to CPPDEFINES for item in menv.get("CPPDEFINES", []): @@ -43,7 +42,6 @@ for item in menv.get("CPPDEFINES", []): # DISPLAY HANDLING elif isinstance(item, tuple) and item[0] == "DISPLAY_CLASS": display_class = item[1] - use_display = True src_filter.append(f"+") if (display_class == "ST7789Display") : src_filter.append(f"+") @@ -55,10 +53,6 @@ for item in menv.get("CPPDEFINES", []): menv.Append(BUILD_FLAGS=[f"-I variants/{variant_name}"]) src_filter.append(f"+<../variants/{variant_name}>") -if use_display : - menv.Append(CPPPATH=[realpath("src/helpers/ui")]) - menv.Append(BUILD_FLAGS=["-I src/helpers/ui"]) - menv.Replace(SRC_FILTER=src_filter) #print (menv.Dump()) diff --git a/src/helpers/ui/ST7789Display.h b/src/helpers/ui/ST7789Display.h index 8056de81..0f06da4c 100644 --- a/src/helpers/ui/ST7789Display.h +++ b/src/helpers/ui/ST7789Display.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include "ST7789Spi.h" class ST7789Display : public DisplayDriver { ST7789Spi display;