From 428ca0972fc7a9377793f6836d45fc82809edaea Mon Sep 17 00:00:00 2001 From: Jason P Date: Mon, 30 Jun 2025 22:09:10 -0500 Subject: [PATCH] Continuing work on Color Picker --- src/graphics/TFTDisplay.cpp | 3 +-- src/graphics/TFTDisplay.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/graphics/TFTDisplay.cpp b/src/graphics/TFTDisplay.cpp index 16d04b3c0..a9cca7a67 100644 --- a/src/graphics/TFTDisplay.cpp +++ b/src/graphics/TFTDisplay.cpp @@ -1,5 +1,6 @@ #include "configuration.h" #include "main.h" + #if ARCH_PORTDUINO #include "platform/portduino/PortduinoGlue.h" #endif @@ -14,10 +15,8 @@ extern SX1509 gpioExtender; #endif -#ifndef TFT_MESH // Legacy Color: 0x67, 0xEA, 0x94 uint16_t TFT_MESH = COLOR565(255, 255, 128); -#endif #if defined(ST7735S) #include // Graphics and font library for ST7735 driver chip diff --git a/src/graphics/TFTDisplay.h b/src/graphics/TFTDisplay.h index 670f8c5af..389bc688a 100644 --- a/src/graphics/TFTDisplay.h +++ b/src/graphics/TFTDisplay.h @@ -19,10 +19,9 @@ class TFTDisplay : public OLEDDisplay FIXME - the parameters are not used, just a temporary hack to keep working like the old displays */ TFTDisplay(uint8_t, int, int, OLEDDISPLAY_GEOMETRY, HW_I2C); -#ifndef TFT_MESH + // Legacy Color: 0x67, 0xEA, 0x94 uint16_t TFT_MESH = COLOR565(255, 255, 128); -#endif // Write the buffer to the display memory virtual void display() override { display(false); };