Merge branch 'master' into usbhost

* No delay between UI frame rendering for OLED

* force redraw the display

---------

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
Co-authored-by: Jason P <applewiz@mac.com>

.github/workflows/daily_packaging.yml

@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        series: [plucky, oracular, noble, jammy]
+        series: [plucky, noble, jammy]
     uses: ./.github/workflows/package_ppa.yml
     with:
       ppa_repo: ppa:meshtastic/daily

.github/workflows/release_channels.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        series: [plucky, oracular, noble, jammy]
+        series: [plucky, noble, jammy]
     uses: ./.github/workflows/package_ppa.yml
     with:
       ppa_repo: |-

.github/workflows/test_native.yml

@@ -143,7 +143,7 @@ jobs:
           merge-multiple: true
 
       - name: Test Report
-        uses: dorny/test-reporter@v2.1.0
+        uses: dorny/test-reporter@v2.1.1
         with:
           name: PlatformIO Tests
           path: testreport.xml

.trunk/trunk.yaml

@@ -8,8 +8,8 @@ plugins:
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - checkov@3.2.447
+    - checkov@3.2.450
-    - renovate@41.23.4
+    - renovate@41.29.1
     - prettier@3.6.2
     - trufflehog@3.89.2
     - yamllint@1.37.1

arch/esp32/esp32s2.ini

@@ -17,3 +17,6 @@ lib_ignore =
   ${esp32_base.lib_ignore} 
   NimBLE-Arduino
   libpax
+
+lib_deps = ${esp32_base.lib_deps}
+  tanakamasayuki/EspUsbHost@^1.0.2

arch/esp32/esp32s3.ini

@@ -3,3 +3,6 @@ extends = esp32_base
 custom_esp32_kind = esp32s3
 
 monitor_speed = 115200
+
+lib_deps = ${esp32_base.lib_deps}
+  tanakamasayuki/EspUsbHost@^1.0.2

arch/portduino/portduino.ini

@@ -2,7 +2,7 @@
 [portduino_base]
 platform =
   # renovate: datasource=git-refs depName=platform-native packageName=https://github.com/meshtastic/platform-native gitBranch=develop
-  https://github.com/meshtastic/platform-native/archive/681ee029207e9fd040afa223df6e54074cbbe084.zip
+  https://github.com/meshtastic/platform-native/archive/6cb7a455b440dd0738e8ed74a18136ed5cf7ea63.zip
 framework = arduino
 
 build_src_filter = 
@@ -30,6 +30,8 @@ lib_deps =
   lovyan03/LovyanGFX@^1.2.0
   # renovate: datasource=git-refs depName=libch341-spi-userspace packageName=https://github.com/pine64/libch341-spi-userspace gitBranch=main
   https://github.com/pine64/libch341-spi-userspace/archive/af9bc27c9c30fa90772279925b7c5913dff789b4.zip
+  # renovate: datasource=custom.pio depName=adafruit/Adafruit seesaw Library packageName=adafruit/library/Adafruit seesaw Library
+	adafruit/Adafruit seesaw Library@1.7.9
 
 build_flags =
   ${arduino_base.build_flags}
@@ -48,4 +50,7 @@ build_flags =
   -std=gnu17
   -std=c++17
 
-lib_ignore = Adafruit NeoPixel
+lib_ignore =
+  Adafruit NeoPixel
+  Adafruit ST7735 and ST7789 Library
+  SD

arch/stm32/stm32.ini

@@ -47,4 +47,4 @@ lib_deps =
   https://github.com/caveman99/Crypto/archive/eae9c768054118a9399690f8af202853d1ae8516.zip
 
 lib_ignore =
-  mathertel/OneButton@2.6.1
+  OneButton

bin/build-esp32.sh

@@ -11,7 +11,7 @@ rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
 
 # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
-platformio pkg update -e $1
+platformio pkg install -e $1
 
 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
 rm -f .pio/build/$1/firmware.*

bin/build-native.sh

@@ -25,7 +25,7 @@ mkdir -p $OUTDIR/
 rm -r $OUTDIR/* || true
 
 # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
-pio pkg update --environment "$PIO_ENV" || platformioFailed
+pio pkg install --environment "$PIO_ENV" || platformioFailed
 pio run --environment "$PIO_ENV" || platformioFailed
 cp ".pio/build/$PIO_ENV/program" "$OUTDIR/meshtasticd_linux_$(uname -m)"
 cp bin/native-install.* $OUTDIR

bin/build-nrf52.sh

@@ -11,7 +11,7 @@ rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
 
 # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
-platformio pkg update -e $1
+platformio pkg install -e $1
 
 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
 rm -f .pio/build/$1/firmware.*

bin/build-rp2xx0.sh

@@ -11,7 +11,7 @@ rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
 
 # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
-platformio pkg update -e $1
+platformio pkg install -e $1
 
 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
 rm -f .pio/build/$1/firmware.*

bin/build-stm32wl.sh

@@ -11,7 +11,7 @@ rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
 
 # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
-platformio pkg update -e $1
+platformio pkg install -e $1
 
 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
 rm -f .pio/build/$1/firmware.*

bin/config-dist.yaml

@@ -199,6 +199,10 @@ HostMetrics:
 #  UserStringCommand: cat /sys/firmware/devicetree/base/serial-number # Command to execute, to send the results as the userString
 
 
+Config:
+#  DisplayMode: TWOCOLOR # uncomment to force BaseUI
+#  DisplayMode: COLOR # uncomment to force MUI
+
 General:
   MaxNodes: 200
   MaxMessageQueue: 100

bin/config.d/lora-ws-raspberry-pico-to-orangepi-03.yaml

@@ -0,0 +1,52 @@
+# https://www.waveshare.com/pico-lora-sx1262-868m.htm
+# http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-Zero-3.html
+#
+# See Orange Pi Zero3 manual, chapter 3.16, page 124 for 26-pin header pinout
+#
+# Pin Connection
+# Waveshare       Orange Pi Zero3
+#   36    3.3V        17
+#   15    MOSI        19
+#   16    MISO        21  
+#   14    CLK         23
+#   38    GND         25
+#   4     BUSY        18
+#   20    RESET       22
+#   5     CS          24
+#   26    DIO1/IRQ    26
+
+Lora:
+  Module: sx1262  # Waveshare Raspberry Pico Lora module
+  DIO2_AS_RF_SWITCH: true
+  DIO3_TCXO_VOLTAGE: true
+  # Specify either the spidev1_1 or the CS below, not both!
+  # On DietPi Linux, when using the user overlay dietpi-spi1_1.dtbo, CS will be configured with spidev1.1
+  spidev: spidev1.1 # See Orange Pi Zero3 manual, chapter 3.18.3, page 130
+#  CS:             # CS     PIN_24 -> chip 1, line 233
+#    pin: 24
+#    gpiochip: 1
+#    line: 233
+  SCK:            # SCK     PIN_23 -> chip 1, line 230
+    pin: 23
+    gpiochip: 1
+    line: 230
+  Busy:           # BUSY    PIN_18 -> chip 1, line 78
+    pin: 18
+    gpiochip: 1
+    line: 78
+  MOSI:           # MOSI    PIN_19 -> chip 1, line 231
+    pin: 19
+    gpiochip: 1
+    line: 231
+  MISO:           # MISO    PIN_21 -> chip 1, line 232
+    pin: 21
+    gpiochip: 1
+    line: 232
+  Reset:          # NRST    PIN_22 -> chip 1, line 71
+    pin: 22
+    gpiochip: 1
+    line: 71
+  IRQ:            # DIO1    PIN_26 -> chip 1, line 74
+    pin: 26
+    gpiochip: 1
+    line: 74

bin/device-update.sh

@@ -31,17 +31,16 @@ EOF
 }
 
 # Check for --change-mode and remove it from arguments
-NEW_ARGS=""
+NEW_ARGS=()
 for arg in "$@"; do
     if [ "$arg" = "--change-mode" ]; then
         CHANGE_MODE=true
     else
-        NEW_ARGS="$NEW_ARGS \"\$arg\""
+        NEW_ARGS+=("$arg")
     fi
 done
 
-# Reset positional parameters to filtered list
+set -- "${NEW_ARGS[@]}"
-eval set -- $NEW_ARGS
 
 while getopts ":hp:P:f:" opt; do
     case "${opt}" in

bin/org.meshtastic.meshtasticd.metainfo.xml

@@ -87,6 +87,9 @@
   </screenshots>
 
   <releases>
+    <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>
     <release version="2.7.2" date="2025-07-04">
       <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.2</url>
     </release>

debian/changelog

@@ -1,4 +1,4 @@
-meshtasticd (2.7.2.0) UNRELEASED; urgency=medium
+meshtasticd (2.7.3.0) UNRELEASED; urgency=medium
 
   [ Austin Lane ]
   * Initial packaging
@@ -28,4 +28,7 @@ meshtasticd (2.7.2.0) UNRELEASED; urgency=medium
   [  ]
   * GitHub Actions Automatic version bump
 
- --  <github-actions[bot]@users.noreply.github.com>  Fri, 04 Jul 2025 11:58:01 +0000
+  [ Ubuntu ]
+  * GitHub Actions Automatic version bump
+
+ -- Ubuntu <github-actions[bot]@users.noreply.github.com>  Thu, 10 Jul 2025 16:29:27 +0000

platformio.ini

@@ -104,18 +104,18 @@ lib_deps =
 [radiolib_base]
 lib_deps =
 	# renovate: datasource=custom.pio depName=RadioLib packageName=jgromes/library/RadioLib
-	jgromes/RadioLib@7.2.0
+	jgromes/RadioLib@7.2.1
 
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/8c7092c73425adfda1aac8c6960df06cd85f6d92.zip
+	https://github.com/meshtastic/device-ui/archive/86a09a7360f92d10053fbbf8d74f67f85b0ceb09.zip
 
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]
 lib_deps =
 	# renovate: datasource=custom.pio depName=Adafruit BusIO packageName=adafruit/library/Adafruit BusIO
-	adafruit/Adafruit BusIO@1.17.1
+	adafruit/Adafruit BusIO@1.17.2
 	# renovate: datasource=custom.pio depName=Adafruit Unified Sensor packageName=adafruit/library/Adafruit Unified Sensor
 	adafruit/Adafruit Unified Sensor@1.1.15
 	# renovate: datasource=custom.pio depName=Adafruit BMP280 packageName=adafruit/library/Adafruit BMP280 Library

src/graphics/Screen.cpp

@@ -21,6 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 #include "Screen.h"
+#include "NodeDB.h"
 #include "PowerMon.h"
 #include "Throttle.h"
 #include "configuration.h"
@@ -44,7 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 #include "FSCommon.h"
 #include "MeshService.h"
-#include "NodeDB.h"
 #include "RadioLibInterface.h"
 #include "error.h"
 #include "gps/GeoCoord.h"
@@ -640,6 +640,11 @@ void Screen::forceDisplay(bool forceUiUpdate)
 
     // Tell EInk class to update the display
     static_cast<EInkDisplay *>(dispdev)->forceDisplay();
+#else
+    // No delay between UI frame rendering
+    if (forceUiUpdate) {
+        setFastFramerate();
+    }
 #endif
 }
 
@@ -1257,40 +1262,45 @@ int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)
             devicestate.has_rx_text_message = true; // Needed to include the message frame
             hasUnreadMessage = true;                // Enables mail icon in the header
             setFrames(FOCUS_PRESERVE);              // Refresh frame list without switching view
-            forceDisplay();                         // Forces screen redraw
 
-            // === Prepare banner content ===
+            // Only wake/force display if the configuration allows it
-            const meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(packet->from);
+            if (shouldWakeOnReceivedMessage()) {
-            const char *longName = (node && node->has_user) ? node->user.long_name : nullptr;
+                setOn(true);    // Wake up the screen first
+                forceDisplay(); // Forces screen redraw
 
-            const char *msgRaw = reinterpret_cast<const char *>(packet->decoded.payload.bytes);
+                // === Prepare banner content ===
+                const meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(packet->from);
+                const char *longName = (node && node->has_user) ? node->user.long_name : nullptr;
 
-            char banner[256];
+                const char *msgRaw = reinterpret_cast<const char *>(packet->decoded.payload.bytes);
 
-            // Check for bell character in message to determine alert type
+                char banner[256];
-            bool isAlert = false;
+
-            for (size_t i = 0; i < packet->decoded.payload.size && i < 100; i++) {
+                // Check for bell character in message to determine alert type
-                if (msgRaw[i] == '\x07') {
+                bool isAlert = false;
-                    isAlert = true;
+                for (size_t i = 0; i < packet->decoded.payload.size && i < 100; i++) {
-                    break;
+                    if (msgRaw[i] == '\x07') {
+                        isAlert = true;
+                        break;
+                    }
                 }
-            }
 
-            if (isAlert) {
+                if (isAlert) {
-                if (longName && longName[0]) {
+                    if (longName && longName[0]) {
-                    snprintf(banner, sizeof(banner), "Alert Received from\n%s", longName);
+                        snprintf(banner, sizeof(banner), "Alert Received from\n%s", longName);
+                    } else {
+                        strcpy(banner, "Alert Received");
+                    }
                 } else {
-                    strcpy(banner, "Alert Received");
+                    if (longName && longName[0]) {
+                        snprintf(banner, sizeof(banner), "New Message from\n%s", longName);
+                    } else {
+                        strcpy(banner, "New Message");
+                    }
                 }
-            } else {
-                if (longName && longName[0]) {
-                    snprintf(banner, sizeof(banner), "New Message from\n%s", longName);
-                } else {
-                    strcpy(banner, "New Message");
-                }
-            }
 
-            screen->showSimpleBanner(banner, 3000);
+                screen->showSimpleBanner(banner, 3000);
+            }
         }
     }
 
@@ -1423,3 +1433,23 @@ bool Screen::isOverlayBannerShowing()
 #else
 graphics::Screen::Screen(ScanI2C::DeviceAddress, meshtastic_Config_DisplayConfig_OledType, OLEDDISPLAY_GEOMETRY) {}
 #endif // HAS_SCREEN
+
+bool shouldWakeOnReceivedMessage()
+{
+    /*
+    The goal here is to determine when we do NOT wake up the screen on message received:
+    - Any ext. notifications are turned on
+    - If role is not client / client_mute
+    - If the battery level is very low
+    */
+    if (moduleConfig.external_notification.enabled) {
+        return false;
+    }
+    if (!meshtastic_Config_DeviceConfig_Role_CLIENT && !meshtastic_Config_DeviceConfig_Role_CLIENT_MUTE) {
+        return false;
+    }
+    if (powerStatus && powerStatus->getBatteryChargePercent() < 10) {
+        return false;
+    }
+    return true;
+}

