Let's use the artifacts token actually

Additional logic and auth
Hopefully extract and commit to meshtastic.github.io
2025-12-14 14:52:32 +00:00 · 2024-09-21 19:33:17 -05:00 · 2024-09-21 19:20:20 -05:00 · 2024-09-21 18:08:01 -05:00 · 2024-09-21 16:17:48 -05:00 · 2024-09-21 15:16:16 -05:00
78 changed files with 935 additions and 458 deletions
--- a/.github/ISSUE_TEMPLATE/Bug
+++ b/.github/ISSUE_TEMPLATE/Bug
@@ -49,10 +49,24 @@ body:
        - Heltec V3
        - Heltec Wireless Paper
        - Heltec Wireless Tracker
+        - Heltec Mesh Node T114
+        - Heltec Vision Master E213
+        - Heltec Vision Master E290
+        - Heltec Vision Master T190
+        - Nano G1
+        - Nano G1 Explorer
+        - Nano G2 Ultra
        - Raspberry Pi Pico (W)
        - Relay v1
        - Relay v2
        - Seeed Wio Tracker 1110
+        - Seeed Card Tracker T1000-E
+        - Station G1
+        - Station G2
+        - unPhone
+        - CanaryOne
+        - Chatter
+        - Linux Native
        - DIY
        - Other
    validations:
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -18,6 +18,7 @@ body:
        - ESP32
        - RP2040
        - Linux Native
+        - Cross-Platform
        - other
    validations:
      required: true
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@@ -251,12 +251,6 @@ jobs:
          merge-multiple: true
          path: ./output

-      - uses: actions/download-artifact@v4
-        with:
-          pattern: meshtasticd_${{ steps.version.outputs.version }}_*.deb
-          merge-multiple: true
-          path: ./output
-
      - name: Display structure of downloaded files
        run: ls -R

@@ -266,7 +260,7 @@ jobs:
          chmod +x ./output/device-update.sh

      - name: Zip firmware
-        run: zip -j -9 -r ./firmware-${{ steps.version.outputs.version }}.zip ./output -x *.deb
+        run: zip -j -9 -r ./firmware-${{ steps.version.outputs.version }}.zip ./output -x meshtasticd_*

      - uses: actions/download-artifact@v4
        with:
@@ -314,6 +308,12 @@ jobs:
          asset_name: debug-elfs-${{ steps.version.outputs.version }}.zip
          asset_content_type: application/zip

+      - uses: actions/download-artifact@v4
+        with:
+          pattern: meshtasticd_${{ steps.version.outputs.version }}_*.deb
+          merge-multiple: true
+          path: ./output
+
      - name: Add raspbian aarch64 .deb
        uses: actions/upload-release-asset@v1
        env:
@@ -353,3 +353,30 @@ jobs:
        with:
          add-paths: |
            version.properties
+
+      - name: Checkout meshtastic/meshtastic.github.io
+        uses: actions/checkout@v4
+        with:
+          repository: meshtastic/meshtastic.github.io
+          token: ${{ secrets.ARTIFACTS_TOKEN }}
+          path: meshtastic.github.io
+
+      - name: Display structure of downloaded files
+        run: ls -R
+
+      - name: Extract firmware.zip
+        run: |
+          unzip ./firmware-${{ steps.version.outputs.version }}.zip -d meshtastic.github.io/firmware-${{ steps.version.outputs.version }}
+
+      - name: Display structure of downloaded files
+        run: ls -R
+
+      - name: Commit and push changes
+        run: |
+          cd meshtastic.github.io
+          find . -type f -name 'meshtasticd_*' -exec rm -f {} +
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git add .
+          git commit -m "Add firmware version ${{ steps.version.outputs.version }}"
+          git push
--- a/.github/workflows/package_amd64.yml
+++ b/.github/workflows/package_amd64.yml
@@ -13,7 +13,7 @@ jobs:
    uses: ./.github/workflows/build_native.yml

  package-native:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    needs: build-native
    steps:
      - name: Checkout code
--- a/.github/workflows/package_raspbian.yml
+++ b/.github/workflows/package_raspbian.yml
@@ -13,7 +13,7 @@ jobs:
    uses: ./.github/workflows/build_raspbian.yml

  package-raspbian:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    needs: build-raspbian
    steps:
      - name: Checkout code
--- a/.github/workflows/package_raspbian_armv7l.yml
+++ b/.github/workflows/package_raspbian_armv7l.yml
@@ -13,7 +13,7 @@ jobs:
    uses: ./.github/workflows/build_raspbian_armv7l.yml

  package-raspbian_armv7l:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    needs: build-raspbian_armv7l
    steps:
      - name: Checkout code
--- a/.github/workflows/sec_sast_semgrep_pull.yml
+++ b/.github/workflows/sec_sast_semgrep_pull.yml
@@ -4,7 +4,7 @@ on: pull_request

 jobs:
  semgrep-diff:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    container:
      image: returntocorp/semgrep

--- a/arch/portduino/portduino.ini
+++ b/arch/portduino/portduino.ini
@@ -1,6 +1,6 @@
 ; The Portduino based sim environment on top of any host OS, all hardware will be simulated
 [portduino_base]
-platform = https://github.com/meshtastic/platform-native.git#ad8112adf82ce1f5b917092cf32be07a077801a0
+platform = https://github.com/meshtastic/platform-native.git#6b3796d697481c8f6e3f4aa5c111bd9979f29e64
 framework = arduino

 build_src_filter = 
--- a/boards/heltec_mesh_node_t114.json
+++ b/boards/heltec_mesh_node_t114.json
@@ -5,7 +5,7 @@
    },
    "core": "nRF5",
    "cpu": "cortex-m4",
-    "extra_flags": "-DARDUINO_NRF52840_PCA10056 -DNRF52840_XXAA",
+    "extra_flags": "-DHELTEC_T114 -DNRF52840_XXAA",
    "f_cpu": "64000000L",
    "hwids": [
      ["0x239A", "0x4405"],
--- a/boards/lora_isp4520.json
+++ b/boards/lora_isp4520.json
@@ -1,40 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "nrf52832_s132_v6.ld"
-    },
-    "core": "nRF5",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DNRF52832_XXAA -DNRF52",
-    "f_cpu": "64000000L",
-    "mcu": "nrf52832",
-    "variant": "lora_isp4520",
-    "bsp": {
-      "name": "adafruit"
-    },
-    "softdevice": {
-      "sd_flags": "-DS132",
-      "sd_name": "s132",
-      "sd_version": "6.1.1",
-      "sd_fwid": "0x00B7"
-    }
-  },
-  "connectivity": ["bluetooth"],
-  "debug": {
-    "jlink_device": "nRF52832_xxAA",
-    "svd_path": "nrf52.svd",
-    "openocd_target": "nrf52840-mdk-rs"
-  },
-  "frameworks": ["arduino"],
-  "name": "lora ISP4520",
-  "upload": {
-    "maximum_ram_size": 65536,
-    "maximum_size": 524288,
-    "require_upload_port": true,
-    "speed": 115200,
-    "protocol": "nrfutil",
-    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"]
-  },
-  "url": "",
-  "vendor": "PsiSoft"
-}
--- a/boards/me25ls01-4y10td.json
+++ b/boards/me25ls01-4y10td.json
@@ -5,7 +5,7 @@
    },
    "core": "nRF5",
    "cpu": "cortex-m4",
-    "extra_flags": "-DARDUINO_WIO_WM1110 -DNRF52840_XXAA",
+    "extra_flags": "-DME25LS01_4Y10TD -DNRF52840_XXAA",
    "f_cpu": "64000000L",
    "hwids": [
      ["0x239A", "0x8029"],
--- a/boards/ms24sf1.json
+++ b/boards/ms24sf1.json
@@ -5,7 +5,7 @@
    },
    "core": "nRF5",
    "cpu": "cortex-m4",
-    "extra_flags": "-DARDUINO_WIO_WM1110 -DNRF52840_XXAA",
+    "extra_flags": "-DMS24SF1 -DNRF52840_XXAA",
    "f_cpu": "64000000L",
    "hwids": [
      ["0x239A", "0x8029"],
--- a/boards/nordic_pca10059.json
+++ b/boards/nordic_pca10059.json
@@ -5,7 +5,7 @@
    },
    "core": "nRF5",
    "cpu": "cortex-m4",
-    "extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
+    "extra_flags": "-DNORDIC_PCA10059 -DNRF52840_XXAA",
    "f_cpu": "64000000L",
    "hwids": [
      ["0x239A", "0x8029"],
--- a/boards/seeed-sensecap-indicator.json
+++ b/boards/seeed-sensecap-indicator.json
@@ -0,0 +1,42 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld",
+      "partitions": "default_8MB.csv",
+      "memory_type": "qio_opi"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_USB_CDC_ON_BOOT=0",
+      "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [["0x1A86", "0x7523"]],
+    "mcu": "esp32s3",
+    "variant": "esp32s3r8"
+  },
+  "connectivity": ["wifi", "bluetooth", "lora"],
+  "debug": {
+    "default_tool": "esp-builtin",
+    "onboard_tools": ["esp-builtin"],
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": ["arduino"],
+  "name": "Seeed Studio SenseCAP Indicator",
+  "upload": {
+    "flash_size": "8MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 8388608,
+    "require_upload_port": true,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://www.seeedstudio.com/Indicator-for-Meshtastic.html",
+  "vendor": "Seeed Studio"
+}
--- a/platformio.ini
+++ b/platformio.ini
@@ -81,14 +81,14 @@ build_flags = -Wno-missing-field-initializers
  -DRADIOLIB_EXCLUDE_APRS
  -DRADIOLIB_EXCLUDE_LORAWAN
  -DMESHTASTIC_EXCLUDE_DROPZONE=1
+  -DBUILD_EPOCH=$UNIX_TIME
  ;-D OLED_PL

 monitor_speed = 115200
 monitor_filters = direct

 lib_deps =
-;  jgromes/RadioLib@~6.6.0
-  https://github.com/jgromes/RadioLib.git#3115fc2d6700a9aee05888791ac930a910f2628f
+  jgromes/RadioLib@~7.0.0
  https://github.com/meshtastic/esp8266-oled-ssd1306.git#e16cee124fe26490cb14880c679321ad8ac89c95 ; ESP8266_SSD1306
  https://github.com/mathertel/OneButton@~2.6.1 ; OneButton library for non-blocking button debounce
  https://github.com/meshtastic/arduino-fsm.git#7db3702bf0cfe97b783d6c72595e3f38e0b19159
@@ -156,8 +156,9 @@ lib_deps =
  https://github.com/boschsensortec/Bosch-BSEC2-Library#v1.7.2502
  boschsensortec/BME68x Sensor Library@^1.1.40407
  https://github.com/KodinLanewave/INA3221@^1.0.0
-  lewisxhe/SensorLib@^0.2.0
+  lewisxhe/SensorLib@0.2.0
  mprograms/QMC5883LCompass@^1.2.0
  

-  https://github.com/meshtastic/DFRobot_LarkWeatherStation#dee914270dc7cb3e43fbf034edd85a63a16a12ee
+  https://github.com/meshtastic/DFRobot_LarkWeatherStation#dee914270dc7cb3e43fbf034edd85a63a16a12ee
+  https://github.com/gjelsoe/STK8xxx-Accelerometer.git#v0.1.1
--- a/2
+++ b/2
--- a/src/AccelerometerThread.h
+++ b/src/AccelerometerThread.h
@@ -11,6 +11,9 @@
 #include <Adafruit_LIS3DH.h>
 #include <Adafruit_LSM6DS3TRC.h>
 #include <Adafruit_MPU6050.h>
+#ifdef STK8XXX_INT
+#include <stk8baxx.h>
+#endif
 #include <Arduino.h>
 #include <SensorBMA423.hpp>
 #include <Wire.h>
@@ -24,6 +27,8 @@
 #define ACCELEROMETER_CHECK_INTERVAL_MS 100
 #define ACCELEROMETER_CLICK_THRESHOLD 40

+volatile static bool STK_IRQ;
+
 static inline int readRegister(uint8_t address, uint8_t reg, uint8_t *data, uint8_t len)
 {
    Wire.beginTransmission(address);
@@ -79,6 +84,11 @@ class AccelerometerThread : public concurrency::OSThread

        if (acceleremoter_type == ScanI2C::DeviceType::MPU6050 && mpu.getMotionInterruptStatus()) {
            wakeScreen();
+        } else if (acceleremoter_type == ScanI2C::DeviceType::STK8BAXX && STK_IRQ) {
+            STK_IRQ = false;
+            if (config.display.wake_on_tap_or_motion) {
+                wakeScreen();
+            }
        } else if (acceleremoter_type == ScanI2C::DeviceType::LIS3DH && lis.getClick() > 0) {
            uint8_t click = lis.getClick();
            if (!config.device.double_tap_as_button_press) {
@@ -188,6 +198,15 @@ class AccelerometerThread : public concurrency::OSThread
            mpu.setMotionDetectionDuration(20);
            mpu.setInterruptPinLatch(true); // Keep it latched.  Will turn off when reinitialized.
            mpu.setInterruptPinPolarity(true);
+#ifdef STK8XXX_INT
+        } else if (acceleremoter_type == ScanI2C::DeviceType::STK8BAXX && stk8baxx.STK8xxx_Initialization(STK8xxx_VAL_RANGE_2G)) {
+            STK_IRQ = false;
+            LOG_DEBUG("STX8BAxx initialized\n");
+            stk8baxx.STK8xxx_Anymotion_init();
+            pinMode(STK8XXX_INT, INPUT_PULLUP);
+            attachInterrupt(
+                digitalPinToInterrupt(STK8XXX_INT), [] { STK_IRQ = true; }, RISING);
+#endif
        } else if (acceleremoter_type == ScanI2C::DeviceType::LIS3DH && lis.begin(accelerometer_found.address)) {
            LOG_DEBUG("LIS3DH initializing\n");
            lis.setRange(LIS3DH_RANGE_2_G);
@@ -262,6 +281,9 @@ class AccelerometerThread : public concurrency::OSThread
    ScanI2C::DeviceType acceleremoter_type;
    Adafruit_MPU6050 mpu;
    Adafruit_LIS3DH lis;
+#ifdef STK8XXX_INT
+    STK8xxx stk8baxx;
+#endif
    Adafruit_LSM6DS3TRC lsm;
    SensorBMA423 bmaSensor;
    bool BMA_IRQ = false;
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -124,7 +124,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define INA3221_ADDR 0x42
 #define QMC6310_ADDR 0x1C
 #define QMI8658_ADDR 0x6B
-#define QMC5883L_ADDR 0x1E
+#define QMC5883L_ADDR 0x0D
+#define HMC5883L_ADDR 0x1E
 #define SHTC3_ADDR 0x70
 #define LPS22HB_ADDR 0x5C
 #define LPS22HB_ADDR_ALT 0x5D
@@ -144,6 +145,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // ACCELEROMETER
 // -----------------------------------------------------------------------------
 #define MPU6050_ADDR 0x68
+#define STK8BXX_ADR 0x18
 #define LIS3DH_ADR 0x18
 #define BMA423_ADDR 0x19
 #define LSM6DS3_ADDR 0x6A
@@ -162,6 +164,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // -----------------------------------------------------------------------------
 // IO Expander
 // -----------------------------------------------------------------------------
+#define TCA9535_ADDR 0x20
 #define TCA9555_ADDR 0x26

 // -----------------------------------------------------------------------------
@@ -171,6 +174,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define GPS_THREAD_INTERVAL 200
 #endif

+// -----------------------------------------------------------------------------
+// Touchscreen
+// -----------------------------------------------------------------------------
+#define FT6336U_ADDR 0x48
+
 // convert 24-bit color to 16-bit (56K)
 #define COLOR565(r, g, b) (((r & 0xF8) << 8) | ((g & 0xFC) << 3) | ((b & 0xF8) >> 3))

@@ -324,4 +332,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif

 #include "DebugConfiguration.h"
-#include "RF95Configuration.h"
+#include "RF95Configuration.h"
--- a/src/detect/ScanI2C.cpp
+++ b/src/detect/ScanI2C.cpp
@@ -37,8 +37,8 @@ ScanI2C::FoundDevice ScanI2C::firstKeyboard() const

 ScanI2C::FoundDevice ScanI2C::firstAccelerometer() const
 {
-    ScanI2C::DeviceType types[] = {MPU6050, LIS3DH, BMA423, LSM6DS3, BMX160};
-    return firstOfOrNONE(5, types);
+    ScanI2C::DeviceType types[] = {MPU6050, LIS3DH, BMA423, LSM6DS3, BMX160, STK8BAXX};
+    return firstOfOrNONE(6, types);
 }

 ScanI2C::FoundDevice ScanI2C::find(ScanI2C::DeviceType) const
--- a/src/detect/ScanI2C.h
+++ b/src/detect/ScanI2C.h
@@ -36,12 +36,14 @@ class ScanI2C
        QMC6310,
        QMI8658,
        QMC5883L,
+        HMC5883L,
        PMSA0031,
        MPU6050,
        LIS3DH,
        BMA423,
        BQ24295,
        LSM6DS3,
+        TCA9535,
        TCA9555,
        VEML7700,
        RCWL9620,
@@ -52,7 +54,9 @@ class ScanI2C
        AHT10,
        BMX160,
        DFROBOT_LARK,
-        NAU7802
+        NAU7802,
+        FT6336U,
+        STK8BAXX
    } DeviceType;

    // typedef uint8_t DeviceAddress;
@@ -115,4 +119,4 @@ class ScanI2C

  private:
    bool shouldSuppressScreen = false;
-};
+};
--- a/src/detect/ScanI2CTwoWire.cpp
+++ b/src/detect/ScanI2CTwoWire.cpp
@@ -313,17 +313,34 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                }
                break;
            case MCP9808_ADDR:
-                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x07), 2);
-                if (registerValue == 0x0400) {
-                    type = MCP9808;
-                    LOG_INFO("MCP9808 sensor found\n");
-                } else {
-                    type = LIS3DH;
-                    LOG_INFO("LIS3DH accelerometer found\n");
+                // We need to check for STK8BAXX first, since register 0x07 is new data flag for the z-axis and can produce some
+                // weird result. and register 0x00 doesn't seems to be colliding with MCP9808 and LIS3DH chips.
+                {
+                    // Check register 0x00 for 0x8700 response to ID STK8BA53 chip.
+                    registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x00), 2);
+                    if (registerValue == 0x8700) {
+                        type = STK8BAXX;
+                        LOG_INFO("STK8BAXX accelerometer found\n");
+                        break;
+                    }
+
+                    // Check register 0x07 for 0x0400 response to ID MCP9808 chip.
+                    registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x07), 2);
+                    if (registerValue == 0x0400) {
+                        type = MCP9808;
+                        LOG_INFO("MCP9808 sensor found\n");
+                        break;
+                    }
+
+                    // Check register 0x0F for 0x3300 response to ID LIS3DH chip.
+                    registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x0F), 2);
+                    if (registerValue == 0x3300) {
+                        type = LIS3DH;
+                        LOG_INFO("LIS3DH accelerometer found\n");
+                    }
+
+                    break;
                }
