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

Merge branch 'develop' into revert-2m-phy

Browse Source
This commit is contained in:
Ben Meadors
2025-12-07 15:51:22 -06:00
committed by GitHub
parent 8c2d863399 2ae391197f
commit 5caa4bba36
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/AudioThread.h
View File

@@ -50,8 +50,11 @@ class AudioThread : public concurrency::OSThread
delete i2sRtttl; delete i2sRtttl;
i2sRtttl = nullptr; i2sRtttl = nullptr;
} }
if (rtttlFile != nullptr) {
delete rtttlFile; delete rtttlFile;
rtttlFile = nullptr; 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

1
src/modules/ExternalNotificationModule.cpp
View File

@@ -310,7 +310,6 @@ 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