src/graphics/Screen.h

@@ -26,6 +26,8 @@ struct BannerOverlayOptions {
 };
 } // namespace graphics
 
+bool shouldWakeOnReceivedMessage();
+
 #if !HAS_SCREEN
 #include "power.h"
 namespace graphics

src/graphics/draw/MenuHandler.cpp

@@ -129,11 +129,11 @@ void menuHandler::ClockFacePicker()
             screen->runNow();
         } else if (selected == Digital) {
             uiconfig.is_clockface_analog = false;
-            nodeDB->saveProto("/prefs/uiconfig.proto", meshtastic_DeviceUIConfig_size, &meshtastic_DeviceUIConfig_msg, &uiconfig);
+            saveUIConfig();
             screen->setFrames(Screen::FOCUS_CLOCK);
         } else {
             uiconfig.is_clockface_analog = true;
-            nodeDB->saveProto("/prefs/uiconfig.proto", meshtastic_DeviceUIConfig_size, &meshtastic_DeviceUIConfig_msg, &uiconfig);
+            saveUIConfig();
             screen->setFrames(Screen::FOCUS_CLOCK);
         }
     };
@@ -346,37 +346,28 @@ void menuHandler::homeBaseMenu()
 
 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, Beeps, Brightness, Reboot, Color, MUI, Test, enumEnd };
+    enum optionsNumbers { Back, Notifications, ScreenOptions, PowerMenu, Test, enumEnd };
     static const char *optionsArray[enumEnd] = {"Back"};
     static int optionsEnumArray[enumEnd] = {Back};
     int options = 1;
 
-    optionsArray[options] = "Reboot";
+    optionsArray[options] = "Notifications";
-    optionsEnumArray[options++] = Reboot;
+    optionsEnumArray[options++] = Notifications;
-
+#if defined(ST7789_CS) || defined(USE_OLED) || defined(USE_SSD1306) || defined(USE_SH1106) || defined(USE_SH1107) ||             \
-    optionsArray[options] = "Beeps Action";
+    defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190) || HAS_TFT
-    optionsEnumArray[options++] = Beeps;
+    optionsArray[options] = "Screen Options";
-
+    optionsEnumArray[options++] = ScreenOptions;
-    if (hasSupportBrightness) {
-        optionsArray[options] = "Brightness";
-        optionsEnumArray[options++] = Brightness;
-    }
-
-#if defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190) || HAS_TFT
-    optionsArray[options] = "Screen Color";
-    optionsEnumArray[options++] = Color;
-#endif
-#if HAS_TFT
-    optionsArray[options] = "Switch to MUI";
-    optionsEnumArray[options++] = MUI;
 #endif