-
-                break;
-
            case SHT31_4x_ADDR:
                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x89), 2);
                if (registerValue == 0x11a2 || registerValue == 0x11da || registerValue == 0xe9c) {
@@ -365,18 +382,21 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                break;

                SCAN_SIMPLE_CASE(QMC5883L_ADDR, QMC5883L, "QMC5883L Highrate 3-Axis magnetic sensor found\n")
+                SCAN_SIMPLE_CASE(HMC5883L_ADDR, HMC5883L, "HMC5883L 3-Axis digital compass found\n")

                SCAN_SIMPLE_CASE(PMSA0031_ADDR, PMSA0031, "PMSA0031 air quality sensor found\n")
                SCAN_SIMPLE_CASE(MPU6050_ADDR, MPU6050, "MPU6050 accelerometer found\n");
                SCAN_SIMPLE_CASE(BMX160_ADDR, BMX160, "BMX160 accelerometer found\n");
                SCAN_SIMPLE_CASE(BMA423_ADDR, BMA423, "BMA423 accelerometer found\n");
                SCAN_SIMPLE_CASE(LSM6DS3_ADDR, LSM6DS3, "LSM6DS3 accelerometer found at address 0x%x\n", (uint8_t)addr.address);
+                SCAN_SIMPLE_CASE(TCA9535_ADDR, TCA9535, "TCA9535 I2C expander found\n");
                SCAN_SIMPLE_CASE(TCA9555_ADDR, TCA9555, "TCA9555 I2C expander found\n");
                SCAN_SIMPLE_CASE(VEML7700_ADDR, VEML7700, "VEML7700 light sensor found\n");
                SCAN_SIMPLE_CASE(TSL25911_ADDR, TSL2591, "TSL2591 light sensor found\n");
                SCAN_SIMPLE_CASE(OPT3001_ADDR, OPT3001, "OPT3001 light sensor found\n");
                SCAN_SIMPLE_CASE(MLX90632_ADDR, MLX90632, "MLX90632 IR temp sensor found\n");
                SCAN_SIMPLE_CASE(NAU7802_ADDR, NAU7802, "NAU7802 based scale found\n");
+                SCAN_SIMPLE_CASE(FT6336U_ADDR, FT6336U, "FT6336U touchscreen found\n");

            default:
                LOG_INFO("Device found at address 0x%x was not able to be enumerated\n", addr.address);
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -26,6 +26,8 @@

 #if defined(NRF52840_XXAA) || defined(NRF52833_XXAA) || defined(ARCH_ESP32) || defined(ARCH_PORTDUINO)
 HardwareSerial *GPS::_serial_gps = &Serial1;
+#elif defined(ARCH_RP2040)
+SerialUART *GPS::_serial_gps = &Serial1;
 #else
 HardwareSerial *GPS::_serial_gps = NULL;
 #endif
@@ -166,18 +168,21 @@ GPS_RESPONSE GPS::getACK(const char *message, uint32_t waitMillis)
            b = _serial_gps->read();

 #ifdef GPS_DEBUG
-            LOG_DEBUG("%02X", (char *)buffer);
+            LOG_DEBUG("%c", (b >= 32 && b <= 126) ? b : '.');
 #endif
            buffer[bytesRead] = b;
            bytesRead++;
            if ((bytesRead == 767) || (b == '\r')) {
                if (strnstr((char *)buffer, message, bytesRead) != nullptr) {
 #ifdef GPS_DEBUG
-                    LOG_DEBUG("\r");
+                    LOG_DEBUG("\r\nFound: %s\r\n", message); // Log the found message
 #endif
                    return GNSS_RESPONSE_OK;
                } else {
                    bytesRead = 0;
+#ifdef GPS_DEBUG
+                    LOG_DEBUG("\r\n");
+#endif
                }
            }
        }
@@ -505,18 +510,18 @@ bool GPS::setup()
            delay(250);
            _serial_gps->write("$CFGMSG,6,1,0\r\n");
            delay(250);
-        } else if (gnssModel == GNSS_MODEL_AG3335) {
+        } else if (gnssModel == GNSS_MODEL_AG3335 || gnssModel == GNSS_MODEL_AG3352) {

            _serial_gps->write("$PAIR066,1,0,1,0,0,1*3B\r\n"); // Enable GPS+GALILEO+NAVIC

            // Configure NMEA (sentences will output once per fix)
-            _serial_gps->write("$PAIR062,0,0*3F\r\n"); // GGA ON
+            _serial_gps->write("$PAIR062,0,1*3F\r\n"); // GGA ON
            _serial_gps->write("$PAIR062,1,0*3F\r\n"); // GLL OFF
-            _serial_gps->write("$PAIR062,2,1*3D\r\n"); // GSA ON
+            _serial_gps->write("$PAIR062,2,0*3C\r\n"); // GSA OFF
            _serial_gps->write("$PAIR062,3,0*3D\r\n"); // GSV OFF
-            _serial_gps->write("$PAIR062,4,0*3B\r\n"); // RMC ON
+            _serial_gps->write("$PAIR062,4,1*3B\r\n"); // RMC ON
            _serial_gps->write("$PAIR062,5,0*3B\r\n"); // VTG OFF
-            _serial_gps->write("$PAIR062,6,1*39\r\n"); // ZDA ON
+            _serial_gps->write("$PAIR062,6,0*38\r\n"); // ZDA ON

            delay(250);
            _serial_gps->write("$PAIR513*3D\r\n"); // save configuration
@@ -1195,18 +1200,19 @@ int GPS::prepareDeepSleep(void *unused)

 GnssModel_t GPS::probe(int serialSpeed)
 {
-#if defined(ARCH_NRF52) || defined(ARCH_PORTDUINO) || defined(ARCH_RP2040) || defined(ARCH_STM32WL)
+#if defined(ARCH_NRF52) || defined(ARCH_PORTDUINO) || defined(ARCH_STM32WL)
    _serial_gps->end();
    _serial_gps->begin(serialSpeed);
+#elif defined(ARCH_RP2040)
+    _serial_gps->end();
+    _serial_gps->setFIFOSize(256);
+    _serial_gps->begin(serialSpeed);
 #else
    if (_serial_gps->baudRate() != serialSpeed) {
        LOG_DEBUG("Setting Baud to %i\n", serialSpeed);
        _serial_gps->updateBaudRate(serialSpeed);
    }
 #endif
-#ifdef GNSS_AIROHA
-    return GNSS_MODEL_AG3335;
-#endif

    memset(&info, 0, sizeof(struct uBloxGnssModelInfo));
    uint8_t buffer[768] = {0};
@@ -1225,7 +1231,12 @@ GnssModel_t GPS::probe(int serialSpeed)
    PROBE_SIMPLE("ATGM332D", "$PCAS06,1*1A", "$GPTXT,01,01,02,HW=ATGM332D", GNSS_MODEL_ATGM336H, 500);

    /* Airoha (Mediatek) AG3335A/M/S, A3352Q, Quectel L89 2.0, SimCom SIM65M */
-    PROBE_SIMPLE("AG3335", "PAIR020*38", "$PAIR020,AG3335", GNSS_MODEL_AG3335, 500);
+    _serial_gps->write("$PAIR062,2,0*3C\r\n"); // GSA OFF to reduce volume
+    _serial_gps->write("$PAIR062,3,0*3D\r\n"); // GSV OFF to reduce volume
+    _serial_gps->write("$PAIR513*3D\r\n");     // save configuration
+    PROBE_SIMPLE("AG3335", "$PAIR021*39", "$PAIR021,AG3335", GNSS_MODEL_AG3335, 500);
+    PROBE_SIMPLE("AG3352", "$PAIR021*39", "$PAIR021,AG3352", GNSS_MODEL_AG3352, 500);
+    PROBE_SIMPLE("LC86", "$PQTMVERNO*58", "$PQTMVERNO,LC86", GNSS_MODEL_AG3352, 500);

    PROBE_SIMPLE("L76K", "$PCAS06,0*1B", "$GPTXT,01,01,02,SW=", GNSS_MODEL_MTK, 500);

@@ -1260,9 +1271,13 @@ GnssModel_t GPS::probe(int serialSpeed)
        _serial_gps->write(_message_prt, sizeof(_message_prt));
        delay(500);
        serialSpeed = 9600;
-#if defined(ARCH_NRF52) || defined(ARCH_PORTDUINO) || defined(ARCH_RP2040) || defined(ARCH_STM32WL)
+#if defined(ARCH_NRF52) || defined(ARCH_PORTDUINO) || defined(ARCH_STM32WL)
        _serial_gps->end();
        _serial_gps->begin(serialSpeed);
+#elif defined(ARCH_RP2040)
+        _serial_gps->end();
+        _serial_gps->setFIFOSize(256);
+        _serial_gps->begin(serialSpeed);
 #else
        _serial_gps->updateBaudRate(serialSpeed);
 #endif
@@ -1423,6 +1438,9 @@ GPS *GPS::createGps()
        LOG_DEBUG("Using GPIO%d for GPS RX\n", new_gps->rx_gpio);
        LOG_DEBUG("Using GPIO%d for GPS TX\n", new_gps->tx_gpio);
        _serial_gps->begin(GPS_BAUDRATE, SERIAL_8N1, new_gps->rx_gpio, new_gps->tx_gpio);
+#elif defined(ARCH_RP2040)
+        _serial_gps->setFIFOSize(256);
+        _serial_gps->begin(GPS_BAUDRATE);
 #else
        _serial_gps->begin(GPS_BAUDRATE);
 #endif
@@ -1534,7 +1552,7 @@ The Unix epoch (or Unix time or POSIX time or Unix timestamp) is the number of s
 (midnight UTC/GMT), not counting leap seconds (in ISO 8601: 1970-01-01T00:00:00Z).
 */
        struct tm t;
-        t.tm_sec = ti.second();
+        t.tm_sec = ti.second() + round(ti.age() / 1000);
        t.tm_min = ti.minute();
        t.tm_hour = ti.hour();
        t.tm_mday = d.day();
@@ -1542,8 +1560,8 @@ The Unix epoch (or Unix time or POSIX time or Unix timestamp) is the number of s
        t.tm_year = d.year() - 1900;
        t.tm_isdst = false;
        if (t.tm_mon > -1) {
-            LOG_DEBUG("NMEA GPS time %02d-%02d-%02d %02d:%02d:%02d\n", d.year(), d.month(), t.tm_mday, t.tm_hour, t.tm_min,
-                      t.tm_sec);
+            LOG_DEBUG("NMEA GPS time %02d-%02d-%02d %02d:%02d:%02d age %d\n", d.year(), d.month(), t.tm_mday, t.tm_hour, t.tm_min,
+                      t.tm_sec, ti.age());
            perhapsSetRTC(RTCQualityGPS, t);
            return true;
        } else
@@ -1802,4 +1820,4 @@ void GPS::toggleGpsMode()
        enable();
    }
 }
-#endif // Exclude GPS
+#endif // Exclude GPS
--- a/src/gps/GPS.h
+++ b/src/gps/GPS.h
@@ -30,7 +30,8 @@ typedef enum {
    GNSS_MODEL_UC6580,
    GNSS_MODEL_UNKNOWN,
    GNSS_MODEL_MTK_L76B,
-    GNSS_MODEL_AG3335
+    GNSS_MODEL_AG3335,
+    GNSS_MODEL_AG3352
 } GnssModel_t;

 typedef enum {
@@ -101,7 +102,7 @@ class GPS : private concurrency::OSThread

  public:
    /** If !NULL we will use this serial port to construct our GPS */
-#if defined(RPI_PICO_WAVESHARE)
+#if defined(ARCH_RP2040)
    static SerialUART *_serial_gps;
 #else
    static HardwareSerial *_serial_gps;
--- a/src/gps/RTC.cpp
+++ b/src/gps/RTC.cpp
@@ -43,7 +43,10 @@ void readFromRTC()
        t.tm_sec = rtc.getSecond();
        tv.tv_sec = gm_mktime(&t);
        tv.tv_usec = 0;
-        LOG_DEBUG("Read RTC time from RV3028 as %ld\n", tv.tv_sec);
+
+        uint32_t printableEpoch = tv.tv_sec; // Print lib only supports 32 bit but time_t can be 64 bit on some platforms
+        LOG_DEBUG("Read RTC time from RV3028 getTime as %02d-%02d-%02d %02d:%02d:%02d (%ld)\n", t.tm_year + 1900, t.tm_mon + 1,
+                  t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, printableEpoch);
        timeStartMsec = now;
        zeroOffsetSecs = tv.tv_sec;
        if (currentQuality == RTCQualityNone) {
@@ -71,7 +74,10 @@ void readFromRTC()
        t.tm_sec = tc.second;
        tv.tv_sec = gm_mktime(&t);
        tv.tv_usec = 0;
-        LOG_DEBUG("Read RTC time from PCF8563 as %ld\n", tv.tv_sec);
+
+        uint32_t printableEpoch = tv.tv_sec; // Print lib only supports 32 bit but time_t can be 64 bit on some platforms
+        LOG_DEBUG("Read RTC time from PCF8563 getDateTime as %02d-%02d-%02d %02d:%02d:%02d (%ld)\n", t.tm_year + 1900,
+                  t.tm_mon + 1, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, printableEpoch);
        timeStartMsec = now;
        zeroOffsetSecs = tv.tv_sec;
        if (currentQuality == RTCQualityNone) {
@@ -81,7 +87,8 @@ void readFromRTC()
 #else
    if (!gettimeofday(&tv, NULL)) {
        uint32_t now = millis();
-        LOG_DEBUG("Read RTC time as %ld\n", tv.tv_sec);
+        uint32_t printableEpoch = tv.tv_sec; // Print lib only supports 32 bit but time_t can be 64 bit on some platforms
+        LOG_DEBUG("Read RTC time as %ld\n", printableEpoch);
        timeStartMsec = now;
        zeroOffsetSecs = tv.tv_sec;
    }
@@ -101,6 +108,13 @@ bool perhapsSetRTC(RTCQuality q, const struct timeval *tv, bool forceUpdate)
 {
    static uint32_t lastSetMsec = 0;
    uint32_t now = millis();
+    uint32_t printableEpoch = tv->tv_sec; // Print lib only supports 32 bit but time_t can be 64 bit on some platforms
+#ifdef BUILD_EPOCH
+    if (tv->tv_sec < BUILD_EPOCH) {
+        LOG_WARN("Ignoring time (%ld) before build epoch (%ld)!\n", printableEpoch, BUILD_EPOCH);
+        return false;
+    }
+#endif

    bool shouldSet;
    if (forceUpdate) {
@@ -110,10 +124,13 @@ bool perhapsSetRTC(RTCQuality q, const struct timeval *tv, bool forceUpdate)
    } else if (q > currentQuality) {
        shouldSet = true;
        LOG_DEBUG("Upgrading time to quality %s\n", RtcName(q));
-    } else if (q >= RTCQualityNTP && (now - lastSetMsec) > (12 * 60 * 60 * 1000UL)) {
-        // Every 12 hrs we will slam in a new GPS or Phone GPS / NTP time, to correct for local RTC clock drift
+    } else if (q == RTCQualityGPS) {
        shouldSet = true;
-        LOG_DEBUG("Reapplying external time to correct clock drift %ld secs\n", tv->tv_sec);
+        LOG_DEBUG("Reapplying GPS time: %ld secs\n", printableEpoch);
+    } else if (q == RTCQualityNTP && (now - lastSetMsec) > (12 * 60 * 60 * 1000UL)) {
+        // Every 12 hrs we will slam in a new NTP or Phone GPS / NTP time, to correct for local RTC clock drift
+        shouldSet = true;
+        LOG_DEBUG("Reapplying external time to correct clock drift %ld secs\n", printableEpoch);
    } else {
        shouldSet = false;
        LOG_DEBUG("Current RTC quality: %s. Ignoring time of RTC quality of %s\n", RtcName(currentQuality), RtcName(q));
@@ -140,8 +157,8 @@ bool perhapsSetRTC(RTCQuality q, const struct timeval *tv, bool forceUpdate)
 #endif
            tm *t = gmtime(&tv->tv_sec);
            rtc.setTime(t->tm_year + 1900, t->tm_mon + 1, t->tm_wday, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
-            LOG_DEBUG("RV3028_RTC setTime %02d-%02d-%02d %02d:%02d:%02d %ld\n", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday,
-                      t->tm_hour, t->tm_min, t->tm_sec, tv->tv_sec);
+            LOG_DEBUG("RV3028_RTC setTime %02d-%02d-%02d %02d:%02d:%02d (%ld)\n", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday,
+                      t->tm_hour, t->tm_min, t->tm_sec, printableEpoch);
        }
 #elif defined(PCF8563_RTC)
        if (rtc_found.address == PCF8563_RTC) {
@@ -154,8 +171,8 @@ bool perhapsSetRTC(RTCQuality q, const struct timeval *tv, bool forceUpdate)
 #endif
            tm *t = gmtime(&tv->tv_sec);
            rtc.setDateTime(t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
-            LOG_DEBUG("PCF8563_RTC setDateTime %02d-%02d-%02d %02d:%02d:%02d %ld\n", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday,
-                      t->tm_hour, t->tm_min, t->tm_sec, tv->tv_sec);
+            LOG_DEBUG("PCF8563_RTC setDateTime %02d-%02d-%02d %02d:%02d:%02d (%ld)\n", t->tm_year + 1900, t->tm_mon + 1,
+                      t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, printableEpoch);
        }
 #elif defined(ARCH_ESP32)
        settimeofday(tv, NULL);
@@ -272,4 +289,4 @@ time_t gm_mktime(struct tm *tm)
 #else
    return mktime(tm);
 #endif
-}
+}
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -1093,8 +1093,8 @@ static void drawNodes(OLEDDisplay *display, int16_t x, int16_t y, const NodeStat
 {
    char usersString[20];
    snprintf(usersString, sizeof(usersString), "%d/%d", nodeStatus->getNumOnline(), nodeStatus->getNumTotal());
-#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(USE_ST7789) ||          \
-     defined(HX8357_CS)) &&                                                                                                      \
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) || defined(ST7789_CS) ||           \
+     defined(USE_ST7789) || defined(HX8357_CS)) &&                                                                               \
    !defined(DISPLAY_FORCE_SMALL_FONTS)
    display->drawFastImage(x, y + 3, 8, 8, imgUser);
 #else
@@ -1285,8 +1285,8 @@ static int8_t prevFrame = -1;
 // Draw the arrow pointing to a node's location
 void Screen::drawNodeHeading(OLEDDisplay *display, int16_t compassX, int16_t compassY, uint16_t compassDiam, float headingRadian)
 {
-    Point tip(0.0f, 0.5f), tail(0.0f, -0.5f); // pointing up initially
-    float arrowOffsetX = 0.2f, arrowOffsetY = 0.2f;
+    Point tip(0.0f, 0.5f), tail(0.0f, -0.35f); // pointing up initially
+    float arrowOffsetX = 0.14f, arrowOffsetY = 1.0f;
    Point leftArrow(tip.x - arrowOffsetX, tip.y - arrowOffsetY), rightArrow(tip.x + arrowOffsetX, tip.y - arrowOffsetY);

    Point *arrowPoints[] = {&tip, &tail, &leftArrow, &rightArrow};
@@ -1296,9 +1296,19 @@ void Screen::drawNodeHeading(OLEDDisplay *display, int16_t compassX, int16_t com
        arrowPoints[i]->scale(compassDiam * 0.6);
        arrowPoints[i]->translate(compassX, compassY);
    }
+    /* Old arrow
    display->drawLine(tip.x, tip.y, tail.x, tail.y);
    display->drawLine(leftArrow.x, leftArrow.y, tip.x, tip.y);
    display->drawLine(rightArrow.x, rightArrow.y, tip.x, tip.y);
+    display->drawLine(leftArrow.x, leftArrow.y, tail.x, tail.y);
+    display->drawLine(rightArrow.x, rightArrow.y, tail.x, tail.y);
+    */
+#ifdef USE_EINK
+    display->drawTriangle(tip.x, tip.y, rightArrow.x, rightArrow.y, tail.x, tail.y);
+#else
+    display->fillTriangle(tip.x, tip.y, rightArrow.x, rightArrow.y, tail.x, tail.y);
+#endif
+    display->drawTriangle(tip.x, tip.y, leftArrow.x, leftArrow.y, tail.x, tail.y);
 }

 // Get a string representation of the time passed since something happened
@@ -1336,22 +1346,27 @@ void Screen::drawCompassNorth(OLEDDisplay *display, int16_t compassX, int16_t co
    // If north is supposed to be at the top of the compass we want rotation to be +0
    if (config.display.compass_north_top)
        myHeading = -0;
-
-    Point N1(-0.04f, 0.65f), N2(0.04f, 0.65f);
+    /* N sign points currently not deleted*/
+    Point N1(-0.04f, 0.65f), N2(0.04f, 0.65f); // N sign points (N1-N4)
    Point N3(-0.04f, 0.55f), N4(0.04f, 0.55f);
-    Point *rosePoints[] = {&N1, &N2, &N3, &N4};
+    Point NC1(0.00f, 0.50f); // north circle center point
+    Point *rosePoints[] = {&N1, &N2, &N3, &N4, &NC1};

    uint16_t compassDiam = Screen::getCompassDiam(SCREEN_WIDTH, SCREEN_HEIGHT);

-    for (int i = 0; i < 4; i++) {
+    for (int i = 0; i < 5; i++) {
        // North on compass will be negative of heading
        rosePoints[i]->rotate(-myHeading);
        rosePoints[i]->scale(compassDiam);
        rosePoints[i]->translate(compassX, compassY);
    }
+
+    /* changed the N sign to a small circle on the compass circle.
    display->drawLine(N1.x, N1.y, N3.x, N3.y);
    display->drawLine(N2.x, N2.y, N4.x, N4.y);
    display->drawLine(N1.x, N1.y, N4.x, N4.y);
+    */
+    display->drawCircle(NC1.x, NC1.y, 4); // North sign circle, 4px radius is sufficient for all displays.
 }

 uint16_t Screen::getCompassDiam(uint32_t displayWidth, uint32_t displayHeight)
@@ -1515,7 +1530,8 @@ Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_O
 #elif defined(USE_SSD1306)
    dispdev = new SSD1306Wire(address.address, -1, -1, geometry,
                              (address.port == ScanI2C::I2CPort::WIRE1) ? HW_I2C::I2C_TWO : HW_I2C::I2C_ONE);
-#elif defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ST7789_CS) || defined(RAK14014) || defined(HX8357_CS)
+#elif defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ST7701_CS) || defined(ST7789_CS) || defined(RAK14014) ||          \
+    defined(HX8357_CS)
    dispdev = new TFTDisplay(address.address, -1, -1, geometry,
                             (address.port == ScanI2C::I2CPort::WIRE1) ? HW_I2C::I2C_TWO : HW_I2C::I2C_ONE);
 #elif defined(USE_EINK) && !defined(USE_EINK_DYNAMICDISPLAY)
@@ -1654,6 +1670,11 @@ void Screen::setup()
    static_cast<SH1106Wire *>(dispdev)->setSubtype(7);
 #endif

+#if defined(USE_ST7789) && defined(TFT_MESH)
+    // Heltec T114 and T190: honor a custom text color, if defined in variant.h
+    static_cast<ST7789Spi *>(dispdev)->setRGB(TFT_MESH);
+#endif
+
    // Initialising the UI will init the display too.
    ui->init();

@@ -1707,8 +1728,11 @@ void Screen::setup()
    // Standard behaviour is to FLIP the screen (needed on T-Beam). If this config item is set, unflip it, and thereby logically
    // flip it. If you have a headache now, you're welcome.
    if (!config.display.flip_screen) {
-#if defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ST7789_CS) || defined(RAK14014) || defined(HX8357_CS)
+#if defined(ST7701_CS) || defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ST7701_CS) || defined(ST7789_CS) ||           \
+    defined(RAK14014) || defined(HX8357_CS)
        static_cast<TFTDisplay *>(dispdev)->flipScreenVertically();
+#elif defined(USE_ST7789)
+        static_cast<ST7789Spi *>(dispdev)->flipScreenVertically();
 #else
        dispdev->flipScreenVertically();
 #endif
@@ -2420,8 +2444,8 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
 #ifdef ARCH_ESP32
        if (millis() - storeForwardModule->lastHeartbeat >
            (storeForwardModule->heartbeatInterval * 1200)) { // no heartbeat, overlap a bit
-#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(USE_ST7789) ||          \
-     defined(HX8357_CS)) &&                                                                                                      \
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) || defined(ST7789_CS) ||           \
+     defined(USE_ST7789) || defined(HX8357_CS)) &&                                                                               \
    !defined(DISPLAY_FORCE_SMALL_FONTS)
            display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8,
                                   imgQuestionL1);
@@ -2432,8 +2456,8 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
                                   imgQuestion);
 #endif
        } else {
-#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(USE_ST7789) ||          \
-     defined(HX8357_CS)) &&                                                                                                      \
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) || defined(ST7789_CS) ||           \
+     defined(USE_ST7789) || defined(HX8357_CS)) &&                                                                               \
    !defined(DISPLAY_FORCE_SMALL_FONTS)
            display->drawFastImage(x + SCREEN_WIDTH - 18 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 16, 8,
                                   imgSFL1);
