chore(deps): update meshtastic-esp32_https_server digest to b0f3960

Update meshtastic/device-ui digest to 613c095 (#9383 )
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-01-23 18:27:27 +00:00 · 2026-01-22 04:30:58 +00:00 · 2026-01-22 09:07:23 +11:00 · 2026-01-19 20:00:41 -06:00 · 2026-01-19 16:57:21 -06:00 · 2026-01-19 15:39:24 -06:00
27 changed files with 50 additions and 528 deletions
--- a/boards/t-watch-ultra.json
+++ b/boards/t-watch-ultra.json
@@ -1,40 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "esp32s3_out.ld",
-      "memory_type": "qio_qspi"
-    },
-    "core": "esp32",
-    "extra_flags": [
-      "-DBOARD_HAS_PSRAM",
-      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1"
-    ],
-    "f_cpu": "240000000L",
-    "f_flash": "80000000L",
-    "flash_mode": "qio",
-    "psram_type": "qio",
-    "hwids": [["0x303A", "0x1001"]],
-    "mcu": "esp32s3",
-    "variant": "t-watch-ultra"
-  },
-  "connectivity": ["wifi", "bluetooth", "lora"],
-  "debug": {
-    "openocd_target": "esp32s3.cfg"
-  },
-  "frameworks": ["arduino"],
-  "name": "LilyGo T-Watch Ultra",
-  "upload": {
-    "flash_size": "16MB",
-    "maximum_ram_size": 327680,
-    "maximum_size": 16777216,
-    "require_upload_port": true,
-    "use_1200bps_touch": true,
-    "wait_for_upload_port": true,
-    "speed": 921600
-  },
-  "url": "https://www.lilygo.cc/en-pl/products/t-watch-ultra",
-  "vendor": "LilyGo"
-}
--- 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/3480b731d28b10d73414cf0dd7975bff745de8cf.zip
+	https://github.com/meshtastic/device-ui/archive/613c0953313bbd236f4ddc5ede447e9edf8e890a.zip

 ; Common libs for environmental measurements in telemetry module
 [environmental_base]
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -723,6 +723,16 @@ bool Power::setup()
            runASAP = true;
        },
        CHANGE);
+#endif
+#ifdef EXT_CHRG_DETECT
+    attachInterrupt(
+        EXT_CHRG_DETECT,
+        []() {
+            power->setIntervalFromNow(0);
+            runASAP = true;
+            BaseType_t higherWake = 0;
+        },
+        CHANGE);
 #endif
    enabled = found;
    low_voltage_counter = 0;
@@ -1172,48 +1182,6 @@ bool Power::axpChipInit()
            PMU->disablePowerOutput(XPOWERS_DLDO1); // Invalid power channel, it does not exist
            PMU->disablePowerOutput(XPOWERS_DLDO2); // Invalid power channel, it does not exist
            PMU->disablePowerOutput(XPOWERS_VBACKUP);