+
+    optionsArray[options] = "Reboot/Shutdown";
+    optionsEnumArray[options++] = PowerMenu;
+
     if (test_enabled) {
         optionsArray[options] = "Test Menu";
         optionsEnumArray[options++] = Test;
@@ -388,20 +379,14 @@ void menuHandler::systemBaseMenu()
     bannerOptions.optionsCount = options;
     bannerOptions.optionsEnumPtr = optionsEnumArray;
     bannerOptions.bannerCallback = [](int selected) -> void {
-        if (selected == Beeps) {
+        if (selected == Notifications) {
-            menuHandler::menuQueue = menuHandler::buzzermodemenupicker;
+            menuHandler::menuQueue = menuHandler::notifications_menu;
             screen->runNow();
-        } else if (selected == Brightness) {
+        } else if (selected == ScreenOptions) {
-            menuHandler::menuQueue = menuHandler::brightness_picker;
+            menuHandler::menuQueue = menuHandler::screen_options_menu;
             screen->runNow();
-        } else if (selected == Reboot) {
+        } else if (selected == PowerMenu) {
-            menuHandler::menuQueue = menuHandler::reboot_menu;
+            menuHandler::menuQueue = menuHandler::power_menu;
-            screen->runNow();
-        } else if (selected == MUI) {
-            menuHandler::menuQueue = menuHandler::mui_picker;
-            screen->runNow();
-        } else if (selected == Color) {
-            menuHandler::menuQueue = menuHandler::tftcolormenupicker;
             screen->runNow();
         } else if (selected == Test) {
             menuHandler::menuQueue = menuHandler::test_menu;
@@ -533,22 +518,19 @@ void menuHandler::compassNorthMenu()
         if (selected == Dynamic) {
             if (uiconfig.compass_mode != meshtastic_CompassMode_DYNAMIC) {
                 uiconfig.compass_mode = meshtastic_CompassMode_DYNAMIC;
-                nodeDB->saveProto("/prefs/uiconfig.proto", meshtastic_DeviceUIConfig_size, &meshtastic_DeviceUIConfig_msg,
+                saveUIConfig();
-                                  &uiconfig);
                 screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
             }
         } else if (selected == Fixed) {
             if (uiconfig.compass_mode != meshtastic_CompassMode_FIXED_RING) {
                 uiconfig.compass_mode = meshtastic_CompassMode_FIXED_RING;
-                nodeDB->saveProto("/prefs/uiconfig.proto", meshtastic_DeviceUIConfig_size, &meshtastic_DeviceUIConfig_msg,
+                saveUIConfig();
-                                  &uiconfig);
                 screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
             }
         } else if (selected == Freeze) {
             if (uiconfig.compass_mode != meshtastic_CompassMode_FREEZE_HEADING) {
                 uiconfig.compass_mode = meshtastic_CompassMode_FREEZE_HEADING;
-                nodeDB->saveProto("/prefs/uiconfig.proto", meshtastic_DeviceUIConfig_size, &meshtastic_DeviceUIConfig_msg,
+                saveUIConfig();
-                                  &uiconfig);
                 screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
             }
         } else if (selected == Back) {
@@ -610,7 +592,7 @@ void menuHandler::BuzzerModeMenu()
 {
     static const char *optionsArray[] = {"All Enabled", "Disabled", "Notifications", "System Only"};
     BannerOverlayOptions bannerOptions;
-    bannerOptions.message = "Beep Action";
+    bannerOptions.message = "Buzzer Mode";
     bannerOptions.optionsArrayPtr = optionsArray;
     bannerOptions.optionsCount = 4;
     bannerOptions.bannerCallback = [](int selected) -> void {
@@ -660,7 +642,7 @@ void menuHandler::BrightnessPickerMenu()
 #endif
 
             // Save to device
-            nodeDB->saveProto("/prefs/uiconfig.proto", meshtastic_DeviceUIConfig_size, &meshtastic_DeviceUIConfig_msg, &uiconfig);
+            saveUIConfig();
 
             LOG_INFO("Screen brightness set to %d", uiconfig.screen_brightness);
         }
@@ -671,13 +653,13 @@ void menuHandler::BrightnessPickerMenu()
 
 void menuHandler::switchToMUIMenu()
 {
-    static const char *optionsArray[] = {"Yes", "No"};
+    static const char *optionsArray[] = {"No", "Yes"};
     BannerOverlayOptions bannerOptions;
     bannerOptions.message = "Switch to MUI?";
     bannerOptions.optionsArrayPtr = optionsArray;
     bannerOptions.optionsCount = 2;
     bannerOptions.bannerCallback = [](int selected) -> void {
-        if (selected == 0) {
+        if (selected == 1) {
             config.display.displaymode = meshtastic_Config_DisplayConfig_DisplayMode_COLOR;
             config.bluetooth.enabled = false;
             service->reloadConfig(SEGMENT_CONFIG);
@@ -742,6 +724,9 @@ void menuHandler::TFTColorPickerMenu(OLEDDisplay *display)
             TFT_MESH_r = 255;
             TFT_MESH_g = 255;
             TFT_MESH_b = 255;
+        } else {
+            menuQueue = system_base_menu;
+            screen->runNow();
         }
 
 #if defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190) || HAS_TFT
@@ -771,7 +756,7 @@ void menuHandler::TFTColorPickerMenu(OLEDDisplay *display)
                 uiconfig.screen_rgb_color = (TFT_MESH_r << 16) | (TFT_MESH_g << 8) | TFT_MESH_b;
             }
             LOG_INFO("Storing Value of %d to uiconfig.screen_rgb_color", uiconfig.screen_rgb_color);
-            nodeDB->saveProto("/prefs/uiconfig.proto", meshtastic_DeviceUIConfig_size, &meshtastic_DeviceUIConfig_msg, &uiconfig);
+            saveUIConfig();
         }
 #endif
     };
@@ -790,6 +775,29 @@ void menuHandler::rebootMenu()
             IF_SCREEN(screen->showSimpleBanner("Rebooting...", 0));
             nodeDB->saveToDisk();
             rebootAtMsec = millis() + DEFAULT_REBOOT_SECONDS * 1000;
+        } else {
+            menuQueue = power_menu;
+            screen->runNow();
+        }
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
+
+void menuHandler::shutdownMenu()
+{
+    static const char *optionsArray[] = {"Back", "Confirm"};
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Shutdown Device?";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 2;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == 1) {
+            IF_SCREEN(screen->showSimpleBanner("Shutting Down...", 0));
+            nodeDB->saveToDisk();
+            power->shutdown();
+        } else {
+            menuQueue = power_menu;
+            screen->runNow();
         }
     };
     screen->showOverlayBanner(bannerOptions);
@@ -888,6 +896,117 @@ void menuHandler::wifiToggleMenu()
     screen->showOverlayBanner(bannerOptions);
 }
 
+void menuHandler::notificationsMenu()
+{
+    enum optionsNumbers { Back, BuzzerActions };
+    static const char *optionsArray[] = {"Back", "Buzzer Actions"};
+    static int optionsEnumArray[] = {Back, BuzzerActions};
+    int options = 2;
+
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Notifications";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = options;
+    bannerOptions.optionsEnumPtr = optionsEnumArray;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == BuzzerActions) {
+            menuHandler::menuQueue = menuHandler::buzzermodemenupicker;
+            screen->runNow();
+        } else {
+            menuQueue = system_base_menu;
+            screen->runNow();
+        }
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
+
+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
+    hasSupportBrightness = true;
+#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) {
+        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
+    optionsArray[options] = "Screen Color";
+    optionsEnumArray[options++] = ScreenColor;
+#endif
+
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Screen Options";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = options;
+    bannerOptions.optionsEnumPtr = optionsEnumArray;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == Brightness) {
+            menuHandler::menuQueue = menuHandler::brightness_picker;
+            screen->runNow();
+        } else if (selected == ScreenColor) {
+            menuHandler::menuQueue = menuHandler::tftcolormenupicker;
+            screen->runNow();
+        } else {
+            menuQueue = system_base_menu;
+            screen->runNow();
+        }
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
+
+void menuHandler::powerMenu()
+{
+
+    enum optionsNumbers { Back, Reboot, Shutdown, MUI };
+    static const char *optionsArray[4] = {"Back"};
+    static int optionsEnumArray[4] = {Back};
+    int options = 1;
+
+    optionsArray[options] = "Reboot";
+    optionsEnumArray[options++] = Reboot;
+
+    optionsArray[options] = "Shutdown";
+    optionsEnumArray[options++] = Shutdown;
+
+#if HAS_TFT
+    optionsArray[options] = "Switch to MUI";
+    optionsEnumArray[options++] = MUI;
+#endif
+
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Reboot / Shutdown";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = options;
+    bannerOptions.optionsEnumPtr = optionsEnumArray;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == Reboot) {
+            menuHandler::menuQueue = menuHandler::reboot_menu;
+            screen->runNow();
+        } else if (selected == Shutdown) {
+            menuHandler::menuQueue = menuHandler::shutdown_menu;
+            screen->runNow();
+        } else if (selected == MUI) {
+            menuHandler::menuQueue = menuHandler::mui_picker;
+            screen->runNow();
+        } else {
+            menuQueue = system_base_menu;
+            screen->runNow();
+        }
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
+
 void menuHandler::keyVerificationInitMenu()
 {
     screen->showNodePicker("Node to Verify", 30000,
@@ -941,6 +1060,9 @@ void menuHandler::handleMenuSwitch(OLEDDisplay *display)
     case clock_menu:
         clockMenu();
         break;
+    case system_base_menu:
+        systemBaseMenu();
+        break;
     case position_base_menu:
         positionBaseMenu();
         break;
@@ -970,6 +1092,9 @@ void menuHandler::handleMenuSwitch(OLEDDisplay *display)
     case reboot_menu:
         rebootMenu();
         break;
+    case shutdown_menu:
+        shutdownMenu();
+        break;
     case add_favorite:
         addFavoriteMenu();
         break;
@@ -994,6 +1119,15 @@ void menuHandler::handleMenuSwitch(OLEDDisplay *display)
     case bluetooth_toggle_menu:
         BluetoothToggleMenu();
         break;
+    case notifications_menu:
+        notificationsMenu();
+        break;
+    case screen_options_menu:
+        screenOptionsMenu();
+        break;
+    case power_menu:
+        powerMenu();
+        break;
     case throttle_message:
         screen->showSimpleBanner("Too Many Attempts\nTry again in 60 seconds.", 5000);
         break;
@@ -1001,6 +1135,11 @@ void menuHandler::handleMenuSwitch(OLEDDisplay *display)
     menuQueue = menu_none;
 }
 
+void menuHandler::saveUIConfig()
+{
+    nodeDB->saveProto("/prefs/uiconfig.proto", meshtastic_DeviceUIConfig_size, &meshtastic_DeviceUIConfig_msg, &uiconfig);
+}
+
 } // namespace graphics
 
 #endif

src/graphics/draw/MenuHandler.h

@@ -23,14 +23,19 @@ class menuHandler
         tftcolormenupicker,
         brightness_picker,
         reboot_menu,
+        shutdown_menu,
         add_favorite,
         remove_favorite,
         test_menu,
         number_test,
         wifi_toggle_menu,
+        bluetooth_toggle_menu,
+        notifications_menu,
+        screen_options_menu,
+        power_menu,
+        system_base_menu,
         key_verification_init,
         key_verification_final_prompt,
-        bluetooth_toggle_menu,
         throttle_message
     };
     static screenMenus menuQueue;
@@ -55,12 +60,19 @@ class menuHandler
     static void resetNodeDBMenu();
     static void BrightnessPickerMenu();
     static void rebootMenu();
+    static void shutdownMenu();
     static void addFavoriteMenu();
     static void removeFavoriteMenu();
     static void testMenu();
     static void numberTest();
     static void wifiBaseMenu();
     static void wifiToggleMenu();
+    static void notificationsMenu();
+    static void screenOptionsMenu();
+    static void powerMenu();
+
+  private:
+    static void saveUIConfig();
     static void keyVerificationInitMenu();
     static void keyVerificationFinalPrompt();
     static void BluetoothToggleMenu();

src/graphics/niche/InkHUD/Events.cpp

@@ -39,8 +39,8 @@ void InkHUD::Events::begin()
 void InkHUD::Events::onButtonShort()
 {
     // Audio feedback (via buzzer)
-    // Short low tone
+    // Short tone
-    playBoop();
+    playChirp();
     // Cancel any beeping, buzzing, blinking
     // Some button handling suppressed if we are dismissing an external notification (see below)
     bool dismissedExt = dismissExternalNotification();
@@ -64,8 +64,8 @@ void InkHUD::Events::onButtonShort()
 void InkHUD::Events::onButtonLong()
 {
     // Audio feedback (via buzzer)
-    // Low tone, longer than playBoop
+    // Slightly longer than playChirp
-    playBeep();
+    playBoop();
 
     // Check which system applet wants to handle the button press (if any)
     SystemApplet *consumer = nullptr;

src/input/SeesawRotary.cpp

@@ -0,0 +1,83 @@
+#ifdef ARCH_PORTDUINO
+#include "SeesawRotary.h"
+#include "input/InputBroker.h"
+
+using namespace concurrency;
+
+SeesawRotary *seesawRotary;
+
+SeesawRotary::SeesawRotary(const char *name) : OSThread(name)
+{
+    _originName = name;
+}
+
+bool SeesawRotary::init()
+{
+    if (inputBroker)
+        inputBroker->registerSource(this);
+
+    if (!ss.begin(SEESAW_ADDR)) {
+        return false;
+    }
+    // attachButtonInterrupts();
+
+    uint32_t version = ((ss.getVersion() >> 16) & 0xFFFF);
+    if (version != 4991) {
+        LOG_WARN("Wrong firmware loaded? %u", version);
+    } else {
+        LOG_INFO("Found Product 4991");
+    }
+    /*
+    #ifdef ARCH_ESP32
+        // Register callbacks for before and after lightsleep
+        // Used to detach and reattach interrupts
+        lsObserver.observe(&notifyLightSleep);
+        lsEndObserver.observe(&notifyLightSleepEnd);
+    #endif
+    */
+    ss.pinMode(SS_SWITCH, INPUT_PULLUP);
+
+    // get starting position
+    encoder_position = ss.getEncoderPosition();
+
+    ss.setGPIOInterrupts((uint32_t)1 << SS_SWITCH, 1);
+    ss.enableEncoderInterrupt();
+    canSleep = true; // Assume we should not keep the board awake
+
+    return true;
+}
+
+int32_t SeesawRotary::runOnce()
+{
+    InputEvent e;
+    e.inputEvent = INPUT_BROKER_NONE;
+    bool currentlyPressed = !ss.digitalRead(SS_SWITCH);
+
+    if (currentlyPressed && !wasPressed) {
+        e.inputEvent = INPUT_BROKER_SELECT;
+    }
+    wasPressed = currentlyPressed;
+
+    int32_t new_position = ss.getEncoderPosition();
+    // did we move arounde?
+    if (encoder_position != new_position) {
+        if (encoder_position == 0 && new_position != 1) {
+            e.inputEvent = INPUT_BROKER_ALT_PRESS;
+        } else if (new_position == 0 && encoder_position != 1) {
+            e.inputEvent = INPUT_BROKER_USER_PRESS;
+        } else if (new_position > encoder_position) {
+            e.inputEvent = INPUT_BROKER_USER_PRESS;
+        } else {
+            e.inputEvent = INPUT_BROKER_ALT_PRESS;
+        }
+        encoder_position = new_position;
+    }
+    if (e.inputEvent != INPUT_BROKER_NONE) {
+        e.source = this->_originName;
+        e.kbchar = 0x00;
+        this->notifyObservers(&e);
+    }
+
+    return 50;
+}
+#endif

src/input/SeesawRotary.h

@@ -0,0 +1,29 @@
+#pragma once
+#ifdef ARCH_PORTDUINO
+
+#include "Adafruit_seesaw.h"
+#include "InputBroker.h"
+#include "concurrency/OSThread.h"
+#include "configuration.h"
+
+#define SS_SWITCH 24
+#define SS_NEOPIX 6
+
+#define SEESAW_ADDR 0x36
+
+class SeesawRotary : public Observable<const InputEvent *>, public concurrency::OSThread
+{
+  public:
+    const char *_originName;
+    bool init();
+    SeesawRotary(const char *name);
+    int32_t runOnce() override;
+
+  private:
+    Adafruit_seesaw ss;
+    int32_t encoder_position;
+    bool wasPressed = false;
+};
+
+extern SeesawRotary *seesawRotary;
+#endif

src/input/kbUsbBase.cpp

@@ -0,0 +1,72 @@
+#include "kbUsbBase.h"
+#include "configuration.h"
+
+#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2
+
+KbUsbBase::KbUsbBase(const char *name) : concurrency::OSThread(name)
+{
+    this->_originName = name;
+}
+
+int32_t KbUsbBase::runOnce()
+{
+    if (firstTime) {
+        // This is the first time the OSThread library has called this function, so init the USB HID routines
+        begin();
+        firstTime = 0;
+    } else {
+
+        task();
+    }
+    return 100;
+}
+
+void KbUsbBase::onKeyboardKey(uint8_t ascii, uint8_t keycode, uint8_t modifier)
+{
+
+    if (ascii != 0) {
+        LOG_DEBUG("Key 0x%x Code 0x%x Mod 0x%x pressed\n", ascii, keycode, modifier);
+        // reset shift now that we have a keypress
+        InputEvent e;
+        e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+        e.source = this->_originName;
+        switch (ascii) {
+        case 0x1b: // ESC
+            e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_CANCEL;
+            break;
+        case 0x08: // Back
+            e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_BACK;
+            e.kbchar = ascii;
+            break;
+        case 0xb5: // Up
+            e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP;
+            break;
+        case 0xb6: // Down
+            e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN;
+            break;
+        case 0xb4: // Left
+            e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT;
+            e.kbchar = ascii;
+            break;
+        case 0xb7: // Right
+            e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT;
+            e.kbchar = ascii;
+            break;
+        case 0x0d: // Enter
+            e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT;
+            break;
+        case 0x00: // nopress
+            e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+            break;
+        default: // all other keys
+            e.inputEvent = ANYKEY;
+            e.kbchar = ascii;
+            break;
+        }
+        if (e.inputEvent != meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE) {
+            this->notifyObservers(&e);
+        }
+    }
+}
+
+#endif

src/input/kbUsbBase.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include "InputBroker.h"
+#include "concurrency/OSThread.h"
+#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2
+#include "EspUsbHost.h"
+
+class KbUsbBase : public Observable<const InputEvent *>, public concurrency::OSThread, public EspUsbHost
+{
+  public:
+    explicit KbUsbBase(const char *name);
+
+  protected:
+    virtual int32_t runOnce() override;
+
+  private:
+    void onKeyboardKey(uint8_t ascii, uint8_t keycode, uint8_t modifier);
+    const char *_originName;
+    bool firstTime = 1;
+};
+#endif

src/input/kbUsbImpl.cpp

@@ -0,0 +1,15 @@
+#include "kbUsbImpl.h"
+#include "InputBroker.h"
+
+#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2
+
+KbUsbImpl *kbUsbImpl;
+
+KbUsbImpl::KbUsbImpl() : KbUsbBase("usbKB") {}
+
+void KbUsbImpl::init()
+{
+    inputBroker->registerSource(this);
+}
+
+#endif // INPUTBROKER_MATRIX_TYPE

src/input/kbUsbImpl.h

@@ -0,0 +1,23 @@
+#pragma once
+#include "kbUsbBase.h"
+#include "main.h"
+
+#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2
+
+/**
+ * @brief The idea behind this class to have static methods for the event handlers.
+ *      Check attachInterrupt() at RotaryEncoderInteruptBase.cpp
+ *      Technically you can have as many rotary encoders hardver attached
+ *      to your device as you wish, but you always need to have separate event
+ *      handlers, thus you need to have a RotaryEncoderInterrupt implementation.
+ */
+class KbUsbImpl : public KbUsbBase
+{
+  public:
+    KbUsbImpl();
+    void init();
+};
+
+extern KbUsbImpl *kbUsbImpl;
+
+#endif

src/mesh/Default.h

@@ -24,6 +24,11 @@
 #define min_node_info_broadcast_secs 60 * 60 // No regular broadcasts of more than once an hour
 #define min_neighbor_info_broadcast_secs 4 * 60 * 60
 #define default_map_publish_interval_secs 60 * 60
+#ifdef USERPREFS_RINGTONE_NAG_SECS
+#define default_ringtone_nag_secs USERPREFS_RINGTONE_NAG_SECS
+#else
+#define default_ringtone_nag_secs 60
+#endif
 
 #define default_mqtt_address "mqtt.meshtastic.org"
 #define default_mqtt_username "meshdev"

src/mesh/NodeDB.cpp

@@ -344,6 +344,22 @@ NodeDB::NodeDB()
         config.device.node_info_broadcast_secs = MAX_INTERVAL;
     if (config.position.position_broadcast_secs > MAX_INTERVAL)
         config.position.position_broadcast_secs = MAX_INTERVAL;
+    if (config.position.gps_update_interval > MAX_INTERVAL)
+        config.position.gps_update_interval = MAX_INTERVAL;
+    if (config.position.gps_attempt_time > MAX_INTERVAL)
+        config.position.gps_attempt_time = MAX_INTERVAL;
+    if (config.position.position_flags > MAX_INTERVAL)
+        config.position.position_flags = MAX_INTERVAL;
+    if (config.position.rx_gpio > MAX_INTERVAL)
+        config.position.rx_gpio = MAX_INTERVAL;
+    if (config.position.tx_gpio > MAX_INTERVAL)
+        config.position.tx_gpio = MAX_INTERVAL;
+    if (config.position.broadcast_smart_minimum_distance > MAX_INTERVAL)
+        config.position.broadcast_smart_minimum_distance = MAX_INTERVAL;
+    if (config.position.broadcast_smart_minimum_interval_secs > MAX_INTERVAL)
+        config.position.broadcast_smart_minimum_interval_secs = MAX_INTERVAL;
+    if (config.position.gps_en_gpio > MAX_INTERVAL)
+        config.position.gps_en_gpio = MAX_INTERVAL;
     if (moduleConfig.neighbor_info.update_interval > MAX_INTERVAL)
         moduleConfig.neighbor_info.update_interval = MAX_INTERVAL;
     if (moduleConfig.telemetry.device_update_interval > MAX_INTERVAL)
@@ -778,7 +794,7 @@ void NodeDB::installDefaultModuleConfig()
     moduleConfig.external_notification.output_buzzer = PIN_BUZZER;
     moduleConfig.external_notification.use_pwm = true;
     moduleConfig.external_notification.alert_message_buzzer = true;
-    moduleConfig.external_notification.nag_timeout = 60;
+    moduleConfig.external_notification.nag_timeout = default_ringtone_nag_secs;
 #endif
 #if defined(RAK4630) || defined(RAK11310) || defined(RAK3312)
     // Default to RAK led pin 2 (blue)
@@ -787,7 +803,7 @@ void NodeDB::installDefaultModuleConfig()
     moduleConfig.external_notification.active = true;
     moduleConfig.external_notification.alert_message = true;
     moduleConfig.external_notification.output_ms = 1000;
-    moduleConfig.external_notification.nag_timeout = 60;
+    moduleConfig.external_notification.nag_timeout = default_ringtone_nag_secs;
 #endif
 
 #ifdef HAS_I2S
@@ -796,10 +812,10 @@ void NodeDB::installDefaultModuleConfig()
     moduleConfig.external_notification.use_i2s_as_buzzer = true;
     moduleConfig.external_notification.alert_message_buzzer = true;
 #if HAS_TFT
-    if (moduleConfig.external_notification.nag_timeout == 60)
+    if (moduleConfig.external_notification.nag_timeout == default_ringtone_nag_secs)
         moduleConfig.external_notification.nag_timeout = 0;
 #else
-    moduleConfig.external_notification.nag_timeout = 60;
+    moduleConfig.external_notification.nag_timeout = default_ringtone_nag_secs;
 #endif
 #endif
 #ifdef NANO_G2_ULTRA
@@ -1309,6 +1325,13 @@ void NodeDB::loadFromDisk()
 
         saveToDisk(SEGMENT_MODULECONFIG);
     }
+#if ARCH_PORTDUINO
+    // set any config overrides
+    if (settingsMap[has_configDisplayMode]) {
+        config.display.displaymode = (_meshtastic_Config_DisplayConfig_DisplayMode)settingsMap[configDisplayMode];
+    }
+
+#endif
 }
 
 /** Save a protobuf from a file, return true for success */

src/modules/CannedMessageModule.cpp

@@ -454,7 +454,7 @@ int CannedMessageModule::handleDestinationSelectionInput(const InputEvent *event
         else if ((destIndex / columns) >= (scrollIndex + visibleRows))
             scrollIndex = (destIndex / columns) - visibleRows + 1;
 
-        screen->forceDisplay();
+        screen->forceDisplay(true);
         return 1;
     }
 
@@ -469,7 +469,7 @@ int CannedMessageModule::handleDestinationSelectionInput(const InputEvent *event
         if ((destIndex / columns) >= (scrollIndex + visibleRows))
             scrollIndex = (destIndex / columns) - visibleRows + 1;
 
-        screen->forceDisplay();
+        screen->forceDisplay(true);
         return 1;
     }
 
@@ -491,7 +491,7 @@ int CannedMessageModule::handleDestinationSelectionInput(const InputEvent *event
 
         runState = returnToCannedList ? CANNED_MESSAGE_RUN_STATE_ACTIVE : CANNED_MESSAGE_RUN_STATE_FREETEXT;
         returnToCannedList = false;
-        screen->forceDisplay();
+        screen->forceDisplay(true);
         return 1;
     }
 
@@ -504,7 +504,7 @@ int CannedMessageModule::handleDestinationSelectionInput(const InputEvent *event
         // UIFrameEvent e;
         // e.action = UIFrameEvent::Action::REGENERATE_FRAMESET;
         // notifyObservers(&e);
-        screen->forceDisplay();
+        screen->forceDisplay(true);
         return 1;
     }
 
@@ -2077,4 +2077,4 @@ String CannedMessageModule::drawWithCursor(String text, int cursor)
     return result;
 }
 
