Merge remote-tracking branch 'origin/main' into issue_120

tonuino · Oct 13, 2023 · 0ebaa73 · 0ebaa73
2 parents ef88091 + 6171d42
commit 0ebaa73
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -51,11 +51,10 @@ Die SD Karte (Ordner mp3 und advert) hat sich gegenüber der Version 3.1.2 geän
 
 ## Version 3.1.4 (13.10.2023)
 - [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
-
-## Version 3.1.4 (20.09.2023)
 - [Issue 103](https://github.com/tonuino/TonUINO-TNG/issues/103): Deploy pages for online upload
 - [Issue 111](https://github.com/tonuino/TonUINO-TNG/issues/111): TonUINO crashes if if the player gives a track count >255
 - [Issue 108](https://github.com/tonuino/TonUINO-TNG/issues/108): Missing OnPlayFinished: the progress is not saved for Hoerbuch mode

diff --git 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 13.10.23\n"));
+  LOG(init_log, s_error, F("V3.1.4 13.10.23 II\n"));
 
   Tonuino::getTonuino().setup();
 }

diff --git 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<Pause>();
       else
         transit<Play>();

diff --git a/src/tonuino.hpp b/src/tonuino.hpp
@@ -38,6 +38,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 ; }