Platform / dep updates (#2684)

* Update nordic platform

* Update sensor libs

.github/ISSUE_TEMPLATE/Bug Report.yml

@@ -37,7 +37,9 @@ body:
         - T-Lora v1
         - T-Lora v1.3
         - T-Lora v2 1.6
+        - T-Deck
         - T-Echo
+        - T-Watch
         - Rak4631
         - Rak11200
         - Rak11310
@@ -45,6 +47,8 @@ body:
         - Heltec v2
         - Heltec v2.1
         - Heltec V3
+        - Heltec Wireless Paper
+        - Heltec Wireless Tracker
         - Raspberry Pi Pico (W)
         - Relay v1
         - Relay v2

.github/workflows/build_esp32.yml

@@ -17,11 +17,11 @@ jobs:
         uses: ./.github/actions/setup-base
 
       - name: Pull web ui
-        uses: dsaltares/fetch-gh-release-asset@master
+        uses: dsaltares/fetch-gh-release-asset@a40c8b4a0471f9ab81bdf73a010f74cc51476ad4
         with:
-          repo: "meshtastic/web"
-          file: "build.tar"
-          target: "build.tar"
+          repo: meshtastic/web
+          file: build.tar
+          target: build.tar
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Unpack web ui
@@ -40,11 +40,11 @@ jobs:
         run: bin/build-esp32.sh ${{ inputs.board }}
 
       - name: Pull OTA Firmware
-        uses: dsaltares/fetch-gh-release-asset@master
+        uses: dsaltares/fetch-gh-release-asset@a40c8b4a0471f9ab81bdf73a010f74cc51476ad4
         with:
-          repo: "meshtastic/firmware-ota"
-          file: "firmware.bin"
-          target: "release/bleota.bin"
+          repo: meshtastic/firmware-ota
+          file: firmware.bin
+          target: release/bleota.bin
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get release version string

.github/workflows/build_esp32_s3.yml

@@ -17,11 +17,11 @@ jobs:
         uses: ./.github/actions/setup-base
 
       - name: Pull web ui
-        uses: dsaltares/fetch-gh-release-asset@master
+        uses: dsaltares/fetch-gh-release-asset@a40c8b4a0471f9ab81bdf73a010f74cc51476ad4
         with:
-          repo: "meshtastic/web"
-          file: "build.tar"
-          target: "build.tar"
+          repo: meshtastic/web
+          file: build.tar
+          target: build.tar
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Unpack web ui
@@ -38,11 +38,11 @@ jobs:
         run: bin/build-esp32.sh ${{ inputs.board }}
 
       - name: Pull OTA Firmware
-        uses: dsaltares/fetch-gh-release-asset@master
+        uses: dsaltares/fetch-gh-release-asset@a40c8b4a0471f9ab81bdf73a010f74cc51476ad4
         with:
-          repo: "meshtastic/firmware-ota"
-          file: "firmware-s3.bin"
-          target: "release/bleota-s3.bin"
+          repo: meshtastic/firmware-ota
+          file: firmware-s3.bin
+          target: release/bleota-s3.bin
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get release version string

.github/workflows/main_matrix.yml

@@ -1,4 +1,7 @@
 name: CI
+#concurrency:
+#  group: ${{ github.ref }}
+#  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
 on:
   # # Triggers the workflow on push but only for the master branch
   push:
@@ -33,6 +36,8 @@ jobs:
           - board: m5stack-coreink
           - board: tbeam-s3-core
           - board: tlora-t3s3-v1
+          - board: t-watch-s3
+          - board: t-deck
           #- board: rak11310
 
     runs-on: ubuntu-latest
@@ -44,7 +49,7 @@ jobs:
 
       - name: Trunk Check
         if: ${{ github.event_name != 'workflow_dispatch' }}
-        uses: trunk-io/trunk-action@v1
+        uses: trunk-io/trunk-action@782e83f803ca6e369f035d64c6ba2768174ba61b
 
       - name: Check ${{ matrix.board }}
         run: bin/check-all.sh ${{ matrix.board }}
@@ -85,8 +90,11 @@ jobs:
           - board: heltec-v3
           - board: heltec-wsl-v3
           - board: heltec-wireless-tracker
+          - board: heltec-wireless-paper
           - board: tbeam-s3-core
           - board: tlora-t3s3-v1
+          - board: t-watch-s3
+          - board: t-deck
     uses: ./.github/workflows/build_esp32_s3.yml
     with:
       board: ${{ matrix.board }}
@@ -103,6 +111,7 @@ jobs:
           - board: t-echo
           - board: pca10059_diy_eink
           - board: feather_diy
+          - board: nano-g2-ultra
     uses: ./.github/workflows/build_nrf52.yml
     with:
       board: ${{ matrix.board }}
@@ -250,6 +259,7 @@ jobs:
           retention-days: 30
 
       - name: Create request artifacts
+        continue-on-error: true # FIXME: Why are we getting 502, but things still work?
         if: ${{ github.event_name == 'pull_request_target' || github.event_name == 'pull_request' }}
         uses: gavv/pull-request-artifacts@v1.1.0
         with:

.github/workflows/nightly.yml

@@ -14,6 +14,6 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Trunk Check
-        uses: trunk-io/trunk-action@v1
+        uses: trunk-io/trunk-action@782e83f803ca6e369f035d64c6ba2768174ba61b
         with:
           trunk-token: ${{ secrets.TRUNK_TOKEN }}

.vscode/extensions.json

@@ -6,4 +6,4 @@
         "platformio.platformio-ide",
         "trunk.io"
     ],
-}
+}

.vscode/settings.json

@@ -1,4 +1,5 @@
 {
   "editor.formatOnSave": true,
-  "editor.defaultFormatter": "trunk.io"
+  "editor.defaultFormatter": "trunk.io",
+  "trunk.enableWindows": true
 }

arch/nrf52/nrf52.ini

@@ -1,11 +1,13 @@
 [nrf52_base]
 ; Instead of the standard nordicnrf52 platform, we use our fork which has our added variant files
-platform = platformio/nordicnrf52@^10.0.0
+platform = platformio/nordicnrf52@^10.1.0
 extends = arduino_base
 
 build_type = debug ; I'm debugging with ICE a lot now
 build_flags = 
-  ${arduino_base.build_flags} -Wno-unused-variable 
+  ${arduino_base.build_flags}
+  -DSERIAL_BUFFER_SIZE=1024
+  -Wno-unused-variable
   -Isrc/platform/nrf52
 
 build_src_filter = 

bin/device-install.bat

@@ -32,7 +32,7 @@ IF EXIST %FILENAME% IF x%FILENAME:update=%==x%FILENAME% (
 	%PYTHON% -m esptool --baud 115200 write_flash 0x00 %FILENAME%
     
     @REM Account for S3 board's different OTA partition
-    IF x%FILENAME:s3=%==x%FILENAME% IF x%FILENAME:v3=%==x%FILENAME% (
+    IF x%FILENAME:s3=%==x%FILENAME% IF x%FILENAME:v3=%==x%FILENAME% IF x%FILENAME:t-deck=%==x%FILENAME% IF x%FILENAME:wireless-paper=%==x%FILENAME% IF x%FILENAME:wireless-tracker=%==x%FILENAME% (
         %PYTHON% -m esptool --baud 115200 write_flash 0x260000 bleota.bin
 	) else (
         %PYTHON% -m esptool --baud 115200 write_flash 0x260000 bleota-s3.bin

bin/device-install.sh

@@ -50,7 +50,7 @@ if [ -f "${FILENAME}" ] && [ ! -z "${FILENAME##*"update"*}" ]; then
 	"$PYTHON" -m esptool  erase_flash
 	"$PYTHON" -m esptool  write_flash 0x00 ${FILENAME}
 	# Account for S3 board's different OTA partition
-	if [ ! -z "${FILENAME##*"s3"*}" ] && [ ! -z "${FILENAME##*"-v3"*}" ]; then
+	if [ ! -z "${FILENAME##*"s3"*}" ] && [ ! -z "${FILENAME##*"-v3"*}" ] && [ ! -z "${FILENAME##*"t-deck"*}" ] && [ ! -z "${FILENAME##*"wireless-paper"*}" ] && [ ! -z "${FILENAME##*"wireless-tracker"*}" ]; then
 		"$PYTHON" -m esptool  write_flash 0x260000 bleota.bin
 	else
 	    "$PYTHON" -m esptool  write_flash 0x260000 bleota-s3.bin

boards/nano-g2-ultra.json

@@ -0,0 +1,51 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "nrf52840_s140_v6.ld"
+    },
+    "core": "nRF5",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
+    "f_cpu": "64000000L",
+    "hwids": [
+      ["0x239A", "0x8029"],
+      ["0x239A", "0x0029"],
+      ["0x239A", "0x002A"],
+      ["0x239A", "0x802A"]
+    ],
+    "usb_product": "BQ nRF52840",
+    "mcu": "nrf52840",
+    "variant": "nano-g2-ultra",
+    "bsp": {
+      "name": "adafruit"
+    },
+    "softdevice": {
+      "sd_flags": "-DS140",
+      "sd_name": "s140",
+      "sd_version": "6.1.1",
+      "sd_fwid": "0x00B6"
+    },
+    "bootloader": {
+      "settings_addr": "0xFF000"
+    }
+  },
+  "connectivity": ["bluetooth"],
+  "debug": {
+    "jlink_device": "nRF52840_xxAA",
+    "svd_path": "nrf52840.svd"
+  },
+  "frameworks": ["arduino"],
+  "name": "BQ nRF52840",
+  "upload": {
+    "maximum_ram_size": 248832,
+    "maximum_size": 815104,
+    "speed": 115200,
+    "protocol": "nrfutil",
+    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
+    "use_1200bps_touch": true,
+    "require_upload_port": true,
+    "wait_for_upload_port": true
+  },
+  "url": "https://wiki.uniteng.com/en/meshtastic/nano-g2-ultra",
+  "vendor": "BQ Consulting"
+}

boards/t-deck.json

@@ -0,0 +1,40 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=0"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "dio",
+    "hwids": [["0x303A", "0x1001"]],
+    "mcu": "esp32s3",
+    "variant": "t-deck"
+  },
+  "connectivity": ["wifi", "bluetooth", "lora"],
+  "debug": {
+    "default_tool": "esp-builtin",
+    "onboard_tools": ["esp-builtin"],
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": ["arduino", "espidf"],
+  "name": "Espressif Systems LilyGO T-Deck (16 MB FLASH, 8 MB PSRAM)",
+  "upload": {
+    "flash_size": "16MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 16777216,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://www.lilygo.cc/en-pl/products/t-deck",
+  "vendor": "LilyGO"
+}

boards/t-watch-s3.json

@@ -0,0 +1,38 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DBOARD_HAS_PSRAM",
+      "-DT_WATCH_S3",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "dio",
+    "hwids": [["0X303A", "0x1001"]],
+    "mcu": "esp32s3",
+    "variant": "t-watch-s3"
+  },
+  "connectivity": ["wifi"],
+  "debug": {
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": ["arduino"],
+  "name": "LilyGo T-Watch 2020 V3",
+  "upload": {
+    "flash_size": "8MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 8388608,
+    "require_upload_port": true,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true
+  },
+  "url": "http://www.lilygo.cn/",
+  "vendor": "LilyGo"
+}

boards/xiao_ble_sense.json

@@ -0,0 +1,57 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "nrf52840_s140_v7.ld"
+    },
+    "core": "nRF5",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DARDUINO_MDBT50Q_RX -DNRF52840_XXAA",
+    "f_cpu": "64000000L",
+    "hwids": [
+      ["0x239A", "0x810B"],
+      ["0x239A", "0x010B"],
+      ["0x239A", "0x810C"]
+    ],
+    "usb_product": "XIAO-BOOT",
+    "mcu": "nrf52840",
+    "variant": "Seeed_XIAO_nRF52840_Sense",
+    "bsp": {
+      "name": "adafruit"
+    },
+    "softdevice": {
+      "sd_flags": "-DS140",
+      "sd_name": "s140",
+      "sd_version": "7.3.0",
+      "sd_fwid": "0x0123"
+    },
+    "bootloader": {
+      "settings_addr": "0xFF000"
+    }
+  },
+  "connectivity": ["bluetooth"],
+  "debug": {
+    "jlink_device": "nRF52840_xxAA",
+    "svd_path": "nrf52840.svd"
+  },
+  "frameworks": ["arduino"],
+  "name": "Seeed Xiao BLE Sense",
+  "upload": {
+    "maximum_ram_size": 248832,
+    "maximum_size": 815104,
+    "speed": 115200,
+    "protocol": "nrfutil",
+    "protocols": [
+      "jlink",
+      "nrfjprog",
+      "nrfutil",
+      "stlink",
+      "cmsis-dap",
+      "blackmagic"
+    ],
+    "use_1200bps_touch": true,
+    "require_upload_port": true,
+    "wait_for_upload_port": true
+  },
+  "url": "https://www.seeedstudio.com/Seeed-XIAO-BLE-Sense-nRF52840-p-5253.html",
+  "vendor": "Seeed Studio"
+}

platformio.ini

@@ -88,7 +88,7 @@ check_flags =
 framework = arduino
 lib_deps =
   ${env.lib_deps}
-  mprograms/QMC5883LCompass@^1.1.1
+  mprograms/QMC5883LCompass@^1.2.0
   end2endzone/NonBlockingRTTTL@^1.3.0
   https://github.com/meshtastic/SparkFun_ATECCX08a_Arduino_Library.git#5cf62b36c6f30bc72a07bdb2c11fc9a22d1e31da
 
@@ -107,8 +107,8 @@ lib_deps =
 [environmental_base]
 lib_deps =
   adafruit/Adafruit BusIO@^1.11.4
-  adafruit/Adafruit Unified Sensor@^1.1.9
-  adafruit/Adafruit BMP280 Library@^2.6.6
+  adafruit/Adafruit Unified Sensor@^1.1.11
+  adafruit/Adafruit BMP280 Library@^2.6.8
   adafruit/Adafruit BME280 Library@^2.2.2
   https://github.com/boschsensortec/Bosch-BSEC2-Library#v1.5.2400
   boschsensortec/BME68x Sensor Library@^1.1.40407
@@ -117,7 +117,8 @@ lib_deps =
   adafruit/Adafruit INA219@^1.2.0
   adafruit/Adafruit SHTC3 Library@^1.0.0
   adafruit/Adafruit LPS2X@^2.0.4
-  adafruit/Adafruit SHT31 Library@^2.2.0
+  adafruit/Adafruit SHT31 Library@^2.2.2
   adafruit/Adafruit PM25 AQI Sensor@^1.0.6
   adafruit/Adafruit MPU6050@^2.2.4
   adafruit/Adafruit LIS3DH@^1.2.4
+  https://github.com/lewisxhe/BMA423_Library@^0.0.1

src/AccelerometerThread.h

@@ -6,10 +6,37 @@
 
 #include <Adafruit_LIS3DH.h>
 #include <Adafruit_MPU6050.h>
+#include <Arduino.h>
+#include <Wire.h>
+#include <bma.h>
+
+BMA423 bmaSensor;
+bool BMA_IRQ = false;
 
 #define ACCELEROMETER_CHECK_INTERVAL_MS 100
 #define ACCELEROMETER_CLICK_THRESHOLD 40
 
+uint16_t readRegister(uint8_t address, uint8_t reg, uint8_t *data, uint16_t len)
+{
+    Wire.beginTransmission(address);
+    Wire.write(reg);
+    Wire.endTransmission();
+    Wire.requestFrom((uint8_t)address, (uint8_t)len);
+    uint8_t i = 0;
+    while (Wire.available()) {
+        data[i++] = Wire.read();
+    }
+    return 0; // Pass
+}
+
+uint16_t writeRegister(uint8_t address, uint8_t reg, uint8_t *data, uint16_t len)
+{
+    Wire.beginTransmission(address);
+    Wire.write(reg);
+    Wire.write(data, len);
+    return (0 != Wire.endTransmission());
+}
+
 namespace concurrency
 {
 class AccelerometerThread : public concurrency::OSThread
@@ -29,10 +56,10 @@ class AccelerometerThread : public concurrency::OSThread
             return;
         }
 
-        accleremoter_type = type;
+        acceleremoter_type = type;
         LOG_DEBUG("AccelerometerThread initializing\n");
 
-        if (accleremoter_type == ScanI2C::DeviceType::MPU6050 && mpu.begin(accelerometer_found.address)) {
+        if (acceleremoter_type == ScanI2C::DeviceType::MPU6050 && mpu.begin(accelerometer_found.address)) {
             LOG_DEBUG("MPU6050 initializing\n");
             // setup motion detection
             mpu.setHighPassFilter(MPU6050_HIGHPASS_0_63_HZ);
@@ -40,11 +67,60 @@ class AccelerometerThread : public concurrency::OSThread
             mpu.setMotionDetectionDuration(20);
             mpu.setInterruptPinLatch(true); // Keep it latched.  Will turn off when reinitialized.
             mpu.setInterruptPinPolarity(true);
-        } else if (accleremoter_type == ScanI2C::DeviceType::LIS3DH && lis.begin(accelerometer_found.address)) {
+        } else if (acceleremoter_type == ScanI2C::DeviceType::LIS3DH && lis.begin(accelerometer_found.address)) {
             LOG_DEBUG("LIS3DH initializing\n");
             lis.setRange(LIS3DH_RANGE_2_G);
             // Adjust threshold, higher numbers are less sensitive
             lis.setClick(config.device.double_tap_as_button_press ? 2 : 1, ACCELEROMETER_CLICK_THRESHOLD);
+        } else if (acceleremoter_type == ScanI2C::DeviceType::BMA423 && bmaSensor.begin(readRegister, writeRegister, delay)) {
+            LOG_DEBUG("BMA423 initializing\n");
+            Acfg cfg;
+            cfg.odr = BMA4_OUTPUT_DATA_RATE_100HZ;
+            cfg.range = BMA4_ACCEL_RANGE_2G;
+            cfg.bandwidth = BMA4_ACCEL_NORMAL_AVG4;
+            cfg.perf_mode = BMA4_CONTINUOUS_MODE;
+            bmaSensor.setAccelConfig(cfg);
+            bmaSensor.enableAccel();
+
+            struct bma4_int_pin_config pin_config;
+            pin_config.edge_ctrl = BMA4_LEVEL_TRIGGER;
+            pin_config.lvl = BMA4_ACTIVE_HIGH;
+            pin_config.od = BMA4_PUSH_PULL;
+            pin_config.output_en = BMA4_OUTPUT_ENABLE;
+            pin_config.input_en = BMA4_INPUT_DISABLE;
+            // The correct trigger interrupt needs to be configured as needed
+            bmaSensor.setINTPinConfig(pin_config, BMA4_INTR1_MAP);
+
+#ifdef BMA423_INT
+            pinMode(BMA4XX_INT, INPUT);
+            attachInterrupt(
+                BMA4XX_INT,
+                [] {
+                    // Set interrupt to set irq value to true
+                    BMA_IRQ = true;
+                },
+                RISING); // Select the interrupt mode according to the actual circuit
+#endif
+
+            struct bma423_axes_remap remap_data;
+            remap_data.x_axis = 0;
+            remap_data.x_axis_sign = 1;
+            remap_data.y_axis = 1;
+            remap_data.y_axis_sign = 0;
+            remap_data.z_axis = 2;
+            remap_data.z_axis_sign = 1;
+            // Need to raise the wrist function, need to set the correct axis
+            bmaSensor.setRemapAxes(&remap_data);
+            // sensor.enableFeature(BMA423_STEP_CNTR, true);
+            bmaSensor.enableFeature(BMA423_TILT, true);
+            bmaSensor.enableFeature(BMA423_WAKEUP, true);
+            // sensor.resetStepCounter();
+
+            // Turn on feature interrupt
+            bmaSensor.enableStepCountInterrupt();
+            bmaSensor.enableTiltInterrupt();
+            // It corresponds to isDoubleClick interrupt
+            bmaSensor.enableWakeupInterrupt();
         }
     }
 
@@ -53,9 +129,9 @@ class AccelerometerThread : public concurrency::OSThread
     {
         canSleep = true; // Assume we should not keep the board awake
 
-        if (accleremoter_type == ScanI2C::DeviceType::MPU6050 && mpu.getMotionInterruptStatus()) {
+        if (acceleremoter_type == ScanI2C::DeviceType::MPU6050 && mpu.getMotionInterruptStatus()) {
             wakeScreen();
-        } else if (accleremoter_type == ScanI2C::DeviceType::LIS3DH && lis.getClick() > 0) {
+        } else if (acceleremoter_type == ScanI2C::DeviceType::LIS3DH && lis.getClick() > 0) {
             uint8_t click = lis.getClick();
             if (!config.device.double_tap_as_button_press) {
                 wakeScreen();
@@ -65,7 +141,13 @@ class AccelerometerThread : public concurrency::OSThread
                 buttonPress();
                 return 500;
             }
+        } else if (acceleremoter_type == ScanI2C::DeviceType::BMA423 && bmaSensor.getINT()) {
+            if (bmaSensor.isTilt() || bmaSensor.isDoubleClick()) {
+                wakeScreen();
+                return 500;
+            }
         }
+
         return ACCELEROMETER_CHECK_INTERVAL_MS;
     }
 
@@ -84,9 +166,9 @@ class AccelerometerThread : public concurrency::OSThread
         powerFSM.trigger(EVENT_PRESS);
     }
 
-    ScanI2C::DeviceType accleremoter_type;
+    ScanI2C::DeviceType acceleremoter_type;
     Adafruit_MPU6050 mpu;
     Adafruit_LIS3DH lis;
 };
 
-} // namespace concurrency
+} // namespace concurrency

src/ButtonThread.h

@@ -4,6 +4,7 @@
 #include "concurrency/OSThread.h"
 #include "configuration.h"
 #include "graphics/Screen.h"
+#include "main.h"
 #include "power.h"
 #include <OneButton.h>
 
@@ -101,7 +102,7 @@ class ButtonThread : public concurrency::OSThread
         // if (!canSleep) LOG_DEBUG("Suppressing sleep!\n");
         // else LOG_DEBUG("sleep ok\n");
 
-        return 5;
+        return 50;
     }
 
   private:

src/FSCommon.cpp

