Merge branch 'develop' into zps-module

Revert "Add include directive for mbedtls error handling in build flags" (#10073 )
This reverts commit 391928ed08. Since esp32_https_server commit e2c9f98, this is no longer necessary. Also, the esp32-common.ini '-include mbedtls/error.h' causes a build error under IDF v5 (https://github.com/meshtastic/firmware/pull/9122#issuecomment-4185767085): <command-line>: fatal error: mbedtls/error.h: No such file or directory so this change fixes that error.
2026-10-06 20:20:59 +10:00 · 2026-04-12 17:19:30 +02:00 · 2026-04-11 06:35:42 -05:00 · 2026-04-10 16:20:25 -05:00 · 2026-04-10 10:53:04 -05:00 · 2026-04-10 07:21:24 -05:00
85 changed files with 1797 additions and 671 deletions
@@ -9,19 +9,19 @@ plugins:
 lint:
  enabled:
    - checkov@3.2.513
-    - renovate@43.100.0
+    - renovate@43.104.6
    - prettier@3.8.1
-    - trufflehog@3.94.1
+    - trufflehog@3.94.2
    - yamllint@1.38.0
    - bandit@1.9.4
    - trivy@0.69.3
    - taplo@0.10.0
-    - ruff@0.15.8
+    - ruff@0.15.9
    - isort@8.0.1
    - markdownlint@0.48.0
    - oxipng@10.1.0
    - svgo@4.0.1
-    - actionlint@1.7.11
+    - actionlint@1.7.12
    - flake8@7.3.0
    - hadolint@2.14.0
    - shfmt@3.6.0
@@ -0,0 +1,39 @@
+# MeshAdv-Pi E22-900M30S
+# https://github.com/chrismyers2000/MeshAdv-Pi-Hat
+Meta:
+  name: MeshAdv-Pi E22-900M30S
+  support: community
+  compatible:
+    - luckfox-lyra-zero-w # Armbian
+
+Lora:
+  Module: sx1262
+  CS: # GPIO0_C2 (physical 40)
+    pin: 18
+    gpiochip: 0
+    line: 18
+  IRQ: # GPIO1_D1 (physical 36)
+    pin: 57
+    gpiochip: 1
+    line: 25
+  Busy: # GPIO0_C1 (physical 38)
+    pin: 17
+    gpiochip: 0
+    line: 17
+  Reset: # GPIO0_B6 (physical 12)
+    pin: 14
+    gpiochip: 0
+    line: 14
+  TXen: # GPIO1_C2 (physical 33)
+    pin: 50
+    gpiochip: 1
+    line: 18
+  RXen: # GPIO1_D2 (physical 32)
+    pin: 58
+    gpiochip: 1
+    line: 26
+  DIO3_TCXO_VOLTAGE: true
+  # Only for E22-900M33S:
+  # Limit the output power to 8 dBm
+  # SX126X_MAX_POWER: 8
+  spidev: spidev0.0
@@ -0,0 +1,33 @@
+# MeshAdv Mini E22-900M22S
+# https://github.com/chrismyers2000/MeshAdv-Mini
+Meta:
+  name: MeshAdv Mini E22-900M22S
+  support: community
+  compatible:
+    - luckfox-lyra-zero-w # Armbian
+
+Lora:
+  Module: sx1262 # Ebyte E22-900M22S
+  CS: # GPIO0_B2_d (phys 24, RPi CE0)
+    pin: 10
+    gpiochip: 0
+    line: 10
+  IRQ: # GPIO1_D1_d (phys 36, RPi GPIO16)
+    pin: 57
+    gpiochip: 1
+    line: 25
+  Busy: # GPIO0_C1_d (phys 38, RPi GPIO20)
+    pin: 17
+    gpiochip: 0
+    line: 17
+  Reset: # GPIO0_B4_d (phys 18, RPi GPIO24)
+    pin: 12
+    gpiochip: 0
+    line: 12
+  RXen: # GPIO1_D2_d (phys 32, RPi GPIO12)
+    pin: 58
+    gpiochip: 1
+    line: 26
+  DIO2_AS_RF_SWITCH: true
+  DIO3_TCXO_VOLTAGE: true
+  spidev: spidev0.0
@@ -0,0 +1,38 @@
+Meta:
+  name: RAK6421 + RAK13300 Slot 1
+  support: community # Promote when tested
+  compatible:
+    - luckfox-lyra-zero-w # Armbian
+
+Lora:
+  Module: sx1262
+  IRQ: # GPIO0_A5 (IO6)
+    pin: 5
+    gpiochip: 0
+    line: 5
+  Reset: # GPIO1_D1 (IO4)
+    pin: 57
+    gpiochip: 1
+    line: 25
+  Busy: # GPIO0_B4 (IO5)
+    pin: 12
+    gpiochip: 0
+    line: 12
+  # Ant_sw: # GPIO1_C2 (IO3)
+  #   pin: 50
+  #   gpiochip: 1
+  #   line: 18
+  Enable_Pins:
+    - pin: 58 # GPIO1_D2
+      gpiochip: 1
+      line: 26
+    - pin: 50 # GPIO1_C2
+      gpiochip: 1
+      line: 18
+  DIO3_TCXO_VOLTAGE: true
+  DIO2_AS_RF_SWITCH: true
+  spidev: spidev0.0
+  # CS: # GPIO0_B2
+  #   pin: 10
+  #   gpiochip: 0
+  #   line: 10
@@ -0,0 +1,36 @@
+Meta:
+  name: RAK6421 + RAK13300 Slot 2
+  support: community # Promote when tested
+  compatible:
+    - luckfox-lyra-zero-w # Armbian
+
+Lora:
+  Module: sx1262
+  IRQ: # GPIO0_B6 (IO6)
+    pin: 14
+    gpiochip: 0
+    line: 14
+  Reset: # GPIO0_B4 (IO4)
+    pin: 12
+    gpiochip: 0
+    line: 12
+  Busy: # GPIO1_C0 (IO5)
+    pin: 48
+    gpiochip: 1
+    line: 16
+  # Ant_sw: # GPIO0_B5 (IO3)
+  #   pin: 13
+  #   gpiochip: 0
+  #   line: 13
+  Enable_Pins:
+    - pin: 51 # GPIO1_C3
+      gpiochip: 1
+      line: 19
+    - pin: 13 # GPIO0_B5
+      gpiochip: 0
+      line: 13
+  spidev: spidev0.1
+  # CS: # GPIO0_B1
+  #   pin: 9
+  #   gpiochip: 0
+  #   line: 9
@@ -0,0 +1,39 @@
+Meta:
+  name: RAK6421 + RAK13300 Slot 1
+  support: community # Promote when tested
+  compatible:
+    - luckfox-lyra-zero-w # Armbian
+
+Lora:
+  Module: sx1262
+  IRQ: # GPIO0_A5 (IO6)
+    pin: 5
+    gpiochip: 0
+    line: 5
+  Reset: # GPIO1_D1 (IO4)
+    pin: 57
+    gpiochip: 1
+    line: 25
+  Busy: # GPIO0_B4 (IO5)
+    pin: 12
+    gpiochip: 0
+    line: 12
+  # Ant_sw: # GPIO1_C2 (IO3)
+  #   pin: 50
+  #   gpiochip: 1
+  #   line: 18
+  Enable_Pins:
+    - pin: 58 # GPIO1_D2
+      gpiochip: 1
+      line: 26
+    - pin: 50 # GPIO1_C2
+      gpiochip: 1
+      line: 18
+  DIO3_TCXO_VOLTAGE: true
+  DIO2_AS_RF_SWITCH: true
+  spidev: spidev0.0
+  # CS: # GPIO0_B2
+  #   pin: 10
+  #   gpiochip: 0
+  #   line: 10
+  TX_GAIN_LORA: [9, 9, 10, 11, 9, 8, 9, 10, 10, 10, 11, 12, 12, 12, 12, 12, 12, 12, 12, 10, 9, 8]
@@ -0,0 +1,37 @@
+Meta:
+  name: RAK6421 + RAK13300 Slot 2
+  support: community # Promote when tested
+  compatible:
+    - luckfox-lyra-zero-w # Armbian
+
+Lora:
+  Module: sx1262
+  IRQ: # GPIO0_B6 (IO6)
+    pin: 14
+    gpiochip: 0
+    line: 14
+  Reset: # GPIO0_B4 (IO4)
+    pin: 12
+    gpiochip: 0
+    line: 12
+  Busy: # GPIO1_C0 (IO5)
+    pin: 48
+    gpiochip: 1
+    line: 16
+  # Ant_sw: # GPIO0_B5 (IO3)
+  #   pin: 13
+  #   gpiochip: 0
+  #   line: 13
+  Enable_Pins:
+    - pin: 51 # GPIO1_C3
+      gpiochip: 1
+      line: 19
+    - pin: 13 # GPIO0_B5
+      gpiochip: 0
+      line: 13
+  spidev: spidev0.1
+  # CS: # GPIO0_B1
+  #   pin: 9
+  #   gpiochip: 0
+  #   line: 9
+  TX_GAIN_LORA: [9, 9, 10, 11, 9, 8, 9, 10, 10, 10, 11, 12, 12, 12, 12, 12, 12, 12, 12, 10, 9, 8]
@@ -0,0 +1,30 @@
+Meta:
+  name: Waveshare SX1262
+  support: deprecated
+  compatible:
+    - luckfox-lyra-zero-w # Armbian
+
+Lora:
+  Module: sx1262  # Waveshare SX126X XXXM
+  DIO2_AS_RF_SWITCH: true
+  CS: # GPIO0_C2 (physical 40)
+    pin: 18
+    gpiochip: 0
+    line: 18
+  IRQ: # GPIO1_D1 (physical 36)
+    pin: 57
+    gpiochip: 1
+    line: 25
+  Busy: # GPIO0_C1 (physical 38)
+    pin: 17
+    gpiochip: 0
+    line: 17
+  Reset: # GPIO0_B6 (physical 12)
+    pin: 14
+    gpiochip: 0
+    line: 14
+  SX126X_ANT_SW: # GPIO1_B3 (physical 31)
+    pin: 43
+    gpiochip: 1
+    line: 11
+  spidev: spidev0.0
@@ -87,6 +87,9 @@
  </screenshots>

  <releases>
+    <release version="2.7.22" date="2026-04-06">
+      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.22</url>
+    </release>
    <release version="2.7.21" date="2026-03-11">
      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.21</url>
    </release>
@@ -1,39 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "esp32s3_out.ld",
-      "memory_type": "qio_opi"
-    },
-    "core": "esp32",
-    "extra_flags": [
-      "-DBOARD_HAS_PSRAM",
-      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1"
-    ],
-    "f_cpu": "240000000L",
-    "f_flash": "80000000L",
-    "flash_mode": "qio",
-    "hwids": [["0x303A", "0x1001"]],
-    "mcu": "esp32s3",
-    "variant": "esp32s3"
-  },
-  "connectivity": ["wifi", "bluetooth", "lora"],
-  "debug": {
-    "default_tool": "esp-builtin",
-    "onboard_tools": ["esp-builtin"],
-    "openocd_target": "esp32s3.cfg"
-  },
-  "frameworks": ["arduino", "espidf"],
-  "name": "LilyGO T-Display S3 Pro LR1121 (16 MB FLASH, 8 MB PSRAM)",
-  "upload": {
-    "flash_size": "16MB",
-    "maximum_ram_size": 327680,
-    "maximum_size": 16777216,
-    "require_upload_port": true,
-    "speed": 921600
-  },
-  "url": "https://lilygo.cc/en-de/products/t-display-s3-pro-lr1121",
-  "vendor": "LilyGO"
-}
@@ -1,3 +1,9 @@
+meshtasticd (2.7.22.0) unstable; urgency=medium
+
+  * Version 2.7.22
+
+ -- GitHub Actions <github-actions[bot]@users.noreply.github.com>  Mon, 06 Apr 2026 11:34:12 +0000
+
 meshtasticd (2.7.21.0) unstable; urgency=medium

  * Version 2.7.21
@@ -50,6 +50,7 @@ build_flags = -Wno-missing-field-initializers
 	-DRADIOLIB_EXCLUDE_APRS=1
 	-DRADIOLIB_EXCLUDE_LORAWAN=1
 	-DMESHTASTIC_EXCLUDE_DROPZONE=1
+	-DMESHTASTIC_EXCLUDE_ZPS=1
 	-DMESHTASTIC_EXCLUDE_REPLYBOT=1
 	-DMESHTASTIC_EXCLUDE_REMOTEHARDWARE=1
 	-DMESHTASTIC_EXCLUDE_HEALTH_TELEMETRY=1
@@ -126,8 +127,7 @@ lib_deps =
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/91d4f76d9fc523fb86ea31ebf48fd4bcdaea43c9.zip
-
+	https://github.com/meshtastic/device-ui/archive/1897dd17fceb1f101bb1a3245680aa3439edcfdd.zip

 ; Common libs for environmental measurements in telemetry module
 [environmental_base]
@@ -196,16 +196,10 @@ lib_deps =
 	adafruit/Adafruit BMP3XX Library@2.1.6
 	# renovate: datasource=custom.pio depName=Adafruit MAX1704X packageName=adafruit/library/Adafruit MAX1704X
 	adafruit/Adafruit MAX1704X@1.0.3
-	# renovate: datasource=custom.pio depName=Adafruit SHTC3 packageName=adafruit/library/Adafruit SHTC3 Library
-	adafruit/Adafruit SHTC3 Library@1.0.2
 	# renovate: datasource=custom.pio depName=Adafruit LPS2X packageName=adafruit/library/Adafruit LPS2X
 	adafruit/Adafruit LPS2X@2.0.6
-	# renovate: datasource=custom.pio depName=Adafruit SHT31 packageName=adafruit/library/Adafruit SHT31 Library
-	adafruit/Adafruit SHT31 Library@2.2.2
 	# renovate: datasource=custom.pio depName=Adafruit VEML7700 packageName=adafruit/library/Adafruit VEML7700 Library
 	adafruit/Adafruit VEML7700 Library@2.1.6
-	# renovate: datasource=custom.pio depName=Adafruit SHT4x packageName=adafruit/library/Adafruit SHT4x Library
-	adafruit/Adafruit SHT4x Library@1.0.5
 	# renovate: datasource=custom.pio depName=SparkFun Qwiic Scale NAU7802 packageName=sparkfun/library/SparkFun Qwiic Scale NAU7802 Arduino Library
 	sparkfun/SparkFun Qwiic Scale NAU7802 Arduino Library@1.0.6
 	# renovate: datasource=custom.pio depName=ClosedCube OPT3001 packageName=closedcube/library/ClosedCube OPT3001
@@ -220,6 +214,8 @@ lib_deps =
 	sensirion/Sensirion I2C SFA3x@1.0.0
 	# renovate: datasource=custom.pio depName=Sensirion I2C SCD30 packageName=sensirion/library/Sensirion I2C SCD30
 	sensirion/Sensirion I2C SCD30@1.0.0
+	# renovate: datasource=custom.pio depName=arduino-sht packageName=sensirion/library/arduino-sht
+	sensirion/arduino-sht@1.2.6

 ; Environmental sensors with BSEC2 (Bosch proprietary IAQ)
 [environmental_extra]
