rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-21 02:02:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into multi-message-Storage

Browse Source
This commit is contained in:
Jason P
2025-12-07 17:42:13 -06:00
committed by GitHub
parent fb932461c1 2ae391197f
commit f4fd3e7812
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
boards/heltec_v4.json
View File

@@ -9,7 +9,7 @@
"extra_flags": [ "extra_flags": [
"-DBOARD_HAS_PSRAM", "-DBOARD_HAS_PSRAM",
"-DARDUINO_USB_CDC_ON_BOOT=1", "-DARDUINO_USB_CDC_ON_BOOT=1",
"-DARDUINO_USB_MODE=0", "-DARDUINO_USB_MODE=1",
"-DARDUINO_RUNNING_CORE=1", "-DARDUINO_RUNNING_CORE=1",
"-DARDUINO_EVENT_RUNNING_CORE=1" "-DARDUINO_EVENT_RUNNING_CORE=1"
], ],

11
src/AudioThread.h
View File

@@ -50,8 +50,11 @@ class AudioThread : public concurrency::OSThread
delete i2sRtttl; delete i2sRtttl;
i2sRtttl = nullptr; i2sRtttl = nullptr;
} }
delete rtttlFile;
rtttlFile = nullptr; if (rtttlFile != nullptr) {
delete rtttlFile;
rtttlFile = nullptr;
}
setCPUFast(false); setCPUFast(false);
#ifdef T_LORA_PAGER #ifdef T_LORA_PAGER
@@ -99,9 +102,9 @@ class AudioThread : public concurrency::OSThread
}; };
AudioGeneratorRTTTL *i2sRtttl = nullptr; AudioGeneratorRTTTL *i2sRtttl = nullptr;
AudioOutputI2S *audioOut; AudioOutputI2S *audioOut = nullptr;
AudioFileSourcePROGMEM *rtttlFile; AudioFileSourcePROGMEM *rtttlFile = nullptr;
}; };
#endif #endif

3
src/modules/ExternalNotificationModule.cpp
View File

@@ -310,8 +310,7 @@ void ExternalNotificationModule::stopNow()
rtttl::stop(); rtttl::stop();
#ifdef HAS_I2S #ifdef HAS_I2S
LOG_INFO("Stop audioThread playback"); LOG_INFO("Stop audioThread playback");
if (audioThread->isPlaying()) audioThread->stop();
audioThread->stop();
#endif #endif
// Turn off all outputs // Turn off all outputs
LOG_INFO("Turning off setExternalStates"); LOG_INFO("Turning off setExternalStates");

4
variants/nrf52840/diy/nrf52_promicro_diy_tcxo/platformio.ini
View File

@@ -5,8 +5,6 @@ board = promicro-nrf52840
build_flags = ${nrf52840_base.build_flags} build_flags = ${nrf52840_base.build_flags}
-I variants/nrf52840/diy/nrf52_promicro_diy_tcxo -I variants/nrf52840/diy/nrf52_promicro_diy_tcxo
-D NRF52_PROMICRO_DIY -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> build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/diy/nrf52_promicro_diy_tcxo>
lib_deps = lib_deps =
${nrf52840_base.lib_deps} ${nrf52840_base.lib_deps}
@@ -22,8 +20,6 @@ build_flags =
${inkhud.build_flags} ${inkhud.build_flags}
-I variants/nrf52840/diy/nrf52_promicro_diy_tcxo -I variants/nrf52840/diy/nrf52_promicro_diy_tcxo
-D NRF52_PROMICRO_DIY -D NRF52_PROMICRO_DIY
-DRADIOLIB_EXCLUDE_SX128X=1
-DRADIOLIB_EXCLUDE_SX127X=1
build_src_filter = build_src_filter =
${nrf52_base.build_src_filter} ${nrf52_base.build_src_filter}
${inkhud.build_src_filter} ${inkhud.build_src_filter}