@@ -1,3 +1,13 @@
+/**
+ * @file FSCommon.cpp
+ * @brief This file contains functions for common filesystem operations such as copying, renaming, listing and deleting files and
+ * directories.
+ *
+ * The functions in this file are used to perform common filesystem operations such as copying, renaming, listing and deleting
+ * files and directories. These functions are used in the Meshtastic-device project to manage files and directories on the
+ * device's filesystem.
+ *
+ */
 #include "FSCommon.h"
 #include "configuration.h"
 
@@ -8,10 +18,19 @@
 #ifdef SDCARD_USE_SPI1
 SPIClass SPI1(HSPI);
 #define SDHandler SPI1
+#else
+#define SDHandler SPI
 #endif
 
 #endif // HAS_SDCARD
 
+/**
+ * @brief Copies a file from one location to another.
+ *
+ * @param from The path of the source file.
+ * @param to The path of the destination file.
+ * @return true if the file was successfully copied, false otherwise.
+ */
 bool copyFile(const char *from, const char *to)
 {
 #ifdef FSCom
@@ -41,6 +60,14 @@ bool copyFile(const char *from, const char *to)
 #endif
 }
 
+/**
+ * Renames a file from pathFrom to pathTo.
+ *
+ * @param pathFrom The original path of the file.
+ * @param pathTo The new path of the file.
+ *
+ * @return True if the file was successfully renamed, false otherwise.
+ */
 bool renameFile(const char *pathFrom, const char *pathTo)
 {
 #ifdef FSCom
@@ -57,6 +84,13 @@ bool renameFile(const char *pathFrom, const char *pathTo)
 #endif
 }
 
+/**
+ * Lists the contents of a directory.
+ *
+ * @param dirname The name of the directory to list.
+ * @param levels The number of levels of subdirectories to list.
+ * @param del Whether or not to delete the contents of the directory after listing.
+ */
 void listDir(const char *dirname, uint8_t levels, bool del = false)
 {
 #ifdef FSCom
@@ -152,6 +186,13 @@ void listDir(const char *dirname, uint8_t levels, bool del = false)
 #endif
 }
 
+/**
+ * @brief Removes a directory and all its contents.
+ *
+ * This function recursively removes a directory and all its contents, including subdirectories and files.
+ *
+ * @param dirname The name of the directory to remove.
+ */
 void rmDir(const char *dirname)
 {
 #ifdef FSCom
@@ -180,6 +221,9 @@ void fsInit()
 #endif
 }
 
+/**
+ * Initializes the SD card and mounts the file system.
+ */
 void setupSDCard()
 {
 #ifdef HAS_SDCARD
@@ -210,4 +254,4 @@ void setupSDCard()
     LOG_DEBUG("Total space: %llu MB\n", SD.totalBytes() / (1024 * 1024));
     LOG_DEBUG("Used space: %llu MB\n", SD.usedBytes() / (1024 * 1024));
 #endif
-}
+}

src/OSTimer.cpp

@@ -29,6 +29,16 @@ static void IRAM_ATTR onTimer()
     (*tCallback)(tParam1, tParam2);
 }
 
+/**
+ * Schedules a hardware callback function to be executed after a specified delay.
+ *
+ * @param callback The function to be executed.
+ * @param param1 The first parameter to be passed to the function.
+ * @param param2 The second parameter to be passed to the function.
+ * @param delayMsec The delay time in milliseconds before the function is executed.
+ *
+ * @return True if the function was successfully scheduled, false otherwise.
+ */
 bool scheduleHWCallback(PendableFunction callback, void *param1, uint32_t param2, uint32_t delayMsec)
 {
     if (!timer) {

src/Power.cpp

@@ -1,3 +1,15 @@
+/**
+ * @file Power.cpp
+ * @brief This file contains the implementation of the Power class, which is responsible for managing power-related functionality
+ * of the device. It includes battery level sensing, power management unit (PMU) control, and power state machine management. The
+ * Power class is used by the main device class to manage power-related functionality.
+ *
+ * The file also includes implementations of various battery level sensors, such as the AnalogBatteryLevel class, which assumes
+ * the battery voltage is attached via a voltage-divider to an analog input.
+ *
+ * This file is part of the Meshtastic project.
+ * For more information, see: https://meshtastic.org/
+ */
 #include "power.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
@@ -366,6 +378,11 @@ bool Power::analogInit()
 #endif
 }
 
+/**
+ * Initializes the Power class.
+ *
+ * @return true if the setup was successful, false otherwise.
+ */
 bool Power::setup()
 {
     bool found = axpChipInit();
@@ -540,10 +557,12 @@ int32_t Power::runOnce()
             LOG_DEBUG("Battery removed\n");
         }
         */
+#ifndef T_WATCH_S3 // FIXME - why is this triggering on the T-Watch S3?
         if (PMU->isPekeyLongPressIrq()) {
             LOG_DEBUG("PEK long button press\n");
             screen->setOn(false);
         }
+#endif
 
         PMU->clearIrqStatus();
     }
@@ -681,7 +700,8 @@ bool Power::axpChipInit()
             // GNSS VDD 3300mV
             PMU->setPowerChannelVoltage(XPOWERS_ALDO3, 3300);
             PMU->enablePowerOutput(XPOWERS_ALDO3);
-        } else if (HW_VENDOR == meshtastic_HardwareModel_LILYGO_TBEAM_S3_CORE) {
+        } else if (HW_VENDOR == meshtastic_HardwareModel_LILYGO_TBEAM_S3_CORE ||
+                   HW_VENDOR == meshtastic_HardwareModel_T_WATCH_S3) {
             // t-beam s3 core
             /**
              * gnss module power channel
@@ -716,6 +736,12 @@ bool Power::axpChipInit()
             PMU->setPowerChannelVoltage(XPOWERS_BLDO1, 3300);
             PMU->enablePowerOutput(XPOWERS_BLDO1);
 
+#ifdef T_WATCH_S3
+            // DRV2605 power channel
+            PMU->setPowerChannelVoltage(XPOWERS_BLDO2, 3300);
+            PMU->enablePowerOutput(XPOWERS_BLDO2);
+#endif
+
             // PMU->setPowerChannelVoltage(XPOWERS_DCDC4, 3300);
             // PMU->enablePowerOutput(XPOWERS_DCDC4);
 

src/PowerFSM.cpp

@@ -1,3 +1,12 @@
+/**
+ * @file PowerFSM.cpp
+ * @brief Implements the finite state machine for power management.
+ *
+ * This file contains the implementation of the finite state machine (FSM) for power management.
+ * The FSM controls the power states of the device, including SDS (shallow deep sleep), LS (light sleep),
+ * NB (normal mode), and POWER (powered mode). The FSM also handles transitions between states and
+ * actions to be taken upon entering or exiting each state.
+ */
 #include "PowerFSM.h"
 #include "GPS.h"
 #include "MeshService.h"
@@ -137,7 +146,10 @@ static void nbEnter()
 {
     LOG_DEBUG("Enter state: NB\n");
     screen->setOn(false);
+#ifdef ARCH_ESP32
+    // Only ESP32 should turn off bluetooth
     setBluetoothEnable(false);
+#endif
 
     // FIXME - check if we already have packets for phone and immediately trigger EVENT_PACKETS_FOR_PHONE
 }
@@ -158,6 +170,8 @@ static void serialEnter()
 
 static void serialExit()
 {
+    // Turn bluetooth back on when we leave serial stream API
+    setBluetoothEnable(true);
     screen->print("Serial disconnected\n");
 }
 
@@ -242,7 +256,11 @@ void PowerFSM_setup()
 
     // wake timer expired or a packet arrived
     // if we are a router node, we go to NB (no need for bluetooth) otherwise we go to DARK (so we can send message to phone)
+#ifdef ARCH_ESP32
     powerFSM.add_transition(&stateLS, isRouter ? &stateNB : &stateDARK, EVENT_WAKE_TIMER, NULL, "Wake timer");
+#else // Don't go into a no-bluetooth state on low power platforms
+    powerFSM.add_transition(&stateLS, &stateDARK, EVENT_WAKE_TIMER, NULL, "Wake timer");
+#endif
 
     // We need this transition, because we might not transition if we were waiting to enter light-sleep, because when we wake from
     // light sleep we _always_ transition to NB or dark and

src/commands.h

@@ -15,4 +15,6 @@ enum class Cmd {
     PRINT,
     START_SHUTDOWN_SCREEN,
     START_REBOOT_SCREEN,
+    SHOW_PREV_FRAME,
+    SHOW_NEXT_FRAME
 };

src/configuration.h

@@ -98,8 +98,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Define if screen should be mirrored left to right
 // #define SCREEN_MIRROR
 
-// The m5stack I2C Keyboard (also RAK14004)
+// I2C Keyboards (M5Stack, RAK14004, T-Deck)
 #define CARDKB_ADDR 0x5F
+#define TDECK_KB_ADDR 0x55
 
 // -----------------------------------------------------------------------------
 // SENSOR
@@ -123,6 +124,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // -----------------------------------------------------------------------------
 #define MPU6050_ADDR 0x68
 #define LIS3DH_ADR 0x18
+#define BMA423_ADDR 0x19
 
 // -----------------------------------------------------------------------------
 // LED
@@ -172,6 +174,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef HAS_BUTTON
 #define HAS_BUTTON 0
 #endif
+#ifndef HAS_TRACKBALL
+#define HAS_TRACKBALL 0
+#endif
+#ifndef HAS_TOUCHSCREEN
+#define HAS_TOUCHSCREEN 0
+#endif
 #ifndef HAS_TELEMETRY
 #define HAS_TELEMETRY 0
 #endif
@@ -193,4 +201,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef HW_VENDOR
 #error HW_VENDOR must be defined
-#endif
+#endif

src/detect/ScanI2C.cpp

@@ -30,14 +30,14 @@ ScanI2C::FoundDevice ScanI2C::firstRTC() const
 
 ScanI2C::FoundDevice ScanI2C::firstKeyboard() const
 {
-    ScanI2C::DeviceType types[] = {CARDKB, RAK14004};
-    return firstOfOrNONE(2, types);
+    ScanI2C::DeviceType types[] = {CARDKB, TDECKKB, RAK14004};
+    return firstOfOrNONE(3, types);
 }
 
 ScanI2C::FoundDevice ScanI2C::firstAccelerometer() const
 {
-    ScanI2C::DeviceType types[] = {MPU6050, LIS3DH};
-    return firstOfOrNONE(2, types);
+    ScanI2C::DeviceType types[] = {MPU6050, LIS3DH, BMA423};
+    return firstOfOrNONE(3, types);
 }
 
 ScanI2C::FoundDevice ScanI2C::find(ScanI2C::DeviceType) const
@@ -73,4 +73,4 @@ bool ScanI2C::DeviceAddress::operator<(const ScanI2C::DeviceAddress &other) cons
         || (port != NO_I2C && other.port != NO_I2C && (address < other.address));
 }
 
-ScanI2C::FoundDevice::FoundDevice(ScanI2C::DeviceType type, ScanI2C::DeviceAddress address) : type(type), address(address) {}
+ScanI2C::FoundDevice::FoundDevice(ScanI2C::DeviceType type, ScanI2C::DeviceAddress address) : type(type), address(address) {}

src/detect/ScanI2C.h

@@ -16,6 +16,7 @@ class ScanI2C
         RTC_RV3028,
         RTC_PCF8563,
         CARDKB,
+        TDECKKB,
         RAK14004,
         PMU_AXP192_AXP2101,
         BME_680,
@@ -33,6 +34,7 @@ class ScanI2C
         PMSA0031,
         MPU6050,
         LIS3DH,
+        BMA423,
 #ifdef HAS_NCP5623
         NCP5623,
 #endif

src/detect/ScanI2CTwoWire.cpp

@@ -212,6 +212,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port)
                 }
                 break;
 
+                SCAN_SIMPLE_CASE(TDECK_KB_ADDR, TDECKKB, "T-Deck keyboard found\n");
                 SCAN_SIMPLE_CASE(ST7567_ADDRESS, SCREEN_ST7567, "st7567 display found\n");
 #ifdef HAS_NCP5623
                 SCAN_SIMPLE_CASE(NCP5623_ADDR, NCP5623, "NCP5623 RGB LED found\n");
@@ -274,6 +275,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port)
 
                 SCAN_SIMPLE_CASE(PMSA0031_ADDR, PMSA0031, "PMSA0031 air quality sensor found\n")
                 SCAN_SIMPLE_CASE(MPU6050_ADDR, MPU6050, "MPU6050 accelerometer found\n");
+                SCAN_SIMPLE_CASE(BMA423_ADDR, BMA423, "BMA423 accelerometer found\n");
 
             default:
                 LOG_INFO("Device found at address 0x%x was not able to be enumerated\n", addr.address);

src/gps/GPS.cpp

@@ -213,8 +213,8 @@ bool GPS::setupGPS()
             // _serial_gps->begin(9600);    //The baud rate of 9600 has been initialized at the beginning of setupGPS, this line
             // is the redundant part delay(250);
 
-            // Initialize the L76K Chip, use GPS + GLONASS
-            _serial_gps->write("$PCAS04,5*1C\r\n");
+            // Initialize the L76K Chip, use GPS + GLONASS + BEIDOU
+            _serial_gps->write("$PCAS04,7*1E\r\n");
             delay(250);
             // only ask for RMC and GGA
             _serial_gps->write("$PCAS03,1,0,0,0,1,0,0,0,0,0,,,0,0*02\r\n");

src/gps/NMEAGPS.cpp

@@ -107,6 +107,14 @@ bool NMEAGPS::lookForLocation()
     // At a minimum, use the fixQuality indicator in GPGGA (FIXME?)
     fixQual = reader.fixQuality();
 
+#ifndef TINYGPS_OPTION_NO_STATISTICS
+    if (reader.failedChecksum() > lastChecksumFailCount) {
+        LOG_WARN("Warning, %u new GPS checksum failures, for a total of %u.\n", reader.failedChecksum() - lastChecksumFailCount,
+                 reader.failedChecksum());
+        lastChecksumFailCount = reader.failedChecksum();
+    }
+#endif
+
 #ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
     fixType = atoi(gsafixtype.value()); // will set to zero if no data
     // LOG_DEBUG("FIX QUAL=%d, TYPE=%d\n", fixQual, fixType);
@@ -174,8 +182,10 @@ bool NMEAGPS::lookForLocation()
 #endif
 
     // Discard incomplete or erroneous readings
-    if (reader.hdop.value() == 0)
+    if (reader.hdop.value() == 0) {
+        LOG_WARN("BOGUS hdop.value() REJECTED: %d\n", reader.hdop.value());
         return false;
+    }
 
     p.latitude_i = toDegInt(loc.lat);
     p.longitude_i = toDegInt(loc.lng);
@@ -243,7 +253,8 @@ bool NMEAGPS::hasFlow()
 bool NMEAGPS::whileIdle()
 {
     bool isValid = false;
-
+    // if (_serial_gps->available() > 0)
+    // LOG_DEBUG("GPS Bytes Waiting: %u\n", _serial_gps->available());
     // First consume any chars that have piled up at the receiver
     while (_serial_gps->available() > 0) {
         int c = _serial_gps->read();

src/gps/NMEAGPS.h

@@ -13,6 +13,7 @@ class NMEAGPS : public GPS
 {
     TinyGPSPlus reader;
     uint8_t fixQual = 0; // fix quality from GPGGA
+    uint32_t lastChecksumFailCount = 0;
 
 #ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
     // (20210908) TinyGps++ can only read the GPGSA "FIX TYPE" field
@@ -53,4 +54,4 @@ class NMEAGPS : public GPS
     virtual bool hasLock() override;
 
     virtual bool hasFlow() override;
-};
+};

src/gps/RTC.cpp

@@ -17,6 +17,10 @@ static uint32_t
     timeStartMsec; // Once we have a GPS lock, this is where we hold the initial msec clock that corresponds to that time
 static uint64_t zeroOffsetSecs; // GPS based time in secs since 1970 - only updated once on initial lock
 
+/**
+ * Reads the current date and time from the RTC module and updates the system time.
+ * @return True if the RTC was successfully read and the system time was updated, false otherwise.
+ */
 void readFromRTC()
 {
     struct timeval tv; /* btw settimeofday() is helpful here too*/
@@ -83,7 +87,15 @@ void readFromRTC()
 #endif
 }
 
-/// If we haven't yet set our RTC this boot, set it from a GPS derived time
+/**
+ * Sets the RTC (Real-Time Clock) if the provided time is of higher quality than the current RTC time.
+ *
+ * @param q The quality of the provided time.
+ * @param tv A pointer to a timeval struct containing the time to potentially set the RTC to.
+ * @return True if the RTC was set, false otherwise.
+ *
+ * If we haven't yet set our RTC this boot, set it from a GPS derived time
+ */
 bool perhapsSetRTC(RTCQuality q, const struct timeval *tv)
 {
     static uint32_t lastSetMsec = 0;
@@ -151,6 +163,13 @@ bool perhapsSetRTC(RTCQuality q, const struct timeval *tv)
     }
 }
 
