Skip to content

Draft: More flexible mqtt #373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 33 commits into
base: dev
Choose a base branch
from
Open

Draft: More flexible mqtt #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
7a215da
remove audio-tak
Joe91 May 15, 2025
6a310c7
rename queues and remove queues
Joe91 May 15, 2025
b683cff
place audio into ps-ram again
Joe91 May 15, 2025
0c61ee4
Merge remote-tracking branch 'original/dev' into remove_audio_task
Joe91 May 15, 2025
3e467d1
move rfid-task to core 1
Joe91 May 15, 2025
ca3531f
fix: add log for audio-level again
Joe91 May 15, 2025
144da01
some more tweaks on LED and RFID-Task (seems to remove the audio-issu…
Joe91 May 16, 2025
30ed576
also remove LED-Task
Joe91 May 16, 2025
2b6e18f
more performant main-loop
Joe91 May 16, 2025
8759985
Merge branch 'remove_audio_task' into remove_led-task
Joe91 May 16, 2025
fa2c7a5
some cleanup. No flicker at all anymore
Joe91 May 16, 2025
66555c8
separate cores more strictly
Joe91 May 16, 2025
82098d1
save wip
Joe91 May 17, 2025
5c6e3b4
separate cores more strictly
Joe91 May 17, 2025
3c43434
Merge branch 'remove_led-task' into remove_audio_task
Joe91 May 17, 2025
b1dba80
use original positioin of loop again and add pause-mechanism again
Joe91 May 18, 2025
81a237c
fix from wolle (set file pos works again)
Joe91 May 18, 2025
467cbe2
clean core-separation
Joe91 May 18, 2025
5f8591b
don't stop the leds or music anymore during upload. Reduce diffs
Joe91 May 18, 2025
d9d3e9e
fix invalid reference
Joe91 May 18, 2025
00b7b83
create full topic dynamically
Joe91 May 19, 2025
4301d8a
Revert "Merge branch 'remove_led-task' into remove_audio_task"
Joe91 May 22, 2025
45f900d
speedup web again. pausing Led-task can cause exceptions
Joe91 May 24, 2025
ee4bcb7
Merge branch 'again_with_tasks' into remove_audio_task
Joe91 May 24, 2025
143943b
finally working leds?
Joe91 Jun 19, 2025
1b8c822
update audio-lib, wait for wifi-connection for mqtt (no more errors o…
Joe91 Jun 19, 2025
32142f8
fix platformio.ini
Joe91 Jun 19, 2025
a93631f
use .git
Joe91 Jun 19, 2025
fd99cde
add pausePlayState to mqtt
Joe91 Jun 24, 2025
a33042c
Merge branch 'remove_audio_task' into more_flexible_mqtt
Joe91 Jun 24, 2025
db92f2c
fix encapsulation of mqtt
Joe91 Jun 24, 2025
cb8df57
fix: revert audio-lib because of issues on large files
Joe91 Jun 26, 2025
0c998fb
Merge remote-tracking branch 'original/dev' into more_flexible_mqtt
Joe91 Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/AudioPlayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,7 @@ void AudioPlayer_Loop() {
gPlayProperties.trackFinished = false;
gPlayProperties.playlistFinished = false;
#ifdef MQTT_ENABLE
publishMqtt(topicPausePlayState, static_cast<uint32_t>(gPlayProperties.pausePlay), false);
publishMqtt(topicPlaymodeState, static_cast<uint32_t>(gPlayProperties.playMode), false);
publishMqtt(topicRepeatModeState, static_cast<uint32_t>(AudioPlayer_GetRepeatMode()), false);
#endif
Expand Down Expand Up @@ -514,6 +515,9 @@ void AudioPlayer_Loop() {
gPlayProperties.playMode = NO_PLAYLIST;
Audio_setTitle(noPlaylist);
AudioPlayer_ClearCover();
#ifdef MQTT_ENABLE
publishMqtt(topicPausePlayState, static_cast<uint32_t>(gPlayProperties.pausePlay), false);
#endif
return;

case PAUSEPLAY:
Expand All @@ -529,6 +533,9 @@ void AudioPlayer_Loop() {
AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), audio->getAudioCurrentTime(), gPlayProperties.playMode, gPlayProperties.currentTrackNumber, gPlayProperties.playlist->size());
}
gPlayProperties.pausePlay = !gPlayProperties.pausePlay;
#ifdef MQTT_ENABLE
publishMqtt(topicPausePlayState, static_cast<uint32_t>(gPlayProperties.pausePlay), false);
#endif
Web_SendWebsocketData(0, WebsocketCodeType::TrackInfo);
return;

Expand All @@ -537,6 +544,9 @@ void AudioPlayer_Loop() {
if (gPlayProperties.pausePlay) {
audio->pauseResume();
gPlayProperties.pausePlay = false;
#ifdef MQTT_ENABLE
publishMqtt(topicPausePlayState, static_cast<uint32_t>(gPlayProperties.pausePlay), false);
#endif
}
if (gPlayProperties.repeatCurrentTrack) { // End loop if button was pressed
gPlayProperties.repeatCurrentTrack = false;
Expand Down Expand Up @@ -572,6 +582,9 @@ void AudioPlayer_Loop() {
if (gPlayProperties.pausePlay) {
audio->pauseResume();
gPlayProperties.pausePlay = false;
#ifdef MQTT_ENABLE
publishMqtt(topicPausePlayState, static_cast<uint32_t>(gPlayProperties.pausePlay), false);
#endif
}
if (gPlayProperties.repeatCurrentTrack) { // End loop if button was pressed
gPlayProperties.repeatCurrentTrack = false;
Expand Down Expand Up @@ -633,6 +646,9 @@ void AudioPlayer_Loop() {
if (gPlayProperties.pausePlay) {
audio->pauseResume();
gPlayProperties.pausePlay = false;
#ifdef MQTT_ENABLE
publishMqtt(topicPausePlayState, static_cast<uint32_t>(gPlayProperties.pausePlay), false);
#endif
}
gPlayProperties.currentTrackNumber = 0;
if (gPlayProperties.saveLastPlayPosition) {
Expand All @@ -650,6 +666,9 @@ void AudioPlayer_Loop() {
if (gPlayProperties.pausePlay) {
audio->pauseResume();
gPlayProperties.pausePlay = false;
#ifdef MQTT_ENABLE
publishMqtt(topicPausePlayState, static_cast<uint32_t>(gPlayProperties.pausePlay), false);
#endif
}
if (gPlayProperties.currentTrackNumber + 1 < gPlayProperties.playlist->size()) {
gPlayProperties.currentTrackNumber = gPlayProperties.playlist->size() - 1;
Expand Down
Loading
Loading