-#endif
+#endif

src/modules/ExternalNotificationModule.cpp

@@ -362,9 +362,8 @@ ExternalNotificationModule::ExternalNotificationModule()
         if (nodeDB->loadProto(rtttlConfigFile, meshtastic_RTTTLConfig_size, sizeof(meshtastic_RTTTLConfig),
                               &meshtastic_RTTTLConfig_msg, &rtttlConfig) != LoadFileResult::LOAD_SUCCESS) {
             memset(rtttlConfig.ringtone, 0, sizeof(rtttlConfig.ringtone));
-            strncpy(rtttlConfig.ringtone,
+            // The default ringtone is always loaded from userPrefs.jsonc
-                    "24:d=32,o=5,b=565:f6,p,f6,4p,p,f6,p,f6,2p,p,b6,p,b6,p,b6,p,b6,p,b,p,b,p,b,p,b,p,b,p,b,p,b,p,b,1p.,2p.,p",
+            strncpy(rtttlConfig.ringtone, USERPREFS_RINGTONE_RTTTL, sizeof(rtttlConfig.ringtone));
-                    sizeof(rtttlConfig.ringtone));
         }
 
         LOG_INFO("Init External Notification Module");

src/modules/KeyVerificationModule.cpp

@@ -86,9 +86,11 @@ bool KeyVerificationModule::handleReceivedProtobuf(const meshtastic_MeshPacket &
             sprintf(message, "Verification: \n");
             generateVerificationCode(message + 15);
             LOG_INFO("Hash1 matches!");
-            IF_SCREEN(static const char *optionsArray[] = {"Reject", "Accept"}; graphics::BannerOverlayOptions options;
+            static const char *optionsArray[] = {"Reject", "Accept"};
-                      options.message = message; options.durationMs = 30000; options.optionsArrayPtr = optionsArray;
+            // Don't try to put the array definition in the macro. Does not work with curly braces.
-                      options.optionsCount = 2; options.notificationType = graphics::notificationTypeEnum::selection_picker;
+            IF_SCREEN(graphics::BannerOverlayOptions options; options.message = message; options.durationMs = 30000;
+                      options.optionsArrayPtr = optionsArray; options.optionsCount = 2;
+                      options.notificationType = graphics::notificationTypeEnum::selection_picker;
                       options.bannerCallback =
                           [=](int selected) {
                               if (selected == 1) {

src/modules/Modules.cpp

@@ -12,6 +12,7 @@
 #include "input/cardKbI2cImpl.h"
 #endif
 #include "input/kbMatrixImpl.h"
+#include "input/kbUsbImpl.h"
 #endif
 #if !MESHTASTIC_EXCLUDE_PKI
 #include "KeyVerificationModule.h"
@@ -53,6 +54,7 @@
 #endif
 #if ARCH_PORTDUINO
 #include "input/LinuxInputImpl.h"
+#include "input/SeesawRotary.h"
 #include "modules/Telemetry/HostMetrics.h"
 #if !MESHTASTIC_EXCLUDE_STOREFORWARD
 #include "modules/StoreForwardModule.h"
@@ -163,7 +165,6 @@ void setupModules()
         // Example: Put your module here
         // new ReplyModule();
 #if (HAS_BUTTON || ARCH_PORTDUINO) && !MESHTASTIC_EXCLUDE_INPUTBROKER
-
         if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
             rotaryEncoderInterruptImpl1 = new RotaryEncoderInterruptImpl1();
             if (!rotaryEncoderInterruptImpl1->init()) {
@@ -181,14 +182,23 @@ void setupModules()
             kbMatrixImpl = new KbMatrixImpl();
             kbMatrixImpl->init();
 #endif // INPUTBROKER_MATRIX_TYPE
+#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2
+        kbUsbImpl = new KbUsbImpl();
+        kbUsbImpl->init();
+#endif
 #ifdef INPUTBROKER_SERIAL_TYPE
             aSerialKeyboardImpl = new SerialKeyboardImpl();
             aSerialKeyboardImpl->init();
-#endif // INPUTBROKER_MATRIX_TYPE
+#endif // INPUTBROKER_SERIAL_TYPE
         }
 #endif // HAS_BUTTON
 #if ARCH_PORTDUINO
         if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
+            seesawRotary = new SeesawRotary("SeesawRotary");
+            if (!seesawRotary->init()) {
+                delete seesawRotary;
+                seesawRotary = nullptr;
+            }
             aLinuxInputImpl = new LinuxInputImpl();
             aLinuxInputImpl->init();
         }

src/modules/TextMessageModule.cpp

@@ -4,6 +4,7 @@
 #include "PowerFSM.h"
 #include "buzz.h"
 #include "configuration.h"
+#include "graphics/Screen.h"
 TextMessageModule *textMessageModule;
 
 ProcessMessage TextMessageModule::handleReceived(const meshtastic_MeshPacket &mp)
@@ -17,7 +18,10 @@ ProcessMessage TextMessageModule::handleReceived(const meshtastic_MeshPacket &mp
     devicestate.rx_text_message = mp;
     devicestate.has_rx_text_message = true;
 
-    powerFSM.trigger(EVENT_RECEIVED_MSG);
+    // Only trigger screen wake if configuration allows it
+    if (shouldWakeOnReceivedMessage()) {
+        powerFSM.trigger(EVENT_RECEIVED_MSG);
+    }
     notifyObservers(&mp);
 
     return ProcessMessage::CONTINUE; // Let others look at this message also if they want

src/platform/portduino/PortduinoGlue.cpp

@@ -35,6 +35,8 @@ char *configPath = nullptr;
 char *optionMac = nullptr;
 bool forceSimulated = false;
 
+const char *argp_program_version = optstr(APP_VERSION);
+
 // FIXME - move setBluetoothEnable into a HALPlatform class
 void setBluetoothEnable(bool enable)
 {
@@ -665,6 +667,21 @@ bool loadConfig(const char *configPath)
             settingsStrings[hostMetrics_user_command] = (yamlConfig["HostMetrics"]["UserStringCommand"]).as<std::string>("");
         }
 
+        if (yamlConfig["Config"]) {
+            if (yamlConfig["Config"]["DisplayMode"]) {
+                settingsMap[has_configDisplayMode] = true;
+                if ((yamlConfig["Config"]["DisplayMode"]).as<std::string>("") == "TWOCOLOR") {
+                    settingsMap[configDisplayMode] = meshtastic_Config_DisplayConfig_DisplayMode_TWOCOLOR;
+                } else if ((yamlConfig["Config"]["DisplayMode"]).as<std::string>("") == "INVERTED") {
+                    settingsMap[configDisplayMode] = meshtastic_Config_DisplayConfig_DisplayMode_INVERTED;
+                } else if ((yamlConfig["Config"]["DisplayMode"]).as<std::string>("") == "COLOR") {
+                    settingsMap[configDisplayMode] = meshtastic_Config_DisplayConfig_DisplayMode_COLOR;
+                } else {
+                    settingsMap[configDisplayMode] = meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT;
+                }
+            }
+        }
+
         if (yamlConfig["General"]) {
             settingsMap[maxnodes] = (yamlConfig["General"]["MaxNodes"]).as<int>(200);
             settingsMap[maxtophone] = (yamlConfig["General"]["MaxMessageQueue"]).as<int>(100);

src/platform/portduino/PortduinoGlue.h

@@ -109,7 +109,9 @@ enum configNames {
     mac_address,
     hostMetrics_interval,
     hostMetrics_channel,
-    hostMetrics_user_command
+    hostMetrics_user_command,
+    configDisplayMode,
+    has_configDisplayMode
 };
 enum { no_screen, x11, fb, st7789, st7735, st7735s, st7796, ili9341, ili9342, ili9486, ili9488, hx8357d };
 enum { no_touchscreen, xpt2046, stmpe610, gt911, ft5x06 };

userPrefs.jsonc

@@ -53,5 +53,7 @@
   // "USERPREFS_MQTT_ENCRYPTION_ENABLED": "true",
   // "USERPREFS_MQTT_TLS_ENABLED": "false",
   // "USERPREFS_MQTT_ROOT_TOPIC": "event/REPLACEME",
+  // "USERPREFS_RINGTONE_NAG_SECS": "60",
+  "USERPREFS_RINGTONE_RTTTL": "24:d=32,o=5,b=565:f6,p,f6,4p,p,f6,p,f6,2p,p,b6,p,b6,p,b6,p,b6,p,b,p,b,p,b,p,b,p,b,p,b,p,b,p,b,1p.,2p.,p",
   "USERPREFS_TZ_STRING": "tzplaceholder                                         "
 }

variants/ELECROW-ThinkNode-M1/nicheGraphics.h

@@ -104,11 +104,11 @@ void setupNicheGraphics()
     buttons->setHandlerDown(1, [backlight]() { backlight->peek(); });
     buttons->setHandlerLongPress(1, [backlight]() {
         backlight->latch();
-        playBeep();
+        playBoop();
     });
     buttons->setHandlerShortPress(1, [backlight]() {
         backlight->off();
-        playBoop();
+        playChirp();
     });
 
     // Begin handling button events

variants/bpi_picow_esp32_s3/platformio.ini

@@ -8,7 +8,7 @@ board_level = extra
 upload_protocol = esptool
 ;upload_port = /dev/ttyACM2
 lib_deps =
-  ${esp32_base.lib_deps}
+  ${esp32s3_base.lib_deps}
   caveman99/ESP32 Codec2@^1.0.1
 build_flags = 
-  ${esp32_base.build_flags} -D PRIVATE_HW -I variants/bpi_picow_esp32_s3
+  ${esp32s3_base.build_flags} -D PRIVATE_HW -I variants/bpi_picow_esp32_s3

variants/diy/esp32c3_super_mini/pins_arduino.h

@@ -0,0 +1,24 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+static const uint8_t TX = 21;
+static const uint8_t RX = 20;
+
+static const uint8_t SDA = 1;
+static const uint8_t SCL = 0;
+
+static const uint8_t SS = 8;
+static const uint8_t MOSI = 7;
+static const uint8_t MISO = 6;
+static const uint8_t SCK = 10;
+
+static const uint8_t A0 = 0;
+static const uint8_t A1 = 1;
+static const uint8_t A2 = 2;
+static const uint8_t A3 = 3;
+static const uint8_t A4 = 4;
+static const uint8_t A5 = 5;
+
+#endif /* Pins_Arduino_h */

variants/diy/esp32c3_super_mini/variant.h

@@ -0,0 +1,61 @@
+#ifndef _VARIANT_ESP32C3_SUPER_MINI_
+#define _VARIANT_ESP32C3_SUPER_MINI_
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+// I2C (Wire) & OLED
+#define WIRE_INTERFACES_COUNT (1)
+#define I2C_SDA (1)
+#define I2C_SCL (0)
+
+#define USE_SSD1306
+
+// GPS
+#undef GPS_RX_PIN
+#undef GPS_TX_PIN
+#define GPS_RX_PIN (20)
+#define GPS_TX_PIN (21)
+
+// Button
+#define BUTTON_PIN (9) // BOOT button
+
+// LoRa
+#define USE_LLCC68
+#define USE_SX1262
+// #define USE_RF95
+#define USE_SX1268
+
+#define LORA_DIO0 RADIOLIB_NC
+#define LORA_RESET (5)
+#define LORA_DIO1 (3)
+#define LORA_RXEN (2)
+#define LORA_BUSY (4)
+#define LORA_SCK (10)
+#define LORA_MISO (6)
+#define LORA_MOSI (7)
+#define LORA_CS (8)
+
+#define SX126X_CS LORA_CS
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY LORA_BUSY
+#define SX126X_RESET LORA_RESET
+#define SX126X_RXEN LORA_RXEN
+
+#define SX126X_DIO3_TCXO_VOLTAGE (1.8)
+#define TCXO_OPTIONAL // make it so that the firmware can try both TCXO and XTAL
+
+#ifdef __cplusplus
+}
+#endif
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#endif

variants/diy/platformio.ini

@@ -96,6 +96,20 @@ board_level = extra
 build_flags = ${env:seeed_xiao_nrf52840_kit.build_flags} -D PRIVATE_HW -DXIAO_BLE_LEGACY_PINOUT -DEBYTE_E22 -DEBYTE_E22_900M30S
 build_unflags = -DGPS_L76K
 
+; Seeed XIAO nRF52840 + EBYTE E22-900M30S - Pinout matching Wio-SX1262 (SKU 113010003)
+[env:seeed_xiao_nrf52840_e22_900m30s]
+extends = env:seeed_xiao_nrf52840_kit
+board_level = extra
+build_flags = ${env:seeed_xiao_nrf52840_kit.build_flags} -D PRIVATE_HW -DEBYTE_E22 -DEBYTE_E22_900M30S
+build_unflags = -DGPS_L76K
+
+; Seeed XIAO nRF52840 + EBYTE E22-900M33S - Pinout matching Wio-SX1262 (SKU 113010003)
+[env:seeed_xiao_nrf52840_e22_900m33s]
+extends = env:seeed_xiao_nrf52840_kit
+board_level = extra
+build_flags = ${env:seeed_xiao_nrf52840_kit.build_flags} -D PRIVATE_HW -DEBYTE_E22 -DEBYTE_E22_900M33S
+build_unflags = -DGPS_L76K
+
 ; Seeed XIAO nRF52840 + XIAO Wio SX1262 DIY
 [env:seeed-xiao-nrf52840-wio-sx1262]
 board = xiao_ble_sense
@@ -127,3 +141,16 @@ build_flags =
   -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

variants/diy/xiao_ble/README.md

@@ -1,264 +1,168 @@
-#
+# XIAO nrf52840/nrf52840 Sense + Ebyte E22-900M30S
 
-<p align="center" style="font-size: 28px;">
+_A step-by-step guide for macOS and Linux._
-    Xiao BLE/BLE Sense + Ebyte E22-900M30S
-</p>
-
-<p align="center" style="font-size: 20px;">
-    A step-by-step guide for macOS and Linux
-</p>
 
 ## Introduction
 
-This guide will walk you through everything needed to get the Xiao BLE (or BLE Sense) running Meshtastic using an Ebyte E22-900M30S LoRa module. The combination of the E22 with an nRF52840 MCU is desirable because it allows for both very low idle (Rx) power draw <i>and</i> high transmit power. The Xiao BLE is a small but surprisingly well-appointed nRF52840 board, with enough GPIO for most Meshtastic applications and a built-in LiPo charger. The E22, on the other hand, is a famously inscrutable and mysterious beast. It is one of the more readily available LoRa modules capable of transmitting at 30 dBm, and includes an LNA to boost its Rx sensitivity a few dB beyond that of the SX1262. However, its documentation is relatively sparse overall, and seems to merely hint at (or completely omit) several key details regarding its functionality. Thus, much of what follows is a synthesis of my observations and inferences over the course of many hours of trial and error.
+This guide will walk you through everything needed to get the XIAO nrf52840 (or XIAO nrf52840 Sense) running Meshtastic using an Ebyte E22-900M30S LoRa module. The combination of the E22 with an nRF52840 MCU is desirable because it allows for both very low idle (Rx) power draw _and_ high transmit power.
 
-<h3>Acknowledgement and friendly disclaimer</h3>
+The XIAO nrf52840 is a small but surprisingly well-appointed nRF52840 board, with enough GPIO for most Meshtastic applications and a built-in LiPo charger.
+
+The E22, on the other hand, is a famously inscrutable and mysterious beast. It is one of the more readily available LoRa modules capable of transmitting at 30 dBm, and includes an LNA to boost its Rx sensitivity a few dB beyond that of the SX1262.
+
+However, its documentation is relatively sparse overall, and seems to merely hint at (or completely omit) several key details regarding its functionality. Thus, much of what follows is a synthesis of my observations and inferences over the course of many hours of trial and error.
+
+### Acknowledgement and Friendly Disclaimer
 
 Huge thanks to those in the community who have forged the way with the E22, without whose hard work none of this would have been possible! (thebentern, riddick, rainer_vie, beegee-tokyo, geeksville, caveman99, Der_Bear, PlumRugOfDoom, BigCorvus, and many others.)
 
-<br>
-
 Please take the conclusions here as a tentative work in progress, representing my current (and fairly limited) understanding of the E22 when paired with this particular MCU. It is my hope that this guide will be helpful to others who are interested in trying a DIY Meshtastic build, and also be subject to revision by folks with more experience and better test equipment.
 
-### Obligatory liability disclaimer
+### Obligatory Liability Disclaimer
 
 This guide and all associated content is for informational purposes only. The information presented is intended for consumption only by persons having appropriate technical skill and judgement, to be used entirely at their own discretion and risk. The authors of this guide in no way provide any warranty, express or implied, toward the content herein, nor its correctness, safety, or suitability to any particular purpose. By following the instructions in this guide in part or in full, you assume all responsibility for all potential risks, including but not limited to fire, property damage, bodily injury, and death.
 
-### Note
+## 1. Wire the board
 
-These instructions assume you are running macOS or Linux, but it should be relatively easy to translate each command for Windows. (In this case, in step 2 below, each line of `xiao_ble.sh` would also need to be converted to the equivalent Windows CLI command and run individually.)
+Connecting the E22 to the XIAO nrf52840 is straightforward, but there are a few gotchas to be mindful of.
 
-## 1. Update Bootloader
+### On the XIAO nrf52840
 
-The first thing you will need to do is update the Xiao BLE's bootloader. The stock bootloader is functionally very similar to the Adafruit nRF52 UF2 bootloader, but apparently not quite enough so to work with Meshtastic out of the box.
+- Pins D4 and D5 are currently mapped to `PIN_WIRE_SDA` and `PIN_WIRE_SCL`, respectively. If you are not using I²C and would like to free up pins D4 and D5 for use as GPIO, `PIN_WIRE_SDA` and `PIN_WIRE_SCL` can be reassigned to any two other unused pin numbers.
+- Pins D6 and D7 were originally mapped to the TX and RX pins for serial interface 1 (`PIN_SERIAL1_RX` and `PIN_SERIAL1_TX`) but are currently set to -1 in `variant.h`. If you need to expose a serial interface, you can restore these pins and move e.g. `SX126X_RXEN` to pin 4 or 5 (the opposite should work too).
 
-1. Connect the Xiao BLE to your computer via USB-C.
+### On the E22
 
-2. Install `adafruit-nrfutil` by following the instructions <a href="https://github.com/adafruit/Adafruit_nRF52_nrfutil">here</a>.
+- There are two options for the E22's `TXEN` pin:
+  1. It can be connected to the MCU on the pin defined as `SX126X_TXEN` in `variant.h`. In this configuration, the MCU will control Tx/Rx switching "manually". As long as `SX126X_TXEN` and `SX126X_RXEN` are both defined in `variant.h` (and neither is set to `RADIOLIB_NC`), `SX126xInterface.cpp` will initialize the E22 correctly for this mode.
+  2. Alternately, it can be connected to the E22's `DIO2` pin only, with neither `TXEN` nor `DIO2` being connected to the MCU. In this configuration, the E22 will control Tx/Rx switching automatically. In `variant.h`, as long as `SX126X_TXEN` is defined as `RADIOLIB_NC`, and `SX126X_RXEN` is defined and connected to the E22's `RXEN` pin, and `E22_TXEN_CONNECTED_TO_DIO2` is defined, `SX126xInterface.cpp` will initialize the E22 correctly for this mode. This configuration frees up a GPIO, and presents no drawbacks that I have found.
+- Note that any combination other than the two described above will likely result in unexpected behavior. In my testing, some of these other configurations appeared to "work" at first glance, but every one I tried had at least one of the following flaws: weak Tx power, extremely poor Rx sensitivity, or the E22 overheating because TXEN was never pulled low, causing its PA to stay on indefinitely.
+- Along the same lines, it is a good idea to check the E22's temperature frequently by lightly touching the shield. If you feel the shield getting hot (i.e. approaching uncomfortable to touch) near pins 1, 2, and 3, something is probably misconfigured; disconnect both the XIAO nrf52840 and E22 from power and double check wiring and pin mapping.
+- Whether you opt to let the E22 control Rx and Tx or handle this manually, **the E22's `RXEN` pin must always be connected to the MCU** on the pin defined as `SX126X_RXEN` in `variant.h`.
 
-3. Open a terminal window and navigate to `firmware/variants/xiao_ble` (where `firmware` is the directory into which you have cloned the <a href="https://github.com/meshtastic/firmware">Meshtastic firmware repo</a>).
+#### Note
 
-4. Run the following command, replacing `/dev/cu.usbmodem2101` with the serial port your Xiao BLE is connected to:
+The default pin mapping in `variant.h` uses "Automatic Tx/Rx switching" mode.
 
-   ```bash
+If you wire your board for Manual Tx/Rx Switching Mode, `SX126X_TXEN` must be defined (`#define #define SX126X_TXEN D6`) in `variants/seeed_xiao_nrf52840_kit/variant.h` in the code block following:
-   adafruit-nrfutil --verbose dfu serial --package xiao_nrf52840_ble_bootloader-0.7.0-22-g277a0c8_s140_7.3.0.zip --port /dev/cu.usbmodem2101 -b 115200 --singlebank --touch 1200
-   ```
 
-5. If all goes well, the Xiao BLE's red LED should start to pulse slowly, and you should see a new USB storage device called `XIAO-BOOT` appear under `Locations` in Finder.
+```c
+#ifdef XIAO_BLE_LEGACY_PINOUT
+// Legacy xiao_ble variant pinout for third-party SX126x modules e.g. EBYTE E22
+```
 
-&nbsp;
+### Example Wiring for Automatic Tx/Rx Switching Mode
 
-## 2. PlatformIO Environment Preparation
+#### MCU -> E22 Connections
 
-Before building Meshtastic for the Xiao BLE + E22, it is necessary to pull in SoftDevice 7.3.0 and its associated linker script (nrf52840_s140_v7.ld) from Seeed Studio's Arduino core. The `xiao_ble.sh` script does this.
+| XIAO nrf52840 pin | variant.h definition | E22 pin   | Notes                                                                                                                |
+| :---------------- | :------------------- | :-------- | :------------------------------------------------------------------------------------------------------------------- |
+| D0                | SX126X_CS            | 19 (NSS)  |                                                                                                                      |
+| D1                | SX126X_DIO1          | 13 (DIO1) |                                                                                                                      |
+| D2                | SX126X_BUSY          | 14 (BUSY) |                                                                                                                      |
+| D3                | SX126X_RESET         | 15 (NRST) |                                                                                                                      |
+| D7                | SX126X_RXEN          | 6 (RXEN)  | These pins must still be connected, and `SX126X_RXEN` defined in `variant.h`, otherwise Rx sensitivity will be poor. |
+| D8                | PIN_SPI_SCK          | 18 (SCK)  |                                                                                                                      |
+| D9                | PIN_SPI_MISO         | 16 (MISO) |                                                                                                                      |
+| D10               | PIN_SPI_MOSI         | 17 (MOSI) |                                                                                                                      |
 
-1. In your terminal window, run the following command:
+#### E22 -> E22 Connections
-
-   ```bash
-   sudo ./xiao_ble.sh
-   ```
-
-&nbsp;
-
-## 3. Build Meshtastic
-
-At this point, you should be able to build the firmware successfully.
-
-1. In VS Code, press `Command Shift P` to bring up the command palette.
-
-2. Search for and run the `Developer: Reload Window` command.
-
-3. Bring up the command palette again with `Command Shift P`. Search for and run the `PlatformIO: Pick Project Environment` command.
-
-4. In the list of environments, select `env:xiao_ble`. PlatformIO may update itself for a minute or two, and should let you know once done.
-
-5. Return to the command palette once again (`Command Shift P`). Search for and run the `PlatformIO: Build` command.
-
-6. PlatformIO will build the project. After a few minutes you should see a green `SUCCESS` message.
-
-&nbsp;
-
-## 4. Wire the board
-
-Connecting the E22 to the Xiao BLE is straightforward, but there are a few gotchas to be mindful of.
-
-- <strong>On the Xiao BLE:</strong>
-
-  - Pins D4 and D5 are currently mapped to `PIN_WIRE_SDA` and `PIN_WIRE_SCL`, respectively. If you are not using I²C and would like to free up pins D4 and D5 for use as GPIO, `PIN_WIRE_SDA` and `PIN_WIRE_SCL` can be reassigned to any two other unused pin numbers.
-
-  - Pins D6 and D7 were originally mapped to the TX and RX pins for serial interface 1 (`PIN_SERIAL1_RX` and `PIN_SERIAL1_TX`) but are currently set to -1 in `variant.h`. If you need to expose a serial interface, you can restore these pins and move e.g. `SX126X_RXEN` to pin 4 or 5 (the opposite should work too).
-
-- <strong>On the E22:</strong>
-
-  - There are two options for the E22's `TXEN` pin:
-
-    1. It can be connected to the MCU on the pin defined as `SX126X_TXEN` in `variant.h`. In this configuration, the MCU will control Tx/Rx switching "manually". As long as `SX126X_TXEN` and `SX126X_RXEN` are both defined in `variant.h` (and neither is set to `RADIOLIB_NC`), `SX126xInterface.cpp` will initialize the E22 correctly for this mode.
-
-    2. Alternately, it can be connected to the E22's `DIO2` pin only, with neither `TXEN` nor `DIO2` being connected to the MCU. In this configuration, the E22 will control Tx/Rx switching automatically. In `variant.h`, as long as `SX126X_TXEN` is defined as `RADIOLIB_NC`, and `SX126X_RXEN` is defined and connected to the E22's `RXEN` pin, and `E22_TXEN_CONNECTED_TO_DIO2` is defined, `SX126xInterface.cpp` will initialize the E22 correctly for this mode. This configuration frees up a GPIO, and presents no drawbacks that I have found.
-
-    - Note that any combination other than the two described above will likely result in unexpected behavior. In my testing, some of these other configurations appeared to "work" at first glance, but every one I tried had at least one of the following flaws: weak Tx power, extremely poor Rx sensitivity, or the E22 overheating because TXEN was never pulled low, causing its PA to stay on indefinitely.
-
-    - Along the same lines, it is a good idea to check the E22's temperature frequently by lightly touching the shield. If you feel the shield getting hot (i.e. approaching uncomfortable to touch) near pins 1, 2, and 3, something is probably misconfigured; disconnect both the Xiao BLE and E22 from power and double check wiring and pin mapping.
-
-  - Whether you opt to let the E22 control Rx and Tx or handle this manually, <strong>the E22's `RXEN` pin must always be connected to the MCU</strong> on the pin defined as `SX126X_RXEN` in `variant.h`.
-
-<h3>Note</h3>
-
-The default pin mapping in `variant.h` uses 'automatic Tx/Rx switching' mode. If you wire your board for manual Rx/Tx switching, make sure to update `variant.h` accordingly by commenting/uncommenting the necessary lines in the 'E22 Tx/Rx control options' section.
-
-&nbsp;
-
----
-
-&nbsp;
-
-<h3>Example wiring for "E22 automatic Tx/Rx switching" mode:</h3>
-&nbsp;
-
-<strong>MCU -> E22 connections</strong>
-
-| Xiao BLE pin | variant.h definition | E22 pin   | Notes                                                                                                                |
-| :----------- | :------------------- | :-------- | :------------------------------------------------------------------------------------------------------------------- |
-| D0           | SX126X_CS            | 19 (NSS)  |                                                                                                                      |
-| D1           | SX126X_DIO1          | 13 (DIO1) |                                                                                                                      |
-| D2           | SX126X_BUSY          | 14 (BUSY) |                                                                                                                      |
-| D3           | SX126X_RESET         | 15 (NRST) |                                                                                                                      |
-| D7           | SX126X_RXEN          | 6 (RXEN)  | These pins must still be connected, and `SX126X_RXEN` defined in `variant.h`, otherwise Rx sensitivity will be poor. |
-| D8           | PIN_SPI_SCK          | 18 (SCK)  |                                                                                                                      |
-| D9           | PIN_SPI_MISO         | 16 (MISO) |                                                                                                                      |
-| D10          | PIN_SPI_MOSI         | 17 (MOSI) |                                                                                                                      |
-
-&nbsp;
-&nbsp;
-
-<strong>E22 -> E22 connections:</strong>
 
 | E22 pin | E22 pin | Notes                                                                     |
 | :------ | :------ | :------------------------------------------------------------------------ |
 | TXEN    | DIO2    | These must be physically connected for automatic Tx/Rx switching to work. |
 
-<h3>Note</h3>
+#### Note
 
 The schematic (`xiao-ble-e22-schematic.png`) in the `eagle-project` directory uses this wiring.
 
-&nbsp;
+### Example Wiring for Manual Tx/Rx Switching Mode
 
----
+#### MCU -> E22 Connections
 
-&nbsp;
+| XIAO nrf52840 pin | variant.h definition | E22 pin   | Notes |
+| :---------------- | :------------------- | :-------- | :---- |
+| D0                | SX126X_CS            | 19 (NSS)  |       |
+| D1                | SX126X_DIO1          | 13 (DIO1) |       |
+| D2                | SX126X_BUSY          | 14 (BUSY) |       |
+| D3                | SX126X_RESET         | 15 (NRST) |       |
+| D6                | SX126X_TXEN          | 7 (TXEN)  |       |
+| D7                | SX126X_RXEN          | 6 (RXEN)  |       |
+| D8                | PIN_SPI_SCK          | 18 (SCK)  |       |
+| D9                | PIN_SPI_MISO         | 16 (MISO) |       |
+| D10               | PIN_SPI_MOSI         | 17 (MOSI) |       |
 
-<h3>Example wiring for "Manual Tx/Rx switching" mode:</h3>
+#### E22 -> E22 connections
 
-<strong>MCU -> E22 connections</strong>
+_(none)_
 
-| Xiao BLE pin | variant.h definition | E22 pin   | Notes |
+## 2. Build Meshtastic
-| :----------- | :------------------- | :-------- | :---- |
-| D0           | SX126X_CS            | 19 (NSS)  |       |
-| D1           | SX126X_DIO1          | 13 (DIO1) |       |
-| D2           | SX126X_BUSY          | 14 (BUSY) |       |
-| D3           | SX126X_RESET         | 15 (NRST) |       |
-| D6           | SX126X_TXEN          | 7 (TXEN)  |       |
-| D7           | SX126X_RXEN          | 6 (RXEN)  |       |
-| D8           | PIN_SPI_SCK          | 18 (SCK)  |       |
-| D9           | PIN_SPI_MISO         | 16 (MISO) |       |
-| D10          | PIN_SPI_MOSI         | 17 (MOSI) |       |
 
-<strong>E22 -> E22 connections:</strong> (none)
+1. Follow the [Building Meshtastic Firmware](https://meshtastic.org/docs/development/firmware/build/) documentation, stop after **Build** → **Step 2**
+2. For **Build** → **Step 3**, select `xiao_ble` as your target
+3. Adjust source code if you:
+   - Wired your board for Manual Tx/Rx Switching Mode: see [Wire the Board](#1-wire-the-board)
+   - Used an E22-900M33S module  
+     (this step is important to avoid **damaging the power amplifier** in the M33S module and **transmitting power above legal limits**!):
+     1. Open `variants/diy/platformio.ini`
+     2. Search for `[env:xiao_ble]`
+     3. In the line starting with `build_flags` within this section, change `-DEBYTE_E22_900M30S` to `-DEBYTE_E22_900M33S`
+4. Follow **Build** → **Step 4** to build the firmware
+5. Stop here, because the **PlatformIO: Upload** step does not work for factory-fresh XIAO nrf52840 (the automatic reset to bootloader only works if Meshtastic firmware is already running)
+6. The built `firmware.uf2` binary can be found in the folder `.pio/build/xiao_ble/firmware.uf2` (relative to where you cloned the Git repository to), we will need it for [flashing the firmware](#3-flash-the-firmware-to-the-xiao-nrf52840) (manually)
 
-&nbsp;
+## 3. Flash the Firmware to the XIAO nrf52840
 
-## 5. Flash the firmware to the Xiao BLE
+1. Double press the XIAO nrf52840's `reset` button to put it in bootloader mode, and a USB volume named `XIAO SENSE` will appear
+2. Copy the `firmware.uf2` file to the `XIAO SENSE` volume (refer to the last step of [Build Meshtastic](#2-build-meshtastic))
+3. The XIAO nrf52840's red LED will flash for several seconds as the firmware is copied
+4. Once Meshtastic firmware succesfully boots, the:
+   1. Green LED will turn on
+   2. Red LED will flash several times to indicate flash memory writes during initial settings file creation
+   3. Green LED will blink every second once the firmware is running normally
+5. If you do not see the above LED patters, proceed to [Troubleshooting](#4-troubleshooting)
 
-1. Double press the Xiao's `reset` button to put it in bootloader mode.
+## 4. Troubleshooting
-2. In a terminal window, navigate to the Meshtastic firmware repo's root directory, and from there to `.pio/build/xiao_ble`.
-3. Convert the generated `.hex` file into a `.uf2` file:
-
-   ```bash
-   ../../../bin/uf2conv.py firmware.hex -c -o firmware.uf2 -f 0xADA52840
-   ```
-
-4. Copy the new `.uf2` file to the Xiao's mass storage volume:
-
-   ```bash
-   cp firmware.uf2 /Volumes/XIAO-BOOT
-   ```
-
-5. The Xiao's red LED will flash for several seconds as the firmware is copied.
-6. Once the firmware is copied, to verify it is running, run the following command:
-
-   ```bash
-   meshtastic --noproto
-   ```
-
-7. Then, press the Xiao's `reset` button again. You should see a lot of debug output logged in the terminal window.
-
-&nbsp;
-
-## 6. Troubleshooting
-
-- If after flashing Meshtastic, the Xiao is bootlooped, look at the serial output (you can see this by running `meshtastic --noproto` with the device connected to your computer via USB).
 
+- If after flashing Meshtastic, the XIAO is bootlooped, look at the serial output (you can see this by running `meshtastic --noproto` with the device connected to your computer via USB).
   - If you see that the SX1262 init result was -2, this likely indicates a wiring problem; double check your wiring and pin mapping in `variant.h`.
-
+  - If you see an error mentioning tinyFS, this may mean you need to reformat the XIAO's storage:
-  - If you see an error mentioning tinyFS, this may mean you need to reformat the Xiao's storage:
+    1. Open the [Meshtastic web flasher](https://flasher.meshtastic.org/)
-
+    2. Select the **_Seeed XIAO NRF52840 Kit_**
-    1. Double press the `reset` button to put the Xiao in bootloader mode.
+    3. Click the **_trash can icon_** to the right of **_Flash_**
-
+    4. Follow the instructions on the screen
-    2. In a terminal window, navigate to the Meshtastic firmware repo's root directory, and from there to `variants/xiao_ble`.
+       **Do not flash the Seeed XIAO NRF52840 Kit firmware** if you have wired the LoRa module according to this variant, as the Seeed XIAO NRF52840 Kit uses different wiring for the SX1262 LoRa chip
-
-    3. Run the following command: &nbsp;`cp xiao-ble-internal-format.uf2 /Volumes/XIAO-BOOT`
-
-    4. The Xiao's red LED will flash briefly as the filesystem format firmware is copied.
-
-    5. Run the following command: &nbsp;`meshtastic --noproto`
-
-    6. In the output of the above command, you should see a message saying "Formatting...done".
-
-    7. To flash Meshtastic again, repeat the steps in section 5 above.
-
   - If you don't see any specific error message, but the boot process is stuck or not proceeding as expected, this might also mean there is a conflict in `variant.h`. If you have made any changes to the pin mapping, ensure they do not result in a conflict. If all else fails, try reverting your changes and using the known-good configuration included here.
-
   - The above might also mean something is wired incorrectly. Try reverting to one of the known-good example wirings in section 4.
-
 - If the E22 gets hot to the touch:
-  - The power amplifier is likely running continually. Disconnect it and the Xiao from power immediately, and double check wiring and pin mapping. In my experimentation this occurred in cases where TXEN was inadvertenly high (usually due to a pin mapping conflict).
+  - The power amplifier is likely running continually. Disconnect it and the XIAO from power immediately, and double check wiring and pin mapping. In my experimentation this occurred in cases where TXEN was inadvertenly high (usually due to a pin mapping conflict).
 
-&nbsp;
+## 5. Notes
 
-## 7. Notes
+- **Transmit Power**
+  - There is a power amplifier after the SX1262's Tx, so the actual Tx power is just over 7 dB greater than the SX1262's set Tx power (the E22-900M30S actually tops out just over 29dB at 5V according to the datasheet)
+  - Meshtastic firmware is aware of the gain of the E22-900M30S module, so the Meshtastic clients' Tx power setting reflects the actual output power, i.e. setting 30 dBm in the Meshtastic app programs the E22 module to correctly output 30 dBm, setting 24 dBm will output 24 dBm, etc.
+- **Adequate 5V Power Supply to the E22 Module**
+  - Have a bypass capacitor from its 5V supply to ground; 100 µF works well
+  - Voltage must be between 5V–5.5V, lower supply voltage results in less output power; for example, with a fully charged LiPo at 4.2V, Tx power appears to max out around 26-27 dBm
 
-- There are several anecdotal recommendations regarding the Tx power the E22's internal SX1262 should be set to in order to achieve the advertised output of 30 dBm, ranging from 4 (per <a href="https://github.com/jgromes/RadioLib/wiki/High-power-Radio-Modules-Guide">this article</a> in the RadioLib github repo) to 22 (per <a href="https://discord.com/channels/867578229534359593/871539930852130866/976472577545490482">this conversation</a> from the Meshtastic Discord). When paired with the Xiao BLE in the configurations described above, I observed that the output is at its maximum when Tx power is set to 22.
+### Additional Reading
 
-- To achieve its full output, the E22 should have a bypass capacitor from its 5V supply to ground. 100 µF works well.
+- [S5NC/CDEBYTE_Modules](https://github.com/S5NC/CDEBYTE_Modules) has additional information about EBYTE E22 modules' internal workings, including photographs
+- [RadioLib High power Radio Modules Guide](https://github.com/jgromes/RadioLib/wiki/High-power-Radio-Modules-Guide)
 
-- The E22 will happily run on voltages lower than 5V, but the full output power will not be realized. For example, with a fully charged LiPo at 4.2V, Tx power appears to max out around 26-27 dBm.
+## 6. Testing Methodology
-
-&nbsp;
-
-## 8. Testing Methodology
 
 During what became a fairly long trial-and-error process, I did a lot of careful testing of Tx power and Rx sensitivity. My methodology in these tests was as follows:
 
 - All tests were conducted between two nodes:
-
+  1. The XIAO nrf52840 + E22 coupled with an [Abracon ARRKP4065-S915A](https://www.digikey.com/en/products/detail/abracon-llc/ARRKP4065-S915A/8593263") ceramic patch antenna
-  1. The Xiao BLE + E22 coupled with an <a href="https://www.digikey.com/en/products/detail/abracon-llc/ARRKP4065-S915A/8593263">Abracon ARRKP4065-S915A</a> ceramic patch antenna
+  2. A RAK 5005/4631 coupled with a [Laird MA9-5N](https://www.streakwave.com/laird-technologies-ma9-5n-55dbi-900mhz-mobile-omni-select-mount) antenna via a 4" U.FL to Type N pigtail.
-
-  2. A RAK 5005/4631 coupled with a <a href="https://www.streakwave.com/laird-technologies-ma9-5n-55dbi-900mhz-mobile-omni-select-mount">Laird MA9-5N</a> antenna via a 4" U.FL to Type N pigtail.
-
   - No other nodes were powered up onsite or nearby.
-
-    <br>
-
 - Each node and its antenna was kept in exactly the same position and orientation throughout testing.
-
 - Other environmental factors (e.g. the location and resting position of my body in the room while testing) were controlled as carefully as possible.
-
 - Each test comprised at least five (and often ten) runs, after which the results were averaged.
-
 - All testing was done by sending single-character messages between nodes and observing the received RSSI reported in the message acknowledgement. Messages were sent one by one, waiting for each to be acknowledged or time out before sending the next.
-
+- The E22's Tx power was observed by sending messages from the RAK to the XIAO nrf52840 + E22 and recording the received RSSI.
-- The E22's Tx power was observed by sending messages from the RAK to the Xiao BLE + E22 and recording the received RSSI.
+- The opposite was done to observe the E22's Rx sensitivity: messages were sent from the XIAO nrf52840 + E22 to the RAK, and the received RSSI was recorded.
-
+  While this cannot match the level of accuracy achievable with actual test equipment in a lab setting, it was nonetheless sufficient to demonstrate the (sometimes very large) differences in Tx power and Rx sensitivity between various configurations.
-- The opposite was done to observe the E22's Rx sensitivity: messages were sent from the Xiao BLE + E22 to the RAK, and the received RSSI was recorded.
-
-While this cannot match the level of accuracy achievable with actual test equipment in a lab setting, it was nonetheless sufficient to demonstrate the (sometimes very large) differences in Tx power and Rx sensitivity between various configurations.

variants/heltec_esp32c3/platformio.ini

@@ -2,7 +2,7 @@
 extends = esp32c3_base
 board = esp32-c3-devkitm-1
 build_flags = 
-  ${esp32_base.build_flags}
+  ${esp32c3_base.build_flags}
   -D HELTEC_HT62
   -I variants/heltec_esp32c3
 monitor_speed = 115200

variants/heltec_vision_master_e213/nicheGraphics.h

@@ -107,7 +107,7 @@ void setupNicheGraphics()
     buttons->setWiring(1, PIN_BUTTON2);
     buttons->setHandlerShortPress(1, [inkhud]() {
         inkhud->nextTile();
-        playBoop();
+        playChirp();
     });
 
     // Begin handling button events

variants/heltec_vision_master_e290/nicheGraphics.h

@@ -104,7 +104,7 @@ void setupNicheGraphics()
     buttons->setWiring(1, PIN_BUTTON2);
     buttons->setHandlerShortPress(1, [inkhud]() {
         inkhud->nextTile();
-        playBoop();
+        playChirp();
     });
 
     // Begin handling button events

variants/m5stack-stamp-c3/platformio.ini

@@ -3,7 +3,7 @@ extends = esp32c3_base
 board = esp32-c3-devkitm-1
 board_level = extra
 build_flags = 
-  ${esp32_base.build_flags}
+  ${esp32c3_base.build_flags}
   -D PRIVATE_HW
   -I variants/m5stack-stamp-c3
 monitor_speed = 115200

variants/my_esp32s3_diy_eink/platformio.ini

@@ -11,15 +11,15 @@ upload_speed = 921600
 platform_packages =
   platformio/tool-esptoolpy@^1.40801.0
 lib_deps =
-  ${esp32_base.lib_deps}
+  ${esp32s3_base.lib_deps}
   zinggjm/GxEPD2@^1.6.2
   adafruit/Adafruit NeoPixel @ ^1.12.0
 build_unflags =
   ${esp32s3_base.build_unflags}
   -DARDUINO_USB_MODE=1
 build_flags = 
-  ;${esp32_base.build_flags} -D MY_ESP32S3_DIY -I variants/my_esp32s3_diy_eink
+  ;${esp32s3_base.build_flags} -D MY_ESP32S3_DIY -I variants/my_esp32s3_diy_eink
-  ${esp32_base.build_flags} -D PRIVATE_HW -I variants/my_esp32s3_diy_eink
+  ${esp32s3_base.build_flags} -D PRIVATE_HW -I variants/my_esp32s3_diy_eink
   -Dmy
   -DEINK_DISPLAY_MODEL=GxEPD2_290_T5D
   -DEINK_WIDTH=296

variants/my_esp32s3_diy_oled/platformio.ini

@@ -11,14 +11,14 @@ upload_speed = 921600
 platform_packages =
   platformio/tool-esptoolpy@^1.40801.0
 lib_deps =
-  ${esp32_base.lib_deps}
+  ${esp32s3_base.lib_deps}
   adafruit/Adafruit NeoPixel @ ^1.12.0
 build_unflags =
   ${esp32s3_base.build_unflags}
   -DARDUINO_USB_MODE=1
 build_flags = 
-  ;${esp32_base.build_flags} -D MY_ESP32S3_DIY -I variants/my_esp32s3_diy_oled
+  ;${esp32s3_base.build_flags} -D MY_ESP32S3_DIY -I variants/my_esp32s3_diy_oled
-  ${esp32_base.build_flags} -D PRIVATE_HW -I variants/my_esp32s3_diy_oled
+  ${esp32s3_base.build_flags} -D PRIVATE_HW -I variants/my_esp32s3_diy_oled
   -DBOARD_HAS_PSRAM
   -mfix-esp32-psram-cache-issue
   -DARDUINO_USB_MODE=0

variants/seeed_xiao_nrf52840_kit/platformio.ini

@@ -1,4 +1,4 @@
-; Seeed Xiao BLE: https://www.digikey.com/en/products/detail/seeed-technology-co-ltd/102010448/16652893
+; Seeed Xiao BLE: https://wiki.seeedstudio.com/XIAO_BLE/
 [env:seeed_xiao_nrf52840_kit]
 extends = nrf52840_base
 board = xiao_ble_sense

variants/tlora_t3s3_v1/platformio.ini

@@ -5,5 +5,5 @@ board_check = true
 upload_protocol = esptool
 
 build_flags = 
-  ${esp32_base.build_flags} -D TLORA_T3S3_V1 -I variants/tlora_t3s3_v1
+  ${esp32s3_base.build_flags} -D TLORA_T3S3_V1 -I variants/tlora_t3s3_v1
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
+  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 7
-build = 2
+build = 3