@@ -2447,8 +2471,8 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
 #endif
    } else {
        // TODO: Raspberry Pi supports more than just the one screen size
-#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(USE_ST7789) ||          \
-     defined(HX8357_CS) || ARCH_PORTDUINO) &&                                                                                    \
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) || defined(ST7789_CS) ||           \
+     defined(USE_ST7789) || defined(HX8357_CS) || ARCH_PORTDUINO) &&                                                             \
    !defined(DISPLAY_FORCE_SMALL_FONTS)
        display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8,
                               imgInfoL1);
@@ -2754,4 +2778,4 @@ int Screen::handleAdminMessage(const meshtastic_AdminMessage *arg)
 } // namespace graphics
 #else
 graphics::Screen::Screen(ScanI2C::DeviceAddress, meshtastic_Config_DisplayConfig_OledType, OLEDDISPLAY_GEOMETRY) {}
-#endif // HAS_SCREEN
+#endif // HAS_SCREEN
--- a/src/graphics/ScreenFonts.h
+++ b/src/graphics/ScreenFonts.h
@@ -12,8 +12,8 @@
 #include "graphics/fonts/OLEDDisplayFontsUA.h"
 #endif

-#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(USE_ST7789) ||          \
-     defined(HX8357_CS)) &&                                                                                                      \
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) || defined(ST7789_CS) ||           \
+     defined(USE_ST7789) || defined(HX8357_CS)) &&                                                                               \
    !defined(DISPLAY_FORCE_SMALL_FONTS)
 // The screen is bigger so use bigger fonts
 #define FONT_SMALL ArialMT_Plain_16  // Height: 19
--- a/src/graphics/TFTDisplay.cpp
+++ b/src/graphics/TFTDisplay.cpp
@@ -500,10 +500,126 @@ class LGFX : public lgfx::LGFX_Device

 static LGFX *tft = nullptr;

+#elif defined(ST7701_CS)
+#include <LovyanGFX.hpp> // Graphics and font library for ST7701 driver chip
+#include <lgfx/v1/platforms/esp32s3/Bus_RGB.hpp>
+#include <lgfx/v1/platforms/esp32s3/Panel_RGB.hpp>
+
+class LGFX : public lgfx::LGFX_Device
+{
+    lgfx::Panel_ST7701 _panel_instance;
+    lgfx::Bus_RGB _bus_instance;
+    lgfx::Light_PWM _light_instance;
+    lgfx::Touch_FT5x06 _touch_instance;
+
+  public:
+    LGFX(void)
+    {
+        {
+            auto cfg = _panel_instance.config();
+            cfg.memory_width = 800;
+            cfg.memory_height = 480;
+            cfg.panel_width = TFT_WIDTH;
+            cfg.panel_height = TFT_HEIGHT;
+            cfg.offset_x = TFT_OFFSET_X;
+            cfg.offset_y = TFT_OFFSET_Y;
+            _panel_instance.config(cfg);
+        }
+
+        {
+            auto cfg = _panel_instance.config_detail();
+            cfg.pin_cs = ST7701_CS;
+            cfg.pin_sclk = ST7701_SCK;
+            cfg.pin_mosi = ST7701_SDA;
+            // cfg.use_psram = 1;
+            _panel_instance.config_detail(cfg);
+        }
+
+        {
+            auto cfg = _bus_instance.config();
+            cfg.panel = &_panel_instance;
+#ifdef SENSECAP_INDICATOR
+            cfg.pin_d0 = GPIO_NUM_15; // B0
+            cfg.pin_d1 = GPIO_NUM_14; // B1
+            cfg.pin_d2 = GPIO_NUM_13; // B2
+            cfg.pin_d3 = GPIO_NUM_12; // B3
+            cfg.pin_d4 = GPIO_NUM_11; // B4
+
+            cfg.pin_d5 = GPIO_NUM_10; // G0
+            cfg.pin_d6 = GPIO_NUM_9;  // G1
+            cfg.pin_d7 = GPIO_NUM_8;  // G2
+            cfg.pin_d8 = GPIO_NUM_7;  // G3
+            cfg.pin_d9 = GPIO_NUM_6;  // G4
+            cfg.pin_d10 = GPIO_NUM_5; // G5
+
+            cfg.pin_d11 = GPIO_NUM_4; // R0
+            cfg.pin_d12 = GPIO_NUM_3; // R1
+            cfg.pin_d13 = GPIO_NUM_2; // R2
+            cfg.pin_d14 = GPIO_NUM_1; // R3
+            cfg.pin_d15 = GPIO_NUM_0; // R4
+
+            cfg.pin_henable = GPIO_NUM_18;
+            cfg.pin_vsync = GPIO_NUM_17;
+            cfg.pin_hsync = GPIO_NUM_16;
+            cfg.pin_pclk = GPIO_NUM_21;
+            cfg.freq_write = 12000000;
+
+            cfg.hsync_polarity = 0;
+            cfg.hsync_front_porch = 10;
+            cfg.hsync_pulse_width = 8;
+            cfg.hsync_back_porch = 50;
+
+            cfg.vsync_polarity = 0;
+            cfg.vsync_front_porch = 10;
+            cfg.vsync_pulse_width = 8;
+            cfg.vsync_back_porch = 20;
+
+            cfg.pclk_active_neg = 0;
+            cfg.de_idle_high = 1;
+            cfg.pclk_idle_high = 0;
+#endif
+            _bus_instance.config(cfg);
+        }
+        _panel_instance.setBus(&_bus_instance);
+
+        {
+            auto cfg = _light_instance.config();
+            cfg.pin_bl = ST7701_BL;
+            _light_instance.config(cfg);
+        }
+        _panel_instance.light(&_light_instance);
+
+        {
+            auto cfg = _touch_instance.config();
+            cfg.pin_cs = -1;
+            cfg.x_min = 0;
+            cfg.x_max = 479;
+            cfg.y_min = 0;
+            cfg.y_max = 479;
+            cfg.pin_int = -1; // don't use SCREEN_TOUCH_INT;
+            cfg.pin_rst = SCREEN_TOUCH_RST;
+            cfg.bus_shared = true;
+            cfg.offset_rotation = TFT_OFFSET_ROTATION;
+
+            cfg.i2c_port = TOUCH_I2C_PORT;
+            cfg.i2c_addr = TOUCH_SLAVE_ADDRESS;
+            cfg.pin_sda = I2C_SDA;
+            cfg.pin_scl = I2C_SCL;
+            cfg.freq = 400000;
+            _touch_instance.config(cfg);
+            _panel_instance.setTouch(&_touch_instance);
+        }
+
+        setPanel(&_panel_instance);
+    }
+};
+
+static LGFX *tft = nullptr;
+
 #endif

-#if defined(ST7735_CS) || defined(ST7789_CS) || defined(ILI9341_DRIVER) || defined(RAK14014) || defined(HX8357_CS) ||            \
-    (ARCH_PORTDUINO && HAS_SCREEN != 0)
+#if defined(ST7701_CS) || defined(ST7735_CS) || defined(ST7789_CS) || defined(ILI9341_DRIVER) || defined(RAK14014) ||            \
+    defined(HX8357_CS) || (ARCH_PORTDUINO && HAS_SCREEN != 0)
 #include "SPILock.h"
 #include "TFTDisplay.h"
 #include <SPI.h>
@@ -709,7 +825,6 @@ bool TFTDisplay::connect()

 #ifdef UNPHONE
    unphone.backlight(true); // using unPhone library
-    LOG_INFO("Power to TFT Backlight\n");
 #endif

    tft->init();
@@ -725,7 +840,7 @@ bool TFTDisplay::connect()
    attachInterrupt(digitalPinToInterrupt(SCREEN_TOUCH_INT), rak14014_tpIntHandle, FALLING);
 #elif defined(T_DECK) || defined(PICOMPUTER_S3) || defined(CHATTER_2)
    tft->setRotation(1); // T-Deck has the TFT in landscape
-#elif defined(T_WATCH_S3)
+#elif defined(T_WATCH_S3) || defined(SENSECAP_INDICATOR)
    tft->setRotation(2); // T-Watch S3 left-handed orientation
 #else
    tft->setRotation(3); // Orient horizontal and wide underneath the silkscreen name label
--- a/src/graphics/images.h
+++ b/src/graphics/images.h
@@ -20,8 +20,8 @@ const uint8_t bluetoothConnectedIcon[36] PROGMEM = {0xfe, 0x01, 0xff, 0x03, 0x03
                                                    0xfe, 0x31, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0xf0, 0x3f, 0xe0, 0x1f};
 #endif

-#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(USE_ST7789) ||          \
-     defined(HX8357_CS) || ARCH_PORTDUINO) &&                                                                                    \
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) || defined(ST7789_CS) ||           \
+     defined(USE_ST7789) || defined(HX8357_CS) || ARCH_PORTDUINO) &&                                                             \
    !defined(DISPLAY_FORCE_SMALL_FONTS)
 const uint8_t imgQuestionL1[] PROGMEM = {0xff, 0x01, 0x01, 0x32, 0x7b, 0x49, 0x49, 0x6f, 0x26, 0x01, 0x01, 0xff};
 const uint8_t imgQuestionL2[] PROGMEM = {0x0f, 0x08, 0x08, 0x08, 0x06, 0x0f, 0x0f, 0x06, 0x08, 0x08, 0x08, 0x0f};
--- a/src/input/cardKbI2cImpl.cpp
+++ b/src/input/cardKbI2cImpl.cpp
@@ -9,7 +9,7 @@ CardKbI2cImpl::CardKbI2cImpl() : KbI2cBase("cardKB") {}

 void CardKbI2cImpl::init()
 {
-#ifndef ARCH_PORTDUINO
+#if !MESHTASTIC_EXCLUDE_I2C && !defined(ARCH_PORTDUINO)
    if (cardkb_found.address == 0x00) {
        LOG_DEBUG("Rescanning for I2C keyboard\n");
        uint8_t i2caddr_scan[] = {CARDKB_ADDR, TDECK_KB_ADDR, BBQ10_KB_ADDR};
@@ -57,4 +57,4 @@ void CardKbI2cImpl::init()
    }
 #endif
    inputBroker->registerSource(this);
-}
+}
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -390,7 +390,7 @@ void setup()
 #endif

 #ifdef AQ_SET_PIN
-    // RAK-12039 set pin for Air quality sensor
+    // RAK-12039 set pin for Air quality sensor. Detectable on I2C after ~3 seconds, so we need to rescan later
    pinMode(AQ_SET_PIN, OUTPUT);
    digitalWrite(AQ_SET_PIN, HIGH);
 #endif
@@ -560,6 +560,7 @@ void setup()
    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::QMC6310, meshtastic_TelemetrySensorType_QMC6310)
    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::QMI8658, meshtastic_TelemetrySensorType_QMI8658)
    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::QMC5883L, meshtastic_TelemetrySensorType_QMC5883L)
+    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::HMC5883L, meshtastic_TelemetrySensorType_QMC5883L)
    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::PMSA0031, meshtastic_TelemetrySensorType_PMSA003I)
    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::RCWL9620, meshtastic_TelemetrySensorType_RCWL9620)
    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::VEML7700, meshtastic_TelemetrySensorType_VEML7700)
@@ -586,6 +587,9 @@ void setup()

    // Hello
    printInfo();
+#ifdef BUILD_EPOCH
+    LOG_INFO("Build timestamp: %ld\n", BUILD_EPOCH);
+#endif

 #ifdef ARCH_ESP32
    esp32Setup();
@@ -745,8 +749,8 @@ void setup()
 #if !MESHTASTIC_EXCLUDE_I2C
 // Don't call screen setup until after nodedb is setup (because we need
 // the current region name)
-#if defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7789_CS) || defined(HX8357_CS) ||            \
-    defined(USE_ST7789)
+#if defined(ST7701_CS) || defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7789_CS) ||            \
+    defined(HX8357_CS) || defined(USE_ST7789)
    screen->setup();
 #elif defined(ARCH_PORTDUINO)
    if (screen_found.port != ScanI2C::I2CPort::NO_I2C || settingsMap[displayPanel]) {
@@ -760,12 +764,6 @@ void setup()

    screen->print("Started...\n");

-#ifdef SX126X_ANT_SW
-    // make analog PA vs not PA switch on SX126x eval board work properly
-    pinMode(SX126X_ANT_SW, OUTPUT);
-    digitalWrite(SX126X_ANT_SW, 1);
-#endif
-
 #ifdef PIN_PWR_DELAY_MS
    // This may be required to give the peripherals time to power up.
    delay(PIN_PWR_DELAY_MS);
@@ -1093,6 +1091,9 @@ extern meshtastic_DeviceMetadata getDeviceMetadata()
    deviceMetadata.position_flags = config.position.position_flags;
    deviceMetadata.hw_model = HW_VENDOR;
    deviceMetadata.hasRemoteHardware = moduleConfig.remote_hardware.enabled;
+#if !(MESHTASTIC_EXCLUDE_PKI)
+    deviceMetadata.hasPKC = true;
+#endif
    return deviceMetadata;
 }
 #ifndef PIO_UNIT_TESTING
--- a/src/mesh/CryptoEngine.cpp
+++ b/src/mesh/CryptoEngine.cpp
@@ -84,7 +84,7 @@ bool CryptoEngine::encryptCurve25519(uint32_t toNode, uint32_t fromNode, uint64_

    // Calculate the shared secret with the destination node and encrypt
    printBytes("Attempting encrypt using nonce: ", nonce, 13);
-    printBytes("Attempting encrypt using shared_key: ", shared_key, 32);
+    printBytes("Attempting encrypt using shared_key starting with: ", shared_key, 8);
    aes_ccm_ae(shared_key, 32, nonce, 8, bytes, numBytes, nullptr, 0, bytesOut,
               auth); // this can write up to 15 bytes longer than numbytes past bytesOut
    *extraNonce = extraNonceTmp;
@@ -117,7 +117,7 @@ bool CryptoEngine::decryptCurve25519(uint32_t fromNode, uint64_t packetNum, size
    }
    initNonce(fromNode, packetNum, *extraNonce);
    printBytes("Attempting decrypt using nonce: ", nonce, 13);
-    printBytes("Attempting decrypt using shared_key: ", shared_key, 32);
+    printBytes("Attempting decrypt using shared_key starting with: ", shared_key, 8);
    return aes_ccm_ad(shared_key, 32, nonce, 8, bytes, numBytes - 12, nullptr, 0, auth, bytesOut);
 }

@@ -137,11 +137,12 @@ bool CryptoEngine::setDHKey(uint32_t nodeNum)
        LOG_DEBUG("Node %d or their public_key not found\n", nodeNum);
        return false;
    }
-
+    printBytes("Generating DH with remote pubkey: ", node->user.public_key.bytes, 32);
+    printBytes("And local pubkey: ", config.security.public_key.bytes, 32);
    if (!setDHPublicKey(node->user.public_key.bytes))
        return false;