+/**
+ * Sets the RTC time if the provided time is of higher quality than the current RTC time.
+ *
+ * @param q The quality of the provided time.
+ * @param t The time to potentially set the RTC to.
+ * @return True if the RTC was set to the provided time, false otherwise.
+ */
 bool perhapsSetRTC(RTCQuality q, struct tm &t)
 {
     /* Convert to unix time
@@ -171,11 +190,22 @@ bool perhapsSetRTC(RTCQuality q, struct tm &t)
     }
 }
 
+/**
+ * Returns the current time in seconds since the Unix epoch (January 1, 1970).
+ *
+ * @return The current time in seconds since the Unix epoch.
+ */
 uint32_t getTime()
 {
     return (((uint32_t)millis() - timeStartMsec) / 1000) + zeroOffsetSecs;
 }
 
+/**
+ * Returns the current time from the RTC if the quality of the time is at least minQuality.
+ *
+ * @param minQuality The minimum quality of the RTC time required for it to be considered valid.
+ * @return The current time from the RTC if it meets the minimum quality requirement, or 0 if the time is not valid.
+ */
 uint32_t getValidTime(RTCQuality minQuality)
 {
     return (currentQuality >= minQuality) ? getTime() : 0;

src/graphics/EInkDisplay2.h

@@ -3,7 +3,7 @@
 #include <OLEDDisplay.h>
 
 /**
- * An adapter class that allows using the TFT_eSPI library as if it was an OLEDDisplay implementation.
+ * An adapter class that allows using the GxEPD2 library as if it was an OLEDDisplay implementation.
  *
  * Remaining TODO:
  * optimize display() to only draw changed pixels (see other OLED subclasses for examples)

src/graphics/Screen.cpp

@@ -31,6 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "gps/GeoCoord.h"
 #include "gps/RTC.h"
 #include "graphics/images.h"
+#include "input/TouchScreenImpl1.h"
 #include "main.h"
 #include "mesh-pb-constants.h"
 #include "mesh/Channels.h"
@@ -102,7 +103,8 @@ static uint16_t displayWidth, displayHeight;
 #define SCREEN_WIDTH displayWidth
 #define SCREEN_HEIGHT displayHeight
 
-#if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS)
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS)) &&                                \
+    !defined(DISPLAY_FORCE_SMALL_FONTS)
 // The screen is bigger so use bigger fonts
 #define FONT_SMALL ArialMT_Plain_16  // Height: 19
 #define FONT_MEDIUM ArialMT_Plain_24 // Height: 28
@@ -492,7 +494,8 @@ static void drawNodes(OLEDDisplay *display, int16_t x, int16_t y, NodeStatus *no
 {
     char usersString[20];
     snprintf(usersString, sizeof(usersString), "%d/%d", nodeStatus->getNumOnline(), nodeStatus->getNumTotal());
-#if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS)
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS)) &&                                \
+    !defined(DISPLAY_FORCE_SMALL_FONTS)
     display->drawFastImage(x, y + 3, 8, 8, imgUser);
 #else
     display->drawFastImage(x, y, 8, 8, imgUser);
@@ -835,7 +838,11 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
     }
 
     static char distStr[20];
-    strncpy(distStr, "? km", sizeof(distStr)); // might not have location data
+    if (config.display.units == meshtastic_Config_DisplayConfig_DisplayUnits_IMPERIAL) {
+        strncpy(distStr, "? mi", sizeof(distStr)); // might not have location data
+    } else {
+        strncpy(distStr, "? km", sizeof(distStr));
+    }
     meshtastic_NodeInfoLite *ourNode = nodeDB.getMeshNode(nodeDB.getNodeNum());
     const char *fields[] = {username, distStr, signalStr, lastStr, NULL};
     int16_t compassX = 0, compassY = 0;
@@ -944,6 +951,9 @@ void Screen::handleSetOn(bool on)
     if (on != screenOn) {
         if (on) {
             LOG_INFO("Turning on screen\n");
+#ifdef T_WATCH_S3
+            PMU->enablePowerOutput(XPOWERS_ALDO2);
+#endif
             dispdev.displayOn();
             dispdev.displayOn();
             enabled = true;
@@ -952,6 +962,9 @@ void Screen::handleSetOn(bool on)
         } else {
             LOG_INFO("Turning off screen\n");
             dispdev.displayOff();
+#ifdef T_WATCH_S3
+            PMU->disablePowerOutput(XPOWERS_ALDO2);
+#endif
             enabled = false;
         }
         screenOn = on;
@@ -1034,12 +1047,18 @@ void Screen::setup()
 #endif
     serialSinceMsec = millis();
 
+#if HAS_TOUCHSCREEN
+    touchScreenImpl1 = new TouchScreenImpl1(dispdev.getWidth(), dispdev.getHeight(), dispdev.getTouch);
+    touchScreenImpl1->init();
+#endif
+
     // Subscribe to status updates
     powerStatusObserver.observe(&powerStatus->onNewStatus);
     gpsStatusObserver.observe(&gpsStatus->onNewStatus);
     nodeStatusObserver.observe(&nodeStatus->onNewStatus);
     if (textMessageModule)
         textMessageObserver.observe(textMessageModule);
+    inputObserver.observe(inputBroker);
 
     // Modules can notify screen about refresh
     MeshModule::observeUIEvents(&uiFrameEventObserver);
@@ -1117,6 +1136,12 @@ int32_t Screen::runOnce()
                 handleOnPress();
             }
             break;
+        case Cmd::SHOW_PREV_FRAME:
+            handleShowPrevFrame();
+            break;
+        case Cmd::SHOW_NEXT_FRAME:
+            handleShowNextFrame();
+            break;
         case Cmd::START_BLUETOOTH_PIN_SCREEN:
             handleStartBluetoothPinScreen(cmd.bluetooth_pin);
             break;
@@ -1410,6 +1435,28 @@ void Screen::handleOnPress()
     }
 }
 
+void Screen::handleShowPrevFrame()
+{
+    // If screen was off, just wake it, otherwise go back to previous frame
+    // If we are in a transition, the press must have bounced, drop it.
+    if (ui.getUiState()->frameState == FIXED) {
+        ui.previousFrame();
+        lastScreenTransition = millis();
+        setFastFramerate();
+    }
+}
+
+void Screen::handleShowNextFrame()
+{
+    // If screen was off, just wake it, otherwise advance to next frame
+    // If we are in a transition, the press must have bounced, drop it.
+    if (ui.getUiState()->frameState == FIXED) {
+        ui.nextFrame();
+        lastScreenTransition = millis();
+        setFastFramerate();
+    }
+}
+
 #ifndef SCREEN_TRANSITION_FRAMERATE
 #define SCREEN_TRANSITION_FRAMERATE 30 // fps
 #endif
@@ -1482,7 +1529,8 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
 #ifdef ARCH_ESP32
         if (millis() - storeForwardModule->lastHeartbeat >
             (storeForwardModule->heartbeatInterval * 1200)) { // no heartbeat, overlap a bit
-#if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS)
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS)) &&                                \
+    !defined(DISPLAY_FORCE_SMALL_FONTS)
             display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8,
                                    imgQuestionL1);
             display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 11 + FONT_HEIGHT_SMALL, 12, 8,
@@ -1492,7 +1540,8 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
                                    imgQuestion);
 #endif
         } else {
-#if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS)
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS)) &&                                \
+    !defined(DISPLAY_FORCE_SMALL_FONTS)
             display->drawFastImage(x + SCREEN_WIDTH - 18 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 16, 8,
                                    imgSFL1);
             display->drawFastImage(x + SCREEN_WIDTH - 18 - display->getStringWidth(ourId), y + 11 + FONT_HEIGHT_SMALL, 16, 8,
@@ -1504,7 +1553,8 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
         }
 #endif
     } else {
-#if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS)
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS)) &&                                \
+    !defined(DISPLAY_FORCE_SMALL_FONTS)
         display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8,
                                imgInfoL1);
         display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 11 + FONT_HEIGHT_SMALL, 12, 8,
@@ -1847,6 +1897,20 @@ int Screen::handleUIFrameEvent(const UIFrameEvent *event)
     return 0;
 }
 
+int Screen::handleInputEvent(const InputEvent *event)
+{
+    if (showingNormalScreen && moduleFrames.size() == 0) {
+        LOG_DEBUG("Screen::handleInputEvent from %s\n", event->source);
+        if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT)) {
+            showPrevFrame();
+        } else if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT)) {
+            showNextFrame();
+        }
+    }
+
+    return 0;
+}
+
 } // namespace graphics
 #else
 graphics::Screen::Screen(ScanI2C::DeviceAddress, meshtastic_Config_DisplayConfig_OledType, OLEDDISPLAY_GEOMETRY) {}

src/graphics/Screen.h

@@ -53,6 +53,7 @@ class Screen
 #include "commands.h"
 #include "concurrency/LockGuard.h"
 #include "concurrency/OSThread.h"
+#include "input/InputBroker.h"
 #include "mesh/MeshModule.h"
 #include "power.h"
 #include <string>
@@ -118,6 +119,8 @@ class Screen : public concurrency::OSThread
         CallbackObserver<Screen, const meshtastic_MeshPacket *>(this, &Screen::handleTextMessage);
     CallbackObserver<Screen, const UIFrameEvent *> uiFrameEventObserver =
         CallbackObserver<Screen, const UIFrameEvent *>(this, &Screen::handleUIFrameEvent);
+    CallbackObserver<Screen, const InputEvent *> inputObserver =
+        CallbackObserver<Screen, const InputEvent *>(this, &Screen::handleInputEvent);
 
   public:
     explicit Screen(ScanI2C::DeviceAddress, meshtastic_Config_DisplayConfig_OledType, OLEDDISPLAY_GEOMETRY);
@@ -152,8 +155,10 @@ class Screen : public concurrency::OSThread
 
     void blink();
 
-    /// Handles a button press.
+    /// Handle button press, trackball or swipe action)
     void onPress() { enqueueCmd(ScreenCmd{.cmd = Cmd::ON_PRESS}); }
+    void showPrevFrame() { enqueueCmd(ScreenCmd{.cmd = Cmd::SHOW_PREV_FRAME}); }
+    void showNextFrame() { enqueueCmd(ScreenCmd{.cmd = Cmd::SHOW_NEXT_FRAME}); }
 
     // Implementation to Adjust Brightness
     void adjustBrightness();
@@ -301,9 +306,11 @@ class Screen : public concurrency::OSThread
     // Use this handle to set things like battery status, user count, GPS status, etc.
     DebugInfo *debug_info() { return &debugInfo; }
 
+    // Handle observer events
     int handleStatusUpdate(const meshtastic::Status *arg);
     int handleTextMessage(const meshtastic_MeshPacket *arg);
     int handleUIFrameEvent(const UIFrameEvent *arg);
+    int handleInputEvent(const InputEvent *arg);
 
     /// Used to force (super slow) eink displays to draw critical frames
     void forceDisplay();
@@ -343,6 +350,8 @@ class Screen : public concurrency::OSThread
     // Implementations of various commands, called from doTask().
     void handleSetOn(bool on);
     void handleOnPress();
+    void handleShowNextFrame();
+    void handleShowPrevFrame();
     void handleStartBluetoothPinScreen(uint32_t pin);
     void handlePrint(const char *text);
     void handleStartFirmwareUpdateScreen();
@@ -380,7 +389,7 @@ class Screen : public concurrency::OSThread
     SH1106Wire dispdev;
 #elif defined(USE_SSD1306)
     SSD1306Wire dispdev;
-#elif defined(ST7735_CS) || defined(ILI9341_DRIVER)
+#elif defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ST7789_CS)
     TFTDisplay dispdev;
 #elif defined(USE_EINK)
     EInkDisplay dispdev;
@@ -394,4 +403,4 @@ class Screen : public concurrency::OSThread
 };
 
 } // namespace graphics
-#endif
+#endif

src/graphics/TFTDisplay.cpp

@@ -96,14 +96,224 @@ class LGFX : public lgfx::LGFX_Device
 
 static LGFX tft;
 
-#elif defined(ST7735_CS) || defined(ILI9341_DRIVER)
+#elif defined(ST7789_CS)
+#include <LovyanGFX.hpp> // Graphics and font library for ST7735 driver chip
+
+#if defined(ST7789_BACKLIGHT_EN) && !defined(TFT_BL)
+#define TFT_BL ST7789_BACKLIGHT_EN
+#endif
+
+class LGFX : public lgfx::LGFX_Device
+{
+    lgfx::Panel_ST7789 _panel_instance;
+    lgfx::Bus_SPI _bus_instance;
+    lgfx::Light_PWM _light_instance;
+#ifdef T_WATCH_S3
+    lgfx::Touch_FT5x06 _touch_instance;
+#else
+    lgfx::Touch_GT911 _touch_instance;
+#endif
+
+  public:
+    LGFX(void)
+    {
+        {
+            auto cfg = _bus_instance.config();
+
+            // SPI
+            cfg.spi_host = ST7789_SPI_HOST;
+            cfg.spi_mode = 0;
+            cfg.freq_write = SPI_FREQUENCY; // SPI clock for transmission (up to 80MHz, rounded to the value obtained by dividing
+                                            // 80MHz by an integer)
+            cfg.freq_read = SPI_READ_FREQUENCY; // SPI clock when receiving
+            cfg.spi_3wire = false;              // Set to true if reception is done on the MOSI pin
+            cfg.use_lock = true;                // Set to true to use transaction locking
+            cfg.dma_channel = SPI_DMA_CH_AUTO;  // SPI_DMA_CH_AUTO; // Set DMA channel to use (0=not use DMA / 1=1ch / 2=ch /
+            cfg.pin_sclk = ST7789_SCK;          // Set SPI SCLK pin number
+            cfg.pin_mosi = ST7789_SDA;          // Set SPI MOSI pin number
+            cfg.pin_miso = ST7789_MISO;         // Set SPI MISO pin number (-1 = disable)
+            cfg.pin_dc = ST7789_RS;             // Set SPI DC pin number (-1 = disable)
+
+            _bus_instance.config(cfg);              // applies the set value to the bus.
+            _panel_instance.setBus(&_bus_instance); // set the bus on the panel.
+        }
+
+        {                                        // Set the display panel control.
+            auto cfg = _panel_instance.config(); // Gets a structure for display panel settings.
+
+            cfg.pin_cs = ST7789_CS; // Pin number where CS is connected (-1 = disable)
+            cfg.pin_rst = -1;       // Pin number where RST is connected  (-1 = disable)
+            cfg.pin_busy = -1;      // Pin number where BUSY is connected (-1 = disable)
+
+            // The following setting values ​​are general initial values ​​for each panel, so please comment out any
+            // unknown items and try them.
+
+            cfg.panel_width = TFT_WIDTH;   // actual displayable width
+            cfg.panel_height = TFT_HEIGHT; // actual displayable height
+            cfg.offset_x = TFT_OFFSET_X;   // Panel offset amount in X direction
+            cfg.offset_y = TFT_OFFSET_Y;   // Panel offset amount in Y direction
+            cfg.offset_rotation = 0;       // Rotation direction value offset 0~7 (4~7 is mirrored)
+            cfg.dummy_read_pixel = 9;      // Number of bits for dummy read before pixel readout
+            cfg.dummy_read_bits = 1;       // Number of bits for dummy read before non-pixel data read
+            cfg.readable = true;           // Set to true if data can be read
+            cfg.invert = true;             // Set to true if the light/darkness of the panel is reversed
+            cfg.rgb_order = false;         // Set to true if the panel's red and blue are swapped
+            cfg.dlen_16bit =
+                false;             // Set to true for panels that transmit data length in 16-bit units with 16-bit parallel or SPI
+            cfg.bus_shared = true; // If the bus is shared with the SD card, set to true (bus control with drawJpgFile etc.)
+
+            // Set the following only when the display is shifted with a driver with a variable number of pixels, such as the
+            // ST7735 or ILI9163.
+            // cfg.memory_width = TFT_WIDTH;   // Maximum width supported by the driver IC
+            // cfg.memory_height = TFT_HEIGHT; // Maximum height supported by the driver IC
+            _panel_instance.config(cfg);
+        }
+
+        // Set the backlight control. (delete if not necessary)
+        {
+            auto cfg = _light_instance.config(); // Gets a structure for backlight settings.
+
+            cfg.pin_bl = ST7789_BL; // Pin number to which the backlight is connected
+            cfg.invert = false;     // true to invert the brightness of the backlight
+            // cfg.pwm_channel = 0;
+
+            _light_instance.config(cfg);
+            _panel_instance.setLight(&_light_instance); // Set the backlight on the panel.
+        }
+
+        // Configure settings for touch screen control.
+        {
+            auto cfg = _touch_instance.config();
+
+            cfg.pin_cs = -1;
+            cfg.x_min = 0;
+            cfg.x_max = TFT_HEIGHT - 1;
+            cfg.y_min = 0;
+            cfg.y_max = TFT_WIDTH - 1;
+            cfg.pin_int = SCREEN_TOUCH_INT;
+            cfg.bus_shared = true;
+            cfg.offset_rotation = 0;
+            // cfg.freq = 2500000;
+
+            // I2C
+            cfg.i2c_port = TOUCH_I2C_PORT;
+            cfg.i2c_addr = TOUCH_SLAVE_ADDRESS;
+#ifdef SCREEN_TOUCH_USE_I2C1
+            cfg.pin_sda = I2C_SDA1;
+            cfg.pin_scl = I2C_SCL1;
+#else
+            cfg.pin_sda = I2C_SDA;
+            cfg.pin_scl = I2C_SCL;
+#endif
+            // cfg.freq = 400000;
+
+            _touch_instance.config(cfg);
+            _panel_instance.setTouch(&_touch_instance);
+        }
+
+        setPanel(&_panel_instance); // Sets the panel to use.
+    }
+};
+
+static LGFX tft;
+
+#elif defined(ILI9341_DRIVER)
+
+#include <LovyanGFX.hpp> // Graphics and font library for ILI9341 driver chip
+
+#if defined(ILI9341_BACKLIGHT_EN) && !defined(TFT_BL)
+#define TFT_BL ILI9341_BACKLIGHT_EN
+#endif
+
+class LGFX : public lgfx::LGFX_Device
+{
+    lgfx::Panel_ILI9341 _panel_instance;
+    lgfx::Bus_SPI _bus_instance;
+    lgfx::Light_PWM _light_instance;
+
+  public:
+    LGFX(void)
+    {
+        {
+            auto cfg = _bus_instance.config();
+
+            // configure SPI
+            cfg.spi_host = ILI9341_SPI_HOST; // ESP32-S2,S3,C3 : SPI2_HOST or SPI3_HOST / ESP32 : VSPI_HOST or HSPI_HOST
+            cfg.spi_mode = 0;
+            cfg.freq_write = SPI_FREQUENCY; // SPI clock for transmission (up to 80MHz, rounded to the value obtained by dividing
+                                            // 80MHz by an integer)
+            cfg.freq_read = SPI_READ_FREQUENCY; // SPI clock when receiving
+            cfg.spi_3wire = false;              // Set to true if reception is done on the MOSI pin
+            cfg.use_lock = true;                // Set to true to use transaction locking
+            cfg.dma_channel = SPI_DMA_CH_AUTO;  // SPI_DMA_CH_AUTO; // Set DMA channel to use (0=not use DMA / 1=1ch / 2=ch /
+                                                // SPI_DMA_CH_AUTO=auto setting)
+            cfg.pin_sclk = TFT_SCLK;            // Set SPI SCLK pin number
+            cfg.pin_mosi = TFT_MOSI;            // Set SPI MOSI pin number
+            cfg.pin_miso = TFT_MISO;            // Set SPI MISO pin number (-1 = disable)
+            cfg.pin_dc = TFT_DC;                // Set SPI DC pin number (-1 = disable)
+
+            _bus_instance.config(cfg);              // applies the set value to the bus.
+            _panel_instance.setBus(&_bus_instance); // set the bus on the panel.
+        }
+
+        {                                        // Set the display panel control.
+            auto cfg = _panel_instance.config(); // Gets a structure for display panel settings.
+
+            cfg.pin_cs = TFT_CS;     // Pin number where CS is connected (-1 = disable)
+            cfg.pin_rst = TFT_RST;   // Pin number where RST is connected  (-1 = disable)
+            cfg.pin_busy = TFT_BUSY; // Pin number where BUSY is connected (-1 = disable)
+
+            // The following setting values ​​are general initial values ​​for each panel, so please comment out any
+            // unknown items and try them.
+
+            cfg.panel_width = TFT_WIDTH;   // actual displayable width
+            cfg.panel_height = TFT_HEIGHT; // actual displayable height
+            cfg.offset_x = TFT_OFFSET_X;   // Panel offset amount in X direction
+            cfg.offset_y = TFT_OFFSET_Y;   // Panel offset amount in Y direction
+            cfg.offset_rotation = 0;       // Rotation direction value offset 0~7 (4~7 is upside down)
+            cfg.dummy_read_pixel = 8;      // Number of bits for dummy read before pixel readout
+            cfg.dummy_read_bits = 1;       // Number of bits for dummy read before non-pixel data read
+            cfg.readable = true;           // Set to true if data can be read
+            cfg.invert = false;            // Set to true if the light/darkness of the panel is reversed
+            cfg.rgb_order = false;         // Set to true if the panel's red and blue are swapped
+            cfg.dlen_16bit =
+                false;             // Set to true for panels that transmit data length in 16-bit units with 16-bit parallel or SPI
+            cfg.bus_shared = true; // If the bus is shared with the SD card, set to true (bus control with drawJpgFile etc.)
+
+            // Set the following only when the display is shifted with a driver with a variable number of pixels, such as the
+            // ST7735 or ILI9163.
+            cfg.memory_width = TFT_WIDTH;   // Maximum width supported by the driver IC
+            cfg.memory_height = TFT_HEIGHT; // Maximum height supported by the driver IC
+            _panel_instance.config(cfg);
+        }
+
+        // Set the backlight control
+        {
+            auto cfg = _light_instance.config(); // Gets a structure for backlight settings.
+
+            cfg.pin_bl = TFT_BL; // Pin number to which the backlight is connected
+            cfg.invert = false;  // true to invert the brightness of the backlight
+            // cfg.freq = 44100;    // PWM frequency of backlight
+            // cfg.pwm_channel = 1; // PWM channel number to use
+
+            _light_instance.config(cfg);
+            _panel_instance.setLight(&_light_instance); // Set the backlight on the panel.
+        }
+
+        setPanel(&_panel_instance);
+    }
+};
+
+static LGFX tft;
+
+#elif defined(ST7735_CS)
 #include <TFT_eSPI.h> // Graphics and font library for ILI9341 driver chip
 
 static TFT_eSPI tft = TFT_eSPI(); // Invoke library, pins defined in User_Setup.h
 
 #endif
 
-#if defined(ST7735_CS) || defined(ILI9341_DRIVER)
+#if defined(ST7735_CS) || defined(ST7789_CS) || defined(ILI9341_DRIVER)
 #include "SPILock.h"
 #include "TFTDisplay.h"
 #include <SPI.h>
@@ -149,20 +359,26 @@ void TFTDisplay::sendCommand(uint8_t com)
     // handle display on/off directly
     switch (com) {
     case DISPLAYON: {
-#ifdef TFT_BL
+#if defined(TFT_BL) && defined(TFT_BACKLIGHT_ON)
         digitalWrite(TFT_BL, TFT_BACKLIGHT_ON);
 #endif
 #ifdef VTFT_CTRL
         digitalWrite(VTFT_CTRL, LOW);
+#endif
+#ifndef M5STACK
+        tft.setBrightness(128);
 #endif
         break;
     }
     case DISPLAYOFF: {
-#ifdef TFT_BL
+#if defined(TFT_BL) && defined(TFT_BACKLIGHT_ON)
         digitalWrite(TFT_BL, !TFT_BACKLIGHT_ON);
 #endif
 #ifdef VTFT_CTRL
         digitalWrite(VTFT_CTRL, HIGH);
+#endif
+#ifndef M5STACK
+        tft.setBrightness(0);
 #endif
         break;
     }
@@ -173,6 +389,24 @@ void TFTDisplay::sendCommand(uint8_t com)
     // Drop all other commands to device (we just update the buffer)
 }
 
+bool TFTDisplay::hasTouch(void)
+{
+#ifndef M5STACK
+    return tft.touch() != nullptr;
+#else
+    return false;
+#endif
+}
+
+bool TFTDisplay::getTouch(int16_t *x, int16_t *y)
+{
+#ifndef M5STACK
+    return tft.getTouch(x, y);
+#else
+    return false;
+#endif
+}
+
 void TFTDisplay::setDetected(uint8_t detected)
 {
     (void)detected;
@@ -190,8 +424,10 @@ bool TFTDisplay::connect()
 #endif
 
     tft.init();
-#ifdef M5STACK
-    tft.setRotation(1); // M5Stack has the TFT in landscape
+#if defined(T_DECK)
+    tft.setRotation(1); // M5Stack/T-Deck have the TFT in landscape
+#elif defined(M5STACK) || defined(T_WATCH_S3)
+    tft.setRotation(0); // T-Watch S3 has the TFT in portrait
 #else
     tft.setRotation(3); // Orient horizontal and wide underneath the silkscreen name label
 #endif
@@ -199,4 +435,4 @@ bool TFTDisplay::connect()
     return true;
 }
 
-#endif
+#endif

src/graphics/TFTDisplay.h

@@ -3,7 +3,7 @@
 #include <OLEDDisplay.h>
 
 /**
- * An adapter class that allows using the TFT_eSPI library as if it was an OLEDDisplay implementation.
+ * An adapter class that allows using the LovyanGFX library as if it was an OLEDDisplay implementation.
  *
  * Remaining TODO:
  * optimize display() to only draw changed pixels (see other OLED subclasses for examples)
@@ -22,6 +22,10 @@ class TFTDisplay : public OLEDDisplay
     // Write the buffer to the display memory
     virtual void display(void) override;
 
+    // Touch screen (static handlers)
+    static bool hasTouch(void);
+    static bool getTouch(int16_t *x, int16_t *y);
+
     /**
      * shim to make the abstraction happy
      *
@@ -37,4 +41,4 @@ class TFTDisplay : public OLEDDisplay
 
     // Connect to the display
     virtual bool connect() override;
-};
+};

src/graphics/images.h

@@ -14,7 +14,8 @@ const uint8_t imgUser[] PROGMEM = {0x3C, 0x42, 0x99, 0xA5, 0xA5, 0x99, 0x42, 0x3
 const uint8_t imgPositionEmpty[] PROGMEM = {0x20, 0x30, 0x28, 0x24, 0x42, 0xFF};
 const uint8_t imgPositionSolid[] PROGMEM = {0x20, 0x30, 0x38, 0x3C, 0x7E, 0xFF};
 
-#if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS)
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS)) &&                                \
+    !defined(DISPLAY_FORCE_SMALL_FONTS)
 const uint8_t imgQuestionL1[] PROGMEM = {0xff, 0x01, 0x01, 0x32, 0x7b, 0x49, 0x49, 0x6f, 0x26, 0x01, 0x01, 0xff};
 const uint8_t imgQuestionL2[] PROGMEM = {0x0f, 0x08, 0x08, 0x08, 0x06, 0x0f, 0x0f, 0x06, 0x08, 0x08, 0x08, 0x0f};
 const uint8_t imgInfoL1[] PROGMEM = {0xff, 0x01, 0x01, 0x01, 0x1e, 0x7f, 0x1e, 0x01, 0x01, 0x01, 0x01, 0xff};

src/input/TouchScreenBase.cpp

@@ -0,0 +1,137 @@
+#include "TouchScreenBase.h"
+#include "main.h"
+
+#ifndef TIME_LONG_PRESS
+#define TIME_LONG_PRESS 400
+#endif
+
+// move a minimum distance over the screen to detect a "swipe"
+#ifndef TOUCH_THRESHOLD_X
+#define TOUCH_THRESHOLD_X 30
+#endif
+
+#ifndef TOUCH_THRESHOLD_Y
+#define TOUCH_THRESHOLD_Y 20
+#endif
+
+TouchScreenBase::TouchScreenBase(const char *name, uint16_t width, uint16_t height)
+    : concurrency::OSThread(name), _display_width(width), _display_height(height), _first_x(0), _last_x(0), _first_y(0),
+      _last_y(0), _start(0), _tapped(false), _originName(name)
+{
+}
+
+void TouchScreenBase::init(bool hasTouch)
+{
+    if (hasTouch) {
+        LOG_INFO("TouchScreen initialized %d %d\n", TOUCH_THRESHOLD_X, TOUCH_THRESHOLD_Y);
+        this->setInterval(100);
+    } else {
+        disable();
+        this->setInterval(UINT_MAX);
+    }
+}
+
+int32_t TouchScreenBase::runOnce()
+{
+    TouchEvent e;
+    e.touchEvent = static_cast<char>(TOUCH_ACTION_NONE);
+
+    // process touch events
+    int16_t x, y;
+    bool touched = getTouch(x, y);
+    if (touched) {
+        hapticFeedback();
+        this->setInterval(20);
+        _last_x = x;
+        _last_y = y;
+    }
+    if (touched != _touchedOld) {
+        if (touched) {
+            _state = TOUCH_EVENT_OCCURRED;
+            _start = millis();
+            _first_x = x;
+            _first_y = y;
+        } else {
+            _state = TOUCH_EVENT_CLEARED;
+            time_t duration = millis() - _start;
+            x = _last_x;
+            y = _last_y;
+            this->setInterval(50);
+
+            // compute distance
+            int16_t dx = x - _first_x;
+            int16_t dy = y - _first_y;
+            uint16_t adx = abs(dx);
+            uint16_t ady = abs(dy);
+
+            // swipe horizontal
+            if (adx > ady && adx > TOUCH_THRESHOLD_X) {
+                if (0 > dx) { // swipe right to left
+                    e.touchEvent = static_cast<char>(TOUCH_ACTION_LEFT);
+                    LOG_DEBUG("action SWIPE: right to left\n");
+                } else { // swipe left to right
+                    e.touchEvent = static_cast<char>(TOUCH_ACTION_RIGHT);
+                    LOG_DEBUG("action SWIPE: left to right\n");
+                }
+            }
+            // swipe vertical
+            else if (ady > adx && ady > TOUCH_THRESHOLD_Y) {
+                if (0 > dy) { // swipe bottom to top
+                    e.touchEvent = static_cast<char>(TOUCH_ACTION_UP);
+                    LOG_DEBUG("action SWIPE: bottom to top\n");
+                } else { // swipe top to bottom
+                    e.touchEvent = static_cast<char>(TOUCH_ACTION_DOWN);
+                    LOG_DEBUG("action SWIPE: top to bottom\n");
+                }
+            }
+            // tap
+            else {
+                if (duration > 0 && duration < TIME_LONG_PRESS) {
+                    if (_tapped) {
+                        _tapped = false;
+                        e.touchEvent = static_cast<char>(TOUCH_ACTION_DOUBLE_TAP);
+                        LOG_DEBUG("action DOUBLE TAP(%d/%d)\n", x, y);
+                    } else {
+                        _tapped = true;
+                    }
+                } else {
+                    _tapped = false;
+                }
+            }
+        }
+    }
+    _touchedOld = touched;
+
+    // fire TAP event when no 2nd tap occured within time
+    if (_tapped && (time_t(millis()) - _start) > TIME_LONG_PRESS - 50) {
+        _tapped = false;
+        e.touchEvent = static_cast<char>(TOUCH_ACTION_TAP);
+        LOG_DEBUG("action TAP(%d/%d)\n", _last_x, _last_y);
+    }
+
+    // fire LONG_PRESS event without the need for release
+    if (touched && (time_t(millis()) - _start) > TIME_LONG_PRESS) {
+        // tricky: prevent reoccurring events and another touch event when releasing
+        _start = millis() + 30000;
+        e.touchEvent = static_cast<char>(TOUCH_ACTION_LONG_PRESS);
+        LOG_DEBUG("action LONG PRESS(%d/%d)\n", _last_x, _last_y);
+    }
+
+    if (e.touchEvent != TOUCH_ACTION_NONE) {
+        e.source = this->_originName;
+        e.x = _last_x;
+        e.y = _last_y;
+        onEvent(e);
+    }
+
+    return interval;
+}
+
+void TouchScreenBase::hapticFeedback()
+{
+#ifdef T_WATCH_S3
+    drv.setWaveform(0, 75);
+    drv.setWaveform(1, 0); // end waveform
+    drv.go();
+#endif
+}

src/input/TouchScreenBase.h

@@ -0,0 +1,55 @@
+#pragma once
+
+#include "InputBroker.h"
+#include "concurrency/OSThread.h"
+#include "mesh/NodeDB.h"
+
+typedef struct _TouchEvent {
+    const char *source;
+    char touchEvent;
+    uint16_t x;
+    uint16_t y;
+} TouchEvent;
+
+class TouchScreenBase : public Observable<const InputEvent *>, public concurrency::OSThread
+{
+  public:
+    explicit TouchScreenBase(const char *name, uint16_t width, uint16_t height);
+    void init(bool hasTouch);
+
+  protected:
+    enum TouchScreenBaseStateType { TOUCH_EVENT_OCCURRED, TOUCH_EVENT_CLEARED };
+
+    enum TouchScreenBaseEventType {
+        TOUCH_ACTION_NONE,
+        TOUCH_ACTION_UP,
+        TOUCH_ACTION_DOWN,
+        TOUCH_ACTION_LEFT,
+        TOUCH_ACTION_RIGHT,
+        TOUCH_ACTION_TAP,
+        TOUCH_ACTION_DOUBLE_TAP,
+        TOUCH_ACTION_LONG_PRESS
+    };
+
+    virtual int32_t runOnce() override;
+
+    virtual bool getTouch(int16_t &x, int16_t &y) = 0;
+    virtual void onEvent(const TouchEvent &event) = 0;
+
+    volatile TouchScreenBaseStateType _state = TOUCH_EVENT_CLEARED;
+    volatile TouchScreenBaseEventType _action = TOUCH_ACTION_NONE;
+    void hapticFeedback();
+
+  protected:
+    uint16_t _display_width;
+    uint16_t _display_height;
+
+  private:
+    bool _touchedOld = false;  // previous touch state
+    int16_t _first_x, _last_x; // horizontal swipe direction
+    int16_t _first_y, _last_y; // vertical swipe direction
+    time_t _start;             // for LONG_PRESS
+    bool _tapped;              // for DOUBLE_TAP
+
+    const char *_originName;
+};

src/input/TouchScreenImpl1.cpp

@@ -0,0 +1,68 @@
+#include "TouchScreenImpl1.h"
+#include "InputBroker.h"
+#include "configuration.h"
+
+TouchScreenImpl1 *touchScreenImpl1;
+
+TouchScreenImpl1::TouchScreenImpl1(uint16_t width, uint16_t height, bool (*getTouch)(int16_t *, int16_t *))
+    : TouchScreenBase("touchscreen1", width, height), _getTouch(getTouch)
+{
+}
+
+void TouchScreenImpl1::init()
+{
+#if !HAS_TOUCHSCREEN
+    TouchScreenBase::init(false);
+    return;
+#else
+    TouchScreenBase::init(true);
+    inputBroker->registerSource(this);
+#endif
+}
+
+bool TouchScreenImpl1::getTouch(int16_t &x, int16_t &y)
+{
+    return _getTouch(&x, &y);
+}
+
+/**
+ * @brief forward touchscreen event
+ *
+ * @param event
+ *
+ * The touchscreen events are translated to input events and reversed
+ */
+void TouchScreenImpl1::onEvent(const TouchEvent &event)
+{
+    InputEvent e;
+    e.source = event.source;
+    switch (event.touchEvent) {
+    case TOUCH_ACTION_LEFT: {
+        e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT);
+        break;
+    }
+    case TOUCH_ACTION_RIGHT: {
+        e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT);
+        break;
+    }
+    case TOUCH_ACTION_UP: {
+        e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP);
+        break;
+    }
+    case TOUCH_ACTION_DOWN: {
+        e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN);
+        break;
+    }
+    case TOUCH_ACTION_DOUBLE_TAP: {
+        e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT);
+        break;
+    }
+    case TOUCH_ACTION_LONG_PRESS: {
+        e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_CANCEL);
+        break;
+    }
+    default:
+        return;
+    }
+    this->notifyObservers(&e);
+}