@@ -1495,15 +1495,7 @@ bool Power::cw2015Init()
 class LipoCharger : public HasBatteryLevel
 {
  private:
-#if defined(XPOWERS_CHIP_SY6970)
-#define PPM_ADDR SY6970_ADDR
-#define CHARGE_TARGET_VOLTAGE 4352
-#elif defined(XPOWERS_CHIP_BQ25896)
-#define PPM_CLASS BQ27220
    BQ27220 *bq = nullptr;
-#define PPM_ADDR BQ25896_ADDR
-#define CHARGE_TARGET_VOLTAGE 4288
-#endif

  public:
    /**
@@ -1513,11 +1505,12 @@ class LipoCharger : public HasBatteryLevel
    {
        if (PPM == nullptr) {
            PPM = new XPowersPPM;
-            bool result = PPM->init(Wire, I2C_SDA, I2C_SCL, PPM_ADDR);
+            bool result = PPM->init(Wire, I2C_SDA, I2C_SCL, BQ25896_ADDR);
            if (result) {
-                LOG_INFO("PPM init succeeded");
+                LOG_INFO("PPM BQ25896 init succeeded");
                // Set the minimum operating voltage. Below this voltage, the PPM will
                // protect PPM->setSysPowerDownVoltage(3100);
+
                // Set input current limit, default is 500mA
                // PPM->setInputCurrentLimit(800);

@@ -1525,7 +1518,7 @@ class LipoCharger : public HasBatteryLevel
                // PPM->disableCurrentLimitPin();

                // Set the charging target voltage, Range:3840 ~ 4608mV ,step:16 mV
-                PPM->setChargeTargetVoltage(CHARGE_TARGET_VOLTAGE);
+                PPM->setChargeTargetVoltage(4288);

                // Set the precharge current , Range: 64mA ~ 1024mA ,step:64mA
                // PPM->setPrechargeCurr(64);
@@ -1549,9 +1542,8 @@ class LipoCharger : public HasBatteryLevel
                return false;
            }
        }
-#if HAS_BQ27220
        if (bq == nullptr) {
-            bq = new PPM_CLASS;
+            bq = new BQ27220;
            bq->setDefaultCapacity(BQ27220_DESIGN_CAPACITY);

            bool result = bq->init();
@@ -1561,15 +1553,13 @@ class LipoCharger : public HasBatteryLevel
                LOG_DEBUG("BQ27220 remaining capacity: %d", bq->getRemainingCapacity());
                return true;
            } else {
-                LOG_WARN("PPM init failed");
+                LOG_WARN("BQ27220 init failed");
                delete bq;
                bq = nullptr;
                return false;
            }
        }
        return false;
-#endif
-        return true;
    }

    /**
@@ -1585,14 +1575,7 @@ class LipoCharger : public HasBatteryLevel
    /**
     * The raw voltage of the battery in millivolts, or NAN if unknown
     */
-    virtual uint16_t getBattVoltage() override
-    {
-#if HAS_BQ27220
-        return bq->getVoltage();
-#else
-        return PPM->getBattVoltage();
-#endif
-    }
+    virtual uint16_t getBattVoltage() override { return bq->getVoltage(); }

    /**
     * return true if there is a battery installed in this unit
@@ -1610,7 +1593,6 @@ class LipoCharger : public HasBatteryLevel
    virtual bool isCharging() override
    {
        bool isCharging = PPM->isCharging();
-#if HAS_BQ27220
        if (isCharging) {
            LOG_DEBUG("BQ27220 time to full charge: %d min", bq->getTimeToFull());
        } else {
@@ -1618,7 +1600,6 @@ class LipoCharger : public HasBatteryLevel
                LOG_DEBUG("BQ27220 time to empty: %d min (%d mAh)", bq->getTimeToEmpty(), bq->getRemainingCapacity());
            }
        }
-#endif
        return isCharging;
    }
 };
@@ -137,7 +137,7 @@ void RedirectablePrint::log_to_serial(const char *logLevel, const char *format,
        if (color) {
            ::printf("\u001b[0m");
        }
-        ::printf("| %02d:%02d:%02d %u ", hour, min, sec, millis() / 1000);
+        ::printf("| %02d:%02d:%02d %u.%03u ", hour, min, sec, millis() / 1000, millis() % 1000);
 #else
        printf("%s ", logLevel);
        if (color) {
@@ -151,7 +151,7 @@ void RedirectablePrint::log_to_serial(const char *logLevel, const char *format,
        if (color) {
            ::printf("\u001b[0m");
        }
-        ::printf("| ??:??:?? %u ", millis() / 1000);
+        ::printf("| ??:??:?? %u.%03u ", millis() / 1000, millis() % 1000);
 #else
        printf("%s ", logLevel);
        if (color) {
@@ -231,7 +231,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BME_ADDR 0x76
 #define BME_ADDR_ALTERNATE 0x77
 #define MCP9808_ADDR 0x18
-#define INA_ADDR 0x40
+#define INA_ADDR 0x40 // same as SHT2X
 #define INA_ADDR_ALTERNATE 0x41
 #define INA_ADDR_WAVESHARE_UPS 0x43
 #define INA3221_ADDR 0x42
@@ -244,8 +244,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LPS22HB_ADDR 0x5C
 #define LPS22HB_ADDR_ALT 0x5D
 #define SFA30_ADDR 0x5D
-#define SHT31_4x_ADDR 0x44
-#define SHT31_4x_ADDR_ALT 0x45
+#define SHTXX_ADDR 0x44
+#define SHTXX_ADDR_ALT 0x45
 #define PMSA003I_ADDR 0x12
 #define QMA6100P_ADDR 0x12
 #define AHT10_ADDR 0x38
@@ -31,9 +31,6 @@ class ScanI2C
        INA3221,
        MAX17048,
        MCP9808,
-        SHT31,
-        SHT4X,
-        SHTC3,
        LPS22HB,
        QMC6310U,
        QMC6310N,
@@ -94,7 +91,8 @@ class ScanI2C
        SFA30,
        CW2015,
        SCD30,
-        ADS1115
+        ADS1115,
+        SHTXX
    } DeviceType;

    // typedef uint8_t DeviceAddress;
@@ -136,7 +136,9 @@ bool ScanI2CTwoWire::i2cCommandResponseLength(ScanI2C::DeviceAddress addr, uint1
    return match;
 }

-/// for SEN5X detection
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR
+// FIXME Move to a separate file for detection of sensors that require more complex interactions?
+// For SEN5X detection
 // Note, this code needs to be called before setting the I2C bus speed
 // for the screen at high speed. The speed needs to be at 100kHz, otherwise
 // detection will not work
@@ -174,6 +176,46 @@ String readSEN5xProductName(TwoWire *i2cBus, uint8_t address)

    return String(productName);
 }
+#endif
+
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+bool detectSHT21SerialNumber(TwoWire *i2cBus, uint8_t address)
+{
+
+    i2cBus->beginTransmission(address);
+    i2cBus->write(0xFA);
+    i2cBus->write(0x0F);
+
+    if (i2cBus->endTransmission() != 0)
+        return false;
+
+    if (i2cBus->requestFrom(address, (uint8_t)8) != 8)
+        return false;
+
+    // Just flush the data
+    while (i2cBus->available() < 8) {
+        i2cBus->read();
+    }
+
+    i2cBus->beginTransmission(address);
+    i2cBus->write(0xFC);
+    i2cBus->write(0xC9);
+
+    if (i2cBus->endTransmission() != 0)
+        return false;
+
+    if (i2cBus->requestFrom(address, (uint8_t)6) != 6)
+        return false;
+
+    // Just flush the data
+    while (i2cBus->available() < 6) {
+        i2cBus->read();
+    }
+
+    // Assume we detect the SHT21 if something came back from the request
+    return true;
+}
+#endif

 #define SCAN_SIMPLE_CASE(ADDR, T, ...)                                                                                           \
    case ADDR:                                                                                                                   \
@@ -371,7 +413,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                break;
 #endif
 #if !defined(M5STACK_UNITC6L)
-            case INA_ADDR:
+            case INA_ADDR: // Same as SHT2X
            case INA_ADDR_ALTERNATE:
            case INA_ADDR_WAVESHARE_UPS:
                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0xFE), 2);
@@ -387,7 +429,12 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                        logFoundDevice("INA260", (uint8_t)addr.address);
                        type = INA260;
                    }
-                } else { // Assume INA219 if INA260 ID is not found
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+                } else if (detectSHT21SerialNumber(i2cBus, (uint8_t)addr.address)) {
+                    logFoundDevice("SHTXX (SHT2X)", (uint8_t)addr.address);
+                    type = SHTXX;
+#endif
+                } else { // Assume INA219 if none of the above ones are found
                    logFoundDevice("INA219", (uint8_t)addr.address);
                    type = INA219;
                }
@@ -448,22 +495,19 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                    }
                    break;
                }
-            case SHT31_4x_ADDR:     // same as OPT3001_ADDR_ALT
-            case SHT31_4x_ADDR_ALT: // same as OPT3001_ADDR
+            case SHTXX_ADDR:     // same as OPT3001_ADDR_ALT
+            case SHTXX_ADDR_ALT: // same as OPT3001_ADDR
                if (getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x7E), 2) == 0x5449) {
                    type = OPT3001;
                    logFoundDevice("OPT3001", (uint8_t)addr.address);
-                } else if (i2cCommandResponseLength(addr, 0x89, 6)) { // SHT4x serial number (6 bytes inc. CRC)
-                    type = SHT4X;
-                    logFoundDevice("SHT4X", (uint8_t)addr.address);
-                } else {
-                    type = SHT31;
-                    logFoundDevice("SHT31", (uint8_t)addr.address);
+                } else { // SHTXX
+                    type = SHTXX;
+                    logFoundDevice("SHTXX", (uint8_t)addr.address);
                }

                break;

-                SCAN_SIMPLE_CASE(SHTC3_ADDR, SHTC3, "SHTC3", (uint8_t)addr.address)
+                SCAN_SIMPLE_CASE(SHTC3_ADDR, SHTXX, "SHTXX", (uint8_t)addr.address)
            case RCWL9620_ADDR:
                // get MAX30102 PARTID
                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0xFF), 1);
@@ -675,6 +719,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                    logFoundDevice("BMX160", (uint8_t)addr.address);
                    break;
                } else {
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR
                    String prod = "";
                    prod = readSEN5xProductName(i2cBus, addr.address);
                    if (prod.startsWith("SEN55")) {
@@ -690,6 +735,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                        logFoundDevice("Sensirion SEN50", addr.address);
                        break;
                    }
+#endif
                    if (addr.address == BMX160_ADDR) {
                        type = BMX160;
                        logFoundDevice("BMX160", (uint8_t)addr.address);
@@ -1254,14 +1254,14 @@ void TFTDisplay::display(bool fromBlank)

        // Did we find a pixel that needs updating on this row?
        if (x_FirstPixelUpdate < displayWidth) {
+            // Align the first pixel for update to an even number so the total alignment of
+            // the data will be at 32-bit boundary, which is required by GDMA SPI transfers.
+            x_FirstPixelUpdate &= ~1;

-            // Quickly write out the first changed pixel (saves another array lookup)
-            linePixelBuffer[x_FirstPixelUpdate] = isset ? colorTftMesh : colorTftBlack;
-            x_LastPixelUpdate = x_FirstPixelUpdate;
-
-            // Step 3: copy all remaining pixels in this row into the pixel line buffer,
-            // while also recording the last pixel in the row that needs updating
-            for (x = x_FirstPixelUpdate + 1; x < displayWidth; x++) {
+            // Step 3a: copy rest of the pixels in this row into the pixel line buffer,
+            // while also recording the last pixel in the row that needs updating.
+            // Since the first changed pixel will be looked up, the x_LastPixelUpdate will be set.
+            for (x = x_FirstPixelUpdate; x < displayWidth; x++) {
                isset = buffer[x + y_byteIndex] & y_byteMask;
                linePixelBuffer[x] = isset ? colorTftMesh : colorTftBlack;

@@ -1274,6 +1274,14 @@ void TFTDisplay::display(bool fromBlank)
                    x_LastPixelUpdate = x;
                }
            }
+            // Step 3b: Round up the last pixel to odd number to maintain 32-bit alignment for SPIs.
+            // Most displays will have even number of pixels in a row -- this will be in bounds
+            // of the displayWidth. (Hopefully odd displays will just ignore that extra pixel.)
+            x_LastPixelUpdate |= 1;
+            // Ensure the last pixel index does not exceed the display width.
+            if (x_LastPixelUpdate >= displayWidth) {
+                x_LastPixelUpdate = displayWidth - 1;
+            }
 #if defined(HACKADAY_COMMUNICATOR)
            tft->draw16bitBeRGBBitmap(x_FirstPixelUpdate, y, &linePixelBuffer[x_FirstPixelUpdate],
                                      (x_LastPixelUpdate - x_FirstPixelUpdate + 1), 1);
@@ -1496,7 +1504,7 @@ bool TFTDisplay::connect()
    attachInterrupt(digitalPinToInterrupt(SCREEN_TOUCH_INT), rak14014_tpIntHandle, FALLING);
 #elif defined(T_DECK) || defined(PICOMPUTER_S3) || defined(CHATTER_2) || defined(HELTEC_MESH_NODE_T096)
    tft->setRotation(1); // T-Deck has the TFT in landscape
-#elif defined(T_WATCH_S3) || defined(T_DISPLAY_S3_PRO)
+#elif defined(T_WATCH_S3)
    tft->setRotation(2); // T-Watch S3 left-handed orientation
 #elif ARCH_PORTDUINO || defined(SENSECAP_INDICATOR) || defined(T_LORA_PAGER)
    tft->setRotation(0); // use config.yaml to set rotation
@@ -163,9 +163,11 @@ void menuHandler::LoraRegionPicker(uint32_t duration)

            // Guard: without a reboot, reconfigure() applies the region directly.
            // Reject LORA_24 on sub-GHz-only hardware — getRadio() used to catch this post-reboot.
+            // TODO: change this to either use the validateLoraConfig() logic or at least check the region for wideLora
+            // rather than a hardcoded check for LORA_24.
            if (selectedRegion == meshtastic_Config_LoRaConfig_RegionCode_LORA_24 &&
                !(RadioLibInterface::instance && RadioLibInterface::instance->wideLora())) {
-                LOG_WARN("Radio hardware does not support 2.4 GHz; ignoring LORA_24 selection");
+                LOG_WARN("Radio hardware does not support 2.4 GHz; ignoring region selection");
                return;
            }

@@ -299,6 +299,7 @@ void InputBroker::Init()
    // Buttons. Moved here cause we need NodeDB to be initialized
    // If your variant.h has a BUTTON_PIN defined, go ahead and define BUTTON_ACTIVE_LOW and BUTTON_ACTIVE_PULLUP
    UserButtonThread = new ButtonThread("UserButton");
+#if !MESHTASTIC_EXCLUDE_SCREEN
    if (screen) {
        ButtonConfig userConfig;
        userConfig.pinNumber = (uint8_t)_pinNum;
@@ -317,7 +318,9 @@ void InputBroker::Init()
        userConfig.longPressTime = 500;
        userConfig.longLongPress = INPUT_BROKER_SHUTDOWN;
        UserButtonThread->initButton(userConfig);
-    } else {
+    } else
+#endif
+    {
        ButtonConfig userConfigNoScreen;
        userConfigNoScreen.pinNumber = (uint8_t)_pinNum;
        userConfigNoScreen.activeLow = BUTTON_ACTIVE_LOW;
@@ -379,11 +382,13 @@ void InputBroker::Init()
    }
 #endif // HAS_BUTTON
 #if ARCH_PORTDUINO
-    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR && portduino_config.i2cdev != "") {
-        seesawRotary = new SeesawRotary("SeesawRotary");
-        if (!seesawRotary->init()) {
-            delete seesawRotary;
-            seesawRotary = nullptr;
+    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
+        if (portduino_config.i2cdev != "") {
+            seesawRotary = new SeesawRotary("SeesawRotary");
+            if (!seesawRotary->init()) {
+                delete seesawRotary;
+                seesawRotary = nullptr;
+            }
        }
        aLinuxInputImpl = new LinuxInputImpl();
        aLinuxInputImpl->init();
@@ -32,8 +32,8 @@
 #define default_map_publish_interval_secs 60 * 60

 // Traffic management defaults
-#define default_traffic_mgmt_position_precision_bits 24         // ~10m grid cells
-#define default_traffic_mgmt_position_min_interval_secs ONE_DAY // 1 day between identical positions
+#define default_traffic_mgmt_position_precision_bits 24               // ~10m grid cells
+#define default_traffic_mgmt_position_min_interval_secs (ONE_DAY / 2) // 12 hours between identical positions

 #ifdef USERPREFS_RINGTONE_NAG_SECS
 #define default_ringtone_nag_secs USERPREFS_RINGTONE_NAG_SECS
@@ -71,12 +71,10 @@ template <typename T> bool LR11x0Interface<T>::init()

    RadioLibInterface::init();

-    limitPower(LR1110_MAX_POWER);
-
-    if ((power > LR1120_MAX_POWER) &&
-        (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) { // clamp again if wide freq range
-        power = LR1120_MAX_POWER;
-        preambleLength = 12; // 12 is the default for operation above 2GHz
+    if (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_LORA_24) { // clamp if wide freq range
+        limitPower(LR1120_MAX_POWER);
+    } else {
+        limitPower(LR1110_MAX_POWER); // default clamp for non-wide freq range
    }

 #ifdef LR11X0_RF_SWITCH_SUBGHZ
@@ -177,6 +175,12 @@ template <typename T> bool LR11x0Interface<T>::reconfigure()
    err = lora.setSyncWord(syncWord);
    assert(err == RADIOLIB_ERR_NONE);

+    if (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_LORA_24) { // clamp if wide freq range
+        limitPower(LR1120_MAX_POWER);
+    } else {
+        limitPower(LR1110_MAX_POWER); // default clamp for non-wide freq range
+    }
+
    err = lora.setPreambleLength(preambleLength);
    assert(err == RADIOLIB_ERR_NONE);

@@ -184,11 +188,6 @@ template <typename T> bool LR11x0Interface<T>::reconfigure()
    if (err != RADIOLIB_ERR_NONE)
        RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);

-    if (power > LR1110_MAX_POWER) // This chip has lower power limits than some
-        power = LR1110_MAX_POWER;
-    if ((power > LR1120_MAX_POWER) && (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) // 2.4G power limit
-        power = LR1120_MAX_POWER;
-
    err = lora.setOutputPower(power);
    assert(err == RADIOLIB_ERR_NONE);

@@ -681,7 +681,7 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
    strncpy(config.network.ntp_server, "meshtastic.pool.ntp.org", 32);

 #if (defined(T_DECK) || defined(T_WATCH_S3) || defined(UNPHONE) || defined(PICOMPUTER_S3) || defined(SENSECAP_INDICATOR) ||      \
-     defined(ELECROW_PANEL) || defined(HELTEC_V4_TFT) || defined(T_DISPLAY_S3_PRO)) &&                                           \
+     defined(ELECROW_PANEL) || defined(HELTEC_V4_TFT)) &&                                                                        \
    HAS_TFT
    // switch BT off by default; use TFT programming mode or hotkey to enable
    config.bluetooth.enabled = false;
@@ -819,7 +819,7 @@ void NodeDB::installDefaultModuleConfig()
    moduleConfig.has_store_forward = true;
    moduleConfig.has_telemetry = true;
    moduleConfig.has_external_notification = true;
-#if defined(PIN_BUZZER) || defined(PIN_VIBRATION) || defined(LED_NOTIFICATION)
+#if defined(PIN_BUZZER) || defined(PIN_VIBRATION) || defined(LED_NOTIFICATION) || defined(PCA_LED_NOTIFICATION)
    moduleConfig.external_notification.enabled = true;
 #endif
 #if defined(PIN_BUZZER)
@@ -17,14 +17,4 @@ template <class T> class PointerQueue : public TypedQueue<T *>

        return this->dequeue(&p, maxWait) ? p : nullptr;
    }
-
-#ifdef HAS_FREE_RTOS
-    // returns a ptr or null if the queue was empty
-    T *dequeuePtrFromISR(BaseType_t *higherPriWoken)
-    {
-        T *p;
-
-        return this->dequeueFromISR(&p, higherPriWoken) ? p : nullptr;
-    }
-#endif
 };
@@ -240,8 +240,7 @@ bool RF95Interface::reconfigure()
    if (err != RADIOLIB_ERR_NONE)
        RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);

-    if (power > RF95_MAX_POWER) // This chip has lower power limits than some
-        power = RF95_MAX_POWER;
+    limitPower(RF95_MAX_POWER);

 #ifdef USE_RF95_RFO
    err = lora->setOutputPower(power, true);
@@ -152,8 +152,10 @@ const RegionInfo regions[] = {

    /*
       https://lora-alliance.org/wp-content/uploads/2020/11/lorawan_regional_parameters_v1.0.3reva_0.pdf
+       https://standard.nbtc.go.th/getattachment/Standards/%E0%B8%A1%E0%B8%B2%E0%B8%95%E0%B8%A3%E0%B8%90%E0%B8%B2%E0%B8%99%E0%B8%97%E0%B8%B2%E0%B8%87%E0%B9%80%E0%B8%97%E0%B8%84%E0%B8%99%E0%B8%B4%E0%B8%84%E0%B8%82%E0%B8%AD%E0%B8%87%E0%B9%80%E0%B8%84%E0%B8%A3%E0%B8%B7%E0%B9%88%E0%B8%AD%E0%B8%87%E0%B9%82%E0%B8%97%E0%B8%A3%E0%B8%84%E0%B8%A1%E0%B8%99%E0%B8%B2%E0%B8%84%E0%B8%A1/1033-2565.pdf.aspx?lang=th-TH
+       Thailand 920–925 MHz set max TX power to 27 dBm and enforce 10% duty cycle, aligned with NBTC regulations.
    */
-    RDEF(TH, 920.0f, 925.0f, 100, 16, false, false, PROFILE_STD),
+    RDEF(TH, 920.0f, 925.0f, 10, 27, false, false, PROFILE_STD),

    /*
        433,05-434,7 Mhz 10 mW
@@ -961,7 +963,7 @@ void RadioInterface::applyModemConfig()
            cr = loraConfig.coding_rate;
            LOG_INFO("Using custom Coding Rate %u", cr);
        } else {
-            cr = loraConfig.coding_rate;
+            cr = newcr;
        }

    } else { // if not using preset, then just use the custom settings
@@ -1036,6 +1038,13 @@ void RadioInterface::applyModemConfig()
    saveFreq(freq + loraConfig.frequency_offset);
    const char *channelName = channels.getName(channels.getPrimaryIndex());

+    if (newRegion->wideLora) {                          // clamp if wide freq range
+        preambleLength = wideLoraPreambleLengthDefault; // 12 is the default for operation above 2GHz
+    } else {
+        preambleLength =
+            preambleLengthDefault; // 8 is default, but we use longer to increase the amount of sleep time when receiving
+    }
+
    slotTimeMsec = computeSlotTimeMsec();
    preambleTimeMsec = preambleLength * (pow_of_2(sf) / bw);

@@ -92,15 +92,20 @@ class RadioInterface
    uint8_t sf = 9;
    uint8_t cr = 5;

-    const uint8_t NUM_SYM_CAD = 2;       // Number of symbols used for CAD, 2 is the default since RadioLib 6.3.0 as per AN1200.48
-    const uint8_t NUM_SYM_CAD_24GHZ = 4; // Number of symbols used for CAD in 2.4 GHz, 4 is recommended in AN1200.22 of SX1280
+    static constexpr uint8_t NUM_SYM_CAD =
+        2; // Number of symbols used for CAD, 2 is the default since RadioLib 6.3.0 as per AN1200.48
+    static constexpr uint8_t NUM_SYM_CAD_24GHZ =
+        4; // Number of symbols used for CAD in 2.4 GHz, 4 is recommended in AN1200.22 of SX1280
    uint32_t slotTimeMsec = computeSlotTimeMsec();
-    uint16_t preambleLength = 16;    // 8 is default, but we use longer to increase the amount of sleep time when receiving
-    uint32_t preambleTimeMsec = 165; // calculated on startup, this is the default for LongFast
-    const uint32_t PROCESSING_TIME_MSEC =
-        4500;                // time to construct, process and construct a packet again (empirically determined)
-    const uint8_t CWmin = 3; // minimum CWsize
-    const uint8_t CWmax = 8; // maximum CWsize
+    uint16_t preambleLength = 16; // 8 is default, but we use longer to increase the amount of sleep time when receiving
+    static constexpr uint16_t preambleLengthDefault =
+        16; // 8 is default, but we use longer to increase the amount of sleep time when receiving
+    static constexpr uint16_t wideLoraPreambleLengthDefault = 12; // 12 is default for wide Lora
+    uint32_t preambleTimeMsec = 165;                              // calculated on startup, this is the default for LongFast
+    static constexpr uint32_t PROCESSING_TIME_MSEC =
+        4500;                           // time to construct, process and construct a packet again (empirically determined)
+    static constexpr uint8_t CWmin = 3; // minimum CWsize
+    static constexpr uint8_t CWmax = 8; // maximum CWsize

    meshtastic_MeshPacket *sendingPacket = NULL; // The packet we are currently sending
    uint32_t lastTxStart = 0L;
@@ -245,8 +245,10 @@ template <typename T> bool SX126xInterface<T>::reconfigure()
    if (err != RADIOLIB_ERR_NONE)
        RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);

-    if (power > SX126X_MAX_POWER) // This chip has lower power limits than some
-        power = SX126X_MAX_POWER;
+    limitPower(SX126X_MAX_POWER);
+    // Make sure we reach the minimum power supported to turn the chip on (-9dBm)
+    if (power < -9)
+        power = -9;

    err = lora.setOutputPower(power);
    if (err != RADIOLIB_ERR_NONE)
@@ -144,8 +144,7 @@ template <typename T> bool SX128xInterface<T>::reconfigure()
    if (err != RADIOLIB_ERR_NONE)
        RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);

-    if (power > SX128X_MAX_POWER) // This chip has lower power limits than some
-        power = SX128X_MAX_POWER;
+    limitPower(SX128X_MAX_POWER);

    err = lora.setOutputPower(power);
    if (err != RADIOLIB_ERR_NONE)
@@ -24,6 +24,18 @@ PB_BIND(meshtastic_Contact, meshtastic_Contact, AUTO)
 PB_BIND(meshtastic_PLI, meshtastic_PLI, AUTO)


+PB_BIND(meshtastic_AircraftTrack, meshtastic_AircraftTrack, AUTO)
+
+
+PB_BIND(meshtastic_TAKPacketV2, meshtastic_TAKPacketV2, 2)
+
+
+
+
+
+
+
+



@@ -65,6 +65,197 @@ typedef enum _meshtastic_MemberRole {
    meshtastic_MemberRole_K9 = 8
 } meshtastic_MemberRole;

+/* CoT how field values.
+ Represents how the coordinates were generated. */
+typedef enum _meshtastic_CotHow {
+    /* Unspecified */
+    meshtastic_CotHow_CotHow_Unspecified = 0,
+    /* Human entered */
+    meshtastic_CotHow_CotHow_h_e = 1,
+    /* Machine generated */
+    meshtastic_CotHow_CotHow_m_g = 2,
+    /* Human GPS/INS derived */
+    meshtastic_CotHow_CotHow_h_g_i_g_o = 3,
+    /* Machine relayed (imported from another system/gateway) */
+    meshtastic_CotHow_CotHow_m_r = 4,
+    /* Machine fused (corroborated from multiple sources) */
+    meshtastic_CotHow_CotHow_m_f = 5,
+    /* Machine predicted */
+    meshtastic_CotHow_CotHow_m_p = 6,
+    /* Machine simulated */
+    meshtastic_CotHow_CotHow_m_s = 7
+} meshtastic_CotHow;
+
+/* Well-known CoT event types.
+ When the type is known, use the enum value for efficient encoding.
+ For unknown types, set cot_type_id to CotType_Other and populate cot_type_str. */
+typedef enum _meshtastic_CotType {
+    /* Unknown or unmapped type, use cot_type_str */
+    meshtastic_CotType_CotType_Other = 0,
+    /* a-f-G-U-C: Friendly ground unit combat */
+    meshtastic_CotType_CotType_a_f_G_U_C = 1,
+    /* a-f-G-U-C-I: Friendly ground unit combat infantry */
+    meshtastic_CotType_CotType_a_f_G_U_C_I = 2,
+    /* a-n-A-C-F: Neutral aircraft civilian fixed-wing */
+    meshtastic_CotType_CotType_a_n_A_C_F = 3,
+    /* a-n-A-C-H: Neutral aircraft civilian helicopter */
+    meshtastic_CotType_CotType_a_n_A_C_H = 4,
+    /* a-n-A-C: Neutral aircraft civilian */
+    meshtastic_CotType_CotType_a_n_A_C = 5,
+    /* a-f-A-M-H: Friendly aircraft military helicopter */
+    meshtastic_CotType_CotType_a_f_A_M_H = 6,
+    /* a-f-A-M: Friendly aircraft military */
+    meshtastic_CotType_CotType_a_f_A_M = 7,
+    /* a-f-A-M-F-F: Friendly aircraft military fixed-wing fighter */
+    meshtastic_CotType_CotType_a_f_A_M_F_F = 8,
+    /* a-f-A-M-H-A: Friendly aircraft military helicopter attack */
+    meshtastic_CotType_CotType_a_f_A_M_H_A = 9,
+    /* a-f-A-M-H-U-M: Friendly aircraft military helicopter utility medium */
+    meshtastic_CotType_CotType_a_f_A_M_H_U_M = 10,
+    /* a-h-A-M-F-F: Hostile aircraft military fixed-wing fighter */
+    meshtastic_CotType_CotType_a_h_A_M_F_F = 11,
+    /* a-h-A-M-H-A: Hostile aircraft military helicopter attack */
+    meshtastic_CotType_CotType_a_h_A_M_H_A = 12,
+    /* a-u-A-C: Unknown aircraft civilian */
+    meshtastic_CotType_CotType_a_u_A_C = 13,
+    /* t-x-d-d: Tasking delete/disconnect */
+    meshtastic_CotType_CotType_t_x_d_d = 14,
+    /* a-f-G-E-S-E: Friendly ground equipment sensor */
+    meshtastic_CotType_CotType_a_f_G_E_S_E = 15,
+    /* a-f-G-E-V-C: Friendly ground equipment vehicle */
+    meshtastic_CotType_CotType_a_f_G_E_V_C = 16,
+    /* a-f-S: Friendly sea */
+    meshtastic_CotType_CotType_a_f_S = 17,
+    /* a-f-A-M-F: Friendly aircraft military fixed-wing */
+    meshtastic_CotType_CotType_a_f_A_M_F = 18,
+    /* a-f-A-M-F-C-H: Friendly aircraft military fixed-wing cargo heavy */
+    meshtastic_CotType_CotType_a_f_A_M_F_C_H = 19,
+    /* a-f-A-M-F-U-L: Friendly aircraft military fixed-wing utility light */
+    meshtastic_CotType_CotType_a_f_A_M_F_U_L = 20,
+    /* a-f-A-M-F-L: Friendly aircraft military fixed-wing liaison */
+    meshtastic_CotType_CotType_a_f_A_M_F_L = 21,
+    /* a-f-A-M-F-P: Friendly aircraft military fixed-wing patrol */
+    meshtastic_CotType_CotType_a_f_A_M_F_P = 22,
+    /* a-f-A-C-H: Friendly aircraft civilian helicopter */
+    meshtastic_CotType_CotType_a_f_A_C_H = 23,
+    /* a-n-A-M-F-Q: Neutral aircraft military fixed-wing drone */
+    meshtastic_CotType_CotType_a_n_A_M_F_Q = 24,
+    /* b-t-f: GeoChat message */
+    meshtastic_CotType_CotType_b_t_f = 25,
+    /* b-r-f-h-c: CASEVAC/MEDEVAC report */
+    meshtastic_CotType_CotType_b_r_f_h_c = 26,
+    /* b-a-o-pan: Ring the bell / alert all */
+    meshtastic_CotType_CotType_b_a_o_pan = 27,
+    /* b-a-o-opn: Troops in contact */
+    meshtastic_CotType_CotType_b_a_o_opn = 28,
+    /* b-a-o-can: Cancel alert */
+    meshtastic_CotType_CotType_b_a_o_can = 29,
+    /* b-a-o-tbl: 911 alert */
+    meshtastic_CotType_CotType_b_a_o_tbl = 30,
+    /* b-a-g: Geofence breach alert */
+    meshtastic_CotType_CotType_b_a_g = 31,
+    /* a-f-G: Friendly ground (generic) */
+    meshtastic_CotType_CotType_a_f_G = 32,
+    /* a-f-G-U: Friendly ground unit (generic) */
+    meshtastic_CotType_CotType_a_f_G_U = 33,
+    /* a-h-G: Hostile ground (generic) */
+    meshtastic_CotType_CotType_a_h_G = 34,
+    /* a-u-G: Unknown ground (generic) */
+    meshtastic_CotType_CotType_a_u_G = 35,
+    /* a-n-G: Neutral ground (generic) */
+    meshtastic_CotType_CotType_a_n_G = 36,
+    /* b-m-r: Route */
+    meshtastic_CotType_CotType_b_m_r = 37,
+    /* b-m-p-w: Route waypoint */
+    meshtastic_CotType_CotType_b_m_p_w = 38,
+    /* b-m-p-s-p-i: Self-position marker */
+    meshtastic_CotType_CotType_b_m_p_s_p_i = 39,
+    /* u-d-f: Freeform shape (line/polygon) */
+    meshtastic_CotType_CotType_u_d_f = 40,
+    /* u-d-r: Rectangle */
+    meshtastic_CotType_CotType_u_d_r = 41,
+    /* u-d-c-c: Circle */
+    meshtastic_CotType_CotType_u_d_c_c = 42,
+    /* u-rb-a: Range/bearing line */
+    meshtastic_CotType_CotType_u_rb_a = 43,
+    /* a-h-A: Hostile aircraft (generic) */
+    meshtastic_CotType_CotType_a_h_A = 44,
+    /* a-u-A: Unknown aircraft (generic) */
+    meshtastic_CotType_CotType_a_u_A = 45,
+    /* a-f-A-M-H-Q: Friendly aircraft military helicopter observation */
+    meshtastic_CotType_CotType_a_f_A_M_H_Q = 46,
+    /* a-f-A-C-F: Friendly aircraft civilian fixed-wing */
+    meshtastic_CotType_CotType_a_f_A_C_F = 47,
+    /* a-f-A-C: Friendly aircraft civilian (generic) */
+    meshtastic_CotType_CotType_a_f_A_C = 48,
+    /* a-f-A-C-L: Friendly aircraft civilian lighter-than-air */
+    meshtastic_CotType_CotType_a_f_A_C_L = 49,
+    /* a-f-A: Friendly aircraft (generic) */
+    meshtastic_CotType_CotType_a_f_A = 50,
+    /* a-f-A-M-H-C: Friendly aircraft military helicopter cargo */
+    meshtastic_CotType_CotType_a_f_A_M_H_C = 51,
+    /* a-n-A-M-F-F: Neutral aircraft military fixed-wing fighter */
+    meshtastic_CotType_CotType_a_n_A_M_F_F = 52,
+    /* a-u-A-C-F: Unknown aircraft civilian fixed-wing */
+    meshtastic_CotType_CotType_a_u_A_C_F = 53,
+    /* a-f-G-U-C-F-T-A: Friendly ground unit combat forces theater aviation */
+    meshtastic_CotType_CotType_a_f_G_U_C_F_T_A = 54,
+    /* a-f-G-U-C-V-S: Friendly ground unit combat vehicle support */
+    meshtastic_CotType_CotType_a_f_G_U_C_V_S = 55,
+    /* a-f-G-U-C-R-X: Friendly ground unit combat reconnaissance exploitation */
+    meshtastic_CotType_CotType_a_f_G_U_C_R_X = 56,
+    /* a-f-G-U-C-I-Z: Friendly ground unit combat infantry mechanized */
+    meshtastic_CotType_CotType_a_f_G_U_C_I_Z = 57,
+    /* a-f-G-U-C-E-C-W: Friendly ground unit combat engineer construction wheeled */
+    meshtastic_CotType_CotType_a_f_G_U_C_E_C_W = 58,
+    /* a-f-G-U-C-I-L: Friendly ground unit combat infantry light */
+    meshtastic_CotType_CotType_a_f_G_U_C_I_L = 59,
+    /* a-f-G-U-C-R-O: Friendly ground unit combat reconnaissance other */
+    meshtastic_CotType_CotType_a_f_G_U_C_R_O = 60,
+    /* a-f-G-U-C-R-V: Friendly ground unit combat reconnaissance cavalry */
+    meshtastic_CotType_CotType_a_f_G_U_C_R_V = 61,
+    /* a-f-G-U-H: Friendly ground unit headquarters */
+    meshtastic_CotType_CotType_a_f_G_U_H = 62,
+    /* a-f-G-U-U-M-S-E: Friendly ground unit support medical surgical evacuation */
+    meshtastic_CotType_CotType_a_f_G_U_U_M_S_E = 63,
+    /* a-f-G-U-S-M-C: Friendly ground unit support maintenance collection */
+    meshtastic_CotType_CotType_a_f_G_U_S_M_C = 64,
+    /* a-f-G-E-S: Friendly ground equipment sensor (generic) */
+    meshtastic_CotType_CotType_a_f_G_E_S = 65,
+    /* a-f-G-E: Friendly ground equipment (generic) */
+    meshtastic_CotType_CotType_a_f_G_E = 66,
+    /* a-f-G-E-V-C-U: Friendly ground equipment vehicle utility */
+    meshtastic_CotType_CotType_a_f_G_E_V_C_U = 67,
+    /* a-f-G-E-V-C-ps: Friendly ground equipment vehicle public safety */
+    meshtastic_CotType_CotType_a_f_G_E_V_C_ps = 68,
+    /* a-u-G-E-V: Unknown ground equipment vehicle */
+    meshtastic_CotType_CotType_a_u_G_E_V = 69,
+    /* a-f-S-N-N-R: Friendly sea surface non-naval rescue */
+    meshtastic_CotType_CotType_a_f_S_N_N_R = 70,
+    /* a-f-F-B: Friendly force boundary */
+    meshtastic_CotType_CotType_a_f_F_B = 71,
+    /* b-m-p-s-p-loc: Self-position location marker */
+    meshtastic_CotType_CotType_b_m_p_s_p_loc = 72,
+    /* b-i-v: Imagery/video */
+    meshtastic_CotType_CotType_b_i_v = 73,
+    /* b-f-t-r: File transfer request */
+    meshtastic_CotType_CotType_b_f_t_r = 74,
+    /* b-f-t-a: File transfer acknowledgment */
+    meshtastic_CotType_CotType_b_f_t_a = 75
+} meshtastic_CotType;
+
+/* Geopoint and altitude source */
+typedef enum _meshtastic_GeoPointSource {
+    /* Unspecified */
+    meshtastic_GeoPointSource_GeoPointSource_Unspecified = 0,
+    /* GPS derived */
+    meshtastic_GeoPointSource_GeoPointSource_GPS = 1,
+    /* User entered */
+    meshtastic_GeoPointSource_GeoPointSource_USER = 2,
+    /* Network/external */
+    meshtastic_GeoPointSource_GeoPointSource_NETWORK = 3
+} meshtastic_GeoPointSource;
+
 /* Struct definitions */
 /* ATAK GeoChat message */
 typedef struct _meshtastic_GeoChat {
@@ -146,6 +337,95 @@ typedef struct _meshtastic_TAKPacket {
    } payload_variant;
 } meshtastic_TAKPacket;

+/* Aircraft track information from ADS-B or military air tracking.
+ Covers the majority of observed real-world CoT traffic. */
+typedef struct _meshtastic_AircraftTrack {
+    /* ICAO hex identifier (e.g. "AD237C") */
+    char icao[8];
+    /* Aircraft registration (e.g. "N946AK") */
+    char registration[16];
+    /* Flight number/callsign (e.g. "ASA864") */
+    char flight[16];
+    /* ICAO aircraft type designator (e.g. "B39M") */
+    char aircraft_type[8];
+    /* Transponder squawk code (0-7777 octal) */
+    uint16_t squawk;
+    /* ADS-B emitter category (e.g. "A3") */
+    char category[4];
+    /* Received signal strength * 10 (e.g. -194 for -19.4 dBm) */
+    int32_t rssi_x10;
+    /* Whether receiver has GPS fix */
+    bool gps;
+    /* CoT host ID for source attribution */
+    char cot_host_id[64];
+} meshtastic_AircraftTrack;
+
+typedef PB_BYTES_ARRAY_T(220) meshtastic_TAKPacketV2_raw_detail_t;
+/* ATAK v2 packet with expanded CoT field support and zstd dictionary compression.
+ Sent on ATAK_PLUGIN_V2 port. The wire payload is:
+   [1 byte flags][zstd-compressed TAKPacketV2 protobuf]
+ Flags byte: bits 0-5 = dictionary ID, bits 6-7 = reserved. */
+typedef struct _meshtastic_TAKPacketV2 {
+    /* Well-known CoT event type enum.
+ Use CotType_Other with cot_type_str for unknown types. */
+    meshtastic_CotType cot_type_id;
+    /* How the coordinates were generated */
+    meshtastic_CotHow how;
+    /* Callsign */
+    char callsign[120];
+    /* Team color assignment */
+    meshtastic_Team team;
+    /* Role of the group member */
+    meshtastic_MemberRole role;
+    /* Latitude, multiply by 1e-7 to get degrees in floating point */
+    int32_t latitude_i;
+    /* Longitude, multiply by 1e-7 to get degrees in floating point */
+    int32_t longitude_i;
+    /* Altitude in meters (HAE) */
+    int32_t altitude;
+    /* Speed in cm/s */
+    uint32_t speed;
+    /* Course in degrees * 100 (0-36000) */
+    uint16_t course;
+    /* Battery level 0-100 */
+    uint8_t battery;
+    /* Geopoint source */
+    meshtastic_GeoPointSource geo_src;
+    /* Altitude source */
+    meshtastic_GeoPointSource alt_src;
+    /* Device UID (UUID string or device ID like "ANDROID-xxxx") */
+    char uid[48];
+    /* Device callsign */
+    char device_callsign[120];
+    /* Stale time as seconds offset from event time */
+    uint16_t stale_seconds;
+    /* TAK client version string */
+    char tak_version[64];
+    /* TAK device model */
+    char tak_device[32];
+    /* TAK platform (ATAK-CIV, WebTAK, etc.) */
+    char tak_platform[32];
+    /* TAK OS version */
+    char tak_os[16];
+    /* Connection endpoint */
+    char endpoint[32];
+    /* Phone number */
+    char phone[20];
+    /* CoT event type string, only populated when cot_type_id is CotType_Other */
+    char cot_type_str[32];
+    pb_size_t which_payload_variant;
+    union {
+        /* Position report (true = PLI, no extra fields beyond the common ones above) */
+        bool pli;
+        /* ATAK GeoChat message */
+        meshtastic_GeoChat chat;
+        /* Aircraft track data (ADS-B, military air) */
+        meshtastic_AircraftTrack aircraft;
+        /* Generic CoT detail XML for unmapped types */
+        meshtastic_TAKPacketV2_raw_detail_t raw_detail;
+    } payload_variant;
+} meshtastic_TAKPacketV2;
+

 #ifdef __cplusplus
 extern "C" {
@@ -160,6 +440,18 @@ extern "C" {
 #define _meshtastic_MemberRole_MAX meshtastic_MemberRole_K9
 #define _meshtastic_MemberRole_ARRAYSIZE ((meshtastic_MemberRole)(meshtastic_MemberRole_K9+1))

+#define _meshtastic_CotHow_MIN meshtastic_CotHow_CotHow_Unspecified
+#define _meshtastic_CotHow_MAX meshtastic_CotHow_CotHow_m_s
+#define _meshtastic_CotHow_ARRAYSIZE ((meshtastic_CotHow)(meshtastic_CotHow_CotHow_m_s+1))
+
+#define _meshtastic_CotType_MIN meshtastic_CotType_CotType_Other
+#define _meshtastic_CotType_MAX meshtastic_CotType_CotType_b_f_t_a
+#define _meshtastic_CotType_ARRAYSIZE ((meshtastic_CotType)(meshtastic_CotType_CotType_b_f_t_a+1))
+
+#define _meshtastic_GeoPointSource_MIN meshtastic_GeoPointSource_GeoPointSource_Unspecified
+#define _meshtastic_GeoPointSource_MAX meshtastic_GeoPointSource_GeoPointSource_NETWORK
+#define _meshtastic_GeoPointSource_ARRAYSIZE ((meshtastic_GeoPointSource)(meshtastic_GeoPointSource_GeoPointSource_NETWORK+1))
+


 #define meshtastic_Group_role_ENUMTYPE meshtastic_MemberRole
@@ -169,6 +461,14 @@ extern "C" {



+#define meshtastic_TAKPacketV2_cot_type_id_ENUMTYPE meshtastic_CotType
+#define meshtastic_TAKPacketV2_how_ENUMTYPE meshtastic_CotHow
+#define meshtastic_TAKPacketV2_team_ENUMTYPE meshtastic_Team
+#define meshtastic_TAKPacketV2_role_ENUMTYPE meshtastic_MemberRole
+#define meshtastic_TAKPacketV2_geo_src_ENUMTYPE meshtastic_GeoPointSource
+#define meshtastic_TAKPacketV2_alt_src_ENUMTYPE meshtastic_GeoPointSource
+
+
 /* Initializer values for message structs */
 #define meshtastic_TAKPacket_init_default        {0, false, meshtastic_Contact_init_default, false, meshtastic_Group_init_default, false, meshtastic_Status_init_default, 0, {meshtastic_PLI_init_default}}
 #define meshtastic_GeoChat_init_default          {"", false, "", false, ""}
@@ -176,12 +476,16 @@ extern "C" {
 #define meshtastic_Status_init_default           {0}
 #define meshtastic_Contact_init_default          {"", ""}
 #define meshtastic_PLI_init_default              {0, 0, 0, 0, 0}
+#define meshtastic_AircraftTrack_init_default    {"", "", "", "", 0, "", 0, 0, ""}
+#define meshtastic_TAKPacketV2_init_default      {_meshtastic_CotType_MIN, _meshtastic_CotHow_MIN, "", _meshtastic_Team_MIN, _meshtastic_MemberRole_MIN, 0, 0, 0, 0, 0, 0, _meshtastic_GeoPointSource_MIN, _meshtastic_GeoPointSource_MIN, "", "", 0, "", "", "", "", "", "", "", 0, {0}}
 #define meshtastic_TAKPacket_init_zero           {0, false, meshtastic_Contact_init_zero, false, meshtastic_Group_init_zero, false, meshtastic_Status_init_zero, 0, {meshtastic_PLI_init_zero}}
 #define meshtastic_GeoChat_init_zero             {"", false, "", false, ""}
 #define meshtastic_Group_init_zero               {_meshtastic_MemberRole_MIN, _meshtastic_Team_MIN}
 #define meshtastic_Status_init_zero              {0}
 #define meshtastic_Contact_init_zero             {"", ""}
 #define meshtastic_PLI_init_zero                 {0, 0, 0, 0, 0}
+#define meshtastic_AircraftTrack_init_zero       {"", "", "", "", 0, "", 0, 0, ""}
+#define meshtastic_TAKPacketV2_init_zero         {_meshtastic_CotType_MIN, _meshtastic_CotHow_MIN, "", _meshtastic_Team_MIN, _meshtastic_MemberRole_MIN, 0, 0, 0, 0, 0, 0, _meshtastic_GeoPointSource_MIN, _meshtastic_GeoPointSource_MIN, "", "", 0, "", "", "", "", "", "", "", 0, {0}}

 /* Field tags (for use in manual encoding/decoding) */
 #define meshtastic_GeoChat_message_tag           1
@@ -204,6 +508,42 @@ extern "C" {
 #define meshtastic_TAKPacket_pli_tag             5
 #define meshtastic_TAKPacket_chat_tag            6
 #define meshtastic_TAKPacket_detail_tag          7
+#define meshtastic_AircraftTrack_icao_tag        1
+#define meshtastic_AircraftTrack_registration_tag 2
+#define meshtastic_AircraftTrack_flight_tag      3
+#define meshtastic_AircraftTrack_aircraft_type_tag 4
+#define meshtastic_AircraftTrack_squawk_tag      5
+#define meshtastic_AircraftTrack_category_tag    6
+#define meshtastic_AircraftTrack_rssi_x10_tag    7
+#define meshtastic_AircraftTrack_gps_tag         8
+#define meshtastic_AircraftTrack_cot_host_id_tag 9
+#define meshtastic_TAKPacketV2_cot_type_id_tag   1
+#define meshtastic_TAKPacketV2_how_tag           2
+#define meshtastic_TAKPacketV2_callsign_tag      3
+#define meshtastic_TAKPacketV2_team_tag          4
+#define meshtastic_TAKPacketV2_role_tag          5
+#define meshtastic_TAKPacketV2_latitude_i_tag    6
+#define meshtastic_TAKPacketV2_longitude_i_tag   7
+#define meshtastic_TAKPacketV2_altitude_tag      8
+#define meshtastic_TAKPacketV2_speed_tag         9
+#define meshtastic_TAKPacketV2_course_tag        10
+#define meshtastic_TAKPacketV2_battery_tag       11
+#define meshtastic_TAKPacketV2_geo_src_tag       12
+#define meshtastic_TAKPacketV2_alt_src_tag       13
+#define meshtastic_TAKPacketV2_uid_tag           14
+#define meshtastic_TAKPacketV2_device_callsign_tag 15
+#define meshtastic_TAKPacketV2_stale_seconds_tag 16
+#define meshtastic_TAKPacketV2_tak_version_tag   17
+#define meshtastic_TAKPacketV2_tak_device_tag    18
+#define meshtastic_TAKPacketV2_tak_platform_tag  19
+#define meshtastic_TAKPacketV2_tak_os_tag        20
+#define meshtastic_TAKPacketV2_endpoint_tag      21
+#define meshtastic_TAKPacketV2_phone_tag         22
+#define meshtastic_TAKPacketV2_cot_type_str_tag  23
+#define meshtastic_TAKPacketV2_pli_tag           30
+#define meshtastic_TAKPacketV2_chat_tag          31
+#define meshtastic_TAKPacketV2_aircraft_tag      32
+#define meshtastic_TAKPacketV2_raw_detail_tag    33

 /* Struct field encoding specification for nanopb */
 #define meshtastic_TAKPacket_FIELDLIST(X, a) \
@@ -255,12 +595,60 @@ X(a, STATIC,   SINGULAR, UINT32,   course,            5)
 #define meshtastic_PLI_CALLBACK NULL
 #define meshtastic_PLI_DEFAULT NULL

+#define meshtastic_AircraftTrack_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, STRING,   icao,              1) \
+X(a, STATIC,   SINGULAR, STRING,   registration,      2) \
+X(a, STATIC,   SINGULAR, STRING,   flight,            3) \
+X(a, STATIC,   SINGULAR, STRING,   aircraft_type,     4) \
+X(a, STATIC,   SINGULAR, UINT32,   squawk,            5) \
+X(a, STATIC,   SINGULAR, STRING,   category,          6) \
+X(a, STATIC,   SINGULAR, SINT32,   rssi_x10,          7) \
+X(a, STATIC,   SINGULAR, BOOL,     gps,               8) \
+X(a, STATIC,   SINGULAR, STRING,   cot_host_id,       9)
+#define meshtastic_AircraftTrack_CALLBACK NULL
+#define meshtastic_AircraftTrack_DEFAULT NULL
+
+#define meshtastic_TAKPacketV2_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UENUM,    cot_type_id,       1) \
+X(a, STATIC,   SINGULAR, UENUM,    how,               2) \
+X(a, STATIC,   SINGULAR, STRING,   callsign,          3) \
+X(a, STATIC,   SINGULAR, UENUM,    team,              4) \
+X(a, STATIC,   SINGULAR, UENUM,    role,              5) \
+X(a, STATIC,   SINGULAR, SFIXED32, latitude_i,        6) \
+X(a, STATIC,   SINGULAR, SFIXED32, longitude_i,       7) \
+X(a, STATIC,   SINGULAR, SINT32,   altitude,          8) \
+X(a, STATIC,   SINGULAR, UINT32,   speed,             9) \
+X(a, STATIC,   SINGULAR, UINT32,   course,           10) \
+X(a, STATIC,   SINGULAR, UINT32,   battery,          11) \
+X(a, STATIC,   SINGULAR, UENUM,    geo_src,          12) \
+X(a, STATIC,   SINGULAR, UENUM,    alt_src,          13) \
+X(a, STATIC,   SINGULAR, STRING,   uid,              14) \
+X(a, STATIC,   SINGULAR, STRING,   device_callsign,  15) \
+X(a, STATIC,   SINGULAR, UINT32,   stale_seconds,    16) \
+X(a, STATIC,   SINGULAR, STRING,   tak_version,      17) \
+X(a, STATIC,   SINGULAR, STRING,   tak_device,       18) \
+X(a, STATIC,   SINGULAR, STRING,   tak_platform,     19) \
+X(a, STATIC,   SINGULAR, STRING,   tak_os,           20) \
+X(a, STATIC,   SINGULAR, STRING,   endpoint,         21) \
+X(a, STATIC,   SINGULAR, STRING,   phone,            22) \
+X(a, STATIC,   SINGULAR, STRING,   cot_type_str,     23) \
+X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,pli,payload_variant.pli),  30) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,chat,payload_variant.chat),  31) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,aircraft,payload_variant.aircraft),  32) \
+X(a, STATIC,   ONEOF,    BYTES,    (payload_variant,raw_detail,payload_variant.raw_detail),  33)
+#define meshtastic_TAKPacketV2_CALLBACK NULL
+#define meshtastic_TAKPacketV2_DEFAULT NULL
+#define meshtastic_TAKPacketV2_payload_variant_chat_MSGTYPE meshtastic_GeoChat
+#define meshtastic_TAKPacketV2_payload_variant_aircraft_MSGTYPE meshtastic_AircraftTrack
+
 extern const pb_msgdesc_t meshtastic_TAKPacket_msg;
 extern const pb_msgdesc_t meshtastic_GeoChat_msg;
 extern const pb_msgdesc_t meshtastic_Group_msg;
 extern const pb_msgdesc_t meshtastic_Status_msg;
 extern const pb_msgdesc_t meshtastic_Contact_msg;
 extern const pb_msgdesc_t meshtastic_PLI_msg;
