define BUTTON_PIN

HAS_GPS
Merge branch 'develop' into t-watch-s3-plus
2026-01-14 05:47:23 +00:00 · 2026-01-09 18:57:57 +01:00 · 2026-01-09 18:55:32 +01:00 · 2026-01-09 18:21:28 +01:00 · 2026-01-09 18:19:15 +01:00 · 2026-01-09 11:30:49 -05:00
9 changed files with 34 additions and 37 deletions
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -9,14 +9,14 @@ plugins:
 lint:
  enabled:
    - checkov@3.2.497
-    - renovate@42.74.2
+    - renovate@42.75.0
    - prettier@3.7.4
    - trufflehog@3.92.4
    - yamllint@1.37.1
    - bandit@1.9.2
    - trivy@0.68.2
    - taplo@0.10.0
-    - ruff@0.14.10
+    - ruff@0.14.11
    - isort@7.0.0
    - markdownlint@0.47.0
    - oxipng@10.0.0
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -1149,11 +1149,11 @@ bool Power::axpChipInit()
            PMU->setPowerChannelVoltage(XPOWERS_ALDO1, 3300);
            PMU->enablePowerOutput(XPOWERS_ALDO1);

-            // sdcard power channel
+            // sdcard (T-Beam S3) / gnns (T-Watch S3 Plus) power channel
            PMU->setPowerChannelVoltage(XPOWERS_BLDO1, 3300);
+#ifndef T_WATCH_S3
            PMU->enablePowerOutput(XPOWERS_BLDO1);
-
-#ifdef T_WATCH_S3
+#else
            // DRV2605 power channel
            PMU->setPowerChannelVoltage(XPOWERS_BLDO2, 3300);
            PMU->enablePowerOutput(XPOWERS_BLDO2);
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -934,8 +934,11 @@ void GPS::setPowerPMU(bool on)
            // t-beam v1.2 GNSS power channel
            on ? PMU->enablePowerOutput(XPOWERS_ALDO3) : PMU->disablePowerOutput(XPOWERS_ALDO3);
        } else if (HW_VENDOR == meshtastic_HardwareModel_LILYGO_TBEAM_S3_CORE) {
-            // t-beam-s3-core GNSS  power channel
+            // t-beam-s3-core GNSS power channel
            on ? PMU->enablePowerOutput(XPOWERS_ALDO4) : PMU->disablePowerOutput(XPOWERS_ALDO4);
+        } 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) {
        // t-beam v1.1 GNSS  power channel
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -312,6 +312,7 @@ Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_O

    // Only validate the combined value once
    if (rawRGB > 0 && rawRGB <= 255255255) {
+        LOG_INFO("Setting screen RGB color to user chosen: 0x%06X", rawRGB);
        // Extract each component as a normal int first
        int r = (rawRGB >> 16) & 0xFF;
        int g = (rawRGB >> 8) & 0xFF;
@@ -319,6 +320,16 @@ Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_O
        if (r >= 0 && r <= 255 && g >= 0 && g <= 255 && b >= 0 && b <= 255) {
            TFT_MESH = COLOR565(static_cast<uint8_t>(r), static_cast<uint8_t>(g), static_cast<uint8_t>(b));
        }
+#ifdef TFT_MESH_OVERRIDE
+    } else if (rawRGB == 0) {
+        LOG_INFO("Setting screen RGB color to TFT_MESH_OVERRIDE: 0x%04X", TFT_MESH_OVERRIDE);
+        // Default to TFT_MESH_OVERRIDE if available
+        TFT_MESH = TFT_MESH_OVERRIDE;
+#endif
+    } else {
+        // Default best readable yellow color
+        LOG_INFO("Setting screen RGB color to default: (255,255,128)");
+        TFT_MESH = COLOR565(255, 255, 128);
    }

 #if defined(USE_SH1106) || defined(USE_SH1107) || defined(USE_SH1107_128_64)
--- a/src/graphics/draw/MenuHandler.cpp
+++ b/src/graphics/draw/MenuHandler.cpp
@@ -1840,7 +1840,7 @@ void menuHandler::TFTColorPickerMenu(OLEDDisplay *display)
    static const ScreenColorOption colorOptions[] = {
        {"Back", OptionsAction::Back},
        {"Default", OptionsAction::Select, ScreenColor(0, 0, 0, true)},
-        {"Meshtastic Green", OptionsAction::Select, ScreenColor(103, 234, 148)},
+        {"Meshtastic Green", OptionsAction::Select, ScreenColor(0x67, 0xEA, 0x94)},
        {"Yellow", OptionsAction::Select, ScreenColor(255, 255, 128)},
        {"Red", OptionsAction::Select, ScreenColor(255, 64, 64)},
        {"Orange", OptionsAction::Select, ScreenColor(255, 160, 20)},
@@ -1890,7 +1890,7 @@ void menuHandler::TFTColorPickerMenu(OLEDDisplay *display)
 #ifdef TFT_MESH_OVERRIDE
                TFT_MESH = TFT_MESH_OVERRIDE;
 #else
-                TFT_MESH = COLOR565(0x67, 0xEA, 0x94);
+                TFT_MESH = COLOR565(255, 255, 128);
 #endif
            } else {
                TFT_MESH = COLOR565(r, g, b);
--- a/src/mesh/Default.h
+++ b/src/mesh/Default.h
@@ -13,10 +13,7 @@
 #define min_default_telemetry_interval_secs 30 * 60
 #define default_gps_update_interval IF_ROUTER(ONE_DAY, 2 * 60)
 #define default_telemetry_broadcast_interval_secs IF_ROUTER(ONE_DAY / 2, 60 * 60)
-#define default_broadcast_interval_secs IF_ROUTER(ONE_DAY / 2, 60 * 60)
-#define default_broadcast_smart_minimum_interval_secs 5 * 60
-#define min_default_broadcast_interval_secs 60 * 60
-#define min_default_broadcast_smart_minimum_interval_secs 5 * 60
+#define default_broadcast_interval_secs IF_ROUTER(ONE_DAY / 2, 15 * 60)
 #define default_wait_bluetooth_secs IF_ROUTER(1, 60)
 #define default_sds_secs IF_ROUTER(ONE_DAY, UINT32_MAX) // Default to forever super deep sleep
 #define default_ls_secs IF_ROUTER(ONE_DAY, 5 * 60)
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -335,23 +335,6 @@ NodeDB::NodeDB()
        moduleConfig.telemetry.health_update_interval = Default::getConfiguredOrMinimumValue(
            moduleConfig.telemetry.health_update_interval, min_default_telemetry_interval_secs);
    }
-    // Enforce position broadcast minimums if we would send positions over a default channel
-    // Check channels the same way PositionModule::sendOurPosition() does - first channel with position_precision set
-    bool positionUsesDefaultChannel = false;
-    for (uint8_t i = 0; i < channels.getNumChannels(); i++) {
-        if (channels.getByIndex(i).settings.has_module_settings &&
-            channels.getByIndex(i).settings.module_settings.position_precision != 0) {
-            positionUsesDefaultChannel = channels.isDefaultChannel(i);
-            break;
-        }
-    }
-    if (positionUsesDefaultChannel) {
-        LOG_DEBUG("Coerce position broadcasts to min of 1 hour and smart broadcast min of 5 minutes on defaults");
-        config.position.position_broadcast_secs =
-            Default::getConfiguredOrMinimumValue(config.position.position_broadcast_secs, min_default_broadcast_interval_secs);
-        config.position.broadcast_smart_minimum_interval_secs = Default::getConfiguredOrMinimumValue(
-            config.position.broadcast_smart_minimum_interval_secs, min_default_broadcast_smart_minimum_interval_secs);
-    }
    // FIXME: UINT32_MAX intervals overflows Apple clients until they are fully patched
    if (config.device.node_info_broadcast_secs > MAX_INTERVAL)
        config.device.node_info_broadcast_secs = MAX_INTERVAL;
@@ -661,7 +644,7 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
    config.position.position_broadcast_smart_enabled = true;
 #endif
    config.position.broadcast_smart_minimum_distance = 100;
-    config.position.broadcast_smart_minimum_interval_secs = default_broadcast_smart_minimum_interval_secs;
+    config.position.broadcast_smart_minimum_interval_secs = 30;
    if (config.device.role != meshtastic_Config_DeviceConfig_Role_ROUTER)
        config.device.node_info_broadcast_secs = default_node_info_broadcast_secs;
    config.security.serial_enabled = true;
--- a/src/modules/PositionModule.h
+++ b/src/modules/PositionModule.h
@@ -69,11 +69,10 @@ class PositionModule : public ProtobufModule<meshtastic_Position>, private concu
    // In event mode we want to prevent excessive position broadcasts
    // we set the minimum interval to 5m
    const uint32_t minimumTimeThreshold =
-        max(uint32_t(300000), Default::getConfiguredOrDefaultMs(config.position.broadcast_smart_minimum_interval_secs,
-                                                                default_broadcast_smart_minimum_interval_secs));
+        max(uint32_t(300000), Default::getConfiguredOrDefaultMs(config.position.broadcast_smart_minimum_interval_secs, 30));
 #else
-    const uint32_t minimumTimeThreshold = Default::getConfiguredOrDefaultMs(config.position.broadcast_smart_minimum_interval_secs,
-                                                                            default_broadcast_smart_minimum_interval_secs);
+    const uint32_t minimumTimeThreshold =
+        Default::getConfiguredOrDefaultMs(config.position.broadcast_smart_minimum_interval_secs, 30);
 #endif
 };