src/input/TouchScreenImpl1.h

@@ -0,0 +1,17 @@
+#pragma once
+#include "TouchScreenBase.h"
+
+class TouchScreenImpl1 : public TouchScreenBase
+{
+  public:
+    TouchScreenImpl1(uint16_t width, uint16_t height, bool (*getTouch)(int16_t *, int16_t *));
+    void init(void);
+
+  protected:
+    virtual bool getTouch(int16_t &x, int16_t &y);
+    virtual void onEvent(const TouchEvent &event);
+
+    bool (*_getTouch)(int16_t *, int16_t *);
+};
+
+extern TouchScreenImpl1 *touchScreenImpl1;

src/input/TrackballInterruptBase.cpp

@@ -0,0 +1,78 @@
+#include "TrackballInterruptBase.h"
+#include "configuration.h"
+
+TrackballInterruptBase::TrackballInterruptBase(const char *name)
+{
+    this->_originName = name;
+}
+
+void TrackballInterruptBase::init(uint8_t pinDown, uint8_t pinUp, uint8_t pinLeft, uint8_t pinRight, uint8_t pinPress,
+                                  char eventDown, char eventUp, char eventLeft, char eventRight, char eventPressed,
+                                  void (*onIntDown)(), void (*onIntUp)(), void (*onIntLeft)(), void (*onIntRight)(),
+                                  void (*onIntPress)())
+{
+    this->_pinDown = pinDown;
+    this->_pinUp = pinUp;
+    this->_pinLeft = pinLeft;
+    this->_pinRight = pinRight;
+    this->_eventDown = eventDown;
+    this->_eventUp = eventUp;
+    this->_eventLeft = eventLeft;
+    this->_eventRight = eventRight;
+    this->_eventPressed = eventPressed;
+
+    pinMode(pinPress, INPUT_PULLUP);
+    pinMode(this->_pinDown, INPUT_PULLUP);
+    pinMode(this->_pinUp, INPUT_PULLUP);
+    pinMode(this->_pinLeft, INPUT_PULLUP);
+    pinMode(this->_pinRight, INPUT_PULLUP);
+
+    attachInterrupt(pinPress, onIntPress, RISING);
+    attachInterrupt(this->_pinDown, onIntDown, RISING);
+    attachInterrupt(this->_pinUp, onIntUp, RISING);
+    attachInterrupt(this->_pinLeft, onIntLeft, RISING);
+    attachInterrupt(this->_pinRight, onIntRight, RISING);
+
+    LOG_DEBUG("Trackball GPIO initialized (%d, %d, %d, %d, %d)\n", this->_pinUp, this->_pinDown, this->_pinLeft, this->_pinRight,
+              pinPress);
+}
+
+void TrackballInterruptBase::intPressHandler()
+{
+    InputEvent e;
+    e.source = this->_originName;
+    e.inputEvent = this->_eventPressed;
+    this->notifyObservers(&e);
+}
+
+void TrackballInterruptBase::intDownHandler()
+{
+    InputEvent e;
+    e.source = this->_originName;
+    e.inputEvent = this->_eventDown;
+    this->notifyObservers(&e);
+}
+
+void TrackballInterruptBase::intUpHandler()
+{
+    InputEvent e;
+    e.source = this->_originName;
+    e.inputEvent = this->_eventUp;
+    this->notifyObservers(&e);
+}
+
+void TrackballInterruptBase::intLeftHandler()
+{
+    InputEvent e;
+    e.source = this->_originName;
+    e.inputEvent = this->_eventLeft;
+    this->notifyObservers(&e);
+}
+
+void TrackballInterruptBase::intRightHandler()
+{
+    InputEvent e;
+    e.source = this->_originName;
+    e.inputEvent = this->_eventRight;
+    this->notifyObservers(&e);
+}

src/input/TrackballInterruptBase.h

@@ -0,0 +1,30 @@
+#pragma once
+
+#include "InputBroker.h"
+#include "mesh/NodeDB.h"
+
+class TrackballInterruptBase : public Observable<const InputEvent *>
+{
+  public:
+    explicit TrackballInterruptBase(const char *name);
+    void init(uint8_t pinDown, uint8_t pinUp, uint8_t pinLeft, uint8_t pinRight, uint8_t pinPress, char eventDown, char eventUp,
+              char eventLeft, char eventRight, char eventPressed, void (*onIntDown)(), void (*onIntUp)(), void (*onIntLeft)(),
+              void (*onIntRight)(), void (*onIntPress)());
+    void intPressHandler();
+    void intDownHandler();
+    void intUpHandler();
+    void intLeftHandler();
+    void intRightHandler();
+
+  private:
+    uint8_t _pinDown = 0;
+    uint8_t _pinUp = 0;
+    uint8_t _pinLeft = 0;
+    uint8_t _pinRight = 0;
+    char _eventDown = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+    char _eventUp = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+    char _eventLeft = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+    char _eventRight = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+    char _eventPressed = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+    const char *_originName;
+};

src/input/TrackballInterruptImpl1.cpp

@@ -0,0 +1,54 @@
+#include "TrackballInterruptImpl1.h"
+#include "InputBroker.h"
+#include "configuration.h"
+
+TrackballInterruptImpl1 *trackballInterruptImpl1;
+
+TrackballInterruptImpl1::TrackballInterruptImpl1() : TrackballInterruptBase("trackball1") {}
+
+void TrackballInterruptImpl1::init()
+{
+#if !HAS_TRACKBALL
+    // Input device is disabled.
+    return;
+#else
+    uint8_t pinUp = TB_UP;
+    uint8_t pinDown = TB_DOWN;
+    uint8_t pinLeft = TB_LEFT;
+    uint8_t pinRight = TB_RIGHT;
+    uint8_t pinPress = TB_PRESS;
+
+    char eventDown = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN);
+    char eventUp = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP);
+    char eventLeft = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT);
+    char eventRight = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT);
+    char eventPressed = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT);
+
+    TrackballInterruptBase::init(pinDown, pinUp, pinLeft, pinRight, pinPress, eventDown, eventUp, eventLeft, eventRight,
+                                 eventPressed, TrackballInterruptImpl1::handleIntDown, TrackballInterruptImpl1::handleIntUp,
+                                 TrackballInterruptImpl1::handleIntLeft, TrackballInterruptImpl1::handleIntRight,
+                                 TrackballInterruptImpl1::handleIntPressed);
+    inputBroker->registerSource(this);
+#endif
+}
+
+void TrackballInterruptImpl1::handleIntDown()
+{
+    trackballInterruptImpl1->intDownHandler();
+}
+void TrackballInterruptImpl1::handleIntUp()
+{
+    trackballInterruptImpl1->intUpHandler();
+}
+void TrackballInterruptImpl1::handleIntLeft()
+{
+    trackballInterruptImpl1->intLeftHandler();
+}
+void TrackballInterruptImpl1::handleIntRight()
+{
+    trackballInterruptImpl1->intRightHandler();
+}
+void TrackballInterruptImpl1::handleIntPressed()
+{
+    trackballInterruptImpl1->intPressHandler();
+}

src/input/TrackballInterruptImpl1.h

@@ -0,0 +1,16 @@
+#pragma once
+#include "TrackballInterruptBase.h"
+
+class TrackballInterruptImpl1 : public TrackballInterruptBase
+{
+  public:
+    TrackballInterruptImpl1();
+    void init();
+    static void handleIntDown();
+    static void handleIntUp();
+    static void handleIntLeft();
+    static void handleIntRight();
+    static void handleIntPressed();
+};
+
+extern TrackballInterruptImpl1 *trackballInterruptImpl1;

src/input/UpDownInterruptBase.cpp

@@ -23,7 +23,7 @@ void UpDownInterruptBase::init(uint8_t pinDown, uint8_t pinUp, uint8_t pinPress,
     attachInterrupt(this->_pinDown, onIntDown, RISING);
     attachInterrupt(this->_pinUp, onIntUp, RISING);
 
-    LOG_DEBUG("GPIO initialized (%d, %d, %d)\n", this->_pinDown, this->_pinUp, pinPress);
+    LOG_DEBUG("Up/down/press GPIO initialized (%d, %d, %d)\n", this->_pinUp, this->_pinDown, pinPress);
 }
 
 void UpDownInterruptBase::intPressHandler()

src/input/cardKbI2cImpl.cpp

@@ -7,7 +7,7 @@ CardKbI2cImpl::CardKbI2cImpl() : KbI2cBase("cardKB") {}
 
 void CardKbI2cImpl::init()
 {
-    if (cardkb_found.address != CARDKB_ADDR) {
+    if (cardkb_found.address != CARDKB_ADDR && cardkb_found.address != TDECK_KB_ADDR) {
         disable();
         return;
     }

src/input/kbI2cBase.cpp

@@ -41,7 +41,7 @@ void write_to_14004(const TwoWire * i2cBus, uint8_t reg, uint8_t data)
 
 int32_t KbI2cBase::runOnce()
 {
-    if (cardkb_found.address != CARDKB_ADDR) {
+    if (cardkb_found.address != CARDKB_ADDR && cardkb_found.address != TDECK_KB_ADDR) {
         // Input device is not detected.
         return INT32_MAX;
     }
@@ -85,9 +85,9 @@ int32_t KbI2cBase::runOnce()
             e.kbchar = PrintDataBuf;
             this->notifyObservers(&e);
         }
-    } else {
-        // m5 cardkb
-        i2cBus->requestFrom(CARDKB_ADDR, 1);
+    } else if (kb_model == 0x00 || kb_model == 0x10) {
+        // m5 cardkb and T-Deck
+        i2cBus->requestFrom(kb_model == 0x00 ? CARDKB_ADDR : TDECK_KB_ADDR, 1);
 
         while (i2cBus->available()) {
             char c = i2cBus->read();
@@ -132,6 +132,8 @@ int32_t KbI2cBase::runOnce()
                 this->notifyObservers(&e);
             }
         }
+    } else {
+        LOG_WARN("Unknown kb_model 0x%02x\n", kb_model);
     }
-    return 500;
+    return 300;
 }

src/main.cpp

@@ -96,7 +96,7 @@ ScanI2C::DeviceAddress screen_found = ScanI2C::ADDRESS_NONE;
 
 // The I2C address of the cardkb or RAK14004 (if found)
 ScanI2C::DeviceAddress cardkb_found = ScanI2C::ADDRESS_NONE;
-// 0x02 for RAK14004 and 0x00 for cardkb
+// 0x02 for RAK14004, 0x00 for cardkb, 0x10 for T-Deck
 uint8_t kb_model;
 
 // The I2C address of the RTC Module (if found)
@@ -110,6 +110,11 @@ ScanI2C::FoundDevice rgb_found = ScanI2C::FoundDevice(ScanI2C::DeviceType::NONE,
 ATECCX08A atecc;
 #endif
 
+#ifdef T_WATCH_S3
+Adafruit_DRV2605 drv;
+#endif
+bool isVibrating = false;
+
 bool eink_found = true;
 
 uint32_t serialSinceMsec;
@@ -250,6 +255,19 @@ void setup()
 
     fsInit();
 
+#if defined(_SEEED_XIAO_NRF52840_SENSE_H_)
+
+    pinMode(CHARGE_LED, INPUT); // sets to detect if charge LED is on or off to see if USB is plugged in
+
+    pinMode(HICHG, OUTPUT);
+    digitalWrite(HICHG, LOW); // 100 mA charging current if set to LOW and 50mA (actually about 20mA) if set to HIGH
+
+    pinMode(BAT_READ, OUTPUT);
+    digitalWrite(BAT_READ, LOW); // This is pin P0_14 = 14 and by pullling low to GND it provices path to read on pin 32 (P0,31)
+                                 // PIN_VBAT the voltage from divider on XIAO board
+
+#endif
+
 #ifdef I2C_SDA1
     Wire1.begin(I2C_SDA1, I2C_SCL1);
 #endif
@@ -282,6 +300,15 @@ void setup()
 #endif
 #endif
 
+#ifdef T_DECK
+    // enable keyboard
+    pinMode(KB_POWERON, OUTPUT);
+    digitalWrite(KB_POWERON, HIGH);
+    // There needs to be a delay after power on, give LILYGO-KEYBOARD some startup time
+    // otherwise keyboard and touch screen will not work
+    delay(800);
+#endif
+
     // Currently only the tbeam has a PMU
     // PMU initialization needs to be placed before i2c scanning
     power = new Power();
@@ -354,8 +381,15 @@ void setup()
             kb_model = 0x02;
             break;
         case ScanI2C::DeviceType::CARDKB:
+            kb_model = 0x00;
+            break;
+        case ScanI2C::DeviceType::TDECKKB:
+            // assign an arbitrary value to distinguish from other models
+            kb_model = 0x10;
+            break;
         default:
             // use this as default since it's also just zero
+            LOG_WARN("kb_info.type is unknown(0x%02x), setting kb_model=0x00\n", kb_info.type);
             kb_model = 0x00;
         }
     }
@@ -440,6 +474,11 @@ void setup()
 #ifdef ARCH_NRF52
     nrf52Setup();
 #endif
+
+#ifdef ARCH_RP2040
+    rp2040Setup();
+#endif
+
     // We do this as early as possible because this loads preferences from flash
     // but we need to do this after main cpu iniot (esp32setup), because we need the random seed set
     nodeDB.init();
@@ -472,10 +511,19 @@ void setup()
 
 #if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
     if (acc_info.type != ScanI2C::DeviceType::NONE) {
+        config.display.wake_on_tap_or_motion = true;
+        moduleConfig.external_notification.enabled = true;
         accelerometerThread = new AccelerometerThread(acc_info.type);
     }
 #endif
 