-    printBytes("DH Output: ", shared_key, 32);
+    // printBytes("DH Output: ", shared_key, 32);

    /**
     * D.J. Bernstein reccomends hashing the shared key. We want to do this because there are
--- a/src/mesh/Default.h
+++ b/src/mesh/Default.h
@@ -3,6 +3,8 @@
 #include <cstdint>
 #define ONE_DAY 24 * 60 * 60
 #define ONE_MINUTE_MS 60 * 1000
+#define THIRTY_SECONDS_MS 30 * 1000
+#define FIVE_SECONDS_MS 5 * 1000

 #define default_gps_update_interval IF_ROUTER(ONE_DAY, 2 * 60)
 #define default_telemetry_broadcast_interval_secs IF_ROUTER(ONE_DAY / 2, 30 * 60)
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -121,6 +121,8 @@ NodeDB::NodeDB()
    owner.hw_model = HW_VENDOR;
    // Ensure user (nodeinfo) role is set to whatever we're configured to
    owner.role = config.device.role;
+    // Ensure macaddr is set to our macaddr as it will be copied in our info below
+    memcpy(owner.macaddr, ourMacAddr, sizeof(owner.macaddr));

    // Include our owner in the node db under our nodenum
    meshtastic_NodeInfoLite *info = getOrCreateMeshNode(getNodeNum());
@@ -243,7 +245,7 @@ bool NodeDB::factoryReset(bool eraseBleBonds)
 #endif
    // second, install default state (this will deal with the duplicate mac address issue)
    installDefaultDeviceState();
-    installDefaultConfig();
+    installDefaultConfig(!eraseBleBonds); // Also preserve the private key if we're not erasing BLE bonds
    installDefaultModuleConfig();
    installDefaultChannels();
    // third, write everything to disk
@@ -266,8 +268,13 @@ bool NodeDB::factoryReset(bool eraseBleBonds)
    return true;
 }

-void NodeDB::installDefaultConfig()
+void NodeDB::installDefaultConfig(bool preserveKey = false)
 {
+    uint8_t private_key_temp[32];
+    bool shouldPreserveKey = preserveKey && config.has_security && config.security.private_key.size > 0;
+    if (shouldPreserveKey) {
+        memcpy(private_key_temp, config.security.private_key.bytes, config.security.private_key.size);
+    }
    LOG_INFO("Installing default LocalConfig\n");
    memset(&config, 0, sizeof(meshtastic_LocalConfig));
    config.version = DEVICESTATE_CUR_VER;
@@ -308,8 +315,14 @@ void NodeDB::installDefaultConfig()
 #else
    config.security.admin_key[0].size = 0;
 #endif
+    if (shouldPreserveKey) {
+        config.security.private_key.size = 32;
+        memcpy(config.security.private_key.bytes, private_key_temp, config.security.private_key.size);
+        printBytes("Restored key", config.security.private_key.bytes, config.security.private_key.size);
+    } else {
+        config.security.private_key.size = 0;
+    }
    config.security.public_key.size = 0;
-    config.security.private_key.size = 0;
 #ifdef PIN_GPS_EN
    config.position.gps_en_gpio = PIN_GPS_EN;
 #endif
@@ -641,10 +654,12 @@ void NodeDB::pickNewNodeNum()
    }

    meshtastic_NodeInfoLite *found;
-    while ((nodeNum == NODENUM_BROADCAST || nodeNum < NUM_RESERVED) ||
-           ((found = getMeshNode(nodeNum)) && memcmp(found->user.macaddr, ourMacAddr, sizeof(ourMacAddr)) != 0)) {
+    while (((found = getMeshNode(nodeNum)) && memcmp(found->user.macaddr, ourMacAddr, sizeof(ourMacAddr)) != 0) ||
+           (nodeNum == NODENUM_BROADCAST || nodeNum < NUM_RESERVED)) {
        NodeNum candidate = random(NUM_RESERVED, LONG_MAX); // try a new random choice
-        LOG_WARN("NOTE! Our desired nodenum 0x%x is invalid or in use, so trying for 0x%x\n", nodeNum, candidate);
+        LOG_WARN("NOTE! Our desired nodenum 0x%x is invalid or in use, by MAC ending in 0x%02x%02x vs our 0x%02x%02x, so "
+                 "trying for 0x%x\n",
+                 nodeNum, found->user.macaddr[4], found->user.macaddr[5], ourMacAddr[4], ourMacAddr[5], candidate);
        nodeNum = candidate;
    }
    LOG_DEBUG("Using nodenum 0x%x \n", nodeNum);
@@ -710,7 +725,7 @@ void NodeDB::loadFromDisk()
    //} else {
    if (devicestate.version < DEVICESTATE_MIN_VER) {
        LOG_WARN("Devicestate %d is old, discarding\n", devicestate.version);
-        factoryReset();
+        installDefaultDeviceState();
    } else {
        LOG_INFO("Loaded saved devicestate version %d, with nodecount: %d\n", devicestate.version,
                 devicestate.node_db_lite.size());
@@ -726,7 +741,7 @@ void NodeDB::loadFromDisk()
    } else {
        if (config.version < DEVICESTATE_MIN_VER) {
            LOG_WARN("config %d is old, discarding\n", config.version);
-            installDefaultConfig();
+            installDefaultConfig(true);
        } else {
            LOG_INFO("Loaded saved config version %d\n", config.version);
        }
@@ -1039,7 +1054,7 @@ bool NodeDB::updateUser(uint32_t nodeId, meshtastic_User &p, uint8_t channelInde
    if (p.public_key.size > 0) {
        printBytes("Incoming Pubkey: ", p.public_key.bytes, 32);
        if (info->user.public_key.size > 0) { // if we have a key for this user already, don't overwrite with a new one
-            LOG_INFO("Public Key set for node, not updateing!\n");
+            LOG_INFO("Public Key set for node, not updating!\n");
            // we copy the key into the incoming packet, to prevent overwrite
            memcpy(p.public_key.bytes, info->user.public_key.bytes, 32);
        } else {
@@ -1097,8 +1112,10 @@ void NodeDB::updateFrom(const meshtastic_MeshPacket &mp)
        info->via_mqtt = mp.via_mqtt; // Store if we received this packet via MQTT

        // If hopStart was set and there wasn't someone messing with the limit in the middle, add hopsAway
-        if (mp.hop_start != 0 && mp.hop_limit <= mp.hop_start)
+        if (mp.hop_start != 0 && mp.hop_limit <= mp.hop_start) {
+            info->has_hops_away = true;
            info->hops_away = mp.hop_start - mp.hop_limit;
+        }
    }
 }

@@ -1194,4 +1211,4 @@ void recordCriticalError(meshtastic_CriticalErrorCode code, uint32_t address, co
    LOG_ERROR("A critical failure occurred, portduino is exiting...");
    exit(2);
 #endif
-}
+}
--- a/src/mesh/NodeDB.h
+++ b/src/mesh/NodeDB.h
@@ -182,7 +182,8 @@ class NodeDB
    void cleanupMeshDB();

    /// Reinit device state from scratch (not loading from disk)
-    void installDefaultDeviceState(), installDefaultChannels(), installDefaultConfig(), installDefaultModuleConfig();
+    void installDefaultDeviceState(), installDefaultChannels(), installDefaultConfig(bool preserveKey),
+        installDefaultModuleConfig();

    /// write to flash
    /// @return true if the save was successful
--- a/src/mesh/PhoneAPI.cpp
+++ b/src/mesh/PhoneAPI.cpp
@@ -25,6 +25,7 @@
 #if !MESHTASTIC_EXCLUDE_MQTT
 #include "mqtt/MQTT.h"
 #endif
+#include <RTC.h>

 PhoneAPI::PhoneAPI()
 {
@@ -194,7 +195,7 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
        auto us = nodeDB->readNextMeshNode(readIndex);
        if (us) {
            nodeInfoForPhone = TypeConversions::ConvertToNodeInfo(us);
-            nodeInfoForPhone.hops_away = 0;
+            nodeInfoForPhone.has_hops_away = false;
            nodeInfoForPhone.is_favorite = true;
            fromRadioScratch.which_payload_variant = meshtastic_FromRadio_node_info_tag;
            fromRadioScratch.node_info = nodeInfoForPhone;
@@ -541,14 +542,37 @@ bool PhoneAPI::available()
    return false;
 }

+void PhoneAPI::sendNotification(meshtastic_LogRecord_Level level, uint32_t replyId, const char *message)
+{
+    meshtastic_ClientNotification *cn = clientNotificationPool.allocZeroed();
+    cn->has_reply_id = true;
+    cn->reply_id = replyId;
+    cn->level = meshtastic_LogRecord_Level_WARNING;
+    cn->time = getValidTime(RTCQualityFromNet);
+    strncpy(cn->message, message, sizeof(cn->message));
+    service->sendClientNotification(cn);
+    delete cn;
+}
+
 /**
 * Handle a packet that the phone wants us to send.  It is our responsibility to free the packet to the pool
 */
 bool PhoneAPI::handleToRadioPacket(meshtastic_MeshPacket &p)
 {
    printPacket("PACKET FROM PHONE", &p);
+    if (p.decoded.portnum == meshtastic_PortNum_TRACEROUTE_APP && lastPortNumToRadio[p.decoded.portnum] &&
+        (millis() - lastPortNumToRadio[p.decoded.portnum]) < (THIRTY_SECONDS_MS)) {
+        LOG_WARN("Rate limiting portnum %d\n", p.decoded.portnum);
+        sendNotification(meshtastic_LogRecord_Level_WARNING, p.id, "TraceRoute can only be sent once every 30 seconds");
+        return false;
+    } else if (p.decoded.portnum == meshtastic_PortNum_POSITION_APP && lastPortNumToRadio[p.decoded.portnum] &&
+               (millis() - lastPortNumToRadio[p.decoded.portnum]) < (FIVE_SECONDS_MS)) {
+        LOG_WARN("Rate limiting portnum %d\n", p.decoded.portnum);
+        sendNotification(meshtastic_LogRecord_Level_WARNING, p.id, "Position can only be sent once every 5 seconds");
+        return false;
+    }
+    lastPortNumToRadio[p.decoded.portnum] = millis();
    service->handleToRadio(p);
-
    return true;
 }

--- a/src/mesh/PhoneAPI.h
+++ b/src/mesh/PhoneAPI.h
@@ -2,8 +2,10 @@

 #include "Observer.h"
 #include "mesh-pb-constants.h"
+#include "meshtastic/portnums.pb.h"
 #include <iterator>
 #include <string>
+#include <unordered_map>
 #include <vector>

 // Make sure that we never let our packets grow too large for one BLE packet
@@ -48,6 +50,9 @@ class PhoneAPI

    uint8_t config_state = 0;

+    // Hashmap of timestamps for last time we received a packet on the API per portnum
+    std::unordered_map<meshtastic_PortNum, uint32_t> lastPortNumToRadio;
+
    /**
     * Each packet sent to the phone has an incrementing count
     */
@@ -99,6 +104,11 @@ class PhoneAPI
     */
    virtual bool handleToRadio(const uint8_t *buf, size_t len);

+    /**
+     * Send a (client)notification to the phone
+     */
+    virtual void sendNotification(meshtastic_LogRecord_Level level, uint32_t replyId, const char *message);
+
    /**
     * Get the next packet we want to send to the phone
     *
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -185,9 +185,12 @@ ErrorCode Router::sendLocal(meshtastic_MeshPacket *p, RxSource src)
            handleReceived(p, src);
        }

-        if (!p->channel) { // don't override if a channel was requested
-            p->channel = nodeDB->getMeshNodeChannel(p->to);
-            LOG_DEBUG("localSend to channel %d\n", p->channel);
+        if (!p->channel && !p->pki_encrypted) { // don't override if a channel was requested
+            meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(p->to);
+            if (node && node->user.public_key.size == 0) {
+                p->channel = node->channel;
+                LOG_DEBUG("localSend to channel %d\n", p->channel);
+            }
        }

        return send(p);
@@ -344,8 +347,11 @@ bool perhapsDecode(meshtastic_MeshPacket *p)
                // memcpy(bytes, ScratchEncrypted, rawSize); // TODO: Rename the bytes buffers
                // chIndex = 8;
            } else {
+                LOG_ERROR("PKC Decrypted, but pb_decode failed!\n");
                return false;
            }
+        } else {
+            LOG_WARN("PKC decrypt attempted but failed!\n");
        }
    }
 #endif
@@ -478,10 +484,20 @@ meshtastic_Routing_Error perhapsEncode(meshtastic_MeshPacket *p)

 #if !(MESHTASTIC_EXCLUDE_PKI)
        meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(p->to);
-        if (!owner.is_licensed && config.security.private_key.size == 32 && p->to != NODENUM_BROADCAST && node != nullptr &&
-            node->user.public_key.size > 0 && p->decoded.portnum != meshtastic_PortNum_TRACEROUTE_APP &&
-            p->decoded.portnum != meshtastic_PortNum_NODEINFO_APP && p->decoded.portnum != meshtastic_PortNum_ROUTING_APP &&
-            p->decoded.portnum != meshtastic_PortNum_POSITION_APP) {
+        // We may want to retool things so we can send a PKC packet when the client specifies a key and nodenum, even if the node
+        // is not in the local nodedb
+        if (
+            // Don't use PKC with Ham mode
+            !owner.is_licensed &&
+            // Don't use PKC if it's not explicitly requested and a non-primary channel is requested
+            !(p->pki_encrypted != true && p->channel > 0) &&
+            // Check for valid keys and single node destination
+            config.security.private_key.size == 32 && p->to != NODENUM_BROADCAST && node != nullptr &&
+            // Check for a known public key for the destination
+            (node->user.public_key.size == 32) &&
+            // Some portnums either make no sense to send with PKC
+            p->decoded.portnum != meshtastic_PortNum_TRACEROUTE_APP && p->decoded.portnum != meshtastic_PortNum_NODEINFO_APP &&
+            p->decoded.portnum != meshtastic_PortNum_ROUTING_APP && p->decoded.portnum != meshtastic_PortNum_POSITION_APP) {
            LOG_DEBUG("Using PKI!\n");
            if (numbytes + 12 > MAX_RHPACKETLEN)
                return meshtastic_Routing_Error_TOO_LARGE;
--- a/src/mesh/SX126xInterface.cpp
+++ b/src/mesh/SX126xInterface.cpp
@@ -25,9 +25,25 @@ SX126xInterface<T>::SX126xInterface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs
 /// \return true if initialisation succeeded.
 template <typename T> bool SX126xInterface<T>::init()
 {
-#ifdef SX126X_POWER_EN
-    pinMode(SX126X_POWER_EN, OUTPUT);
+
+// Typically, the RF switch on SX126x boards is controlled by two signals, which are negations of each other (switched RFIO
+// paths). The negation is usually performed in hardware, or (suboptimal design) TXEN and RXEN are the two inputs to this style of
+// RF switch. On some boards, there is no hardware negation between CTRL and ¬CTRL, but CTRL is internally connected to DIO2, and
+// DIO2's switching is done by the SX126X itself, so the MCU can't control ¬CTRL at exactly the same time. One solution would be
+// to set ¬CTRL as SX126X_TXEN or SX126X_RXEN, but they may already be used for another purpose, such as controlling another
+// PA/LNA. Keeping ¬CTRL high seems to work, as long CTRL=1, ¬CTRL=1 has the opposite and stable RF path effect as CTRL=0 and
+// ¬CTRL=1, this depends on the RF switch, but it seems this usually works. Better hardware design, which is done most the time,
+// means this workaround is not necessary.
+#ifdef SX126X_ANT_SW // Perhaps add RADIOLIB_NC check, and beforehand define as such if it is undefined, but it is not commonly
+                     // used and not part of the 'default' set of pin definitions.
+    digitalWrite(SX126X_ANT_SW, HIGH);
+    pinMode(SX126X_ANT_SW, OUTPUT);
+#endif
+
+#ifdef SX126X_POWER_EN // Perhaps add RADIOLIB_NC check, and beforehand define as such if it is undefined, but it is not commonly
+                       // used and not part of the 'default' set of pin definitions.
    digitalWrite(SX126X_POWER_EN, HIGH);
+    pinMode(SX126X_POWER_EN, OUTPUT);
 #endif

 #if ARCH_PORTDUINO
--- a/src/mesh/TypeConversions.cpp
+++ b/src/mesh/TypeConversions.cpp
@@ -11,9 +11,13 @@ meshtastic_NodeInfo TypeConversions::ConvertToNodeInfo(const meshtastic_NodeInfo
    info.last_heard = lite->last_heard;
    info.channel = lite->channel;
    info.via_mqtt = lite->via_mqtt;
-    info.hops_away = lite->hops_away;
    info.is_favorite = lite->is_favorite;

+    if (lite->has_hops_away) {
+        info.has_hops_away = true;
+        info.hops_away = lite->hops_away;
+    }
+
    if (lite->has_position) {
        info.has_position = true;
        if (lite->position.latitude_i != 0)
@@ -78,7 +82,7 @@ meshtastic_UserLite TypeConversions::ConvertToUserLite(meshtastic_User user)
    lite.hw_model = user.hw_model;
    lite.role = user.role;
    lite.is_licensed = user.is_licensed;
-    memccpy(lite.macaddr, user.macaddr, sizeof(user.macaddr), sizeof(lite.macaddr));
+    memcpy(lite.macaddr, user.macaddr, sizeof(lite.macaddr));
    memcpy(lite.public_key.bytes, user.public_key.bytes, sizeof(lite.public_key.bytes));
    lite.public_key.size = user.public_key.size;
    return lite;
@@ -94,7 +98,7 @@ meshtastic_User TypeConversions::ConvertToUser(uint32_t nodeNum, meshtastic_User
    user.hw_model = lite.hw_model;
    user.role = lite.role;
    user.is_licensed = lite.is_licensed;
-    memccpy(user.macaddr, lite.macaddr, sizeof(lite.macaddr), sizeof(user.macaddr));
+    memcpy(user.macaddr, lite.macaddr, sizeof(user.macaddr));
    memcpy(user.public_key.bytes, lite.public_key.bytes, sizeof(user.public_key.bytes));
    user.public_key.size = lite.public_key.size;

--- a/src/mesh/generated/meshtastic/atak.pb.h
+++ b/src/mesh/generated/meshtastic/atak.pb.h
@@ -120,6 +120,7 @@ typedef struct _meshtastic_PLI {
    uint16_t course;
 } meshtastic_PLI;

+typedef PB_BYTES_ARRAY_T(220) meshtastic_TAKPacket_detail_t;
 /* Packets for the official ATAK Plugin */
 typedef struct _meshtastic_TAKPacket {
    /* Are the payloads strings compressed for LoRA transport? */
@@ -139,6 +140,9 @@ typedef struct _meshtastic_TAKPacket {
        meshtastic_PLI pli;
        /* ATAK GeoChat message */
        meshtastic_GeoChat chat;
+        /* Generic CoT detail XML
+     May be compressed / truncated by the sender */
+        meshtastic_TAKPacket_detail_t detail;
    } payload_variant;
 } meshtastic_TAKPacket;

@@ -199,6 +203,7 @@ extern "C" {
 #define meshtastic_TAKPacket_status_tag          4
 #define meshtastic_TAKPacket_pli_tag             5
 #define meshtastic_TAKPacket_chat_tag            6
+#define meshtastic_TAKPacket_detail_tag          7

 /* Struct field encoding specification for nanopb */
 #define meshtastic_TAKPacket_FIELDLIST(X, a) \
@@ -207,7 +212,8 @@ X(a, STATIC,   OPTIONAL, MESSAGE,  contact,           2) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  group,             3) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  status,            4) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,pli,payload_variant.pli),   5) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,chat,payload_variant.chat),   6)
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,chat,payload_variant.chat),   6) \
+X(a, STATIC,   ONEOF,    BYTES,    (payload_variant,detail,payload_variant.detail),   7)
 #define meshtastic_TAKPacket_CALLBACK NULL
 #define meshtastic_TAKPacket_DEFAULT NULL
 #define meshtastic_TAKPacket_contact_MSGTYPE meshtastic_Contact
--- a/src/mesh/generated/meshtastic/clientonly.pb.h
+++ b/src/mesh/generated/meshtastic/clientonly.pb.h
@@ -5,6 +5,7 @@
 #define PB_MESHTASTIC_MESHTASTIC_CLIENTONLY_PB_H_INCLUDED
 #include <pb.h>
 #include "meshtastic/localonly.pb.h"
+#include "meshtastic/mesh.pb.h"

 #if PB_PROTO_HEADER_VERSION != 40
 #error Regenerate this file with the current version of nanopb generator.
@@ -28,6 +29,15 @@ typedef struct _meshtastic_DeviceProfile {
    /* The ModuleConfig of the node */
    bool has_module_config;
    meshtastic_LocalModuleConfig module_config;
+    /* Fixed position data */
+    bool has_fixed_position;
+    meshtastic_Position fixed_position;
+    /* Ringtone for ExternalNotification */
+    bool has_ringtone;
+    char ringtone[231];
+    /* Predefined messages for CannedMessage */
+    bool has_canned_messages;
+    char canned_messages[201];
 } meshtastic_DeviceProfile;


@@ -36,8 +46,8 @@ extern "C" {
 #endif

 /* Initializer values for message structs */
-#define meshtastic_DeviceProfile_init_default    {false, "", false, "", {{NULL}, NULL}, false, meshtastic_LocalConfig_init_default, false, meshtastic_LocalModuleConfig_init_default}
-#define meshtastic_DeviceProfile_init_zero       {false, "", false, "", {{NULL}, NULL}, false, meshtastic_LocalConfig_init_zero, false, meshtastic_LocalModuleConfig_init_zero}
+#define meshtastic_DeviceProfile_init_default    {false, "", false, "", {{NULL}, NULL}, false, meshtastic_LocalConfig_init_default, false, meshtastic_LocalModuleConfig_init_default, false, meshtastic_Position_init_default, false, "", false, ""}
+#define meshtastic_DeviceProfile_init_zero       {false, "", false, "", {{NULL}, NULL}, false, meshtastic_LocalConfig_init_zero, false, meshtastic_LocalModuleConfig_init_zero, false, meshtastic_Position_init_zero, false, "", false, ""}

 /* Field tags (for use in manual encoding/decoding) */
 #define meshtastic_DeviceProfile_long_name_tag   1
@@ -45,6 +55,9 @@ extern "C" {
 #define meshtastic_DeviceProfile_channel_url_tag 3
 #define meshtastic_DeviceProfile_config_tag      4
 #define meshtastic_DeviceProfile_module_config_tag 5
+#define meshtastic_DeviceProfile_fixed_position_tag 6
+#define meshtastic_DeviceProfile_ringtone_tag    7
+#define meshtastic_DeviceProfile_canned_messages_tag 8

 /* Struct field encoding specification for nanopb */
 #define meshtastic_DeviceProfile_FIELDLIST(X, a) \
@@ -52,11 +65,15 @@ X(a, STATIC,   OPTIONAL, STRING,   long_name,         1) \
 X(a, STATIC,   OPTIONAL, STRING,   short_name,        2) \
 X(a, CALLBACK, OPTIONAL, STRING,   channel_url,       3) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  config,            4) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  module_config,     5)