--- a/variants/esp32s3/t-watch-s3/variant.h
+++ b/variants/esp32s3/t-watch-s3/variant.h
@@ -53,9 +53,13 @@
 #define HAS_BMA423 1
 #define BMA4XX_INT 14 // Interrupt for BMA_423 axis sensor

-#define HAS_GPS 0
-#undef GPS_RX_PIN
-#undef GPS_TX_PIN
+#define HAS_GPS 1
+#define GPS_DEFAULT_NOT_PRESENT 1
+#define GPS_BAUDRATE 38400
+#define GPS_RX_PIN 42
+#define GPS_TX_PIN 41
+
+#define BUTTON_PIN 0 // only for Plus version

 #define USE_SX1262
 #define USE_SX1268
Author	SHA1	Message	Date
mverch67	1f665d86d5	define BUTTON_PIN	2026-01-09 18:57:57 +01:00
mverch67	8556279c3a	HAS_GPS	2026-01-09 18:55:32 +01:00
Manuel	da32fe6a98	Merge branch 'develop' into t-watch-s3-plus	2026-01-09 18:21:28 +01:00
mverch67	49d0abe0f8	support T-Watch S3 Plus GPS	2026-01-09 18:19:15 +01:00
Jason P	925381ef7b	Fix TFT_MESH settings across setting and recalling (#9234 ) * Fix TFT_MESH settings across setting and recalling * Fix a word in documentation * Update src/graphics/Screen.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/graphics/Screen.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2026-01-09 11:30:49 -05:00
github-actions[bot]	6b8e5e9d7b	Upgrade trunk (#9229 ) Co-authored-by: vidplace7 <1779290+vidplace7@users.noreply.github.com>	2026-01-09 05:41:19 -06:00