From 2760c3365a6e97c84968501a4057ed504988a682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Thu, 7 Aug 2025 14:03:14 +0200 Subject: [PATCH] Move to new variant structure and refactor inkHUD - Display does not work and SX1262 init fails on HT752-02 --- .../{ => esp32s3}/t5s3_epaper/nicheGraphics.h | 16 ++-------------- .../{ => esp32s3}/t5s3_epaper/pins_arduino.h | 0 .../{ => esp32s3}/t5s3_epaper/platformio.ini | 2 +- variants/{ => esp32s3}/t5s3_epaper/variant.h | 0 4 files changed, 3 insertions(+), 15 deletions(-) rename variants/{ => esp32s3}/t5s3_epaper/nicheGraphics.h (87%) rename variants/{ => esp32s3}/t5s3_epaper/pins_arduino.h (100%) rename variants/{ => esp32s3}/t5s3_epaper/platformio.ini (95%) rename variants/{ => esp32s3}/t5s3_epaper/variant.h (100%) diff --git a/variants/t5s3_epaper/nicheGraphics.h b/variants/esp32s3/t5s3_epaper/nicheGraphics.h similarity index 87% rename from variants/t5s3_epaper/nicheGraphics.h rename to variants/esp32s3/t5s3_epaper/nicheGraphics.h index baadc3d28..699a82de0 100644 --- a/variants/t5s3_epaper/nicheGraphics.h +++ b/variants/esp32s3/t5s3_epaper/nicheGraphics.h @@ -31,19 +31,12 @@ Different NicheGraphics UIs and different hardware variants will each have their #include "graphics/niche/InkHUD/Applets/User/RecentsList/RecentsListApplet.h" #include "graphics/niche/InkHUD/Applets/User/ThreadedMessage/ThreadedMessageApplet.h" -// #include "graphics/niche/InkHUD/Applets/Examples/BasicExample/BasicExampleApplet.h" -// #include "graphics/niche/InkHUD/Applets/Examples/NewMsgExample/NewMsgExampleApplet.h" - // Shared NicheGraphics components // -------------------------------- #include "graphics/niche/Drivers/Backlight/LatchingBacklight.h" #include "graphics/niche/Drivers/EInk/DEPG0290BNS800.h" #include "graphics/niche/Inputs/TwoButton.h" -#include "graphics/niche/Fonts/FreeSans6pt7b.h" -#include "graphics/niche/Fonts/FreeSans6pt8bCyrillic.h" -#include - void setupNicheGraphics() { using namespace NicheGraphics; @@ -75,13 +68,8 @@ void setupNicheGraphics() inkhud->setDisplayResilience(7, 1.5); // Prepare fonts - InkHUD::Applet::fontLarge = InkHUD::AppletFont(FreeSans9pt7b); - InkHUD::Applet::fontSmall = InkHUD::AppletFont(FreeSans6pt7b); - /* - // Font localization demo: Cyrillic - InkHUD::Applet::fontSmall = InkHUD::AppletFont(FreeSans6pt8bCyrillic); - InkHUD::Applet::fontSmall.addSubstitutionsWin1251(); - */ + InkHUD::Applet::fontLarge = FREESANS_9PT_WIN1252; + InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252; // Init settings, and customize defaults inkhud->persistence->settings.userTiles.maxCount = 2; // How many tiles can the display handle? diff --git a/variants/t5s3_epaper/pins_arduino.h b/variants/esp32s3/t5s3_epaper/pins_arduino.h similarity index 100% rename from variants/t5s3_epaper/pins_arduino.h rename to variants/esp32s3/t5s3_epaper/pins_arduino.h diff --git a/variants/t5s3_epaper/platformio.ini b/variants/esp32s3/t5s3_epaper/platformio.ini similarity index 95% rename from variants/t5s3_epaper/platformio.ini rename to variants/esp32s3/t5s3_epaper/platformio.ini index 59b1db657..93ae5f685 100644 --- a/variants/t5s3_epaper/platformio.ini +++ b/variants/esp32s3/t5s3_epaper/platformio.ini @@ -8,7 +8,7 @@ upload_protocol = esptool build_flags = ${esp32_base.build_flags} ${inkhud.build_flags} - -I variants/t5s3_epaper + -I variants/esp32s3/t5s3_epaper -D PRIVATE_HW -D MESHTASTIC_EXCLUDE_I2C=1 -D MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR=1 diff --git a/variants/t5s3_epaper/variant.h b/variants/esp32s3/t5s3_epaper/variant.h similarity index 100% rename from variants/t5s3_epaper/variant.h rename to variants/esp32s3/t5s3_epaper/variant.h