-        } else if (HW_VENDOR == meshtastic_HardwareModel_T_WATCH_ULTRA) {
-            PMU->clearIrqStatus();
-
-            // Turn off the PMU charging indicator light, no physical connection
-            PMU->setChargingLedMode(XPOWERS_CHG_LED_OFF); // NO LED
-
-            PMU->setPowerChannelVoltage(XPOWERS_ALDO1, 3300); // SD Card
-            PMU->enablePowerOutput(XPOWERS_ALDO1);
-
-            PMU->setPowerChannelVoltage(XPOWERS_ALDO2, 3300); // Display
-            PMU->enablePowerOutput(XPOWERS_ALDO2);
-
-            PMU->setPowerChannelVoltage(XPOWERS_ALDO3, 3300); // LoRa
-            PMU->enablePowerOutput(XPOWERS_ALDO3);
-
-            PMU->setPowerChannelVoltage(XPOWERS_ALDO4, 1800); // Sensor
-            PMU->enablePowerOutput(XPOWERS_ALDO4);
-
-            PMU->setPowerChannelVoltage(XPOWERS_BLDO1, 3300); // GPS
-            PMU->enablePowerOutput(XPOWERS_BLDO1);
-
-            PMU->setPowerChannelVoltage(XPOWERS_BLDO2, 3300); // Speaker
-            PMU->enablePowerOutput(XPOWERS_BLDO2);
-
-            PMU->setPowerChannelVoltage(XPOWERS_VBACKUP, 3300); // RTC Button battery
-            PMU->enablePowerOutput(XPOWERS_VBACKUP);
-
-            // PMU->enablePowerOutput(XPOWERS_DLDO1); // NFC
-
-            // UNUSED POWER CHANNEL
-            PMU->disablePowerOutput(XPOWERS_DCDC2);
-            PMU->disablePowerOutput(XPOWERS_DCDC3);
-            PMU->disablePowerOutput(XPOWERS_DCDC4);
-            PMU->disablePowerOutput(XPOWERS_DCDC5);
-            PMU->disablePowerOutput(XPOWERS_CPULDO);
-
-            // Enable Measure
-            PMU->enableBattDetection();
-            PMU->enableVbusVoltageMeasure();
-            PMU->enableBattVoltageMeasure();
-            PMU->enableSystemVoltageMeasure();
-            PMU->enableTemperatureMeasure();
        }

        // disable all axp chip interrupt
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -933,8 +933,8 @@ void GPS::setPowerPMU(bool on)
        } else if (HW_VENDOR == meshtastic_HardwareModel_LILYGO_TBEAM_S3_CORE) {
            // t-beam-s3-core GNSS power channel
            on ? PMU->enablePowerOutput(XPOWERS_ALDO4) : PMU->disablePowerOutput(XPOWERS_ALDO4);
-        } else if (HW_VENDOR == meshtastic_HardwareModel_T_WATCH_ULTRA || HW_VENDOR == meshtastic_HardwareModel_T_WATCH_S3) {
-            // t-watch-ultra / t-watch-s3-plus GNSS power channel
+        } else if (HW_VENDOR == meshtastic_HardwareModel_T_WATCH_S3) {
+            // t-watch-s3-plus GNSS power channel
            on ? PMU->enablePowerOutput(XPOWERS_BLDO1) : PMU->disablePowerOutput(XPOWERS_BLDO1);
        }
    } else if (model == XPOWERS_AXP192) {
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -361,8 +361,7 @@ Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_O
        LOG_INFO("SSD1306 init success");
    }
 #elif defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7789_CS) ||    \
-    defined(RAK14014) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST7796_CS) || defined(CO5300_CS) ||                \
-    defined(HACKADAY_COMMUNICATOR)
+    defined(RAK14014) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST7796_CS) || defined(HACKADAY_COMMUNICATOR)
    dispdev = new TFTDisplay(address.address, -1, -1, geometry,
                             (address.port == ScanI2C::I2CPort::WIRE1) ? HW_I2C::I2C_TWO : HW_I2C::I2C_ONE);
 #elif defined(USE_EINK) && !defined(USE_EINK_DYNAMICDISPLAY)
@@ -430,7 +429,7 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)
        if (on) {
            LOG_INFO("Turn on screen");
            powerMon->setState(meshtastic_PowerMon_State_Screen_On);
-#if defined(T_WATCH_S3) || defined(T_WATCH_ULTRA)
+#ifdef T_WATCH_S3
            PMU->enablePowerOutput(XPOWERS_ALDO2);
 #endif

@@ -536,7 +535,7 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)
 #endif
 #endif

-#if defined(T_WATCH_S3) || defined(T_WATCH_ULTRA)
+#ifdef T_WATCH_S3
            PMU->disablePowerOutput(XPOWERS_ALDO2);
 #endif
            enabled = false;
@@ -643,8 +642,7 @@ void Screen::setup()
 #else
    if (!config.display.flip_screen) {
 #if defined(ST7701_CS) || defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7789_CS) ||      \
-    defined(RAK14014) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST7796_CS) || defined(CO5300_CS) ||                \
-    defined(HACKADAY_COMMUNICATOR)
+    defined(RAK14014) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST7796_CS) || defined(HACKADAY_COMMUNICATOR)
        static_cast<TFTDisplay *>(dispdev)->flipScreenVertically();
 #elif defined(USE_ST7789)
        static_cast<ST7789Spi *>(dispdev)->flipScreenVertically();
--- a/src/graphics/ScreenFonts.h
+++ b/src/graphics/ScreenFonts.h
@@ -90,7 +90,7 @@

 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
     defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST7796_CS) ||             \
-     defined(CO5300_CS) || defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796)) &&                                             \
+     defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796)) &&                                                                   \
    !defined(DISPLAY_FORCE_SMALL_FONTS)
 // The screen is bigger so use bigger fonts
 #define FONT_SMALL FONT_MEDIUM_LOCAL // Height: 19
--- a/src/graphics/TFTDisplay.cpp
+++ b/src/graphics/TFTDisplay.cpp
@@ -22,109 +22,6 @@ uint16_t TFT_MESH = TFT_MESH_OVERRIDE;
 uint16_t TFT_MESH = COLOR565(0x67, 0xEA, 0x94);
 #endif