+X(a, STATIC,   OPTIONAL, MESSAGE,  module_config,     5) \
+X(a, STATIC,   OPTIONAL, MESSAGE,  fixed_position,    6) \
+X(a, STATIC,   OPTIONAL, STRING,   ringtone,          7) \
+X(a, STATIC,   OPTIONAL, STRING,   canned_messages,   8)
 #define meshtastic_DeviceProfile_CALLBACK pb_default_field_callback
 #define meshtastic_DeviceProfile_DEFAULT NULL
 #define meshtastic_DeviceProfile_config_MSGTYPE meshtastic_LocalConfig
 #define meshtastic_DeviceProfile_module_config_MSGTYPE meshtastic_LocalModuleConfig
+#define meshtastic_DeviceProfile_fixed_position_MSGTYPE meshtastic_Position

 extern const pb_msgdesc_t meshtastic_DeviceProfile_msg;

--- a/src/mesh/generated/meshtastic/config.pb.h
+++ b/src/mesh/generated/meshtastic/config.pb.h
@@ -535,7 +535,7 @@ typedef struct _meshtastic_Config_SecurityConfig {
    meshtastic_Config_SecurityConfig_private_key_t private_key;
    /* The public key authorized to send admin messages to this node. */
    pb_size_t admin_key_count;
-    meshtastic_Config_SecurityConfig_admin_key_t admin_key[1];
+    meshtastic_Config_SecurityConfig_admin_key_t admin_key[3];
    /* If true, device is considered to be "managed" by a mesh administrator via admin messages
 Device is managed by a mesh administrator. */
    bool is_managed;
@@ -660,7 +660,7 @@ extern "C" {
 #define meshtastic_Config_DisplayConfig_init_default {0, _meshtastic_Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _meshtastic_Config_DisplayConfig_DisplayUnits_MIN, _meshtastic_Config_DisplayConfig_OledType_MIN, _meshtastic_Config_DisplayConfig_DisplayMode_MIN, 0, 0, _meshtastic_Config_DisplayConfig_CompassOrientation_MIN}
 #define meshtastic_Config_LoRaConfig_init_default {0, _meshtastic_Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _meshtastic_Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0}, 0, 0}
 #define meshtastic_Config_BluetoothConfig_init_default {0, _meshtastic_Config_BluetoothConfig_PairingMode_MIN, 0}
-#define meshtastic_Config_SecurityConfig_init_default {{0, {0}}, {0, {0}}, 0, {{0, {0}}}, 0, 0, 0, 0}
+#define meshtastic_Config_SecurityConfig_init_default {{0, {0}}, {0, {0}}, 0, {{0, {0}}, {0, {0}}, {0, {0}}}, 0, 0, 0, 0}
 #define meshtastic_Config_SessionkeyConfig_init_default {0}
 #define meshtastic_Config_init_zero              {0, {meshtastic_Config_DeviceConfig_init_zero}}
 #define meshtastic_Config_DeviceConfig_init_zero {_meshtastic_Config_DeviceConfig_Role_MIN, 0, 0, 0, _meshtastic_Config_DeviceConfig_RebroadcastMode_MIN, 0, 0, 0, 0, "", 0}
@@ -671,7 +671,7 @@ extern "C" {
 #define meshtastic_Config_DisplayConfig_init_zero {0, _meshtastic_Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _meshtastic_Config_DisplayConfig_DisplayUnits_MIN, _meshtastic_Config_DisplayConfig_OledType_MIN, _meshtastic_Config_DisplayConfig_DisplayMode_MIN, 0, 0, _meshtastic_Config_DisplayConfig_CompassOrientation_MIN}
 #define meshtastic_Config_LoRaConfig_init_zero   {0, _meshtastic_Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _meshtastic_Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0}, 0, 0}
 #define meshtastic_Config_BluetoothConfig_init_zero {0, _meshtastic_Config_BluetoothConfig_PairingMode_MIN, 0}
-#define meshtastic_Config_SecurityConfig_init_zero {{0, {0}}, {0, {0}}, 0, {{0, {0}}}, 0, 0, 0, 0}
+#define meshtastic_Config_SecurityConfig_init_zero {{0, {0}}, {0, {0}}, 0, {{0, {0}}, {0, {0}}, {0, {0}}}, 0, 0, 0, 0}
 #define meshtastic_Config_SessionkeyConfig_init_zero {0}

 /* Field tags (for use in manual encoding/decoding) */
@@ -953,7 +953,7 @@ extern const pb_msgdesc_t meshtastic_Config_SessionkeyConfig_msg;
 #define meshtastic_Config_NetworkConfig_size     196
 #define meshtastic_Config_PositionConfig_size    62
 #define meshtastic_Config_PowerConfig_size       52
-#define meshtastic_Config_SecurityConfig_size    111
+#define meshtastic_Config_SecurityConfig_size    178
 #define meshtastic_Config_SessionkeyConfig_size  0
 #define meshtastic_Config_size                   199

--- a/src/mesh/generated/meshtastic/deviceonly.pb.h
+++ b/src/mesh/generated/meshtastic/deviceonly.pb.h
@@ -94,6 +94,7 @@ typedef struct _meshtastic_NodeInfoLite {
    /* True if we witnessed the node over MQTT instead of LoRA transport */
    bool via_mqtt;
    /* Number of hops away from us this node is (0 if adjacent) */
+    bool has_hops_away;
    uint8_t hops_away;
    /* True if node is in our favorites list
 Persists between NodeDB internal clean ups */
@@ -202,13 +203,13 @@ extern "C" {
 /* Initializer values for message structs */
 #define meshtastic_PositionLite_init_default     {0, 0, 0, 0, _meshtastic_Position_LocSource_MIN}
 #define meshtastic_UserLite_init_default         {{0}, "", "", _meshtastic_HardwareModel_MIN, 0, _meshtastic_Config_DeviceConfig_Role_MIN, {0, {0}}}
-#define meshtastic_NodeInfoLite_init_default     {0, false, meshtastic_UserLite_init_default, false, meshtastic_PositionLite_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0, 0, 0, 0}
+#define meshtastic_NodeInfoLite_init_default     {0, false, meshtastic_UserLite_init_default, false, meshtastic_PositionLite_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0, 0, false, 0, 0}
 #define meshtastic_DeviceState_init_default      {false, meshtastic_MyNodeInfo_init_default, false, meshtastic_User_init_default, 0, {meshtastic_MeshPacket_init_default}, false, meshtastic_MeshPacket_init_default, 0, 0, 0, false, meshtastic_MeshPacket_init_default, 0, {meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default}, {0}}
 #define meshtastic_ChannelFile_init_default      {0, {meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default}, 0}
 #define meshtastic_OEMStore_init_default         {0, 0, {0, {0}}, _meshtastic_ScreenFonts_MIN, "", {0, {0}}, false, meshtastic_LocalConfig_init_default, false, meshtastic_LocalModuleConfig_init_default}
 #define meshtastic_PositionLite_init_zero        {0, 0, 0, 0, _meshtastic_Position_LocSource_MIN}
 #define meshtastic_UserLite_init_zero            {{0}, "", "", _meshtastic_HardwareModel_MIN, 0, _meshtastic_Config_DeviceConfig_Role_MIN, {0, {0}}}
-#define meshtastic_NodeInfoLite_init_zero        {0, false, meshtastic_UserLite_init_zero, false, meshtastic_PositionLite_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0, 0, 0, 0}
+#define meshtastic_NodeInfoLite_init_zero        {0, false, meshtastic_UserLite_init_zero, false, meshtastic_PositionLite_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0, 0, false, 0, 0}
 #define meshtastic_DeviceState_init_zero         {false, meshtastic_MyNodeInfo_init_zero, false, meshtastic_User_init_zero, 0, {meshtastic_MeshPacket_init_zero}, false, meshtastic_MeshPacket_init_zero, 0, 0, 0, false, meshtastic_MeshPacket_init_zero, 0, {meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero}, {0}}
 #define meshtastic_ChannelFile_init_zero         {0, {meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero}, 0}
 #define meshtastic_OEMStore_init_zero            {0, 0, {0, {0}}, _meshtastic_ScreenFonts_MIN, "", {0, {0}}, false, meshtastic_LocalConfig_init_zero, false, meshtastic_LocalModuleConfig_init_zero}
@@ -287,7 +288,7 @@ X(a, STATIC,   SINGULAR, FIXED32,  last_heard,        5) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  device_metrics,    6) \
 X(a, STATIC,   SINGULAR, UINT32,   channel,           7) \
 X(a, STATIC,   SINGULAR, BOOL,     via_mqtt,          8) \
-X(a, STATIC,   SINGULAR, UINT32,   hops_away,         9) \
+X(a, STATIC,   OPTIONAL, UINT32,   hops_away,         9) \
 X(a, STATIC,   SINGULAR, BOOL,     is_favorite,      10)
 #define meshtastic_NodeInfoLite_CALLBACK NULL
 #define meshtastic_NodeInfoLite_DEFAULT NULL
@@ -358,7 +359,7 @@ extern const pb_msgdesc_t meshtastic_OEMStore_msg;
 #define MESHTASTIC_MESHTASTIC_DEVICEONLY_PB_H_MAX_SIZE meshtastic_OEMStore_size
 #define meshtastic_ChannelFile_size              718
 #define meshtastic_NodeInfoLite_size             183
-#define meshtastic_OEMStore_size                 3500
+#define meshtastic_OEMStore_size                 3568
 #define meshtastic_PositionLite_size             28
 #define meshtastic_UserLite_size                 96

--- a/src/mesh/generated/meshtastic/localonly.pb.h
+++ b/src/mesh/generated/meshtastic/localonly.pb.h
@@ -186,8 +186,8 @@ extern const pb_msgdesc_t meshtastic_LocalModuleConfig_msg;
 #define meshtastic_LocalModuleConfig_fields &meshtastic_LocalModuleConfig_msg

 /* Maximum encoded size of messages (where known) */
-#define MESHTASTIC_MESHTASTIC_LOCALONLY_PB_H_MAX_SIZE meshtastic_LocalModuleConfig_size
-#define meshtastic_LocalConfig_size              667
+#define MESHTASTIC_MESHTASTIC_LOCALONLY_PB_H_MAX_SIZE meshtastic_LocalConfig_size
+#define meshtastic_LocalConfig_size              735
 #define meshtastic_LocalModuleConfig_size        687

 #ifdef __cplusplus
--- a/src/mesh/generated/meshtastic/mesh.pb.h
+++ b/src/mesh/generated/meshtastic/mesh.pb.h
@@ -316,7 +316,11 @@ typedef enum _meshtastic_Routing_Error {
    /* The client specified a PKI transport, but the node was unable to send the packet using PKI (and did not send the message at all) */
    meshtastic_Routing_Error_PKI_FAILED = 34,
    /* The receiving node does not have a Public Key to decode with */
-    meshtastic_Routing_Error_PKI_UNKNOWN_PUBKEY = 35
+    meshtastic_Routing_Error_PKI_UNKNOWN_PUBKEY = 35,
+    /* Admin packet otherwise checks out, but uses a bogus or expired session key */
+    meshtastic_Routing_Error_ADMIN_BAD_SESSION_KEY = 36,
+    /* Admin packet sent using PKC, but not from a public key on the admin key list */
+    meshtastic_Routing_Error_ADMIN_PUBLIC_KEY_UNAUTHORIZED = 37
 } meshtastic_Routing_Error;

 /* The priority of this message for sending.
@@ -741,6 +745,7 @@ typedef struct _meshtastic_NodeInfo {
    /* True if we witnessed the node over MQTT instead of LoRA transport */
    bool via_mqtt;
    /* Number of hops away from us this node is (0 if adjacent) */
+    bool has_hops_away;
    uint8_t hops_away;
    /* True if node is in our favorites list
 Persists between NodeDB internal clean ups */
@@ -871,6 +876,8 @@ typedef struct _meshtastic_DeviceMetadata {
    meshtastic_HardwareModel hw_model;
    /* Has Remote Hardware enabled */
    bool hasRemoteHardware;
+    /* Has PKC capabilities */
+    bool hasPKC;
 } meshtastic_DeviceMetadata;

 /* Packets from the radio to the phone will appear on the fromRadio characteristic.
@@ -1026,8 +1033,8 @@ extern "C" {
 #define _meshtastic_Position_AltSource_ARRAYSIZE ((meshtastic_Position_AltSource)(meshtastic_Position_AltSource_ALT_BAROMETRIC+1))

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

 #define _meshtastic_MeshPacket_Priority_MIN meshtastic_MeshPacket_Priority_UNSET
 #define _meshtastic_MeshPacket_Priority_MAX meshtastic_MeshPacket_Priority_MAX
@@ -1089,7 +1096,7 @@ extern "C" {
 #define meshtastic_Waypoint_init_default         {0, false, 0, false, 0, 0, 0, "", "", 0}
 #define meshtastic_MqttClientProxyMessage_init_default {"", 0, {{0, {0}}}, 0}
 #define meshtastic_MeshPacket_init_default       {0, 0, 0, 0, {meshtastic_Data_init_default}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0}
-#define meshtastic_NodeInfo_init_default         {0, false, meshtastic_User_init_default, false, meshtastic_Position_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0, 0, 0, 0}
+#define meshtastic_NodeInfo_init_default         {0, false, meshtastic_User_init_default, false, meshtastic_Position_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0, 0, false, 0, 0}
 #define meshtastic_MyNodeInfo_init_default       {0, 0, 0}
 #define meshtastic_LogRecord_init_default        {"", 0, "", _meshtastic_LogRecord_Level_MIN}
 #define meshtastic_QueueStatus_init_default      {0, 0, 0, 0}
@@ -1100,7 +1107,7 @@ extern "C" {
 #define meshtastic_Compressed_init_default       {_meshtastic_PortNum_MIN, {0, {0}}}
 #define meshtastic_NeighborInfo_init_default     {0, 0, 0, 0, {meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default}}
 #define meshtastic_Neighbor_init_default         {0, 0, 0, 0}
-#define meshtastic_DeviceMetadata_init_default   {"", 0, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_Role_MIN, 0, _meshtastic_HardwareModel_MIN, 0}
+#define meshtastic_DeviceMetadata_init_default   {"", 0, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_Role_MIN, 0, _meshtastic_HardwareModel_MIN, 0, 0}
 #define meshtastic_Heartbeat_init_default        {0}
 #define meshtastic_NodeRemoteHardwarePin_init_default {0, false, meshtastic_RemoteHardwarePin_init_default}
 #define meshtastic_ChunkedPayload_init_default   {0, 0, 0, {0, {0}}}
@@ -1114,7 +1121,7 @@ extern "C" {
 #define meshtastic_Waypoint_init_zero            {0, false, 0, false, 0, 0, 0, "", "", 0}
 #define meshtastic_MqttClientProxyMessage_init_zero {"", 0, {{0, {0}}}, 0}
 #define meshtastic_MeshPacket_init_zero          {0, 0, 0, 0, {meshtastic_Data_init_zero}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0}
-#define meshtastic_NodeInfo_init_zero            {0, false, meshtastic_User_init_zero, false, meshtastic_Position_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0, 0, 0, 0}
+#define meshtastic_NodeInfo_init_zero            {0, false, meshtastic_User_init_zero, false, meshtastic_Position_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0, 0, false, 0, 0}
 #define meshtastic_MyNodeInfo_init_zero          {0, 0, 0}
 #define meshtastic_LogRecord_init_zero           {"", 0, "", _meshtastic_LogRecord_Level_MIN}
 #define meshtastic_QueueStatus_init_zero         {0, 0, 0, 0}
@@ -1125,7 +1132,7 @@ extern "C" {
 #define meshtastic_Compressed_init_zero          {_meshtastic_PortNum_MIN, {0, {0}}}
 #define meshtastic_NeighborInfo_init_zero        {0, 0, 0, 0, {meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero}}
 #define meshtastic_Neighbor_init_zero            {0, 0, 0, 0}
-#define meshtastic_DeviceMetadata_init_zero      {"", 0, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_Role_MIN, 0, _meshtastic_HardwareModel_MIN, 0}
+#define meshtastic_DeviceMetadata_init_zero      {"", 0, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_Role_MIN, 0, _meshtastic_HardwareModel_MIN, 0, 0}
 #define meshtastic_Heartbeat_init_zero           {0}
 #define meshtastic_NodeRemoteHardwarePin_init_zero {0, false, meshtastic_RemoteHardwarePin_init_zero}
 #define meshtastic_ChunkedPayload_init_zero      {0, 0, 0, {0, {0}}}
@@ -1256,6 +1263,7 @@ extern "C" {
 #define meshtastic_DeviceMetadata_position_flags_tag 8
 #define meshtastic_DeviceMetadata_hw_model_tag   9
 #define meshtastic_DeviceMetadata_hasRemoteHardware_tag 10
+#define meshtastic_DeviceMetadata_hasPKC_tag     11
 #define meshtastic_FromRadio_id_tag              1
 #define meshtastic_FromRadio_packet_tag          2
 #define meshtastic_FromRadio_my_info_tag         3
@@ -1411,7 +1419,7 @@ X(a, STATIC,   SINGULAR, FIXED32,  last_heard,        5) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  device_metrics,    6) \
 X(a, STATIC,   SINGULAR, UINT32,   channel,           7) \
 X(a, STATIC,   SINGULAR, BOOL,     via_mqtt,          8) \
-X(a, STATIC,   SINGULAR, UINT32,   hops_away,         9) \
+X(a, STATIC,   OPTIONAL, UINT32,   hops_away,         9) \
 X(a, STATIC,   SINGULAR, BOOL,     is_favorite,      10)
 #define meshtastic_NodeInfo_CALLBACK NULL
 #define meshtastic_NodeInfo_DEFAULT NULL
@@ -1536,7 +1544,8 @@ X(a, STATIC,   SINGULAR, BOOL,     hasEthernet,       6) \
 X(a, STATIC,   SINGULAR, UENUM,    role,              7) \
 X(a, STATIC,   SINGULAR, UINT32,   position_flags,    8) \
 X(a, STATIC,   SINGULAR, UENUM,    hw_model,          9) \
-X(a, STATIC,   SINGULAR, BOOL,     hasRemoteHardware,  10)
+X(a, STATIC,   SINGULAR, BOOL,     hasRemoteHardware,  10) \
+X(a, STATIC,   SINGULAR, BOOL,     hasPKC,           11)
 #define meshtastic_DeviceMetadata_CALLBACK NULL
 #define meshtastic_DeviceMetadata_DEFAULT NULL

@@ -1635,7 +1644,7 @@ extern const pb_msgdesc_t meshtastic_ChunkedPayloadResponse_msg;
 #define meshtastic_ClientNotification_size       415
 #define meshtastic_Compressed_size               243
 #define meshtastic_Data_size                     273
-#define meshtastic_DeviceMetadata_size           46
+#define meshtastic_DeviceMetadata_size           48
 #define meshtastic_FileInfo_size                 236
 #define meshtastic_FromRadio_size                510
 #define meshtastic_Heartbeat_size                0
--- a/src/modules/AdminModule.cpp
+++ b/src/modules/AdminModule.cpp
@@ -73,12 +73,38 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
    meshtastic_Channel *ch = &channels.getByIndex(mp.channel);
    // Could tighten this up further by tracking the last public_key we went an AdminMessage request to
    // and only allowing responses from that remote.
-    if (!((mp.from == 0 && !config.security.is_managed) || messageIsResponse(r) ||
-          (strcasecmp(ch->settings.name, Channels::adminChannel) == 0 && config.security.admin_channel_enabled) ||
-          (mp.pki_encrypted && memcmp(mp.public_key.bytes, config.security.admin_key[0].bytes, 32) == 0))) {
-        LOG_INFO("Ignoring admin payload %i\n", r->which_payload_variant);
+    if (messageIsResponse(r)) {
+        LOG_DEBUG("Allowing admin response message\n");
+    } else if (mp.from == 0) {
+        if (config.security.is_managed) {
+            LOG_INFO("Ignoring local admin payload because is_managed.\n");
+            return handled;
+        }
+    } else if (strcasecmp(ch->settings.name, Channels::adminChannel) == 0) {
+        if (!config.security.admin_channel_enabled) {
+            LOG_INFO("Ignoring admin channel, as legacy admin is disabled.\n");
+            myReply = allocErrorResponse(meshtastic_Routing_Error_NOT_AUTHORIZED, &mp);
+            return handled;
+        }
+    } else if (mp.pki_encrypted) {
+        if ((config.security.admin_key[0].size == 32 &&
+             memcmp(mp.public_key.bytes, config.security.admin_key[0].bytes, 32) == 0) ||
+            (config.security.admin_key[1].size == 32 &&
+             memcmp(mp.public_key.bytes, config.security.admin_key[1].bytes, 32) == 0) ||
+            (config.security.admin_key[2].size == 32 &&
+             memcmp(mp.public_key.bytes, config.security.admin_key[2].bytes, 32) == 0)) {
+            LOG_INFO("PKC admin payload with authorized sender key.\n");
+        } else {
+            myReply = allocErrorResponse(meshtastic_Routing_Error_ADMIN_PUBLIC_KEY_UNAUTHORIZED, &mp);
+            LOG_INFO("Received PKC admin payload, but the sender public key does not match the admin authorized key!\n");
+            return handled;
+        }
+    } else {
+        LOG_INFO("Ignoring unauthorized admin payload %i\n", r->which_payload_variant);
+        myReply = allocErrorResponse(meshtastic_Routing_Error_NOT_AUTHORIZED, &mp);
        return handled;
    }
+
    LOG_INFO("Handling admin payload %i\n", r->which_payload_variant);

    // all of the get and set messages, including those for other modules, flow through here first.
@@ -86,6 +112,7 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
    if (mp.from != 0 && !messageIsRequest(r) && !messageIsResponse(r)) {
        if (!checkPassKey(r)) {
            LOG_WARN("Admin message without session_key!\n");
+            myReply = allocErrorResponse(meshtastic_Routing_Error_ADMIN_BAD_SESSION_KEY, &mp);
            return handled;
        }
    }
@@ -186,18 +213,22 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
        break;
    }
    case meshtastic_AdminMessage_factory_reset_config_tag: {
+        disableBluetooth();
        LOG_INFO("Initiating factory config reset\n");
        nodeDB->factoryReset();
+        LOG_INFO("Factory config reset finished, rebooting soon.\n");
        reboot(DEFAULT_REBOOT_SECONDS);
        break;
    }
    case meshtastic_AdminMessage_factory_reset_device_tag: {
+        disableBluetooth();
        LOG_INFO("Initiating full factory reset\n");
        nodeDB->factoryReset(true);
        reboot(DEFAULT_REBOOT_SECONDS);
        break;
    }
    case meshtastic_AdminMessage_nodedb_reset_tag: {
+        disableBluetooth();
        LOG_INFO("Initiating node-db reset\n");
        nodeDB->resetNodes();
        reboot(DEFAULT_REBOOT_SECONDS);
@@ -209,6 +240,7 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
        break;
    }
    case meshtastic_AdminMessage_commit_edit_settings_tag: {
+        disableBluetooth();
        LOG_INFO("Committing transaction for edited settings\n");
        hasOpenEditTransaction = false;
        saveChanges(SEGMENT_CONFIG | SEGMENT_MODULECONFIG | SEGMENT_DEVICESTATE | SEGMENT_CHANNELS);
@@ -252,34 +284,26 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
        break;
    }
    case meshtastic_AdminMessage_set_fixed_position_tag: {
-        if (fromOthers) {
-            LOG_INFO("Ignoring set_fixed_position command from another node.\n");
-        } else {
-            LOG_INFO("Client is receiving a set_fixed_position command.\n");
-            meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(nodeDB->getNodeNum());
-            node->has_position = true;
-            node->position = TypeConversions::ConvertToPositionLite(r->set_fixed_position);
-            nodeDB->setLocalPosition(r->set_fixed_position);
-            config.position.fixed_position = true;
-            saveChanges(SEGMENT_DEVICESTATE | SEGMENT_CONFIG, false);
+        LOG_INFO("Client is receiving a set_fixed_position command.\n");
+        meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(nodeDB->getNodeNum());
+        node->has_position = true;
+        node->position = TypeConversions::ConvertToPositionLite(r->set_fixed_position);
+        nodeDB->setLocalPosition(r->set_fixed_position);
+        config.position.fixed_position = true;
+        saveChanges(SEGMENT_DEVICESTATE | SEGMENT_CONFIG, false);
 #if !MESHTASTIC_EXCLUDE_GPS
-            if (gps != nullptr)
-                gps->enable();
-            // Send our new fixed position to the mesh for good measure
-            positionModule->sendOurPosition();
+        if (gps != nullptr)
+            gps->enable();
+        // Send our new fixed position to the mesh for good measure
+        positionModule->sendOurPosition();
 #endif
-        }
        break;
    }
    case meshtastic_AdminMessage_remove_fixed_position_tag: {
-        if (fromOthers) {
-            LOG_INFO("Ignoring remove_fixed_position command from another node.\n");
-        } else {
-            LOG_INFO("Client is receiving a remove_fixed_position command.\n");
-            nodeDB->clearLocalPosition();
-            config.position.fixed_position = false;
-            saveChanges(SEGMENT_DEVICESTATE | SEGMENT_CONFIG, false);
-        }
+        LOG_INFO("Client is receiving a remove_fixed_position command.\n");
+        nodeDB->clearLocalPosition();
+        config.position.fixed_position = false;
+        saveChanges(SEGMENT_DEVICESTATE | SEGMENT_CONFIG, false);
        break;
    }
    case meshtastic_AdminMessage_set_time_only_tag: {
@@ -559,12 +583,16 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)

        break;
    }
+    if (requiresReboot) {
+        disableBluetooth();
+    }

    saveChanges(changes, requiresReboot);
 }

 void AdminModule::handleSetModuleConfig(const meshtastic_ModuleConfig &c)
 {
+    disableBluetooth();
    switch (c.which_payload_variant) {
    case meshtastic_ModuleConfig_mqtt_tag:
        LOG_INFO("Setting module config: MQTT\n");
@@ -636,7 +664,6 @@ void AdminModule::handleSetModuleConfig(const meshtastic_ModuleConfig &c)
        moduleConfig.paxcounter = c.payload_variant.paxcounter;
        break;
    }
-
    saveChanges(SEGMENT_MODULECONFIG);
 }

@@ -1031,3 +1058,16 @@ bool AdminModule::messageIsRequest(meshtastic_AdminMessage *r)
    else
        return false;
 }
+
+void disableBluetooth()
+{
+#if HAS_BLUETOOTH
+#ifdef ARCH_ESP32
+    if (nimbleBluetooth)
+        nimbleBluetooth->deinit();
+#elif defined(ARCH_NRF52)
+    if (nrf52Bluetooth)
+        nrf52Bluetooth->shutdown();
+#endif
+#endif
+}
--- a/src/modules/AdminModule.h
+++ b/src/modules/AdminModule.h
@@ -59,4 +59,6 @@ class AdminModule : public ProtobufModule<meshtastic_AdminMessage>, public Obser
    bool messageIsRequest(meshtastic_AdminMessage *r);
 };

-extern AdminModule *adminModule;
+extern AdminModule *adminModule;
+
+void disableBluetooth();
--- a/src/modules/AtakPluginModule.cpp
+++ b/src/modules/AtakPluginModule.cpp
@@ -52,6 +52,10 @@ meshtastic_TAKPacket AtakPluginModule::cloneTAKPacketData(meshtastic_TAKPacket *
    } else if (t->which_payload_variant == meshtastic_TAKPacket_chat_tag) {
        clone.which_payload_variant = meshtastic_TAKPacket_chat_tag;
        clone.payload_variant.chat = {0};
+    } else if (t->which_payload_variant == meshtastic_TAKPacket_detail_tag) {
+        clone.which_payload_variant = meshtastic_TAKPacket_detail_tag;
+        clone.payload_variant.detail.size = t->payload_variant.detail.size;
+        memcpy(clone.payload_variant.detail.bytes, t->payload_variant.detail.bytes, t->payload_variant.detail.size);
    }

    return clone;
--- a/src/modules/PositionModule.h
+++ b/src/modules/PositionModule.h
@@ -63,7 +63,7 @@ class PositionModule : public ProtobufModule<meshtastic_Position>, private concu
    bool hasQualityTimesource();

    const uint32_t minimumTimeThreshold =
-        Default::getConfiguredOrDefaultMsScaled(config.position.broadcast_smart_minimum_interval_secs, 30, numOnlineNodes);
+        Default::getConfiguredOrDefaultMs(config.position.broadcast_smart_minimum_interval_secs, 30);
 };

 struct SmartPosition {
--- a/src/modules/RemoteHardwareModule.cpp
+++ b/src/modules/RemoteHardwareModule.cpp
@@ -47,6 +47,8 @@ RemoteHardwareModule::RemoteHardwareModule()
    : ProtobufModule("remotehardware", meshtastic_PortNum_REMOTE_HARDWARE_APP, &meshtastic_HardwareMessage_msg),
      concurrency::OSThread("RemoteHardwareModule")
 {
+    // restrict to the gpio channel for rx
+    boundChannel = Channels::gpioChannel;
 }

 bool RemoteHardwareModule::handleReceivedProtobuf(const meshtastic_MeshPacket &req, meshtastic_HardwareMessage *pptr)
--- a/src/modules/Telemetry/AirQualityTelemetry.cpp
+++ b/src/modules/Telemetry/AirQualityTelemetry.cpp
@@ -10,11 +10,11 @@
 #include "PowerFSM.h"
 #include "RTC.h"
 #include "Router.h"
+#include "detect/ScanI2CTwoWire.h"
 #include "main.h"

 int32_t AirQualityTelemetryModule::runOnce()
 {
-    int32_t result = INT32_MAX;
    /*
        Uncomment the preferences below if you want to use the module
        without having to configure it from the PythonAPI or WebUI.
@@ -29,21 +29,36 @@ int32_t AirQualityTelemetryModule::runOnce()

    if (firstTime) {
        // This is the first time the OSThread library has called this function, so do some setup
-        firstTime = 0;
+        firstTime = false;

        if (moduleConfig.telemetry.air_quality_enabled) {
            LOG_INFO("Air quality Telemetry: Initializing\n");
            if (!aqi.begin_I2C()) {
-                LOG_WARN("Could not establish i2c connection to AQI sensor\n");
+                LOG_WARN("Could not establish i2c connection to AQI sensor. Rescanning...\n");
+                // rescan for late arriving sensors. AQI Module starts about 10 seconds into the boot so this is plenty.
+                uint8_t i2caddr_scan[] = {PMSA0031_ADDR};
+                uint8_t i2caddr_asize = 1;
+                auto i2cScanner = std::unique_ptr<ScanI2CTwoWire>(new ScanI2CTwoWire());
+#if defined(I2C_SDA1)
+                i2cScanner->scanPort(ScanI2C::I2CPort::WIRE1, i2caddr_scan, i2caddr_asize);
+#endif
+                i2cScanner->scanPort(ScanI2C::I2CPort::WIRE, i2caddr_scan, i2caddr_asize);
+                auto found = i2cScanner->find(ScanI2C::DeviceType::PMSA0031);
+                if (found.type != ScanI2C::DeviceType::NONE) {
+                    nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_PMSA003I].first = found.address.address;
+                    nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_PMSA003I].second =
+                        i2cScanner->fetchI2CBus(found.address);
+                    return 1000;
+                }
                return disable();
            }
            return 1000;
        }
-        return result;
+        return disable();
    } else {
        // if we somehow got to a second run of this module with measurement disabled, then just wait forever
        if (!moduleConfig.telemetry.air_quality_enabled)
-            return result;
+            return disable();

        uint32_t now = millis();
        if (((lastSentToMesh == 0) ||
--- a/src/modules/Telemetry/AirQualityTelemetry.h
+++ b/src/modules/Telemetry/AirQualityTelemetry.h
@@ -44,7 +44,7 @@ class AirQualityTelemetryModule : private concurrency::OSThread, public Protobuf
  private:
    Adafruit_PM25AQI aqi;
    PM25_AQI_Data data = {0};
-    bool firstTime = 1;
+    bool firstTime = true;
    meshtastic_MeshPacket *lastMeasurementPacket;
    uint32_t sendToPhoneIntervalMs = SECONDS_IN_MINUTE * 1000; // Send to phone every minute
    uint32_t lastSentToMesh = 0;
--- a/src/modules/Telemetry/DeviceTelemetry.cpp
+++ b/src/modules/Telemetry/DeviceTelemetry.cpp
@@ -124,7 +124,7 @@ void DeviceTelemetryModule::sendLocalStatsToPhone()
    telemetry.variant.local_stats.num_total_nodes = nodeDB->getNumMeshNodes();
    if (RadioLibInterface::instance) {
        telemetry.variant.local_stats.num_packets_tx = RadioLibInterface::instance->txGood;
-        telemetry.variant.local_stats.num_packets_rx = RadioLibInterface::instance->rxGood;
+        telemetry.variant.local_stats.num_packets_rx = RadioLibInterface::instance->rxGood + RadioLibInterface::instance->rxBad;
        telemetry.variant.local_stats.num_packets_rx_bad = RadioLibInterface::instance->rxBad;
    }

--- a/src/modules/Telemetry/Sensor/T1000xSensor.cpp
+++ b/src/modules/Telemetry/Sensor/T1000xSensor.cpp
@@ -95,7 +95,7 @@ float T1000xSensor::getTemp()

    Vout = ntc_vot;
    Rt = (HEATER_NTC_RP * vcc_vot) / Vout - HEATER_NTC_RP;
-    for (u8i = 0; u8i < 136; u8i++) {
+    for (u8i = 0; u8i < 135; u8i++) {
        if (Rt >= ntc_res2[u8i]) {
            break;
        }
--- a/src/modules/TraceRouteModule.cpp
+++ b/src/modules/TraceRouteModule.cpp
@@ -53,7 +53,7 @@ void TraceRouteModule::insertUnknownHops(meshtastic_MeshPacket &p, meshtastic_Ro
        uint8_t hopsTaken = p.hop_start - p.hop_limit;
        int8_t diff = hopsTaken - *route_count;
        for (uint8_t i = 0; i < diff; i++) {
-            if (*route_count < sizeof(*route) / sizeof(route[0])) {
+            if (*route_count < ROUTE_SIZE) {
                route[*route_count] = NODENUM_BROADCAST; // This will represent an unknown hop
                *route_count += 1;
            }
@@ -61,7 +61,7 @@ void TraceRouteModule::insertUnknownHops(meshtastic_MeshPacket &p, meshtastic_Ro
        // Add unknown SNR values if necessary
        diff = *route_count - *snr_count;
        for (uint8_t i = 0; i < diff; i++) {
-            if (*snr_count < sizeof(*snr_list) / sizeof(snr_list[0])) {
+            if (*snr_count < ROUTE_SIZE) {
                snr_list[*snr_count] = INT8_MIN; // This will represent an unknown SNR
                *snr_count += 1;
            }
@@ -89,7 +89,7 @@ void TraceRouteModule::appendMyIDandSNR(meshtastic_RouteDiscovery *updated, floa
        snr_list = updated->snr_back;
    }

-    if (*snr_count < sizeof(*snr_list) / sizeof(snr_list[0])) {
+    if (*snr_count < ROUTE_SIZE) {
        snr_list[*snr_count] = (int8_t)(snr * 4); // Convert SNR to 1 byte
        *snr_count += 1;
    }
@@ -97,7 +97,7 @@ void TraceRouteModule::appendMyIDandSNR(meshtastic_RouteDiscovery *updated, floa
        return;

    // Length of route array can normally not be exceeded due to the max. hop_limit of 7
-    if (*route_count < sizeof(*route) / sizeof(route[0])) {
+    if (*route_count < ROUTE_SIZE) {
        route[*route_count] = myNodeInfo.my_node_num;
        *route_count += 1;
    } else {
--- a/src/modules/TraceRouteModule.h
+++ b/src/modules/TraceRouteModule.h
@@ -1,6 +1,8 @@
 #pragma once
 #include "ProtobufModule.h"

+#define ROUTE_SIZE sizeof(((meshtastic_RouteDiscovery *)0)->route) / sizeof(((meshtastic_RouteDiscovery *)0)->route[0])
+
 /**
 * A module that traces the route to a certain destination node
 */
--- a/src/mqtt/MQTT.cpp
+++ b/src/mqtt/MQTT.cpp
@@ -158,7 +158,22 @@ void MQTT::onReceive(char *topic, byte *payload, size_t length)
                    meshtastic_MeshPacket *p = packetPool.allocCopy(*e.packet);
                    p->via_mqtt = true; // Mark that the packet was received via MQTT

+                    if (p->from == 0 || p->from == nodeDB->getNodeNum()) {
+                        LOG_INFO("Ignoring downlink message we originally sent.\n");
+                        packetPool.release(p);
+                        return;
+                    }
                    if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
+                        if (moduleConfig.mqtt.encryption_enabled) {
+                            LOG_INFO("Ignoring decoded message on MQTT, encryption is enabled.\n");
+                            packetPool.release(p);
+                            return;
+                        }
+                        if (p->decoded.portnum == meshtastic_PortNum_ADMIN_APP) {
+                            LOG_INFO("Ignoring decoded admin packet.\n");
+                            packetPool.release(p);
+                            return;
+                        }
                        p->channel = ch.index;
                    }

@@ -468,7 +483,7 @@ void MQTT::publishQueuedMessages()
        LOG_DEBUG("Publishing enqueued MQTT message\n");
        // FIXME - this size calculation is super sloppy, but it will go away once we dynamically alloc meshpackets
        meshtastic_ServiceEnvelope *env = mqttQueue.dequeuePtr(0);
-        static uint8_t bytes[meshtastic_MeshPacket_size + 64];
+        static uint8_t bytes[meshtastic_MqttClientProxyMessage_size];
        size_t numBytes = pb_encode_to_bytes(bytes, sizeof(bytes), &meshtastic_ServiceEnvelope_msg, env);
        std::string topic;
        if (env->packet->pki_encrypted) {
@@ -555,7 +570,7 @@ void MQTT::onSend(const meshtastic_MeshPacket &mp, const meshtastic_MeshPacket &

        if (moduleConfig.mqtt.proxy_to_client_enabled || this->isConnectedDirectly()) {
            // FIXME - this size calculation is super sloppy, but it will go away once we dynamically alloc meshpackets
-            static uint8_t bytes[meshtastic_MeshPacket_size + 64];
+            static uint8_t bytes[meshtastic_MqttClientProxyMessage_size];
            size_t numBytes = pb_encode_to_bytes(bytes, sizeof(bytes), &meshtastic_ServiceEnvelope_msg, env);
            std::string topic = cryptTopic + channelId + "/" + owner.id;
            LOG_DEBUG("MQTT Publish %s, %u bytes\n", topic.c_str(), numBytes);
@@ -651,7 +666,7 @@ void MQTT::perhapsReportToMap()
        se->packet = mp;

        // FIXME - this size calculation is super sloppy, but it will go away once we dynamically alloc meshpackets
-        static uint8_t bytes[meshtastic_MeshPacket_size + 64];
+        static uint8_t bytes[meshtastic_MqttClientProxyMessage_size];
        size_t numBytes = pb_encode_to_bytes(bytes, sizeof(bytes), &meshtastic_ServiceEnvelope_msg, se);

        LOG_INFO("MQTT Publish map report to %s\n", mapTopic.c_str());
--- a/src/platform/esp32/architecture.h
+++ b/src/platform/esp32/architecture.h
@@ -166,6 +166,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_VISION_MASTER_E290
 #elif defined(HELTEC_MESH_NODE_T114)
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_MESH_NODE_T114
+#elif defined(SENSECAP_INDICATOR)
+#define HW_VENDOR meshtastic_HardwareModel_SENSECAP_INDICATOR
 #endif

 // -----------------------------------------------------------------------------
--- a/src/platform/esp32/main-esp32.cpp
+++ b/src/platform/esp32/main-esp32.cpp
@@ -120,17 +120,24 @@ void esp32Setup()
    uint32_t rebootCounter = preferences.getUInt("rebootCounter", 0);
    rebootCounter++;
    preferences.putUInt("rebootCounter", rebootCounter);
+    // store firmware version and hwrevision for access from OTA firmware
+    String fwrev = preferences.getString("firmwareVersion", "");
+    if (fwrev.compareTo(optstr(APP_VERSION)) != 0)
+        preferences.putString("firmwareVersion", optstr(APP_VERSION));
+    uint8_t hwven = preferences.getUInt("hwVendor", 0);
+    if (hwven != HW_VENDOR)
+        preferences.putUInt("hwVendor", HW_VENDOR);
    preferences.end();
    LOG_DEBUG("Number of Device Reboots: %d\n", rebootCounter);
 #if !MESHTASTIC_EXCLUDE_BLUETOOTH
    String BLEOTA = BleOta::getOtaAppVersion();
    if (BLEOTA.isEmpty()) {
-        LOG_DEBUG("No OTA firmware available\n");
+        LOG_INFO("No OTA firmware available\n");
    } else {
-        LOG_DEBUG("OTA firmware version %s\n", BLEOTA.c_str());
+        LOG_INFO("OTA firmware version %s\n", BLEOTA.c_str());
    }
 #else
-    LOG_DEBUG("No OTA firmware available\n");
+    LOG_INFO("No OTA firmware available\n");
 #endif

    // enableModemSleep();
--- a/src/platform/extra_variants/heltec_wireless_tracker/variant.cpp
+++ b/src/platform/extra_variants/heltec_wireless_tracker/variant.cpp
@@ -10,10 +10,14 @@
 void lateInitVariant()
 {
    // LOG_DEBUG("Heltec tracker initVariant\n");
-#ifdef VEXT_ENABLE
-    GpioPin *hwEnable = new GpioHwPin(VEXT_ENABLE);
-    GpioVirtPin *virtGpsEnable = gps ? gps->enablePin : new GpioVirtPin();

+#ifndef MESHTASTIC_EXCLUDE_GPS
+    GpioVirtPin *virtGpsEnable = gps ? gps->enablePin : new GpioVirtPin();
+#else
+    GpioVirtPin *virtGpsEnable = new GpioVirtPin();
+#endif
+
+#ifndef MESHTASTIC_EXCLUDE_SCREEN
    // On this board we are actually using the backlightEnable signal to already be controlling a physical enable to the
    // display controller.  But we'd _ALSO_ like to have that signal drive a virtual GPIO.  So nest it as needed.
    GpioVirtPin *virtScreenEnable = new GpioVirtPin();
@@ -25,8 +29,11 @@ void lateInitVariant()
        // Assume screen is initially powered
        splitter->set(true);
    }
+#endif

+#if defined(VEXT_ENABLE) && (!defined(MESHTASTIC_EXCLUDE_GPS) || !defined(MESHTASTIC_EXCLUDE_SCREEN))
    // If either the GPS or the screen is on, turn on the external power regulator
+    GpioPin *hwEnable = new GpioHwPin(VEXT_ENABLE);
    new GpioBinaryTransformer(virtGpsEnable, virtScreenEnable, hwEnable, GpioBinaryTransformer::Or);
 #endif
 }
--- a/src/platform/nrf52/architecture.h
+++ b/src/platform/nrf52/architecture.h
@@ -71,6 +71,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_MS24SF1
 #elif defined(PRIVATE_HW) || defined(FEATHER_DIY)
 #define HW_VENDOR meshtastic_HardwareModel_PRIVATE_HW
+#elif defined(HELTEC_T114)
+#define HW_VENDOR meshtastic_HardwareModel_HELTEC_MESH_NODE_T114
 #else
 #define HW_VENDOR meshtastic_HardwareModel_NRF52_UNKNOWN
 #endif
--- a/src/serialization/JSONValue.h
+++ b/src/serialization/JSONValue.h
@@ -40,15 +40,15 @@ class JSONValue

  public:
    JSONValue(/*NULL*/);
-    JSONValue(const char *m_char_value);
-    JSONValue(const std::string &m_string_value);
-    JSONValue(bool m_bool_value);
-    JSONValue(double m_number_value);
-    JSONValue(int m_integer_value);
-    JSONValue(unsigned int m_integer_value);
-    JSONValue(const JSONArray &m_array_value);
-    JSONValue(const JSONObject &m_object_value);
-    JSONValue(const JSONValue &m_source);
+    explicit JSONValue(const char *m_char_value);
+    explicit JSONValue(const std::string &m_string_value);
+    explicit JSONValue(bool m_bool_value);
+    explicit JSONValue(double m_number_value);
+    explicit JSONValue(int m_integer_value);
+    explicit JSONValue(unsigned int m_integer_value);
+    explicit JSONValue(const JSONArray &m_array_value);
+    explicit JSONValue(const JSONObject &m_object_value);
+    explicit JSONValue(const JSONValue &m_source);
    ~JSONValue();

    bool IsNull() const;
--- a/src/sleep.cpp
+++ b/src/sleep.cpp
@@ -271,13 +271,6 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false)
        digitalWrite(LORA_CS, HIGH);
        gpio_hold_en((gpio_num_t)LORA_CS);
    }
-
-#if defined(I2C_SDA)
-    Wire.end();
-    pinMode(I2C_SDA, ANALOG);
-    pinMode(I2C_SCL, ANALOG);
-#endif
-
 #endif

 #ifdef HAS_PMU
@@ -315,6 +308,14 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false)
    }
 #endif

+#if defined(ARCH_ESP32) && defined(I2C_SDA)
+    // Added by https://github.com/meshtastic/firmware/pull/4418
+    // Possibly to support Heltec Capsule Sensor?
+    Wire.end();
+    pinMode(I2C_SDA, ANALOG);
+    pinMode(I2C_SCL, ANALOG);
+#endif
+
    console->flush();
    cpuDeepSleep(msecToWake);
 }
