Merge branch 'develop' into multi-message-Storage

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"
     ],

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

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");

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}