-#if defined(CO5300_CS)
-#include <LovyanGFX.hpp> // Graphics and font library for AMOLED driver chip
-class LGFX : public lgfx::LGFX_Device
-{
-    lgfx::Panel_CO5300 _panel_instance;
-    lgfx::Bus_SPI _bus_instance;
-
-  public:
-    LGFX(void)
-    {
-        {
-            auto cfg = _bus_instance.config();
-
-            // configure SPI
-            cfg.spi_host = CO5300_SPI_HOST; // ESP32-S2,S3,C3 : SPI2_HOST or SPI3_HOST / ESP32 : VSPI_HOST or HSPI_HOST
-            cfg.spi_mode = SPI_MODE0;
-            cfg.freq_write = SPI_FREQUENCY; // SPI clock for transmission (up to 80MHz, rounded to the value obtained by dividing
-                                            // 80MHz by an integer)
-            cfg.freq_read = SPI_READ_FREQUENCY; // SPI clock when receiving
-            cfg.spi_3wire = false;              // Set to true if reception is done on the MOSI pin
-            cfg.use_lock = true;                // Set to true to use transaction locking
-            cfg.dma_channel = SPI_DMA_CH_AUTO;  // SPI_DMA_CH_AUTO; // Set DMA channel to use (0=not use DMA / 1=1ch / 2=ch /
-                                                // SPI_DMA_CH_AUTO=auto setting)
-            cfg.pin_sclk = CO5300_SCK;          // Set SPI SCLK pin number
-            cfg.pin_io0 = CO5300_IO0;
-            cfg.pin_io1 = CO5300_IO1;
-            cfg.pin_io2 = CO5300_IO2;
-            cfg.pin_io3 = CO5300_IO3;
-
-            _bus_instance.config(cfg);              // applies the set value to the bus.
-            _panel_instance.setBus(&_bus_instance); // set the bus on the panel.
-        }
-
-        {                                        // Set the display panel control.
-            auto cfg = _panel_instance.config(); // Gets a structure for display panel settings.
-
-            cfg.pin_cs = CO5300_CS;                    // Pin number where CS is connected (-1 = disable)
-            cfg.pin_rst = CO5300_RESET;                // Pin number where RST is connected  (-1 = disable)
-            cfg.panel_width = TFT_WIDTH;               // actual displayable width
-            cfg.panel_height = TFT_HEIGHT;             // actual displayable height
-            cfg.offset_rotation = TFT_OFFSET_ROTATION; // Rotation direction value offset 0~7 (4~7 is upside down)
-            cfg.offset_x = TFT_OFFSET_X;
-            cfg.offset_y = TFT_OFFSET_Y;
-            cfg.dummy_read_pixel = 8; // Number of bits for dummy read before pixel readout
-            cfg.dummy_read_bits = 1;  // Number of bits for dummy read before non-pixel data read
-            cfg.readable = true;      // Set to true if data can be read
-            cfg.invert = false;       // Set to true if the light/darkness of the panel is reversed
-            cfg.rgb_order = false;    // Set to true if the panel's red and blue are swapped
-            cfg.dlen_16bit = false;   // Set to true for panels that transmit data length in 16-bit units
-            cfg.bus_shared = true;    // If the bus is shared with the SD card, set to true (bus control with drawJpgFile etc.)
-
-            // Set the following only when the display is shifted with a driver with a variable number of pixels
-            cfg.memory_width = TFT_WIDTH;   // Maximum width supported by the driver IC
-            cfg.memory_height = TFT_HEIGHT; // Maximum height supported by the driver IC
-            _panel_instance.config(cfg);
-        }
-
-        setPanel(&_panel_instance);
-    }
-
-    bool enableFrameBuffer(bool auto_display = false)
-    {
-        if (_panel_instance.initPanelFb()) {
-            auto fbPanel = _panel_instance.getPanelFb();
-            if (fbPanel) {
-                fbPanel->setBus(&_bus_instance);
-                fbPanel->setAutoDisplay(auto_display);
-                setPanel(fbPanel);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    void disableFrameBuffer()
-    {
-        auto fbPanel = _panel_instance.getPanelFb();
-        if (fbPanel) {
-            _panel_instance.deinitPanelFb();
-            setPanel(&_panel_instance);
-        }
-    }
-
-    bool init()
-    {
-#ifdef CO5300_RESET
-        LOG_DEBUG("LGFX_Panel_CO5300::init()");
-        lgfx::pinMode(CO5300_RESET, lgfx::pin_mode_t::output);
-        lgfx::gpio_hi(CO5300_RESET);
-        delay(200);
-        lgfx::gpio_lo(CO5300_RESET);
-        delay(300);
-        lgfx::gpio_hi(CO5300_RESET);
-        delay(200);
-#endif
-        return lgfx::LGFX_Device::init() && enableFrameBuffer(false);
-    }
-};
-
-static LGFX *tft = nullptr;
-
-#endif
-
 #if defined(ST7735S)
 #include <LovyanGFX.hpp> // Graphics and font library for ST7735 driver chip

@@ -1443,7 +1340,7 @@ void TFTDisplay::sendCommand(uint8_t com)
    // handle display on/off directly
    switch (com) {
    case DISPLAYON: {
-        LOG_DEBUG("Display on");
+        // LOG_DEBUG("Display on");
        backlightEnable->set(true);
 #if ARCH_PORTDUINO
        display(true);
@@ -1463,13 +1360,14 @@ void TFTDisplay::sendCommand(uint8_t com)
        unphone.backlight(true); // using unPhone library
 #endif
 #ifdef RAK14014
-#elif !defined(M5STACK) && !defined(ST7789_CS) && !defined(HACKADAY_COMMUNICATOR)
+#elif !defined(M5STACK) && !defined(ST7789_CS) &&                                                                                \
+    !defined(HACKADAY_COMMUNICATOR) // T-Deck gets brightness set in Screen.cpp in the handleSetOn function
        tft->setBrightness(172);
 #endif
        break;
    }
    case DISPLAYOFF: {
-        LOG_DEBUG("Display off");
+        // LOG_DEBUG("Display off");
        backlightEnable->set(false);
 #if ARCH_PORTDUINO
        tft->clear();
@@ -1571,8 +1469,8 @@ bool TFTDisplay::connect()
    tft = new LGFX;
 #endif

-    LOG_INFO("Power to TFT Backlight");
    backlightEnable->set(true);
+    LOG_INFO("Power to TFT Backlight");

 #ifdef UNPHONE
    unphone.backlight(true); // using unPhone library
@@ -1600,7 +1498,7 @@ bool TFTDisplay::connect()
    tft->setRotation(1); // T-Deck has the TFT in landscape
 #elif defined(T_WATCH_S3)
    tft->setRotation(2); // T-Watch S3 left-handed orientation
-#elif ARCH_PORTDUINO || defined(SENSECAP_INDICATOR) || defined(T_LORA_PAGER) || defined(T_WATCH_ULTRA)
+#elif ARCH_PORTDUINO || defined(SENSECAP_INDICATOR) || defined(T_LORA_PAGER)
    tft->setRotation(0); // use config.yaml to set rotation
 #else
    tft->setRotation(3); // Orient horizontal and wide underneath the silkscreen name label
--- a/src/graphics/draw/DebugRenderer.cpp
+++ b/src/graphics/draw/DebugRenderer.cpp
@@ -97,7 +97,7 @@ void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16
                                          (storeForwardModule->heartbeatInterval * 1200))) { // no heartbeat, overlap a bit
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
     defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS) || defined(ST7796_CS) ||             \
-     defined(CO5300_CS) || defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796) || ARCH_PORTDUINO) &&                           \
+     defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796) || ARCH_PORTDUINO) &&                                                 \
    !defined(DISPLAY_FORCE_SMALL_FONTS)
            display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(screen->ourId), y + 3 + FONT_HEIGHT_SMALL, 12,
                                   8, imgQuestionL1);