--- a/variants/ME25LS01-4Y10TD_e-ink/variant.h
+++ b/variants/ME25LS01-4Y10TD_e-ink/variant.h
@@ -97,7 +97,7 @@ static const uint8_t MISO = PIN_SPI_MISO;
 static const uint8_t SCK = PIN_SPI_SCK;

 // EPD SPI
-#define PIN_SPI1_MISO (-1)     // Not Used for EPD
+#define PIN_SPI1_MISO (32 + 2) // Not Used for EPD but needs to be defined
 #define PIN_SPI1_MOSI (0 + 10) // EPD_MOSI  P0.10
 #define PIN_SPI1_SCK (0 + 9)   // EPD_SCLK  P0.09

--- a/variants/chatter2/variant.h
+++ b/variants/chatter2/variant.h
@@ -66,6 +66,7 @@
 #define SCREEN_ROTATE
 #define SCREEN_TRANSITION_FRAMERATE 5 // fps
 #define DISPLAY_FORCE_SMALL_FONTS
+#define TFT_BACKLIGHT_ON LOW

 // Battery

@@ -121,4 +122,4 @@
 // cannot serve any extra function even if requested to LORA_DIO3 value is never used in src (as we are not using RF95), so no
 // need to define, and DIO3_AS_TCXO_AT_1V8 is set so it cannot serve any extra function even if requested to (from 13.3.2.1
 // DioxMask in SX1262 datasheet: Note that if DIO2 or DIO3 are used to control the RF Switch or the TCXO, the IRQ will not be
