Merge branch 'master' into t-deck-pro

2025-07-30 02:15:41 +00:00 · 2025-07-21 13:12:05 +02:00 · 2025-07-21 13:12:05 +02:00 · b5706a82e4
commit b5706a82e4
parent 335c0164cb 19dc2873c5
307 changed files with 1190 additions and 542 deletions
--- a/.github/workflows/daily_packaging.yml
+++ b/.github/workflows/daily_packaging.yml
@ -30,7 +30,11 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        series: [plucky, noble, jammy]
+        series:
+          - jammy # 22.04
+          - noble # 24.04
+          - plucky # 25.04
+          - questing # 25.10
    uses: ./.github/workflows/package_ppa.yml
    with:
      ppa_repo: ppa:meshtastic/daily
--- a/.github/workflows/pr_enforce_labels.yml
+++ b/.github/workflows/pr_enforce_labels.yml
@ -0,0 +1,24 @@
+name: Check PR Labels
+
+on:
+  pull_request:
+    types: [opened, edited, labeled, unlabeled, synchronize, reopened]
+
+permissions:
+  pull-requests: read
+  contents: read
+
+jobs:
+  check-label:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Check for PR labels
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const labels = context.payload.pull_request.labels.map(label => label.name);
+            const requiredLabels = ['bugfix', 'enhancement', 'hardware-support', 'dependencies', 'submodules', 'github_actions', 'trunk'];
+            const hasRequiredLabel = labels.some(label => requiredLabels.includes(label));
+            if (!hasRequiredLabel) {
+              core.setFailed(`PR must have at least one of the following labels before it can be merged: ${requiredLabels.join(', ')}.`);
+            }
--- a/.github/workflows/release_channels.yml
+++ b/.github/workflows/release_channels.yml
@ -20,7 +20,11 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        series: [plucky, noble, jammy]
+        series:
+          - jammy # 22.04
+          - noble # 24.04
+          - plucky # 25.04
+          # - questing # 25.10
    uses: ./.github/workflows/package_ppa.yml
    with:
      ppa_repo: |-
@ -99,8 +103,9 @@ jobs:
        with:
          base: ${{ github.event.repository.default_branch }}
          branch: create-pull-request/bump-version
+          labels: github_actions
          title: Bump release version
-          commit-message: automated bumps
+          commit-message: Automated version bumps
          add-paths: |
            version.properties
            debian/changelog
--- a/.github/workflows/update_protobufs.yml
+++ b/.github/workflows/update_protobufs.yml
@ -34,7 +34,9 @@ jobs:
        uses: peter-evans/create-pull-request@v7
        with:
          branch: create-pull-request/update-protobufs
+          labels: submodules
          title: Update protobufs and classes
+          commit-message: Update protobufs
          add-paths: |
            protobufs
            src/mesh
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@ -8,15 +8,15 @@ plugins:
      uri: https://github.com/trunk-io/plugins
 lint:
  enabled:
-    - checkov@3.2.450
-    - renovate@41.29.1
+    - checkov@3.2.451
+    - renovate@41.38.1
    - prettier@3.6.2
-    - trufflehog@3.89.2
+    - trufflehog@3.90.0
    - yamllint@1.37.1
    - bandit@1.8.6
    - trivy@0.64.1
    - taplo@0.9.3
-    - ruff@0.12.2
+    - ruff@0.12.4
    - isort@6.0.1
    - markdownlint@0.45.0
    - oxipng@9.1.5
--- a/arch/portduino/portduino.ini
+++ b/arch/portduino/portduino.ini
@ -39,7 +39,7 @@ build_flags =
  -Isrc/platform/portduino
  -DRADIOLIB_EEPROM_UNSUPPORTED
  -DPORTDUINO_LINUX_HARDWARE
-  -DHAS_UDP_MULTICAST
+  -DHAS_UDP_MULTICAST=1
  -lpthread
  -lstdc++fs
  -lbluetooth
--- a/arch/stm32/stm32.ini
+++ b/arch/stm32/stm32.ini
@ -23,14 +23,20 @@ build_flags =
  -DMESHTASTIC_EXCLUDE_SCREEN=1
  -DMESHTASTIC_EXCLUDE_MQTT=1
  -DMESHTASTIC_EXCLUDE_BLUETOOTH=1
-  -DMESHTASTIC_EXCLUDE_GPS=1
  -DMESHTASTIC_EXCLUDE_WIFI=1
  -DMESHTASTIC_EXCLUDE_TZ=1 ; Exclude TZ to save some flash space.
+  -DSERIAL_RX_BUFFER_SIZE=256 ; For GPS - the default of 64 is too small.
+  -DHAS_SCREEN=0 ; Always disable screen for STM32, it is not supported.
  -DPIO_FRAMEWORK_ARDUINO_NANOLIB_FLOAT_PRINTF ; This is REQUIRED for at least traceroute debug prints - without it the length ends up uninitialized.
-  ;-DDEBUG_MUTE
+  -DDEBUG_MUTE ; You can #undef DEBUG_MUTE in certain source files if you need the logs.
  -fmerge-all-constants
  -ffunction-sections
  -fdata-sections
+  -DRADIOLIB_EXCLUDE_SX128X=1
+  -DRADIOLIB_EXCLUDE_SX127X=1
+  -DRADIOLIB_EXCLUDE_LR11X0=1
+  -DHAL_DAC_MODULE_ONLY
+  -DHAL_RNG_MODULE_ENABLED

 build_src_filter =
  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/api/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mesh/eth/> -<input> -<buzz> -<modules/RemoteHardwareModule.cpp> -<platform/nrf52> -<platform/portduino> -<platform/rp2xx0> -<mesh/raspihttp>
--- a/bin/org.meshtastic.meshtasticd.metainfo.xml
+++ b/bin/org.meshtastic.meshtasticd.metainfo.xml
@ -87,6 +87,9 @@
  </screenshots>

  <releases>
+    <release version="2.7.4" date="2025-07-19">
+      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.4</url>
+    </release>
    <release version="2.7.3" date="2025-07-10">
      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.3</url>
    </release>
--- a/bin/platformio-custom.py
+++ b/bin/platformio-custom.py
@ -3,6 +3,7 @@
 # trunk-ignore-all(flake8/F821): For SConstruct imports
 import sys
 from os.path import join
+import subprocess
 import json
 import re

@ -92,6 +93,17 @@ prefsLoc = projenv["PROJECT_DIR"] + "/version.properties"
 verObj = readProps(prefsLoc)
 print("Using meshtastic platformio-custom.py, firmware version " + verObj["long"] + " on " + env.get("PIOENV"))

+# get repository owner if git is installed
+try:
+    r_owner = (
+        subprocess.check_output(["git", "config", "--get", "remote.origin.url"])
+        .decode("utf-8")
+        .strip().split("/")
+    )
+    repo_owner = r_owner[-2] + "/" + r_owner[-1].replace(".git", "")
+except subprocess.CalledProcessError:
+    repo_owner = "unknown"
+
 jsonLoc = env["PROJECT_DIR"] + "/userPrefs.jsonc"
 with open(jsonLoc) as f:
    jsonStr = re.sub("//.*","", f.read(), flags=re.MULTILINE)
@ -117,6 +129,7 @@ flags = [
        "-DAPP_VERSION=" + verObj["long"],
        "-DAPP_VERSION_SHORT=" + verObj["short"],
        "-DAPP_ENV=" + env.get("PIOENV"),
+        "-DAPP_REPO=" + repo_owner,
    ] + pref_flags

 print ("Using flags:")
--- a/debian/changelog
+++ b/debian/changelog
@ -1,4 +1,4 @@
-meshtasticd (2.7.3.0) UNRELEASED; urgency=medium
+meshtasticd (2.7.4.0) UNRELEASED; urgency=medium

  [ Austin Lane ]
  * Initial packaging
@ -31,4 +31,7 @@ meshtasticd (2.7.3.0) UNRELEASED; urgency=medium
  [ Ubuntu ]
  * GitHub Actions Automatic version bump

- -- Ubuntu <github-actions[bot]@users.noreply.github.com>  Thu, 10 Jul 2025 16:29:27 +0000
+  [  ]
+  * GitHub Actions Automatic version bump
+
+ --  <github-actions[bot]@users.noreply.github.com>  Sat, 19 Jul 2025 11:36:55 +0000
--- a/platformio.ini
+++ b/platformio.ini
@ -6,7 +6,9 @@ default_envs = tbeam

 extra_configs =
 	arch/*/*.ini
-	variants/*/platformio.ini
+	variants/*/platformio.ini ; Remove when all variants migrated to new dir structure
+	variants/*/*/platformio.ini
+	variants/*/diy/*/platformio.ini
 	src/graphics/niche/InkHUD/PlatformioConfig.ini

 description = Meshtastic
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 584f0a3a359103acf0bfce506c1b1fc32c639841
+Subproject commit 15c1fbde882de953dec279160fa984d0e00569d0
--- a/src/Power.cpp
+++ b/src/Power.cpp
@ -692,7 +692,16 @@ bool Power::setup()

 void Power::shutdown()
 {
-    LOG_INFO("Shutting Down");
+
+#if HAS_SCREEN
+    if (screen) {
+        screen->showSimpleBanner("Shutting Down...", 0); // stays on screen
+    }
+#endif
+#if !defined(ARCH_STM32WL)
+    playShutdownMelody();
+#endif
+    nodeDB->saveToDisk();

 #if defined(ARCH_NRF52) || defined(ARCH_ESP32) || defined(ARCH_RP2040)
 #ifdef PIN_LED1
@ -704,7 +713,11 @@ void Power::shutdown()
 #ifdef PIN_LED3
    ledOff(PIN_LED3);
 #endif
-    doDeepSleep(DELAY_FOREVER, false, false);
+    doDeepSleep(DELAY_FOREVER, false, true);
+#elif defined(ARCH_PORTDUINO)
+    exit(EXIT_SUCCESS);
+#else
+    LOG_WARN("FIXME implement shutdown for this platform");
 #endif
 }

--- a/src/buzz/BuzzerFeedbackThread.cpp
+++ b/src/buzz/BuzzerFeedbackThread.cpp
@ -47,10 +47,6 @@ int BuzzerFeedbackThread::handleInputEvent(const InputEvent *event)
        playComboTune(); // Ping sent feedback
        break;

-    case INPUT_BROKER_SHUTDOWN:
-        playShutdownMelody(); // Shutdown feedback
-        break;
-
    default:
        // For other events, check if it's a printable character
        if (event->kbchar >= 32 && event->kbchar <= 126) {
@ -69,10 +65,7 @@ int32_t BuzzerFeedbackThread::runOnce()
    // This thread is primarily event-driven, but we can use runOnce
    // for any periodic tasks if needed in the future

-    if (needsUpdate) {
-        needsUpdate = false;
-        // Could add any periodic processing here
-    }
+    needsUpdate = false;

    // Run every 100ms when active, less frequently when idle
    return needsUpdate ? 100 : 1000;
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@ -39,9 +39,9 @@ template <typename T, std::size_t N> std::size_t array_count(const T (&)[N])
    return N;
 }

-#if defined(NRF52840_XXAA) || defined(NRF52833_XXAA) || defined(ARCH_ESP32) || defined(ARCH_PORTDUINO)
-#if defined(RAK2560)
-HardwareSerial *GPS::_serial_gps = &Serial2;
+#if defined(NRF52840_XXAA) || defined(NRF52833_XXAA) || defined(ARCH_ESP32) || defined(ARCH_PORTDUINO) || defined(ARCH_STM32WL)
+#if defined(GPS_SERIAL_PORT)
+HardwareSerial *GPS::_serial_gps = &GPS_SERIAL_PORT;
 #else
 HardwareSerial *GPS::_serial_gps = &Serial1;
 #endif
--- a/src/gps/RTC.cpp
+++ b/src/gps/RTC.cpp
@ -226,7 +226,14 @@ RTCSetResult perhapsSetRTC(RTCQuality q, struct tm &t)
    time_t res = gm_mktime(&t);
    struct timeval tv;
    tv.tv_sec = res;
-    tv.tv_usec = 0; // time.centisecond() * (10 / 1000);
+    tv.tv_usec = 0;                      // time.centisecond() * (10 / 1000);
+    uint32_t printableEpoch = tv.tv_sec; // Print lib only supports 32 bit but time_t can be 64 bit on some platforms
+#ifdef BUILD_EPOCH
+    if (tv.tv_sec < BUILD_EPOCH) {
+        LOG_WARN("Ignore time (%ld) before build epoch (%ld)!", printableEpoch, BUILD_EPOCH);
+        return RTCSetResultInvalidTime;
+    }
+#endif

    // LOG_DEBUG("Got time from GPS month=%d, year=%d, unixtime=%ld", t.tm_mon, t.tm_year, tv.tv_sec);
    if (t.tm_year < 0 || t.tm_year >= 300) {
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@ -386,9 +386,7 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)
 #ifdef T_WATCH_S3
            PMU->enablePowerOutput(XPOWERS_ALDO2);
 #endif