+#ifdef T_WATCH_S3
+    drv.begin();
+    drv.selectLibrary(1);
+    // I2C trigger by sending 'go' command
+    drv.setMode(DRV2605_MODE_INTTRIG);
+#endif
+
     // Init our SPI controller (must be before screen and lora)
     initSPI();
 #ifdef ARCH_RP2040
@@ -528,7 +576,7 @@ void setup()
 
 // Don't call screen setup until after nodedb is setup (because we need
 // the current region name)
-#if defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER)
+#if defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7789_CS)
     screen->setup();
 #else
     if (screen_found.port != ScanI2C::I2CPort::NO_I2C)

src/main.h

@@ -38,6 +38,12 @@ extern bool isUSBPowered;
 extern ATECCX08A atecc;
 #endif
 
+#ifdef T_WATCH_S3
+#include <Adafruit_DRV2605.h>
+extern Adafruit_DRV2605 drv;
+#endif
+extern bool isVibrating;
+
 extern int TCPPort; // set by Portduino
 
 // Global Screen singleton.
@@ -62,7 +68,7 @@ extern uint32_t serialSinceMsec;
 // This will suppress the current delay and instead try to run ASAP.
 extern bool runASAP;
 
-void nrf52Setup(), esp32Setup(), nrf52Loop(), esp32Loop(), clearBonds();
+void nrf52Setup(), esp32Setup(), nrf52Loop(), esp32Loop(), rp2040Setup(), clearBonds();
 
 meshtastic_DeviceMetadata getDeviceMetadata();
 

src/memGet.cpp

@@ -1,8 +1,21 @@
+/**
+ * @file memGet.cpp
+ * @brief Implementation of MemGet class that provides functions to get memory information.
+ *
+ * This file contains the implementation of MemGet class that provides functions to get
+ * information about free heap, heap size, free psram and psram size. The functions are
+ * implemented for ESP32 and NRF52 architectures. If the platform does not have heap
+ * management function implemented, the functions return UINT32_MAX or 0.
+ */
 #include "memGet.h"
 #include "configuration.h"
 
 MemGet memGet;
 
+/**
+ * Returns the amount of free heap memory in bytes.
+ * @return uint32_t The amount of free heap memory in bytes.
+ */
 uint32_t MemGet::getFreeHeap()
 {
 #ifdef ARCH_ESP32
@@ -15,6 +28,10 @@ uint32_t MemGet::getFreeHeap()
 #endif
 }
 
+/**
+ * Returns the size of the heap memory in bytes.
+ * @return uint32_t The size of the heap memory in bytes.
+ */
 uint32_t MemGet::getHeapSize()
 {
 #ifdef ARCH_ESP32
@@ -27,6 +44,11 @@ uint32_t MemGet::getHeapSize()
 #endif
 }
 
+/**
+ * Returns the amount of free psram memory in bytes.
+ *
+ * @return The amount of free psram memory in bytes.
+ */
 uint32_t MemGet::getFreePsram()
 {
 #ifdef ARCH_ESP32
@@ -36,6 +58,11 @@ uint32_t MemGet::getFreePsram()
 #endif
 }
 
+/**
+ * @brief Returns the size of the PSRAM memory.
+ *
+ * @return uint32_t The size of the PSRAM memory.
+ */
 uint32_t MemGet::getPsramSize()
 {
 #ifdef ARCH_ESP32
@@ -43,4 +70,4 @@ uint32_t MemGet::getPsramSize()
 #else
     return 0;
 #endif
-}
+}

src/mesh/MeshService.cpp

@@ -82,8 +82,13 @@ int MeshService::handleFromRadio(const meshtastic_MeshPacket *mp)
     powerFSM.trigger(EVENT_PACKET_FOR_PHONE); // Possibly keep the node from sleeping
 
     nodeDB.updateFrom(*mp); // update our DB state based off sniffing every RX packet from the radio
-    if (mp->which_payload_variant == meshtastic_MeshPacket_decoded_tag && !nodeDB.getMeshNode(mp->from)->has_user &&
-        nodeInfoModule) {
+    if (mp->which_payload_variant == meshtastic_MeshPacket_decoded_tag &&
+        mp->decoded.portnum == meshtastic_PortNum_TELEMETRY_APP && mp->decoded.request_id > 0) {
+        LOG_DEBUG(
+            "Received telemetry response. Skip sending our NodeInfo because this potentially a Repeater which will ignore our "
+            "request for its NodeInfo.\n");
+    } else if (mp->which_payload_variant == meshtastic_MeshPacket_decoded_tag && !nodeDB.getMeshNode(mp->from)->has_user &&
+               nodeInfoModule) {
         LOG_INFO("Heard a node on channel %d we don't know, sending NodeInfo and asking for a response.\n", mp->channel);
         nodeInfoModule->sendOurNodeInfo(mp->from, true, mp->channel);
     }

src/mesh/NodeDB.cpp

@@ -109,7 +109,6 @@ bool NodeDB::resetRadioConfig(bool factory_reset)
         config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_TW;
 
         // Enter super deep sleep soon and stay there not very long
-        // radioConfig.preferences.mesh_sds_timeout_secs = 10;
         // radioConfig.preferences.sds_secs = 60;
     }
 
@@ -165,7 +164,8 @@ void NodeDB::installDefaultConfig()
     config.has_network = true;
     config.has_bluetooth = true;
     config.device.rebroadcast_mode = meshtastic_Config_DeviceConfig_RebroadcastMode_ALL;
-    config.lora.sx126x_rx_boosted_gain = false;
+
+    config.lora.sx126x_rx_boosted_gain = true;
     config.lora.tx_enabled =
         true; // FIXME: maybe false in the future, and setting region to enable it. (unset region forces it off)
     config.lora.override_duty_cycle = false;
@@ -184,7 +184,7 @@ void NodeDB::installDefaultConfig()
     // FIXME: Default to bluetooth capability of platform as default
     config.bluetooth.enabled = true;
     config.bluetooth.fixed_pin = defaultBLEPin;
-#if defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER)
+#if defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7789_CS)
     bool hasScreen = true;
 #else
     bool hasScreen = screen_found.port != ScanI2C::I2CPort::NO_I2C;
@@ -195,6 +195,11 @@ void NodeDB::installDefaultConfig()
     config.position.position_flags =
         (meshtastic_Config_PositionConfig_PositionFlags_ALTITUDE | meshtastic_Config_PositionConfig_PositionFlags_ALTITUDE_MSL);
 
+#ifdef T_WATCH_S3
+    config.display.screen_on_secs = 30;
+    config.display.wake_on_tap_or_motion = true;
+#endif
+
     initConfigIntervals();
 }
 
@@ -205,7 +210,6 @@ void NodeDB::initConfigIntervals()
     config.position.position_broadcast_secs = default_broadcast_interval_secs;
 
     config.power.ls_secs = default_ls_secs;
-    config.power.mesh_sds_timeout_secs = default_mesh_sds_timeout_secs;
     config.power.min_wake_secs = default_min_wake_secs;
     config.power.sds_secs = default_sds_secs;
     config.power.wait_bluetooth_secs = default_wait_bluetooth_secs;
@@ -233,6 +237,10 @@ void NodeDB::installDefaultModuleConfig()
     moduleConfig.external_notification.alert_message = true;
     moduleConfig.external_notification.output_ms = 1000;
     moduleConfig.external_notification.nag_timeout = 60;
+#endif
+#ifdef T_WATCH_S3
+    // Don't worry about the other settings, we'll use the DRV2056 behavior for notifications
+    moduleConfig.external_notification.enabled = true;
 #endif
     moduleConfig.has_canned_message = true;
 
@@ -916,4 +924,4 @@ void recordCriticalError(meshtastic_CriticalErrorCode code, uint32_t address, co
     LOG_ERROR("A critical failure occurred, portduino is exiting...");
     exit(2);
 #endif
-}
+}

src/mesh/NodeDB.h

@@ -174,7 +174,6 @@ extern NodeDB nodeDB;
 
         # prefs.position_broadcast_secs = FIXME possibly broadcast only once an hr
         prefs.wait_bluetooth_secs = 1  # Don't stay in bluetooth mode
-        prefs.mesh_sds_timeout_secs = never
         # try to stay in light sleep one full day, then briefly wake and sleep again
 
         prefs.ls_secs = oneday
@@ -202,7 +201,6 @@ extern NodeDB nodeDB;
 #define default_gps_update_interval IF_ROUTER(ONE_DAY, 2 * 60)
 #define default_broadcast_interval_secs IF_ROUTER(ONE_DAY / 2, 15 * 60)
 #define default_wait_bluetooth_secs IF_ROUTER(1, 60)
-#define default_mesh_sds_timeout_secs IF_ROUTER(NODE_DELAY_FOREVER, 2 * 60 * 60)
 #define default_sds_secs IF_ROUTER(ONE_DAY, UINT32_MAX) // Default to forever super deep sleep
 #define default_ls_secs IF_ROUTER(ONE_DAY, 5 * 60)
 #define default_min_wake_secs 10

src/mesh/Router.cpp

@@ -153,7 +153,12 @@ void Router::setReceivedMessage()
 
 meshtastic_QueueStatus Router::getQueueStatus()
 {
-    return iface->getQueueStatus();
+    if (!iface) {
+        meshtastic_QueueStatus qs;
+        qs.res = qs.mesh_packet_id = qs.free = qs.maxlen = 0;
+        return qs;
+    } else
+        return iface->getQueueStatus();
 }
 
 ErrorCode Router::sendLocal(meshtastic_MeshPacket *p, RxSource src)

src/mesh/SX126xInterface.cpp

@@ -70,12 +70,25 @@ template <typename T> bool SX126xInterface<T>::init()
 #endif
 
 #if defined(SX126X_TXEN) && (SX126X_TXEN != RADIOLIB_NC)
-    // lora.begin sets Dio2 as RF switch control, which is not true if we are manually controlling RX and TX
+    // If SX126X_TXEN is connected to the MCU, we are manually controlling RX and TX.
+    // But lora.begin (called above) sets Dio2 as RF switch control, which is not true here, so set it back to false.
     if (res == RADIOLIB_ERR_NONE) {
-        LOG_DEBUG("SX126X_TX/RX EN pins defined. Setting RF Switch: RXEN=%i, TXEN=%i\n", SX126X_RXEN, SX126X_TXEN);
+        LOG_DEBUG("SX126X_TXEN pin defined. Setting RF Switch: RXEN=%i, TXEN=%i\n", SX126X_RXEN, SX126X_TXEN);
         res = lora.setDio2AsRfSwitch(false);
         lora.setRfSwitchPins(SX126X_RXEN, SX126X_TXEN);
     }
+#elif defined(SX126X_RXEN) && (SX126X_RXEN != RADIOLIB_NC && defined(E22_TXEN_CONNECTED_TO_DIO2))
+    // Otherwise, if SX126X_RXEN is connected to the MCU, and E22_TXEN_CONNECTED_TO_DIO2 is defined, we are letting the
+    // E22 control RX and TX via DIO2. In this configuration, the E22's TXEN and DIO2 pins are connected to each other,
+    // but not to the MCU.
+    // However, we must still connect the E22's RXEN pin to the MCU, define SX126X_RXEN accordingly, and then call
+    // setRfSwitchPins, otherwise RX sensitivity (observed via RSSI) is greatly diminished.
+    LOG_DEBUG("SX126X_RXEN and E22_TXEN_CONNECTED_TO_DIO2 are defined; value of res: %d", res);
+    if (res == RADIOLIB_ERR_NONE) {
+        LOG_DEBUG("SX126X_TXEN is RADIOLIB_NC, but SX126X_RXEN and E22_TXEN_CONNECTED_TO_DIO2 are both defined; calling "
+                  "lora.setRfSwitchPins.");
+        lora.setRfSwitchPins(SX126X_RXEN, SX126X_TXEN);
+    }
 #endif
 
     if (config.lora.sx126x_rx_boosted_gain) {
@@ -299,4 +312,4 @@ template <typename T> bool SX126xInterface<T>::sleep()
 #endif
 
     return true;
-}
+}

src/mesh/generated/meshtastic/admin.pb.h

@@ -53,7 +53,9 @@ typedef enum _meshtastic_AdminMessage_ModuleConfigType {
     /* TODO: REPLACE */
     meshtastic_AdminMessage_ModuleConfigType_AUDIO_CONFIG = 7,
     /* TODO: REPLACE */
-    meshtastic_AdminMessage_ModuleConfigType_REMOTEHARDWARE_CONFIG = 8
+    meshtastic_AdminMessage_ModuleConfigType_REMOTEHARDWARE_CONFIG = 8,
+    /* TODO: REPLACE */
+    meshtastic_AdminMessage_ModuleConfigType_AMBIENTLIGHTING_CONFIG = 10
 } meshtastic_AdminMessage_ModuleConfigType;
 
 /* Struct definitions */
@@ -172,8 +174,8 @@ extern "C" {
 #define _meshtastic_AdminMessage_ConfigType_ARRAYSIZE ((meshtastic_AdminMessage_ConfigType)(meshtastic_AdminMessage_ConfigType_BLUETOOTH_CONFIG+1))
 
 #define _meshtastic_AdminMessage_ModuleConfigType_MIN meshtastic_AdminMessage_ModuleConfigType_MQTT_CONFIG
-#define _meshtastic_AdminMessage_ModuleConfigType_MAX meshtastic_AdminMessage_ModuleConfigType_REMOTEHARDWARE_CONFIG
-#define _meshtastic_AdminMessage_ModuleConfigType_ARRAYSIZE ((meshtastic_AdminMessage_ModuleConfigType)(meshtastic_AdminMessage_ModuleConfigType_REMOTEHARDWARE_CONFIG+1))
+#define _meshtastic_AdminMessage_ModuleConfigType_MAX meshtastic_AdminMessage_ModuleConfigType_AMBIENTLIGHTING_CONFIG
+#define _meshtastic_AdminMessage_ModuleConfigType_ARRAYSIZE ((meshtastic_AdminMessage_ModuleConfigType)(meshtastic_AdminMessage_ModuleConfigType_AMBIENTLIGHTING_CONFIG+1))
 
 #define meshtastic_AdminMessage_payload_variant_get_config_request_ENUMTYPE meshtastic_AdminMessage_ConfigType
 #define meshtastic_AdminMessage_payload_variant_get_module_config_request_ENUMTYPE meshtastic_AdminMessage_ModuleConfigType

src/mesh/generated/meshtastic/config.pb.h

@@ -292,7 +292,8 @@ typedef struct _meshtastic_Config_PowerConfig {
  The number of seconds for to wait before turning off BLE in No Bluetooth states
  0 for default of 1 minute */
     uint32_t wait_bluetooth_secs;
-    /* Mesh Super Deep Sleep Timeout Seconds
+    /* Deprecated in 2.1.X
+ Mesh Super Deep Sleep Timeout Seconds
  While in Light Sleep if this value is exceeded we will lower into super deep sleep
  for sds_secs (default 1 year) or a button press
  0 for default of two hours, MAXUINT for disabled */

src/mesh/generated/meshtastic/mesh.pb.h

@@ -59,6 +59,8 @@ typedef enum _meshtastic_HardwareModel {
     meshtastic_HardwareModel_TLORA_T3_S3 = 16,
     /* B&Q Consulting Nano G1 Explorer: https://wiki.uniteng.com/en/meshtastic/nano-g1-explorer */
     meshtastic_HardwareModel_NANO_G1_EXPLORER = 17,
+    /* B&Q Consulting Nano G2 Ultra: https://wiki.uniteng.com/en/meshtastic/nano-g2-ultra */
+    meshtastic_HardwareModel_NANO_G2_ULTRA = 18,
     /* B&Q Consulting Station Edition G1: https://uniteng.com/wiki/doku.php?id=meshtastic:station */
     meshtastic_HardwareModel_STATION_G1 = 25,
     /* RAK11310 (RP2040 + SX1262) */
@@ -228,9 +230,9 @@ typedef enum _meshtastic_Routing_Error {
  to make sure that critical packets are sent ASAP.
  In the case of meshtastic that means we want to send protocol acks as soon as possible
  (to prevent unneeded retransmissions), we want routing messages to be sent next,
- then messages marked as reliable and finally ‘background’ packets like periodic position updates.
+ then messages marked as reliable and finally 'background' packets like periodic position updates.
  So I bit the bullet and implemented a new (internal - not sent over the air)
- field in MeshPacket called ‘priority’.
+ field in MeshPacket called 'priority'.
  And the transmission queue in the router object is now a priority queue. */
 typedef enum _meshtastic_MeshPacket_Priority {
     /* Treated as Priority.DEFAULT */
@@ -707,7 +709,7 @@ typedef struct _meshtastic_ToRadio {
      (Sending this message is optional for clients) */
         bool disconnect;
         meshtastic_XModem xmodemPacket;
-        /* MQTT Client Proxy Message */
+        /* MQTT Client Proxy Message (for client / phone subscribed to MQTT sending to device) */
         meshtastic_MqttClientProxyMessage mqttClientProxyMessage;
     };
 } meshtastic_ToRadio;
@@ -806,7 +808,7 @@ typedef struct _meshtastic_FromRadio {
         meshtastic_XModem xmodemPacket;
         /* Device metadata message */
         meshtastic_DeviceMetadata metadata;
-        /* MQTT Client Proxy Message */
+        /* MQTT Client Proxy Message (device sending to client / phone for publishing to MQTT) */
         meshtastic_MqttClientProxyMessage mqttClientProxyMessage;
     };
 } meshtastic_FromRadio;

src/mesh/generated/meshtastic/portnums.pb.h

@@ -54,8 +54,6 @@ typedef enum _meshtastic_PortNum {
     /* Audio Payloads.
  Encapsulated codec2 packets. On 2.4 GHZ Bandwidths only for now */
     meshtastic_PortNum_AUDIO_APP = 9,
-    /* Payloads for clients with a network connection proxying MQTT pub/sub to the device */
-    meshtastic_PortNum_MQTT_CLIENT_PROXY_APP = 10,
     /* Provides a 'ping' service that replies to any packet it receives.
  Also serves as a small example module. */
     meshtastic_PortNum_REPLY_APP = 32,

src/modules/CannedMessageModule.cpp

@@ -18,7 +18,9 @@
 #include "graphics/fonts/OLEDDisplayFontsUA.h"
 #endif
 
-#if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS)
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS)) &&                                \
+    !defined(DISPLAY_FORCE_SMALL_FONTS)
+
 // The screen is bigger so use bigger fonts
 #define FONT_SMALL ArialMT_Plain_16
 #define FONT_MEDIUM ArialMT_Plain_24
@@ -59,7 +61,8 @@ CannedMessageModule::CannedMessageModule()
 {
     if (moduleConfig.canned_message.enabled) {
         this->loadProtoForModule();
-        if ((this->splitConfiguredMessages() <= 0) && (cardkb_found.address != CARDKB_ADDR)) {
+        if ((this->splitConfiguredMessages() <= 0) && (cardkb_found.address != CARDKB_ADDR) &&
+            (cardkb_found.address != TDECK_KB_ADDR)) {
             LOG_INFO("CannedMessageModule: No messages are configured. Module is disabled\n");
             this->runState = CANNED_MESSAGE_RUN_STATE_DISABLED;
             disable();
@@ -164,12 +167,21 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
         (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT)) ||
         (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT))) {
         LOG_DEBUG("Canned message event (%x)\n", event->kbchar);
-        if (this->runState == CANNED_MESSAGE_RUN_STATE_FREETEXT) {
+        // tweak for left/right events generated via trackball/touch with empty kbchar
+        if (!event->kbchar) {
+            if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT)) {
+                this->payload = 0xb4;
+                this->destSelect = true;
+            } else if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT)) {
+                this->payload = 0xb7;
+                this->destSelect = true;
+            }
+        } else {
             // pass the pressed key
             this->payload = event->kbchar;
-            this->lastTouchMillis = millis();
-            validEvent = true;
         }
+        this->lastTouchMillis = millis();
+        validEvent = true;
     }
     if (event->inputEvent == static_cast<char>(ANYKEY)) {
         LOG_DEBUG("Canned message event any key pressed\n");
@@ -225,7 +237,7 @@ int32_t CannedMessageModule::runOnce()
         (this->runState == CANNED_MESSAGE_RUN_STATE_INACTIVE)) {
         return INT32_MAX;
     }
-    LOG_DEBUG("Check status\n");
+    // LOG_DEBUG("Check status\n");
     UIFrameEvent e = {false, true};
     if (this->runState == CANNED_MESSAGE_RUN_STATE_SENDING_ACTIVE) {
         // TODO: might have some feedback of sendig state
@@ -300,8 +312,7 @@ int32_t CannedMessageModule::runOnce()
             this->runState = CANNED_MESSAGE_RUN_STATE_ACTIVE;
             LOG_DEBUG("MOVE DOWN (%d):%s\n", this->currentMessageIndex, this->getCurrentMessage());
         }
-    } else if (this->runState == CANNED_MESSAGE_RUN_STATE_FREETEXT) {
-        e.frameChanged = true;
+    } else if (this->runState == CANNED_MESSAGE_RUN_STATE_FREETEXT || this->runState == CANNED_MESSAGE_RUN_STATE_ACTIVE) {
         switch (this->payload) {
         case 0xb4: // left
             if (this->destSelect) {
@@ -347,38 +358,49 @@ int32_t CannedMessageModule::runOnce()
                 }
             }
             break;
-        case 0x08: // backspace
-            if (this->freetext.length() > 0) {
-                if (this->cursor == this->freetext.length()) {
-                    this->freetext = this->freetext.substring(0, this->freetext.length() - 1);
-                } else {
-                    this->freetext = this->freetext.substring(0, this->cursor - 1) +
-                                     this->freetext.substring(this->cursor, this->freetext.length());
-                }
-                this->cursor--;
-            }
-            break;
-        case 0x09: // tab
-            if (this->destSelect) {
-                this->destSelect = false;
-            } else {
-                this->destSelect = true;
-            }
-            break;
         default:
-            if (this->cursor == this->freetext.length()) {
-                this->freetext += this->payload;
-            } else {
-                this->freetext =
-                    this->freetext.substring(0, this->cursor) + this->payload + this->freetext.substring(this->cursor);
-            }
-            this->cursor += 1;
-            if (this->freetext.length() > meshtastic_Constants_DATA_PAYLOAD_LEN) {
-                this->cursor = meshtastic_Constants_DATA_PAYLOAD_LEN;
-                this->freetext = this->freetext.substring(0, meshtastic_Constants_DATA_PAYLOAD_LEN);
-            }
             break;
         }