@@ -110,7 +110,7 @@ void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16
        } else {
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
     defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS) || defined(ST7796_CS) ||             \
-     defined(CO5300_CS) || defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796)) &&                                             \
+     defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796)) &&                                                                   \
    !defined(DISPLAY_FORCE_SMALL_FONTS)
            display->drawFastImage(x + SCREEN_WIDTH - 18 - display->getStringWidth(screen->ourId), y + 3 + FONT_HEIGHT_SMALL, 16,
                                   8, imgSFL1);
@@ -126,7 +126,7 @@ void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16
        // TODO: Raspberry Pi supports more than just the one screen size
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
     defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS) || defined(ST7796_CS) ||             \
-     defined(CO5300_CS) || defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796) || ARCH_PORTDUINO) &&                           \
+     defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796) || ARCH_PORTDUINO) &&                                                 \
    !defined(DISPLAY_FORCE_SMALL_FONTS)
        display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(screen->ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8,
                               imgInfoL1);
--- a/src/graphics/draw/UIRenderer.cpp
+++ b/src/graphics/draw/UIRenderer.cpp
@@ -265,7 +265,7 @@ void UIRenderer::drawNodes(OLEDDisplay *display, int16_t x, int16_t y, const mes

 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
     defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS) || defined(ST7796_CS) ||             \