+extern const pb_msgdesc_t meshtastic_AircraftTrack_msg;
+extern const pb_msgdesc_t meshtastic_TAKPacketV2_msg;

 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define meshtastic_TAKPacket_fields &meshtastic_TAKPacket_msg
@@ -269,14 +657,18 @@ extern const pb_msgdesc_t meshtastic_PLI_msg;
 #define meshtastic_Status_fields &meshtastic_Status_msg
 #define meshtastic_Contact_fields &meshtastic_Contact_msg
 #define meshtastic_PLI_fields &meshtastic_PLI_msg
+#define meshtastic_AircraftTrack_fields &meshtastic_AircraftTrack_msg
+#define meshtastic_TAKPacketV2_fields &meshtastic_TAKPacketV2_msg

 /* Maximum encoded size of messages (where known) */
-#define MESHTASTIC_MESHTASTIC_ATAK_PB_H_MAX_SIZE meshtastic_TAKPacket_size
+#define MESHTASTIC_MESHTASTIC_ATAK_PB_H_MAX_SIZE meshtastic_TAKPacketV2_size
+#define meshtastic_AircraftTrack_size            134
 #define meshtastic_Contact_size                  242
 #define meshtastic_GeoChat_size                  444
 #define meshtastic_Group_size                    4
 #define meshtastic_PLI_size                      31
 #define meshtastic_Status_size                   3