-// generated even if it is mapped to the pins.)
+// generated even if it is mapped to the pins.)
--- a/variants/diy/platformio.ini
+++ b/variants/diy/platformio.ini
@@ -7,7 +7,6 @@ build_flags =
  ${esp32_base.build_flags}
  -D DIY_V1
  -D EBYTE_E22
-  -D OLED_RU
  -I variants/diy/v1

 ; Meshtastic DIY v1.1 new schematic based on ESP32-WROOM-32 & SX1262/SX1268 modules
@@ -19,7 +18,6 @@ build_flags =
  ${esp32_base.build_flags}
  -D DIY_V1
  -D EBYTE_E22
-  -D OLED_RU
  -I variants/diy/v1_1

 ; Port to Disaster Radio's ESP32-v3 Dev Board
@@ -52,7 +50,6 @@ board_level = extra
 build_flags = ${nrf52840_base.build_flags}
  -I variants/diy/nrf52_promicro_diy_xtal
  -D NRF52_PROMICRO_DIY
-  -D OLED_RU
  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/diy/nrf52_promicro_diy_xtal>
 lib_deps = 
@@ -68,7 +65,6 @@ board_level = extra
 build_flags = ${nrf52840_base.build_flags}
  -I variants/diy/nrf52_promicro_diy_tcxo
  -D NRF52_PROMICRO_DIY
-  -D OLED_RU
  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/diy/nrf52_promicro_diy_tcxo>
 lib_deps = 
--- a/variants/heltec_mesh_node_t114/platformio.ini
+++ b/variants/heltec_mesh_node_t114/platformio.ini
@@ -8,9 +8,10 @@ debug_tool = jlink
 build_flags = ${nrf52840_base.build_flags} -Ivariants/heltec_mesh_node_t114
        -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
        -DGPS_POWER_TOGGLE
+        -DHELTEC_T114

 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/heltec_mesh_node_t114> 
 lib_deps = 
  ${nrf52840_base.lib_deps}
  lewisxhe/PCF8563_Library@^1.0.1