-     defined(CO5300_CS) || defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796)) &&                                             \
+     defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796)) &&                                                                   \
    !defined(DISPLAY_FORCE_SMALL_FONTS)

    if (currentResolution == ScreenResolution::High) {
--- a/src/graphics/images.h
+++ b/src/graphics/images.h
@@ -28,7 +28,7 @@ const uint8_t bluetoothConnectedIcon[36] PROGMEM = {0xfe, 0x01, 0xff, 0x03, 0x03

 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
     defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST7796_CS) ||             \
-     defined(USE_ST7796) || defined(CO5300_CS) || defined(HACKADAY_COMMUNICATOR) || ARCH_PORTDUINO) &&                           \
+     defined(USE_ST7796) || defined(HACKADAY_COMMUNICATOR) || ARCH_PORTDUINO) &&                                                 \
    !defined(DISPLAY_FORCE_SMALL_FONTS)
 const uint8_t imgQuestionL1[] PROGMEM = {0xff, 0x01, 0x01, 0x32, 0x7b, 0x49, 0x49, 0x6f, 0x26, 0x01, 0x01, 0xff};
 const uint8_t imgQuestionL2[] PROGMEM = {0x0f, 0x08, 0x08, 0x08, 0x06, 0x0f, 0x0f, 0x06, 0x08, 0x08, 0x08, 0x0f};