+#define meshtastic_TAKPacketV2_size              1027
 #define meshtastic_TAKPacket_size                705

 #ifdef __cplusplus
@@ -308,6 +308,8 @@ typedef enum _meshtastic_HardwareModel {
    meshtastic_HardwareModel_TDISPLAY_S3_PRO = 126,
    /* Heltec Mesh Node T096 board features an nRF52840 CPU and a TFT screen. */
    meshtastic_HardwareModel_HELTEC_MESH_NODE_T096 = 127,
+    /* Seeed studio T1000-E Pro tracker card. NRF52840 w/ LR2021 radio, GPS, button, buzzer, and sensors. */
+    meshtastic_HardwareModel_TRACKER_T1000_E_PRO = 128,
    /* ------------------------------------------------------------------------------------------------------------------------------------------
 Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.
 ------------------------------------------------------------------------------------------------------------------------------------------ */
@@ -150,6 +150,10 @@ typedef enum _meshtastic_PortNum {
 arbitrary telemetry over meshtastic that is not covered by telemetry.proto
 ENCODING: CayenneLLP */
    meshtastic_PortNum_CAYENNE_APP = 77,
+    /* ATAK Plugin V2
+ Portnum for payloads from the official Meshtastic ATAK plugin using
+ TAKPacketV2 with zstd dictionary compression. */
+    meshtastic_PortNum_ATAK_PLUGIN_V2 = 78,
    /* GroupAlarm integration
 Used for transporting GroupAlarm-related messages between Meshtastic nodes
 and companion applications/services. */
@@ -203,6 +203,10 @@ void ExternalNotificationModule::setExternalState(uint8_t index, bool on)
    default:
        if (output > 0)
            digitalWrite(output, (moduleConfig.external_notification.active ? on : !on));
+#ifdef PCA_LED_NOTIFICATION
+        io.digitalWrite(PCA_LED_NOTIFICATION, on);
+
+#endif
        break;
    }

@@ -104,6 +104,10 @@
 #include "modules/StatusMessageModule.h"
 #endif

+#if !MESHTASTIC_EXCLUDE_ZPS
+#include "modules/esp32/ZPSModule.h"
+#endif
+
 #if defined(HAS_HARDWARE_WATCHDOG)
 #include "watchdog/watchdogThread.h"
 #endif
@@ -174,6 +178,9 @@ void setupModules()
 #if !MESHTASTIC_EXCLUDE_STATUS
    statusMessageModule = new StatusMessageModule();
 #endif
+#if !MESHTASTIC_EXCLUDE_ZPS
+        zpsModule = new ZPSModule();
+#endif
 #if !MESHTASTIC_EXCLUDE_GENERIC_THREAD_MODULE
    new GenericThreadModule();
 #endif
@@ -651,7 +651,7 @@ void SerialModule::processWXSerial()
        LOG_INFO("WS8X : %i %.1fg%.1f %.1fv %.1fv %.1fC rain: %.1f, %i sum", atoi(windDir), strtof(windVel, nullptr),
                 strtof(windGust, nullptr), batVoltageF, capVoltageF, temperatureF, rain, rainSum);
    }
-    if (gotwind && !Throttle::isWithinTimespanMs(lastAveraged, averageIntervalMillis)) {
+    if (gotwind && !Throttle::isWithinTimespanMs(lastAveraged, averageIntervalMillis) && velCount > 0 && dirCount > 0) {
        // calculate averages and send to the mesh
        float velAvg = 1.0 * velSum / velCount;

@@ -66,18 +66,10 @@ extern void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y, const c
 #include "Sensor/MCP9808Sensor.h"
 #endif

-#if __has_include(<Adafruit_SHT31.h>)
-#include "Sensor/SHT31Sensor.h"
-#endif
-
 #if __has_include(<Adafruit_LPS2X.h>)
 #include "Sensor/LPS22HBSensor.h"
 #endif

-#if __has_include(<Adafruit_SHTC3.h>)
-#include "Sensor/SHTC3Sensor.h"
-#endif
-
 #if __has_include("RAK12035_SoilMoisture.h") && defined(RAK_4631) && RAK_4631 == 1
 #include "Sensor/RAK12035Sensor.h"
 #endif
@@ -94,8 +86,8 @@ extern void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y, const c
 #include "Sensor/OPT3001Sensor.h"
 #endif

-#if __has_include(<Adafruit_SHT4x.h>)
-#include "Sensor/SHT4XSensor.h"
+#if __has_include(<SHTSensor.h>)
+#include "Sensor/SHTXXSensor.h"
 #endif

 #if __has_include(<SparkFun_MLX90632_Arduino_Library.h>)
@@ -155,6 +147,15 @@ void EnvironmentTelemetryModule::i2cScanFinished(ScanI2C *i2cScanner)
    }
    LOG_INFO("Environment Telemetry adding I2C devices...");

+    /*
+        Uncomment the preferences below if you want to use the module
+        without having to configure it from the PythonAPI or WebUI.
+    */
+
+    // moduleConfig.telemetry.environment_measurement_enabled = 1;
+    // moduleConfig.telemetry.environment_screen_enabled = 1;
+    // moduleConfig.telemetry.environment_update_interval = 15;
+
    // order by priority of metrics/values (low top, high bottom)

 #if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
@@ -202,15 +203,9 @@ void EnvironmentTelemetryModule::i2cScanFinished(ScanI2C *i2cScanner)
 #if __has_include(<Adafruit_MCP9808.h>)
    addSensor<MCP9808Sensor>(i2cScanner, ScanI2C::DeviceType::MCP9808);
 #endif
-#if __has_include(<Adafruit_SHT31.h>)
-    addSensor<SHT31Sensor>(i2cScanner, ScanI2C::DeviceType::SHT31);
-#endif
 #if __has_include(<Adafruit_LPS2X.h>)
    addSensor<LPS22HBSensor>(i2cScanner, ScanI2C::DeviceType::LPS22HB);
 #endif
-#if __has_include(<Adafruit_SHTC3.h>)
-    addSensor<SHTC3Sensor>(i2cScanner, ScanI2C::DeviceType::SHTC3);
-#endif
 #if __has_include("RAK12035_SoilMoisture.h") && defined(RAK_4631) && RAK_4631 == 1
    addSensor<RAK12035Sensor>(i2cScanner, ScanI2C::DeviceType::RAK12035);
 #endif
@@ -223,13 +218,9 @@ void EnvironmentTelemetryModule::i2cScanFinished(ScanI2C *i2cScanner)
 #if __has_include(<ClosedCube_OPT3001.h>)
    addSensor<OPT3001Sensor>(i2cScanner, ScanI2C::DeviceType::OPT3001);
 #endif
-#if __has_include(<Adafruit_SHT4x.h>)
-    addSensor<SHT4XSensor>(i2cScanner, ScanI2C::DeviceType::SHT4X);
-#endif
 #if __has_include(<SparkFun_MLX90632_Arduino_Library.h>)
    addSensor<MLX90632Sensor>(i2cScanner, ScanI2C::DeviceType::MLX90632);
 #endif
-
 #if __has_include(<Adafruit_BMP3XX.h>)
    addSensor<BMP3XXSensor>(i2cScanner, ScanI2C::DeviceType::BMP_3XX);
 #endif
@@ -245,7 +236,10 @@ void EnvironmentTelemetryModule::i2cScanFinished(ScanI2C *i2cScanner)
 #if __has_include(<BH1750_WE.h>)
    addSensor<BH1750Sensor>(i2cScanner, ScanI2C::DeviceType::BH1750);
 #endif
-
+#if __has_include(<SHTSensor.h>)
+    // TODO Can we scan for multiple sensors connected on the same bus?
+    addSensor<SHTXXSensor>(i2cScanner, ScanI2C::DeviceType::SHTXX);
+#endif
 #endif
 }

@@ -260,14 +254,6 @@ int32_t EnvironmentTelemetryModule::runOnce()
    }

    uint32_t result = UINT32_MAX;