+        if (this->runState == CANNED_MESSAGE_RUN_STATE_FREETEXT) {
+            e.frameChanged = true;
+            switch (this->payload) {
+            case 0x08: // backspace
+                if (this->freetext.length() > 0) {
+                    if (this->cursor == this->freetext.length()) {
+                        this->freetext = this->freetext.substring(0, this->freetext.length() - 1);
+                    } else {
+                        this->freetext = this->freetext.substring(0, this->cursor - 1) +
+                                         this->freetext.substring(this->cursor, this->freetext.length());
+                    }
+                    this->cursor--;
+                }
+                break;
+            case 0x09: // tab
+                if (this->destSelect) {
+                    this->destSelect = false;
+                } else {
+                    this->destSelect = true;
+                }
+                break;
+            case 0xb4: // left
+            case 0xb7: // right
+                // already handled above
+                break;
+            default:
+                if (this->cursor == this->freetext.length()) {
+                    this->freetext += this->payload;
+                } else {
+                    this->freetext =
+                        this->freetext.substring(0, this->cursor) + this->payload + this->freetext.substring(this->cursor);
+                }
+                this->cursor += 1;
+                if (this->freetext.length() > meshtastic_Constants_DATA_PAYLOAD_LEN) {
+                    this->cursor = meshtastic_Constants_DATA_PAYLOAD_LEN;
+                    this->freetext = this->freetext.substring(0, meshtastic_Constants_DATA_PAYLOAD_LEN);
+                }
+                break;
+            }
+        }
 
         this->lastTouchMillis = millis();
         this->notifyObservers(&e);
@@ -406,6 +428,11 @@ const char *CannedMessageModule::getNextMessage()
 {
     return this->messages[this->getNextIndex()];
 }
+const char *CannedMessageModule::getMessageByIndex(int index)
+{
+    return (index >= 0 && index < this->messagesCount) ? this->messages[index] : "";
+}
+
 const char *CannedMessageModule::getNodeName(NodeNum node)
 {
     if (node == NODENUM_BROADCAST) {
@@ -482,12 +509,31 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st
             display->setTextAlignment(TEXT_ALIGN_LEFT);
             display->setFont(FONT_SMALL);
             display->drawStringf(0 + x, 0 + y, buffer, "To: %s", cannedMessageModule->getNodeName(this->dest));
-            display->drawString(0 + x, 0 + y + FONT_HEIGHT_SMALL, cannedMessageModule->getPrevMessage());
-            display->fillRect(0 + x, 0 + y + FONT_HEIGHT_SMALL * 2, x + display->getWidth(), y + FONT_HEIGHT_SMALL);
-            display->setColor(BLACK);
-            display->drawString(0 + x, 0 + y + FONT_HEIGHT_SMALL * 2, cannedMessageModule->getCurrentMessage());
-            display->setColor(WHITE);
-            display->drawString(0 + x, 0 + y + FONT_HEIGHT_SMALL * 3, cannedMessageModule->getNextMessage());
+            int lines = (display->getHeight() / FONT_HEIGHT_SMALL) - 1;
+            if (lines == 3) {
+                // static (old) behavior for small displays
+                display->drawString(0 + x, 0 + y + FONT_HEIGHT_SMALL, cannedMessageModule->getPrevMessage());
+                display->fillRect(0 + x, 0 + y + FONT_HEIGHT_SMALL * 2, x + display->getWidth(), y + FONT_HEIGHT_SMALL);
+                display->setColor(BLACK);
+                display->drawString(0 + x, 0 + y + FONT_HEIGHT_SMALL * 2, cannedMessageModule->getCurrentMessage());
+                display->setColor(WHITE);
+                display->drawString(0 + x, 0 + y + FONT_HEIGHT_SMALL * 3, cannedMessageModule->getNextMessage());
+            } else {
+                // use entire display height for larger displays
+                int topMsg = (messagesCount > lines && currentMessageIndex >= lines - 1) ? currentMessageIndex - lines + 2 : 0;
+                for (int i = 0; i < std::min(messagesCount, lines); i++) {
+                    if (i == currentMessageIndex - topMsg) {
+                        display->fillRect(0 + x, 0 + y + FONT_HEIGHT_SMALL * (i + 1), x + display->getWidth(),
+                                          y + FONT_HEIGHT_SMALL);
+                        display->setColor(BLACK);
+                        display->drawString(0 + x, 0 + y + FONT_HEIGHT_SMALL * (i + 1), cannedMessageModule->getCurrentMessage());
+                        display->setColor(WHITE);
+                    } else {
+                        display->drawString(0 + x, 0 + y + FONT_HEIGHT_SMALL * (i + 1),
+                                            cannedMessageModule->getMessageByIndex(topMsg + i));
+                    }
+                }
+            }
         }
     }
 }

src/modules/CannedMessageModule.h

@@ -30,6 +30,7 @@ class CannedMessageModule : public SinglePortModule, public Observable<const UIF
     const char *getCurrentMessage();
     const char *getPrevMessage();
     const char *getNextMessage();
+    const char *getMessageByIndex(int index);
     const char *getNodeName(NodeNum node);
     bool shouldDraw();
     void eventUp();

src/modules/ExternalNotificationModule.cpp

@@ -1,3 +1,18 @@
+/**
+ * @file ExternalNotificationModule.cpp
+ * @brief Implementation of the ExternalNotificationModule class.
+ *
+ * This file contains the implementation of the ExternalNotificationModule class, which is responsible for handling external
+ * notifications such as vibration, buzzer, and LED lights. The class provides methods to turn on and off the external
+ * notification outputs and to play ringtones using PWM buzzer. It also includes default configurations and a runOnce() method to
+ * handle the module's behavior.
+ *
+ * Documentation:
+ * https://meshtastic.org/docs/settings/moduleconfig/external-notification
+ *
+ * @author Jm Casler & Meshtastic Team
+ * @date [Insert Date]
+ */
 #include "ExternalNotificationModule.h"
 #include "MeshService.h"
 #include "NodeDB.h"
@@ -93,6 +108,10 @@ int32_t ExternalNotificationModule::runOnce()
                 rgb.setColor(red, green, blue);
             }
 #endif
+
+#ifdef T_WATCH_S3
+            drv.go();
+#endif
         }
 
         // now let the PWM buzzer play
@@ -109,6 +128,11 @@ int32_t ExternalNotificationModule::runOnce()
     }
 }
 
+/**
+ * Sets the external notification on for the specified index.
+ *
+ * @param index The index of the external notification to turn on.
+ */
 void ExternalNotificationModule::setExternalOn(uint8_t index)
 {
     externalCurrentState[index] = 1;
@@ -124,7 +148,8 @@ void ExternalNotificationModule::setExternalOn(uint8_t index)
             digitalWrite(moduleConfig.external_notification.output_buzzer, true);
         break;
     default:
-        digitalWrite(output, (moduleConfig.external_notification.active ? true : false));
+        if (output > 0)
+            digitalWrite(output, (moduleConfig.external_notification.active ? true : false));
         break;
     }
 #ifdef HAS_NCP5623
@@ -132,6 +157,9 @@ void ExternalNotificationModule::setExternalOn(uint8_t index)
         rgb.setColor(red, green, blue);
     }
 #endif
+#ifdef T_WATCH_S3
+    drv.go();
+#endif
 }
 
 void ExternalNotificationModule::setExternalOff(uint8_t index)
@@ -149,7 +177,8 @@ void ExternalNotificationModule::setExternalOff(uint8_t index)
             digitalWrite(moduleConfig.external_notification.output_buzzer, false);
         break;
     default:
-        digitalWrite(output, (moduleConfig.external_notification.active ? false : true));
+        if (output > 0)
+            digitalWrite(output, (moduleConfig.external_notification.active ? false : true));
         break;
     }
 
@@ -161,6 +190,9 @@ void ExternalNotificationModule::setExternalOff(uint8_t index)
         rgb.setColor(red, green, blue);
     }
 #endif
+#ifdef T_WATCH_S3
+    drv.stop();
+#endif
 }
 
 bool ExternalNotificationModule::getExternal(uint8_t index)
@@ -174,6 +206,9 @@ void ExternalNotificationModule::stopNow()
     nagCycleCutoff = 1; // small value
     isNagging = false;
     setIntervalFromNow(0);
+#ifdef T_WATCH_S3
+    drv.stop();
+#endif
 }
 
 ExternalNotificationModule::ExternalNotificationModule()
@@ -185,7 +220,6 @@ ExternalNotificationModule::ExternalNotificationModule()
         without having to configure it from the PythonAPI or WebUI.
     */
 
-    // moduleConfig.external_notification.enabled = true;
     // moduleConfig.external_notification.alert_message = true;
     // moduleConfig.external_notification.alert_message_buzzer = true;
     // moduleConfig.external_notification.alert_message_vibra = true;
@@ -213,8 +247,10 @@ ExternalNotificationModule::ExternalNotificationModule()
                                                            : EXT_NOTIFICATION_MODULE_OUTPUT;
 
         // Set the direction of a pin
-        LOG_INFO("Using Pin %i in digital mode\n", output);
-        pinMode(output, OUTPUT);
+        if (output > 0) {
+            LOG_INFO("Using Pin %i in digital mode\n", output);
+            pinMode(output, OUTPUT);
+        }
         setExternalOff(0);
         externalTurnedOn[0] = 0;
         if (moduleConfig.external_notification.output_vibra) {
@@ -250,7 +286,12 @@ ExternalNotificationModule::ExternalNotificationModule()
 ProcessMessage ExternalNotificationModule::handleReceived(const meshtastic_MeshPacket &mp)
 {
     if (moduleConfig.external_notification.enabled) {
-
+#if T_WATCH_S3
+        drv.setWaveform(0, 75);
+        drv.setWaveform(1, 56);
+        drv.setWaveform(2, 0);
+        drv.go();
+#endif
         if (getFrom(&mp) != nodeDB.getNodeNum()) {
 
             // Check if the message contains a bell character. Don't do this loop for every pin, just once.
@@ -343,7 +384,6 @@ ProcessMessage ExternalNotificationModule::handleReceived(const meshtastic_MeshP
             }
             setIntervalFromNow(0); // run once so we know if we should do something
         }
-
     } else {
         LOG_INFO("External Notification Module Disabled\n");
     }

src/modules/Modules.cpp

@@ -1,6 +1,7 @@
 #include "configuration.h"
 #include "input/InputBroker.h"
 #include "input/RotaryEncoderInterruptImpl1.h"
+#include "input/TrackballInterruptImpl1.h"
 #include "input/UpDownInterruptImpl1.h"
 #include "input/cardKbI2cImpl.h"
 #include "modules/AdminModule.h"
@@ -24,7 +25,7 @@
 #include "modules/esp32/AudioModule.h"
 #include "modules/esp32/StoreForwardModule.h"
 #endif
-#if defined(ARCH_ESP32) || defined(ARCH_NRF52)
+#if defined(ARCH_ESP32) || defined(ARCH_NRF52) || defined(ARCH_RP2040)
 #include "modules/ExternalNotificationModule.h"
 #include "modules/RangeTestModule.h"
 #if (defined(ARCH_ESP32) || defined(ARCH_NRF52)) && !defined(CONFIG_IDF_TARGET_ESP32S2)
@@ -60,6 +61,10 @@ void setupModules()
         cardKbI2cImpl = new CardKbI2cImpl();
         cardKbI2cImpl->init();
 #endif
+#if HAS_TRACKBALL
+        trackballInterruptImpl1 = new TrackballInterruptImpl1();
+        trackballInterruptImpl1->init();
+#endif
 #if HAS_SCREEN
         cannedMessageModule = new CannedMessageModule();
 #endif
@@ -81,15 +86,18 @@ void setupModules()
 
         storeForwardModule = new StoreForwardModule();
 #endif
-#if defined(ARCH_ESP32) || defined(ARCH_NRF52)
+#if defined(ARCH_ESP32) || defined(ARCH_NRF52) || defined(ARCH_RP2040)
         externalNotificationModule = new ExternalNotificationModule();
         new RangeTestModule();
 #endif
     } else {
         adminModule = new AdminModule();
+#if HAS_TELEMETRY
+        new DeviceTelemetryModule();
+#endif
         traceRouteModule = new TraceRouteModule();
     }
     // NOTE! This module must be added LAST because it likes to check for replies from other modules and avoid sending extra
     // acks
     routingModule = new RoutingModule();
-}
+}

src/modules/PositionModule.cpp

@@ -52,11 +52,22 @@ bool PositionModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, mes
 
     nodeDB.updatePosition(getFrom(&mp), p);
 
+    // Only respond to location requests on the channel where we broadcast location.
+    if (channels.getByIndex(mp.channel).role == meshtastic_Channel_Role_PRIMARY) {
+        ignoreRequest = false;
+    } else {
+        ignoreRequest = true;
+    }
+
     return false; // Let others look at this message also if they want
 }
 
 meshtastic_MeshPacket *PositionModule::allocReply()
 {
+    if (ignoreRequest) {
+        return NULL;
+    }
+
     meshtastic_NodeInfoLite *node = service.refreshLocalMeshNode(); // should guarantee there is now a position
     assert(node->has_position);
 

src/modules/RangeTestModule.cpp

@@ -1,3 +1,13 @@
+/**
+ * @file RangeTestModule.cpp
+ * @brief Implementation of the RangeTestModule class and RangeTestModuleRadio class.
+ *
+ * As a sender, this module sends packets every n seconds with an incremented PacketID.
+ * As a receiver, this module receives packets from multiple senders and saves them to the Filesystem.
+ *
+ * The RangeTestModule class is an OSThread that runs the module.
+ * The RangeTestModuleRadio class handles sending and receiving packets.
+ */
 #include "RangeTestModule.h"
 #include "FSCommon.h"
 #include "MeshService.h"
@@ -10,11 +20,6 @@
 #include "gps/GeoCoord.h"
 #include <Arduino.h>
 
-/*
-    As a sender, I can send packets every n seconds. These packets include an incremented PacketID.
-    As a receiver, I can receive packets from multiple senders. These packets can be saved to the Filesystem.
-*/
-
 RangeTestModule *rangeTestModule;
 RangeTestModuleRadio *rangeTestModuleRadio;
 
@@ -97,6 +102,12 @@ int32_t RangeTestModule::runOnce()
     return disable();
 }
 
+/**
+ * Sends a payload to a specified destination node.
+ *
+ * @param dest The destination node number.
+ * @param wantReplies Whether or not to request replies from the destination node.
+ */
 void RangeTestModuleRadio::sendPayload(NodeNum dest, bool wantReplies)
 {
     meshtastic_MeshPacket *p = allocDataPacket();

src/modules/SerialModule.cpp

@@ -86,7 +86,13 @@ SerialModuleRadio::SerialModuleRadio() : MeshModule("SerialModuleRadio")
     }
 }
 
-// For the serial2 port we can't really detect if any client is on the other side, so instead just look for recent messages
+/**
+ * @brief Checks if the serial connection is established.
+ *
+ * @return true if the serial connection is established, false otherwise.
+ *
+ * For the serial2 port we can't really detect if any client is on the other side, so instead just look for recent messages
+ */
 bool SerialModule::checkIsConnected()
 {
     uint32_t now = millis();
@@ -191,6 +197,11 @@ int32_t SerialModule::runOnce()
     }
 }
 
+/**
+ * Allocates a new mesh packet for use as a reply to a received packet.
+ *
+ * @return A pointer to the newly allocated mesh packet.
+ */
 meshtastic_MeshPacket *SerialModuleRadio::allocReply()
 {
     auto reply = allocDataPacket(); // Allocate a packet for sending
@@ -198,6 +209,12 @@ meshtastic_MeshPacket *SerialModuleRadio::allocReply()
     return reply;
 }
 
+/**
+ * Sends a payload to a specified destination node.
+ *
+ * @param dest The destination node number.
+ * @param wantReplies Whether or not to request replies from the destination node.
+ */
 void SerialModuleRadio::sendPayload(NodeNum dest, bool wantReplies)
 {
     meshtastic_Channel *ch = (boundChannel != NULL) ? &channels.getByName(boundChannel) : NULL;
@@ -216,6 +233,12 @@ void SerialModuleRadio::sendPayload(NodeNum dest, bool wantReplies)
     service.sendToMesh(p);
 }
 