-#ifdef HELTEC_TRACKER_V1_X
-            uint8_t tft_vext_enabled = digitalRead(VEXT_ENABLE);
-#endif
+
 #if !ARCH_PORTDUINO
            dispdev->displayOn();
 #endif
@ -400,10 +398,7 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)

            dispdev->displayOn();
 #ifdef HELTEC_TRACKER_V1_X
-            // If the TFT VEXT power is not enabled, initialize the UI.
-            if (!tft_vext_enabled) {
-                ui->init();
-            }
+            ui->init();
 #endif
 #ifdef USE_ST7789
            pinMode(VTFT_CTRL, OUTPUT);
@ -869,6 +864,8 @@ void Screen::setFrames(FrameFocus focus)
    uint8_t previousFrameCount = framesetInfo.frameCount;
    FramesetInfo fsi; // Location of specific frames, for applying focus parameter

+    graphics::UIRenderer::rebuildFavoritedNodes();
+
    LOG_DEBUG("Show standard frames");
    showingNormalScreen = true;

@ -1004,7 +1001,7 @@ void Screen::setFrames(FrameFocus focus)
    // Insert favorite frames *after* collecting them all
    if (!favoriteFrames.empty()) {
        fsi.positions.firstFavorite = numframes;
-        for (auto &f : favoriteFrames) {
+        for (const auto &f : favoriteFrames) {
            normalFrames[numframes++] = f;
            indicatorIcons.push_back(icon_node);
        }
@ -1379,9 +1376,12 @@ int Screen::handleInputEvent(const InputEvent *event)
                    menuHandler::clockMenu();
                } else if (this->ui->getUiState()->currentFrame == framesetInfo.positions.lora) {
                    menuHandler::LoraRegionPicker();
-                } else if (this->ui->getUiState()->currentFrame == framesetInfo.positions.textMessage &&
-                           devicestate.rx_text_message.from) {
-                    menuHandler::messageResponseMenu();
+                } else if (this->ui->getUiState()->currentFrame == framesetInfo.positions.textMessage) {
+                    if (devicestate.rx_text_message.from) {
+                        menuHandler::messageResponseMenu();
+                    } else {
+                        menuHandler::textMessageBaseMenu();
+                    }
                } else if (framesetInfo.positions.firstFavorite != 255 &&
                           this->ui->getUiState()->currentFrame >= framesetInfo.positions.firstFavorite &&
                           this->ui->getUiState()->currentFrame <= framesetInfo.positions.lastFavorite) {
--- a/src/graphics/SharedUIDisplay.cpp
+++ b/src/graphics/SharedUIDisplay.cpp
@ -206,7 +206,7 @@ void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y, const char *ti
        timeX = screenW - xOffset - timeStrWidth + 3;

        // === Show Mail or Mute Icon to the Left of Time ===
-        int iconRightEdge = timeX - 1;
+        int iconRightEdge = timeX - 2;

        bool showMail = false;

--- a/src/graphics/draw/ClockRenderer.cpp
+++ b/src/graphics/draw/ClockRenderer.cpp
@ -186,7 +186,7 @@ void drawDigitalClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int1
 {
    display->clear();
    display->setTextAlignment(TEXT_ALIGN_LEFT);
-    int line = 1;
+
    // === Set Title, Blank for Clock
    const char *titleStr = "";
    // === Header ===
@ -218,7 +218,6 @@ void drawDigitalClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int1
        hour %= 12;
        if (hour == 0)
            hour = 12;
-        bool isPM = hour >= 12;
        snprintf(timeString, sizeof(timeString), "%d:%02d", hour, minute);
    } else {
        snprintf(timeString, sizeof(timeString), "%02d:%02d", hour, minute);
@ -230,6 +229,8 @@ void drawDigitalClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int1

 #ifdef T_WATCH_S3
    float scale = 1.5;
+#elif defined(CHATTER_2)
+    float scale = 1.1;
 #else
    float scale = 0.75;
    if (isHighResolution) {
@ -285,6 +286,9 @@ void drawDigitalClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int1
    int yOffset = (isHighResolution) ? 3 : 1;
 #ifdef SENSECAP_INDICATOR
    yOffset -= 3;
+#endif
+#ifdef T_DECK
+    yOffset -= 5;
 #endif
    if (config.display.use_12h_clock) {
        display->drawString(startingHourMinuteTextX + xOffset, (display->getHeight() - hourMinuteTextY) - yOffset - 2,
@ -362,7 +366,7 @@ void drawAnalogClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
    // hour hand radius and y coordinate
    int16_t hourHandRadius = radius * 0.35;
    if (isHighResolution) {
-        int16_t hourHandRadius = radius * 0.55;
+        hourHandRadius = radius * 0.55;
    }
    int16_t hourHandNoonY = centerY - hourHandRadius;

@ -381,7 +385,7 @@ void drawAnalogClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16

        bool isPM = hour >= 12;
        if (config.display.use_12h_clock) {
-            bool isPM = hour >= 12;
+            isPM = hour >= 12;
            display->setFont(FONT_SMALL);
            int yOffset = isHighResolution ? 1 : 0;
 #ifdef USE_EINK
--- a/src/graphics/draw/DebugRenderer.cpp
+++ b/src/graphics/draw/DebugRenderer.cpp
@ -483,7 +483,7 @@ void drawLoRaFocused(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
 }

 // ****************************
-// *      Memory Screen       *
+// *      System Screen       *
 // ****************************
 void drawMemoryUsage(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
@ -593,7 +593,19 @@ void drawMemoryUsage(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
    }
    line += 1;
    char appversionstr[35];
-    snprintf(appversionstr, sizeof(appversionstr), "Ver.: %s", optstr(APP_VERSION));
+    snprintf(appversionstr, sizeof(appversionstr), "Ver: %s", optstr(APP_VERSION));
+    char appversionstr_formatted[40];
+    char *lastDot = strrchr(appversionstr, '.');
+    if (lastDot) {
+        size_t prefixLen = lastDot - appversionstr;
+        strncpy(appversionstr_formatted, appversionstr, prefixLen);
+        appversionstr_formatted[prefixLen] = '\0';
+        strncat(appversionstr_formatted, " (", sizeof(appversionstr_formatted) - strlen(appversionstr_formatted) - 1);
+        strncat(appversionstr_formatted, lastDot + 1, sizeof(appversionstr_formatted) - strlen(appversionstr_formatted) - 1);
+        strncat(appversionstr_formatted, ")", sizeof(appversionstr_formatted) - strlen(appversionstr_formatted) - 1);
+        strncpy(appversionstr, appversionstr_formatted, sizeof(appversionstr) - 1);
+        appversionstr[sizeof(appversionstr) - 1] = '\0';
+    }
    int textWidth = display->getStringWidth(appversionstr);
    int nameX = (SCREEN_WIDTH - textWidth) / 2;
    display->drawString(nameX, getTextPositions(display)[line], appversionstr);
--- a/src/graphics/draw/MenuHandler.cpp
+++ b/src/graphics/draw/MenuHandler.cpp
@ -344,14 +344,37 @@ void menuHandler::homeBaseMenu()
    screen->showOverlayBanner(bannerOptions);
 }

+void menuHandler::textMessageBaseMenu()
+{
+    enum optionsNumbers { Back, Preset, Freetext, enumEnd };
+
+    static const char *optionsArray[enumEnd] = {"Back"};
+    static int optionsEnumArray[enumEnd] = {Back};
+    int options = 1;
+    optionsArray[options] = "New Preset Msg";
+    optionsEnumArray[options++] = Preset;
+    if (kb_found) {
+        optionsArray[options] = "New Freetext Msg";
+        optionsEnumArray[options++] = Freetext;
+    }
+
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Message Action";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsEnumPtr = optionsEnumArray;
+    bannerOptions.optionsCount = options;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == Preset) {
+            cannedMessageModule->LaunchWithDestination(NODENUM_BROADCAST);
+        } else if (selected == Freetext) {
+            cannedMessageModule->LaunchFreetextWithDestination(NODENUM_BROADCAST);
+        }
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
+
 void menuHandler::systemBaseMenu()
 {
-    // Check if brightness is supported
-    bool hasSupportBrightness = false;
-#if defined(ST7789_CS) || defined(USE_OLED) || defined(USE_SSD1306) || defined(USE_SH1106) || defined(USE_SH1107) || HAS_TFT
-    hasSupportBrightness = true;
-#endif
-
    enum optionsNumbers { Back, Notifications, ScreenOptions, PowerMenu, Test, enumEnd };
    static const char *optionsArray[enumEnd] = {"Back"};
    static int optionsEnumArray[enumEnd] = {Back};
@ -421,11 +444,11 @@ void menuHandler::favoriteBaseMenu()
    bannerOptions.optionsEnumPtr = optionsEnumArray;
    bannerOptions.optionsCount = options;
    bannerOptions.bannerCallback = [](int selected) -> void {
-        if (selected == 1) {
+        if (selected == Preset) {
            cannedMessageModule->LaunchWithDestination(graphics::UIRenderer::currentFavoriteNodeNum);
-        } else if (selected == 2 && kb_found) {
+        } else if (selected == Freetext) {
            cannedMessageModule->LaunchFreetextWithDestination(graphics::UIRenderer::currentFavoriteNodeNum);
-        } else if ((!kb_found && selected == 2) || (selected == 3 && kb_found)) {
+        } else if (selected == Remove) {
            menuHandler::menuQueue = menuHandler::remove_favorite;
            screen->runNow();
        }
@ -678,6 +701,7 @@ void menuHandler::TFTColorPickerMenu(OLEDDisplay *display)
    bannerOptions.optionsArrayPtr = optionsArray;
    bannerOptions.optionsCount = 10;
    bannerOptions.bannerCallback = [display](int selected) -> void {
+#if defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190) || defined(T_DECK) || HAS_TFT
        uint8_t TFT_MESH_r = 0;
        uint8_t TFT_MESH_g = 0;
        uint8_t TFT_MESH_b = 0;
@ -729,7 +753,6 @@ void menuHandler::TFTColorPickerMenu(OLEDDisplay *display)
            screen->runNow();
        }

-#if defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190) || HAS_TFT
        if (selected != 0) {
            display->setColor(BLACK);
            display->fillRect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
@ -792,9 +815,8 @@ void menuHandler::shutdownMenu()
    bannerOptions.optionsCount = 2;
    bannerOptions.bannerCallback = [](int selected) -> void {
        if (selected == 1) {
-            IF_SCREEN(screen->showSimpleBanner("Shutting Down...", 0));
-            nodeDB->saveToDisk();
-            power->shutdown();
+            InputEvent event = {.inputEvent = (input_broker_event)INPUT_BROKER_SHUTDOWN, .kbchar = 0, .touchX = 0, .touchY = 0};
+            inputBroker->injectInputEvent(&event);
        } else {
            menuQueue = power_menu;
            screen->runNow();
@ -827,8 +849,9 @@ void menuHandler::removeFavoriteMenu()
    bannerOptions.optionsCount = 2;
    bannerOptions.bannerCallback = [](int selected) -> void {
        if (selected == 1) {
+            LOG_INFO("Removing %x as favorite node", graphics::UIRenderer::currentFavoriteNodeNum);
            nodeDB->set_favorite(false, graphics::UIRenderer::currentFavoriteNodeNum);
-            screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
+            screen->setFrames(graphics::Screen::FOCUS_DEFAULT);
        }
    };
    screen->showOverlayBanner(bannerOptions);
@ -924,23 +947,28 @@ void menuHandler::screenOptionsMenu()
 {
    // Check if brightness is supported
    bool hasSupportBrightness = false;
-#if defined(ST7789_CS) || defined(USE_OLED) || defined(USE_SSD1306) || defined(USE_SH1106) || defined(USE_SH1107) || HAS_TFT
+#if defined(ST7789_CS) || defined(USE_OLED) || defined(USE_SSD1306) || defined(USE_SH1106) || defined(USE_SH1107)
    hasSupportBrightness = true;
 #endif

+#if defined(T_DECK)
+    // TDeck Doesn't seem to support brightness at all, at least not reliably
+    hasSupportBrightness = false;
+#endif
+
    enum optionsNumbers { Back, Brightness, ScreenColor };
    static const char *optionsArray[4] = {"Back"};
    static int optionsEnumArray[4] = {Back};
    int options = 1;

    // Only show brightness for B&W displays
-    if (hasSupportBrightness && !HAS_TFT) {
+    if (hasSupportBrightness) {
        optionsArray[options] = "Brightness";
        optionsEnumArray[options++] = Brightness;
    }

    // Only show screen color for TFT displays
-#if defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190) || HAS_TFT
+#if defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190) || defined(T_DECK) || HAS_TFT
    optionsArray[options] = "Screen Color";
    optionsEnumArray[options++] = ScreenColor;
 #endif
--- a/src/graphics/draw/MenuHandler.h
+++ b/src/graphics/draw/MenuHandler.h
@ -48,6 +48,7 @@ class menuHandler
    static void ClockFacePicker();
    static void messageResponseMenu();
    static void homeBaseMenu();
+    static void textMessageBaseMenu();
    static void systemBaseMenu();
    static void favoriteBaseMenu();
    static void positionBaseMenu();
--- a/src/graphics/draw/NotificationRenderer.cpp
+++ b/src/graphics/draw/NotificationRenderer.cpp
@ -156,7 +156,7 @@ void NotificationRenderer::drawNumberPicker(OLEDDisplay *display, OLEDDisplayUiS
        resetBanner();
        return;
    }
-    if (curSelected == numDigits) {
+    if (curSelected == static_cast<int8_t>(numDigits)) {
        alertBannerCallback(currentNumber);
        resetBanner();
        return;
--- a/src/graphics/draw/UIRenderer.cpp
+++ b/src/graphics/draw/UIRenderer.cpp
@ -24,6 +24,23 @@ extern graphics::Screen *screen;
 namespace graphics
 {
 NodeNum UIRenderer::currentFavoriteNodeNum = 0;
+std::vector<meshtastic_NodeInfoLite *> graphics::UIRenderer::favoritedNodes;
+
+void graphics::UIRenderer::rebuildFavoritedNodes()
+{
+    favoritedNodes.clear();
+    size_t total = nodeDB->getNumMeshNodes();
+    for (size_t i = 0; i < total; i++) {
+        meshtastic_NodeInfoLite *n = nodeDB->getMeshNodeByIndex(i);
+        if (!n || n->num == nodeDB->getNodeNum())
+            continue;
+        if (n->is_favorite)
+            favoritedNodes.push_back(n);
+    }
+
+    std::sort(favoritedNodes.begin(), favoritedNodes.end(),
+              [](const meshtastic_NodeInfoLite *a, const meshtastic_NodeInfoLite *b) { return a->num < b->num; });
+}

 #if !MESHTASTIC_EXCLUDE_GPS
 // GeoCoord object for coordinate conversions
@ -201,27 +218,7 @@ void UIRenderer::drawNodes(OLEDDisplay *display, int16_t x, int16_t y, const mes
 // **********************
 void UIRenderer::drawNodeInfo(OLEDDisplay *display, const OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
-    // --- Cache favorite nodes for the current frame only, to save computation ---
-    static std::vector<meshtastic_NodeInfoLite *> favoritedNodes;
-    static int prevFrame = -1;

-    // --- Only rebuild favorites list if we're on a new frame ---
-    if (state->currentFrame != prevFrame) {
-        prevFrame = state->currentFrame;
-        favoritedNodes.clear();
-        size_t total = nodeDB->getNumMeshNodes();
-        for (size_t i = 0; i < total; i++) {
-            meshtastic_NodeInfoLite *n = nodeDB->getMeshNodeByIndex(i);
-            // Skip nulls and ourself
-            if (!n || n->num == nodeDB->getNodeNum())
-                continue;
-            if (n->is_favorite)
-                favoritedNodes.push_back(n);
-        }
-        // Keep a stable, consistent display order
-        std::sort(favoritedNodes.begin(), favoritedNodes.end(),
-                  [](const meshtastic_NodeInfoLite *a, const meshtastic_NodeInfoLite *b) { return a->num < b->num; });
-    }
    if (favoritedNodes.empty())
        return;

@ -657,7 +654,7 @@ void UIRenderer::drawDeviceFocused(OLEDDisplay *display, OLEDDisplayUiState *sta

    char combinedName[50];
    snprintf(combinedName, sizeof(combinedName), "%s (%s)", longNameStr.empty() ? "" : longNameStr.c_str(), shortnameble);
-    if (SCREEN_WIDTH - (display->getStringWidth(longName) + display->getStringWidth(shortnameble)) > 10) {
+    if (SCREEN_WIDTH - (display->getStringWidth(combinedName)) > 10) {
        size_t len = strlen(combinedName);
        if (len >= 3 && strcmp(combinedName + len - 3, " ()") == 0) {
            combinedName[len - 3] = '\0'; // Remove the last three characters
@ -668,7 +665,7 @@ void UIRenderer::drawDeviceFocused(OLEDDisplay *display, OLEDDisplayUiState *sta
            nameX, ((rows == 4) ? getTextPositions(display)[line++] : getTextPositions(display)[line++]) + yOffset, combinedName);
    } else {
        // === LongName Centered ===
-        textWidth = display->getStringWidth(longName);
+        textWidth = display->getStringWidth(longNameStr.c_str());
        nameX = (SCREEN_WIDTH - textWidth) / 2;
        display->drawString(nameX, getTextPositions(display)[line++], longNameStr.c_str());

--- a/src/graphics/draw/UIRenderer.h
+++ b/src/graphics/draw/UIRenderer.h
@ -61,6 +61,8 @@ class UIRenderer
    static void drawCompassAndLocationScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);

    static NodeNum currentFavoriteNodeNum;
+    static std::vector<meshtastic_NodeInfoLite *> favoritedNodes;
+    static void rebuildFavoritedNodes();

 // OEM screens
 #ifdef USERPREFS_OEM_TEXT
--- a/src/input/ButtonThread.cpp
+++ b/src/input/ButtonThread.cpp
@ -53,23 +53,21 @@ bool ButtonThread::initButton(const ButtonConfig &config)
        },
        this);

-    if (config.longPress != INPUT_BROKER_NONE) {
-        _longPress = config.longPress;
-        userButton.attachLongPressStart(
-            [](void *callerThread) -> void {
-                ButtonThread *thread = (ButtonThread *)callerThread;
-                // if (millis() > 30000) // hold off 30s after boot
-                thread->btnEvent = BUTTON_EVENT_LONG_PRESSED;
-            },
-            this);
-        userButton.attachLongPressStop(
-            [](void *callerThread) -> void {
-                ButtonThread *thread = (ButtonThread *)callerThread;
-                // if (millis() > 30000) // hold off 30s after boot
-                thread->btnEvent = BUTTON_EVENT_LONG_RELEASED;
-            },
-            this);
-    }
+    _longPress = config.longPress;
+    userButton.attachLongPressStart(
+        [](void *callerThread) -> void {
+            ButtonThread *thread = (ButtonThread *)callerThread;
+            // if (millis() > 30000) // hold off 30s after boot
+            thread->btnEvent = BUTTON_EVENT_LONG_PRESSED;
+        },
+        this);
+    userButton.attachLongPressStop(
+        [](void *callerThread) -> void {
+            ButtonThread *thread = (ButtonThread *)callerThread;
+            // if (millis() > 30000) // hold off 30s after boot
+            thread->btnEvent = BUTTON_EVENT_LONG_RELEASED;
+        },
+        this);

    if (config.doublePress != INPUT_BROKER_NONE) {
        _doublePress = config.doublePress;
@ -202,11 +200,11 @@ int32_t ButtonThread::runOnce()

                break;
            }
-
-            // Forward long press to InputBroker (but NOT as DOWN/SELECT, just forward a "button long press" event)
-            evt.inputEvent = _longPress;
-            this->notifyObservers(&evt);
-
+            if (_longPress != INPUT_BROKER_NONE) {
+                // Forward long press to InputBroker (but NOT as DOWN/SELECT, just forward a "button long press" event)
+                evt.inputEvent = _longPress;
+                this->notifyObservers(&evt);
+            }
            // Reset combination tracking
            waitingForLongPress = false;

@ -253,7 +251,7 @@ int32_t ButtonThread::runOnce()
        // may wake the board immediatedly.
        case BUTTON_EVENT_LONG_RELEASED: {

-            LOG_INFO("LONG PRESS RELEASE");
+            LOG_INFO("LONG PRESS RELEASE AFTER %u MILLIS", millis() - buttonPressStartTime);
            if (millis() > 30000 && _longLongPress != INPUT_BROKER_NONE &&
                (millis() - buttonPressStartTime) >= _longLongPressTime) {
                evt.inputEvent = _longLongPress;
--- a/src/input/ButtonThread.h
+++ b/src/input/ButtonThread.h
@ -18,13 +18,13 @@ struct ButtonConfig {
    uint16_t longPressTime = 500;
    input_broker_event doublePress = INPUT_BROKER_NONE;
    input_broker_event longLongPress = INPUT_BROKER_NONE;
-    uint16_t longLongPressTime = 5000;
+    uint16_t longLongPressTime = 3900;
    input_broker_event triplePress = INPUT_BROKER_NONE;
    input_broker_event shortLong = INPUT_BROKER_NONE;
    bool touchQuirk = false;

    // Constructor to set required parameter
-    ButtonConfig(uint8_t pin = 0) : pinNumber(pin) {}
+    explicit ButtonConfig(uint8_t pin = 0) : pinNumber(pin) {}
 };

 #ifndef BUTTON_CLICK_MS
@ -62,7 +62,7 @@ class ButtonThread : public Observable<const InputEvent *>, public concurrency::
        BUTTON_EVENT_COMBO_SHORT_LONG,
    };

-    ButtonThread(const char *name);
+    explicit ButtonThread(const char *name);
    int32_t runOnce() override;
    OneButton userButton;
    void attachButtonInterrupts();
--- a/src/input/ExpressLRSFiveWay.cpp
+++ b/src/input/ExpressLRSFiveWay.cpp
@ -233,14 +233,7 @@ void ExpressLRSFiveWay::sendAdhocPing()
 // Contained as one method for easier remapping of buttons by user
 void ExpressLRSFiveWay::shutdown()
 {
-    LOG_INFO("Shutdown from long press");
-    powerFSM.trigger(EVENT_PRESS);
-    screen->startAlert("Shutting Down...");
-    // Don't set alerting = true. We don't want to auto-dismiss this alert.
-
-    playShutdownMelody(); // In case user adds a buzzer
-
-    shutdownAtMsec = millis() + 3000;
+    sendKey(INPUT_BROKER_SHUTDOWN);
 }

 void ExpressLRSFiveWay::click()
--- a/src/input/cardKbI2cImpl.cpp
+++ b/src/input/cardKbI2cImpl.cpp
@ -67,4 +67,5 @@ void CardKbI2cImpl::init()
    }
 #endif
    inputBroker->registerSource(this);
+    kb_found = true;
 }
--- a/src/main.cpp
+++ b/src/main.cpp
@ -286,7 +286,7 @@ void lateInitVariant() {}
 */
 void printInfo()
 {
-    LOG_INFO("S:B:%d,%s", HW_VENDOR, optstr(APP_VERSION));
+    LOG_INFO("S:B:%d,%s,%s,%s", HW_VENDOR, optstr(APP_VERSION), optstr(APP_ENV), optstr(APP_REPO));
 }
 #ifndef PIO_UNIT_TESTING
 void setup()
@ -524,25 +524,11 @@ void setup()
    LOG_INFO("Scan for i2c devices");
 #endif

-#if defined(I2C_SDA1) && defined(ARCH_RP2040)
-    Wire1.setSDA(I2C_SDA1);
-    Wire1.setSCL(I2C_SCL1);
-    Wire1.begin();
-    i2cScanner->scanPort(ScanI2C::I2CPort::WIRE1);
-#elif defined(I2C_SDA1) && !defined(ARCH_RP2040)
-    Wire1.begin(I2C_SDA1, I2C_SCL1);
-    i2cScanner->scanPort(ScanI2C::I2CPort::WIRE1);
-#elif defined(NRF52840_XXAA) && (WIRE_INTERFACES_COUNT == 2)
+#if defined(I2C_SDA1) || (defined(NRF52840_XXAA) && (WIRE_INTERFACES_COUNT == 2))
    i2cScanner->scanPort(ScanI2C::I2CPort::WIRE1);
 #endif

-#if defined(I2C_SDA) && defined(ARCH_RP2040)
-    Wire.setSDA(I2C_SDA);
-    Wire.setSCL(I2C_SCL);
-    Wire.begin();
-    i2cScanner->scanPort(ScanI2C::I2CPort::WIRE);
-#elif defined(I2C_SDA) && !defined(ARCH_RP2040)
-    Wire.begin(I2C_SDA, I2C_SCL);
+#if defined(I2C_SDA)
    i2cScanner->scanPort(ScanI2C::I2CPort::WIRE);
 #elif defined(ARCH_PORTDUINO)
    if (settingsStrings[i2cdev] != "") {
@ -1065,8 +1051,9 @@ void setup()
            mainDelay.interruptFromISR(&higherWake);
        };
        userConfigNoScreen.singlePress = INPUT_BROKER_USER_PRESS;
-        userConfigNoScreen.longPress = INPUT_BROKER_SHUTDOWN;
-        userConfigNoScreen.longPressTime = 5000;
+        userConfigNoScreen.longPress = INPUT_BROKER_NONE;
+        userConfigNoScreen.longPressTime = 500;
+        userConfigNoScreen.longLongPress = INPUT_BROKER_SHUTDOWN;
        userConfigNoScreen.doublePress = INPUT_BROKER_SEND_PING;
        userConfigNoScreen.triplePress = INPUT_BROKER_GPS_TOGGLE;
        UserButtonThread->initButton(userConfigNoScreen);
--- a/src/memGet.cpp
+++ b/src/memGet.cpp
@ -10,6 +10,10 @@
 #include "memGet.h"
 #include "configuration.h"

+#ifdef ARCH_STM32WL
+#include <malloc.h>
+#endif
+
 MemGet memGet;

 /**
@ -24,6 +28,9 @@ uint32_t MemGet::getFreeHeap()
    return dbgHeapFree();
 #elif defined(ARCH_RP2040)
    return rp2040.getFreeHeap();
+#elif defined(ARCH_STM32WL)
+    struct mallinfo m = mallinfo();
+    return m.fordblks; // Total free space (bytes)
 #else
    // this platform does not have heap management function implemented
    return UINT32_MAX;
@ -42,6 +49,9 @@ uint32_t MemGet::getHeapSize()
    return dbgHeapTotal();
 #elif defined(ARCH_RP2040)
    return rp2040.getTotalHeap();
+#elif defined(ARCH_STM32WL)
+    struct mallinfo m = mallinfo();
+    return m.arena; // Non-mmapped space allocated (bytes)
 #else
    // this platform does not have heap management function implemented
    return UINT32_MAX;
--- a/src/mesh/MeshPacketQueue.cpp
+++ b/src/mesh/MeshPacketQueue.cpp
@ -121,7 +121,7 @@ meshtastic_MeshPacket *MeshPacketQueue::remove(NodeNum from, PacketId id, bool t
 bool MeshPacketQueue::find(const NodeNum from, const PacketId id)
 {
    for (auto it = queue.begin(); it != queue.end(); it++) {
-        const auto p = (*it);
+        const auto *p = *it;
        if (getFrom(p) == from && p->id == id) {
            return true;
        }
--- a/src/mesh/MeshService.cpp
+++ b/src/mesh/MeshService.cpp
@ -16,6 +16,7 @@
 #include "meshUtils.h"
 #include "modules/NodeInfoModule.h"
 #include "modules/PositionModule.h"
+#include "modules/RoutingModule.h"
 #include "power.h"
 #include <assert.h>
 #include <string>
@ -333,6 +334,21 @@ void MeshService::sendMqttMessageToClientProxy(meshtastic_MqttClientProxyMessage
    fromNum++;
 }

+void MeshService::sendRoutingErrorResponse(meshtastic_Routing_Error error, const meshtastic_MeshPacket *mp)
+{
+    if (!mp) {
+        LOG_WARN("Cannot send routing error response: null packet");
+        return;
+    }
+
+    // Use the routing module to send the error response
+    if (routingModule) {
+        routingModule->sendAckNak(error, mp->from, mp->id, mp->channel);
+    } else {
+        LOG_ERROR("Cannot send routing error response: no routing module");
+    }
+}
+
 void MeshService::sendClientNotification(meshtastic_ClientNotification *n)
 {
    LOG_DEBUG("Send client notification to phone");
--- a/src/mesh/MeshService.h
+++ b/src/mesh/MeshService.h
@ -148,6 +148,9 @@ class MeshService
    /// Send a ClientNotification to the phone
    void sendClientNotification(meshtastic_ClientNotification *cn);

+    /// Send an error response to the phone
+    void sendRoutingErrorResponse(meshtastic_Routing_Error error, const meshtastic_MeshPacket *mp);
+
    bool isToPhoneQueueEmpty();

    ErrorCode sendQueueStatusToPhone(const meshtastic_QueueStatus &qs, ErrorCode res, uint32_t mesh_packet_id);
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@ -1874,7 +1874,7 @@ UserLicenseStatus NodeDB::getLicenseStatus(uint32_t nodeNum)
    return info->user.is_licensed ? UserLicenseStatus::Licensed : UserLicenseStatus::NotLicensed;
 }

-bool NodeDB::checkLowEntropyPublicKey(const meshtastic_Config_SecurityConfig_public_key_t keyToTest)
+bool NodeDB::checkLowEntropyPublicKey(const meshtastic_Config_SecurityConfig_public_key_t &keyToTest)
 {
    if (keyToTest.size == 32) {
        uint8_t keyHash[32] = {0};
--- a/src/mesh/NodeDB.h
+++ b/src/mesh/NodeDB.h
@ -279,7 +279,7 @@ class NodeDB

    bool hasValidPosition(const meshtastic_NodeInfoLite *n);

-    bool checkLowEntropyPublicKey(const meshtastic_Config_SecurityConfig_public_key_t keyToTest);
+    bool checkLowEntropyPublicKey(const meshtastic_Config_SecurityConfig_public_key_t &keyToTest);

    bool backupPreferences(meshtastic_AdminMessage_BackupLocation location);
    bool restorePreferences(meshtastic_AdminMessage_BackupLocation location,
--- a/src/mesh/PacketHistory.cpp
+++ b/src/mesh/PacketHistory.cpp
@ -181,7 +181,7 @@ PacketHistory::PacketRecord *PacketHistory::find(NodeNum sender, PacketId id)
 }

 /** Insert/Replace oldest PacketRecord in recentPackets. */
-void PacketHistory::insert(PacketRecord &r)
+void PacketHistory::insert(const PacketRecord &r)
 {
    uint32_t now_millis = millis(); // Should not jump with time changes
    uint32_t OldtrxTimeMsec = 0;
@ -308,7 +308,7 @@ bool PacketHistory::wasRelayer(const uint8_t relayer, const uint32_t id, const N
        return false;
    }

-    PacketRecord *found = find(sender, id);
+    const PacketRecord *found = find(sender, id);

    if (found == NULL) {
 #if VERBOSE_PACKET_HISTORY
@ -327,7 +327,7 @@ bool PacketHistory::wasRelayer(const uint8_t relayer, const uint32_t id, const N

 /* Check if a certain node was a relayer of a packet in the history given iterator
 * @return true if node was indeed a relayer, false if not */
-bool PacketHistory::wasRelayer(const uint8_t relayer, PacketRecord &r)
+bool PacketHistory::wasRelayer(const uint8_t relayer, const PacketRecord &r)
 {
    for (uint8_t i = 0; i < NUM_RELAYERS; i++) {
        if (r.relayed_by[i] == relayer) {
--- a/src/mesh/PacketHistory.h
+++ b/src/mesh/PacketHistory.h
@ -31,11 +31,11 @@ class PacketHistory

    /** Insert/Replace oldest PacketRecord in mx_recentPackets.
     * @param r PacketRecord to insert or replace */
-    void insert(PacketRecord &r); // Insert or replace a packet record in the history
+    void insert(const PacketRecord &r); // Insert or replace a packet record in the history

    /* Check if a certain node was a relayer of a packet in the history given iterator
     * @return true if node was indeed a relayer, false if not */
-    bool wasRelayer(const uint8_t relayer, PacketRecord &r);
+    bool wasRelayer(const uint8_t relayer, const PacketRecord &r);

    PacketHistory(const PacketHistory &);            // non construction-copyable
    PacketHistory &operator=(const PacketHistory &); // non copyable
--- a/src/mesh/PhoneAPI.cpp
+++ b/src/mesh/PhoneAPI.cpp
@ -686,7 +686,8 @@ bool PhoneAPI::handleToRadioPacket(meshtastic_MeshPacket &p)
        LOG_WARN("Rate limit portnum %d", p.decoded.portnum);
        meshtastic_QueueStatus qs = router->getQueueStatus();
        service->sendQueueStatusToPhone(qs, 0, p.id);
-        sendNotification(meshtastic_LogRecord_Level_WARNING, p.id, "Text messages can only be sent once every 2 seconds");
+        service->sendRoutingErrorResponse(meshtastic_Routing_Error_RATE_LIMIT_EXCEEDED, &p);
+        // sendNotification(meshtastic_LogRecord_Level_WARNING, p.id, "Text messages can only be sent once every 2 seconds");
        return false;
    }
    lastPortNumToRadio[p.decoded.portnum] = millis();
--- a/src/mesh/eth/ethClient.cpp
+++ b/src/mesh/eth/ethClient.cpp
@ -68,6 +68,11 @@ static int32_t reconnectETH()
                initApiServer();
            }
 #endif
+#if HAS_UDP_MULTICAST
+            if (udpHandler && config.network.enabled_protocols & meshtastic_Config_NetworkConfig_ProtocolFlags_UDP_BROADCAST) {
+                udpHandler->start();
+            }
+#endif

            ethStartupComplete = true;
        }
--- a/src/mesh/eth/ethClient.h
+++ b/src/mesh/eth/ethClient.h
@ -2,7 +2,6 @@

 #include "configuration.h"
 #include <Arduino.h>
-#include <functional>

 bool initEthernet();
 bool isEthernetAvailable();
--- a/src/mesh/generated/meshtastic/admin.pb.h
+++ b/src/mesh/generated/meshtastic/admin.pb.h
@ -7,9 +7,9 @@
 #include "meshtastic/channel.pb.h"
 #include "meshtastic/config.pb.h"
 #include "meshtastic/connection_status.pb.h"
+#include "meshtastic/device_ui.pb.h"
 #include "meshtastic/mesh.pb.h"
 #include "meshtastic/module_config.pb.h"
-#include "meshtastic/device_ui.pb.h"

 #if PB_PROTO_HEADER_VERSION != 40
 #error Regenerate this file with the current version of nanopb generator.
--- a/src/mesh/generated/meshtastic/config.pb.h
+++ b/src/mesh/generated/meshtastic/config.pb.h
@ -102,7 +102,11 @@ typedef enum _meshtastic_Config_DeviceConfig_BuzzerMode {
    meshtastic_Config_DeviceConfig_BuzzerMode_NOTIFICATIONS_ONLY = 2,
    /* Non-notification system buzzer tones only.
 Buzzer is enabled only for non-notification tones such as button presses, startup, shutdown, but not for alerts. */
-    meshtastic_Config_DeviceConfig_BuzzerMode_SYSTEM_ONLY = 3
+    meshtastic_Config_DeviceConfig_BuzzerMode_SYSTEM_ONLY = 3,
+    /* Direct Message notifications only.
+ Buzzer is enabled only for direct messages and alerts, but not for button presses.
+ External notification config determines the specifics of the notification behavior. */
+    meshtastic_Config_DeviceConfig_BuzzerMode_DIRECT_MSG_ONLY = 4
 } meshtastic_Config_DeviceConfig_BuzzerMode;

 /* Bit field of boolean configuration options, indicating which optional
@ -476,7 +480,8 @@ typedef struct _meshtastic_Config_DisplayConfig {
    /* Number of seconds the screen stays on after pressing the user button or receiving a message
 0 for default of one minute MAXUINT for always on */
    uint32_t screen_on_secs;
-    /* How the GPS coordinates are formatted on the OLED screen. */
+    /* Deprecated in 2.7.4: Unused
+ How the GPS coordinates are formatted on the OLED screen. */
    meshtastic_Config_DisplayConfig_GpsCoordinateFormat gps_format;
    /* Automatically toggles to the next page on the screen like a carousel, based the specified interval in seconds.
 Potentially useful for devices without user buttons. */
@ -645,8 +650,8 @@ extern "C" {
 #define _meshtastic_Config_DeviceConfig_RebroadcastMode_ARRAYSIZE ((meshtastic_Config_DeviceConfig_RebroadcastMode)(meshtastic_Config_DeviceConfig_RebroadcastMode_CORE_PORTNUMS_ONLY+1))

 #define _meshtastic_Config_DeviceConfig_BuzzerMode_MIN meshtastic_Config_DeviceConfig_BuzzerMode_ALL_ENABLED
-#define _meshtastic_Config_DeviceConfig_BuzzerMode_MAX meshtastic_Config_DeviceConfig_BuzzerMode_SYSTEM_ONLY
-#define _meshtastic_Config_DeviceConfig_BuzzerMode_ARRAYSIZE ((meshtastic_Config_DeviceConfig_BuzzerMode)(meshtastic_Config_DeviceConfig_BuzzerMode_SYSTEM_ONLY+1))
+#define _meshtastic_Config_DeviceConfig_BuzzerMode_MAX meshtastic_Config_DeviceConfig_BuzzerMode_DIRECT_MSG_ONLY
+#define _meshtastic_Config_DeviceConfig_BuzzerMode_ARRAYSIZE ((meshtastic_Config_DeviceConfig_BuzzerMode)(meshtastic_Config_DeviceConfig_BuzzerMode_DIRECT_MSG_ONLY+1))

 #define _meshtastic_Config_PositionConfig_PositionFlags_MIN meshtastic_Config_PositionConfig_PositionFlags_UNSET
 #define _meshtastic_Config_PositionConfig_PositionFlags_MAX meshtastic_Config_PositionConfig_PositionFlags_SPEED
--- a/src/mesh/generated/meshtastic/deviceonly.pb.h
+++ b/src/mesh/generated/meshtastic/deviceonly.pb.h
@ -6,10 +6,10 @@
 #include <pb.h>
 #include <vector>
 #include "meshtastic/channel.pb.h"
-#include "meshtastic/mesh.pb.h"
-#include "meshtastic/telemetry.pb.h"
 #include "meshtastic/config.pb.h"
 #include "meshtastic/localonly.pb.h"
+#include "meshtastic/mesh.pb.h"
+#include "meshtastic/telemetry.pb.h"

 #if PB_PROTO_HEADER_VERSION != 40
 #error Regenerate this file with the current version of nanopb generator.
--- a/src/mesh/generated/meshtastic/mesh.pb.h
+++ b/src/mesh/generated/meshtastic/mesh.pb.h
@ -6,11 +6,11 @@
 #include <pb.h>
 #include "meshtastic/channel.pb.h"
 #include "meshtastic/config.pb.h"
+#include "meshtastic/device_ui.pb.h"
 #include "meshtastic/module_config.pb.h"
 #include "meshtastic/portnums.pb.h"
 #include "meshtastic/telemetry.pb.h"
 #include "meshtastic/xmodem.pb.h"
-#include "meshtastic/device_ui.pb.h"

 #if PB_PROTO_HEADER_VERSION != 40
 #error Regenerate this file with the current version of nanopb generator.
@ -247,32 +247,26 @@ typedef enum _meshtastic_HardwareModel {
    meshtastic_HardwareModel_NOMADSTAR_METEOR_PRO = 96,
    /* Elecrow CrowPanel Advance models, ESP32-S3 and TFT with SX1262 radio plugin */
    meshtastic_HardwareModel_CROWPANEL = 97,
-    /* *
- Lilygo LINK32 board with sensors */
+    /* Lilygo LINK32 board with sensors */
    meshtastic_HardwareModel_LINK_32 = 98,
-    /* *
- Seeed Tracker L1 */
+    /* Seeed Tracker L1 */
    meshtastic_HardwareModel_SEEED_WIO_TRACKER_L1 = 99,
-    /* *
- Seeed Tracker L1 EINK driver */
+    /* Seeed Tracker L1 EINK driver */
    meshtastic_HardwareModel_SEEED_WIO_TRACKER_L1_EINK = 100,
    /* Reserved ID for future and past use */
    meshtastic_HardwareModel_QWANTZ_TINY_ARMS = 101,
-    /* *
- Lilygo T-Deck Pro */
+    /* Lilygo T-Deck Pro */
    meshtastic_HardwareModel_T_DECK_PRO = 102,
-    /* *
- Lilygo TLora Pager */
+    /* Lilygo TLora Pager */
    meshtastic_HardwareModel_T_LORA_PAGER = 103,
-    /* *
- GAT562 Mesh Trial Tracker */
+    /* GAT562 Mesh Trial Tracker */
    meshtastic_HardwareModel_GAT562_MESH_TRIAL_TRACKER = 104,
-    /* *
- RAKwireless WisMesh Tag */
+    /* RAKwireless WisMesh Tag */
    meshtastic_HardwareModel_WISMESH_TAG = 105,
-    /* *
- RAKwireless WisBlock Core RAK3312 https://docs.rakwireless.com/product-categories/wisduo/rak3112-module/overview/ */
+    /* RAKwireless WisBlock Core RAK3312 https://docs.rakwireless.com/product-categories/wisduo/rak3112-module/overview/ */
    meshtastic_HardwareModel_RAK3312 = 106,
+    /* Elecrow ThinkNode M5 https://www.elecrow.com/wiki/ThinkNode_M5_Meshtastic_LoRa_Signal_Transceiver_ESP32-S3.html */
+    meshtastic_HardwareModel_THINKNODE_M5 = 107,
    /* ------------------------------------------------------------------------------------------------------------------------------------------
 Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.
 ------------------------------------------------------------------------------------------------------------------------------------------ */
@ -432,7 +426,10 @@ typedef enum _meshtastic_Routing_Error {
    /* Admin packet otherwise checks out, but uses a bogus or expired session key */
    meshtastic_Routing_Error_ADMIN_BAD_SESSION_KEY = 36,
    /* Admin packet sent using PKC, but not from a public key on the admin key list */
-    meshtastic_Routing_Error_ADMIN_PUBLIC_KEY_UNAUTHORIZED = 37
+    meshtastic_Routing_Error_ADMIN_PUBLIC_KEY_UNAUTHORIZED = 37,
+    /* Airtime fairness rate limit exceeded for a packet
+ This typically enforced per portnum and is used to prevent a single node from monopolizing airtime */
+    meshtastic_Routing_Error_RATE_LIMIT_EXCEEDED = 38
 } meshtastic_Routing_Error;

 /* The priority of this message for sending.
@ -1228,8 +1225,8 @@ extern "C" {
 #define _meshtastic_Position_AltSource_ARRAYSIZE ((meshtastic_Position_AltSource)(meshtastic_Position_AltSource_ALT_BAROMETRIC+1))

 #define _meshtastic_Routing_Error_MIN meshtastic_Routing_Error_NONE
-#define _meshtastic_Routing_Error_MAX meshtastic_Routing_Error_ADMIN_PUBLIC_KEY_UNAUTHORIZED
-#define _meshtastic_Routing_Error_ARRAYSIZE ((meshtastic_Routing_Error)(meshtastic_Routing_Error_ADMIN_PUBLIC_KEY_UNAUTHORIZED+1))
+#define _meshtastic_Routing_Error_MAX meshtastic_Routing_Error_RATE_LIMIT_EXCEEDED
+#define _meshtastic_Routing_Error_ARRAYSIZE ((meshtastic_Routing_Error)(meshtastic_Routing_Error_RATE_LIMIT_EXCEEDED+1))

 #define _meshtastic_MeshPacket_Priority_MIN meshtastic_MeshPacket_Priority_UNSET
 #define _meshtastic_MeshPacket_Priority_MAX meshtastic_MeshPacket_Priority_MAX
--- a/src/mesh/generated/meshtastic/powermon.pb.h
+++ b/src/mesh/generated/meshtastic/powermon.pb.h
@ -11,7 +11,7 @@

 /* Enum definitions */
 /* Any significant power changing event in meshtastic should be tagged with a powermon state transition.
-If you are making new meshtastic features feel free to add new entries at the end of this definition. */
+ If you are making new meshtastic features feel free to add new entries at the end of this definition. */
 typedef enum _meshtastic_PowerMon_State {
    meshtastic_PowerMon_State_None = 0,
    meshtastic_PowerMon_State_CPU_DeepSleep = 1,
@ -34,13 +34,13 @@ something like "S:PM:C,0x00001234,REASON" where the hex number is the bitmask of
    meshtastic_PowerMon_State_Screen_Drawing = 512,
    meshtastic_PowerMon_State_Wifi_On = 1024,
    /* GPS is actively trying to find our location
-See GPSPowerState for more details */
+ See GPSPowerState for more details */
    meshtastic_PowerMon_State_GPS_Active = 2048
 } meshtastic_PowerMon_State;

 /* What operation would we like the UUT to perform.
-note: senders should probably set want_response in their request packets, so that they can know when the state
-machine has started processing their request */
+ note: senders should probably set want_response in their request packets, so that they can know when the state
+ machine has started processing their request */
 typedef enum _meshtastic_PowerStressMessage_Opcode {
    /* Unset/unused */
    meshtastic_PowerStressMessage_Opcode_UNSET = 0,
@ -67,7 +67,7 @@ typedef enum _meshtastic_PowerStressMessage_Opcode {

 /* Struct definitions */
 /* Note: There are no 'PowerMon' messages normally in use (PowerMons are sent only as structured logs - slogs).
-But we wrap our State enum in this message to effectively nest a namespace (without our linter yelling at us) */
+ But we wrap our State enum in this message to effectively nest a namespace (without our linter yelling at us) */
 typedef struct _meshtastic_PowerMon {
    char dummy_field;
 } meshtastic_PowerMon;
--- a/src/mesh/generated/meshtastic/telemetry.pb.h
+++ b/src/mesh/generated/meshtastic/telemetry.pb.h
@ -93,7 +93,11 @@ typedef enum _meshtastic_TelemetrySensorType {
    /* PCT2075 Temperature Sensor */
    meshtastic_TelemetrySensorType_PCT2075 = 39,
    /* ADS1X15 ADC */
-    meshtastic_TelemetrySensorType_ADS1X15 = 40
+    meshtastic_TelemetrySensorType_ADS1X15 = 40,
+    /* ADS1X15 ADC_ALT */
+    meshtastic_TelemetrySensorType_ADS1X15_ALT = 41,
+    /* Sensirion SFA30 Formaldehyde sensor */
+    meshtastic_TelemetrySensorType_SFA30 = 42
 } meshtastic_TelemetrySensorType;

 /* Struct definitions */
@ -287,6 +291,15 @@ typedef struct _meshtastic_AirQualityMetrics {
    /* CO2 sensor relative humidity in % */
    bool has_co2_humidity;
    float co2_humidity;
+    /* Formaldehyde sensor formaldehyde concentration in ppb */
+    bool has_form_formaldehyde;
+    float form_formaldehyde;
+    /* Formaldehyde sensor relative humidity in %RH */
+    bool has_form_humidity;
+    float form_humidity;
+    /* Formaldehyde sensor temperature in degrees Celsius */
+    bool has_form_temperature;
+    float form_temperature;
 } meshtastic_AirQualityMetrics;

 /* Local device mesh statistics */
@ -398,8 +411,8 @@ extern "C" {

 /* Helper constants for enums */
 #define _meshtastic_TelemetrySensorType_MIN meshtastic_TelemetrySensorType_SENSOR_UNSET
-#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_ADS1X15
-#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_ADS1X15+1))
+#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_SFA30
+#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_SFA30+1))



@ -415,7 +428,7 @@ extern "C" {
 #define meshtastic_DeviceMetrics_init_default    {false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_EnvironmentMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_PowerMetrics_init_default     {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
-#define meshtastic_AirQualityMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
+#define meshtastic_AirQualityMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_LocalStats_init_default       {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_HealthMetrics_init_default    {false, 0, false, 0, false, 0}
 #define meshtastic_HostMetrics_init_default      {0, 0, 0, false, 0, false, 0, 0, 0, 0, false, ""}
@ -424,7 +437,7 @@ extern "C" {
 #define meshtastic_DeviceMetrics_init_zero       {false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_EnvironmentMetrics_init_zero  {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_PowerMetrics_init_zero        {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
-#define meshtastic_AirQualityMetrics_init_zero   {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
+#define meshtastic_AirQualityMetrics_init_zero   {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_LocalStats_init_zero          {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_HealthMetrics_init_zero       {false, 0, false, 0, false, 0}
 #define meshtastic_HostMetrics_init_zero         {0, 0, 0, false, 0, false, 0, 0, 0, 0, false, ""}
@ -490,6 +503,9 @@ extern "C" {
 #define meshtastic_AirQualityMetrics_co2_tag     13
 #define meshtastic_AirQualityMetrics_co2_temperature_tag 14
 #define meshtastic_AirQualityMetrics_co2_humidity_tag 15
+#define meshtastic_AirQualityMetrics_form_formaldehyde_tag 16
+#define meshtastic_AirQualityMetrics_form_humidity_tag 17
+#define meshtastic_AirQualityMetrics_form_temperature_tag 18
 #define meshtastic_LocalStats_uptime_seconds_tag 1
 #define meshtastic_LocalStats_channel_utilization_tag 2
 #define meshtastic_LocalStats_air_util_tx_tag    3
@ -597,7 +613,10 @@ X(a, STATIC,   OPTIONAL, UINT32,   particles_50um,   11) \
 X(a, STATIC,   OPTIONAL, UINT32,   particles_100um,  12) \
 X(a, STATIC,   OPTIONAL, UINT32,   co2,              13) \
 X(a, STATIC,   OPTIONAL, FLOAT,    co2_temperature,  14) \
-X(a, STATIC,   OPTIONAL, FLOAT,    co2_humidity,     15)
+X(a, STATIC,   OPTIONAL, FLOAT,    co2_humidity,     15) \
+X(a, STATIC,   OPTIONAL, FLOAT,    form_formaldehyde,  16) \
+X(a, STATIC,   OPTIONAL, FLOAT,    form_humidity,    17) \
+X(a, STATIC,   OPTIONAL, FLOAT,    form_temperature,  18)
 #define meshtastic_AirQualityMetrics_CALLBACK NULL
 #define meshtastic_AirQualityMetrics_DEFAULT NULL

@ -686,7 +705,7 @@ extern const pb_msgdesc_t meshtastic_Nau7802Config_msg;

 /* Maximum encoded size of messages (where known) */
 #define MESHTASTIC_MESHTASTIC_TELEMETRY_PB_H_MAX_SIZE meshtastic_Telemetry_size
-#define meshtastic_AirQualityMetrics_size        88
+#define meshtastic_AirQualityMetrics_size        106
 #define meshtastic_DeviceMetrics_size            27
 #define meshtastic_EnvironmentMetrics_size       113
 #define meshtastic_HealthMetrics_size            11
--- a/src/mesh/udp/UdpMulticastHandler.h
+++ b/src/mesh/udp/UdpMulticastHandler.h
@ -4,8 +4,13 @@
 #include "main.h"
 #include "mesh/Router.h"

-#include <AsyncUDP.h>
+#if HAS_ETHERNET && defined(ARCH_NRF52)
+#include "mesh/eth/ethClient.h"
+#else
 #include <WiFi.h>
+#endif
+
+#include <AsyncUDP.h>

 #if HAS_ETHERNET && defined(USE_WS5500)
 #include <ETHClass2.h>
@ -22,11 +27,11 @@ class UdpMulticastHandler final
    void start()
    {
        if (udp.listenMulticast(udpIpAddress, UDP_MULTICAST_DEFAUL_PORT, 64)) {
-#ifndef ARCH_PORTDUINO
-            // FIXME(PORTDUINO): arduino lacks IPAddress::toString()
-            LOG_DEBUG("UDP Listening on IP: %s", WiFi.localIP().toString().c_str());
+#if defined(ARCH_NRF52) || defined(ARCH_PORTDUINO)
+            LOG_DEBUG("UDP Listening on IP: %u.%u.%u.%u:%u", udpIpAddress[0], udpIpAddress[1], udpIpAddress[2], udpIpAddress[3],
+                      UDP_MULTICAST_DEFAUL_PORT);
 #else
-            LOG_DEBUG("UDP Listening");
+            LOG_DEBUG("UDP Listening on IP: %s", WiFi.localIP().toString().c_str());
 #endif
            udp.onPacket([this](AsyncUDPPacket packet) { onReceive(packet); });
        } else {
@ -37,7 +42,10 @@ class UdpMulticastHandler final
    void onReceive(AsyncUDPPacket packet)
    {
        size_t packetLength = packet.length();
-#ifndef ARCH_PORTDUINO
+#if defined(ARCH_NRF52)
+        IPAddress ip = packet.remoteIP();
+        LOG_DEBUG("UDP broadcast from: %u.%u.%u.%u, len=%u", ip[0], ip[1], ip[2], ip[3], packetLength);
+#elif !defined(ARCH_PORTDUINO)
        // FIXME(PORTDUINO): arduino lacks IPAddress::toString()
        LOG_DEBUG("UDP broadcast from: %s, len=%u", packet.remoteIP().toString().c_str(), packetLength);
 #endif
@ -61,7 +69,11 @@ class UdpMulticastHandler final
        if (!mp || !udp) {
            return false;
        }
-#ifndef ARCH_PORTDUINO
+#if defined(ARCH_NRF52)
+        if (!isEthernetAvailable()) {
+            return false;
+        }
+#elif !defined(ARCH_PORTDUINO)
        if (WiFi.status() != WL_CONNECTED) {
            return false;
        }
--- a/src/modules/CannedMessageModule.cpp
+++ b/src/modules/CannedMessageModule.cpp
@ -850,7 +850,13 @@ void CannedMessageModule::sendText(NodeNum dest, ChannelIndex channel, const cha
    this->waitingForAck = true;

    // Log outgoing message
-    LOG_INFO("Send message id=%d, dest=%x, msg=%.*s", p->id, p->to, p->decoded.payload.size, p->decoded.payload.bytes);
+    LOG_INFO("Send message id=%u, dest=%x, msg=%.*s", p->id, p->to, p->decoded.payload.size, p->decoded.payload.bytes);
+
+    if (p->to != 0xffffffff) {
+        LOG_INFO("Proactively adding %x as favorite node", p->to);
+        nodeDB->set_favorite(true, p->to);
+        screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
+    }

    // Send to mesh and phone (even if no phone connected, to track ACKs)
    service->sendToMesh(p, RX_SRC_LOCAL, true);
@ -1441,7 +1447,7 @@ void CannedMessageModule::drawEmotePickerScreen(OLEDDisplay *display, OLEDDispla
    int headerY = y;
    int listTop = headerY + headerFontHeight + headerMargin;

-    int visibleRows = (display->getHeight() - listTop - 2) / rowHeight;
+    int _visibleRows = (display->getHeight() - listTop - 2) / rowHeight;
    int numEmotes = graphics::numEmotes;

    // Clamp highlight index
@ -1451,11 +1457,11 @@ void CannedMessageModule::drawEmotePickerScreen(OLEDDisplay *display, OLEDDispla
        emotePickerIndex = numEmotes - 1;

    // Determine which emote is at the top
-    int topIndex = emotePickerIndex - visibleRows / 2;
+    int topIndex = emotePickerIndex - _visibleRows / 2;
    if (topIndex < 0)
        topIndex = 0;
-    if (topIndex > numEmotes - visibleRows)
-        topIndex = std::max(0, numEmotes - visibleRows);
+    if (topIndex > numEmotes - _visibleRows)
+        topIndex = std::max(0, numEmotes - _visibleRows);

    // Draw header/title
    display->setFont(FONT_SMALL);
@ -1703,7 +1709,7 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st
                } else {
                    // Text: split by words and wrap inside word if needed
                    String text = token.second;
-                    uint16_t pos = 0;
+                    pos = 0;
                    while (pos < text.length()) {
                        // Find next space (or end)
                        int spacePos = text.indexOf(' ', pos);
@ -1747,7 +1753,7 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st
            int yLine = inputY;
            for (auto &line : lines) {
                int nextX = x;
-                for (auto &token : line) {
+                for (const auto &token : line) {
                    if (token.first) {
                        const graphics::Emote *emote = nullptr;
                        for (int j = 0; j < graphics::numEmotes; j++) {
@ -1783,19 +1789,20 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st

        int topMsg;
        std::vector<int> rowHeights;
-        int visibleRows;
+        int _visibleRows;

        // Draw header (To: ...)
        drawHeader(display, x, y, buffer);

        // Shift message list upward by 3 pixels to reduce spacing between header and first message
        const int listYOffset = y + FONT_HEIGHT_SMALL - 3;
-        visibleRows = (display->getHeight() - listYOffset) / baseRowSpacing;
+        _visibleRows = (display->getHeight() - listYOffset) / baseRowSpacing;

        // Figure out which messages are visible and their needed heights
-        topMsg =
-            (messagesCount > visibleRows && currentMessageIndex >= visibleRows - 1) ? currentMessageIndex - visibleRows + 2 : 0;
-        int countRows = std::min(messagesCount, visibleRows);
+        topMsg = (messagesCount > _visibleRows && currentMessageIndex >= _visibleRows - 1)
+                     ? currentMessageIndex - _visibleRows + 2
+                     : 0;
+        int countRows = std::min(messagesCount, _visibleRows);

        // --- Build per-row max height based on all emotes in line ---
        for (int i = 0; i < countRows; i++) {
@ -1822,7 +1829,7 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st
            int lineY = yCursor;
            const char *msg = getMessageByIndex(msgIdx);
            int rowHeight = rowHeights[vis];
-            bool highlight = (msgIdx == currentMessageIndex);
+            bool _highlight = (msgIdx == currentMessageIndex);

            // --- Multi-emote tokenization ---
            std::vector<std::pair<bool, String>> tokens; // (isEmote, token)
@ -1875,20 +1882,20 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st
            int textYOffset = (rowHeight - FONT_HEIGHT_SMALL) / 2;

 #ifdef USE_EINK
-            int nextX = x + (highlight ? 12 : 0);
-            if (highlight)
+            int nextX = x + (_highlight ? 12 : 0);
+            if (_highlight)
                display->drawString(x + 0, lineY + textYOffset, ">");
 #else
            int scrollPadding = 8;
-            if (highlight) {
+            if (_highlight) {
                display->fillRect(x + 0, lineY, display->getWidth() - scrollPadding, rowHeight);
                display->setColor(BLACK);
            }
-            int nextX = x + (highlight ? 2 : 0);
+            int nextX = x + (_highlight ? 2 : 0);
 #endif

            // Draw all tokens left to right
-            for (auto &token : tokens) {
+            for (const auto &token : tokens) {
                if (token.first) {
                    // Emote
                    const graphics::Emote *emote = nullptr;
@ -1910,7 +1917,7 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st
                }
            }
 #ifndef USE_EINK
-            if (highlight)
+            if (_highlight)
                display->setColor(WHITE);
 #endif

@ -1918,11 +1925,11 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st
        }

        // Scrollbar
-        if (messagesCount > visibleRows) {
+        if (messagesCount > _visibleRows) {
            int scrollHeight = display->getHeight() - listYOffset;
            int scrollTrackX = display->getWidth() - 6;
            display->drawRect(scrollTrackX, listYOffset, 4, scrollHeight);
-            int barHeight = (scrollHeight * visibleRows) / messagesCount;
+            int barHeight = (scrollHeight * _visibleRows) / messagesCount;
            int scrollPos = listYOffset + (scrollHeight * topMsg) / messagesCount;
            display->fillRect(scrollTrackX, scrollPos, 4, barHeight);
        }
--- a/src/modules/NodeInfoModule.cpp
+++ b/src/modules/NodeInfoModule.cpp
@ -14,6 +14,11 @@ bool NodeInfoModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, mes
 {
    auto p = *pptr;

+    if (p.is_licensed != owner.is_licensed) {
+        LOG_WARN("Invalid nodeInfo detected, is_licensed mismatch!");
+        return true;
+    }
+
    // Coerce user.id to be derived from the node number
    snprintf(p.id, sizeof(p.id), "!%08x", getFrom(&mp));

--- a/src/modules/PositionModule.cpp
+++ b/src/modules/PositionModule.cpp
@ -266,9 +266,11 @@ meshtastic_MeshPacket *PositionModule::allocPositionPacket()

    LOG_INFO("Position packet: time=%i lat=%i lon=%i", p.time, p.latitude_i, p.longitude_i);

+#ifndef MESHTASTIC_EXCLUDE_ATAK
    // TAK Tracker devices should send their position in a TAK packet over the ATAK port
    if (config.device.role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER)
        return allocAtakPli();
+#endif

    return allocDataProtobuf(p);
 }
--- a/src/modules/SystemCommandsModule.cpp
+++ b/src/modules/SystemCommandsModule.cpp
@ -107,11 +107,7 @@ int SystemCommandsModule::handleInputEvent(const InputEvent *event)
        return true;
    // Power control
    case INPUT_BROKER_SHUTDOWN:
-        LOG_ERROR("Shutting Down");
-        IF_SCREEN(screen->showSimpleBanner("Shutting Down..."));
-        nodeDB->saveToDisk();
-        shutdownAtMsec = millis() + DEFAULT_SHUTDOWN_SECONDS * 1000;
-        // runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
+        shutdownAtMsec = millis();
        return true;

    default:
--- a/src/mqtt/MQTT.cpp
+++ b/src/mqtt/MQTT.cpp
@ -559,10 +559,8 @@ void MQTT::sendSubscriptions()

 int32_t MQTT::runOnce()
 {
-#if HAS_NETWORKING
    if (!moduleConfig.mqtt.enabled || !(moduleConfig.mqtt.map_reporting_enabled || channels.anyMqttEnabled()))
        return disable();
-
    bool wantConnection = wantsLink();

    perhapsReportToMap();
@ -572,7 +570,7 @@ int32_t MQTT::runOnce()
        publishQueuedMessages();
        return 200;
    }
-
+#if HAS_NETWORKING
    else if (!pubSub.loop()) {
        if (!wantConnection)
            return 5000; // If we don't want connection now, check again in 5 secs
@ -596,8 +594,10 @@ int32_t MQTT::runOnce()
        powerFSM.trigger(EVENT_CONTACT_FROM_PHONE); // Suppress entering light sleep (because that would turn off bluetooth)
        return 20;
    }
-#endif
+#else
+    // No networking available, return default interval
    return 30000;
+#endif
 }

 bool MQTT::isValidConfig(const meshtastic_ModuleConfig_MQTTConfig &config, MQTTClient *client)
--- a/src/platform/nrf52/AsyncUDP.cpp
+++ b/src/platform/nrf52/AsyncUDP.cpp
@ -0,0 +1,73 @@
+#include "AsyncUDP.h"
+
+#if HAS_ETHERNET
+
+AsyncUDP::AsyncUDP() : OSThread("AsyncUDP"), localPort(0) {}
+
+bool AsyncUDP::listenMulticast(IPAddress multicastIP, uint16_t port, uint8_t ttl)
+{
+    if (!isMulticast(multicastIP))
+        return false;
+    localPort = port;
+    udp.beginMulticast(multicastIP, port);
+    return true;
+}
+
+size_t AsyncUDP::write(uint8_t b)
+{
+    return udp.write(&b, 1);
+}
+
+size_t AsyncUDP::write(const uint8_t *data, size_t len)
+{
+    return udp.write(data, len);
+}
+
+void AsyncUDP::onPacket(const std::function<void(AsyncUDPPacket)> &callback)
+{
+    _onPacket = callback;
+}
+
+bool AsyncUDP::writeTo(const uint8_t *data, size_t len, IPAddress ip, uint16_t port)
+{
+    if (!udp.beginPacket(ip, port))
+        return false;
+    udp.write(data, len);
+    return udp.endPacket();
+}
+
+// AsyncUDPPacket
+AsyncUDPPacket::AsyncUDPPacket(EthernetUDP &source) : _udp(source), _remoteIP(source.remoteIP()), _remotePort(source.remotePort())
+{
+    if (_udp.available() > 0) {
+        _readLength = _udp.read(_buffer, sizeof(_buffer));
+    } else {
+        _readLength = 0;
+    }
+}
+
+IPAddress AsyncUDPPacket::remoteIP()
+{
+    return _remoteIP;
+}
+
+uint16_t AsyncUDPPacket::length()
+{
+    return _readLength;
+}
+
+const uint8_t *AsyncUDPPacket::data()
+{
+    return _buffer;
+}
+
+int32_t AsyncUDP::runOnce()
+{
+    if (_onPacket && udp.parsePacket() > 0) {
+        AsyncUDPPacket packet(udp);
+        _onPacket(packet);
+    }
+    return 5; // check every 5ms
+}
+
+#endif // HAS_ETHERNET
--- a/src/platform/nrf52/AsyncUDP.h
+++ b/src/platform/nrf52/AsyncUDP.h
@ -0,0 +1,63 @@
+#ifndef ASYNC_UDP_H
+#define ASYNC_UDP_H
+
+#include "configuration.h"
+
+#if HAS_ETHERNET
+
+#include "concurrency/OSThread.h"
+#include <IPAddress.h>
+#include <Print.h>
+#include <RAK13800_W5100S.h>
+#include <cstdint>
+#include <functional>
+
+class AsyncUDPPacket;
+
+class AsyncUDP : public Print, private concurrency::OSThread
+{
+  public:
+    AsyncUDP();
+    explicit operator bool() const { return localPort != 0; }
+
+    bool listenMulticast(IPAddress multicastIP, uint16_t port, uint8_t ttl = 64);
+    bool writeTo(const uint8_t *data, size_t len, IPAddress ip, uint16_t port);
+
+    size_t write(uint8_t b) override;
+    size_t write(const uint8_t *data, size_t len) override;
+    void onPacket(const std::function<void(AsyncUDPPacket)> &callback);
+
+  private:
+    EthernetUDP udp;
+    uint16_t localPort;
+    std::function<void(AsyncUDPPacket)> _onPacket;
+    virtual int32_t runOnce() override;
+};
+
+class AsyncUDPPacket
+{
+  public:
+    AsyncUDPPacket(EthernetUDP &source);
+
+    IPAddress remoteIP();
+    uint16_t length();
+    const uint8_t *data();
+
+  private:
+    EthernetUDP &_udp;
+    IPAddress _remoteIP;
+    uint16_t _remotePort;
+    size_t _readLength = 0;
+
+    static constexpr size_t BUF_SIZE = 512;
+    uint8_t _buffer[BUF_SIZE];
+};
+
+inline bool isMulticast(const IPAddress &ip)
+{
+    return (ip[0] & 0xF0) == 0xE0;
+}
+
+#endif // HAS_ETHERNET
+
+#endif // ASYNC_UDP_H
--- a/src/platform/nrf52/architecture.h
+++ b/src/platform/nrf52/architecture.h
@ -49,6 +49,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_RAK2560
 #elif defined(WISMESH_TAP)
 #define HW_VENDOR meshtastic_HardwareModel_WISMESH_TAP
+#elif defined(WISMESH_TAG)
+#define HW_VENDOR meshtastic_HardwareModel_WISMESH_TAG
 #elif defined(GAT562_MESH_TRIAL_TRACKER)
 #define HW_VENDOR meshtastic_HardwareModel_GAT562_MESH_TRIAL_TRACKER
 #elif defined(RAK4630)
@ -89,6 +91,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_MESH_POCKET
 #elif defined(NOMADSTAR_METEOR_PRO)
 #define HW_VENDOR meshtastic_HardwareModel_NOMADSTAR_METEOR_PRO
+#elif defined(SEEED_WIO_TRACKER_L1_EINK)
+#define HW_VENDOR meshtastic_HardwareModel_SEEED_WIO_TRACKER_L1_EINK
 #elif defined(SEEED_WIO_TRACKER_L1)
 #define HW_VENDOR meshtastic_HardwareModel_SEEED_WIO_TRACKER_L1
 #else
--- a/src/shutdown.h
+++ b/src/shutdown.h
@ -40,21 +40,8 @@ void powerCommandsCheck()
 #endif
    }

-#if defined(ARCH_ESP32) || defined(ARCH_NRF52)
-    if (shutdownAtMsec && screen) {
-        screen->showSimpleBanner("Shutting Down...", 0); // stays on screen
-    }
-#endif
-
    if (shutdownAtMsec && millis() > shutdownAtMsec) {
-        LOG_INFO("Shut down from admin command");
-#if defined(ARCH_NRF52) || defined(ARCH_ESP32) || defined(ARCH_RP2040)
-        playShutdownMelody();
+        shutdownAtMsec = 0;
        power->shutdown();
-#elif defined(ARCH_PORTDUINO)
-        exit(EXIT_SUCCESS);
-#else
-        LOG_WARN("FIXME implement shutdown for this platform");
-#endif
    }
 }
--- a/variants/diy/platformio.ini
+++ b/variants/diy/platformio.ini
@ -1,47 +1,3 @@
-; Meshtastic DIY v1 by Nano VHF Schematic based on ESP32-WROOM-32 (38 pins) devkit & EBYTE E22 SX1262/SX1268 module
-[env:meshtastic-diy-v1]
-extends = esp32_base
-board = esp32doit-devkit-v1
-board_check = true
-build_flags =
-  ${esp32_base.build_flags}
-  -D DIY_V1
-  -D EBYTE_E22
-  -I variants/diy/v1
-
-; Meshtastic DIY v1.1 new schematic based on ESP32-WROOM-32 & SX1262/SX1268 modules
-[env:meshtastic-diy-v1_1]
-extends = esp32_base
-board = esp32doit-devkit-v1
-board_level = extra
-build_flags =
-  ${esp32_base.build_flags}
-  -D DIY_V1
-  -D EBYTE_E22
-  -I variants/diy/v1_1
-
-; Port to Disaster Radio's ESP32-v3 Dev Board
-[env:meshtastic-dr-dev]
-extends = esp32_base
-board = esp32doit-devkit-v1
-board_upload.maximum_size = 4194304
-board_upload.maximum_ram_size = 532480
-build_flags =
-  ${esp32_base.build_flags}
-  -D DR_DEV
-  -D EBYTE_E22
-  -I variants/diy/dr-dev
-
-; Hydra - Meshtastic DIY v1 hardware with some specific changes
-[env:hydra]
-extends = esp32_base
-board = esp32doit-devkit-v1
-build_flags =
-  ${esp32_base.build_flags}
-  -D DIY_V1
-  -I variants/diy/hydra
-
-
 ; Promicro + E22(0)-xxxMM / RA-01SH modules board variant - DIY - without TCXO
 [env:nrf52_promicro_diy_xtal]
 extends = nrf52840_base
@ -122,35 +78,3 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/diy/seeed-xiao-n
 lib_deps =
  ${nrf52840_base.lib_deps}
 debug_tool = jlink
-
-; NanoVHF T-Energy-S3 + E22(0)-xxxM - DIY
-[env:t-energy-s3_e22]
-extends = esp32s3_base
-board = esp32-s3-devkitc-1
-board_build.partitions = default_16MB.csv
-board_level = extra
-board_upload.flash_size = 16MB ;Specify the FLASH capacity as 16MB
-board_build.arduino.memory_type = qio_opi ;Enable internal PSRAM
-build_unflags =
-  ${esp32s3_base.build_unflags}
-  -D ARDUINO_USB_MODE=1
-build_flags =
-  ${esp32s3_base.build_flags}
-  -D EBYTE_ESP32_S3
-  -D BOARD_HAS_PSRAM
-  -D ARDUINO_USB_MODE=0
-  -D ARDUINO_USB_CDC_ON_BOOT=1
-  -I variants/diy/t-energy-s3_e22
-
-; ESP32 C3 Super Mini Development Board
-; https://www.espboards.dev/esp32/esp32-c3-super-mini/
-[env:esp32c3_super_mini]
-extends = esp32c3_base
-board = esp32-c3-devkitm-1
-build_flags =
-  ${esp32_base.build_flags}
-  -D PRIVATE_HW
-  -I variants/diy/esp32c3_super_mini
-  -D ARDUINO_USB_MODE=1
-  -D ARDUINO_USB_CDC_ON_BOOT=1
-board_level = extra
--- a/variants/esp32/betafpv_2400_tx_micro/platformio.ini
+++ b/variants/esp32/betafpv_2400_tx_micro/platformio.ini
@ -8,11 +8,11 @@ build_flags =
  -D VTABLES_IN_FLASH=1
  -D CONFIG_DISABLE_HAL_LOCKS=1
  -O2
-  -I variants/betafpv_2400_tx_micro
+  -I variants/esp32/betafpv_2400_tx_micro
 board_build.f_cpu = 240000000L
 upload_protocol = esptool
 ;upload_port = /dev/ttyUSB0
 upload_speed = 460800
 lib_deps =
  ${esp32_base.lib_deps}
-  adafruit/Adafruit NeoPixel @ ^1.12.0
+  adafruit/Adafruit NeoPixel @ ^1.12.0
--- a/variants/esp32/betafpv_2400_tx_micro/variant.h
+++ b/variants/esp32/betafpv_2400_tx_micro/variant.h
--- a/variants/esp32/betafpv_900_tx_nano/platformio.ini
+++ b/variants/esp32/betafpv_900_tx_nano/platformio.ini
@ -8,10 +8,10 @@ build_flags =
  -D VTABLES_IN_FLASH=1
  -D CONFIG_DISABLE_HAL_LOCKS=1
  -O2
-  -I variants/betafpv_900_tx_nano
+  -I variants/esp32/betafpv_900_tx_nano
 board_build.f_cpu = 240000000L
 upload_protocol = esptool
 ;upload_port = /dev/ttyUSB0
 upload_speed = 460800
 lib_deps =
-  ${esp32_base.lib_deps}
+  ${esp32_base.lib_deps}
--- a/variants/esp32/betafpv_900_tx_nano/variant.h
+++ b/variants/esp32/betafpv_900_tx_nano/variant.h
--- a/variants/esp32/chatter2/platformio.ini
+++ b/variants/esp32/chatter2/platformio.ini
@ -5,7 +5,7 @@ board = esp32doit-devkit-v1
 build_flags =
  ${esp32_base.build_flags}
  -D CHATTER_2
-  -I variants/chatter2
+  -I variants/esp32/chatter2
  
 lib_deps =
  ${esp32_base.lib_deps}
--- a/variants/esp32/chatter2/variant.h
+++ b/variants/esp32/chatter2/variant.h
--- a/variants/esp32/diy/dr-dev/platformio.ini
+++ b/variants/esp32/diy/dr-dev/platformio.ini
@ -0,0 +1,11 @@
+; Port to Disaster Radio's ESP32-v3 Dev Board
+[env:meshtastic-dr-dev]
+extends = esp32_base
+board = esp32doit-devkit-v1
+board_upload.maximum_size = 4194304
+board_upload.maximum_ram_size = 532480
+build_flags =
+  ${esp32_base.build_flags}
+  -D DR_DEV
+  -D EBYTE_E22
+  -I variants/esp32/diy/dr-dev
--- a/variants/esp32/diy/dr-dev/variant.h
+++ b/variants/esp32/diy/dr-dev/variant.h
--- a/variants/esp32/diy/hydra/platformio.ini
+++ b/variants/esp32/diy/hydra/platformio.ini
@ -0,0 +1,8 @@
+; Hydra - Meshtastic DIY v1 hardware with some specific changes
+[env:hydra]
+extends = esp32_base
+board = esp32doit-devkit-v1
+build_flags =
+  ${esp32_base.build_flags}
+  -D DIY_V1
+  -I variants/esp32/diy/hydra
--- a/variants/esp32/diy/hydra/variant.h
+++ b/variants/esp32/diy/hydra/variant.h
--- a/variants/esp32/diy/v1/platformio.ini
+++ b/variants/esp32/diy/v1/platformio.ini
@ -0,0 +1,10 @@
+; Meshtastic DIY v1 by Nano VHF Schematic based on ESP32-WROOM-32 (38 pins) devkit & EBYTE E22 SX1262/SX1268 module
+[env:meshtastic-diy-v1]
+extends = esp32_base
+board = esp32doit-devkit-v1
+board_check = true
+build_flags =
+  ${esp32_base.build_flags}
+  -D DIY_V1
+  -D EBYTE_E22
+  -I variants/esp32/diy/v1
--- a/variants/esp32/diy/v1/variant.h
+++ b/variants/esp32/diy/v1/variant.h
--- a/variants/esp32/diy/v1_1/platformio.ini
+++ b/variants/esp32/diy/v1_1/platformio.ini
@ -0,0 +1,10 @@
+; Meshtastic DIY v1.1 new schematic based on ESP32-WROOM-32 & SX1262/SX1268 modules
+[env:meshtastic-diy-v1_1]
+extends = esp32_base
+board = esp32doit-devkit-v1
+board_level = extra
+build_flags =
+  ${esp32_base.build_flags}
+  -D DIY_V1
+  -D EBYTE_E22
+  -I variants/esp32/diy/v1_1
--- a/variants/esp32/diy/v1_1/variant.h
+++ b/variants/esp32/diy/v1_1/variant.h
--- a/variants/esp32/hackerboxes_esp32_io/platformio.ini
+++ b/variants/esp32/hackerboxes_esp32_io/platformio.ini
@ -5,7 +5,7 @@ board_level = extra
 build_flags = 
  ${esp32_base.build_flags}
  -D PRIVATE_HW
-  -I variants/hackerboxes_esp32_io
+  -I variants/esp32/hackerboxes_esp32_io
 monitor_speed = 115200
 upload_protocol = esptool
 ;upload_port = /dev/ttyUSB0
--- a/variants/esp32/hackerboxes_esp32_io/variant.h
+++ b/variants/esp32/hackerboxes_esp32_io/variant.h
--- a/variants/esp32/heltec_v1/platformio.ini
+++ b/variants/esp32/heltec_v1/platformio.ini
@ -4,4 +4,6 @@ extends = esp32_base
 board_level = extra
 board = heltec_wifi_lora_32
 build_flags = 
-  ${esp32_base.build_flags} -D HELTEC_V1 -I variants/heltec_v1
+  ${esp32_base.build_flags}
+  -D HELTEC_V1
+  -I variants/esp32/heltec_v1
--- a/variants/esp32/heltec_v1/variant.h
+++ b/variants/esp32/heltec_v1/variant.h
--- a/variants/esp32/heltec_v2.1/platformio.ini
+++ b/variants/esp32/heltec_v2.1/platformio.ini
@ -4,5 +4,7 @@ board_level = extra
 extends = esp32_base
 board = heltec_wifi_lora_32_V2
 build_flags = 
-  ${esp32_base.build_flags} -D HELTEC_V2_1 -I variants/heltec_v2.1
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
+  ${esp32_base.build_flags}
+  -D HELTEC_V2_1
+  -I variants/esp32/heltec_v2.1
+  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
--- a/variants/esp32/heltec_v2.1/variant.h
+++ b/variants/esp32/heltec_v2.1/variant.h
--- a/variants/esp32/heltec_v2/platformio.ini
+++ b/variants/esp32/heltec_v2/platformio.ini
@ -4,4 +4,6 @@ board_level = extra
 extends = esp32_base
 board = heltec_wifi_lora_32_V2
 build_flags = 
-  ${esp32_base.build_flags} -D HELTEC_V2_0 -I variants/heltec_v2
+  ${esp32_base.build_flags}
+  -D HELTEC_V2_0
+  -I variants/esp32/heltec_v2
--- a/variants/esp32/heltec_v2/variant.h
+++ b/variants/esp32/heltec_v2/variant.h
--- a/variants/esp32/heltec_wireless_bridge/platformio.ini
+++ b/variants/esp32/heltec_wireless_bridge/platformio.ini
@ -4,7 +4,7 @@ extends = esp32_base
 board = heltec_wifi_lora_32
 build_flags = 
  ${esp32_base.build_flags}
-  -I variants/heltec_wireless_bridge
+  -I variants/esp32/heltec_wireless_bridge
  -D HELTEC_WIRELESS_BRIDGE
  -D BOARD_HAS_PSRAM
  -D RADIOLIB_EXCLUDE_LR11X0=1
--- a/variants/esp32/heltec_wireless_bridge/variant.h
+++ b/variants/esp32/heltec_wireless_bridge/variant.h
--- a/variants/esp32/heltec_wsl_v2.1/platformio.ini
+++ b/variants/esp32/heltec_wsl_v2.1/platformio.ini
@ -3,5 +3,7 @@ extends = esp32_base
 board = heltec_wireless_stick_lite
 board_level = extra
 build_flags =
-  ${esp32_base.build_flags} -D PRIVATE_HW -I variants/heltec_wsl_v2.1
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
+  ${esp32_base.build_flags}
+  -D PRIVATE_HW
+  -I variants/esp32/heltec_wsl_v2.1
+  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
--- a/variants/esp32/heltec_wsl_v2.1/variant.h
+++ b/variants/esp32/heltec_wsl_v2.1/variant.h
--- a/variants/esp32/m5stack_core/pins_arduino.h
+++ b/variants/esp32/m5stack_core/pins_arduino.h
--- a/variants/esp32/m5stack_core/platformio.ini
+++ b/variants/esp32/m5stack_core/platformio.ini
@ -5,7 +5,8 @@ monitor_filters = esp32_exception_decoder
 build_src_filter = 
  ${esp32_base.build_src_filter}
 build_flags = 
-  ${esp32_base.build_flags} -I variants/m5stack_core
+  ${esp32_base.build_flags}
+  -I variants/esp32/m5stack_core
  -DILI9341_DRIVER
  -DM5STACK
  -DUSER_SETUP_LOADED
--- a/variants/esp32/m5stack_core/variant.h
+++ b/variants/esp32/m5stack_core/variant.h
--- a/variants/esp32/m5stack_coreink/pins_arduino.h
+++ b/variants/esp32/m5stack_coreink/pins_arduino.h
--- a/variants/esp32/m5stack_coreink/platformio.ini
+++ b/variants/esp32/m5stack_coreink/platformio.ini
@ -5,7 +5,8 @@ board_check = true
 build_src_filter = 
  ${esp32_base.build_src_filter}
 build_flags = 
-  ${esp32_base.build_flags} -I variants/m5stack_coreink
+  ${esp32_base.build_flags}
+  -I variants/esp32/m5stack_coreink
  ;-D RADIOLIB_VERBOSE
  -Ofast
  -D__MCUXPRESSO
--- a/variants/esp32/m5stack_coreink/variant.h
+++ b/variants/esp32/m5stack_coreink/variant.h
--- a/variants/esp32/nano-g1-explorer/platformio.ini
+++ b/variants/esp32/nano-g1-explorer/platformio.ini
@ -5,4 +5,6 @@ board = ttgo-t-beam
 lib_deps =
  ${esp32_base.lib_deps}
 build_flags = 
-  ${esp32_base.build_flags} -D NANO_G1_EXPLORER  -I variants/nano-g1-explorer
+  ${esp32_base.build_flags}
+  -D NANO_G1_EXPLORER
+  -I variants/esp32/nano-g1-explorer
--- a/variants/esp32/nano-g1-explorer/variant.h
+++ b/variants/esp32/nano-g1-explorer/variant.h
--- a/variants/esp32/nano-g1/platformio.ini
+++ b/variants/esp32/nano-g1/platformio.ini
@ -5,4 +5,6 @@ board = ttgo-t-beam
 lib_deps =
  ${esp32_base.lib_deps}
 build_flags = 
-  ${esp32_base.build_flags} -D NANO_G1  -I variants/nano-g1
+  ${esp32_base.build_flags}
+  -D NANO_G1
+  -I variants/esp32/nano-g1
--- a/variants/esp32/nano-g1/variant.h
+++ b/variants/esp32/nano-g1/variant.h
--- a/variants/esp32/radiomaster_900_bandit/platformio.ini
+++ b/variants/esp32/radiomaster_900_bandit/platformio.ini
@ -8,7 +8,7 @@ build_flags =
  -DCONFIG_DISABLE_HAL_LOCKS=1
  -DHAS_STK8XXX=1
  -O2
-  -Ivariants/radiomaster_900_bandit
+  -I variants/esp32/radiomaster_900_bandit
 board_build.f_cpu = 240000000L
 upload_protocol = esptool
 lib_deps =
--- a/variants/esp32/radiomaster_900_bandit/variant.h
+++ b/variants/esp32/radiomaster_900_bandit/variant.h
--- a/variants/esp32/radiomaster_900_bandit_micro/platformio.ini
+++ b/variants/esp32/radiomaster_900_bandit_micro/platformio.ini
@ -12,8 +12,8 @@ build_flags =
  -DVTABLES_IN_FLASH=1
  -DCONFIG_DISABLE_HAL_LOCKS=1
  -O2
-  -Ivariants/radiomaster_900_bandit_nano
+  -I variants/esp32/radiomaster_900_bandit_nano
 board_build.f_cpu = 240000000L
 upload_protocol = esptool
 lib_deps =
-  ${esp32_base.lib_deps}
+  ${esp32_base.lib_deps}
--- a/variants/esp32/radiomaster_900_bandit_nano/platformio.ini
+++ b/variants/esp32/radiomaster_900_bandit_nano/platformio.ini
@ -7,8 +7,8 @@ build_flags =
  -DVTABLES_IN_FLASH=1
  -DCONFIG_DISABLE_HAL_LOCKS=1
  -O2
-  -Ivariants/radiomaster_900_bandit_nano
+  -I variants/esp32/radiomaster_900_bandit_nano
 board_build.f_cpu = 240000000L
 upload_protocol = esptool
 lib_deps =
-  ${esp32_base.lib_deps}
+  ${esp32_base.lib_deps}
--- a/variants/esp32/radiomaster_900_bandit_nano/variant.h
+++ b/variants/esp32/radiomaster_900_bandit_nano/variant.h
--- a/variants/esp32/rak11200/pins_arduino.h
+++ b/variants/esp32/rak11200/pins_arduino.h
--- a/Show More
+++ b/Show More