-    /*
-        Uncomment the preferences below if you want to use the module
-        without having to configure it from the PythonAPI or WebUI.
-    */
-
-    // moduleConfig.telemetry.environment_measurement_enabled = 1;
-    // moduleConfig.telemetry.environment_screen_enabled = 1;
-    // moduleConfig.telemetry.environment_update_interval = 15;

    if (!(moduleConfig.telemetry.environment_measurement_enabled || moduleConfig.telemetry.environment_screen_enabled ||
          ENVIRONMENTAL_TELEMETRY_MODULE_ENABLE)) {
@@ -1,31 +0,0 @@
-#include "configuration.h"
-
-#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_SHT31.h>)
-
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "SHT31Sensor.h"
-#include "TelemetrySensor.h"
-#include <Adafruit_SHT31.h>
-
-SHT31Sensor::SHT31Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_SHT31, "SHT31") {}
-
-bool SHT31Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
-{
-    LOG_INFO("Init sensor: %s", sensorName);
-    sht31 = Adafruit_SHT31(bus);
-    status = sht31.begin(dev->address.address);
-    initI2CSensor();
-    return status;
-}
-
-bool SHT31Sensor::getMetrics(meshtastic_Telemetry *measurement)
-{
-    measurement->variant.environment_metrics.has_temperature = true;
-    measurement->variant.environment_metrics.has_relative_humidity = true;
-    measurement->variant.environment_metrics.temperature = sht31.readTemperature();
-    measurement->variant.environment_metrics.relative_humidity = sht31.readHumidity();
-
-    return true;
-}
-
-#endif
@@ -1,20 +0,0 @@
-#include "configuration.h"
-
-#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_SHT31.h>)
-
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "TelemetrySensor.h"
-#include <Adafruit_SHT31.h>
-
-class SHT31Sensor : public TelemetrySensor
-{
-  private:
-    Adafruit_SHT31 sht31;
-
-  public:
-    SHT31Sensor();
-    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
-    virtual bool initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev) override;
-};
-
-#endif
@@ -1,48 +0,0 @@
-#include "configuration.h"
-
-#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_SHT4x.h>)
-
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "SHT4XSensor.h"
-#include "TelemetrySensor.h"
-#include <Adafruit_SHT4x.h>
-
-SHT4XSensor::SHT4XSensor() : TelemetrySensor(meshtastic_TelemetrySensorType_SHT4X, "SHT4X") {}
-
-bool SHT4XSensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
-{
-    LOG_INFO("Init sensor: %s", sensorName);
-
-    uint32_t serialNumber = 0;
-
-    status = sht4x.begin(bus);
-    if (!status) {
-        return status;
-    }
-
-    serialNumber = sht4x.readSerial();
-    if (serialNumber != 0) {
-        LOG_DEBUG("serialNumber : %x", serialNumber);
-        status = 1;
-    } else {
-        LOG_DEBUG("Error trying to execute readSerial(): ");
-        status = 0;
-    }
-
-    initI2CSensor();
-    return status;
-}
-
-bool SHT4XSensor::getMetrics(meshtastic_Telemetry *measurement)
-{
-    measurement->variant.environment_metrics.has_temperature = true;
-    measurement->variant.environment_metrics.has_relative_humidity = true;
-
-    sensors_event_t humidity, temp;
-    sht4x.getEvent(&humidity, &temp);
-    measurement->variant.environment_metrics.temperature = temp.temperature;
-    measurement->variant.environment_metrics.relative_humidity = humidity.relative_humidity;
-    return true;
-}
-
-#endif
@@ -1,20 +0,0 @@
-#include "configuration.h"
-
-#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_SHT4x.h>)
-
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "TelemetrySensor.h"
-#include <Adafruit_SHT4x.h>
-
-class SHT4XSensor : public TelemetrySensor
-{
-  private:
-    Adafruit_SHT4x sht4x = Adafruit_SHT4x();
-
-  public:
-    SHT4XSensor();
-    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
-    virtual bool initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev) override;
-};
-
-#endif
@@ -1,35 +0,0 @@
-#include "configuration.h"
-
-#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_SHTC3.h>)
-
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "SHTC3Sensor.h"
-#include "TelemetrySensor.h"
-#include <Adafruit_SHTC3.h>
-
-SHTC3Sensor::SHTC3Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_SHTC3, "SHTC3") {}
-
-bool SHTC3Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
-{
-    LOG_INFO("Init sensor: %s", sensorName);
-    status = shtc3.begin(bus);
-
-    initI2CSensor();
-    return status;
-}
-
-bool SHTC3Sensor::getMetrics(meshtastic_Telemetry *measurement)
-{
-    measurement->variant.environment_metrics.has_temperature = true;
-    measurement->variant.environment_metrics.has_relative_humidity = true;
-
-    sensors_event_t humidity, temp;
-    shtc3.getEvent(&humidity, &temp);
-
-    measurement->variant.environment_metrics.temperature = temp.temperature;
-    measurement->variant.environment_metrics.relative_humidity = humidity.relative_humidity;
-
-    return true;
-}
-
-#endif
@@ -1,20 +0,0 @@
-#include "configuration.h"
-
-#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_SHTC3.h>)
-
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "TelemetrySensor.h"
-#include <Adafruit_SHTC3.h>
-
-class SHTC3Sensor : public TelemetrySensor
-{
-  private:
-    Adafruit_SHTC3 shtc3 = Adafruit_SHTC3();
-
-  public:
-    SHTC3Sensor();
-    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
-    virtual bool initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev) override;
-};
-
-#endif
@@ -0,0 +1,145 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<SHTSensor.h>)
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "SHTXXSensor.h"
+#include "TelemetrySensor.h"
+#include <SHTSensor.h>
+
+SHTXXSensor::SHTXXSensor() : TelemetrySensor(meshtastic_TelemetrySensorType_SHTXX, "SHTXX") {}
+
+void SHTXXSensor::getSensorVariant(SHTSensor::SHTSensorType sensorType)
+{
+    switch (sensorType) {
+    case SHTSensor::SHTSensorType::SHT2X:
+        sensorVariant = "SHT2x";
+        break;
+
+    case SHTSensor::SHTSensorType::SHT3X:
+    case SHTSensor::SHTSensorType::SHT85:
+        sensorVariant = "SHT3x/SHT85";
+        break;
+
+    case SHTSensor::SHTSensorType::SHT3X_ALT:
+        sensorVariant = "SHT3x";
+        break;
+
+    case SHTSensor::SHTSensorType::SHTW1:
+    case SHTSensor::SHTSensorType::SHTW2:
+    case SHTSensor::SHTSensorType::SHTC1:
+    case SHTSensor::SHTSensorType::SHTC3:
+        sensorVariant = "SHTC1/SHTC3/SHTW1/SHTW2";
+        break;
+
+    case SHTSensor::SHTSensorType::SHT4X:
+        sensorVariant = "SHT4x";
+        break;
+
+    default:
+        sensorVariant = "Unknown";
+        break;
+    }
+}
+
+bool SHTXXSensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
+{
+    LOG_INFO("Init sensor: %s", sensorName);
+
+    _bus = bus;
+    _address = dev->address.address;
+
+    if (sht.init(*_bus)) {
+        LOG_INFO("%s: init(): success", sensorName);
+        getSensorVariant(sht.mSensorType);
+        LOG_INFO("%s Sensor detected: %s on 0x%x", sensorName, sensorVariant, _address);
+        status = 1;
+    } else {
+        LOG_ERROR("%s: init(): failed", sensorName);
+    }
+
+    initI2CSensor();
+    return status;
+}
+
+/**
+ * Accuracy setting of measurement.
+ * Not all sensors support changing the sampling accuracy (only SHT3X and SHT4X)
+ * SHTAccuracy:
+ * - SHT_ACCURACY_HIGH: Highest repeatability at the cost of slower measurement
+ * - SHT_ACCURACY_MEDIUM: Balanced repeatability and speed of measurement
+ * - SHT_ACCURACY_LOW: Fastest measurement but lowest repeatability
+ */
+bool SHTXXSensor::setAccuracy(SHTSensor::SHTAccuracy newAccuracy)
+{
+    // Only SHT3X-family (including alternates) and SHT4X support changing accuracy
+    if (sht.mSensorType != SHTSensor::SHTSensorType::SHT3X && sht.mSensorType != SHTSensor::SHTSensorType::SHT3X_ALT &&
+        sht.mSensorType != SHTSensor::SHTSensorType::SHT85 && sht.mSensorType != SHTSensor::SHTSensorType::SHT4X) {
+        LOG_WARN("%s doesn't support accuracy setting", sensorVariant);
+        return false;
+    }
+    LOG_INFO("%s: setting new accuracy setting", sensorVariant);
+    accuracy = newAccuracy;
+    return sht.setAccuracy(accuracy);
+}
+
+bool SHTXXSensor::getMetrics(meshtastic_Telemetry *measurement)
+{
+    if (sht.readSample()) {
+        measurement->variant.environment_metrics.has_temperature = true;
+        measurement->variant.environment_metrics.has_relative_humidity = true;
+        measurement->variant.environment_metrics.temperature = sht.getTemperature();
+        measurement->variant.environment_metrics.relative_humidity = sht.getHumidity();
+
+        LOG_INFO("%s (%s): Got: temp:%fdegC, hum:%f%%rh", sensorName, sensorVariant,
+                 measurement->variant.environment_metrics.temperature,
+                 measurement->variant.environment_metrics.relative_humidity);
+
+        return true;
+    } else {
+        LOG_ERROR("%s (%s): read sample failed", sensorName, sensorVariant);
+        return false;
+    }
+}
+
+AdminMessageHandleResult SHTXXSensor::handleAdminMessage(const meshtastic_MeshPacket &mp, meshtastic_AdminMessage *request,
+                                                         meshtastic_AdminMessage *response)
+{
+    AdminMessageHandleResult result;
+    result = AdminMessageHandleResult::NOT_HANDLED;
+
+    switch (request->which_payload_variant) {
+    case meshtastic_AdminMessage_sensor_config_tag:
+        if (!request->sensor_config.has_shtxx_config) {
+            result = AdminMessageHandleResult::NOT_HANDLED;
+            break;
+        }
+
+        // Check for sensor accuracy setting
+        if (request->sensor_config.shtxx_config.has_set_accuracy) {
+            SHTSensor::SHTAccuracy newAccuracy;
+            if (request->sensor_config.shtxx_config.set_accuracy == 0) {
+                newAccuracy = SHTSensor::SHT_ACCURACY_LOW;
+            } else if (request->sensor_config.shtxx_config.set_accuracy == 1) {
+                newAccuracy = SHTSensor::SHT_ACCURACY_MEDIUM;
+            } else if (request->sensor_config.shtxx_config.set_accuracy == 2) {
+                newAccuracy = SHTSensor::SHT_ACCURACY_HIGH;
+            } else {
+                LOG_ERROR("%s: incorrect accuracy setting", sensorName);
+                result = AdminMessageHandleResult::HANDLED;
+                break;
+            }
+            this->setAccuracy(newAccuracy);
+        }
+
+        result = AdminMessageHandleResult::HANDLED;
+        break;
+
+    default:
+        result = AdminMessageHandleResult::NOT_HANDLED;
+    }
+
+    return result;
+}
+
+#endif
@@ -0,0 +1,29 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<SHTSensor.h>)
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include <SHTSensor.h>
+
+class SHTXXSensor : public TelemetrySensor
+{
+  private:
+    SHTSensor sht;
+    TwoWire *_bus{};
+    uint8_t _address{};
+    SHTSensor::SHTAccuracy accuracy{};
+    bool setAccuracy(SHTSensor::SHTAccuracy newAccuracy);
+
+  public:
+    SHTXXSensor();
+    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
+    virtual bool initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev) override;
+    void getSensorVariant(SHTSensor::SHTSensorType);
+    const char *sensorVariant{};
+
+    AdminMessageHandleResult handleAdminMessage(const meshtastic_MeshPacket &mp, meshtastic_AdminMessage *request,
+                                                meshtastic_AdminMessage *response) override;
+};
+
+#endif
@@ -7,6 +7,7 @@
 #include "NodeDB.h"
 #include "Router.h"
 #include "TypeConversions.h"
+#include "airtime.h"
 #include "concurrency/LockGuard.h"
 #include "configuration.h"
 #include "mesh-pb-constants.h"
@@ -1001,7 +1002,11 @@ void TrafficManagementModule::alterReceived(meshtastic_MeshPacket &mp)
    const auto &cfg = moduleConfig.traffic_management;
    const bool isTelemetry = mp.decoded.portnum == meshtastic_PortNum_TELEMETRY_APP;
    const bool isPosition = mp.decoded.portnum == meshtastic_PortNum_POSITION_APP;
-    const bool shouldExhaust = (isTelemetry && cfg.exhaust_hop_telemetry) || (isPosition && cfg.exhaust_hop_position);
+    // Only exhaust telemetry hops when channel is actually congested, mirroring the same
+    // airtime checks that gate self-generated telemetry in the telemetry modules.
+    const bool channelBusy = airTime && (!airTime->isTxAllowedChannelUtil(true) || !airTime->isTxAllowedAirUtil());
+    const bool shouldExhaust =
+        ((channelBusy && isTelemetry && cfg.exhaust_hop_telemetry) || (isPosition && cfg.exhaust_hop_position));

    if (!shouldExhaust || !isBroadcast(mp.to))
        return;