--- a/src/input/TouchScreenBase.cpp
+++ b/src/input/TouchScreenBase.cpp
@@ -151,7 +151,7 @@ int32_t TouchScreenBase::runOnce()

 void TouchScreenBase::hapticFeedback()
 {
-#if defined(T_WATCH_S3) || defined(T_WATCH_ULTRA)
+#ifdef T_WATCH_S3
    drv.setWaveform(0, 75);
    drv.setWaveform(1, 0); // end waveform
    drv.go();
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -438,32 +438,6 @@ void setup()
    io.pinMode(EXPANDS_GPIO_EN, OUTPUT);
    io.digitalWrite(EXPANDS_GPIO_EN, HIGH);
    io.pinMode(EXPANDS_SD_PULLEN, INPUT);
-#elif defined(T_WATCH_ULTRA)
-    pinMode(LORA_CS, OUTPUT);
-    digitalWrite(LORA_CS, HIGH);
-    pinMode(DISP_CS, OUTPUT);
-    digitalWrite(DISP_CS, HIGH);
-    pinMode(SDCARD_CS, OUTPUT);
-    digitalWrite(SDCARD_CS, HIGH);
-
-    if (io.begin(Wire, XL9555_SLAVE_ADDRESS0)) {
-        io.pinMode(EXPANDS_DRV_EN, OUTPUT);
-        io.digitalWrite(EXPANDS_DRV_EN, HIGH);
-        delay(1);
-        io.pinMode(EXPANDS_DISP_EN, OUTPUT);
-        io.digitalWrite(EXPANDS_DISP_EN, HIGH);
-        delay(1);
-        io.pinMode(EXPANDS_TOUCH_RST, OUTPUT);
-        io.digitalWrite(EXPANDS_TOUCH_RST, LOW);
-        delay(20);
-        io.digitalWrite(EXPANDS_TOUCH_RST, HIGH);
-        delay(60);
-        io.pinMode(EXPANDS_LORA_RF_SW, OUTPUT);
-        io.digitalWrite(EXPANDS_LORA_RF_SW, HIGH); // set RF switch to built-in LoRa antenna
-        // io.pinMode(EXPANDS_SD_DET, INPUT);
-    } else {
-        LOG_ERROR("io expander initialisation failed!");
-    }
 #elif defined(HACKADAY_COMMUNICATOR)
    pinMode(KB_INT, INPUT);
 #endif
@@ -975,7 +949,7 @@ void setup()

 #if defined(ST7701_CS) || defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) ||       \
    defined(ST7789_CS) || defined(HX8357_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(ST7796_CS) ||              \
-    defined(USE_SPISSD1306) || defined(USE_ST7796) || defined(CO5300_CS) || defined(HACKADAY_COMMUNICATOR)
+    defined(USE_SPISSD1306) || defined(USE_ST7796) || defined(HACKADAY_COMMUNICATOR)
        screen = new graphics::Screen(screen_found, screen_model, screen_geometry);
 #elif defined(ARCH_PORTDUINO)
        if ((screen_found.port != ScanI2C::I2CPort::NO_I2C || portduino_config.displayPanel) &&
@@ -1270,7 +1244,7 @@ void setup()
 // the current region name)
 #if defined(ST7701_CS) || defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) ||       \
    defined(ST7789_CS) || defined(HX8357_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(ST7796_CS) ||              \
-    defined(USE_ST7796) || defined(USE_SPISSD1306) || defined(CO5300_CS) || defined(HACKADAY_COMMUNICATOR)
+    defined(USE_ST7796) || defined(USE_SPISSD1306) || defined(HACKADAY_COMMUNICATOR)
    if (screen)
        screen->setup();
 #elif defined(ARCH_PORTDUINO)
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -670,7 +670,7 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
    strncpy(config.network.ntp_server, "meshtastic.pool.ntp.org", 32);

 #if (defined(T_DECK) || defined(T_WATCH_S3) || defined(UNPHONE) || defined(PICOMPUTER_S3) || defined(SENSECAP_INDICATOR) ||      \
-     defined(ELECROW_PANEL) || defined(HELTEC_V4_TFT) || defined(T_WATCH_ULTRA)) &&                                              \
+     defined(ELECROW_PANEL) || defined(HELTEC_V4_TFT)) &&                                                                        \
    HAS_TFT
    // switch BT off by default; use TFT programming mode or hotkey to enable
    config.bluetooth.enabled = false;
@@ -748,7 +748,7 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
 #ifdef RAK4630
    config.display.wake_on_tap_or_motion = true;
 #endif
-#if defined(T_WATCH_S3) || defined(SENSECAP_INDICATOR) || defined(T_WATCH_ULTRA)
+#if defined(T_WATCH_S3) || defined(SENSECAP_INDICATOR)
    config.display.screen_on_secs = 30;
    config.display.wake_on_tap_or_motion = true;
 #endif
--- a/src/modules/NodeInfoModule.cpp
+++ b/src/modules/NodeInfoModule.cpp
@@ -2,6 +2,7 @@
 #include "Default.h"
 #include "MeshService.h"
 #include "NodeDB.h"
+#include "NodeStatus.h"
 #include "RTC.h"
 #include "Router.h"
 #include "configuration.h"
@@ -129,14 +130,17 @@ meshtastic_MeshPacket *NodeInfoModule::allocReply()
        LOG_DEBUG("Skip send NodeInfo > 40%% ch. util");
        return NULL;
    }
-    // If we sent our NodeInfo less than 5 min. ago, don't send it again as it may be still underway.
-    if (!shorterTimeout && lastSentToMesh && Throttle::isWithinTimespanMs(lastSentToMesh, 5 * 60 * 1000)) {
-        LOG_DEBUG("Skip send NodeInfo since we sent it <5min ago");
+
+    // Use graduated scaling based on active mesh size (10 minute base, scales with congestion coefficient)
+    uint32_t timeoutMs = Default::getConfiguredOrDefaultMsScaled(0, 10 * 60, nodeStatus->getNumOnline());
+    if (!shorterTimeout && lastSentToMesh && Throttle::isWithinTimespanMs(lastSentToMesh, timeoutMs)) {
+        LOG_DEBUG("Skip send NodeInfo since we sent it <%us ago", timeoutMs / 1000);
        ignoreRequest = true; // Mark it as ignored for MeshModule
        return NULL;
    } else if (shorterTimeout && lastSentToMesh && Throttle::isWithinTimespanMs(lastSentToMesh, 60 * 1000)) {
+        // For interactive/urgent requests (e.g., user-triggered or implicit requests), use a shorter 60s timeout
        LOG_DEBUG("Skip send NodeInfo since we sent it <60s ago");
-        ignoreRequest = true; // Mark it as ignored for MeshModule
+        ignoreRequest = true;
        return NULL;
    } else {
        ignoreRequest = false; // Don't ignore requests anymore
--- a/src/modules/PositionModule.cpp
+++ b/src/modules/PositionModule.cpp
@@ -60,7 +60,7 @@ bool PositionModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, mes
        if (config.position.fixed_position) {
            LOG_DEBUG("Ignore incoming position update from myself except for time, because position.fixed_position is true");

-#if defined(T_WATCH_S3) || defined(T_WATCH_ULTRA)
+#ifdef T_WATCH_S3
            // Since we return early if position.fixed_position is true, set the T-Watch's RTC to the time received from the
            // client device here
            if (p.time && channels.getByIndex(mp.channel).role == meshtastic_Channel_Role_PRIMARY) {
--- a/src/platform/esp32/architecture.h
+++ b/src/platform/esp32/architecture.h
@@ -205,8 +205,6 @@
 #define HW_VENDOR meshtastic_HardwareModel_M5STACK_C6L
 #elif defined(HELTEC_WIRELESS_TRACKER_V2)
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_WIRELESS_TRACKER_V2
-#elif defined(T_WATCH_ULTRA)
-#define HW_VENDOR meshtastic_HardwareModel_T_WATCH_ULTRA
 #else
 #define HW_VENDOR meshtastic_HardwareModel_PRIVATE_HW
 #endif
--- a/src/platform/extra_variants/t_watch_ultra/variant.cpp
+++ b/src/platform/extra_variants/t_watch_ultra/variant.cpp
@@ -1,31 +0,0 @@
-#include "configuration.h"
-
-#ifdef T_WATCH_ULTRA
-
-#include "Arduino.h"
-#include "TouchDrvCSTXXX.hpp"
-#include "input/TouchScreenImpl1.h"
-#include <Wire.h>
-
-static TouchDrvCST92xx touchDrv;
-
-static bool readTouch(int16_t *x, int16_t *y)
-{
-    return touchDrv.isPressed() && touchDrv.getPoint(x, y, 1);
-}
-
-// T-Watch Ultra specific init
-void lateInitVariant()
-{
-    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
-        pinMode(SCREEN_TOUCH_INT, INPUT_PULLUP);
-        touchDrv.setPins(-1, SCREEN_TOUCH_INT);
-        if (touchDrv.begin(Wire, TOUCH_SLAVE_ADDRESS, I2C_SDA, I2C_SCL)) {
-            touchScreenImpl1 = new TouchScreenImpl1(TFT_WIDTH, TFT_HEIGHT, readTouch);
-            touchScreenImpl1->init();
-        } else {
-            LOG_ERROR("failed to initialize CST92xx");
-        }
-    }
-}
-#endif
--- a/src/sleep.cpp
+++ b/src/sleep.cpp
@@ -339,7 +339,7 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false, bool skipSaveN
                // t-beam v1.2 radio power channel
                PMU->disablePowerOutput(XPOWERS_ALDO2); // lora radio power channel
            } else if (HW_VENDOR == meshtastic_HardwareModel_LILYGO_TBEAM_S3_CORE ||
-                       HW_VENDOR == meshtastic_HardwareModel_T_WATCH_S3 || HW_VENDOR == meshtastic_HardwareModel_T_WATCH_ULTRA) {
+                       HW_VENDOR == meshtastic_HardwareModel_T_WATCH_S3) {
                PMU->disablePowerOutput(XPOWERS_ALDO3); // lora radio power channel
            }
        } else if (model == XPOWERS_AXP192) {
--- a/variants/esp32/chatter2/platformio.ini
+++ b/variants/esp32/chatter2/platformio.ini
@@ -6,6 +6,8 @@ build_flags =
  ${esp32_base.build_flags}
  -D CHATTER_2
  -I variants/esp32/chatter2
+  -DMESHTASTIC_EXCLUDE_WEBSERVER=1
+  -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
  
 lib_deps =
  ${esp32_base.lib_deps}
--- a/variants/esp32/esp32-common.ini
+++ b/variants/esp32/esp32-common.ini
@@ -59,7 +59,7 @@ lib_deps =
  ${environmental_extra.lib_deps}
  ${radiolib_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-esp32_https_server packageName=https://github.com/meshtastic/esp32_https_server gitBranch=master
-  https://github.com/meshtastic/esp32_https_server/archive/3223704846752e6d545139204837bdb2a55459ca.zip
+  https://github.com/meshtastic/esp32_https_server/archive/b0f3960b3e8444563280656d88e22b5899481884.zip
  # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
  h2zero/NimBLE-Arduino@^1.4.3
  # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
--- a/variants/esp32/esp32.ini
+++ b/variants/esp32/esp32.ini
@@ -17,7 +17,7 @@ lib_deps =
  ${environmental_extra_no_bsec.lib_deps}
  ${radiolib_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-esp32_https_server packageName=https://github.com/meshtastic/esp32_https_server gitBranch=master
-  https://github.com/meshtastic/esp32_https_server/archive/3223704846752e6d545139204837bdb2a55459ca.zip
+  https://github.com/meshtastic/esp32_https_server/archive/b0f3960b3e8444563280656d88e22b5899481884.zip
  # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
  h2zero/NimBLE-Arduino@^1.4.3
  # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
--- a/variants/esp32/m5stack_core/platformio.ini
+++ b/variants/esp32/m5stack_core/platformio.ini
@@ -16,6 +16,8 @@ build_flags =
  ${esp32_base.build_flags}
  -I variants/esp32/m5stack_core
  -DM5STACK
+  -DMESHTASTIC_EXCLUDE_WEBSERVER=1
+  -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
  -DUSER_SETUP_LOADED
  -DTFT_SDA_READ
  -DTFT_DRIVER=0x9341
--- a/variants/esp32s3/t-deck-pro/variant.h
+++ b/variants/esp32s3/t-deck-pro/variant.h
@@ -30,7 +30,6 @@

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

 // Have SPI interface SD card slot
 #define HAS_SDCARD
--- a/variants/esp32s3/t-watch-ultra/pins_arduino.h
+++ b/variants/esp32s3/t-watch-ultra/pins_arduino.h
@@ -1,94 +0,0 @@
-#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 */
--- a/variants/esp32s3/t-watch-ultra/platformio.ini
+++ b/variants/esp32s3/t-watch-ultra/platformio.ini
@@ -1,63 +0,0 @@
-; LilyGo T-Watch S3
-[env:t-watch-ultra]
-extends = esp32s3_base
-board = t-watch-ultra
-board_check = true
-board_build.partitions = default_16MB.csv
-upload_protocol = esptool
-
-build_flags = ${esp32_base.build_flags} -Ivariants/esp32s3/t-watch-ultra
-  -D T_WATCH_ULTRA
-  -D RADIOLIB_EXCLUDE_SX128X=1
-  -D RADIOLIB_EXCLUDE_SX127X=1
-  -D RADIOLIB_EXCLUDE_LR11X0=1
-;  -D HAS_SDCARD
-  -D SDCARD_CS=21
-;  -DHAS_BMA423=1
-
-lib_deps = ${esp32s3_base.lib_deps}
-  https://github.com/lovyan03/LovyanGFX/archive/a914f993a2c80b334e1d25b2881b3d7a09865155.zip ; PR814
-  adafruit/Adafruit DRV2605 Library@^1.2.4
-  earlephilhower/ESP8266Audio@^1.9.9
-  earlephilhower/ESP8266SAM@^1.0.1
-  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}
--- a/variants/esp32s3/t-watch-ultra/variant.h
+++ b/variants/esp32s3/t-watch-ultra/variant.h
@@ -1,90 +0,0 @@
-
-// 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_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 0 // TODO
-
-#define HAS_AXP2101
-// #define PMU_IRQ 7
-#define HAS_DRV2605 1
-
-#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
-
-// SPI interface SD card slot
-#define SPI_MOSI MOSI
-#define SPI_SCK SCK
-#define SPI_MISO MISO
-#define SPI_CS 21
-#define SD_SPI_FREQUENCY 75000000U
-
-#define USE_SX1262
-// #define USE_SX1280
-
-#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
--- a/variants/esp32s3/tlora-pager/variant.h
+++ b/variants/esp32s3/tlora-pager/variant.h
@@ -71,9 +71,6 @@
 #define DAC_I2S_DIN 17
 #define DAC_I2S_MCLK 10

-// haptic driver
-#define HAS_DRV2605 1
-
 // gyroscope BHI260AP
 #define HAS_BHI260AP
Author	SHA1	Message	Date
renovate[bot]	e95c6077cd	chore(deps): update meshtastic-esp32_https_server digest to b0f3960	2026-01-22 04:30:58 +00:00
renovate[bot]	3e3299f549	Update meshtastic/device-ui digest to 613c095 (#9383 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-01-22 09:07:23 +11:00
Ben Meadors	fb3bf783dd	Implement graduated scaling for NodeInfo send timeout based on active mesh size (#9364 ) * Implement graduated scaling for NodeInfo send timeout based on active mesh size * Shorter timeout still needed for pubkey unkown and ad-hoc send * Update src/modules/NodeInfoModule.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2026-01-19 20:00:41 -06:00
Ben Meadors	fc268d43d0	Add Meshtastic exclusion flags for webserver and paxcounter in platformio.ini	2026-01-19 16:57:21 -06:00
Jonathan Bennett	c38aff7e52	Add interrupt for external charge detection (#9332 ) Tested on Thinknode m4, m6, and T1000-e	2026-01-19 15:39:24 -06:00