From 9212aad8d8283324d34867df386b4f006d7f8648 Mon Sep 17 00:00:00 2001 From: Nic Limper Date: Thu, 23 Mar 2023 13:55:55 +0100 Subject: [PATCH] bugfix color palette --- ESP32_AP-Flasher/include/settings.h | 9 +++------ ESP32_AP-Flasher/platformio.ini | 8 +++++--- ESP32_AP-Flasher/src/contentmanager.cpp | 5 +++++ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ESP32_AP-Flasher/include/settings.h b/ESP32_AP-Flasher/include/settings.h index 4137cde9..1bd87ece 100644 --- a/ESP32_AP-Flasher/include/settings.h +++ b/ESP32_AP-Flasher/include/settings.h @@ -51,14 +51,11 @@ #define FLASHER_AP_MOSI 23 #define FLASHER_AP_MISO 19 #define FLASHER_AP_RESET 2 -//#define FLASHER_AP_POWER 13 +#define FLASHER_AP_POWER 13 #define FLASHER_AP_POWER2 15 -//#define FLASHER_AP_TXD 17 -//#define FLASHER_AP_RXD 16 #define FLASHER_AP_TEST -1 -#define FLASHER_AP_TXD 12 -#define FLASHER_AP_RXD 13 -#define FLASHER_AP_POWER 25 +#define FLASHER_AP_TXD 17 +#define FLASHER_AP_RXD 16 #define FLASHER_LED 22 #endif diff --git a/ESP32_AP-Flasher/platformio.ini b/ESP32_AP-Flasher/platformio.ini index 8f61e5eb..e587642a 100644 --- a/ESP32_AP-Flasher/platformio.ini +++ b/ESP32_AP-Flasher/platformio.ini @@ -73,9 +73,11 @@ lib_deps = https://github.com/garretlab/shoddyxml2 https://github.com/Bodmer/U8g2_for_TFT_eSPI https://github.com/ricmoo/qrcode -upload_port = COM12 -monitor_port = COM12 +upload_port = COM21 +monitor_port = COM21 build_flags = -D SIMPLE_AP=2 - -D PINOUT=SIMPLE_AP \ No newline at end of file + -D PINOUT=SIMPLE_AP +src_filter = + +<*>- diff --git a/ESP32_AP-Flasher/src/contentmanager.cpp b/ESP32_AP-Flasher/src/contentmanager.cpp index c2317fd2..e02a00aa 100644 --- a/ESP32_AP-Flasher/src/contentmanager.cpp +++ b/ESP32_AP-Flasher/src/contentmanager.cpp @@ -217,6 +217,11 @@ void drawString(TFT_eSprite &spr, String content, uint16_t posx, uint16_t posy, void initSprite(TFT_eSprite &spr, int w, int h) { spr.setColorDepth(4); // 4 bits per pixel, uses indexed color spr.createSprite(w, h); + uint16_t cmap[16]; + cmap[PAL_BLACK] = TFT_BLACK; + cmap[PAL_RED] = TFT_RED; + cmap[PAL_WHITE] = TFT_WHITE; + spr.createPalette(cmap, 16); if (spr.getPointer() == nullptr) { wsErr("Failed to create sprite"); }