+/**
+ * Handle a received mesh packet.
+ *
+ * @param mp The received mesh packet.
+ * @return The processed message.
+ */
 ProcessMessage SerialModuleRadio::handleReceived(const meshtastic_MeshPacket &mp)
 {
     if (moduleConfig.serial.enabled) {
@@ -249,7 +272,7 @@ ProcessMessage SerialModuleRadio::handleReceived(const meshtastic_MeshPacket &mp
 
             if (moduleConfig.serial.mode == meshtastic_ModuleConfig_SerialConfig_Serial_Mode_DEFAULT ||
                 moduleConfig.serial.mode == meshtastic_ModuleConfig_SerialConfig_Serial_Mode_SIMPLE) {
-                serialPrint->printf("%s", p.payload.bytes);
+                serialPrint->write(p.payload.bytes, p.payload.size);
             } else if (moduleConfig.serial.mode == meshtastic_ModuleConfig_SerialConfig_Serial_Mode_TEXTMSG) {
                 meshtastic_NodeInfoLite *node = nodeDB.getMeshNode(getFrom(&mp));
                 String sender = (node && node->has_user) ? node->user.short_name : "???";
@@ -277,6 +300,11 @@ ProcessMessage SerialModuleRadio::handleReceived(const meshtastic_MeshPacket &mp
     return ProcessMessage::CONTINUE; // Let others look at this message also if they want
 }
 
+/**
+ * @brief Returns the baud rate of the serial module from the module configuration.
+ *
+ * @return uint32_t The baud rate of the serial module.
+ */
 uint32_t SerialModule::getBaudRate()
 {
     if (moduleConfig.serial.baud == meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_110) {

src/modules/Telemetry/DeviceTelemetry.cpp

@@ -17,7 +17,8 @@ int32_t DeviceTelemetryModule::runOnce()
     uint32_t now = millis();
     if (((lastSentToMesh == 0) ||
          ((now - lastSentToMesh) >= getConfiguredOrDefaultMs(moduleConfig.telemetry.device_update_interval))) &&
-        airTime->isTxAllowedChannelUtil() && airTime->isTxAllowedAirUtil()) {
+        airTime->isTxAllowedChannelUtil() && airTime->isTxAllowedAirUtil() &&
+        config.device.role != meshtastic_Config_DeviceConfig_Role_REPEATER) {
         sendTelemetry();
         lastSentToMesh = now;
     } else if (service.isToPhoneQueueEmpty()) {
@@ -30,6 +31,10 @@ int32_t DeviceTelemetryModule::runOnce()
 
 bool DeviceTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t)
 {
+    // Don't worry about storing telemetry in NodeDB if we're a repeater
+    if (config.device.role == meshtastic_Config_DeviceConfig_Role_REPEATER)
+        return false;
+
     if (t->which_variant == meshtastic_Telemetry_device_metrics_tag) {
 #ifdef DEBUG_PORT
         const char *sender = getSenderShortName(mp);
@@ -43,7 +48,19 @@ bool DeviceTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &
     return false; // Let others look at this message also if they want
 }
 
-bool DeviceTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
+meshtastic_MeshPacket *DeviceTelemetryModule::allocReply()
+{
+    if (ignoreRequest) {
+        return NULL;
+    }
+
+    LOG_INFO("Device telemetry replying to request\n");
+
+    meshtastic_Telemetry telemetry = getDeviceTelemetry();
+    return allocDataProtobuf(telemetry);
+}
+
+meshtastic_Telemetry DeviceTelemetryModule::getDeviceTelemetry()
 {
     meshtastic_Telemetry t;
 
@@ -60,16 +77,22 @@ bool DeviceTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
     t.variant.device_metrics.channel_utilization = airTime->channelUtilizationPercent();
     t.variant.device_metrics.voltage = powerStatus->getBatteryVoltageMv() / 1000.0;
 
-    LOG_INFO("(Sending): air_util_tx=%f, channel_utilization=%f, battery_level=%i, voltage=%f\n",
-             t.variant.device_metrics.air_util_tx, t.variant.device_metrics.channel_utilization,
-             t.variant.device_metrics.battery_level, t.variant.device_metrics.voltage);
+    return t;
+}
 
-    meshtastic_MeshPacket *p = allocDataProtobuf(t);
+bool DeviceTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
+{
+    meshtastic_Telemetry telemetry = getDeviceTelemetry();
+    LOG_INFO("(Sending): air_util_tx=%f, channel_utilization=%f, battery_level=%i, voltage=%f\n",
+             telemetry.variant.device_metrics.air_util_tx, telemetry.variant.device_metrics.channel_utilization,
+             telemetry.variant.device_metrics.battery_level, telemetry.variant.device_metrics.voltage);
+
+    meshtastic_MeshPacket *p = allocDataProtobuf(telemetry);
     p->to = dest;
     p->decoded.want_response = false;
     p->priority = meshtastic_MeshPacket_Priority_MIN;
 
-    nodeDB.updateTelemetry(nodeDB.getNodeNum(), t, RX_SRC_LOCAL);
+    nodeDB.updateTelemetry(nodeDB.getNodeNum(), telemetry, RX_SRC_LOCAL);
     if (phoneOnly) {
         LOG_INFO("Sending packet to phone\n");
         service.sendToPhone(p);

src/modules/Telemetry/DeviceTelemetry.h

@@ -21,6 +21,7 @@ class DeviceTelemetryModule : private concurrency::OSThread, public ProtobufModu
     @return true if you've guaranteed you've handled this message and no other handlers should be considered for it
     */
     virtual bool handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *p) override;
+    virtual meshtastic_MeshPacket *allocReply() override;
     virtual int32_t runOnce() override;
     /**
      * Send our Telemetry into the mesh
@@ -28,6 +29,7 @@ class DeviceTelemetryModule : private concurrency::OSThread, public ProtobufModu
     bool sendTelemetry(NodeNum dest = NODENUM_BROADCAST, bool phoneOnly = false);
 
   private:
+    meshtastic_Telemetry getDeviceTelemetry();
     uint32_t sendToPhoneIntervalMs = SECONDS_IN_MINUTE * 1000; // Send to phone every minute
     uint32_t lastSentToMesh = 0;
 };

src/modules/Telemetry/EnvironmentTelemetry.cpp

@@ -31,7 +31,9 @@ SHT31Sensor sht31Sensor;
 #define FAILED_STATE_SENSOR_READ_MULTIPLIER 10
 #define DISPLAY_RECEIVEID_MEASUREMENTS_ON_SCREEN true
 
-#ifdef USE_EINK
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS)) &&                                \
+    !defined(DISPLAY_FORCE_SMALL_FONTS)
+
 // The screen is bigger so use bigger fonts
 #define FONT_SMALL ArialMT_Plain_16
 #define FONT_MEDIUM ArialMT_Plain_24

src/modules/esp32/AudioModule.cpp

@@ -48,7 +48,9 @@ AudioModule *audioModule;
 #define YIELD_FROM_ISR(x) portYIELD_FROM_ISR(x)
 #endif
 
-#if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS)
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS)) &&                                \
+    !defined(DISPLAY_FORCE_SMALL_FONTS)
+
 // The screen is bigger so use bigger fonts
 #define FONT_SMALL ArialMT_Plain_16
 #define FONT_MEDIUM ArialMT_Plain_24

src/modules/esp32/StoreForwardModule.cpp

@@ -1,3 +1,17 @@
+/**
+ * @file StoreForwardModule.cpp
+ * @brief Implementation of the StoreForwardModule class.
+ *
+ * This file contains the implementation of the StoreForwardModule class, which is responsible for managing the store and forward
+ * functionality of the Meshtastic device. The class provides methods for sending and receiving messages, as well as managing the
+ * message history queue. It also initializes and manages the data structures used for storing the message history.
+ *
+ * The StoreForwardModule class is used by the MeshService class to provide store and forward functionality to the Meshtastic
+ * device.
+ *
+ * @author Jm Casler
+ * @date [Insert Date]
+ */
 #include "StoreForwardModule.h"
 #include "MeshService.h"
 #include "NodeDB.h"
@@ -52,9 +66,9 @@ int32_t StoreForwardModule::runOnce()
     return disable();
 }
 
-/*
-    Create our data structure in the PSRAM.
-*/
+/**
+ * Populates the PSRAM with data to be sent later when a device is out of range.
+ */
 void StoreForwardModule::populatePSRAM()
 {
     /*
@@ -82,6 +96,12 @@ void StoreForwardModule::populatePSRAM()
     LOG_DEBUG("*** numberOfPackets for packetHistory - %u\n", numberOfPackets);
 }
 
+/**
+ * Sends messages from the message history to the specified recipient.
+ *
+ * @param msAgo The number of milliseconds ago from which to start sending messages.
+ * @param to The recipient ID to send the messages to.
+ */
 void StoreForwardModule::historySend(uint32_t msAgo, uint32_t to)
 {
     uint32_t queueSize = storeForwardModule->historyQueueCreate(msAgo, to);
@@ -101,6 +121,13 @@ void StoreForwardModule::historySend(uint32_t msAgo, uint32_t to)
     storeForwardModule->sendMessage(to, sf);
 }
 
+/**
+ * Creates a new history queue with messages that were received within the specified time frame.
+ *
+ * @param msAgo The number of milliseconds ago to start the history queue.
+ * @param to The maximum number of messages to include in the history queue.
+ * @return The ID of the newly created history queue.
+ */
 uint32_t StoreForwardModule::historyQueueCreate(uint32_t msAgo, uint32_t to)
 {
 
@@ -141,6 +168,11 @@ uint32_t StoreForwardModule::historyQueueCreate(uint32_t msAgo, uint32_t to)
     return this->packetHistoryTXQueue_size;
 }
 
+/**
+ * Adds a mesh packet to the history buffer for store-and-forward functionality.
+ *
+ * @param mp The mesh packet to add to the history buffer.
+ */
 void StoreForwardModule::historyAdd(const meshtastic_MeshPacket &mp)
 {
     const auto &p = mp.decoded;
@@ -162,6 +194,12 @@ meshtastic_MeshPacket *StoreForwardModule::allocReply()
     return reply;
 }
 
+/**
+ * Sends a payload to a specified destination node using the store and forward mechanism.
+ *
+ * @param dest The destination node number.
+ * @param packetHistory_index The index of the packet in the packet history buffer.
+ */
 void StoreForwardModule::sendPayload(NodeNum dest, uint32_t packetHistory_index)
 {
     LOG_INFO("*** Sending S&F Payload\n");
@@ -183,6 +221,12 @@ void StoreForwardModule::sendPayload(NodeNum dest, uint32_t packetHistory_index)
     service.sendToMesh(p);
 }
 
+/**
+ * Sends a message to a specified destination node using the store and forward protocol.
+ *
+ * @param dest The destination node number.
+ * @param payload The message payload to be sent.
+ */
 void StoreForwardModule::sendMessage(NodeNum dest, meshtastic_StoreAndForward &payload)
 {
     meshtastic_MeshPacket *p = allocDataProtobuf(payload);
@@ -203,6 +247,12 @@ void StoreForwardModule::sendMessage(NodeNum dest, meshtastic_StoreAndForward &p
     service.sendToMesh(p);
 }
 
+/**
+ * Sends a store-and-forward message to the specified destination node.
+ *
+ * @param dest The destination node number.
+ * @param rr The store-and-forward request/response message to send.
+ */
 void StoreForwardModule::sendMessage(NodeNum dest, meshtastic_StoreAndForward_RequestResponse rr)
 {
     // Craft an empty response, save some bytes in flash
@@ -211,6 +261,11 @@ void StoreForwardModule::sendMessage(NodeNum dest, meshtastic_StoreAndForward_Re
     storeForwardModule->sendMessage(dest, sf);
 }
 
+/**
+ * Sends statistics about the store and forward module to the specified node.
+ *
+ * @param to The node ID to send the statistics to.
+ */
 void StoreForwardModule::statsSend(uint32_t to)
 {
     meshtastic_StoreAndForward sf = meshtastic_StoreAndForward_init_zero;
@@ -231,6 +286,12 @@ void StoreForwardModule::statsSend(uint32_t to)
     storeForwardModule->sendMessage(to, sf);
 }
 
+/**
+ * Handles a received mesh packet, potentially storing it for later forwarding.
+ *
+ * @param mp The received mesh packet.
+ * @return A `ProcessMessage` indicating whether the packet was successfully handled.
+ */
 ProcessMessage StoreForwardModule::handleReceived(const meshtastic_MeshPacket &mp)
 {
 #ifdef ARCH_ESP32
@@ -287,6 +348,13 @@ ProcessMessage StoreForwardModule::handleReceived(const meshtastic_MeshPacket &m
     return ProcessMessage::CONTINUE; // Let others look at this message also if they want
 }
 
+/**
+ * Handles a received protobuf message for the Store and Forward module.
+ *
+ * @param mp The received MeshPacket to handle.
+ * @param p A pointer to the StoreAndForward object.
+ * @return True if the message was successfully handled, false otherwise.
+ */
 bool StoreForwardModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_StoreAndForward *p)
 {
     if (!moduleConfig.store_forward.enabled) {
@@ -488,4 +556,4 @@ StoreForwardModule::StoreForwardModule()
         disable();
     }
 #endif
-}
+}

src/mqtt/MQTT.cpp

@@ -164,6 +164,8 @@ MQTT::MQTT() : concurrency::OSThread("mqtt"), mqttQueue(MAX_MQTT_QUEUE)
 #endif
 {
     if (moduleConfig.mqtt.enabled) {
+        LOG_DEBUG("Initializing MQTT\n");
+
         assert(!mqtt);
         mqtt = this;
 
@@ -181,6 +183,14 @@ MQTT::MQTT() : concurrency::OSThread("mqtt"), mqttQueue(MAX_MQTT_QUEUE)
         if (!moduleConfig.mqtt.proxy_to_client_enabled)
             pubSub.setCallback(mqttCallback);
 #endif
+
+        if (moduleConfig.mqtt.proxy_to_client_enabled) {
+            LOG_INFO("MQTT configured to use client proxy...\n");
+            enabled = true;
+            runASAP = true;
+            reconnectCount = 0;
+            publishStatus();
+        }
         // preflightSleepObserver.observe(&preflightSleep);
     } else {
         disable();
@@ -597,6 +607,15 @@ std::string MQTT::meshPacketToJson(meshtastic_MeshPacket *mp)
                 if (int(decoded->sats_in_view)) {
                     msgPayload["sats_in_view"] = new JSONValue((int)decoded->sats_in_view);
                 }
+                if ((int)decoded->PDOP) {
+                    msgPayload["PDOP"] = new JSONValue((int)decoded->PDOP);
+                }
+                if ((int)decoded->HDOP) {
+                    msgPayload["HDOP"] = new JSONValue((int)decoded->HDOP);
+                }
+                if ((int)decoded->VDOP) {
+                    msgPayload["VDOP"] = new JSONValue((int)decoded->VDOP);
+                }
                 jsonObj["payload"] = new JSONValue(msgPayload);
             } else {
                 LOG_ERROR("Error decoding protobuf for position message!\n");

src/platform/esp32/architecture.h

@@ -46,6 +46,10 @@
 #if defined(HAS_AXP192) || defined(HAS_AXP2101)
 #define HAS_PMU
 #endif
+
+#ifdef PIN_BUTTON_TOUCH
+#define BUTTON_PIN_TOUCH PIN_BUTTON_TOUCH
+#endif
 //
 // set HW_VENDOR
 //
@@ -81,6 +85,10 @@
 #define HW_VENDOR meshtastic_HardwareModel_TLORA_V2_1_1P6
 #elif defined(TLORA_V2_1_18)
 #define HW_VENDOR meshtastic_HardwareModel_TLORA_V2_1_1P8
+#elif defined(T_DECK)
+#define HW_VENDOR meshtastic_HardwareModel_T_DECK
+#elif defined(T_WATCH_S3)
+#define HW_VENDOR meshtastic_HardwareModel_T_WATCH_S3
 #elif defined(GENIEBLOCKS)
 #define HW_VENDOR meshtastic_HardwareModel_GENIEBLOCKS
 #elif defined(PRIVATE_HW)

src/platform/nrf52/architecture.h

@@ -66,6 +66,14 @@
 
 #endif
 
+#ifdef _SEEED_XIAO_NRF52840_SENSE_H_
+
+// This board uses 0 to be mean LED on
+#undef LED_INVERTED
+#define LED_INVERTED 1
+
+#endif
+
 #ifndef TTGO_T_ECHO
 #define GPS_UBLOX
 #endif

src/platform/rp2040/main-rp2040.cpp

@@ -27,4 +27,12 @@ void getMacAddr(uint8_t *dmac)
     dmac[2] = src.id[4];
     dmac[1] = src.id[3];
     dmac[0] = src.id[2];
+}
+
+void rp2040Setup()
+{
+    /* Sets a random seed to make sure we get different random numbers on each boot.
+       Taken from CPU cycle counter and ROSC oscillator, so should be pretty random.
+    */
+    randomSeed(rp2040.hwrand32());
 }

src/sleep.cpp

@@ -23,11 +23,6 @@ esp_sleep_source_t wakeCause; // the reason we booted this time
 #define INCLUDE_vTaskSuspend 0
 #endif
 
-#ifdef HAS_PMU
-#include "XPowersLibInterface.hpp"
-extern XPowersLibInterface *PMU;
-#endif
-
 /// Called to ask any observers if they want to veto sleep. Return 1 to veto or 0 to allow sleep to happen
 Observable<void *> preflightSleep;
 
@@ -259,7 +254,8 @@ void doDeepSleep(uint32_t msecToWake)
             if (HW_VENDOR == meshtastic_HardwareModel_TBEAM) {
                 // t-beam v1.2 radio power channel
                 PMU->disablePowerOutput(XPOWERS_ALDO2); // lora radio power channel
-            } else if (HW_VENDOR == meshtastic_HardwareModel_LILYGO_TBEAM_S3_CORE) {
+            } else if (HW_VENDOR == meshtastic_HardwareModel_LILYGO_TBEAM_S3_CORE ||
+                       HW_VENDOR == meshtastic_HardwareModel_T_WATCH_S3) {
                 PMU->disablePowerOutput(XPOWERS_ALDO3); // lora radio power channel
             }
         } else if (model == XPOWERS_AXP192) {
@@ -388,4 +384,4 @@ void enableModemSleep()
     int rv = esp_pm_configure(&esp32_config);
     LOG_DEBUG("Sleep request result %x\n", rv);
 }
-#endif
+#endif

src/sleep.h

@@ -12,6 +12,12 @@ esp_sleep_wakeup_cause_t doLightSleep(uint64_t msecToWake);
 
 extern esp_sleep_source_t wakeCause;
 #endif
+
+#ifdef HAS_PMU
+#include "XPowersLibInterface.hpp"
+extern XPowersLibInterface *PMU;
+#endif
+
 void setGPSPower(bool on);
 void doGPSpowersave(bool on);
 // Perform power on init that we do on each wake from deep sleep

src/xmodem.cpp

@@ -1,3 +1,21 @@
+/**
+ * @file xmodem.cpp
+ * @brief Implementation of XMODEM protocol for Meshtastic devices.
+ *
+ * This file contains the implementation of the XMODEM protocol for Meshtastic devices. It is based on the XMODEM implementation
+ * by Georges Menie (www.menie.org) and has been adapted for protobuf encapsulation.
+ *
+ * The XMODEM protocol is used for reliable transmission of binary data over a serial connection. This implementation supports
+ * both sending and receiving of data.
+ *
+ * The XModemAdapter class provides the main functionality for the protocol, including CRC calculation, packet handling, and
+ * control signal sending.
+ *
+ * @copyright Copyright (c) 2001-2019 Georges Menie
+ * @author
+ * @author
+ * @date
+ */
 /***********************************************************************************************************************
  * based on XMODEM implementation by Georges Menie (www.menie.org)
  ***********************************************************************************************************************
@@ -36,6 +54,13 @@ XModemAdapter xModem;
 
 XModemAdapter::XModemAdapter() {}
 
+/**
+ * Calculates the CRC-16 CCITT checksum of the given buffer.
+ *
+ * @param buffer The buffer to calculate the checksum for.
+ * @param length The length of the buffer.
+ * @return The calculated checksum.
+ */
 unsigned short XModemAdapter::crc16_ccitt(const pb_byte_t *buffer, int length)
 {
     unsigned short crc16 = 0;
@@ -52,6 +77,15 @@ unsigned short XModemAdapter::crc16_ccitt(const pb_byte_t *buffer, int length)
     return crc16;
 }
 
+/**
+ * Calculates the checksum of the given buffer and compares it to the given
+ * expected checksum. Returns 1 if the checksums match, 0 otherwise.
+ *
+ * @param buf The buffer to calculate the checksum of.
+ * @param sz The size of the buffer.
+ * @param tcrc The expected checksum.
+ * @return 1 if the checksums match, 0 otherwise.
+ */
 int XModemAdapter::check(const pb_byte_t *buf, int sz, unsigned short tcrc)
 {
     return crc16_ccitt(buf, sz) == tcrc;
@@ -214,4 +248,4 @@ void XModemAdapter::handlePacket(meshtastic_XModem xmodemPacket)
         // Unknown control character
         break;
     }
-}
+}

variants/diy/hydra/variant.h

@@ -35,7 +35,10 @@
 #define SX126X_DIO1 LORA_DIO1
 #define SX126X_BUSY LORA_DIO2
 #define SX126X_RESET LORA_RESET
+#define SX126X_RXEN 14
+#define SX126X_TXEN RADIOLIB_NC
+#define E22_TXEN_CONNECTED_TO_DIO2 1
 
 // Set lora.tx_power to 13 for Hydra or other E22 900M30S target due to PA
 #define SX126X_MAX_POWER 13
-#define SX126X_E22
+#define SX126X_E22

variants/heltec_wireless_tracker/platformio.ini

@@ -8,4 +8,4 @@ build_flags =
 
 lib_deps =
   ${esp32s3_base.lib_deps}
-  lovyan03/LovyanGFX@^1.1.7
+  lovyan03/LovyanGFX@^1.1.8

variants/heltec_wireless_tracker/variant.h

@@ -21,6 +21,7 @@
 #define TFT_OFFSET_Y 0
 #define VTFT_CTRL 46                  // Heltec Tracker needs this pulled low for TFT
 #define SCREEN_TRANSITION_FRAMERATE 1 // fps
+#define DISPLAY_FORCE_SMALL_FONTS
 
 #define VEXT_ENABLE Vext // active low, powers the oled display and the lora antenna boost
 #define BUTTON_PIN 0

variants/m5stack_core/platformio.ini

@@ -2,8 +2,6 @@
 extends = esp32_base
 board = m5stack-core-esp32
 board_level = extra
-upload_port = COM8
-monitor_port = COM8
 monitor_filters = esp32_exception_decoder
 build_src_filter = 
   ${esp32_base.build_src_filter}
@@ -28,4 +26,4 @@ lib_ignore =
   m5stack-core
 lib_deps = 
   ${esp32_base.lib_deps}
-  bodmer/TFT_eSPI@^2.4.76
+  lovyan03/LovyanGFX@^1.1.8

variants/m5stack_core/variant.h

@@ -34,8 +34,13 @@
 #define GPS_RX_PIN 16
 #define GPS_TX_PIN 17
 
-// Define if screen should be mirrored left to right
-#define SCREEN_ROTATE
+#define TFT_HEIGHT 240
+#define TFT_WIDTH 320
+#define TFT_OFFSET_X 0
+#define TFT_OFFSET_Y 0
+#define TFT_BUSY -1
 
 // LCD screens are slow, so slowdown the wipe so it looks better
 #define SCREEN_TRANSITION_FRAMERATE 1 // fps
+
+#define ILI9341_SPI_HOST VSPI_HOST // VSPI_HOST or HSPI_HOST

variants/m5stack_coreink/variant.h

@@ -39,7 +39,9 @@
 #undef RF95_MOSI
 #undef RF95_NSS
 #define USE_RF95
+//#define USE_SX1280
 
+#ifdef USE_RF95
 #define RF95_SCK 18
 #define RF95_MISO 34
 #define RF95_MOSI 23
@@ -48,6 +50,22 @@
 #define LORA_RESET 26
 #define LORA_DIO1 RADIOLIB_NC
 #define LORA_DIO2 RADIOLIB_NC
+#endif
+
+#ifdef USE_SX1280
+#define RF95_SCK 18
+#define RF95_MISO 34
+#define RF95_MOSI 23
+#define RF95_NSS 14
+#define LORA_RESET 26
+#define LORA_DIO1 25
+#define LORA_DIO2 13
+#define SX128X_CS RF95_NSS
+#define SX128X_DIO1 LORA_DIO1
+#define SX128X_BUSY LORA_DIO2
+#define SX128X_RESET LORA_RESET
+#define SX128X_MAX_POWER 13 // 10
+#endif
 
 #define USE_EINK
 // https://docs.m5stack.com/en/core/coreink
@@ -59,3 +77,18 @@
 #define PIN_EINK_RES -1  // Connected but not needed
 #define PIN_EINK_SCLK 18 // EPD_SCLK
 #define PIN_EINK_MOSI 23 // EPD_MOSI
+
+#define BATTERY_PIN 35
+#define ADC_CHANNEL ADC1_GPIO35_CHANNEL
+// https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/schematic/Core/m5paper/M5_PAPER_SCH.pdf
+// https://github.com/m5stack/M5Core-Ink/blob/master/examples/Basics/FactoryTest/FactoryTest.ino#L58
+//  VBAT
+//   |
+//  R83 (3K)
+//   +
+//  R86 (11K)
+//   |
+//  GND
+// https://github.com/m5stack/M5Core-Ink/blob/master/examples/Basics/FactoryTest/FactoryTest.ino#L58
+#define ADC_MULTIPLIER 5 // Just a guess for now... more detailed getBatVoltage above
+// https://embeddedexplorer.com/esp32-adc-esp-idf-tutorial/

variants/nano-g2-ultra/platformio.ini

@@ -0,0 +1,14 @@
+; First prototype eink/nrf52840/sx1262 device
+[env:nano-g2-ultra]
+extends = nrf52840_base
+board = nano-g2-ultra
+debug_tool = jlink
+
+build_flags = ${nrf52840_base.build_flags} -Ivariants/nano-g2-ultra -D NANO_G2_ULTRA
+  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nano-g2-ultra>
+lib_deps = 
+  ${nrf52840_base.lib_deps}
+  adafruit/Adafruit BusIO@^1.13.2
+  lewisxhe/PCF8563_Library@^1.0.1
+;upload_protocol = fs

variants/nano-g2-ultra/variant.cpp

@@ -0,0 +1,36 @@
+/*
+  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2016 Sandeep Mistry All right reserved.
+  Copyright (c) 2018, Adafruit Industries (adafruit.com)
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "variant.h"
+#include "nrf.h"
+#include "wiring_constants.h"
+#include "wiring_digital.h"
+
+const uint32_t g_ADigitalPinMap[] = {
+    // P0 - pins 0 and 1 are hardwired for xtal and should never be enabled
+    0xff, 0xff, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+
+    // P1
+    32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47};
+
+void initVariant()
+{
+    // Nothing need to be inited for now
+}

variants/nano-g2-ultra/variant.h

@@ -0,0 +1,196 @@
+/*
+ Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+ Copyright (c) 2016 Sandeep Mistry All right reserved.
+ Copyright (c) 2018, Adafruit Industries (adafruit.com)
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the GNU Lesser General Public License for more details.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef _VARIANT_Nano_G2_
+#define _VARIANT_Nano_G2_
+
+/** Master clock frequency */
+#define VARIANT_MCK (64000000ul)
+
+#define USE_LFXO // Board uses 32khz crystal for LF
+//#define USE_LFRC  // Board uses 32khz RC for LF
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+
+#include "WVariant.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+// Number of pins defined in PinDescription array
+#define PINS_COUNT (48)
+#define NUM_DIGITAL_PINS (48)
+#define NUM_ANALOG_INPUTS (1)
+#define NUM_ANALOG_OUTPUTS (0)
+
+// LEDs
+#define PIN_LED1 (-1)
+#define PIN_LED2 (-1)
+#define PIN_LED3 (-1)
+
+#define LED_RED PIN_LED3
+#define LED_BLUE PIN_LED1
+#define LED_GREEN PIN_LED2
+
+#define LED_BUILTIN LED_BLUE
+#define LED_CONN PIN_GREEN
+
+#define LED_STATE_ON 0 // State when LED is lit
+//#define LED_INVERTED 1
+
+/*
+ * Buttons
+ */
+#define PIN_BUTTON1 (32 + 6)
+
+#define EXT_NOTIFY_OUT (0 + 4) // Default pin to use for Ext Notify Module.
+
+/*
+ * Analog pins
+ */
+#define PIN_A4 (0 + 2) // Battery ADC
+
+#define BATTERY_PIN PIN_A4
+
+static const uint8_t A4 = PIN_A4;
+
+#define ADC_RESOLUTION 14
+
+/*
+ * Serial interfaces
+ */
+#define PIN_SERIAL2_RX (0 + 22)
+#define PIN_SERIAL2_TX (0 + 20)
+
+/**
+    Wire Interfaces
+    */
+#define WIRE_INTERFACES_COUNT 1
+
+#define PIN_WIRE_SDA (0 + 17)
+#define PIN_WIRE_SCL (0 + 15)
+
+#define PIN_RTC_INT (0 + 14) // Interrupt from the PCF8563 RTC
+
+/*
+External serial flash W25Q16JV_IQ
+*/
+
+// QSPI Pins
+#define PIN_QSPI_SCK (0 + 8)
+#define PIN_QSPI_CS (32 + 7)
+#define PIN_QSPI_IO0 (0 + 6)  // MOSI if using two bit interface
+#define PIN_QSPI_IO1 (0 + 26) // MISO if using two bit interface
+#define PIN_QSPI_IO2 (32 + 4) // WP if using two bit interface (i.e. not used)
+#define PIN_QSPI_IO3 (32 + 2) // HOLD if using two bit interface (i.e. not used)
+
+// On-board QSPI Flash
+#define EXTERNAL_FLASH_DEVICES W25Q16JV_IQ
+#define EXTERNAL_FLASH_USE_QSPI
+
+/*
+ * Lora radio
+ */
+
+#define USE_SX1262
+#define SX126X_CS (32 + 13) // FIXME - we really should define LORA_CS instead
+#define SX126X_DIO1 (32 + 10)
+// Note DIO2 is attached internally to the module to an analog switch for TX/RX switching
+//#define SX1262_DIO3 (0 + 21)
+// This is used as an *output* from the sx1262 and connected internally to power the tcxo, do not drive from the main CPU?
+#define SX126X_BUSY (32 + 11)
+#define SX126X_RESET (32 + 15)
+#define SX126X_E22 //  DIO2 controlls an antenna switch and the TCXO voltage is controlled by DIO3
+
+// #define LORA_DISABLE_SENDING // Define this to disable transmission for testing (power testing etc...)
+
+// #undef SX126X_CS
+
+/*
+ * GPS pins
+ */
+
+#define GPS_L76K
+
+#define PIN_GPS_WAKE (0 + 13) // An output to wake GPS, low means allow sleep, high means force wake
+#define PIN_GPS_TX (0 + 9)    // This is for bits going TOWARDS the CPU
+#define PIN_GPS_RX (0 + 10)   // This is for bits going TOWARDS the GPS
+
+//#define GPS_THREAD_INTERVAL 50
+
+#define PIN_SERIAL1_RX PIN_GPS_TX
+#define PIN_SERIAL1_TX PIN_GPS_RX
+
+// PCF8563 RTC Module
+#define PCF8563_RTC 0x51
+
+/*
+ * SPI Interfaces
+ */
+#define SPI_INTERFACES_COUNT 1
+
+// For LORA, spi 0
+#define PIN_SPI_MISO (32 + 9)
+#define PIN_SPI_MOSI (0 + 11)
+#define PIN_SPI_SCK (0 + 12)
+
+//#define PIN_PWR_EN (0 + 6)
+
+// To debug via the segger JLINK console rather than the CDC-ACM serial device
+// #define USE_SEGGER
+
+// Battery
+// The battery sense is hooked to pin A0 (2)
+// it is defined in the anlaolgue pin section of this file
+// and has 12 bit resolution
+#define BATTERY_SENSE_RESOLUTION_BITS 12
+#define BATTERY_SENSE_RESOLUTION 4096.0
+// Definition of milliVolt per LSB => 3.0V ADC range and 12-bit ADC resolution = 3000mV/4096
+#define VBAT_MV_PER_LSB (0.73242188F)
+// Voltage divider value => 100K + 100K voltage divider on VBAT = (100K / (100K + 100K))
+#define VBAT_DIVIDER (0.5F)
+// Compensation factor for the VBAT divider
+#define VBAT_DIVIDER_COMP (2.0)
+// Fixed calculation of milliVolt from compensation value
+#define REAL_VBAT_MV_PER_LSB (VBAT_DIVIDER_COMP * VBAT_MV_PER_LSB)
+#undef AREF_VOLTAGE
+#define AREF_VOLTAGE 3.0
+#define VBAT_AR_INTERNAL AR_INTERNAL_3_0
+#define ADC_MULTIPLIER VBAT_DIVIDER_COMP
+#define VBAT_RAW_TO_SCALED(x) (REAL_VBAT_MV_PER_LSB * x)
+
+#define HAS_RTC 1
+
+/**
+    OLED Screen Model
+    */
+#define ARDUINO_ARCH_AVR
+#define USE_SH1107_128_64
+
+#ifdef __cplusplus
+}
+#endif
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#endif

variants/rpipico/variant.h

@@ -19,6 +19,7 @@
 // SDA = 4
 // SCL = 5
 
+#define EXT_NOTIFY_OUT 22
 #define BUTTON_PIN 17
 
 #define LED_PIN PIN_LED

variants/rpipicow/variant.h

@@ -19,6 +19,7 @@
 // SDA = 4
 // SCL = 5
 
+#define EXT_NOTIFY_OUT 22
 #define BUTTON_PIN 17
 
 #define BATTERY_PIN 26

variants/t-deck/pins_arduino.h

@@ -0,0 +1,69 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define USB_VID 0x303a
+#define USB_PID 0x1001
+
+#define EXTERNAL_NUM_INTERRUPTS 46
+#define NUM_DIGITAL_PINS 48
+#define NUM_ANALOG_INPUTS 20
+
+#define analogInputToDigitalPin(p) (((p) < NUM_ANALOG_INPUTS) ? (analogChannelToDigitalPin(p)) : -1)
+#define digitalPinToInterrupt(p) (((p) < NUM_DIGITAL_PINS) ? (p) : -1)
+#define digitalPinHasPWM(p) (p < EXTERNAL_NUM_INTERRUPTS)
+
+// static const uint8_t LED_BUILTIN = -1;
+
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+static const uint8_t SDA = 18;
+static const uint8_t SCL = 8;
+
+// Default SPI will be mapped to Radio
+static const uint8_t SS = 9;
+static const uint8_t MOSI = 41;
+static const uint8_t MISO = 38;
+static const uint8_t SCK = 40;
+
+static const uint8_t A0 = 1;
+static const uint8_t A1 = 2;
+static const uint8_t A2 = 3;
+static const uint8_t A3 = 4;
+static const uint8_t A4 = 5;
+static const uint8_t A5 = 6;
+static const uint8_t A6 = 7;
+static const uint8_t A7 = 8;
+static const uint8_t A8 = 9;
+static const uint8_t A9 = 10;
+static const uint8_t A10 = 11;
+static const uint8_t A11 = 12;
+static const uint8_t A12 = 13;
+static const uint8_t A13 = 14;
+static const uint8_t A14 = 15;
+static const uint8_t A15 = 16;
+static const uint8_t A16 = 17;
+static const uint8_t A17 = 18;
+static const uint8_t A18 = 19;
+static const uint8_t A19 = 20;
+
+static const uint8_t T1 = 1;
+static const uint8_t T2 = 2;
+static const uint8_t T3 = 3;
+static const uint8_t T4 = 4;
+static const uint8_t T5 = 5;
+static const uint8_t T6 = 6;
+static const uint8_t T7 = 7;
+static const uint8_t T8 = 8;
+static const uint8_t T9 = 9;
+static const uint8_t T10 = 10;
+static const uint8_t T11 = 11;
+static const uint8_t T12 = 12;
+static const uint8_t T13 = 13;
+static const uint8_t T14 = 14;
+
+static const uint8_t BAT_ADC_PIN = 4;
+
+#endif /* Pins_Arduino_h */

variants/t-deck/platformio.ini

@@ -0,0 +1,14 @@
+; LilyGo T-Deck
+[env:t-deck]
+extends = esp32s3_base
+board = t-deck
+upload_protocol = esp-builtin
+debug_tool = esp-builtin
+
+build_flags = ${esp32_base.build_flags} 
+  -DT_DECK 
+  -DBOARD_HAS_PSRAM
+  -Ivariants/t-deck
+
+lib_deps = ${esp32s3_base.lib_deps}
+	lovyan03/LovyanGFX@^1.1.8

variants/t-deck/variant.h

@@ -0,0 +1,88 @@
+// ST7789 TFT LCD
+#define ST7789_CS 12
+#define ST7789_RS 11  // DC
+#define ST7789_SDA 41 // MOSI
+#define ST7789_SCK 40
+#define ST7789_RESET -1
+#define ST7789_MISO 38
+#define ST7789_BUSY -1
+#define ST7789_BL 42
+#define ST7789_SPI_HOST SPI2_HOST
+#define ST7789_BACKLIGHT_EN 42
+#define SPI_FREQUENCY 40000000
+#define SPI_READ_FREQUENCY 16000000
+#define TFT_HEIGHT 320
+#define TFT_WIDTH 240
+#define TFT_OFFSET_X 0
+#define TFT_OFFSET_Y 0
+#define SCREEN_ROTATE
+#define SCREEN_TRANSITION_FRAMERATE 5
+
+#define HAS_TOUCHSCREEN 1
+#define SCREEN_TOUCH_INT 16
+#define TOUCH_I2C_PORT 0
+#define TOUCH_SLAVE_ADDRESS 0x5D // GT911
+
+#define BUTTON_PIN 0
+// #define BUTTON_NEED_PULLUP
+
+#define HAS_GPS 0
+#undef GPS_RX_PIN
+#undef GPS_TX_PIN
+
+// Have SPI interface SD card slot
+#define HAS_SDCARD 1
+#define SPI_MOSI (41)
+#define SPI_SCK (40)
+#define SPI_MISO (38)
+#define SPI_CS (39)
+#define SDCARD_CS SPI_CS
+
+#define BATTERY_PIN 4 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
+// ratio of voltage divider = 2.0 (RD2=100k, RD3=100k)
+#define ADC_MULTIPLIER 2.11 // 2.0 + 10% for correction of display undervoltage.
+#define ADC_CHANNEL ADC1_GPIO1_CHANNEL
+
+// keyboard
+#define I2C_SDA 18 // I2C pins for this board
+#define I2C_SCL 8
+#define KB_POWERON 10                  // must be set to HIGH
+#define KB_SLAVE_ADDRESS TDECK_KB_ADDR // 0x55
+#define KB_BL_PIN 46                   // not used for now
+
+// trackball
+#define HAS_TRACKBALL 1
+#define TB_UP 3
+#define TB_DOWN 15
+#define TB_LEFT 1
+#define TB_RIGHT 2
+#define TB_PRESS BUTTON_PIN
+
+// microphone
+#define ES7210_SCK 47
+#define ES7210_DIN 14
+#define ES7210_LRCK 21
+#define ES7210_MCLK 48
+
+// LoRa
+#define USE_SX1262
+#define USE_SX1268
+
+#define RF95_SCK 40
+#define RF95_MISO 38
+#define RF95_MOSI 41
+#define RF95_NSS 9
+
+#define LORA_DIO0 -1 // a No connect on the SX1262 module
+#define LORA_RESET 17
+#define LORA_DIO1 45 // SX1262 IRQ
+#define LORA_DIO2 13 // SX1262 BUSY
+#define LORA_DIO3    // Not connected on PCB, but internally on the TTGO SX1262, if DIO3 is high the TXCO is enabled
+
+#define SX126X_CS RF95_NSS // FIXME - we really should define LORA_CS instead
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY LORA_DIO2
+#define SX126X_RESET LORA_RESET
+#define SX126X_E22 // Not really an E22 but TTGO seems to be trying to clone that
+// Internally the TTGO module hooks the SX1262-DIO2 in to control the TX/RX switch (which is the default for the sx1262interface
+// code)

variants/t-echo/platformio.ini

@@ -4,9 +4,6 @@ extends = nrf52840_base
 board = t-echo
 debug_tool = jlink
 
-# add our variants files to the include and src paths
-# define build flags for the TFT_eSPI library - NOTE: WE NOT LONGER USE TFT_eSPI, it was for an earlier version of the TTGO eink screens
-# -DBUSY_PIN=3 -DRST_PIN=2 -DDC_PIN=28 -DCS_PIN=30
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
 build_flags = ${nrf52840_base.build_flags} -Ivariants/t-echo
   -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"

variants/t-watch-s3/pins_arduino.h

@@ -0,0 +1,64 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define EXTERNAL_NUM_INTERRUPTS 46
+#define NUM_DIGITAL_PINS 48
+#define NUM_ANALOG_INPUTS 20
+
+#define analogInputToDigitalPin(p) (((p) < NUM_ANALOG_INPUTS) ? (analogChannelToDigitalPin(p)) : -1)
+#define digitalPinToInterrupt(p) (((p) < NUM_DIGITAL_PINS) ? (p) : -1)
+#define digitalPinHasPWM(p) (p < EXTERNAL_NUM_INTERRUPTS)
+
+// static const uint8_t LED_BUILTIN = -1;
+
+// static const uint8_t TX = 43;
+// static const uint8_t RX = 44;
+
+static const uint8_t SDA = 10;
+static const uint8_t SCL = 11;
+
+// Default SPI will be mapped to Radio
+static const uint8_t SS = 5;
+static const uint8_t MOSI = 1;
+static const uint8_t MISO = 4;
+static const uint8_t SCK = 3;
+
+static const uint8_t A0 = 1;
+static const uint8_t A1 = 2;
+static const uint8_t A2 = 3;
+static const uint8_t A3 = 4;
+static const uint8_t A4 = 5;
+static const uint8_t A5 = 6;
+static const uint8_t A6 = 7;
+static const uint8_t A7 = 8;
+static const uint8_t A8 = 9;
+static const uint8_t A9 = 10;
+static const uint8_t A10 = 11;
+static const uint8_t A11 = 12;
+static const uint8_t A12 = 13;
+static const uint8_t A13 = 14;
+static const uint8_t A14 = 15;
+static const uint8_t A15 = 16;
+static const uint8_t A16 = 17;
+static const uint8_t A17 = 18;
+static const uint8_t A18 = 19;
+static const uint8_t A19 = 20;
+
+static const uint8_t T1 = 1;
+static const uint8_t T2 = 2;
+static const uint8_t T3 = 3;
+static const uint8_t T4 = 4;
+static const uint8_t T5 = 5;
+static const uint8_t T6 = 6;
+static const uint8_t T7 = 7;
+static const uint8_t T8 = 8;
+static const uint8_t T9 = 9;
+static const uint8_t T10 = 10;
+static const uint8_t T11 = 11;
+static const uint8_t T12 = 12;
+static const uint8_t T13 = 13;
+static const uint8_t T14 = 14;
+
+#endif /* Pins_Arduino_h */

variants/t-watch-s3/platformio.ini

@@ -0,0 +1,17 @@
+; LilyGo T-Watch S3
+[env:t-watch-s3]
+extends = esp32s3_base
+board = t-watch-s3
+upload_protocol = esptool
+upload_speed = 115200
+#upload_port = /dev/tty.usbmodem3485188D636C1
+
+build_flags = ${esp32_base.build_flags} 
+  -DT_WATCH_S3
+  -Ivariants/t-watch-s3
+  -DPCF8563_RTC=0x51
+
+lib_deps = ${esp32s3_base.lib_deps}
+	lovyan03/LovyanGFX@^1.1.8
+  lewisxhe/PCF8563_Library@1.0.1
+  adafruit/Adafruit DRV2605 Library@^1.2.2

variants/t-watch-s3/variant.h

@@ -0,0 +1,67 @@
+// ST7789 TFT LCD
+#define ST7789_CS 12
+#define ST7789_RS 38  // DC
+#define ST7789_SDA 13 // MOSI
+#define ST7789_SCK 18
+#define ST7789_RESET -1
+#define ST7789_MISO -1
+#define ST7789_BUSY -1
+#define ST7789_BL 45
+#define ST7789_SPI_HOST SPI3_HOST
+#define ST7789_BACKLIGHT_EN 45
+#define SPI_FREQUENCY 40000000
+#define SPI_READ_FREQUENCY 16000000
+#define TFT_HEIGHT 240
+#define TFT_WIDTH 240
+#define TFT_OFFSET_X 0
+#define TFT_OFFSET_Y 0
+#define SCREEN_ROTATE
+#define SCREEN_TRANSITION_FRAMERATE 5 // fps
+
+#define HAS_TOUCHSCREEN 1
+#define SCREEN_TOUCH_INT 16
+#define SCREEN_TOUCH_USE_I2C1
+#define TOUCH_I2C_PORT 1
+#define TOUCH_SLAVE_ADDRESS 0x38
+
+#define I2C_SDA1 39 // Used for capacitive touch
+#define I2C_SCL1 40 // Used for capacitive touch
+
+#define TFT_BL ST7789_BACKLIGHT_EN
+
+#define HAS_AXP2101
+
+#define HAS_RTC 1
+
+#define I2C_SDA 10 // For QMC6310 sensors and screens
+#define I2C_SCL 11 // For QMC6310 sensors and screens
+
+#define BUTTON_PIN 0
+
+#define BMA4XX_INT 14 // Interrupt for BMA_423 axis sensor
+
+#define HAS_GPS 0
+#undef GPS_RX_PIN
+#undef GPS_TX_PIN
+
+#define USE_SX1262
+#define USE_SX1268
+
+#define RF95_SCK 3
+#define RF95_MISO 4
+#define RF95_MOSI 1
+#define RF95_NSS 5
+
+#define LORA_DIO0 -1 // a No connect on the SX1262 module
+#define LORA_RESET 8
+#define LORA_DIO1 9 // SX1262 IRQ
+#define LORA_DIO2 7 // SX1262 BUSY
+#define LORA_DIO3   // Not connected on PCB, but internally on the TTGO SX1262, if DIO3 is high the TXCO is enabled
+
+#define SX126X_CS RF95_NSS // FIXME - we really should define LORA_CS instead
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY LORA_DIO2
+#define SX126X_RESET LORA_RESET
+#define SX126X_E22 // Not really an E22 but TTGO seems to be trying to clone that
+                   // Internally the TTGO module hooks the SX1262-DIO2 in to control the TX/RX switch (which is the default for
+                   // the sx1262interface code)

variants/tbeam-s3-core/variant.h

@@ -39,6 +39,8 @@
 // #define PMU_IRQ 40
 #define HAS_AXP2101
 
+#define HAS_RTC 1
+
 // Specify the PMU as Wire1. In the t-beam-s3 core, PCF8563 and PMU share the bus
 #define PMU_USE_WIRE1
 #define RTC_USE_WIRE1
@@ -59,8 +61,6 @@
 // PCF8563 RTC Module
 // #define PCF8563_RTC 0x51         //Putting definitions in variant. h does not compile correctly
 
-#define HAS_RTC 1
-
 // has 32768 Hz crystal
 #define HAS_32768HZ
 

variants/xiao_ble/README.md

@@ -0,0 +1,261 @@
+#
+
+<p align="center" style="font-size: 28px;">
+    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.
+
+<h3>Acknowledgement and friendly disclaimer</h3>
+
+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
+
+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
+
+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.)
+
+## 1. Update Bootloader
+
+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.
+
+1. Connect the Xiao BLE to your computer via USB-C.
+
+2. Install `adafruit-nrfutil` by following the instructions <a href="https://github.com/adafruit/Adafruit_nRF52_nrfutil">here</a>.
+
+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>).
+
+4. Run the following command, replacing `/dev/cu.usbmodem2101` with the serial port your Xiao BLE is connected to:
+
+   ```bash
+   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.
+
+&nbsp;
+
+## 2. PlatformIO Environment Preparation
+
+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.
+
+1. In your terminal window, run the following command:
+
+   ```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>
+
+The schematic (`xiao-ble-e22-schematic.png`) in the `eagle-project` directory uses this wiring.
+
+&nbsp;
+
+---
+
+&nbsp;
+
+<h3>Example wiring for "Manual Tx/Rx switching" mode:</h3>
+
+<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) | |
+| 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)
+
+&nbsp;
+
+## 5. Flash the firmware to the Xiao BLE
+
+1. Double press the Xiao's `reset` button to put it in bootloader mode.
+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 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:
+
+    1. Double press the `reset` button to put the Xiao in bootloader mode.
+
+    2. In a terminal window, navigate to the Meshtastic firmware repo's root directory, and from there to `variants/xiao_ble`.
+
+    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).
+
+&nbsp;
+
+## 7. Notes
+
+- 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.
+
+- To achieve its full output, the E22 should have a bypass capacitor from its 5V supply to ground. 100 µF works well.
+
+- 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.
+
+&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 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 <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 BLE + E22 and recording the received RSSI.
+
+- 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/xiao_ble/platformio.ini

@@ -0,0 +1,13 @@
+; Seeed Xiao BLE: https://www.digikey.com/en/products/detail/seeed-technology-co-ltd/102010448/16652893
+[env:xiao_ble]
+extends = nrf52840_base
+board = xiao_ble_sense
+board_level = extra
+build_flags = ${nrf52840_base.build_flags} -Ivariants/xiao_ble -Dxiao_ble -D EBYTE_E22
+  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/xiao_ble>
+lib_deps = 
+  ${nrf52840_base.lib_deps}
+debug_tool = jlink
+; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
+;upload_protocol = jlink