@@ -0,0 +1,419 @@
+/*
+ * ZPS - Zero-GPS Positioning System for standalone Meshtastic devices
+ * - experimental tools for estimating own position without a GPS -
+ *
+ * Copyright 2021 all rights reserved by https://github.com/a-f-G-U-C
+ * Released under GPL v3 (see LICENSE file for details)
+ */
+
+#include "ZPSModule.h"
+#include "Default.h"
+#include "MeshService.h"
+#include "NodeDB.h"
+#include "NodeStatus.h"
+#include "Router.h"
+#include "configuration.h"
+#include "gps/RTC.h"
+#include <WiFi.h>
+
+#if !defined(MESHTASTIC_EXCLUDE_BLUETOOTH)
+
+#include "NimBLEDevice.h"
+
+#define BLE_MAX_REC 15
+#define BLE_NO_RESULTS -1 // Indicates a BLE scan is in progress
+
+uint8_t bleCounter = 0; // used internally by the ble scanner
+uint64_t bleResult[BLE_MAX_REC + 1];
+int bleResSize = BLE_NO_RESULTS;
+
+uint64_t scanStart = 0;
+
+ZPSModule *zpsModule;
+
+// Mini BLE scanner, NIMBLE based and modelled loosely after the Wifi scanner
+static int ble_scan(uint32_t duration, bool passive = true, bool dedup = true);
+
+// ZPSModule::ZPSModule()
+//     : ProtobufModule("ZPS", ZPS_PORTNUM, Position_fields), concurrency::OSThread("ZPSModule")
+ZPSModule::ZPSModule() : SinglePortModule("ZPS", ZPS_PORTNUM), concurrency::OSThread("ZPSModule")
+{
+    setIntervalFromNow(ZPS_STARTUP_DELAY); // Delay startup by 10 seconds, no need to race :)
+
+    wantBSS = true;
+    wantBLE = true;
+
+    WiFi.mode(WIFI_STA);
+    WiFi.disconnect();
+    WiFi.scanNetworks(true, true); // nonblock, showhidden
+    scanState = SCAN_BSS_RUN;
+}
+
+ProcessMessage ZPSModule::handleReceived(const meshtastic_MeshPacket &mp)
+{
+    meshtastic_Position pos = meshtastic_Position_init_default;
+
+    auto &pd = mp.decoded;
+    uint8_t nRecs = pd.payload.size >> 3;
+
+    LOG_DEBUG("handleReceived %s 0x%0x->0x%0x, id=0x%x, port=%d, len=%d, rec=%d\n", name, mp.from, mp.to, mp.id, pd.portnum,
+              pd.payload.size, nRecs);
+    if (nRecs > ZPS_DATAPKT_MAXITEMS)
+        nRecs = ZPS_DATAPKT_MAXITEMS;
+    memcpy(&netData, pd.payload.bytes, nRecs << 3);
+
+    // Currently we are unable to act as a position server, so we're
+    // not interested in broadcasts (this will change later)
+    if (mp.to != nodeDB->getNodeNum()) {
+        // Message is not for us, won't process
+        return ProcessMessage::CONTINUE;
+    }
+
+#ifdef ZPS_EXTRAVERBOSE
+    for (int i = 0; i < nRecs; i++) {
+        LOG_DEBUG("ZPS[%d]: %08x"
+                  "%08x\n",
+                  i, (uint32_t)(netData[i] >> 32), (uint32_t)netData[i]);
+    }
+#endif
+
+    if ((netData[0] & 0x800000000000) && (nRecs >= 2)) {
+        // message contains a position
+        pos.PDOP = (netData[0] >> 40) & 0x7f;
+        pos.timestamp = netData[0] & 0xffffffff;
+        // second int64 encodes lat and lon
+        pos.longitude_i = (int32_t)(netData[1] & 0xffffffff);
+        pos.latitude_i = (int32_t)((netData[1] >> 32) & 0xffffffff);
+
+        // FIXME should be conditional, to ensure we don't overwrite a good GPS fix!
+        LOG_DEBUG("ZPS lat/lon/dop/pts %d/%d/%d/%d\n", pos.latitude_i, pos.longitude_i, pos.PDOP, pos.timestamp);
+
+        // Some required fields
+        pos.time = getTime();
+        pos.location_source = meshtastic_Position_LocSource_LOC_EXTERNAL;
+
+        // don't update position if my gps fix is valid
+        if (nodeDB->hasValidPosition(nodeDB->getMeshNode(nodeDB->getNodeNum()))) {
+            LOG_DEBUG("ZPSModule::handleReceived: ignoring position update, GPS is valid\n");
+            return ProcessMessage::CONTINUE;
+        }
+        nodeDB->updatePosition(nodeDB->getNodeNum(), pos);
+    } else {
+        // nothing we can do - for now
+        return ProcessMessage::CONTINUE;
+    }
+
+    return ProcessMessage::CONTINUE; // Let others look at this message also if they want
+}
+
+meshtastic_MeshPacket *ZPSModule::allocReply()
+{
+    meshtastic_MeshPacket *p = allocDataPacket();
+    p->decoded.payload.size = (netRecs + 2) << 3; // actually can be only +1 if no GPS data
+
+    LOG_DEBUG("Allocating dataPacket for %d items, %d bytes\n", netRecs, p->decoded.payload.size);
+    memcpy(p->decoded.payload.bytes, &netData, p->decoded.payload.size);
+
+    return (p);
+}
+
+void ZPSModule::sendDataPacket(NodeNum dest, bool wantReplies)
+{
+    // cancel any not yet sent (now stale) position packets
+    if (prevPacketId)
+        service->cancelSending(prevPacketId);
+
+    meshtastic_MeshPacket *p = allocReply();
+    p->to = dest;
+    p->decoded.portnum = meshtastic_PortNum_ZPS_APP;
+    p->decoded.want_response = wantReplies;
+    p->priority = meshtastic_MeshPacket_Priority_BACKGROUND;
+    prevPacketId = p->id;
+
+    service->sendToMesh(p, RX_SRC_LOCAL);
+}
+
+int32_t ZPSModule::runOnce()
+{
+    meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(nodeDB->getNodeNum());
+    assert(node);
+
+    // LOG_DEBUG("ZPSModule::runOnce() START, scanState: %d\n", (int) scanState);
+
+    int numWifi = 0;
+
+    if (scanState == SCAN_BSS_RUN) {
+        // check completion status of any running Wifi scan
+        numWifi = WiFi.scanComplete();
+
+        if (numWifi >= 0) {
+            // scan is complete
+            LOG_DEBUG("%d BSS found\n", numWifi);
+            LOG_DEBUG("BSS scan done in %d millis\n", millis() - scanStart);
+
+            if (wantBSS && haveBSS) {
+                // old data exists, overwrite it
+                netRecs = 0;
+                haveBSS = haveBLE = false;
+            }
+
+            for (int i = 0; i < numWifi; i++) {
+                // pack each Wifi network record into a 64-bit int
+                uint64_t netBytes = encodeBSS(WiFi.BSSID(i), WiFi.channel(i), abs(WiFi.RSSI(i)));
+
+                if (wantBSS) {
+                    // load into outbound array if needed
+                    outBufAdd(netBytes);
+                    haveBSS = true;
+                }
+#ifdef ZPS_EXTRAVERBOSE
+                LOG_DEBUG("BSS[%02d]: %08x"
+                          "%08x\n",
+                          i, (uint32_t)(netBytes >> 32), (uint32_t)netBytes);
+#endif
+            }
+
+            WiFi.scanDelete();
+            scanState = SCAN_BSS_DONE;
+
+#ifdef ZPS_EXTRAVERBOSE
+        } else if (numWifi == -1) {
+            // LOG_DEBUG("BSS scan in-progress\n");
+        } else {
+            LOG_DEBUG("BSS scan state=%d\n", numWifi);
+#endif
+        }
+    }
+
+    if ((scanState == SCAN_BLE_RUN) && (bleResSize >= 0)) {
+        // completion status checked above (bleResSize >= 0)
+        LOG_DEBUG("BLE scan done in %d millis\n", millis() - scanStart);
+        scanState = SCAN_BLE_DONE;
+
+        if (wantBLE && haveBLE) {
+            // old data exists, overwrite it
+            netRecs = 0;
+            haveBSS = haveBLE = false;
+        }
+
+        for (int i = 0; i < bleResSize; i++) {
+            // load data into output array if needed
+            if (wantBLE) {
+                outBufAdd(bleResult[i]);
+                haveBLE = true;
+            }
+#ifdef ZPS_EXTRAVERBOSE
+            LOG_DEBUG("BLE[%d]: %08x"
+                      "%08x\n",
+                      i, (uint32_t)(bleResult[i] >> 32), (uint32_t)bleResult[i]);
+#endif
+        }
+
+        // Reset the counter once we're done with the dataset
+        bleResSize = BLE_NO_RESULTS;
+    }
+
+    // Are we finished assembling that packet? Then send it out
+    if ((wantBSS == haveBSS) && (wantBLE == haveBLE) &&
+        airTime->isTxAllowedChannelUtil(config.device.role != meshtastic_Config_DeviceConfig_Role_SENSOR) &&
+        airTime->isTxAllowedAirUtil() &&
+        (lastSend == 0 || millis() - lastSend >= Default::getConfiguredOrDefaultMsScaled(config.position.position_broadcast_secs,
+                                                                                         default_broadcast_interval_secs,
+                                                                                         nodeStatus->getNumOnline()))) {
+
+        haveBSS = haveBLE = false;
+        sendDataPacket(NODENUM_BROADCAST, false); // no replies
+        lastSend = millis();
+        netRecs = 0; // reset packet
+    }
+
+    /*
+     * State machine transitions
+     *
+     * FIXME could be managed better, for example: check if we require
+     *   each type of scan (wantBSS/wantBLE), and if not, don't start it!
+     */
+    if (scanState == SCAN_BLE_DONE) {
+        // BLE done, transition to BSS scanning
+        scanStart = millis();
+        LOG_DEBUG("BSS scan start t=%d\n", scanStart);
+        if (WiFi.scanNetworks(true, true) == WIFI_SCAN_RUNNING) // nonblock, showhidden
+            scanState = SCAN_BSS_RUN;
+
+    } else if (scanState == SCAN_BSS_DONE) {
+        // BSS done, transition to BLE scanning
+        scanStart = millis();
+        LOG_DEBUG("BLE scan start t=%d\n", scanStart);
+        if (ble_scan(ZPS_BLE_SCANTIME) == 0)
+            scanState = SCAN_BLE_RUN;
+    }
+
+    // LOG_DEBUG("ZPSModule::runOnce() DONE, scanState=%d\n", scanState);
+    if ((scanState == SCAN_BSS_RUN) || (scanState == SCAN_BLE_RUN)) {
+        return 1000; // scan in progress, re-check soon
+    }
+
+    return 5000;
+}
+
+uint64_t encodeBSS(uint8_t *bssid, uint8_t chan, uint8_t absRSSI)
+{
+    uint64_t netBytes = absRSSI & 0xff;
+    netBytes <<= 8;
+    netBytes |= (chan & 0xff);
+
+    for (uint8_t b = 0; b < 6; b++) {
+        netBytes <<= 8;
+        netBytes |= bssid[b];
+    }
+
+    return netBytes;
+}
+
+uint64_t encodeBLE(uint8_t *addr, uint8_t absRSSI)
+{
+    uint64_t netBytes = absRSSI & 0xff;
+    netBytes <<= 8;
+    netBytes |= 0xff; // "channel" byte reserved in BLE records
+
+    for (uint8_t b = 0; b < 6; b++) {
+        netBytes <<= 8;
+        netBytes |= addr[5 - b] & 0xff;
+    }
+
+    return netBytes;
+}
+
+/**
+ * Event handler
+ */
+static int ble_gap_event(struct ble_gap_event *event, void *arg)
+{
+    // Adverts matching certain patterns are useless for positioning purposes
+    //  (ephemeral MAC etc), so try excluding them if possible
+    //
+    // TODO: Expand the list of reject patterns for BLE adverts.
+    //   There are likely more than 10 patterns to test and reject, including most Apple devices and others.
+    //
+    // TODO: Implement full packet search for reject patterns (use memmem() or similar),
+    //   not just at the beginning (currently uses memcmp()).
+
+    const uint8_t rejPat[] = {0x1e, 0xff, 0x06, 0x00, 0x01}; // one of many
+
+    struct ble_hs_adv_fields fields;
+    int rc;
+    int i = 0;
+
+    uint64_t netBytes = 0;
+
+    switch (event->type) {
+    case BLE_GAP_EVENT_DISC:
+        // called once for every BLE advert received
+        rc = ble_hs_adv_parse_fields(&fields, event->disc.data, event->disc.length_data);
+        if (rc != 0)
+            return 0;
+
+        if (bleResSize != BLE_NO_RESULTS)
+            // as far as we know, we're not in the middle of a BLE scan!
+            LOG_DEBUG("Unexpected BLE_GAP_EVENT_DISC!\n");
+
+#ifdef ZPS_EXTRAVERBOSE
+        // Dump the advertisement packet
+        DEBUG_PORT.hexDump("DEBUG", (unsigned char *)event->disc.data, event->disc.length_data);
+#endif
+        // Reject beacons known to be unreliable (ephemeral etc)
+        if (memcmp(event->disc.data, rejPat, sizeof(rejPat)) == 0) {
+            LOG_DEBUG("(BLE item filtered by pattern)\n");
+            return 0; // Processing-wise, it's still a success
+        }
+
+        //
+        // STORE THE RESULTS IN A SORTED LIST
+        //
+
+        // first, pack each BLE item reading into a 64-bit int
+        netBytes = encodeBLE(event->disc.addr.val, abs(event->disc.rssi));
+
+        // SOME DUPLICATES SURVIVE through filter_duplicates = 1, catch them here
+        // Duplicate filtering is now handled in the sorting loop below,
+        // but right now we write for clarity not optimization
+        for (i = 0; i < bleCounter; i++) {
+            if ((bleResult[i] & 0xffffffffffff) == (netBytes & 0xffffffffffff)) {
+                LOG_DEBUG("(BLE duplicate filtered)\n");
+                return 0;
+            }
+        }
+
+#ifdef ZPS_EXTRAVERBOSE
+        // redundant extraverbosity, but I need it for duplicate hunting
+        LOG_DEBUG("BL_[%02d]: %08x"
+                  "%08x\n",
+                  bleCounter, (uint32_t)(netBytes >> 32), (uint32_t)netBytes);
+#endif
+        // then insert item into a list (up to BLE_MAX_REC records), sorted by RSSI
+        for (i = 0; i < bleCounter; i++) {
+            // find first element greater than ours, that will be our insertion point
+            if (bleResult[i] > netBytes)
+                break;
+        }
+        // any other records move down one position to vacate res[i]
+        for (int j = bleCounter; j > i; j--)
+            bleResult[j] = bleResult[j - 1];
+        // write new element at insertion point
+        bleResult[i] = netBytes;
+
+        // advance tail of list, but not beyond limit
+        if (bleCounter < BLE_MAX_REC)
+            bleCounter++;
+
+        return 0; // SUCCESS
+
+    case BLE_GAP_EVENT_DISC_COMPLETE:
+        LOG_DEBUG("EVENT_DISC_COMPLETE in %d millis\n", (millis() - scanStart));
+        LOG_DEBUG("%d BLE found\n", bleCounter);
+        bleResSize = bleCounter;
+
+        bleCounter = 0; // reset counter
+        return 0;       // SUCCESS
+
+    default:
+        return 0; // SUCCESS
+    }
+}
+
+/**
+ * Initiates the GAP general discovery procedure (non-blocking)
+ */
+static int ble_scan(uint32_t duration, bool passive, bool dedup)
+{
+    uint8_t own_addr_type;
+    struct ble_gap_disc_params disc_params;
+    int rc;
+
+    // Figure out address type to use
+    rc = ble_hs_id_infer_auto(0, &own_addr_type);
+    if (rc != 0) {
+        LOG_DEBUG("error determining address type; rc=%d\n", rc);
+        return rc;
+    }
+
+    // Scanning parameters, these are mostly default
+    disc_params.itvl = 0;
+    disc_params.window = 0;
+    disc_params.filter_policy = 0;
+    disc_params.limited = 0;
+
+    // These two params are the more interesting ones
+    disc_params.filter_duplicates = dedup; // self-explanatory
+    disc_params.passive = passive;         // passive uses less power
+
+    // Start scanning process (non-blocking) and return
+    rc = ble_gap_disc(own_addr_type, duration, &disc_params, ble_gap_event, NULL);
+    if (rc != 0) {
+        LOG_DEBUG("error initiating GAP discovery; rc=%d\n", rc);
+    }
+
+    return rc;
+}
+
+#endif // MESHTASTIC_EXCLUDE_BLUETOOTH
@@ -0,0 +1,86 @@
+#pragma once
+#include "SinglePortModule.h"
+#include "concurrency/OSThread.h"
+#include "gps/RTC.h"
+
+#define ZPS_PORTNUM meshtastic_PortNum_ZPS_APP
+
+#define ZPS_DATAPKT_MAXITEMS 20 // max number of records to pack in an outbound packet (~10)
+#define ZPS_STARTUP_DELAY 10000 // Module startup delay in millis
+
+// Duration of a BLE scan in millis.
+// We want this number to be SLIGHTLY UNDER an integer number of seconds,
+//  to be able to catch the result as fresh as possible on a 1-second polling loop
+#define ZPS_BLE_SCANTIME 2900 // millis
+
+enum SCANSTATE { SCAN_NONE, SCAN_BSS_RUN, SCAN_BSS_DONE, SCAN_BLE_RUN, SCAN_BLE_DONE };
+
+/*
+ * Data packing "compression" functions
+ * Ingest a WiFi BSSID, channel and RSSI (or BLE address and RSSI)
+ *   and encode them into a packed uint64
+ */
+uint64_t encodeBSS(uint8_t *bssid, uint8_t chan, uint8_t absRSSI);
+uint64_t encodeBLE(uint8_t *addr, uint8_t absRSSI);
+
+class ZPSModule : public SinglePortModule, private concurrency::OSThread
+{
+    /// The id of the last packet we sent, to allow us to cancel it if we make something fresher
+    PacketId prevPacketId = 0;
+
+    /// We limit our broadcasts to a max rate
+    uint32_t lastSend = 0;
+
+    bool wantBSS = true;
+    bool haveBSS = false;
+
+    bool wantBLE = true;
+    bool haveBLE = false;
+
+  public:
+    /** Constructor
+     * name is for debugging output
+     */
+    ZPSModule();
+
+    /**
+     * Send our radio environment data into the mesh
+     */
+    void sendDataPacket(NodeNum dest = NODENUM_BROADCAST, bool wantReplies = false);
+
+  protected:
+    /** Called to handle a particular incoming message
+    @return true if you've guaranteed you've handled this message and no other handlers should be considered for it
+    */
+    virtual ProcessMessage handleReceived(const meshtastic_MeshPacket &mp);
+
+    /** Messages can be received that have the want_response bit set.  If set, this callback will be invoked
+     * so that subclasses can (optionally) send a response back to the original sender.  */
+    virtual meshtastic_MeshPacket *allocReply();
+
+    /** Does our periodic broadcast */
+    virtual int32_t runOnce();
+
+  private:
+    // outbound data packet staging buffer and record counter
+    uint64_t netData[ZPS_DATAPKT_MAXITEMS + 2] = {0};
+    uint8_t netRecs = 0;
+
+    // mini state machine to alternate between BSS(Wifi) and BLE scanning
+    SCANSTATE scanState = SCAN_NONE;
+
+    inline void outBufAdd(uint64_t netBytes)
+    {
+        // If this is the first record, initialize the header with the current time and reset the record count.
+        if (!netRecs) {
+            netData[0] = getTime();
+            netData[1] = 0;
+        }
+
+        // push to buffer and update counter
+        if (netRecs < ZPS_DATAPKT_MAXITEMS)
+            netData[2 + (netRecs++)] = netBytes;
+    }
+};
+
+extern ZPSModule *zpsModule;
@@ -322,8 +322,8 @@ bool connectPubSub(const PubSubConfig &config, PubSubClient &pubSub, Client &cli
    pubSub.setClient(client);
    pubSub.setServer(config.serverAddr.c_str(), config.serverPort);

-    LOG_INFO("Connecting directly to MQTT server %s, port: %d, username: %s, password: %s", config.serverAddr.c_str(),
-             config.serverPort, config.mqttUsername, config.mqttPassword);
+    LOG_INFO("Connecting directly to MQTT server %s, port: %d, username: %s, password: ***", config.serverAddr.c_str(),
+             config.serverPort, config.mqttUsername);

    // Generate node ID from nodenum for client identification
    std::string nodeId = nodeDB->getNodeId();
@@ -231,7 +231,9 @@ void cpuDeepSleep(uint32_t msecToWake)
 #if SOC_RTCIO_HOLD_SUPPORTED && SOC_PM_SUPPORT_EXT_WAKEUP
    uint64_t gpioMask = (1ULL << (config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN));
 #endif
-
+#ifdef ALT_BUTTON_WAKE
+    gpioMask |= (1ULL << BUTTON_PIN_ALT);
+#endif
 #ifdef BUTTON_NEED_PULLUP
    gpio_pullup_en((gpio_num_t)BUTTON_PIN);
 #endif
@@ -23,5 +23,6 @@ void lateInitVariant()
    cfg.i2s.bits = BIT_LENGTH_16BITS;
    cfg.i2s.rate = RATE_44K;
    board.begin(cfg);
+    board.setVolume(75); // 75% volume
 }
 #endif
@@ -0,0 +1,11 @@
+.globl HardFault_Handler
+.syntax unified
+.thumb
+
+.type HardFault_Handler, %function
+HardFault_Handler:
+tst lr, #4
+ite eq
+mrseq r0, msp
+mrsne r0, psp
+b HardFault_Handler_C
@@ -1,5 +1,6 @@
 #include "RTC.h"
 #include "configuration.h"
+#include <stdarg.h>
 #include <stm32wle5xx.h>
 #include <stm32wlxx_hal.h>

@@ -53,4 +54,99 @@ extern "C" void __wrap__tzset_unlocked_r(struct _reent *reent_ptr)
 {
    return;
 }
-#endif
+#endif
+
+// Taken from https://interrupt.memfault.com/blog/cortex-m-hardfault-debug
+typedef struct __attribute__((packed)) ContextStateFrame {
+    uint32_t r0;
+    uint32_t r1;
+    uint32_t r2;
+    uint32_t r3;
+    uint32_t r12;
+    uint32_t lr;
+    uint32_t return_address;
+    uint32_t xpsr;
+} sContextStateFrame;
+
+// NOTE: If you are using CMSIS, the registers can also be
+// accessed through CoreDebug->DHCSR & CoreDebug_DHCSR_C_DEBUGEN_Msk
+#define HALT_IF_DEBUGGING()                                                                                                      \
+    do {                                                                                                                         \
+        if ((*(volatile uint32_t *)0xE000EDF0) & (1 << 0)) {                                                                     \
+            __asm("bkpt 1");                                                                                                     \
+        }                                                                                                                        \
+    } while (0)
+
+static char hardfault_message_buffer[256];
+
+// printf directly using srcwrapper's debug UART function.
+static void debug_printf(const char *format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    int length = vsnprintf(hardfault_message_buffer, sizeof(hardfault_message_buffer), format, args);
+    va_end(args);
+
+    if (length < 0)
+        return;
+    uart_debug_write((uint8_t *)hardfault_message_buffer, min((unsigned int)length, sizeof(hardfault_message_buffer) - 1));
+}
+
+// N picked by guessing
+#define DOT_TIME 1200000
+static void dot()
+{
+    digitalWrite(LED_POWER, LED_STATE_ON);
+    for (volatile int i = 0; i < DOT_TIME; i++) { /* busy wait */
+    }
+    digitalWrite(LED_POWER, LED_STATE_OFF);
+    for (volatile int i = 0; i < DOT_TIME; i++) { /* busy wait */
+    }
+}
+
+static void dash()
+{
+    digitalWrite(LED_POWER, LED_STATE_ON);
+    for (volatile int i = 0; i < (DOT_TIME * 3); i++) { /* busy wait */
+    }
+    digitalWrite(LED_POWER, LED_STATE_OFF);
+    for (volatile int i = 0; i < DOT_TIME; i++) { /* busy wait */
+    }
+}
+
+static void space()
+{
+    for (volatile int i = 0; i < (DOT_TIME * 3); i++) { /* busy wait */
+    }
+}
+
+// Disable optimizations for this function so "frame" argument
+// does not get optimized away
+extern "C" __attribute__((optimize("O0"))) void HardFault_Handler_C(sContextStateFrame *frame)
+{
+    debug_printf("HardFault!\r\n");
+    debug_printf("r0: %08x\r\n", frame->r0);
+    debug_printf("r1: %08x\r\n", frame->r1);
+    debug_printf("r2: %08x\r\n", frame->r2);
+    debug_printf("r3: %08x\r\n", frame->r3);
+    debug_printf("r12: %08x\r\n", frame->r12);
+    debug_printf("lr: %08x\r\n", frame->lr);
+    debug_printf("pc[return address]: %08x\r\n", frame->return_address);
+    debug_printf("xpsr: %08x\r\n", frame->xpsr);
+
+    HALT_IF_DEBUGGING();
+
+    // blink SOS forever
+    while (1) {
+        dot();
+        dot();
+        dot();
+        dash();
+        dash();
+        dash();
+        dot();
+        dot();
+        dot();
+        space();
+    }
+}
@@ -14,6 +14,23 @@ class MockMeshService : public MeshService

 static MockMeshService *mockMeshService;

+// Test shim to expose protected radio parameters set by applyModemConfig()
+class TestableRadioInterface : public RadioInterface
+{
+  public:
+    TestableRadioInterface() : RadioInterface() {}
+    uint8_t getCr() const { return cr; }
+    uint8_t getSf() const { return sf; }
+    float getBw() const { return bw; }
+
+    // Override reconfigure to call the base which invokes applyModemConfig()
+    bool reconfigure() override { return RadioInterface::reconfigure(); }
+
+    // Stubs for pure virtual methods required by RadioInterface
+    uint32_t getPacketTime(uint32_t, bool) override { return 0; }
+    ErrorCode send(meshtastic_MeshPacket *p) override { return ERRNO_OK; }
+};
+
 static void test_bwCodeToKHz_specialMappings()
 {
    TEST_ASSERT_FLOAT_WITHIN(0.0001f, 31.25f, bwCodeToKHz(31));
@@ -100,13 +117,87 @@ static void test_clampConfigLora_validPresetUnchanged()
    TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST, cfg.modem_preset);
 }

