T-Watch Ultra support (#8171)

* feat: T-Watch Ultra support * fix init touch controller * add framebuffer * update to device-ui * trunk fmt * update amoled driver reference * PMU cosmetics * power off lora * fix NodeDB defaults * trySetRTC when fixedPosition * haptic touch (only BaseUI) * init lora RF switch * update LovyanGFX 1.2.19 * earlyInitVariant() adaptations acc. #9438 * update device-ui / touch handling * Set NFC_CS disabled on boot * Get t-watch-ultra working better on BaseUI * Fix compilation * Fix flash reads on t-watch-ultra * Get baseui drawing to the screen correctly again on t-watch and add touch IRQ handling * Add PMU IRQ handling * Add IMU support * Change define to avoid collision * BaseUI changes to support t-watch-s3 rounded screen (#10786) * BaseUI changes to support t-watch-s3 rounded screen * Extend margin work to CannedMessages * Finish merge * Get audio working on watch-ultra * trunk fmt * added custom_meshtastic boilerplate * T-Echo-Plus: disable BHI260AP while assumingly not implemented * Drop the duplicate origBold declaration from the merge * Inset incoming message bubbles on rounded screens * Fix RTTTL tempo, WiFi screen margins, PMU guard and a duplicate define * fix compile errror (the 2nd time) * fix SDcard * fix/workaround CO5300 pixel flush to SPI * trunk fmt --------- Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz> Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
2026-10-04 03:18:10 +10:00 · 2026-08-20 12:28:57 +00:00
parent 389559bddb
commit 0b906b4d15
35 changed files with 1060 additions and 166 deletions
@@ -30,6 +30,7 @@

 // vibration motor
 #define PIN_VIBRATION 2
+#define HAS_DRV2605 1

 // Have SPI interface SD card slot
 #define HAS_SDCARD
@@ -0,0 +1,94 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+// #ifndef digitalPinToInterrupt
+// #define digitalPinToInterrupt(p) (((p) < 48) ? (p) : -1)
+// #endif
+
+#define USB_VID 0x303a
+#define USB_PID 0x8227
+#define USB_MANUFACTURER "LILYGO"
+#define USB_PRODUCT "T-Watch-Ultra"
+
+#define DISP_WIDTH 502
+#define DISP_HEIGHT 410
+
+// QSPI interface display
+#define DISP_D0 (38)
+#define DISP_D1 (39)
+#define DISP_D2 (42)
+#define DISP_D3 (45)
+#define DISP_SCK (40)
+#define DISP_CS (41)
+#define DISP_RST (37)
+#define DISP_TE (6)
+
+// Interrupt IO port
+#define TP_INT (12)
+#define RTC_INT (1)
+#define PMU_INT (7)
+#define NFC_INT (5)
+#define SENSOR_INT (8)
+#define NFC_CS (4)
+
+// PDM microphone
+#define MIC_SCK (17)
+#define MIC_DAT (18)
+
+// MAX98357A
+#define I2S_BCLK (9)
+#define I2S_WCLK (10)
+#define I2S_DOUT (11)
+
+#define SD_CS (21)
+
+// TX, RX pin connected to GPS
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+// BHI260,PCF85063,AXP2101,DRV2605L share I2C Bus
+static const uint8_t SDA = 3;
+static const uint8_t SCL = 2;
+
+// Default sd cs pin
+static const uint8_t SS = SD_CS;
+static const uint8_t MOSI = 34;
+static const uint8_t MISO = 33;
+static const uint8_t SCK = 35;
+
+#define GPS_TX (TX)
+#define GPS_RX (RX)
+#define GPS_PPS (13)
+
+#define TP_SDA (SDA)
+#define TP_SCL (SCL)
+
+// LoRa and SD card share SPI bus -> variant.h
+// #define LORA_SCK  (SCK)   // share spi bus
+// #define LORA_MISO (MISO)  // share spi bus
+// #define LORA_MOSI (MOSI)  // share spi bus
+// #define LORA_CS   (36)
+// #define LORA_RST  (47)
+// #define LORA_BUSY (48)
+// #define LORA_IRQ  (14)
+
+// External expansion chip IO definition
+#define EXPANDS_DRV_EN (6)
+#define EXPANDS_DISP_EN (7)
+#define EXPANDS_TOUCH_RST (8)
+#define EXPANDS_SD_DET (10)
+#define EXPANDS_LORA_RF_SW (11)
+
+// Peripheral definition exists
+#define USING_XL9555_EXPANDS
+#define USING_PCM_AMPLIFIER
+#define USING_PDM_MICROPHONE
+#define USING_PMU_MANAGE
+#define USING_INPUT_DEV_TOUCHPAD
+#define USING_ST25R3916
+#define USING_BHI260_SENSOR
+#define HAS_SD_CARD_SOCKET
+
+#endif /* Pins_Arduino_h */
@@ -0,0 +1,96 @@
+; LilyGo T-Watch S3
+[env:t-watch-ultra]
+custom_meshtastic_hw_model = 114
+custom_meshtastic_hw_model_slug = T_WATCH_ULTRA
+custom_meshtastic_architecture = esp32-s3
+custom_meshtastic_actively_supported = true
+custom_meshtastic_support_level = 1
+custom_meshtastic_display_name = T-Watch Ultra
+custom_meshtastic_images = t-watch-ultra.svg
+custom_meshtastic_tags = LilyGo
+custom_meshtastic_requires_dfu = false
+custom_meshtastic_partition_scheme = 16MB
+custom_meshtastic_has_mui = true
+
+extends = esp32s3_base
+board = t-watch-ultra
+board_level = release
+board_build.partitions = default_16MB.csv
+upload_protocol = esptool
+
+custom_sdkconfig =
+  ${esp32s3_base.custom_sdkconfig}
+  ; Keep esp_littlefs buffers in internal RAM (off the shared-bus PSRAM).
+  CONFIG_LITTLEFS_MALLOC_STRATEGY_INTERNAL=y
+  CONFIG_SPI_FLASH_SHARE_SPI1_BUS=y
+
+build_flags = ${esp32_base.build_flags} -Ivariants/esp32s3/t-watch-ultra
+  ; Route flash reads through the cache/mmap path (esp_partition_read_mmap_wrap.c)
+  ; to dodge the IDF 5.5 manual-read regression on this board's flash.
+  -Wl,--wrap=esp_partition_read
+  -D T_WATCH_ULTRA
+  -D RADIOLIB_EXCLUDE_SX128X=1
+  -D RADIOLIB_EXCLUDE_SX127X=1
+  -D RADIOLIB_EXCLUDE_LR11X0=1
+  -UMESHTASTIC_EXCLUDE_ACCELEROMETER
+  -D HAS_SDCARD
+  -D SDCARD_USE_SPI1
+  -D SD_SPI_FREQUENCY=75000000
+  -D SPI_MISO=33
+  -D SPI_MOSI=34
+  -D SPI_SCK=35
+  -D SDCARD_CS=21
+;  -DHAS_BMA423=1
+
+build_src_filter =
+  ${esp32s3_base.build_src_filter}
+  +<../variants/esp32s3/t-watch-ultra>
+
+lib_deps = ${esp32s3_base.lib_deps}
+  https://github.com/lovyan03/LovyanGFX/archive/tags/1.2.27.zip
+  adafruit/Adafruit DRV2605 Library@^1.2.4
+  # renovate: datasource=git-refs depName=ESP8266Audio packageName=https://github.com/meshtastic/ESP8266Audio gitBranch=meshtastic-2.0.0-dacfix
+  https://github.com/earlephilhower/ESP8266Audio/archive/05f2fb0045cc294b4e0d1a1a9747b89c22c1fea4.zip
+  # renovate: datasource=custom.pio depName=ESP8266SAM packageName=earlephilhower/library/ESP8266SAM
+  earlephilhower/ESP8266SAM@1.1.0
+  lewisxhe/SensorLib@0.3.1
+
+[env:t-watch-ultra-tft]
+board_level = extra
+extends = env:t-watch-ultra
+build_flags =
+  ${env:t-watch-ultra.build_flags}
+  -D CONFIG_DISABLE_HAL_LOCKS=1
+  -D INPUTDRIVER_BUTTON_TYPE=0
+  -D HAS_SCREEN=1
+  -D HAS_TFT=1
+  -D USE_I2S_BUZZER
+  -D RAM_SIZE=5120
+  -D LV_LVGL_H_INCLUDE_SIMPLE
+  -D LV_CONF_INCLUDE_SIMPLE
+  -D LV_COMP_CONF_INCLUDE_SIMPLE
+  -D LV_USE_SYSMON=0
+  -D LV_USE_PROFILER=0
+  -D LV_USE_PERF_MONITOR=0
+  -D LV_USE_MEM_MONITOR=0
+  -D LV_USE_LOG=0
+  -D USE_LOG_DEBUG
+  -D LOG_DEBUG_INC=\"DebugConfiguration.h\"
+  -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 VIEW_320x240
+  -D USE_PACKET_API
+  -D MAP_FULL_REDRAW
+  -D CUSTOM_TOUCH_DRIVER
+
+lib_deps =
+  ${env:t-watch-ultra.lib_deps}
+  ${device-ui_base.lib_deps}
@@ -0,0 +1,101 @@
+
+// CO5300 TFT AMOLED
+#define CO5300_CS 41
+#define CO5300_SCK 40
+#define CO5300_RESET 37
+#define CO5300_TE 6
+#define CO5300_IO0 38
+#define CO5300_IO1 39
+#define CO5300_IO2 42
+#define CO5300_IO3 45
+#define CO5300_SPI_HOST SPI2_HOST
+#define SPI_FREQUENCY 75000000
+#define SPI_READ_FREQUENCY 16000000 // irrelevant
+#define TFT_HEIGHT 502
+#define TFT_WIDTH 410
+#define TFT_OFFSET_X 22
+#define TFT_OFFSET_Y 0
+#define TFT_OFFSET_ROTATION 0
+#define SCREEN_TRANSITION_FRAMERATE 5 // fps
+#define USE_TFTDISPLAY 1
+#define HAS_SCREEN 1
+#define TFT_RESET_AFTER_SLEEP
+#define OLED_HUGE
+#define ROUNDED_SCREEN true
+#define BASEUI_HEADER_MARGIN 15
+#define BASEUI_HEADER_LR_MARGIN 55
+#define BASEUI_BELOW_HEADER_MARGIN 15
+#define BASEUI_BODY_LR_MARGIN 35
+
+#define HAS_TOUCHSCREEN 1
+#define HAS_SPI_TFT 1
+#define ENABLE_TOUCH_INT 1
+#define VARIANT_TOUCHSCREEN 1
+#define SCREEN_TOUCH_INT 12
+#define TOUCH_I2C_PORT 0
+#define TOUCH_SLAVE_ADDRESS 0x1A
+#define WAKE_ON_TOUCH
+
+#define BUTTON_PIN 0
+
+#define USE_POWERSAVE
+#define SLEEP_TIME 120
+
+// 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
+#define DAC_I2S_WS 10
+#define DAC_I2S_DOUT 11
+#define DAC_I2S_MCLK -1 // TODO
+
+#define HAS_AXP2101
+#define PMU_IRQ 7
+#define PMU_POWER_BUTTON_IS_CANCEL
+#define HAS_DRV2605 1
+
+#define HAS_BHI260AP
+#define BHI260AP_INT 8
+#undef MESHTASTIC_EXCLUDE_ACCELEROMETER
+#define SHOW_STEP_COUNTER
+
+#define I2C_SDA 3
+#define I2C_SCL 2
+#define I2C_NO_RESCAN
+
+#define HAS_GPS 1
+#define GPS_BAUDRATE 38400
+#define GPS_RX_PIN 44
+#define GPS_TX_PIN 43
+#define PIN_GPS_PPS 13
+
+#define USE_SX1262
+// #define USE_SX1280
+#define HW_SPI1_DEVICE
+
+#define LORA_SCK 35
+#define LORA_MISO 33
+#define LORA_MOSI 34
+#define LORA_CS 36
+
+#define LORA_DIO0 -1 // a No connect on the SX1262 module
+#define LORA_RESET 47
+#define LORA_DIO1 14 // SX1262 IRQ
+#define LORA_DIO2 48 // SX1262 BUSY
+#define LORA_DIO3
+
+#define SX126X_CS LORA_CS
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY LORA_DIO2
+#define SX126X_RESET LORA_RESET
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8
+
+#define USE_VIRTUAL_KEYBOARD 1
+#define DISPLAY_CLOCK_FRAME 1
@@ -59,7 +59,7 @@ static const uint8_t A0 = PIN_A0;
 #define WIRE_INTERFACES_COUNT 1
 #define PIN_WIRE_SDA (0 + 26)
 #define PIN_WIRE_SCL (0 + 27)
-#define HAS_BHI260AP
+// #define HAS_BHI260AP ; lewisxhe/SensorLib too big for nrf52

 #define TP_SER_IO (0 + 11)