-  https://github.com/meshtastic/st7789#7181320e7ed05c7fb5fd2d32f14723bce6088b7b
+  https://github.com/meshtastic/st7789#bd33ea58ddfe4a5e4a66d53300ccbd38d66ac21f
--- a/variants/heltec_mesh_node_t114/variant.cpp
+++ b/variants/heltec_mesh_node_t114/variant.cpp
@@ -32,13 +32,7 @@ const uint32_t g_ADigitalPinMap[] = {

 void initVariant()
 {
-    // LED1 & LED2
+    // LED1
    pinMode(PIN_LED1, OUTPUT);
    ledOff(PIN_LED1);
-
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
-    pinMode(PIN_LED3, OUTPUT);
-    ledOff(PIN_LED3);
 }
--- a/variants/heltec_mesh_node_t114/variant.h
+++ b/variants/heltec_mesh_node_t114/variant.h
@@ -67,20 +67,17 @@ extern "C" {
 #define NUM_ANALOG_OUTPUTS (0)

 // LEDs
-#define PIN_LED1 (32 + 3) // 13 red (confirmed on 1.0 board)
-// Unused(by firmware) LEDs:
-#define PIN_LED2 (1 + 1)  // 14 blue
-#define PIN_LED3 (1 + 11) // 15 green
-
-#define LED_RED PIN_LED3
-#define LED_BLUE PIN_LED1
-#define LED_GREEN PIN_LED2
-
-#define LED_BUILTIN LED_BLUE
-#define LED_CONN PIN_GREEN
-
+#define PIN_LED1 (32 + 3) // green (confirmed on 1.0 board)
+#define LED_BLUE PIN_LED1 // fake for bluefruit library
+#define LED_GREEN PIN_LED1
+#define LED_BUILTIN LED_GREEN
 #define LED_STATE_ON 0 // State when LED is lit

+#define HAS_NEOPIXEL                         // Enable the use of neopixels
+#define NEOPIXEL_COUNT 2                     // How many neopixels are connected
+#define NEOPIXEL_DATA 14                     // gpio pin used to send data to the neopixels
+#define NEOPIXEL_TYPE (NEO_GRB + NEO_KHZ800) // type of neopixels in use
+
 /*
 * Buttons
 */
@@ -206,4 +203,4 @@ No longer populated on PCB
 *        Arduino objects - C++ only
 *----------------------------------------------------------------------------*/

-#endif
+#endif
--- a/variants/heltec_vision_master_t190/platformio.ini
+++ b/variants/heltec_vision_master_t190/platformio.ini
@@ -9,5 +9,5 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  lewisxhe/PCF8563_Library@^1.0.1
-  https://github.com/meshtastic/st7789#7181320e7ed05c7fb5fd2d32f14723bce6088b7b
+  https://github.com/meshtastic/st7789#bd33ea58ddfe4a5e4a66d53300ccbd38d66ac21f
 upload_speed = 921600
--- a/variants/lora_isp4520/platformio.ini
+++ b/variants/lora_isp4520/platformio.ini
@@ -1,18 +0,0 @@
-[env:lora_isp4520]
-extends = nrf52_base
-board = lora_isp4520
-board_level = extra
-
-# add our variants files to the include and src paths
-build_flags = ${nrf52_base.build_flags} -Ivariants/lora_isp4520
-
-# No screen and GPS on the board. We still need RTC.cpp for the RTC clock.
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/lora_isp4520> -<graphics> -<gps> +<gps/GPS.cpp> +<gps/RTC.cpp>
-lib_ignore = ${nrf52_base.lib_ignore} 
-  ESP8266_SSD1306
-  SparkFun Ublox Arduino Library
-  AXP202X_Library
-  TinyGPSPlus
-
-upload_protocol = jlink
-monitor_port = /dev/ttyUSB0
--- a/variants/lora_isp4520/variant.cpp
+++ b/variants/lora_isp4520/variant.cpp
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
-  Copyright (c) 2016 Sandeep Mistry All right reserved.
-  Copyright (c) 2018, Adafruit Industries (adafruit.com)
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the GNU Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#include "variant.h"
-#include "nrf.h"
-#include "wiring_constants.h"
-#include "wiring_digital.h"
-
-const uint32_t g_ADigitalPinMap[] = {
-    25, // D0  SPI_MISO
-    24, // D1  SPI_NSS
-    23, // D2  SPI_SCK
-    4,  // D3  VBAT
-    11, // D4  DIO1
-    27, // D5  BUSY
-    19, // D6  NRESET
-    12, // D7  BUTTON2
-    22, // D8  BUTTON3
-    26, // D9  SPI_MOSI
-    31, // D10 UART_RX
-    2,  // D11 UART_TX
-    10, // D12 LED1 GREEN
-    17, // D13 LED2 RED
-    9,  // D14 BUZZER
-    7,  // D15 BUTTON1
-};
-
-#include <initializer_list>
-void initVariant()
-{
-    for (int i : {PIN_LED1, PIN_LED2}) {
-        pinMode(i, OUTPUT);
-        ledOff(i);
-    }
-}
--- a/variants/lora_isp4520/variant.h
+++ b/variants/lora_isp4520/variant.h
@@ -1,94 +0,0 @@
-/*
- Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
- Copyright (c) 2016 Sandeep Mistry All right reserved.
- Copyright (c) 2018, Adafruit Industries (adafruit.com)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the GNU Lesser General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#ifndef _VARIANT_LORA_ISP4520_
-#define _VARIANT_LORA_ISP4520_
-
-#define USE_SEGGER
-/*----------------------------------------------------------------------------
- *        Headers
- *----------------------------------------------------------------------------*/
-
-#include "WVariant.h"
-
-#define USE_LFXO
-
-// #define USE_SEGGER
-
-// Number of pins defined in PinDescription array
-#define PINS_COUNT (16)
-#define NUM_DIGITAL_PINS (16)
-#define NUM_ANALOG_INPUTS (1)
-#define NUM_ANALOG_OUTPUTS (1)
-
-/*
- * SPI Interfaces
- */
-#define SPI_INTERFACES_COUNT 1
-
-// These are in arduino pin numbers,
-// translation in g_ADigitalPinMap in variants.cpp
-#define PIN_SPI_MISO (0)
-#define PIN_SPI_MOSI (9)
-#define PIN_SPI_SCK (2)
-
-/*
- * Wire Interfaces (I2C)
- */
-#define WIRE_INTERFACES_COUNT 0
-
-// GPIOs the SX1262 is connected
-#define USE_SX1262
-#define SX126X_CS 1 // aka SPI_NSS
-#define SX126X_DIO1 (4)
-#define SX126X_BUSY (5)
-#define SX126X_RESET (6)
-
-/*
- * Serial interfaces
- */
-#define PIN_SERIAL_RX (10)
-#define PIN_SERIAL_TX (11)
-// LEDs
-#define PIN_LED1 (12)
-#define PIN_LED2 (13)
-#define PIN_BUZZER (14)
-
-#define LED_BUILTIN PIN_LED1
-#define LED_CONN PIN_LED2
-
-#define LED_RED PIN_LED1
-#define LED_BLUE PIN_LED2
-
-#define LED_STATE_ON 1 // State when LED is litted
-
-/*
- * Buttons
- */
-#define PIN_BUTTON1 (15)
-#define PIN_BUTTON2 (7)
-#define PIN_BUTTON3 (8)
-
-// ADC pin and voltage divider
-#define BATTERY_PIN 3
-#define ADC_MULTIPLIER 1.436
-
-#define SX126X_DIO2_AS_RF_SWITCH
-#define SX126X_DIO3_TCXO_VOLTAGE 1.8 // Not really an E22 but this board clones using DIO3 for tcxo control
-
-#endif
--- a/variants/radiomaster_900_bandit/variant.h
+++ b/variants/radiomaster_900_bandit/variant.h
@@ -11,12 +11,17 @@

 /*
  I2C SDA and SCL.
-  0x18 - STK8XXX Accelerometer, Not supported yet.
+  0x18 - STK8XXX Accelerometer
  0x3C - SH1115 Display Driver
 */
 #define I2C_SDA 14
 #define I2C_SCL 12

+/*
+  I2C STK8XXX Accelerometer Interrupt PIN to ESP32 Pin 6 - SENSOR_CAPP (GPIO37)
+*/
+#define STK8XXX_INT 37
+
 /*
  No GPS - but free pins are available.
 */
--- a/variants/rak11200/variant.h
+++ b/variants/rak11200/variant.h
@@ -70,11 +70,12 @@ static const uint8_t SCK = 33;
 #define LORA_CS SS

 #define USE_SX1262
+#define SX126X_ANT_SW WB_IO3
 #define SX126X_CS SS // NSS for SX126X
 #define SX126X_DIO1 LORA_DIO1
 #define SX126X_BUSY LORA_DIO2
 #define SX126X_RESET LORA_RESET
-#define SX126X_POWER_EN WB_IO3
+#define SX126X_POWER_EN WB_IO2
 // DIO2 controlls an antenna switch and the TCXO voltage is controlled by DIO3
 #define SX126X_DIO2_AS_RF_SWITCH
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8
--- a/variants/seeed-sensecap-indicator/pins_arduino.h
+++ b/variants/seeed-sensecap-indicator/pins_arduino.h
@@ -0,0 +1,56 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+// static const uint8_t LED_BUILTIN = -1;
+
+// static const uint8_t TX = 43;
+// static const uint8_t RX = 44;
+
+static const uint8_t SDA = 39;
+static const uint8_t SCL = 40;
+
+// Default SPI will be mapped to Radio
+static const uint8_t SS = -1;
+static const uint8_t MOSI = 48;
+static const uint8_t MISO = 47;
+static const uint8_t SCK = 41;
+
+static const uint8_t A0 = 1;
+static const uint8_t A1 = 2;
+static const uint8_t A2 = 3;
+static const uint8_t A3 = 4;
+static const uint8_t A4 = 5;
+static const uint8_t A5 = 6;
+static const uint8_t A6 = 7;
+static const uint8_t A7 = 8;
+static const uint8_t A8 = 9;
+static const uint8_t A9 = 10;
+static const uint8_t A10 = 11;
+static const uint8_t A11 = 12;
+static const uint8_t A12 = 13;
+static const uint8_t A13 = 14;
+static const uint8_t A14 = 15;
+static const uint8_t A15 = 16;
+static const uint8_t A16 = 17;
+static const uint8_t A17 = 18;
+static const uint8_t A18 = 19;
+static const uint8_t A19 = 20;
+
+static const uint8_t T1 = 1;
+static const uint8_t T2 = 2;
+static const uint8_t T3 = 3;
+static const uint8_t T4 = 4;
+static const uint8_t T5 = 5;
+static const uint8_t T6 = 6;
+static const uint8_t T7 = 7;
+static const uint8_t T8 = 8;
+static const uint8_t T9 = 9;
+static const uint8_t T10 = 10;
+static const uint8_t T11 = 11;
+static const uint8_t T12 = 12;
+static const uint8_t T13 = 13;
+static const uint8_t T14 = 14;
+
+#endif /* Pins_Arduino_h */
--- a/variants/seeed-sensecap-indicator/platformio.ini
+++ b/variants/seeed-sensecap-indicator/platformio.ini
@@ -0,0 +1,28 @@
+; Seeed Studio SenseCAP Indicator
+[env:seeed-sensecap-indicator]
+extends = esp32s3_base
+platform_packages =
+    platformio/framework-arduinoespressif32 @ https://github.com/mverch67/arduino-esp32.git#add_tca9535 ; based on 2.0.16
+
+board = seeed-sensecap-indicator
+board_check = true
+upload_protocol = esptool
+
+build_flags = ${esp32_base.build_flags}
+  -Ivariants/seeed-sensecap-indicator
+  -DSENSECAP_INDICATOR
+  -DCONFIG_ARDUHAL_LOG_COLORS
+  -DRADIOLIB_DEBUG_SPI=0
+  -DRADIOLIB_DEBUG_PROTOCOL=0
+  -DRADIOLIB_DEBUG_BASIC=0
+  -DRADIOLIB_VERBOSE_ASSERT=0
+  -DRADIOLIB_SPI_PARANOID=0
+  -DIO_EXPANDER=0x40
+  -DIO_EXPANDER_IRQ=42
+  ;-DIO_EXPANDER_DEBUG
+  -DUSE_ARDUINO_HAL_GPIO
+
+lib_deps = ${esp32s3_base.lib_deps}
+  https://github.com/mverch67/LovyanGFX#develop
+  earlephilhower/ESP8266Audio@^1.9.7
+  earlephilhower/ESP8266SAM@^1.0.1
--- a/variants/seeed-sensecap-indicator/variant.h
+++ b/variants/seeed-sensecap-indicator/variant.h
@@ -0,0 +1,64 @@
+#define I2C_SDA 39
+#define I2C_SCL 40
+
+#define BUTTON_PIN 38
+// #define BUTTON_NEED_PULLUP
+
+// #define BATTERY_PIN 27 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
+// #define ADC_CHANNEL ADC1_GPIO27_CHANNEL
+// #define ADC_MULTIPLIER 2
+
+// ST7701 TFT LCD
+#define ST7701_CS (4 | IO_EXPANDER)
+#define ST7701_RS -1  // DC
+#define ST7701_SDA 48 // MOSI
+#define ST7701_SCK 41
+#define ST7701_RESET (5 | IO_EXPANDER)
+#define ST7701_MISO 47
+#define ST7701_BUSY -1
+#define ST7701_BL 45
+#define ST7701_SPI_HOST SPI2_HOST
+#define ST7701_BACKLIGHT_EN 45
+#define SPI_FREQUENCY 20000000
+#define SPI_READ_FREQUENCY 16000000
+#define TFT_HEIGHT 480
+#define TFT_WIDTH 480
+#define TFT_OFFSET_X 0
+#define TFT_OFFSET_Y 0
+#define TFT_OFFSET_ROTATION 0
+#define TFT_BL 45
+#define SCREEN_ROTATE
+#define SCREEN_TRANSITION_FRAMERATE 5 // fps
+
+#define HAS_TOUCHSCREEN 1
+#define SCREEN_TOUCH_INT (6 | IO_EXPANDER)
+#define SCREEN_TOUCH_RST (7 | IO_EXPANDER)
+#define TOUCH_I2C_PORT 0
+#define TOUCH_SLAVE_ADDRESS 0x48
+
+// Buzzer
+#define PIN_BUZZER 19
+
+#define HAS_GPS 0
+#undef GPS_RX_PIN
+#undef GPS_TX_PIN
+
+#define USE_SX1262
+#define USE_SX1268
+
+#define LORA_SCK 41
+#define LORA_MISO 47
+#define LORA_MOSI 48
+#define LORA_CS (0 | IO_EXPANDER)
+
+#define LORA_DIO0 -1 // a no connect on the SX1262 module
+#define LORA_RESET (1 | IO_EXPANDER)
+#define LORA_DIO1 (3 | IO_EXPANDER) // SX1262 IRQ
+#define LORA_DIO2 (2 | IO_EXPANDER) // SX1262 BUSY
+#define LORA_DIO3
+
+#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
Author	SHA1	Message	Date
Ben Meadors	c13b44b992	Let's use the artifacts token actually	2024-09-21 19:33:17 -05:00
Ben Meadors	baceb48f07	Additional logic and auth	2024-09-21 19:20:20 -05:00
Ben Meadors	6aa3705b8a	Hopefully extract and commit to meshtastic.github.io	2024-09-21 18:08:01 -05:00
Jonathan Bennett	c4c63a8af3	Update platform-native to pick up portduino crash fix (#4807 )	2024-09-21 16:17:48 -05:00
todd-herbert	a6e16e901d	Re-order doDeepSleep (#4802 ) Make sure PMU sleep takes place before I2C ends	2024-09-21 15:16:16 -05:00
Ben Meadors	0664c09f9d	Download debian files after firmware zip	2024-09-20 14:55:53 -05:00
todd-herbert	ba31a7c753	Honor flip & color for Heltec T114 and T190 (#4786 ) * Honor TFT_MESH color if defined for Heltec T114 or T190 * Temporary: point lib_deps at fork of Heltec's ST7789 library For demo only, until ST7789 is merged * Update lib_deps; tidy preprocessor logic	2024-09-20 13:27:41 -05:00
Ben Meadors	85d722232e	Additional decoded packet ignores	2024-09-20 07:35:26 -05:00
Ben Meadors	921d92c649	Drop received packets from self	2024-09-20 06:55:16 -05:00
Jonathan Bennett	0f3450ad44	Mark package workflows for gh hosted runners	2024-09-19 18:21:30 -05:00
Jonathan Bennett	114df8cb1b	Pin sensorlib version	2024-09-19 13:29:17 -05:00
Jonathan Bennett	d3a293a0d8	Flag semgrep to not run on self-hosted The semgrep action runs inside a docker container, and docker in podman just doesn't work.	2024-09-19 12:10:39 -05:00
Ben Meadors	91b4199f9d	Revert "DetectionSensor: broadcast all state changes" (#4776 )	2024-09-19 10:46:18 -05:00
Tom Fifield	6473cf0b69	Update RadioLib to 7.0.0 (#4771 ) We were not too many commits behind, and the changes since then were either for LoraWAN or useful minor bug fixes for SX1280.	2024-09-19 06:48:22 -05:00
Tom Fifield	84e197574b	Merge pull request #4773 from markbirss/master Update HW_VENDOR	2024-09-19 16:28:40 +08:00
Mark Trevor Birss	5c4c0965af	Update nordic_pca10059.json	2024-09-19 15:41:59 +08:00
Mark Trevor Birss	7289b295e8	Update me25ls01-4y10td.json	2024-09-19 15:41:59 +08:00
Mark Trevor Birss	7c32ab3023	Update ms24sf1.json	2024-09-19 15:41:59 +08:00
Tom Fifield	2bc036f9eb	Merge pull request #4772 from dahanc/master Another missed define for the T114	2024-09-19 15:28:26 +08:00
David Huang	cc89e85e71	Another missed define for the T114	2024-09-19 00:53:33 -05:00
Tom Fifield	da45cb8557	Merge pull request #4767 from augustozanellato/detsensor_broadcast_changes DetectionSensor: broadcast all state changes	2024-09-19 13:42:56 +08:00
Augusto Zanellato	2ebfcea94e	DetectionSensor: broadcast all state changes Closes #4753	2024-09-18 19:43:23 +02:00
github-actions[bot]	deada41cee	[create-pull-request] automated change (#4765 ) Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>	2024-09-18 10:49:12 -05:00
Ben Meadors	777bcf691a	Initial PhoneAPI rate-limiting of messages on certain ports (#4756 )	2024-09-18 10:13:07 -05:00
Tom Fifield	35e1c401e2	PMSA0031 sensors require ~3secs before coming up on I2C (#4743 ) * PMSA0031 sensors require ~3secs before coming up on I2C As reported by @MALAONE1 and debugged by @shodan8192 , PMSA0031s on a RAK4631 take 3 seconds before they can become detectable on I2c. Add a delay(4000) before I2C scan if the air quality sensor pin is defined. Fixes https://github.com/meshtastic/firmware/issues/3690 * Remove 4 second wait and rescan during air quality init for the sensor * works without but this triggers my OCD --------- Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>	2024-09-18 10:12:49 -05:00
Tom Fifield	19c57e8ec6	Fix Chatter 2 blank screen on boot (#4759 ) As reported by @eureekasigns and @GPSFan, Chatter 2 had begun to show a blank screen on boot after recent TFT display changes. Setting TFT_BACKLIGHT_ON LOW resolves the issue. Fixes https://github.com/meshtastic/firmware/issues/4751	2024-09-18 09:05:32 -05:00
Jonathan Bennett	c6196b2260	Update build_esp32.yml -- less CI fun	2024-09-18 01:11:08 -05:00
Jonathan Bennett	3eebdcefa4	More CI fun	2024-09-18 00:28:54 -05:00
Jonathan Bennett	4289cb089b	Update package_raspbian.yml to build on self-hosted (#4761 ) * Update package_raspbian.yml to build on self-hosted * Update package_raspbian_armv7l.yml to use self hosted	2024-09-18 00:17:48 -05:00
Jonathan Bennett	2d52803dbd	Add new admin error types (#4750 ) Co-authored-by: Ben Meadors <benmmeadors@gmail.com>	2024-09-17 21:09:24 -05:00
Jonathan Bennett	c78302a2ee	Add hasPKC to deviceMetadata (#4755 )	2024-09-17 19:34:05 -05:00
github-actions[bot]	923458bc18	[create-pull-request] automated change (#4754 ) Co-authored-by: jp-bennett <5630967+jp-bennett@users.noreply.github.com>	2024-09-17 17:55:16 -05:00
Ben Meadors	50fb4ab22a	Implement optional hops_away on NodeInfo/Lite (#4747 ) * Implement optional hops_away on NodeInfo/Lite * Trunk	2024-09-17 12:08:04 -05:00
Thomas Göttgens	f5016763fd	change evaluation order to silence warning about "found" (#4749 )	2024-09-17 10:33:21 -05:00
Ben Meadors	2a6921292e	Implement CoT detail support in TAKPacket (#4748 ) * Implement CoT detail support in TAKPacket * dest, src * More coffee is needed * SAVE	2024-09-17 10:05:55 -05:00
github-actions[bot]	a47570d65a	[create-pull-request] automated change (#4746 ) Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>	2024-09-17 06:52:42 -05:00
Andre K	db4dc88d6f	feat: enable remote admin to set/clear fixed positions (#4713 ) Co-authored-by: Ben Meadors <benmmeadors@gmail.com>	2024-09-17 06:50:49 -05:00
Tom Fifield	be306cc384	Increase GPS FIFO Buffer Size for RP2040 (#4741 ) As discovered and tested by @Mictronics, default Serial FIFO size on the Pico is 32bytes, which is not enough for GPS messages. This patch increases the Serial GPS FIFO buffer size to 256 for the RP2040 Architecture fixes https://github.com/meshtastic/firmware/issues/3989	2024-09-17 06:48:56 -05:00
Jonathan Bennett	a967dd52f3	More useful PKC logging (#4742 )	2024-09-17 06:31:39 -05:00
Ben Meadors	11378325e0	Separate GPS and NTP RTCQuality logic and allow GPS time to always set us (#4721 )	2024-09-17 06:29:18 -05:00
Thomas Göttgens	4b5bcf52d2	Merge pull request #4691 from S5NC/rak11200-pin-name-correction Rak11200 pin name correction	2024-09-17 11:42:40 +02:00
Thomas Göttgens	5ba418b2cd	Merge pull request #4744 from meshtastic/create-pull-request/patch Changes by create-pull-request action	2024-09-17 09:27:42 +02:00
Thomas Göttgens	bc753e6903	trunk fmt	2024-09-17 15:24:11 +08:00
S5NC	34a543ec74	Update main.cpp	2024-09-17 15:24:11 +08:00
S5NC	06cd9abd81	Update SX126xInterface.cpp	2024-09-17 15:24:11 +08:00
S5NC	af30485611	Update main.cpp	2024-09-17 15:24:11 +08:00
S5NC	cd6bd1e9a3	Update main.cpp	2024-09-17 15:24:11 +08:00
S5NC	b025eeb13c	Update variant.h	2024-09-17 15:24:11 +08:00
Thomas Göttgens	21eb54e58a	Merge pull request #4740 from fifieldt/QMC5883L Fix I2C address for QMC5883L.	2024-09-17 09:09:43 +02:00
Tom Fifield	6f1db6fc63	Fix I2C address for QMC5883L. QMC5883L and HMC5883L are 3-axis compasses which are often confused. As reported by @Africmod, we had the wrong I2C address for the QMC5883L. This patch fixes the address and adds its HMC5883L so we keep info about both. Fixes https://github.com/meshtastic/firmware/issues/4144	2024-09-17 13:48:10 +08:00
Tom Fifield	a5118787b3	Merge pull request #4689 from Szetya/master Improved compass arrow	2024-09-17 13:02:52 +08:00
jp-bennett	39c90dd581	[create-pull-request] automated change	2024-09-17 02:53:44 +00:00
Todd Herbert	33e6f7f6e0	Hollow triangle for E-Ink; trunk formatting	2024-09-17 08:27:00 +08:00
Szetya	97fd189f43	Compass update https://github.com/meshtastic/firmware/issues/4494 New compass arrow and replacement of the north marker with a small circle.	2024-09-17 08:27:00 +08:00
jhps	1e665d5181	Update T114 LED definitions to include only one simple controllable LED and two NEOPIXELS. (#4710 )	2024-09-16 19:11:55 -05:00
Thomas Göttgens	b3343303a9	write firmware version and hardware platform to Flash memory	2024-09-16 21:36:54 +02:00
github-actions[bot]	f37276d5fc	[create-pull-request] automated change (#4736 ) Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>	2024-09-16 10:32:21 -05:00
Tom Fifield	905194c604	Remove lora_isp4520 (#4735 ) Per Ben: "We haven't supported any NRF5832 based board in quite some time. It's relatively resource constrained compared to the NRF52840"	2024-09-16 09:06:13 -05:00
Thomas Göttgens	51b22630b4	Merge pull request #4728 from fifieldt/11111111111111111 Fix Heltec T114 vendor definition	2024-09-16 12:20:18 +02:00
Mark Trevor Birss	5d831ef461	Merge pull request #4729 from markbirss/master [BUG-FIX] ME25LS01-4Y10TD_e-ink e-paper init fix	2024-09-16 11:14:16 +02:00
Mark Trevor Birss	4e8672cce4	Update variant.h	2024-09-16 10:40:52 +02:00
Tom Fifield	41a769aa06	Fix Heltec T114 vendor definition @dahanc pointed out there was an extra one in there.	2024-09-16 13:55:27 +08:00
Ben Meadors	8d57b6164a	Add Heltec T1114 hardware model to build (#4719 )	2024-09-15 20:37:19 -05:00
Ben Meadors	dc3eba9100	Expand to MqttClientProxyMessage_size (#4726 )	2024-09-15 18:57:02 -05:00
Jonathan Bennett	ff8baa1c85	Don't use PKC on a non-primary channel unless specifically requested (#4715 ) * Don't use PKC on a non-primary channel unless specifically requested * Don't change from channel 0 if we can send a PKC packet.	2024-09-15 09:26:43 -05:00
Jonathan Bennett	3a10a27851	Actually restrict remote hardware to gpio channel (#4717 )	2024-09-15 06:27:59 -05:00
GUVWAF	8893529653	Make local stats number of Rx packets sum of good and bad (#4709 )	2024-09-14 17:53:27 -05:00
Jonathan Bennett	1ab5bf4355	Use the time.age() value to correct stale GPS times (#4705 ) * Use the time.age() value to correct stale GPS times * Trunk --------- Co-authored-by: Ben Meadors <benmmeadors@gmail.com>	2024-09-14 07:44:40 -05:00
Ben Meadors	ae791ca7e1	Add buildstamp epoch to initial debug output	2024-09-13 19:43:50 -05:00
Ben Meadors	35cfe4318a	Stop past timestamps from setting our system time RTC (#4704 ) * Ignore attempts to set times in the past (before our build epoch) * TRONK	2024-09-13 19:42:31 -05:00
rcarteraz	b59bd6fee9	Update feature.yml (#4700 )	2024-09-13 16:11:54 -05:00
rcarteraz	8b911f14cf	Update Bug Report.yml (#4702 )	2024-09-13 16:11:39 -05:00
Ben Meadors	d36c69396b	Exclude meshtasticd binaries from firmware.zip (#4698 ) * Exclude meshtasticd binaries from firmware.zip * Incorrect	2024-09-13 10:42:40 -05:00
Vertex	3d72fbb19e	Define SX126X_ANT_SW for the RAK11200 to allow it to function correctly on the RAK19007 base (#4690 )	2024-09-12 12:20:38 -05:00
Manuel	625254cf90	Support Seeed SenseCAP Indicator (#4279 ) * preliminary target environment * add debug tool * add screen definitions * screen definitions * remove rtc, debug build * correct rotation * Add real hwmodel * fix width * use IO expander ports * link to modified arduino-esp32 * added config_detail * rotate screen * remove touch INT * add delay to display log * color log and radiolib log * LoRa init * make trunk happy * add lovyanGFX patch lib for io expander * fix lib * fix display&touch function * touch driver I2C scan * remove delay * build for release * minor code cleanup * allow trunk to be happy --------- Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>	2024-09-12 06:44:30 -05:00
panaceya	910b6b7512	OLED_ can be configured via userPrefs.h (#4624 )	2024-09-11 19:31:30 -05:00
Tom Fifield	371c3e05bf	Beautify GPS_DEBUG getACK logging code (#4672 ) This getACK is used to look for ASCII responses, so print ASCII when GPS_DEBUG is enabled. This markedly assisted with recent AG3335 debugging. It works great with other chips too (tested eg ATGM336H). Even UBLOX prints understandable "GPTXT,01,01,01,PDTI inv format*35." responses. Credit to bluebrolly. on discord.	2024-09-11 19:30:29 -05:00
Michael Gjelsø	f37df4d6bf	Radiomaster Bandit Accelerometer support (#4667 ) * Added STK8xxxx Accelerometer chip Added detection of STK8BA53 to I2C scanner. Change the way and order MCP9808, lLISH3DH and STK8BA53 is detected since they all shares the same I2C address. * Accelerometer support Radiomaster Bandit. Enables tap to wake screen if enabled in config, * Trunk Trunk	2024-09-11 18:53:17 -05:00
github-actions[bot]	ba9a3cd719	[create-pull-request] automated change (#4685 ) Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>	2024-09-11 18:51:52 -05:00
Ben Meadors	9ac0e26d42	Add option to preserve private key for factory reset (config) (#4679 ) * Add option to preserve private key for factory reset (config) * Typo fix * Copy the key in the right direction, and set the size. * Don't set the key size back to 0 right after setting it to 32. * Set the key size before using it to do a memcpy. * Use the right key_size for backing up private_key * Don't factoryReset() for a missing nodeDB * Disable Bluetooth in AdminModule when resetting device settings or nodeDB to avoid race * Add checks for valid objects before deinit bluetooth * Add disableBluetooth to handleSetConfig, handleSetModuleConfig, and commit settings --------- Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>	2024-09-11 08:42:26 -05:00
Ben Meadors	1ba4f6e222	Revert "Temp: Grab pre-release tag" This reverts commit `e8e9826adc`.	2024-09-10 20:07:06 -05:00
Ben Meadors	e8e9826adc	Temp: Grab pre-release tag	2024-09-10 19:27:59 -05:00
zerolint	6724f1f7ea	Print Unix epoch on time_t 64bit platforms (#4673 ) Fixes (#4600) by using unsigned 32bit for epoch. Co-authored-by: Ben Meadors <benmmeadors@gmail.com>	2024-09-10 15:51:28 -05:00
Ben Meadors	013021941e	Remove scaling of smart position broadcast minimum interval specifically (#4677 ) * Remove scaling of smart position broacast minimum interval specifically * Trunk	2024-09-10 15:30:40 -05:00
Jonathan Bennett	4e850296b6	Fix repeatedly getting new NodeNum and add more debug (#4674 ) * All the debug * Change `memccpy()` to `memcpy()` * Brint all the bytes of the MAC Address from the NodeDB * Check for blank MAC Address in ourown NodeDB entry * One more `memccpy()` * Clean-up debug log --------- Co-authored-by: GUVWAF <thijs@havinga.eu>	2024-09-10 13:24:57 -05:00
GUVWAF	f1602ee3f6	Merge pull request #4669 from GUVWAF/trFix	2024-09-09 23:13:39 +02:00
GUVWAF	5537f98dd6	Merge branch 'master' into trFix	2024-09-09 21:29:37 +02:00
GUVWAF	4ed12bf21d	Try fix repeatedly getting a new NodeNum (#4670 )	2024-09-09 14:22:32 -05:00
Ben Meadors	106dab23db	Revert "Changes by create-pull-request action" (#4671 )	2024-09-09 14:20:14 -05:00
GUVWAF	2f9dcee954	Fix size calculation of route/SNR array	2024-09-09 19:13:00 +02:00
Thomas Göttgens	68d6ff8c24	Merge pull request #4650 from fifieldt/AG3352 Add support for AG3352 and fix AG3335 support	2024-09-09 16:40:44 +02:00
Tom Fifield	dc8cc122a6	Add explicit to JSONValue constructors (#4665 )	2024-09-09 09:20:21 -05:00
Tom Fifield	e9d55de3cb	Fix out-of-bound array access in T1000X Sensor (#4663 ) if u8i == 135, then u8i++ runs, the loop exits since u8i == 136, then value for u8i is 136 after the for loop. then in the next line, ntc_res2[u8i] will read past the end of the array	2024-09-09 07:54:11 -05:00
David	dacb452d47	Bugfix (#4660 )	2024-09-09 07:16:58 -05:00
Thomas Göttgens	b2e2f1dba3	Merge branch 'master' into AG3352	2024-09-09 11:10:36 +02:00
Tom Fifield	6217e97c41	Add support for AG3352 and fix AG3335 support AG33352 is a Mediatek/Airoha GPS/GLONASS/Galileo/BeiDou receiver. Patch adds relevant detection and setup code. Thanks to Bluebrolly and kongduino for providing the relevant information and testing. This patch also fixes support for the A3335, which is a related chip. The setup and detection code now works as tested on a real life T-1000E! Thanks to @gpsfan for the guidance.	2024-09-09 09:06:05 +08:00