+// -----------------------------------------------------------------------
+// applyModemConfig() coding rate tests (via reconfigure)
+// -----------------------------------------------------------------------
+
+static TestableRadioInterface *testRadio;
+
+// After fresh flash: coding_rate=0, use_preset=true, modem_preset=LONG_FAST
+// CR should come from the preset (5 for LONG_FAST), not from the zero default.
+static void test_applyModemConfig_freshFlashCodingRateNotZero()
+{
+    config.lora = meshtastic_Config_LoRaConfig_init_zero;
+    config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_US;
+    config.lora.use_preset = true;
+    config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
+    // coding_rate is 0 (default after init_zero, same as fresh flash)
+
+    testRadio->reconfigure();
+
+    // LONG_FAST preset has cr=5; must never be 0
+    TEST_ASSERT_EQUAL_UINT8(5, testRadio->getCr());
+    TEST_ASSERT_EQUAL_UINT8(11, testRadio->getSf());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 250.0f, testRadio->getBw());
+}
+
+// When coding_rate matches the preset exactly, should still use the preset value
+static void test_applyModemConfig_codingRateMatchesPreset()
+{
+    config.lora = meshtastic_Config_LoRaConfig_init_zero;
+    config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_US;
+    config.lora.use_preset = true;
+    config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW;
+    config.lora.coding_rate = 8; // LONG_SLOW default is cr=8
+
+    testRadio->reconfigure();
+
+    TEST_ASSERT_EQUAL_UINT8(8, testRadio->getCr());
+}
+
+// Custom CR higher than preset should be used
+static void test_applyModemConfig_customCodingRateHigherThanPreset()
+{
+    config.lora = meshtastic_Config_LoRaConfig_init_zero;
+    config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_US;
+    config.lora.use_preset = true;
+    config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
+    config.lora.coding_rate = 7; // LONG_FAST preset has cr=5, 7 > 5
+
+    testRadio->reconfigure();
+
+    TEST_ASSERT_EQUAL_UINT8(7, testRadio->getCr());
+}
+
+// Custom CR lower than preset: preset wins (higher is more robust)
+static void test_applyModemConfig_customCodingRateLowerThanPreset()
+{
+    config.lora = meshtastic_Config_LoRaConfig_init_zero;
+    config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_US;
+    config.lora.use_preset = true;
+    config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW;
+    config.lora.coding_rate = 5; // LONG_SLOW preset has cr=8, 5 < 8
+
+    testRadio->reconfigure();
+
+    TEST_ASSERT_EQUAL_UINT8(8, testRadio->getCr());
+}
+
 void setUp(void)
 {
    mockMeshService = new MockMeshService();
    service = mockMeshService;
+
+    // RadioInterface computes slotTimeMsec during construction and expects myRegion to be valid.
+    config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_US;
+    initRegion();
+
+    testRadio = new TestableRadioInterface();
 }
 void tearDown(void)
 {
+    delete testRadio;
+    testRadio = nullptr;
    service = nullptr;
    delete mockMeshService;
    mockMeshService = nullptr;
@@ -128,6 +219,10 @@ void setup()
    RUN_TEST(test_validateConfigLora_rejectsInvalidPresetForRegion);
    RUN_TEST(test_clampConfigLora_invalidPresetClampedToDefault);
    RUN_TEST(test_clampConfigLora_validPresetUnchanged);
+    RUN_TEST(test_applyModemConfig_freshFlashCodingRateNotZero);
+    RUN_TEST(test_applyModemConfig_codingRateMatchesPreset);
+    RUN_TEST(test_applyModemConfig_customCodingRateHigherThanPreset);
+    RUN_TEST(test_applyModemConfig_customCodingRateLowerThanPreset);
    exit(UNITY_END());
 }

@@ -39,7 +39,6 @@ build_flags =
  -Wall
  -Wextra
  -Isrc/platform/esp32
-  -include mbedtls/error.h
  -std=gnu++17
  -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG
  -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
@@ -68,7 +67,7 @@ lib_deps =
  ${environmental_extra.lib_deps}
  ${radiolib_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-esp32_https_server packageName=https://github.com/meshtastic/esp32_https_server gitBranch=master
-  https://github.com/meshtastic/esp32_https_server/archive/b78f12c86ea65c3ca08968840ff554ff7ed69b60.zip
+  https://github.com/meshtastic/esp32_https_server/archive/0c71f380390ad483ff134ad938e07f6cf1226c5b.zip
  # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
  h2zero/NimBLE-Arduino@1.4.3
  # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
@@ -9,11 +9,11 @@ void earlyInitVariant()
    io.pinMode(PCA_PIN_EINK_EN, OUTPUT);
    io.pinMode(PCA_PIN_POWER_EN, OUTPUT);
    io.pinMode(PCA_LED_POWER, OUTPUT);
-    io.pinMode(PCA_LED_USER, OUTPUT);
+    io.pinMode(PCA_LED_NOTIFICATION, OUTPUT);
    io.pinMode(PCA_LED_ENABLE, OUTPUT);

    io.digitalWrite(PCA_PIN_POWER_EN, HIGH);
-    io.digitalWrite(PCA_LED_USER, LOW);
+    io.digitalWrite(PCA_LED_NOTIFICATION, LOW);
    io.digitalWrite(PCA_LED_ENABLE, LOW);
 }

@@ -8,9 +8,9 @@

 // LED
 // Both of these are on the GPIO expander
-#define PCA_LED_USER 1   // the Blue LED
-#define PCA_LED_ENABLE 2 // the power supply to the LEDs, in an OR arrangement with VBUS power
-#define PCA_LED_POWER 3  // the Red LED? Seems to have hardware logic to blink when USB is plugged in.
+#define PCA_LED_NOTIFICATION 1 // the Blue LED
+#define PCA_LED_ENABLE 2       // the power supply to the LEDs, in an OR arrangement with VBUS power
+#define PCA_LED_POWER 3        // the Red LED? Seems to have hardware logic to blink when USB is plugged in.
 #define POWER_LED_HARDWARE_BLINKS_WHILE_CHARGING

 // USB_CHECK
@@ -18,7 +18,7 @@
 #define BATTERY_PIN 8
 #define ADC_CHANNEL ADC1_GPIO8_CHANNEL

-#define ADC_MULTIPLIER 2.11 // 2.0 + 10% for correction of display undervoltage.
+#define ADC_MULTIPLIER 2.0 // 2.0 + 10% for correction of display undervoltage.

 #define PIN_BUZZER 9

@@ -86,6 +86,7 @@

 #define BUTTON_PIN PIN_BUTTON1
 #define BUTTON_PIN_ALT PIN_BUTTON2
+#define ALT_BUTTON_WAKE

 #define SERIAL_PRINT_PORT 0
 #endif
@@ -84,6 +84,7 @@ custom_meshtastic_images = crowpanel_2_4.svg, crowpanel_2_8.svg
 custom_meshtastic_tags = Elecrow
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 16MB
+custom_meshtastic_has_mui = true

 extends = crowpanel_small_esp32s3_base
 build_flags =
@@ -119,6 +120,7 @@ custom_meshtastic_images = crowpanel_3_5.svg
 custom_meshtastic_tags = Elecrow
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 16MB
+custom_meshtastic_has_mui = true

 extends = crowpanel_small_esp32s3_base
 board_level = pr
@@ -158,6 +160,7 @@ custom_meshtastic_images = crowpanel_5_0.svg, crowpanel_7_0.svg
 custom_meshtastic_tags = Elecrow
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 16MB
+custom_meshtastic_has_mui = true

 extends = crowpanel_large_esp32s3_base
 build_flags =
@@ -22,6 +22,7 @@ custom_meshtastic_images = heltec_v4.svg
 custom_meshtastic_tags = Heltec
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 16MB
+custom_meshtastic_has_mui = true

 extends = heltec_v4_base
 build_flags = 
@@ -9,6 +9,7 @@ custom_meshtastic_images = heltec-vision-master-e213.svg
 custom_meshtastic_tags = Heltec
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 8MB
+custom_meshtastic_has_ink_hud = true

 extends = esp32s3_base
 board = heltec_vision_master_e213
@@ -10,6 +10,7 @@ custom_meshtastic_images = heltec-vision-master-e290.svg
 custom_meshtastic_tags = Heltec
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 8MB
+custom_meshtastic_has_ink_hud = true

 extends = esp32s3_base
 board = heltec_vision_master_e290
@@ -9,6 +9,7 @@ custom_meshtastic_display_name = Heltec Wireless Paper
 custom_meshtastic_images = heltec-wireless-paper.svg
 custom_meshtastic_tags = Heltec
 custom_meshtastic_partition_scheme = 8MB
+custom_meshtastic_has_ink_hud = true

 extends = esp32s3_base
 board = heltec_wifi_lora_32_V3
@@ -12,6 +12,7 @@ build_flags = ${esp32s3_base.build_flags}
  -D CONFIG_ARDUHAL_ESP_LOG
  -D CONFIG_ARDUHAL_LOG_COLORS=1
  -D CONFIG_DISABLE_HAL_LOCKS=1
+  -D MESHTASTIC_EXCLUDE_SCREEN=1
  -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
  -D MESHTASTIC_EXCLUDE_INPUTBROKER=1
  -D MESHTASTIC_EXCLUDE_BLUETOOTH=1
@@ -31,7 +32,10 @@ build_flags = ${esp32s3_base.build_flags}
  -D HAS_SCREEN=0
  -D HAS_TFT=1
  -D USE_PIN_BUZZER
-  -D RAM_SIZE=1024
+  -D MAP_TILES_GREY ; required for 2MB PSRAM
+  -D RAM_SIZE=1432
+  -D STBI_ARENA_SIZE=450000
+  -D LV_CACHE_DEF_SIZE=0
  -D LGFX_DRIVER_TEMPLATE
  -D LGFX_DRIVER=LGFX_GENERIC
  -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_GENERIC.h\"
@@ -1,5 +1,5 @@
 [env:mini-epaper-s3]
-;custom_meshtastic_hw_model =
+custom_meshtastic_hw_model = 125
 custom_meshtastic_hw_model_slug = MINI_EPAPER_S3
 custom_meshtastic_architecture = esp32-s3
 custom_meshtastic_actively_supported = true
@@ -8,6 +8,7 @@ custom_meshtastic_display_name = LILYGO Mini ePaper S3 E-Ink
 custom_meshtastic_images = mini-epaper-s3.svg
 custom_meshtastic_tags = LilyGo
 custom_meshtastic_requires_dfu = no
+custom_meshtastic_has_mui = false

 extends = esp32s3_base
 board = mini-epaper-s3
@@ -6,6 +6,7 @@ custom_meshtastic_actively_supported = true
 custom_meshtastic_support_level = 3
 custom_meshtastic_display_name = Pi Computer S3
 custom_meshtastic_partition_scheme = 8MB
+custom_meshtastic_has_mui = true

 extends = esp32s3_base
 board = bpi_picow_esp32_s3
@@ -9,6 +9,7 @@ custom_meshtastic_images = rak_3312.svg
 custom_meshtastic_tags = RAK
 custom_meshtastic_requires_dfu = false
 custom_meshtastic_partition_scheme = 16MB
+custom_meshtastic_has_mui = false

 extends = esp32s3_base
 board = wiscore_rak3312
@@ -20,6 +20,7 @@ custom_meshtastic_display_name = RAK WisMesh Tap V2
 custom_meshtastic_images = rak-wismesh-tap-v2.svg
 custom_meshtastic_tags = RAK
 custom_meshtastic_partition_scheme = 8MB
+custom_meshtastic_has_mui = true

 extends = esp32s3_base
 board = wiscore_rak3312
@@ -43,6 +44,7 @@ extends = env:rak_wismesh_tap_v2

 build_flags =
  ${env:rak_wismesh_tap_v2.build_flags}
+  -D MESHTASTIC_EXCLUDE_WEBSERVER=1
  -D CONFIG_ARDUHAL_ESP_LOG
  -D CONFIG_ARDUHAL_LOG_COLORS=1
  -D CONFIG_DISABLE_HAL_LOCKS=1
@@ -9,7 +9,7 @@ custom_meshtastic_display_name = Seeed SenseCAP Indicator
 custom_meshtastic_images = seeed-sensecap-indicator.svg
 custom_meshtastic_tags = Seeed
 custom_meshtastic_partition_scheme = 8MB
- = true
+custom_meshtastic_has_mui = true

 extends = esp32s3_base
 platform_packages =
@@ -8,6 +8,7 @@ custom_meshtastic_support_level = 1
 custom_meshtastic_display_name = LILYGO T-Beam 1W
 custom_meshtastic_images = tbeam-1w.svg
 custom_meshtastic_tags = LilyGo
+custom_meshtastic_has_mui = false

 extends = esp32s3_base
 board = t-beam-1w
@@ -9,6 +9,7 @@ custom_meshtastic_images = tdeck_pro.svg
 custom_meshtastic_tags = LilyGo
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 16MB
+custom_meshtastic_has_mui = false

 extends = esp32s3_base
 board = t-deck-pro
@@ -10,6 +10,7 @@ custom_meshtastic_images = t-deck.svg
 custom_meshtastic_tags = LilyGo
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 16MB
+custom_meshtastic_has_mui = true

 extends = esp32s3_base
 board = t-deck
@@ -1,19 +0,0 @@
-#ifndef Pins_Arduino_h
-#define Pins_Arduino_h
-
-#include <stdint.h>
-
-#define USB_VID 0x303a
-#define USB_PID 0x1001
-
-// used for keyboard, battery gauge, charger and haptic driver
-static const uint8_t SDA = 5;
-static const uint8_t SCL = 6;
-
-// Default SPI will be mapped to Radio
-static const uint8_t SS = 7;
-static const uint8_t MOSI = 17;
-static const uint8_t MISO = 8;
-static const uint8_t SCK = 18;
-
-#endif /* Pins_Arduino_h */
@@ -1,81 +0,0 @@
-; LilyGo T-Display S3 Pro LR1121
-[env:tdisplay-s3-pro]
-custom_meshtastic_hw_model = 126
-custom_meshtastic_hw_model_slug = T_DISPLAY_S3_PRO
-custom_meshtastic_architecture = esp32-s3
-custom_meshtastic_actively_supported = true
-custom_meshtastic_support_level = 1
-custom_meshtastic_display_name = LILYGO T-Display S3 Pro
-custom_meshtastic_images = lilygo-tdisplay-s3-pro.svg
-custom_meshtastic_tags = LilyGo
-custom_meshtastic_requires_dfu = true
-custom_meshtastic_partition_scheme = 16MB
-
-extends = esp32s3_base
-board = t-display-s3
-board_check = true
-board_build.partitions = default_16MB.csv
-upload_protocol = esptool
-
-build_src_filter =
-  ${esp32s3_base.build_src_filter}
-  +<../variants/esp32s3/tdisplay-s3pro>
-
-build_flags = ${esp32s3_base.build_flags} 
-  -I variants/esp32s3/tdisplay-s3pro
-  -D T_DISPLAY_S3_PRO 
-  -D BOARD_HAS_PSRAM
-  -D HAS_SDCARD
-
-lib_deps = ${esp32s3_base.lib_deps}
-  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.19
-  # renovate: datasource=custom.pio depName=ESP8266Audio packageName=earlephilhower/library/ESP8266Audio
-  earlephilhower/ESP8266Audio@1.9.9
-  # renovate: datasource=custom.pio depName=ESP8266SAM packageName=earlephilhower/library/ESP8266SAM
-  earlephilhower/ESP8266SAM@1.1.0
-  # renovate: datasource=custom.pio depName=SensorLib packageName=lewisxhe/library/SensorLib
-  lewisxhe/SensorLib@0.3.4
-
-[env:tdisplay-s3-pro-tft]
-board_level = extra
-extends = env:tdisplay-s3-pro
-build_flags =
-  ${env:tdisplay-s3-pro.build_flags}
-  -D CONFIG_DISABLE_HAL_LOCKS=1
-  -D INPUTDRIVER_ENCODER_TYPE=2
-  -D INPUTDRIVER_ENCODER_LEFT=12
-  -D INPUTDRIVER_ENCODER_RIGHT=16
-  -D INPUTDRIVER_ENCODER_BTN=0
-  -D HAS_SCREEN=1
-  -D HAS_TFT=1
-  -D USE_I2S_BUZZER
-  -D RAM_SIZE=5120
-  -D LV_LVGL_H_INCLUDE_SIMPLE
-  -D LV_CONF_INCLUDE_SIMPLE
-  -D LV_COMP_CONF_INCLUDE_SIMPLE
-  -D LV_USE_SYSMON=0
-  -D LV_USE_PROFILER=0
-  -D LV_USE_PERF_MONITOR=0
-  -D LV_USE_MEM_MONITOR=0
-  -D LV_USE_LOG=0
-  -D USE_LOG_DEBUG
-  -D LOG_DEBUG_INC=\"DebugConfiguration.h\"
-  -D RADIOLIB_SPI_PARANOID=0
-  -D LGFX_SCREEN_WIDTH=222
-  -D LGFX_SCREEN_HEIGHT=480
-  -D LGFX_BUFSIZE=617460
-  -D DISPLAY_SIZE=480x222 ; landscape mode
-  -D DISPLAY_SET_RESOLUTION
-  -D LGFX_DRIVER=LGFX_TDISPLAY_S3PRO
-  -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_TDISPLAY_S3PRO.h\"
-;  -D LVGL_DRIVER=LVGL_TDISPLAY_S3PRO
-;  -D LV_USE_ST7796=1
-  -D VIEW_480x222
-  -D CUSTOM_TOUCH_DRIVER
-  -D USE_PACKET_API
-  -D MAP_FULL_REDRAW
-
-lib_deps =
-  ${env:tdisplay-s3-pro.lib_deps}
-  ${device-ui_base.lib_deps}
@@ -1,11 +0,0 @@
-#include "RadioLib.h"
-
-static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC};
-
-static const Module::RfSwitchMode_t rfswitch_table[] = {
-    // mode                  DIO5  DIO6
-    {LR11x0::MODE_STBY, {LOW, LOW}},  {LR11x0::MODE_RX, {HIGH, LOW}},
-    {LR11x0::MODE_TX, {LOW, HIGH}},   {LR11x0::MODE_TX_HP, {LOW, HIGH}},
-    {LR11x0::MODE_TX_HF, {LOW, LOW}}, {LR11x0::MODE_GNSS, {LOW, LOW}},
-    {LR11x0::MODE_WIFI, {LOW, LOW}},  END_OF_MODE_TABLE,
-};
@@ -1,57 +0,0 @@
-#include "variant.h"
-#include "Arduino.h"
-#include "configuration.h"
-
-void earlyInitVariant()
-{
-    pinMode(LORA_CS, OUTPUT);
-    digitalWrite(LORA_CS, HIGH);
-    pinMode(SDCARD_CS, OUTPUT);
-    digitalWrite(SDCARD_CS, HIGH);
-    pinMode(TFT_CS, OUTPUT);
-    digitalWrite(TFT_CS, HIGH);
-    pinMode(MAX98357A_EN, OUTPUT);
-    digitalWrite(MAX98357A_EN, HIGH);
-}
-
-#ifdef HAS_CST226SE // only for BaseUI
-
-#include "TouchDrvCSTXXX.hpp"
-#include "input/TouchScreenImpl1.h"
-#include <Wire.h>
-
-TouchDrvCSTXXX tsPanel;
-static constexpr uint8_t PossibleAddresses[2] = {CST328_ADDR, CST226SE_ADDR_ALT};
-uint8_t i2cAddress = 0;
-
-bool readTouch(int16_t *x, int16_t *y)
-{
-    int16_t x_array[1], y_array[1];
-    uint8_t touched = tsPanel.getPoint(x_array, y_array, 1);
-    if (touched > 0) {
-        *y = x_array[0];
-        *x = (TFT_WIDTH - y_array[0]);
-        // Check bounds
-        if (*x < 0 || *x >= TFT_WIDTH || *y < 0 || *y >= TFT_HEIGHT) {
-            return false;
-        }
-        return true; // Valid touch detected
-    }
-    return false; // No valid touch data
-}
-
-void lateInitVariant()
-{
-    tsPanel.setTouchDrvModel(TouchDrv_CST226);
-    for (uint8_t addr : PossibleAddresses) {
-        if (tsPanel.begin(Wire, addr, I2C_SDA, I2C_SCL)) {
-            i2cAddress = addr;
-            LOG_DEBUG("CST226SE init OK at address 0x%02X", addr);
-            touchScreenImpl1 = new TouchScreenImpl1(TFT_WIDTH, TFT_HEIGHT, readTouch);
-            touchScreenImpl1->init();
-            return;
-        }
-    }
-    LOG_ERROR("CST226SE init failed at all known addresses");
-}
-#endif
@@ -1,126 +0,0 @@
-// ST7796 TFT LCD
-#define TFT_CS 39
-#define ST7796_CS TFT_CS
-#define ST7796_RS 9     // DC
-#define ST7796_SDA MOSI // MOSI
-#define ST7796_SCK SCK
-#define ST7796_RESET -1
-#define ST7796_MISO MISO
-#define ST7796_BUSY -1
-#define ST7796_BL 48
-#define ST7796_SPI_HOST SPI2_HOST
-#define TFT_BL 48
-#define SPI_FREQUENCY 75000000
-#define SPI_READ_FREQUENCY 16000000
-#define TFT_HEIGHT 480
-#define TFT_WIDTH 222
-#define TFT_OFFSET_X 49
-#define TFT_OFFSET_Y 0
-#define TFT_OFFSET_ROTATION 3
-#define SCREEN_ROTATE
-#define SCREEN_TRANSITION_FRAMERATE 5
-#define BRIGHTNESS_DEFAULT 130 // Medium Low Brightness
-#define USE_TFTDISPLAY 1
-
-#define I2C_SDA SDA
-#define I2C_SCL SCL
-
-// #define I2C_SDA1
-// #define I2C_SCL1
-
-#define USE_POWERSAVE
-#define SLEEP_TIME 120
-
-#define PIN_POWER_EN 42
-
-// GNSS
-#define GPS_DEFAULT_NOT_PRESENT 1
-
-// PCF85063 RTC Module
-#define PCF85063_RTC 0x51
-
-// SY6970 battery charger
-#define SY6970_ADDR 0x6A
-#define SY6970_INT 21
-#define HAS_PPM 1
-#define XPOWERS_CHIP_SY6970
-
-// MAX98357A PCM amplifier
-#define HAS_I2S
-#define DAC_I2S_BCK 4
-#define DAC_I2S_WS 15
-#define DAC_I2S_DOUT 11
-#define DAC_I2S_MCLK 13 // not used
-#define MAX98357A_EN 41
-
-// ICM20948 motion tracker
-#define ICM20948_ADDRESS 0x28
-#define ICM20948_INT 21
-
-// MP34DT05TRF MEMS mic
-#define MP34DT05TR_LRCLK 1
-#define MP34DT05TR_DATA 2
-#define MP34DT05TR_EN 3
-
-#define BUTTON_PIN 16
-#define BUTTON_NEED_PULLUP
-#define ALT_BUTTON_PIN 12
-#define ALT_BUTTON_ACTIVE_LOW true
-#define ALT_BUTTON_ACTIVE_PULLUP true
-#define PIN_BUTTON3 0
-
-// vibration motor
-#define PIN_VIBRATION 45
-
-// SPI interface SD card slot
-#define SPI_MOSI MOSI
-#define SPI_SCK SCK
-#define SPI_MISO MISO
-#define SPI_CS 14
-#define SDCARD_CS SPI_CS
-#define SD_SPI_FREQUENCY 75000000U
-
-// LoRa
-// #define USE_SX1262
-// #define USE_SX1268
-// #define USE_SX1280
-#define USE_LR1121
-
-#define LORA_SCK 18
-#define LORA_MISO 8
-#define LORA_MOSI 17
-#define LORA_CS 7
-#define LORA_RESET 10
-
-#define LORA_DIO0 -1 // a No connect on the SX1262 module
-#define LORA_DIO1 40 // SX1262 IRQ
-#define LORA_DIO2 46 // SX1262 BUSY
-#define LORA_DIO3    // Not connected on PCB, but internally on the TTGO SX1262, if DIO3 is high the TXCO is enabled
-
-#if defined(USE_SX1262) || defined(USE_SX1268)
-#define SX126X_CS LORA_CS
-#define SX126X_DIO1 LORA_DIO1
-#define SX126X_BUSY LORA_DIO2
-#define SX126X_RESET LORA_RESET
-#define SX126X_DIO2_AS_RF_SWITCH
-#define SX126X_DIO3_TCXO_VOLTAGE 3.0
-#endif
-
-#ifdef USE_SX1280
-#define SX128X_CS LORA_CS
-#define SX128X_DIO1 LORA_DIO1
-#define SX128X_BUSY LORA_DIO2
-#define SX128X_RESET LORA_RESET
-#endif
-
-#ifdef USE_LR1121
-#define LR1121_IRQ_PIN LORA_DIO1
-#define LR1121_NRESET_PIN LORA_RESET
-#define LR1121_BUSY_PIN LORA_DIO2
-#define LR1121_SPI_NSS_PIN LORA_CS
-#define LR1121_SPI_SCK_PIN LORA_SCK
-#define LR1121_SPI_MOSI_PIN LORA_MOSI
-#define LR1121_SPI_MISO_PIN LORA_MISO
-#define LR11X0_DIO3_TCXO_VOLTAGE 3.0
-#define LR11X0_DIO_AS_RF_SWITCH
-#endif
@@ -10,6 +10,7 @@ custom_meshtastic_images = lilygo-tlora-pager.svg
 custom_meshtastic_tags = LilyGo
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 16MB
+custom_meshtastic_has_mui = true

 extends = esp32s3_base
 board = t-deck-pro ; same as T-Deck Pro
