diff --git a/README.md b/README.md index c1502d8..2043f41 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Allgemeine Anleitungen zum Einrichten der IDE findet man hier [www.tonuino.de/TN - Es müssen folgende Versionen der Libraries verwendet werden: - jchristensen/JC_Button: 2.1.2 - miguelbalboa/MFRC522: 1.4.10 - - makuna/DFPlayer Mini Mp3 by Makuna: 1.2.1 + - makuna/DFPlayer Mini Mp3 by Makuna: 1.2.2 - adafruit/Adafruit NeoPixel: 1.11.0 (optional, nur bei Feature NEO_RING notwendig) @@ -51,8 +51,10 @@ Die SD Karte (Ordner mp3 und advert) hat sich gegenüber der Version 3.1.2 geän # Change Log -## Version 3.1.4 (06.10.2023) -- [Issue 117](https://github.com/tonuino/TonUINO-TNG/issues/117): Support potentiometer for setting the volume +## Version 3.1.4 (13.10.2023) +- [Issue 117](https://github.com/tonuino/TonUINO-TNG/issues/117): Support potentiometer for setting the +- [Issue 120](https://github.com/tonuino/TonUINO-TNG/issues/120): Change to version 1.2.2 of the DFMiniMp3 library +- [Issue 118](https://github.com/tonuino/TonUINO-TNG/issues/118): In modus pause_if_card_removed no shortcut is played ## Version 3.1.4 (03.10.2023) - [Issue 115](https://github.com/tonuino/TonUINO-TNG/issues/115): Sometimes initial SetVolume does not come to an end diff --git a/TonUINO-TNG.ino b/TonUINO-TNG.ino index 334f944..102c4dd 100644 --- a/TonUINO-TNG.ino +++ b/TonUINO-TNG.ino @@ -35,7 +35,7 @@ void setup() LOG(init_log, s_error, F("TonUINO Version 3.1 - refactored by Boerge1\n")); LOG(init_log, s_error, F("created by Thorsten Voß and licensed under GNU/GPL.")); LOG(init_log, s_error, F("Information and contribution at https://tonuino.de.\n")); - LOG(init_log, s_error, F("V3.1.4 06.10.23\n")); + LOG(init_log, s_error, F("V3.1.4 13.10.23 III\n")); Tonuino::getTonuino().setup(); } diff --git a/platformio.ini b/platformio.ini index 07bbe12..32a858e 100644 --- a/platformio.ini +++ b/platformio.ini @@ -12,7 +12,7 @@ lib_deps = jchristensen/JC_Button@^2.1.2 miguelbalboa/MFRC522@^1.4.10 - makuna/DFPlayer Mini Mp3 by Makuna@1.2.1 + makuna/DFPlayer Mini Mp3 by Makuna@1.2.2 adafruit/Adafruit NeoPixel@^1.11.0 build_flags = diff --git a/src/state_machine.cpp b/src/state_machine.cpp index df3733b..680c7c6 100644 --- a/src/state_machine.cpp +++ b/src/state_machine.cpp @@ -666,7 +666,7 @@ void StartPlay::react(command_e const &/*cmd_e*/) { if (timer.isActive()) { if (timer.isExpired()) { LOG(state_log, s_debug, str_StartPlay(), str_to(), str_Play()); - if (settings.pauseWhenCardRemoved && chip_card.isCardRemoved()) + if (settings.pauseWhenCardRemoved && chip_card.isCardRemoved() && tonuino.playingCard()) transit(); else transit(); diff --git a/src/tonuino.cpp b/src/tonuino.cpp index 557e7d7..50e5375 100644 --- a/src/tonuino.cpp +++ b/src/tonuino.cpp @@ -50,6 +50,7 @@ void Tonuino::setup() { // DFPlayer Mini initialisieren mp3.begin(); + delay(2000); mp3.setVolume(); mp3.setEq(static_cast(settings.eq - 1)); diff --git a/src/tonuino.hpp b/src/tonuino.hpp index 32e6f25..eb00d88 100644 --- a/src/tonuino.hpp +++ b/src/tonuino.hpp @@ -39,6 +39,7 @@ class Tonuino { const nfcTagObject& getCard() const { return myCard; } void setFolder(folderSettings *newFolder ) { myFolder = newFolder; } uint8_t getFolder() { return myFolder->folder; } + bool playingCard() { return myFolder == &myCard.nfcFolderSettings; } Mp3& getMp3 () { return mp3 ; } Commands& getCommands () { return commands ; }