From a8af68844c1913671a526e8f107432e25e0c1ac3 Mon Sep 17 00:00:00 2001 From: Manuel <71137295+mverch67@users.noreply.github.com> Date: Mon, 19 Jan 2026 00:51:53 +0100 Subject: [PATCH] update to device-ui --- platformio.ini | 2 +- src/main.cpp | 1 + variants/esp32s3/t-watch-ultra/platformio.ini | 6 +++--- variants/esp32s3/t-watch-ultra/variant.h | 6 +++++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/platformio.ini b/platformio.ini index 86580c6ae..8daad1fb3 100644 --- a/platformio.ini +++ b/platformio.ini @@ -119,7 +119,7 @@ lib_deps = [device-ui_base] lib_deps = # renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master - https://github.com/meshtastic/device-ui/archive/fbdba6f63de96adf1ae1f0ef99c7a6bec7226943.zip + https://github.com/meshtastic/device-ui/archive/3480b731d28b10d73414cf0dd7975bff745de8cf.zip ; Common libs for environmental measurements in telemetry module [environmental_base] diff --git a/src/main.cpp b/src/main.cpp index 15ab12255..dc310f44f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -419,6 +419,7 @@ void setup() io.pinMode(EXPANDS_TOUCH_RST, OUTPUT); io.digitalWrite(EXPANDS_TOUCH_RST, HIGH); delay(1); + // io.pinMode(EXPANDS_SD_DET, INPUT); } else { LOG_ERROR("io expander initialisation failed!"); } diff --git a/variants/esp32s3/t-watch-ultra/platformio.ini b/variants/esp32s3/t-watch-ultra/platformio.ini index 5a152de7b..9064bb9d9 100644 --- a/variants/esp32s3/t-watch-ultra/platformio.ini +++ b/variants/esp32s3/t-watch-ultra/platformio.ini @@ -11,9 +11,8 @@ build_flags = ${esp32_base.build_flags} -Ivariants/esp32s3/t-watch-ultra -D RADIOLIB_EXCLUDE_SX128X=1 -D RADIOLIB_EXCLUDE_SX127X=1 -D RADIOLIB_EXCLUDE_LR11X0=1 - -D HAS_SDCARD +; -D HAS_SDCARD -D SDCARD_CS=21 -; -DPCF85063_RTC=0x51 ; -DHAS_BMA423=1 lib_deps = ${esp32s3_base.lib_deps} @@ -47,12 +46,13 @@ build_flags = -D RADIOLIB_SPI_PARANOID=0 -D LGFX_SCREEN_WIDTH=410 -D LGFX_SCREEN_HEIGHT=502 + -D LGFX_AMOLED_ROUNDER=1 + -D LGFX_BUFSIZE=308732 -D DISPLAY_SIZE=410x502 ; portrait mode -D DISPLAY_SET_RESOLUTION -D LGFX_DRIVER=LGFX_TWATCH_ULTRA -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_T_WATCH_ULTRA.h\" ; -D LVGL_DRIVER=LVGL_T_WATCH_ULTRA -; -D LV_USE_ST7796=1 -D VIEW_320x240 -D USE_PACKET_API -D MAP_FULL_REDRAW diff --git a/variants/esp32s3/t-watch-ultra/variant.h b/variants/esp32s3/t-watch-ultra/variant.h index b79b8507b..02544b880 100644 --- a/variants/esp32s3/t-watch-ultra/variant.h +++ b/variants/esp32s3/t-watch-ultra/variant.h @@ -17,6 +17,7 @@ #define TFT_OFFSET_Y 0 #define TFT_OFFSET_ROTATION 0 #define SCREEN_TRANSITION_FRAMERATE 5 // fps +#define USE_TFTDISPLAY 1 #define HAS_TOUCHSCREEN 1 #define SCREEN_TOUCH_INT 12 @@ -32,6 +33,10 @@ // External expansion chip XL9555 #define USE_XL9555 +// PCF85063 RTC Module +#define PCF85063_RTC 0x51 +#define HAS_RTC 1 + // MAX98357A #define HAS_I2S #define DAC_I2S_BCK 9 @@ -41,7 +46,6 @@ #define HAS_AXP2101 // #define PMU_IRQ 7 -#define HAS_RTC 1 #define HAS_DRV2605 1 #define I2C_SDA 3