@@ -8,6 +8,7 @@ custom_meshtastic_display_name = LILYGO T-LoRa T3-S3 E-Ink
 custom_meshtastic_images = tlora-t3s3-epaper.svg
 custom_meshtastic_tags = LilyGo
 custom_meshtastic_requires_dfu = true
+custom_meshtastic_has_ink_hud = true

 extends = esp32s3_base
 board = tlora-t3s3-v1
@@ -8,6 +8,7 @@ custom_meshtastic_support_level = 1
 custom_meshtastic_display_name = ThinkNode M1
 custom_meshtastic_images = thinknode_m1.svg
 custom_meshtastic_tags = Elecrow
+custom_meshtastic_has_ink_hud = true

 extends = nrf52840_base
 board = ThinkNode-M1
@@ -15,6 +15,7 @@ custom_meshtastic_display_name = Heltec Mesh Pocket
 custom_meshtastic_actively_supported = true
 custom_meshtastic_variant = 5000mAh
 custom_meshtastic_key = heltec_mesh_pocket
+custom_meshtastic_has_ink_hud = true

 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
 build_flags = ${nrf52840_base.build_flags}
@@ -78,6 +79,7 @@ custom_meshtastic_display_name = Heltec Mesh Pocket
 custom_meshtastic_actively_supported = true
 custom_meshtastic_variant = 10000mAh
 custom_meshtastic_key = heltec_mesh_pocket
+custom_meshtastic_has_ink_hud = true

 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
 build_flags = ${nrf52840_base.build_flags}
@@ -7,6 +7,7 @@ custom_meshtastic_support_level = 1
 custom_meshtastic_display_name = Seeed Wio Tracker L1 E-Ink
 custom_meshtastic_images = wio_tracker_l1_eink.svg
 custom_meshtastic_tags = Seeed
+custom_meshtastic_has_ink_hud = true

 board = seeed_wio_tracker_L1
 extends = nrf52840_base
@@ -1,4 +1,15 @@
 [env:t-echo-plus]
+custom_meshtastic_hw_model = 33
+custom_meshtastic_hw_model_slug = T_ECHO_PLUS
+custom_meshtastic_architecture = nrf52840
+custom_meshtastic_actively_supported = true
+custom_meshtastic_support_level = 1
+custom_meshtastic_display_name = LILYGO T-Echo Plus
+custom_meshtastic_images = t-echo_plus.svg
+custom_meshtastic_tags = LilyGo
+custom_meshtastic_requires_dfu = true
+custom_meshtastic_has_ink_hud = true
+
 extends = nrf52840_base
 board = t-echo
 board_level = pr
@@ -8,6 +8,7 @@ custom_meshtastic_support_level = 1
 custom_meshtastic_display_name = LILYGO T-Echo
 custom_meshtastic_images = t-echo.svg
 custom_meshtastic_tags = LilyGo
+custom_meshtastic_has_ink_hud = true

 extends = nrf52840_base
 board = t-echo
@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 7
-build = 21
+build = 22
Author	SHA1	Message	Date
Thomas Göttgens	8b9e06b05f	Merge branch 'develop' into zps-module	2026-04-12 17:19:30 +02:00
Catalin Patulea	288d7a3e7b	Revert "Add include directive for mbedtls error handling in build flags" (#10073 ) This reverts commit `391928ed08`. Since esp32_https_server commit e2c9f98, this is no longer necessary. Also, the esp32-common.ini '-include mbedtls/error.h' causes a build error under IDF v5 (https://github.com/meshtastic/firmware/pull/9122#issuecomment-4185767085): <command-line>: fatal error: mbedtls/error.h: No such file or directory so this change fixes that error.	2026-04-11 06:35:42 -05:00
Catalin Patulea	4990bf51e3	Delete PointerQueue::dequeuePtrFromISR, unused since commit `db766f1` (#99 ). (#10090 )	2026-04-10 16:20:25 -05:00
Tom	b2c8cbb78d	Enhance traffic management by adjusting position update interval and refining hop exhaustion logic based on channel congestion (#9921 )	2026-04-10 10:53:04 -05:00
Jonathan Bennett	8061f83704	Modify log output to show milliseconds (#10115 ) Updated timestamp format to include milliseconds.	2026-04-10 07:21:24 -05:00
Tom	a3b49b9028	Add powerlimits to reconfigured radio settings as well as init settings. (#10025 ) * Add powerlimits to reconfigured radio settings as well as init settings. * Refactor preamble length handling for wide LoRa configurations * Moved the preamble setting to the main class and made the references static	2026-04-09 16:18:05 -05:00
Ben Meadors	17945884a5	Merge remote-tracking branch 'origin/master' into develop	2026-04-09 06:21:33 -05:00
renovate[bot]	7fdee353b5	Update meshtastic-esp32_https_server digest to 0c71f38 (#10081 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-04-08 21:16:56 -05:00
Ben Meadors	1116f06139	Merge remote-tracking branch 'origin/master' into develop	2026-04-08 13:37:25 -05:00
github-actions[bot]andthebentern	16cf962351	Update protobufs (#10104 ) Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>	2026-04-08 13:36:09 -05:00
Ben Meadors	12f0a74557	Sync up custom metadata	2026-04-07 08:43:29 -05:00
Jonathan Bennett	2dd9c5eef2	Fix Linux Input enable logic (#10093 )	2026-04-06 15:02:38 -05:00
github-actions[bot]andthebentern	98963218ad	Automated version bumps (#10092 ) Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>	2026-04-06 13:34:01 -05:00
github-actions[bot]andvidplace7	6628c9e66e	Upgrade trunk (#10091 ) Co-authored-by: vidplace7 <1779290+vidplace7@users.noreply.github.com>	2026-04-06 07:51:37 -05:00
github-actions[bot]andthebentern	c728cfdaf4	Automated version bumps (#10092 ) Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>	2026-04-06 06:39:53 -05:00
Austin	d96770007d	meshtasticd: Add configs for luckfox-lyra-zero-w (mPWRD-OS) (#10085 )	2026-04-05 15:23:52 -05:00
Patrickschell609 Patrickschell609 Claude Opus 4.6	9322bcdb21	fix: redact MQTT password from log output (#10064 ) MQTT password was logged in cleartext via LOG_INFO when connecting to the broker, exposing credentials to anyone with log access. Replace the password format specifier with a static mask. Co-authored-by: Patrickschell609 <patrickschell609@users.noreply.github.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>	2026-04-05 07:54:51 -05:00
Ben Meadors	1370b234eb	Add build flag to exclude web server in MUI build for Wismesh Tap V2	2026-04-05 07:48:24 -05:00
Ben Meadors	9ba44bfbfb	Set T-LoRA pager audio board volume to 75%	2026-04-04 20:05:22 -05:00
oscgonfer Copilot Ben Meadors	2f19a1d7a4	Consolidate SHTs into one class (#9859 ) * Consolidate SHTs into one class * Remove separate SHT imports * Create one single SHTXX sensor type * Let the SHTXXSensor class handle variant detection * Minor logging improvements * Add functions to set accuracy on SHT3X and SHT4X * Fix variable init in constructor * Add bus to SHT sensor init * Update src/modules/Telemetry/Sensor/SHTXXSensor.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/modules/Telemetry/Sensor/SHTXXSensor.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Fix accuracy conditions on SHTXX Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Merge upstream * Add SHT2X detection on 0x40 * Read second part of SHT2X serial number --------- Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2026-04-04 06:51:15 -05:00
github-actions[bot]andfifieldt	71c8143f72	Update protobufs (#10074 ) Co-authored-by: fifieldt <1287116+fifieldt@users.noreply.github.com>	2026-04-04 13:58:23 +11:00
Ben MeadorsandCopilot	222d3e6b62	Fix zero CR and add unit tests for applyModemConfig coding rate behavior (#10070 ) * Fix zero CR and add unit tests for applyModemConfig coding rate behavior * Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * fix: initialize region configuration in setUp for RadioInterface tests --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2026-04-04 08:27:39 +11:00
Chloe Bethel	2e6519bb98	Add a hardfault handler so it's more obvious when STM32 crashes. (#10071 ) * Add hardfault handler so it's more obvious when STM32 crashes. * thanks copilot	2026-04-03 14:50:39 +01:00
github-actions[bot]andvidplace7	934c3fa8be	Upgrade trunk (#10047 ) Co-authored-by: vidplace7 <1779290+vidplace7@users.noreply.github.com>	2026-04-03 06:39:53 -05:00
Patrickschell609 Patrickschell609 Claude Opus 4.6 Ben Meadors	726d539174	fix: prevent division by zero in wind sensor averaging (#10059 ) SerialModule's weather station parser divides by velCount and dirCount to compute wind speed/direction averages. Both counters are only incremented when their respective sensor readings arrive, but the division runs whenever gotwind is true (set by EITHER reading) and the averaging interval has elapsed. If only WindDir arrives without WindSpeed (or vice versa), or if the timer fires before any readings accumulate, the division produces undefined behavior (floating-point divide by zero on embedded = NaN or hardware fault depending on platform). Fix: add velCount > 0 && dirCount > 0 guard to the averaging block. Co-authored-by: Patrickschell609 <patrickschell609@users.noreply.github.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>	2026-04-03 06:07:59 -05:00
notmasteryet Copilot Ben Meadors	e7ee4bea18	Fix TFTDisplay::display to align pixels at 32-bit boundary (#9956 ) * Fix TFTDisplay partial update: align spans to 32-bit boundary for GDMA The device, such as esp32c6, require 32-bit alignment for the data. The patch aligns start and end of the update pixels buffer. * Update src/graphics/TFTDisplay.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>	2026-04-02 20:57:19 -05:00
Kittiwut Khongkaeo	7f0cd70c07	Align 920–925 MHz limits as per NBTC in Thailand (27 dBm, 10% duty cycle) (#9827 )	2026-04-03 08:27:36 +11:00
renovate[bot]	d5fe7dc9e6	Update meshtastic/device-ui digest to dfdcf00 (#10050 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-04-02 06:34:31 -05:00
Jonathan Bennett	98efb25a0c	Thinknode_m5 minor fixes (#10049 )	2026-04-01 21:13:16 -05:00
ManuelandBen Meadors	8dc3c0541b	feat: Mesh-tab wifi map + exclude screen fix (#10038 ) * fix MESHTASTIC_EXCLUDE_SCREEN * mesh-tab map constraints (2 MB PSRAM) * point MUI commit to the related PR --------- Co-authored-by: Ben Meadors <benmmeadors@gmail.com>	2026-04-01 08:03:34 -05:00
github-actions[bot]andvidplace7	fc6c89abeb	Upgrade trunk (#10041 ) Co-authored-by: vidplace7 <1779290+vidplace7@users.noreply.github.com>	2026-03-31 14:36:29 -05:00
renovate[bot]	c7feef00c0	Update meshtastic/device-ui digest to 7b1485b (#10044 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-03-31 14:07:11 -05:00
Ethac.chenandBen Meadors	8c905427a1	Fix rak_wismeshtag low‑voltage reboot hang after App configuration (#9897 ) * Fix TAG low‑voltage reboot hang after App configuration * nRF52: Move low-VDD System OFF logic to variant hook * Addressed review * serialize SAADC access with shared mutex for VDD and battery reads * raise LPCOMP wake threshold to ensure rising-edge wake * Trunk fmt --------- Co-authored-by: Ben Meadors <benmmeadors@gmail.com>	2026-03-31 07:37:46 -05:00
Austin	90befeeeb1	Add timeout to PPA uploads (#9989 ) Don't allow dput to run for more than 15 minutes (successful runs take about ~8 minutes)	2026-03-31 07:36:21 -05:00
TomandBen Meadors	9e61c44629	fix(routing): prevent licensed users from rebroadcasting packets to or from unlicensed users (#9958 ) * fix(routing): prevent licensed users from rebroadcasting packets from unlicensed or unknown users * fix(routing): prevent licensed users from rebroadcasting packets to or from unlicensed users --------- Co-authored-by: Ben Meadors <benmmeadors@gmail.com>	2026-03-31 07:36:04 -05:00
ManuelandBen Meadors	3ad80b80ee	MUI: WiFi map tile download: heltec V4 adaptations (#10011 ) * rotated MUI * mui-maps heltec-v4 adaptations --------- Co-authored-by: Ben Meadors <benmmeadors@gmail.com>	2026-03-31 07:26:39 -05:00
Philip LykovandBen Meadors	8fe12e9fda	Fix W5100S socket exhaustion blocking MQTT and additional TCP clients (#9770 ) The W5100S Ethernet chip has only 4 hardware sockets. On RAK4631 Ethernet gateways with syslog and NTP enabled, all 4 sockets were permanently consumed (NTP UDP + Syslog UDP + TCP API listener + TCP API client), leaving none for MQTT, DHCP lease renewal, or additional TCP connections. - NTP: Remove permanent timeClient.begin() at startup; NTPClient::update() auto-initializes when needed. Add timeClient.end() after each query to release the UDP socket immediately. - Syslog: Remove socket allocation from Syslog::enable(). Open and close the UDP socket on-demand in _sendLog() around each message send. - MQTT: Fix socket leak in isValidConfig() where a successful test connection was never closed (PubSubClient destructor does not call disconnect). Add explicit pubSub->disconnect() before returning. Made-with: Cursor Co-authored-by: Ben Meadors <benmmeadors@gmail.com>	2026-03-31 07:23:59 -05:00
Thomas Göttgens	b0060b61fe	Merge branch 'develop' into zps-module	2026-02-04 14:03:29 +01:00
Thomas Göttgens	a7435b85a1	trunk fmt	2025-08-28 13:50:22 +10:00
Thomas Göttgens	729d6c576f	everyone's a critic, especially copilot.	2025-08-28 13:50:22 +10:00
Thomas Göttgens	15b84fca01	Fix compile and check issues	2025-08-28 13:50:22 +10:00
Thomas Göttgens	285b30dff0	the original ZPS module from https://github.com/a-f-G-U-C/Meshtastic-ZPS - work in progress, adapted to 2.x firmware convention, disabled by default	2025-08-28 13:50:22 +10:00