From 8060134224773a82df18c32179c322fc3458e998 Mon Sep 17 00:00:00 2001
From: Tom <116762865+NomDeTom@users.noreply.github.com>
Date: Sat, 6 Dec 2025 02:25:57 +0000
Subject: [PATCH 1/3] promicro doesn't need these. (#8873)

---
 variants/nrf52840/diy/nrf52_promicro_diy_tcxo/platformio.ini | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/platformio.ini b/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/platformio.ini
index d7d0c02c8..61a6eda07 100644
--- a/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/platformio.ini
+++ b/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/platformio.ini
@@ -5,8 +5,6 @@ board = promicro-nrf52840
 build_flags = ${nrf52840_base.build_flags}
   -I variants/nrf52840/diy/nrf52_promicro_diy_tcxo
   -D NRF52_PROMICRO_DIY
-  -DRADIOLIB_EXCLUDE_SX128X=1
-  -DRADIOLIB_EXCLUDE_SX127X=1
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/diy/nrf52_promicro_diy_tcxo>
 lib_deps = 
   ${nrf52840_base.lib_deps}
@@ -22,8 +20,6 @@ build_flags =
   ${inkhud.build_flags}
   -I variants/nrf52840/diy/nrf52_promicro_diy_tcxo
   -D NRF52_PROMICRO_DIY
-  -DRADIOLIB_EXCLUDE_SX128X=1
-  -DRADIOLIB_EXCLUDE_SX127X=1
 build_src_filter =
   ${nrf52_base.build_src_filter}
   ${inkhud.build_src_filter}

From 2a17c3b5d48726fb947e328340c4ea75f5acaf0a Mon Sep 17 00:00:00 2001
From: Clive Blackledge <clive@ansible.org>
Date: Sat, 6 Dec 2025 16:56:56 -0800
Subject: [PATCH 2/3] Change ARDUINO_USB_MODE from 0 to 1 in the board
 definition. This switches to the ESP32-S3's Hardware CDC and JTAG mode, which
 properly handles the reset signals for automatic reboot after firmware
 updates. (#8881)

---
 boards/heltec_v4.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boards/heltec_v4.json b/boards/heltec_v4.json
index 8eac3a9b2..9827be83f 100644
--- a/boards/heltec_v4.json
+++ b/boards/heltec_v4.json
@@ -9,7 +9,7 @@
     "extra_flags": [
       "-DBOARD_HAS_PSRAM",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],

From 2ae391197f7c1fd92bce8f60c75ff3482aab2bbf Mon Sep 17 00:00:00 2001
From: Igor Danilov <59930161+polarikus@users.noreply.github.com>
Date: Mon, 8 Dec 2025 00:50:53 +0300
Subject: [PATCH 3/3] Fix #8883 (lora-Pager fter playing the notification,
 voltage does not disappear from the speaker) (#8884)

* Fix #8883

* Fix crash when delete not inicialized rtttlFile
---
 src/AudioThread.h                          | 11 +++++++----
 src/modules/ExternalNotificationModule.cpp |  3 +--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/AudioThread.h b/src/AudioThread.h
index df4892b6e..23552c421 100644
--- a/src/AudioThread.h
+++ b/src/AudioThread.h
@@ -50,8 +50,11 @@ class AudioThread : public concurrency::OSThread
             delete i2sRtttl;
             i2sRtttl = nullptr;
         }
-        delete rtttlFile;
-        rtttlFile = nullptr;
+
+        if (rtttlFile != nullptr) {
+            delete rtttlFile;
+            rtttlFile = nullptr;
+        }
 
         setCPUFast(false);
 #ifdef T_LORA_PAGER
@@ -99,9 +102,9 @@ class AudioThread : public concurrency::OSThread
     };
 
     AudioGeneratorRTTTL *i2sRtttl = nullptr;
-    AudioOutputI2S *audioOut;
+    AudioOutputI2S *audioOut = nullptr;
 
-    AudioFileSourcePROGMEM *rtttlFile;
+    AudioFileSourcePROGMEM *rtttlFile = nullptr;
 };
 
 #endif
diff --git a/src/modules/ExternalNotificationModule.cpp b/src/modules/ExternalNotificationModule.cpp
index 91e96b8d4..ecbe71b27 100644
--- a/src/modules/ExternalNotificationModule.cpp
+++ b/src/modules/ExternalNotificationModule.cpp
@@ -310,8 +310,7 @@ void ExternalNotificationModule::stopNow()
     rtttl::stop();
 #ifdef HAS_I2S
     LOG_INFO("Stop audioThread playback");
-    if (audioThread->isPlaying())
-        audioThread->stop();
+    audioThread->stop();
 #endif
     // Turn off all outputs
     LOG_INFO("Turning off setExternalStates");