From 12fc96210777282741b5cd591234fe9b9a6a6cdc Mon Sep 17 00:00:00 2001 From: norbert-walter Date: Fri, 13 Mar 2026 15:44:08 +0100 Subject: [PATCH] Add color replacement for b/w --- lib/obp60task/OBP60Extensions.h | 14 +++++++++----- lib/obp60task/OBP60Hardware.h | 2 ++ lib/obp60task/obp60task.cpp | 1 - 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/obp60task/OBP60Extensions.h b/lib/obp60task/OBP60Extensions.h index 62c7c2a..c6db616 100644 --- a/lib/obp60task/OBP60Extensions.h +++ b/lib/obp60task/OBP60Extensions.h @@ -5,18 +5,22 @@ #include "OBP60Hardware.h" #include "LedSpiTask.h" #include "Graphics.h" -#include // E-paper lib V2 +#include // GxEPD2 lib for b/w E-Ink displays #include // I2C FRAM #include #ifdef DISPLAY_ST7796 -#include // TFT LCD lib for ST7796 + #include // TFT LCD lib for ST7796 color displays + #undef GxEPD_WHITE + #define GxEPD_WHITE TFT_WHITE // Replacement color for white on TFT (OBPHardware.h) + #undef GxEPD_BLACK + #define GxEPD_BLACK TFT_BLACK // Replacement color for black on TFT (OBPHardware.h) #endif #ifdef BOARD_OBP40S3 -#include "esp_vfs_fat.h" -#include "sdmmc_cmd.h" -#define MOUNT_POINT "/sdcard" + #include "esp_vfs_fat.h" + #include "sdmmc_cmd.h" + #define MOUNT_POINT "/sdcard" #endif // FRAM address reservations 32kB: 0x0000 - 0x7FFF diff --git a/lib/obp60task/OBP60Hardware.h b/lib/obp60task/OBP60Hardware.h index 416c81c..0884b70 100644 --- a/lib/obp60task/OBP60Hardware.h +++ b/lib/obp60task/OBP60Hardware.h @@ -43,6 +43,8 @@ #define OBP_SPI_DIN 48 #define OBP_TFT_OFFSET_X 10 // ST7796 operating x-offset for centered 400x300 content #define OBP_TFT_OFFSET_Y -20 // ST7796 operating y-offset for centered 400x300 content + #define TFT_BLACK 0x0109 // Replacement color for black on TFT (RGB565) + #define TFT_WHITE 0xFFFF // Replacement color for white on TFT (RGB565) #define SHOW_TIME 6000 // Show time in [ms] for logo and WiFi QR code #define FULL_REFRESH_TIME 600 // Refresh cycle time in [s][600...3600] for full display update (very important healcy function) #define GxEPD_WIDTH 400 // Display width diff --git a/lib/obp60task/obp60task.cpp b/lib/obp60task/obp60task.cpp index 18fb479..ef29b35 100644 --- a/lib/obp60task/obp60task.cpp +++ b/lib/obp60task/obp60task.cpp @@ -9,7 +9,6 @@ #include // NMEA0183 #include #include -#include // GxEPD2 lib for b/w E-Ink displays #include "OBP60Extensions.h" // Functions lib for extension board #include "OBP60Keypad.h" // Functions for keypad #include "OBPDataOperations.h" // Functions lib for data operations such as true wind calculation