From d332dfa19b851d93b1dc39f5fe3831995136e971 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 8 Oct 2025 17:33:39 +1100
Subject: [PATCH 01/19] Update python Docker tag to v3.14 (#8255)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Dockerfile        | 2 +-
 alpine.Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b1e151ac7..111dd69fc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@
 # trunk-ignore-all(hadolint/DL3008): Do not pin apt package versions
 # trunk-ignore-all(hadolint/DL3013): Do not pin pip package versions
 
-FROM python:3.13-slim-trixie AS builder
+FROM python:3.14-slim-trixie AS builder
 ARG PIO_ENV=native
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Etc/UTC
diff --git a/alpine.Dockerfile b/alpine.Dockerfile
index 670736241..0469874e4 100644
--- a/alpine.Dockerfile
+++ b/alpine.Dockerfile
@@ -3,7 +3,7 @@
 # trunk-ignore-all(hadolint/DL3018): Do not pin apk package versions
 # trunk-ignore-all(hadolint/DL3013): Do not pin pip package versions
 
-FROM python:3.13-alpine3.22 AS builder
+FROM python:3.14-alpine3.22 AS builder
 ARG PIO_ENV=native
 ENV PIP_ROOT_USER_ACTION=ignore
 

From 7822f28152cab468b13567b5cef583cde8468832 Mon Sep 17 00:00:00 2001
From: Andrew Yong <me@ndoo.sg>
Date: Thu, 9 Oct 2025 00:33:50 +0800
Subject: [PATCH 02/19] fix: Move `#include "variant.h"` to top of file (fixes
 #8276) (#8278)

* Force coverage tests to run in simulation mode

* Revert "Force coverage tests to run in simulation mode"

This reverts commit e4ec719e6f888c47ee3a1cc78afd2b96d5f196d1.

* fix: Move `#include "variant.h"` to top of file (fixes #8276)

The original line being further down the file causes any #ifdef/defined() checks for definitions in variant.h to silently skip.

This was noticed when `USE_GC1109_PA` in Heltec v4 and Heltec Wireless Tracker failed to correct program TX_GAIN_LORA, but will also affect any variant.h-dependent configurations in this file, if they would have been defined above where the `#include` previously was.

---------

Co-authored-by: Austin Lane <vidplace7@gmail.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
---
 src/configuration.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/configuration.h b/src/configuration.h
index e67f0b8e5..c6c8d673c 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -33,6 +33,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "pcf8563.h"
 #endif
 
+/* Offer chance for variant-specific defines */
+#include "variant.h"
+
 // -----------------------------------------------------------------------------
 // Version
 // -----------------------------------------------------------------------------
@@ -260,9 +263,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // convert 24-bit color to 16-bit (56K)
 #define COLOR565(r, g, b) (((r & 0xF8) << 8) | ((g & 0xFC) << 3) | ((b & 0xF8) >> 3))
 
-/* Step #1: offer chance for variant-specific defines */
-#include "variant.h"
-
 #if defined(VEXT_ENABLE) && !defined(VEXT_ON_VALUE)
 // Older variant.h files might not be defining this value, so stay with the old default
 #define VEXT_ON_VALUE LOW

From adae68fbfe94d1415e54a1bafb842f144e02a4df Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 8 Oct 2025 11:34:11 -0500
Subject: [PATCH 03/19] Update meshtastic/device-ui digest to 6d8cc22 (#8275)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 2e101a8a2..7121f00b7 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -120,7 +120,7 @@ lib_deps =
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/e564d78ae1a7e9a225aaf4a73b1cb84c549f510f.zip
+	https://github.com/meshtastic/device-ui/archive/6d8cc228298a1ecd9913aed757187e9527c1facc.zip
 
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]

From 828e11cc482a802b3385c9a4aa7cb7b00a519360 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Wed, 8 Oct 2025 14:16:57 -0500
Subject: [PATCH 04/19] NimBLE speedup (#8281)

* Remove status polling code in NimBLE

* Goober

---------

Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>
---
 src/mesh/PhoneAPI.cpp          |  2 +-
 src/nimble/NimbleBluetooth.cpp | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/mesh/PhoneAPI.cpp b/src/mesh/PhoneAPI.cpp
index 210e0ba06..d2ed2d4cb 100644
--- a/src/mesh/PhoneAPI.cpp
+++ b/src/mesh/PhoneAPI.cpp
@@ -431,7 +431,6 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
         break;
 
     case STATE_SEND_OTHER_NODEINFOS: {
-        LOG_DEBUG("Send known nodes");
         if (nodeInfoForPhone.num != 0) {
             // Just in case we stored a different user.id in the past, but should never happen going forward
             sprintf(nodeInfoForPhone.user.id, "!%08x", nodeInfoForPhone.num);
@@ -592,6 +591,7 @@ bool PhoneAPI::available()
                 nodeInfoForPhone.snr = isUs ? 0 : nodeInfoForPhone.snr;
                 nodeInfoForPhone.via_mqtt = isUs ? false : nodeInfoForPhone.via_mqtt;
                 nodeInfoForPhone.is_favorite = nodeInfoForPhone.is_favorite || isUs; // Our node is always a favorite
+
                 onNowHasData(0);
             }
         }
diff --git a/src/nimble/NimbleBluetooth.cpp b/src/nimble/NimbleBluetooth.cpp
index 5524765f3..030e00d6b 100644
--- a/src/nimble/NimbleBluetooth.cpp
+++ b/src/nimble/NimbleBluetooth.cpp
@@ -120,14 +120,19 @@ class NimbleBluetoothFromRadioCallback : public NimBLECharacteristicCallbacks
     virtual void onRead(NimBLECharacteristic *pCharacteristic)
 #endif
     {
-        int tries = 0;
-        bluetoothPhoneAPI->phoneWants = true;
-        while (!bluetoothPhoneAPI->hasChecked && tries < 100) {
-            bluetoothPhoneAPI->setIntervalFromNow(0);
-            delay(20);
-            tries++;
-        }
         std::lock_guard<std::mutex> guard(bluetoothPhoneAPI->nimble_mutex);
+
+        // If we don't have fresh data, trigger a refresh
+        if (!bluetoothPhoneAPI->hasChecked || bluetoothPhoneAPI->numBytes == 0) {
+            bluetoothPhoneAPI->phoneWants = true;
+            bluetoothPhoneAPI->setIntervalFromNow(0);
+
+            // Get fresh data immediately
+            bluetoothPhoneAPI->numBytes = bluetoothPhoneAPI->getFromRadio(bluetoothPhoneAPI->fromRadioBytes);
+            bluetoothPhoneAPI->hasChecked = true;
+        }
+
+        // Set the characteristic value with whatever data we have
         pCharacteristic->setValue(bluetoothPhoneAPI->fromRadioBytes, bluetoothPhoneAPI->numBytes);
 
         if (bluetoothPhoneAPI->numBytes != 0) // if we did send something, queue it up right away to reload

From 05edcc5d6ce1ed755fe40013459b718bafe84e24 Mon Sep 17 00:00:00 2001
From: Tom Fifield <tom@tomfifield.net>
Date: Thu, 9 Oct 2025 08:03:26 +1100
Subject: [PATCH 05/19] Fix Station G2 Lora Power Settings (#8273)

* Force coverage tests to run in simulation mode

* Revert "Force coverage tests to run in simulation mode"

This reverts commit e4ec719e6f888c47ee3a1cc78afd2b96d5f196d1.

* Fix Station G2 Lora Power Settings

In #8107 we introduced the ability to specify gain values for
non-linear power amplifiers.

This patch adds appropriate values for the Station G2, based on
the table at https://wiki.uniteng.com/en/meshtastic/station-g2#summary-for-lora-power-amplifier-conduction-test

Fixes https://github.com/meshtastic/firmware/issues/7239

---------

Co-authored-by: Austin Lane <vidplace7@gmail.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
---
 src/configuration.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/configuration.h b/src/configuration.h
index c6c8d673c..b6b1c1e5e 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -126,6 +126,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TX_GAIN_LORA 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 10, 10, 9, 9, 8, 7
 #endif
 
+#ifdef STATION_G2
+#define NUM_PA_POINTS 19
+#define TX_GAIN_LORA 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 19, 19, 18, 18
+#endif
+
 // Default system gain to 0 if not defined
 #ifndef TX_GAIN_LORA
 #define TX_GAIN_LORA 0

From 2a1469652540d85710c62ab80b65626a3ee17b08 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 9 Oct 2025 09:32:41 +1100
Subject: [PATCH 06/19] chore(deps): update github/codeql-action action to v4
 (#8250)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/sec_sast_semgrep_cron.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sec_sast_semgrep_cron.yml b/.github/workflows/sec_sast_semgrep_cron.yml
index 96c993cba..2059fde2c 100644
--- a/.github/workflows/sec_sast_semgrep_cron.yml
+++ b/.github/workflows/sec_sast_semgrep_cron.yml
@@ -41,7 +41,7 @@ jobs:
 
       # step 4
       - name: publish code scanning alerts
-        uses: github/codeql-action/upload-sarif@v3
+        uses: github/codeql-action/upload-sarif@v4
         with:
           sarif_file: report.sarif
           category: semgrep

From 45f15b8fe66b42ac31b05fe06e65d54467317c7b Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Thu, 9 Oct 2025 12:44:00 -0500
Subject: [PATCH 07/19] Fix BLE stateful issues (#8287)

---
 src/mesh/PhoneAPI.cpp          |  2 +-
 src/nimble/NimbleBluetooth.cpp | 23 +++--------------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/mesh/PhoneAPI.cpp b/src/mesh/PhoneAPI.cpp
index d2ed2d4cb..e8dc9843c 100644
--- a/src/mesh/PhoneAPI.cpp
+++ b/src/mesh/PhoneAPI.cpp
@@ -734,7 +734,7 @@ int PhoneAPI::onNotify(uint32_t newValue)
         LOG_INFO("Tell client we have new packets %u", newValue);
         onNowHasData(newValue);
     } else {
-        LOG_DEBUG("(Client not yet interested in packets)");
+        LOG_DEBUG("Client not yet interested in packets (state=%d)", state);
     }
 
     return timeout ? -1 : 0; // If we timed out, MeshService should stop iterating through observers as we just removed one
diff --git a/src/nimble/NimbleBluetooth.cpp b/src/nimble/NimbleBluetooth.cpp
index 030e00d6b..0b3009d39 100644
--- a/src/nimble/NimbleBluetooth.cpp
+++ b/src/nimble/NimbleBluetooth.cpp
@@ -31,11 +31,8 @@ class BluetoothPhoneAPI : public PhoneAPI, public concurrency::OSThread
     std::vector<NimBLEAttValue> nimble_queue;
     std::mutex nimble_mutex;
     uint8_t queue_size = 0;
-    bool has_fromRadio = false;
     uint8_t fromRadioBytes[meshtastic_FromRadio_size] = {0};
     size_t numBytes = 0;
-    bool hasChecked = false;
-    bool phoneWants = false;
 
   protected:
     virtual int32_t runOnce() override
@@ -48,10 +45,7 @@ class BluetoothPhoneAPI : public PhoneAPI, public concurrency::OSThread
             LOG_DEBUG("Queue_size %u", queue_size);
             queue_size = 0;
         }
-        if (hasChecked == false && phoneWants == true) {
-            numBytes = getFromRadio(fromRadioBytes);
-            hasChecked = true;
-        }
+        // Note: phoneWants/hasChecked logic removed since onRead() handles getFromRadio() directly
 
         // the run is triggered via NimbleBluetoothToRadioCallback and NimbleBluetoothFromRadioCallback
         return INT32_MAX;
@@ -122,15 +116,8 @@ class NimbleBluetoothFromRadioCallback : public NimBLECharacteristicCallbacks
     {
         std::lock_guard<std::mutex> guard(bluetoothPhoneAPI->nimble_mutex);
 
-        // If we don't have fresh data, trigger a refresh
-        if (!bluetoothPhoneAPI->hasChecked || bluetoothPhoneAPI->numBytes == 0) {
-            bluetoothPhoneAPI->phoneWants = true;
-            bluetoothPhoneAPI->setIntervalFromNow(0);
-
-            // Get fresh data immediately
-            bluetoothPhoneAPI->numBytes = bluetoothPhoneAPI->getFromRadio(bluetoothPhoneAPI->fromRadioBytes);
-            bluetoothPhoneAPI->hasChecked = true;
-        }
+        // Get fresh data immediately when client reads
+        bluetoothPhoneAPI->numBytes = bluetoothPhoneAPI->getFromRadio(bluetoothPhoneAPI->fromRadioBytes);
 
         // Set the characteristic value with whatever data we have
         pCharacteristic->setValue(bluetoothPhoneAPI->fromRadioBytes, bluetoothPhoneAPI->numBytes);
@@ -138,8 +125,6 @@ class NimbleBluetoothFromRadioCallback : public NimBLECharacteristicCallbacks
         if (bluetoothPhoneAPI->numBytes != 0) // if we did send something, queue it up right away to reload
             bluetoothPhoneAPI->setIntervalFromNow(0);
         bluetoothPhoneAPI->numBytes = 0;
-        bluetoothPhoneAPI->hasChecked = false;
-        bluetoothPhoneAPI->phoneWants = false;
     }
 };
 
@@ -248,8 +233,6 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
         if (bluetoothPhoneAPI) {
             std::lock_guard<std::mutex> guard(bluetoothPhoneAPI->nimble_mutex);
             bluetoothPhoneAPI->close();
-            bluetoothPhoneAPI->hasChecked = false;
-            bluetoothPhoneAPI->phoneWants = false;
             bluetoothPhoneAPI->numBytes = 0;
             bluetoothPhoneAPI->queue_size = 0;
         }

From e5a2ce54e74f6cfaec8e44c43764fa062b1b862b Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Wed, 8 Oct 2025 23:13:02 -0500
Subject: [PATCH 08/19] Attach an interrupt to EXT_PWR_DETECT if present, and
 force a screen redraw on a power change.

---
 src/Power.cpp           | 10 ++++++++++
 src/graphics/Screen.cpp |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/src/Power.cpp b/src/Power.cpp
index 7de82b8d6..39d47610b 100644
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -691,6 +691,16 @@ bool Power::setup()
 #ifdef NRF_APM
     found = true;
 #endif
+#ifdef EXT_PWR_DETECT
+    attachInterrupt(
+        EXT_PWR_DETECT,
+        []() {
+            power->setIntervalFromNow(0);
+            runASAP = true;
+            BaseType_t higherWake = 0;
+        },
+        CHANGE);
+#endif
 
     enabled = found;
     low_voltage_counter = 0;
diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index 4485ca7a3..767f97eed 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -1428,6 +1428,9 @@ int Screen::handleStatusUpdate(const meshtastic::Status *arg)
         }
         nodeDB->updateGUI = false;
         break;
+    case STATUS_TYPE_POWER:
+        forceDisplay(true);
+        break;
     }
 
     return 0;

From 05febc25e1d6ca0fd37752fa9be23d6d515730c1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 11 Oct 2025 17:12:10 +1100
Subject: [PATCH 09/19] Update XPowersLib to v0.3.1 (#8303)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 arch/esp32/esp32.ini   | 2 +-
 arch/esp32/esp32c6.ini | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/esp32/esp32.ini b/arch/esp32/esp32.ini
index d2c933461..327444a60 100644
--- a/arch/esp32/esp32.ini
+++ b/arch/esp32/esp32.ini
@@ -56,7 +56,7 @@ lib_deps =
   # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
   https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
   # renovate: datasource=github-tags depName=XPowersLib packageName=lewisxhe/XPowersLib
-  https://github.com/lewisxhe/XPowersLib/archive/v0.3.0.zip
+  https://github.com/lewisxhe/XPowersLib/archive/v0.3.1.zip
   # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master
   https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
   # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
diff --git a/arch/esp32/esp32c6.ini b/arch/esp32/esp32c6.ini
index 1afb9b547..7b06f4cd8 100644
--- a/arch/esp32/esp32c6.ini
+++ b/arch/esp32/esp32c6.ini
@@ -28,7 +28,7 @@ lib_deps =
   ${environmental_extra.lib_deps}
   ${radiolib_base.lib_deps}
   # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
-  lewisxhe/XPowersLib@0.3.0
+  lewisxhe/XPowersLib@0.3.1
   # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master
   https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
   # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto

From 0bb1c1fe6f537cefff17c9a360be772d731b075b Mon Sep 17 00:00:00 2001
From: thebentern <9000580+thebentern@users.noreply.github.com>
Date: Sat, 11 Oct 2025 15:27:33 +0000
Subject: [PATCH 10/19] Automated version bumps

---
 bin/org.meshtastic.meshtasticd.metainfo.xml | 3 +++
 debian/changelog                            | 6 ++++++
 version.properties                          | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/bin/org.meshtastic.meshtasticd.metainfo.xml b/bin/org.meshtastic.meshtasticd.metainfo.xml
index 3505f1940..6fc5e8597 100644
--- a/bin/org.meshtastic.meshtasticd.metainfo.xml
+++ b/bin/org.meshtastic.meshtasticd.metainfo.xml
@@ -87,6 +87,9 @@
   </screenshots>
 
   <releases>
+    <release version="2.7.13" date="2025-10-11">
+      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.13</url>
+    </release>
     <release version="2.7.12" date="2025-10-01">
       <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.12</url>
     </release>
diff --git a/debian/changelog b/debian/changelog
index 8bd053b25..e124f8929 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+meshtasticd (2.7.13.0) unstable; urgency=medium
+
+  * Version 2.7.13
+
+ -- GitHub Actions <github-actions[bot]@users.noreply.github.com>  Sat, 11 Oct 2025 15:27:28 +0000
+
 meshtasticd (2.7.12.0) unstable; urgency=medium
 
   [ Austin Lane ]
diff --git a/version.properties b/version.properties
index 5c84a8e65..f33f0f1cb 100644
--- a/version.properties
+++ b/version.properties
@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 7
-build = 12
+build = 13

From 694b669eb7c4f24825ee7c058875505c5f31ff68 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Sat, 11 Oct 2025 10:30:33 -0500
Subject: [PATCH 11/19] Double the number of bluetooth bonds NimBLE will store
 (from 3 to 6) (#8296)

---
 arch/esp32/esp32.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/esp32/esp32.ini b/arch/esp32/esp32.ini
index 327444a60..810c9780e 100644
--- a/arch/esp32/esp32.ini
+++ b/arch/esp32/esp32.ini
@@ -31,6 +31,7 @@ build_flags =
   -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL
   -DAXP_DEBUG_PORT=Serial
   -DCONFIG_BT_NIMBLE_ENABLED
+  -DCONFIG_BT_NIMBLE_MAX_BONDS=6 # default is 3
   -DCONFIG_NIMBLE_CPP_LOG_LEVEL=2
   -DCONFIG_BT_NIMBLE_MAX_CCCDS=20
   -DCONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=8192

From 464663b496708b9845b878d38e122272bc2c1ae6 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Sun, 12 Oct 2025 05:33:34 -0500
Subject: [PATCH 12/19] GPS_POWER_TOGGLE no longer has a function, so purge
 (#8312)

---
 variants/esp32/diy/hydra/variant.h                            | 1 -
 variants/esp32/heltec_v2.1/platformio.ini                     | 1 -
 variants/esp32/heltec_wsl_v2.1/platformio.ini                 | 1 -
 variants/esp32/tbeam/platformio.ini                           | 1 -
 variants/esp32/tlora_v2_1_16/platformio.ini                   | 1 -
 variants/esp32/tlora_v2_1_16_tcxo/platformio.ini              | 1 -
 variants/esp32/tlora_v3_3_0_tcxo/platformio.ini               | 1 -
 variants/esp32s3/CDEBYTE_EoRa-S3/platformio.ini               | 1 -
 variants/esp32s3/crowpanel-esp32s3-5-epaper/platformio.ini    | 3 ---
 variants/esp32s3/heltec_capsule_sensor_v3/platformio.ini      | 1 -
 variants/esp32s3/heltec_v3/platformio.ini                     | 1 -
 variants/esp32s3/heltec_v4/platformio.ini                     | 1 -
 variants/esp32s3/heltec_wireless_tracker/platformio.ini       | 1 -
 variants/esp32s3/heltec_wireless_tracker_V1_0/platformio.ini  | 1 -
 variants/esp32s3/heltec_wireless_tracker_v2/platformio.ini    | 1 -
 variants/esp32s3/heltec_wsl_v3/platformio.ini                 | 1 -
 variants/esp32s3/link32_s3_v1/platformio.ini                  | 1 -
 variants/esp32s3/t-deck-pro/platformio.ini                    | 1 -
 variants/esp32s3/t-deck/platformio.ini                        | 1 -
 variants/esp32s3/t-eth-elite/platformio.ini                   | 1 -
 variants/esp32s3/tlora-pager/platformio.ini                   | 1 -
 variants/esp32s3/tlora_t3s3_epaper/platformio.ini             | 1 -
 variants/esp32s3/tlora_t3s3_v1/platformio.ini                 | 1 -
 variants/esp32s3/tracksenger/platformio.ini                   | 3 ---
 variants/nrf52840/ELECROW-ThinkNode-M1/platformio.ini         | 1 -
 variants/nrf52840/ME25LS01-4Y10TD/platformio.ini              | 1 -
 variants/nrf52840/ME25LS01-4Y10TD_e-ink/platformio.ini        | 1 -
 variants/nrf52840/MS24SF1/platformio.ini                      | 1 -
 variants/nrf52840/diy/nrf52_promicro_diy_tcxo/variant.h       | 1 -
 variants/nrf52840/diy/nrf52_promicro_diy_xtal/variant.h       | 1 -
 variants/nrf52840/gat562_mesh_trial_tracker/platformio.ini    | 1 -
 variants/nrf52840/heltec_mesh_node_t114/platformio.ini        | 1 -
 variants/nrf52840/heltec_mesh_solar/platformio.ini            | 1 -
 variants/nrf52840/meshlink/platformio.ini                     | 1 -
 variants/nrf52840/meshlink_eink/platformio.ini                | 1 -
 variants/nrf52840/r1-neo/platformio.ini                       | 1 -
 variants/nrf52840/rak2560/platformio.ini                      | 1 -
 variants/nrf52840/rak4631/platformio.ini                      | 1 -
 variants/nrf52840/rak4631_eth_gw/platformio.ini               | 1 -
 variants/nrf52840/rak4631_nomadstar_meteor_pro/platformio.ini | 1 -
 variants/nrf52840/rak_wismeshtag/platformio.ini               | 1 -
 variants/nrf52840/rak_wismeshtap/platformio.ini               | 1 -
 variants/nrf52840/t-echo-lite/platformio.ini                  | 1 -
 variants/nrf52840/t-echo/platformio.ini                       | 1 -
 variants/nrf52840/tracker-t1000-e/platformio.ini              | 1 -
 variants/nrf52840/wio-sdk-wm1110/platformio.ini               | 1 -
 variants/nrf52840/wio-t1000-s/platformio.ini                  | 1 -
 variants/nrf52840/wio-tracker-wm1110/platformio.ini           | 1 -
 48 files changed, 52 deletions(-)

diff --git a/variants/esp32/diy/hydra/variant.h b/variants/esp32/diy/hydra/variant.h
index 0d64c1b5e..e5c10e26b 100644
--- a/variants/esp32/diy/hydra/variant.h
+++ b/variants/esp32/diy/hydra/variant.h
@@ -6,7 +6,6 @@
 #define GPS_TX_PIN 15
 #define GPS_RX_PIN 12
 #define PIN_GPS_EN 4
-#define GPS_POWER_TOGGLE // Moved definition from platformio.ini to here
 
 #define BUTTON_PIN 39 // The middle button GPIO on the T-Beam
 // Note: On the ESP32 base version, gpio34-39 are input-only, and do not have internal pull-ups.
diff --git a/variants/esp32/heltec_v2.1/platformio.ini b/variants/esp32/heltec_v2.1/platformio.ini
index 763f9764c..4dcd9e583 100644
--- a/variants/esp32/heltec_v2.1/platformio.ini
+++ b/variants/esp32/heltec_v2.1/platformio.ini
@@ -7,4 +7,3 @@ build_flags =
   ${esp32_base.build_flags}
   -D HELTEC_V2_1
   -I variants/esp32/heltec_v2.1
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
diff --git a/variants/esp32/heltec_wsl_v2.1/platformio.ini b/variants/esp32/heltec_wsl_v2.1/platformio.ini
index eb44c88d2..6a77cf11b 100644
--- a/variants/esp32/heltec_wsl_v2.1/platformio.ini
+++ b/variants/esp32/heltec_wsl_v2.1/platformio.ini
@@ -6,4 +6,3 @@ build_flags =
   ${esp32_base.build_flags}
   -D PRIVATE_HW
   -I variants/esp32/heltec_wsl_v2.1
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
diff --git a/variants/esp32/tbeam/platformio.ini b/variants/esp32/tbeam/platformio.ini
index ea17751c6..e53f22d30 100644
--- a/variants/esp32/tbeam/platformio.ini
+++ b/variants/esp32/tbeam/platformio.ini
@@ -10,7 +10,6 @@ build_flags =
   ${esp32_base.build_flags}
   -D TBEAM_V10
   -I variants/esp32/tbeam
-  -DGPS_POWER_TOGGLE ; comment this line to disable double press function on the user button to turn off gps entirely.
   -DBOARD_HAS_PSRAM
   -mfix-esp32-psram-cache-issue
 upload_speed = 921600
diff --git a/variants/esp32/tlora_v2_1_16/platformio.ini b/variants/esp32/tlora_v2_1_16/platformio.ini
index bd85aa847..6967bb480 100644
--- a/variants/esp32/tlora_v2_1_16/platformio.ini
+++ b/variants/esp32/tlora_v2_1_16/platformio.ini
@@ -4,5 +4,4 @@ board = ttgo-lora32-v21
 board_check = true
 build_flags = 
   ${esp32_base.build_flags} -D TLORA_V2_1_16 -I variants/esp32/tlora_v2_1_16
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 upload_speed = 115200
diff --git a/variants/esp32/tlora_v2_1_16_tcxo/platformio.ini b/variants/esp32/tlora_v2_1_16_tcxo/platformio.ini
index 9404faa02..a6b9d2254 100644
--- a/variants/esp32/tlora_v2_1_16_tcxo/platformio.ini
+++ b/variants/esp32/tlora_v2_1_16_tcxo/platformio.ini
@@ -6,6 +6,5 @@ build_flags =
   ${esp32_base.build_flags}
   -D TLORA_V2_1_16
   -I variants/esp32/tlora_v2_1_16
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -D LORA_TCXO_GPIO=33
 upload_speed = 115200
\ No newline at end of file
diff --git a/variants/esp32/tlora_v3_3_0_tcxo/platformio.ini b/variants/esp32/tlora_v3_3_0_tcxo/platformio.ini
index f1110386e..1258fd8b7 100644
--- a/variants/esp32/tlora_v3_3_0_tcxo/platformio.ini
+++ b/variants/esp32/tlora_v3_3_0_tcxo/platformio.ini
@@ -5,6 +5,5 @@ build_flags =
   ${esp32_base.build_flags}
   -D TLORA_V2_1_16
   -I variants/esp32/tlora_v2_1_16
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -D LORA_TCXO_GPIO=12
   -D BUTTON_PIN=0
\ No newline at end of file
diff --git a/variants/esp32s3/CDEBYTE_EoRa-S3/platformio.ini b/variants/esp32s3/CDEBYTE_EoRa-S3/platformio.ini
index dbd420f04..3fcfbf281 100644
--- a/variants/esp32s3/CDEBYTE_EoRa-S3/platformio.ini
+++ b/variants/esp32s3/CDEBYTE_EoRa-S3/platformio.ini
@@ -5,4 +5,3 @@ build_flags =
   ${esp32s3_base.build_flags}
   -D CDEBYTE_EORA_S3
   -I variants/esp32s3/CDEBYTE_EoRa-S3
-  -D GPS_POWER_TOGGLE
diff --git a/variants/esp32s3/crowpanel-esp32s3-5-epaper/platformio.ini b/variants/esp32s3/crowpanel-esp32s3-5-epaper/platformio.ini
index 49e84bf4f..eed21a412 100644
--- a/variants/esp32s3/crowpanel-esp32s3-5-epaper/platformio.ini
+++ b/variants/esp32s3/crowpanel-esp32s3-5-epaper/platformio.ini
@@ -16,7 +16,6 @@ build_flags =
   -I variants/esp32s3/crowpanel-esp32s3-5-epaper
   -D PRIVATE_HW
   -DBOARD_HAS_PSRAM
-  -DGPS_POWER_TOGGLE
   -DEINK_DISPLAY_MODEL=GxEPD2_579_GDEY0579T93 ;https://www.good-display.com/product/439.html
   -DEINK_WIDTH=792
   -DEINK_HEIGHT=272
@@ -46,7 +45,6 @@ build_flags =
   -I variants/esp32s3/crowpanel-esp32s3-5-epaper
   -D PRIVATE_HW
   -DBOARD_HAS_PSRAM
-  -DGPS_POWER_TOGGLE
   -DEINK_DISPLAY_MODEL=GxEPD2_420_GYE042A87   ; similar Panel: GDEY042T81 : https://www.good-display.com/product/386.html
   -DEINK_WIDTH=400
   -DEINK_HEIGHT=300
@@ -76,7 +74,6 @@ build_flags =
   -I variants/esp32s3/crowpanel-esp32s3-5-epaper
   -D PRIVATE_HW
   -DBOARD_HAS_PSRAM
-  -DGPS_POWER_TOGGLE
   -DEINK_DISPLAY_MODEL=GxEPD2_290_GDEY029T94 ;https://www.good-display.com/product/389.html
   -DEINK_WIDTH=296
   -DEINK_HEIGHT=128
diff --git a/variants/esp32s3/heltec_capsule_sensor_v3/platformio.ini b/variants/esp32s3/heltec_capsule_sensor_v3/platformio.ini
index d43ffd0df..0bb21581a 100644
--- a/variants/esp32s3/heltec_capsule_sensor_v3/platformio.ini
+++ b/variants/esp32s3/heltec_capsule_sensor_v3/platformio.ini
@@ -6,5 +6,4 @@ board_build.partitions = default_8MB.csv
 build_flags = 
   ${esp32s3_base.build_flags} -I variants/esp32s3/heltec_capsule_sensor_v3
   -D HELTEC_CAPSULE_SENSOR_V3
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   ;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output
diff --git a/variants/esp32s3/heltec_v3/platformio.ini b/variants/esp32s3/heltec_v3/platformio.ini
index b521e11ca..af0854e49 100644
--- a/variants/esp32s3/heltec_v3/platformio.ini
+++ b/variants/esp32s3/heltec_v3/platformio.ini
@@ -8,4 +8,3 @@ build_flags =
   ${esp32s3_base.build_flags}
   -D HELTEC_V3
   -I variants/esp32s3/heltec_v3
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
diff --git a/variants/esp32s3/heltec_v4/platformio.ini b/variants/esp32s3/heltec_v4/platformio.ini
index d0a250ad3..7057f9646 100644
--- a/variants/esp32s3/heltec_v4/platformio.ini
+++ b/variants/esp32s3/heltec_v4/platformio.ini
@@ -7,4 +7,3 @@ build_flags =
   ${esp32s3_base.build_flags}
   -D HELTEC_V4
   -I variants/esp32s3/heltec_v4
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
diff --git a/variants/esp32s3/heltec_wireless_tracker/platformio.ini b/variants/esp32s3/heltec_wireless_tracker/platformio.ini
index 2faba45a8..3a373bf4f 100644
--- a/variants/esp32s3/heltec_wireless_tracker/platformio.ini
+++ b/variants/esp32s3/heltec_wireless_tracker/platformio.ini
@@ -8,7 +8,6 @@ build_flags =
   ${esp32s3_base.build_flags}
   -I variants/esp32s3/heltec_wireless_tracker
   -D HELTEC_TRACKER_V1_1
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   ;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output
 
 lib_deps =
diff --git a/variants/esp32s3/heltec_wireless_tracker_V1_0/platformio.ini b/variants/esp32s3/heltec_wireless_tracker_V1_0/platformio.ini
index 89fe4b385..cd961533d 100644
--- a/variants/esp32s3/heltec_wireless_tracker_V1_0/platformio.ini
+++ b/variants/esp32s3/heltec_wireless_tracker_V1_0/platformio.ini
@@ -8,7 +8,6 @@ build_flags =
   ${esp32s3_base.build_flags}
   -I variants/esp32s3/heltec_wireless_tracker_V1_0
   -D HELTEC_TRACKER_V1_0
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   ;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output
 lib_deps =
   ${esp32s3_base.lib_deps}
diff --git a/variants/esp32s3/heltec_wireless_tracker_v2/platformio.ini b/variants/esp32s3/heltec_wireless_tracker_v2/platformio.ini
index 4872561db..0f9265f91 100644
--- a/variants/esp32s3/heltec_wireless_tracker_v2/platformio.ini
+++ b/variants/esp32s3/heltec_wireless_tracker_v2/platformio.ini
@@ -8,7 +8,6 @@ build_flags =
   ${esp32s3_base.build_flags}
   -I variants/esp32s3/heltec_wireless_tracker_v2
   -D HELTEC_WIRELESS_TRACKER_V2
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 lib_deps =
   ${esp32s3_base.lib_deps}
   lovyan03/LovyanGFX@^1.2.0
diff --git a/variants/esp32s3/heltec_wsl_v3/platformio.ini b/variants/esp32s3/heltec_wsl_v3/platformio.ini
index 06cde2304..c038a463e 100644
--- a/variants/esp32s3/heltec_wsl_v3/platformio.ini
+++ b/variants/esp32s3/heltec_wsl_v3/platformio.ini
@@ -7,4 +7,3 @@ build_flags =
   ${esp32s3_base.build_flags}
   -D HELTEC_WSL_V3
   -I variants/esp32s3/heltec_wsl_v3
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
diff --git a/variants/esp32s3/link32_s3_v1/platformio.ini b/variants/esp32s3/link32_s3_v1/platformio.ini
index c1b71b3b5..8d88075c4 100644
--- a/variants/esp32s3/link32_s3_v1/platformio.ini
+++ b/variants/esp32s3/link32_s3_v1/platformio.ini
@@ -5,7 +5,6 @@ build_flags =
   ${esp32_base.build_flags}
   -D LINK_32
   -I variants/esp32s3/link32_s3_v1
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DARDUINO_USB_CDC_ON_BOOT
   -DARDUINO_USB_MODE=1
   -DRADIOLIB_EXCLUDE_SX128X=1
diff --git a/variants/esp32s3/t-deck-pro/platformio.ini b/variants/esp32s3/t-deck-pro/platformio.ini
index 45c3ae4ea..0b3c7843a 100644
--- a/variants/esp32s3/t-deck-pro/platformio.ini
+++ b/variants/esp32s3/t-deck-pro/platformio.ini
@@ -7,7 +7,6 @@ upload_protocol = esptool
 build_flags = 
   ${esp32_base.build_flags} -I variants/esp32s3/t-deck-pro
   -D T_DECK_PRO
-  -D GPS_POWER_TOGGLE
   -D USE_EINK
   -D EINK_DISPLAY_MODEL=GxEPD2_310_GDEQ031T10
   -D EINK_WIDTH=240
diff --git a/variants/esp32s3/t-deck/platformio.ini b/variants/esp32s3/t-deck/platformio.ini
index 7c8070c3e..9ab0756d1 100644
--- a/variants/esp32s3/t-deck/platformio.ini
+++ b/variants/esp32s3/t-deck/platformio.ini
@@ -9,7 +9,6 @@ upload_protocol = esptool
 build_flags = ${esp32s3_base.build_flags} 
   -D T_DECK 
   -D BOARD_HAS_PSRAM
-  -D GPS_POWER_TOGGLE
   -I variants/esp32s3/t-deck
 
 lib_deps = ${esp32s3_base.lib_deps}
diff --git a/variants/esp32s3/t-eth-elite/platformio.ini b/variants/esp32s3/t-eth-elite/platformio.ini
index 6107185ce..1a5823bc3 100644
--- a/variants/esp32s3/t-eth-elite/platformio.ini
+++ b/variants/esp32s3/t-eth-elite/platformio.ini
@@ -9,7 +9,6 @@ build_flags =
   -D T_ETH_ELITE
   -D HAS_UDP_MULTICAST=1
   -I variants/esp32s3/t-eth-elite
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 
 lib_ignore = 
     Ethernet
diff --git a/variants/esp32s3/tlora-pager/platformio.ini b/variants/esp32s3/tlora-pager/platformio.ini
index 9800161bb..d63537904 100644
--- a/variants/esp32s3/tlora-pager/platformio.ini
+++ b/variants/esp32s3/tlora-pager/platformio.ini
@@ -10,7 +10,6 @@ build_flags = ${esp32s3_base.build_flags}
   -I variants/esp32s3/tlora-pager
   -D T_LORA_PAGER 
   -D BOARD_HAS_PSRAM
-  -D GPS_POWER_TOGGLE
   -D HAS_SDCARD
   -D SDCARD_USE_SPI1
   -D ENABLE_ROTARY_PULLUP
diff --git a/variants/esp32s3/tlora_t3s3_epaper/platformio.ini b/variants/esp32s3/tlora_t3s3_epaper/platformio.ini
index 71644ee77..eca052f57 100644
--- a/variants/esp32s3/tlora_t3s3_epaper/platformio.ini
+++ b/variants/esp32s3/tlora_t3s3_epaper/platformio.ini
@@ -8,7 +8,6 @@ build_flags =
   ${esp32_base.build_flags}
   -D TLORA_T3S3_EPAPER
   -I variants/esp32s3/tlora_t3s3_epaper
-  -DGPS_POWER_TOGGLE
   -DUSE_EINK
   -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
   -DEINK_WIDTH=250
diff --git a/variants/esp32s3/tlora_t3s3_v1/platformio.ini b/variants/esp32s3/tlora_t3s3_v1/platformio.ini
index d9624f043..56ece0d62 100644
--- a/variants/esp32s3/tlora_t3s3_v1/platformio.ini
+++ b/variants/esp32s3/tlora_t3s3_v1/platformio.ini
@@ -6,4 +6,3 @@ upload_protocol = esptool
 
 build_flags = 
   ${esp32_base.build_flags} -D TLORA_T3S3_V1 -I variants/esp32s3/tlora_t3s3_v1
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
diff --git a/variants/esp32s3/tracksenger/platformio.ini b/variants/esp32s3/tracksenger/platformio.ini
index 0e9f08541..213a917b1 100644
--- a/variants/esp32s3/tracksenger/platformio.ini
+++ b/variants/esp32s3/tracksenger/platformio.ini
@@ -8,7 +8,6 @@ build_flags =
   ${esp32s3_base.build_flags}
   -I variants/esp32s3/tracksenger/internal
   -D HELTEC_TRACKER_V1_1
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   ;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output
 
 lib_deps =
@@ -25,7 +24,6 @@ build_flags =
   ${esp32s3_base.build_flags}
   -I variants/esp32s3/tracksenger/lcd
   -D HELTEC_TRACKER_V1_1
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   ;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output
 
 lib_deps =
@@ -42,5 +40,4 @@ build_flags =
   ${esp32s3_base.build_flags}
   -I variants/esp32s3/tracksenger/oled
   -D HELTEC_TRACKER_V1_1
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   ;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output
diff --git a/variants/nrf52840/ELECROW-ThinkNode-M1/platformio.ini b/variants/nrf52840/ELECROW-ThinkNode-M1/platformio.ini
index 0578bcfe8..f89b05d1f 100644
--- a/variants/nrf52840/ELECROW-ThinkNode-M1/platformio.ini
+++ b/variants/nrf52840/ELECROW-ThinkNode-M1/platformio.ini
@@ -9,7 +9,6 @@ debug_tool = jlink
 build_flags = ${nrf52840_base.build_flags}
   -Ivariants/nrf52840/ELECROW-ThinkNode-M1
   -DELECROW_ThinkNode_M1
-  -DGPS_POWER_TOGGLE
   -DUSE_EINK
   -DEINK_DISPLAY_MODEL=GxEPD2_154_D67
   -DEINK_WIDTH=200
diff --git a/variants/nrf52840/ME25LS01-4Y10TD/platformio.ini b/variants/nrf52840/ME25LS01-4Y10TD/platformio.ini
index 89a45694c..1279f12c6 100644
--- a/variants/nrf52840/ME25LS01-4Y10TD/platformio.ini
+++ b/variants/nrf52840/ME25LS01-4Y10TD/platformio.ini
@@ -8,7 +8,6 @@ build_flags = ${nrf52840_base.build_flags}
   -Isrc/platform/nrf52/softdevice
   -Isrc/platform/nrf52/softdevice/nrf52
   -DME25LS01_4Y10TD
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/ME25LS01-4Y10TD>
 lib_deps = 
diff --git a/variants/nrf52840/ME25LS01-4Y10TD_e-ink/platformio.ini b/variants/nrf52840/ME25LS01-4Y10TD_e-ink/platformio.ini
index ad5867bd5..f8d6da008 100644
--- a/variants/nrf52840/ME25LS01-4Y10TD_e-ink/platformio.ini
+++ b/variants/nrf52840/ME25LS01-4Y10TD_e-ink/platformio.ini
@@ -8,7 +8,6 @@ build_flags = ${nrf52840_base.build_flags}
   -Isrc/platform/nrf52/softdevice
   -Isrc/platform/nrf52/softdevice/nrf52
   -DME25LS01_4Y10TD
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DEINK_DISPLAY_MODEL=GxEPD2_420_GDEY042T81
   -DEINK_WIDTH=400
   -DEINK_HEIGHT=300
diff --git a/variants/nrf52840/MS24SF1/platformio.ini b/variants/nrf52840/MS24SF1/platformio.ini
index f162cbd60..df15b5605 100644
--- a/variants/nrf52840/MS24SF1/platformio.ini
+++ b/variants/nrf52840/MS24SF1/platformio.ini
@@ -7,7 +7,6 @@ build_flags = ${nrf52840_base.build_flags}
   -Ivariants/nrf52840/MS24SF1
   -Isrc/platform/nrf52/softdevice
   -Isrc/platform/nrf52/softdevice/nrf52
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/MS24SF1>
 lib_deps =
diff --git a/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/variant.h b/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/variant.h
index e93442c7e..87342a02f 100644
--- a/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/variant.h
+++ b/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/variant.h
@@ -94,7 +94,6 @@ NRF52 PRO MICRO PIN ASSIGNMENT
 #define PIN_GPS_RX (0 + 20) // P0.20
 
 #define PIN_GPS_EN (0 + 24) // P0.24
-#define GPS_POWER_TOGGLE
 #define GPS_UBLOX
 // define GPS_DEBUG
 
diff --git a/variants/nrf52840/diy/nrf52_promicro_diy_xtal/variant.h b/variants/nrf52840/diy/nrf52_promicro_diy_xtal/variant.h
index 7aafab7da..6e208e79f 100644
--- a/variants/nrf52840/diy/nrf52_promicro_diy_xtal/variant.h
+++ b/variants/nrf52840/diy/nrf52_promicro_diy_xtal/variant.h
@@ -93,7 +93,6 @@ NRF52 PRO MICRO PIN ASSIGNMENT
 #define PIN_GPS_RX (0 + 20) // P0.20
 
 #define PIN_GPS_EN (0 + 24) // P0.24
-#define GPS_POWER_TOGGLE
 #define GPS_UBLOX
 // define GPS_DEBUG
 
diff --git a/variants/nrf52840/gat562_mesh_trial_tracker/platformio.ini b/variants/nrf52840/gat562_mesh_trial_tracker/platformio.ini
index c6a5a7399..c6cd23314 100644
--- a/variants/nrf52840/gat562_mesh_trial_tracker/platformio.ini
+++ b/variants/nrf52840/gat562_mesh_trial_tracker/platformio.ini
@@ -8,7 +8,6 @@ build_flags = ${nrf52840_base.build_flags}
   -I variants/nrf52840/gat562_mesh_trial_tracker
   ;-D GAT562_MESH_TRIAL_TRACKER
   -D PRIVATE_HW
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DRADIOLIB_EXCLUDE_SX128X=1
   -DRADIOLIB_EXCLUDE_SX127X=1
   -DRADIOLIB_EXCLUDE_LR11X0=1
diff --git a/variants/nrf52840/heltec_mesh_node_t114/platformio.ini b/variants/nrf52840/heltec_mesh_node_t114/platformio.ini
index c7b30b339..c49dadd56 100644
--- a/variants/nrf52840/heltec_mesh_node_t114/platformio.ini
+++ b/variants/nrf52840/heltec_mesh_node_t114/platformio.ini
@@ -8,7 +8,6 @@ debug_tool = jlink
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
 build_flags = ${nrf52840_base.build_flags}
   -Ivariants/nrf52840/heltec_mesh_node_t114
-  -DGPS_POWER_TOGGLE
   -DHELTEC_T114
 
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/heltec_mesh_node_t114>
diff --git a/variants/nrf52840/heltec_mesh_solar/platformio.ini b/variants/nrf52840/heltec_mesh_solar/platformio.ini
index 625dd1d43..36a7904d6 100644
--- a/variants/nrf52840/heltec_mesh_solar/platformio.ini
+++ b/variants/nrf52840/heltec_mesh_solar/platformio.ini
@@ -8,7 +8,6 @@ debug_tool = jlink
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
 build_flags = ${nrf52840_base.build_flags}
   -Ivariants/nrf52840/heltec_mesh_solar
-  -DGPS_POWER_TOGGLE
   -DHELTEC_MESH_SOLAR
 
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/heltec_mesh_solar>
diff --git a/variants/nrf52840/meshlink/platformio.ini b/variants/nrf52840/meshlink/platformio.ini
index 466362242..2a4e27fe8 100644
--- a/variants/nrf52840/meshlink/platformio.ini
+++ b/variants/nrf52840/meshlink/platformio.ini
@@ -9,7 +9,6 @@ board_level = extra
 build_flags = ${nrf52840_base.build_flags}
   -I variants/nrf52840/meshlink
   -D MESHLINK
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -D EINK_DISPLAY_MODEL=GxEPD2_213_B74
   -D EINK_WIDTH=250
   -D EINK_HEIGHT=122
diff --git a/variants/nrf52840/meshlink_eink/platformio.ini b/variants/nrf52840/meshlink_eink/platformio.ini
index af5a0040e..c0c0cb1dd 100644
--- a/variants/nrf52840/meshlink_eink/platformio.ini
+++ b/variants/nrf52840/meshlink_eink/platformio.ini
@@ -9,7 +9,6 @@ board_level = extra
 build_flags = ${nrf52840_base.build_flags}
   -I variants/nrf52840/meshlink_eink
   -D MESHLINK
-  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -D EINK_DISPLAY_MODEL=GxEPD2_213_B74
   -D EINK_WIDTH=250
   -D EINK_HEIGHT=122
diff --git a/variants/nrf52840/r1-neo/platformio.ini b/variants/nrf52840/r1-neo/platformio.ini
index 6feb55dc9..60f1f6ae1 100644
--- a/variants/nrf52840/r1-neo/platformio.ini
+++ b/variants/nrf52840/r1-neo/platformio.ini
@@ -6,7 +6,6 @@ board_check = true
 build_flags = ${nrf52840_base.build_flags}
   -Ivariants/nrf52840/r1-neo
   -D R1_NEO
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DRADIOLIB_EXCLUDE_SX128X=1
   -DRADIOLIB_EXCLUDE_SX127X=1
   -DRADIOLIB_EXCLUDE_LR11X0=1
diff --git a/variants/nrf52840/rak2560/platformio.ini b/variants/nrf52840/rak2560/platformio.ini
index edc648b9b..021e6d03b 100644
--- a/variants/nrf52840/rak2560/platformio.ini
+++ b/variants/nrf52840/rak2560/platformio.ini
@@ -6,7 +6,6 @@ board_check = true
 build_flags = ${nrf52840_base.build_flags}
   -I variants/nrf52840/rak2560
   -D RAK_4631
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DRADIOLIB_EXCLUDE_SX128X=1
   -DRADIOLIB_EXCLUDE_SX127X=1
   -DRADIOLIB_EXCLUDE_LR11X0=1
diff --git a/variants/nrf52840/rak4631/platformio.ini b/variants/nrf52840/rak4631/platformio.ini
index 6bf5f44cb..205966529 100644
--- a/variants/nrf52840/rak4631/platformio.ini
+++ b/variants/nrf52840/rak4631/platformio.ini
@@ -7,7 +7,6 @@ board_check = true
 build_flags = ${nrf52840_base.build_flags}
   -I variants/nrf52840/rak4631
   -D RAK_4631
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
   -DEINK_WIDTH=250
   -DEINK_HEIGHT=122
diff --git a/variants/nrf52840/rak4631_eth_gw/platformio.ini b/variants/nrf52840/rak4631_eth_gw/platformio.ini
index 4be8843a2..3c61e3498 100644
--- a/variants/nrf52840/rak4631_eth_gw/platformio.ini
+++ b/variants/nrf52840/rak4631_eth_gw/platformio.ini
@@ -6,7 +6,6 @@ board_check = true
 build_flags = ${nrf52840_base.build_flags}
   -I variants/nrf52840/rak4631_eth_gw
   -D RAK_4631
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DHAS_UDP_MULTICAST=1
   -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
   -DEINK_WIDTH=250
diff --git a/variants/nrf52840/rak4631_nomadstar_meteor_pro/platformio.ini b/variants/nrf52840/rak4631_nomadstar_meteor_pro/platformio.ini
index e94eef1ee..d7dab2678 100644
--- a/variants/nrf52840/rak4631_nomadstar_meteor_pro/platformio.ini
+++ b/variants/nrf52840/rak4631_nomadstar_meteor_pro/platformio.ini
@@ -6,7 +6,6 @@ board_check = true
 build_flags = ${nrf52840_base.build_flags}
   -I variants/nrf52840/rak4631_nomadstar_meteor_pro
   -D NOMADSTAR_METEOR_PRO
-  ;-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
   -DEINK_WIDTH=250
   -DEINK_HEIGHT=122
diff --git a/variants/nrf52840/rak_wismeshtag/platformio.ini b/variants/nrf52840/rak_wismeshtag/platformio.ini
index 08e723302..f04d1f186 100644
--- a/variants/nrf52840/rak_wismeshtag/platformio.ini
+++ b/variants/nrf52840/rak_wismeshtag/platformio.ini
@@ -7,7 +7,6 @@ build_flags = ${nrf52840_base.build_flags}
   -I variants/nrf52840/rak_wismeshtag
   -D WISMESH_TAG
   -D RAK_4631
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DRADIOLIB_EXCLUDE_SX128X=1
   -DRADIOLIB_EXCLUDE_SX127X=1
   -DRADIOLIB_EXCLUDE_LR11X0=1
diff --git a/variants/nrf52840/rak_wismeshtap/platformio.ini b/variants/nrf52840/rak_wismeshtap/platformio.ini
index adf301537..3369f9c77 100644
--- a/variants/nrf52840/rak_wismeshtap/platformio.ini
+++ b/variants/nrf52840/rak_wismeshtap/platformio.ini
@@ -6,7 +6,6 @@ build_flags = ${nrf52840_base.build_flags}
   -Ivariants/nrf52840/rak_wismeshtap
   -DWISMESH_TAP
   -DRAK_4631
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
   -DEINK_WIDTH=250
   -DEINK_HEIGHT=122
diff --git a/variants/nrf52840/t-echo-lite/platformio.ini b/variants/nrf52840/t-echo-lite/platformio.ini
index 68ae59dcb..90e6487a7 100644
--- a/variants/nrf52840/t-echo-lite/platformio.ini
+++ b/variants/nrf52840/t-echo-lite/platformio.ini
@@ -9,7 +9,6 @@ debug_tool = jlink
 build_flags = ${nrf52840_base.build_flags}
   -Ivariants/nrf52840/t-echo-lite
   -D T_ECHO_LITE
-  -D GPS_POWER_TOGGLE
   -D EINK_DISPLAY_MODEL=GxEPD2_122_T61
   -D EINK_WIDTH=192
   -D EINK_HEIGHT=176
diff --git a/variants/nrf52840/t-echo/platformio.ini b/variants/nrf52840/t-echo/platformio.ini
index 6541c9796..051fb3099 100644
--- a/variants/nrf52840/t-echo/platformio.ini
+++ b/variants/nrf52840/t-echo/platformio.ini
@@ -9,7 +9,6 @@ debug_tool = jlink
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
 build_flags = ${nrf52840_base.build_flags}
   -Ivariants/nrf52840/t-echo
-  -DGPS_POWER_TOGGLE
   -DEINK_DISPLAY_MODEL=GxEPD2_154_D67
   -DEINK_WIDTH=200
   -DEINK_HEIGHT=200
diff --git a/variants/nrf52840/tracker-t1000-e/platformio.ini b/variants/nrf52840/tracker-t1000-e/platformio.ini
index c6c3f269c..905d751fd 100644
--- a/variants/nrf52840/tracker-t1000-e/platformio.ini
+++ b/variants/nrf52840/tracker-t1000-e/platformio.ini
@@ -7,7 +7,6 @@ build_flags = ${nrf52840_base.build_flags}
   -Isrc/platform/nrf52/softdevice
   -Isrc/platform/nrf52/softdevice/nrf52
   -DTRACKER_T1000_E
-  -DGPS_POWER_TOGGLE
   -DMESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR_EXTERNAL=1
   -DMESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
   -DMESHTASTIC_EXCLUDE_SCREEN=1
diff --git a/variants/nrf52840/wio-sdk-wm1110/platformio.ini b/variants/nrf52840/wio-sdk-wm1110/platformio.ini
index 2c65246b8..028129783 100644
--- a/variants/nrf52840/wio-sdk-wm1110/platformio.ini
+++ b/variants/nrf52840/wio-sdk-wm1110/platformio.ini
@@ -14,7 +14,6 @@ build_flags = ${nrf52840_base.build_flags}
   -Isrc/platform/nrf52/softdevice
   -Isrc/platform/nrf52/softdevice/nrf52
   -DWIO_WM1110
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DCFG_TUD_CDC=0
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/wio-sdk-wm1110>
diff --git a/variants/nrf52840/wio-t1000-s/platformio.ini b/variants/nrf52840/wio-t1000-s/platformio.ini
index 3594bcf07..c6b61fc8a 100644
--- a/variants/nrf52840/wio-t1000-s/platformio.ini
+++ b/variants/nrf52840/wio-t1000-s/platformio.ini
@@ -8,7 +8,6 @@ build_flags = ${nrf52840_base.build_flags}
   -Isrc/platform/nrf52/softdevice
   -Isrc/platform/nrf52/softdevice/nrf52
   -DWIO_WM1110
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/wio-t1000-s>
 lib_deps = 
diff --git a/variants/nrf52840/wio-tracker-wm1110/platformio.ini b/variants/nrf52840/wio-tracker-wm1110/platformio.ini
index b383043bb..73b7dedd4 100644
--- a/variants/nrf52840/wio-tracker-wm1110/platformio.ini
+++ b/variants/nrf52840/wio-tracker-wm1110/platformio.ini
@@ -7,7 +7,6 @@ build_flags = ${nrf52840_base.build_flags}
   -Isrc/platform/nrf52/softdevice
   -Isrc/platform/nrf52/softdevice/nrf52
   -DWIO_WM1110
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/wio-tracker-wm1110>
 lib_deps = 

From cb11e6b720fcf3eceed1b0e557013ec68153421e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 12 Oct 2025 05:34:00 -0500
Subject: [PATCH 13/19] Update protobufs (#8305)

Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
---
 protobufs                                     |  2 +-
 src/mesh/generated/meshtastic/apponly.pb.h    |  2 +-
 src/mesh/generated/meshtastic/channel.pb.h    | 22 ++++++++-----------
 src/mesh/generated/meshtastic/deviceonly.pb.h |  4 ++--
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/protobufs b/protobufs
index a1b8c3d17..38638f19f 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit a1b8c3d171445b2eebfd4b5bd1e4876f3bbed605
+Subproject commit 38638f19f84ad886222b484d6bf5a8459aed8c7e
diff --git a/src/mesh/generated/meshtastic/apponly.pb.h b/src/mesh/generated/meshtastic/apponly.pb.h
index db9dedaaf..f4c33bd79 100644
--- a/src/mesh/generated/meshtastic/apponly.pb.h
+++ b/src/mesh/generated/meshtastic/apponly.pb.h
@@ -55,7 +55,7 @@ extern const pb_msgdesc_t meshtastic_ChannelSet_msg;
 
 /* Maximum encoded size of messages (where known) */
 #define MESHTASTIC_MESHTASTIC_APPONLY_PB_H_MAX_SIZE meshtastic_ChannelSet_size
-#define meshtastic_ChannelSet_size               695
+#define meshtastic_ChannelSet_size               679
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/src/mesh/generated/meshtastic/channel.pb.h b/src/mesh/generated/meshtastic/channel.pb.h
index d5573a1e2..9dc757ab4 100644
--- a/src/mesh/generated/meshtastic/channel.pb.h
+++ b/src/mesh/generated/meshtastic/channel.pb.h
@@ -34,9 +34,9 @@ typedef enum _meshtastic_Channel_Role {
 typedef struct _meshtastic_ModuleSettings {
     /* Bits of precision for the location sent in position packets. */
     uint32_t position_precision;
-    /* Controls whether or not the phone / clients should mute the current channel
+    /* Controls whether or not the client / device should mute the current channel
  Useful for noisy public channels you don't necessarily want to disable */
-    bool is_client_muted;
+    bool is_muted;
 } meshtastic_ModuleSettings;
 
 typedef PB_BYTES_ARRAY_T(32) meshtastic_ChannelSettings_psk_t;
@@ -97,8 +97,6 @@ typedef struct _meshtastic_ChannelSettings {
     /* Per-channel module settings. */
     bool has_module_settings;
     meshtastic_ModuleSettings module_settings;
-    /* Whether or not we should receive notifactions / alerts through this channel */
-    bool mute;
 } meshtastic_ChannelSettings;
 
 /* A pair of a channel number, mode and the (sharable) settings for that channel */
@@ -130,16 +128,16 @@ extern "C" {
 
 
 /* Initializer values for message structs */
-#define meshtastic_ChannelSettings_init_default  {0, {0, {0}}, "", 0, 0, 0, false, meshtastic_ModuleSettings_init_default, 0}
+#define meshtastic_ChannelSettings_init_default  {0, {0, {0}}, "", 0, 0, 0, false, meshtastic_ModuleSettings_init_default}
 #define meshtastic_ModuleSettings_init_default   {0, 0}
 #define meshtastic_Channel_init_default          {0, false, meshtastic_ChannelSettings_init_default, _meshtastic_Channel_Role_MIN}
-#define meshtastic_ChannelSettings_init_zero     {0, {0, {0}}, "", 0, 0, 0, false, meshtastic_ModuleSettings_init_zero, 0}
+#define meshtastic_ChannelSettings_init_zero     {0, {0, {0}}, "", 0, 0, 0, false, meshtastic_ModuleSettings_init_zero}
 #define meshtastic_ModuleSettings_init_zero      {0, 0}
 #define meshtastic_Channel_init_zero             {0, false, meshtastic_ChannelSettings_init_zero, _meshtastic_Channel_Role_MIN}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define meshtastic_ModuleSettings_position_precision_tag 1
-#define meshtastic_ModuleSettings_is_client_muted_tag 2
+#define meshtastic_ModuleSettings_is_muted_tag   2
 #define meshtastic_ChannelSettings_channel_num_tag 1
 #define meshtastic_ChannelSettings_psk_tag       2
 #define meshtastic_ChannelSettings_name_tag      3
@@ -147,7 +145,6 @@ extern "C" {
 #define meshtastic_ChannelSettings_uplink_enabled_tag 5
 #define meshtastic_ChannelSettings_downlink_enabled_tag 6
 #define meshtastic_ChannelSettings_module_settings_tag 7
-#define meshtastic_ChannelSettings_mute_tag      8
 #define meshtastic_Channel_index_tag             1
 #define meshtastic_Channel_settings_tag          2
 #define meshtastic_Channel_role_tag              3
@@ -160,15 +157,14 @@ X(a, STATIC,   SINGULAR, STRING,   name,              3) \
 X(a, STATIC,   SINGULAR, FIXED32,  id,                4) \
 X(a, STATIC,   SINGULAR, BOOL,     uplink_enabled,    5) \
 X(a, STATIC,   SINGULAR, BOOL,     downlink_enabled,   6) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  module_settings,   7) \
-X(a, STATIC,   SINGULAR, BOOL,     mute,              8)
+X(a, STATIC,   OPTIONAL, MESSAGE,  module_settings,   7)
 #define meshtastic_ChannelSettings_CALLBACK NULL
 #define meshtastic_ChannelSettings_DEFAULT NULL
 #define meshtastic_ChannelSettings_module_settings_MSGTYPE meshtastic_ModuleSettings
 
 #define meshtastic_ModuleSettings_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   position_precision,   1) \
-X(a, STATIC,   SINGULAR, BOOL,     is_client_muted,   2)
+X(a, STATIC,   SINGULAR, BOOL,     is_muted,          2)
 #define meshtastic_ModuleSettings_CALLBACK NULL
 #define meshtastic_ModuleSettings_DEFAULT NULL
 
@@ -191,8 +187,8 @@ extern const pb_msgdesc_t meshtastic_Channel_msg;
 
 /* Maximum encoded size of messages (where known) */
 #define MESHTASTIC_MESHTASTIC_CHANNEL_PB_H_MAX_SIZE meshtastic_Channel_size
-#define meshtastic_ChannelSettings_size          74
-#define meshtastic_Channel_size                  89
+#define meshtastic_ChannelSettings_size          72
+#define meshtastic_Channel_size                  87
 #define meshtastic_ModuleSettings_size           8
 
 #ifdef __cplusplus
diff --git a/src/mesh/generated/meshtastic/deviceonly.pb.h b/src/mesh/generated/meshtastic/deviceonly.pb.h
index b5b116137..7fab82ff7 100644
--- a/src/mesh/generated/meshtastic/deviceonly.pb.h
+++ b/src/mesh/generated/meshtastic/deviceonly.pb.h
@@ -360,8 +360,8 @@ extern const pb_msgdesc_t meshtastic_BackupPreferences_msg;
 /* Maximum encoded size of messages (where known) */
 /* meshtastic_NodeDatabase_size depends on runtime parameters */
 #define MESHTASTIC_MESHTASTIC_DEVICEONLY_PB_H_MAX_SIZE meshtastic_BackupPreferences_size
-#define meshtastic_BackupPreferences_size        2293
-#define meshtastic_ChannelFile_size              734
+#define meshtastic_BackupPreferences_size        2277
+#define meshtastic_ChannelFile_size              718
 #define meshtastic_DeviceState_size              1737
 #define meshtastic_NodeInfoLite_size             196
 #define meshtastic_PositionLite_size             28

From 11aff46af1e41a4800ae0cead411641a13c5822d Mon Sep 17 00:00:00 2001
From: Tom Fifield <tom@tomfifield.net>
Date: Sun, 12 Oct 2025 21:34:34 +1100
Subject: [PATCH 14/19] Remove T1000E GPS startup delay sequence (#8236)

8 months ago, when this was added to the code, the GPS probe code
was still a little flaky.

Particularly after #6114 and #6116 were added, reliability improved
for all devices as we were sending fewer calls on the bus.

Today, the T1000E is the only Meshtastic device that regularly takes
2, 3, or 4 attempts to be detected via the probe code.

Removing these lines, on my T1000E, results in the AG3335 being
detected immediately.

Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>
---
 src/gps/GPS.cpp | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp
index 2cfa558ed..297ed3dfa 100644
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -494,17 +494,6 @@ bool GPS::setup()
     if (!didSerialInit) {
         int msglen = 0;
         if (tx_gpio && gnssModel == GNSS_MODEL_UNKNOWN) {
-#ifdef TRACKER_T1000_E
-            // add power up/down strategy, improve ag3335 detection success
-            digitalWrite(PIN_GPS_EN, LOW);
-            delay(500);
-            digitalWrite(GPS_VRTC_EN, LOW);
-            delay(1000);
-            digitalWrite(GPS_VRTC_EN, HIGH);
-            delay(500);
-            digitalWrite(PIN_GPS_EN, HIGH);
-            delay(1000);
-#endif
             if (probeTries < GPS_PROBETRIES) {
                 gnssModel = probe(serialSpeeds[speedSelect]);
                 if (gnssModel == GNSS_MODEL_UNKNOWN) {

From fb08e17c39f625c5ddfea85918a0f6d86c67a019 Mon Sep 17 00:00:00 2001
From: Clive Blackledge <clive@ansible.org>
Date: Sun, 12 Oct 2025 03:35:00 -0700
Subject: [PATCH 15/19] Increase bluetooth 5.0 PHY speed and MTU on esp32_s3
 (#8261)

* Increase Bluetooth speed to 2MB, increase MTU

* Adding esp32c6

* trunk fmt..
---
 src/detect/ScanI2CTwoWire.cpp  |  3 +-
 src/nimble/NimbleBluetooth.cpp | 62 +++++++++++++++++++++++++++++++++-
 2 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/src/detect/ScanI2CTwoWire.cpp b/src/detect/ScanI2CTwoWire.cpp
index 89a0610b4..d6daf7b7a 100644
--- a/src/detect/ScanI2CTwoWire.cpp
+++ b/src/detect/ScanI2CTwoWire.cpp
@@ -378,7 +378,8 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
             case SHT31_4x_ADDR:     // same as OPT3001_ADDR_ALT
             case SHT31_4x_ADDR_ALT: // same as OPT3001_ADDR
                 registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x89), 2);
-                if (registerValue == 0x11a2 || registerValue == 0x11da || registerValue == 0x11f3 || registerValue == 0xe9c || registerValue == 0xc8d) {
+                if (registerValue == 0x11a2 || registerValue == 0x11da || registerValue == 0x11f3 || registerValue == 0xe9c ||
+                    registerValue == 0xc8d) {
                     type = SHT4X;
                     logFoundDevice("SHT4X", (uint8_t)addr.address);
                 } else if (getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x7E), 2) == 0x5449) {
diff --git a/src/nimble/NimbleBluetooth.cpp b/src/nimble/NimbleBluetooth.cpp
index 0b3009d39..60165b2c0 100644
--- a/src/nimble/NimbleBluetooth.cpp
+++ b/src/nimble/NimbleBluetooth.cpp
@@ -17,6 +17,21 @@
 #include "PowerStatus.h"
 #endif
 
+#if defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32C6)
+#if defined(CONFIG_NIMBLE_CPP_IDF)
+#include "host/ble_gap.h"
+#else
+#include "nimble/nimble/host/include/host/ble_gap.h"
+#endif
+
+namespace
+{
+constexpr uint16_t kPreferredBleMtu = 517;
+constexpr uint16_t kPreferredBleTxOctets = 251;
+constexpr uint16_t kPreferredBleTxTimeUs = (kPreferredBleTxOctets + 14) * 8;
+} // namespace
+#endif
+
 NimBLECharacteristic *fromNumCharacteristic;
 NimBLECharacteristic *BatteryCharacteristic;
 NimBLECharacteristic *logRadioCharacteristic;
@@ -212,6 +227,27 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
     virtual void onConnect(NimBLEServer *pServer, NimBLEConnInfo &connInfo)
     {
         LOG_INFO("BLE incoming connection %s", connInfo.getAddress().toString().c_str());
+
+#if defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32C6)
+        const uint16_t connHandle = connInfo.getConnHandle();
+        int phyResult =
+            ble_gap_set_prefered_le_phy(connHandle, BLE_GAP_LE_PHY_2M_MASK, BLE_GAP_LE_PHY_2M_MASK, BLE_GAP_LE_PHY_CODED_ANY);
+        if (phyResult == 0) {
+            LOG_INFO("BLE conn %u requested 2M PHY", connHandle);
+        } else {
+            LOG_WARN("Failed to prefer 2M PHY for conn %u, rc=%d", connHandle, phyResult);
+        }
+
+        int dataLenResult = ble_gap_set_data_len(connHandle, kPreferredBleTxOctets, kPreferredBleTxTimeUs);
+        if (dataLenResult == 0) {
+            LOG_INFO("BLE conn %u requested data length %u bytes", connHandle, kPreferredBleTxOctets);
+        } else {
+            LOG_WARN("Failed to raise data length for conn %u, rc=%d", connHandle, dataLenResult);
+        }
+
+        LOG_INFO("BLE conn %u initial MTU %u (target %u)", connHandle, connInfo.getMTU(), kPreferredBleMtu);
+        pServer->updateConnParams(connHandle, 6, 12, 0, 200);
+#endif
     }
 
     virtual void onDisconnect(NimBLEServer *pServer, NimBLEConnInfo &connInfo, int reason)
@@ -316,6 +352,30 @@ void NimbleBluetooth::setup()
     NimBLEDevice::init(getDeviceName());
     NimBLEDevice::setPower(ESP_PWR_LVL_P9);
 
+#if defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32C6)
+    int mtuResult = NimBLEDevice::setMTU(kPreferredBleMtu);
+    if (mtuResult == 0) {
+        LOG_INFO("BLE MTU request set to %u", kPreferredBleMtu);
+    } else {
+        LOG_WARN("Unable to request MTU %u, rc=%d", kPreferredBleMtu, mtuResult);
+    }
+
+    int phyResult = ble_gap_set_prefered_default_le_phy(BLE_GAP_LE_PHY_2M_MASK, BLE_GAP_LE_PHY_2M_MASK);
+    if (phyResult == 0) {
+        LOG_INFO("BLE default PHY preference set to 2M");
+    } else {
+        LOG_WARN("Failed to prefer 2M PHY by default, rc=%d", phyResult);
+    }
+
+    int dataLenResult = ble_gap_write_sugg_def_data_len(kPreferredBleTxOctets, kPreferredBleTxTimeUs);
+    if (dataLenResult == 0) {
+        LOG_INFO("BLE suggested data length set to %u bytes", kPreferredBleTxOctets);
+    } else {
+        LOG_WARN("Failed to raise suggested data length (%u/%u), rc=%d", kPreferredBleTxOctets, kPreferredBleTxTimeUs,
+                 dataLenResult);
+    }
+#endif
+
     if (config.bluetooth.mode != meshtastic_Config_BluetoothConfig_PairingMode_NO_PIN) {
         NimBLEDevice::setSecurityAuth(BLE_SM_PAIR_AUTHREQ_BOND | BLE_SM_PAIR_AUTHREQ_MITM | BLE_SM_PAIR_AUTHREQ_SC);
         NimBLEDevice::setSecurityInitKey(BLE_SM_PAIR_KEY_DIST_ENC | BLE_SM_PAIR_KEY_DIST_ID);
@@ -459,4 +519,4 @@ void clearNVS()
     ESP.restart();
 #endif
 }
-#endif
\ No newline at end of file
+#endif

From f0126d44e2c6e464144a1df98a24b660c6c92496 Mon Sep 17 00:00:00 2001
From: Jason P <applewiz@mac.com>
Date: Sun, 12 Oct 2025 06:28:23 -0500
Subject: [PATCH 16/19] More BaseUI Frame Visibility Toggles (#8252)

* Add Power and Environmental Telemetry Hide/Show

* Allow Power and Telemetry Frames even if module disabled

---------

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
---
 src/graphics/draw/MenuHandler.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/graphics/draw/MenuHandler.cpp b/src/graphics/draw/MenuHandler.cpp
index c93e34545..3e139c0d6 100644
--- a/src/graphics/draw/MenuHandler.cpp
+++ b/src/graphics/draw/MenuHandler.cpp
@@ -1431,6 +1431,8 @@ void menuHandler::FrameToggles_menu()
         lora,
         clock,
         show_favorites,
+        show_telemetry,
+        show_power,
         enumEnd
     };
     static const char *optionsArray[enumEnd] = {"Finish"};
@@ -1469,6 +1471,12 @@ void menuHandler::FrameToggles_menu()
     optionsArray[options] = screen->isFrameHidden("show_favorites") ? "Show Favorites" : "Hide Favorites";
     optionsEnumArray[options++] = show_favorites;
 
+    optionsArray[options] = moduleConfig.telemetry.environment_screen_enabled ? "Hide Telemetry" : "Show Telemetry";
+    optionsEnumArray[options++] = show_telemetry;
+
+    optionsArray[options] = moduleConfig.telemetry.power_screen_enabled ? "Hide Power" : "Show Power";
+    optionsEnumArray[options++] = show_power;
+
     BannerOverlayOptions bannerOptions;
     bannerOptions.message = "Show/Hide Frames";
     bannerOptions.optionsArrayPtr = optionsArray;
@@ -1523,6 +1531,14 @@ void menuHandler::FrameToggles_menu()
             screen->toggleFrameVisibility("show_favorites");
             menuHandler::menuQueue = menuHandler::FrameToggles;
             screen->runNow();
+        } else if (selected == show_telemetry) {
+            moduleConfig.telemetry.environment_screen_enabled = !moduleConfig.telemetry.environment_screen_enabled;
+            menuHandler::menuQueue = menuHandler::FrameToggles;
+            screen->runNow();
+        } else if (selected == show_power) {
+            moduleConfig.telemetry.power_screen_enabled = !moduleConfig.telemetry.power_screen_enabled;
+            menuHandler::menuQueue = menuHandler::FrameToggles;
+            screen->runNow();
         }
     };
     screen->showOverlayBanner(bannerOptions);

From a6732682deb60b31f0779f730b464499e30f5da4 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Sun, 12 Oct 2025 06:30:17 -0500
Subject: [PATCH 17/19] Opt in to telemetry going forward (#8059)

---
 src/modules/Telemetry/DeviceTelemetry.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/Telemetry/DeviceTelemetry.cpp b/src/modules/Telemetry/DeviceTelemetry.cpp
index 7e3018564..066b9361d 100644
--- a/src/modules/Telemetry/DeviceTelemetry.cpp
+++ b/src/modules/Telemetry/DeviceTelemetry.cpp
@@ -26,7 +26,8 @@ int32_t DeviceTelemetryModule::runOnce()
           Default::getConfiguredOrDefaultMsScaled(moduleConfig.telemetry.device_update_interval,
                                                   default_telemetry_broadcast_interval_secs, numOnlineNodes))) &&
         airTime->isTxAllowedChannelUtil(!isImpoliteRole) && airTime->isTxAllowedAirUtil() &&
-        config.device.role != meshtastic_Config_DeviceConfig_Role_CLIENT_HIDDEN) {
+        config.device.role != meshtastic_Config_DeviceConfig_Role_CLIENT_HIDDEN &&
+        moduleConfig.telemetry.device_telemetry_enabled) {
         sendTelemetry();
         lastSentToMesh = uptimeLastMs;
     } else if (service->isToPhoneQueueEmpty()) {

From 661e596dbb71a91f3c30098ac0a82a608e933b70 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Sun, 12 Oct 2025 07:39:23 -0500
Subject: [PATCH 18/19] Fix muted channel compile errors after protobuf move
 (#8316)

---
 src/graphics/Screen.cpp                    | 2 +-
 src/modules/ExternalNotificationModule.cpp | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index 767f97eed..e1cc0ccad 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -1490,7 +1490,7 @@ int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)
                     strcpy(banner, "Alert Received");
                 }
                 screen->showSimpleBanner(banner, 3000);
-            } else if (!channel.settings.mute) {
+            } else if (!channel.settings.has_module_settings || !channel.settings.module_settings.is_muted) {
                 if (longName && longName[0]) {
 #if defined(M5STACK_UNITC6L)
                     strcpy(banner, "New Message");
diff --git a/src/modules/ExternalNotificationModule.cpp b/src/modules/ExternalNotificationModule.cpp
index 2346cd299..ffc789275 100644
--- a/src/modules/ExternalNotificationModule.cpp
+++ b/src/modules/ExternalNotificationModule.cpp
@@ -510,7 +510,8 @@ ProcessMessage ExternalNotificationModule::handleReceived(const meshtastic_MeshP
                 }
             }
 
-            if (moduleConfig.external_notification.alert_message && !ch.settings.mute) {
+            if (moduleConfig.external_notification.alert_message &&
+                (!ch.settings.has_module_settings || !ch.settings.module_settings.is_muted)) {
                 LOG_INFO("externalNotificationModule - Notification Module");
                 isNagging = true;
                 setExternalState(0, true);
@@ -521,7 +522,8 @@ ProcessMessage ExternalNotificationModule::handleReceived(const meshtastic_MeshP
                 }
             }
 
-            if (moduleConfig.external_notification.alert_message_vibra && !ch.settings.mute) {
+            if (moduleConfig.external_notification.alert_message_vibra &&
+                (!ch.settings.has_module_settings || !ch.settings.module_settings.is_muted)) {
                 LOG_INFO("externalNotificationModule - Notification Module (Vibra)");
                 isNagging = true;
                 setExternalState(1, true);
@@ -532,7 +534,8 @@ ProcessMessage ExternalNotificationModule::handleReceived(const meshtastic_MeshP
                 }
             }
 
-            if (moduleConfig.external_notification.alert_message_buzzer && !ch.settings.mute) {
+            if (moduleConfig.external_notification.alert_message_buzzer &&
+                (!ch.settings.has_module_settings || !ch.settings.module_settings.is_muted)) {
                 LOG_INFO("externalNotificationModule - Notification Module (Buzzer)");
                 if (config.device.buzzer_mode != meshtastic_Config_DeviceConfig_BuzzerMode_DIRECT_MSG_ONLY ||
                     (!isBroadcast(mp.to) && isToUs(&mp))) {

From 5eeffdb290b1e1f1a35d186066ffaf2cdf76dbfc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 12 Oct 2025 07:44:54 -0500
Subject: [PATCH 19/19] chore(deps): update meshtastic/device-ui digest to
 3fb7c0e (#8291)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 7121f00b7..5b7f5ddcf 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -120,7 +120,7 @@ lib_deps =
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/6d8cc228298a1ecd9913aed757187e9527c1facc.zip
+	https://github.com/meshtastic/device-ui/archive/3fb7c0e28e8e51fc0a7d56facacf3411f1d29fe0.zip
 
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]