Merge pull request #194: Issue_193: Hoerbuch mode: after playing last…

… track it does not change to first track on next start
tonuino · Apr 13, 2024 · 555afed · 555afed
2 parents 357c8bc + df097f0
commit 555afed
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -90,7 +90,8 @@ Die SD Karte (Ordner mp3 und advert) hat sich gegenüber der Version 3.1.6 geän
 
 # Change Log
 
-## Version 3.1.7 (08.04.2024)
+## Version 3.1.7 (11.04.2024)
+- [Issue 193](https://github.com/tonuino/TonUINO-TNG/issues/193): Hoerbuch mode: after playing last track it does not change to first track on next start
 - [Issue 190](https://github.com/tonuino/TonUINO-TNG/issues/190): Neo Pixel Ring: Add the possibility to have 2 rings remains
 - [Issue 188](https://github.com/tonuino/TonUINO-TNG/issues/188): Pause when card removed modus: do not go to Play via button if card is not present
 

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.7 08.04.24\n"));
+  LOG(init_log, s_error, F("V3.1.7 11.04.24\n"));
 
   Tonuino::getTonuino().setup();
 }

diff --git a/src/tonuino.cpp b/src/tonuino.cpp
@@ -258,13 +258,14 @@ void Tonuino::nextTrack(uint8_t tracks, bool fromOnPlayFinished) {
   LOG(play_log, s_info, F("nextTrack"));
   if (activeModifier->handleNext())
     return;
-  if (fromOnPlayFinished && mp3.isPlayingFolder() && myFolder.mode == pmode_t::hoerbuch_1) {
+  if (fromOnPlayFinished && mp3.isPlayingFolder() && (myFolder.mode == pmode_t::hoerbuch || myFolder.mode == pmode_t::hoerbuch_1)) {
     const uint8_t trackToSave = (mp3.getCurrentTrack() < numTracksInFolder) ? mp3.getCurrentTrack()+1 : 1;
     settings.writeFolderSettingToFlash(myFolder.folder, trackToSave);
-    mp3.clearFolderQueue();
+    if (myFolder.mode == pmode_t::hoerbuch_1)
+      mp3.clearFolderQueue();
   }
   mp3.playNext(tracks, fromOnPlayFinished);
-  if (mp3.isPlayingFolder() && (myFolder.mode == pmode_t::hoerbuch || myFolder.mode == pmode_t::hoerbuch_1)) {
+  if (not fromOnPlayFinished && mp3.isPlayingFolder() && (myFolder.mode == pmode_t::hoerbuch || myFolder.mode == pmode_t::hoerbuch_1)) {
     settings.writeFolderSettingToFlash(myFolder.folder, mp3.getCurrentTrack());
   }
 }

diff --git a/test/src/mp3_tests.cpp b/test/src/mp3_tests.cpp
@@ -12,6 +12,8 @@ class mp3_test_fixture: public ::testing::Test {
   {
     mp3.reset_to_initial_state();
     mp3.clearAllQueue();
+    folderSettings card = { 1, pmode_t::album, 0, 0 };
+    tonuino.setMyFolder(card, true);
   }
 
   void execute_cycle() {

diff --git a/test/src/tonuino_fixture.hpp b/test/src/tonuino_fixture.hpp
@@ -329,9 +329,9 @@ class tonuino_fixture: public ::testing::Test {
     }
   }
 
-  void goto_play(const folderSettings& card) {
+  void goto_play(const folderSettings& card, uint16_t track_count = 99) {
     goto_idle();
-    card_in(card);
+    card_in(card, track_count);
     EXPECT_TRUE(SM_tonuino::is_in_state<StartPlay>());
 
     // play t_262_pling

diff --git a/test/src/tonuino_tests.cpp b/test/src/tonuino_tests.cpp
@@ -1121,3 +1121,58 @@ TEST_F(tonuino_test_fixture, next_previous_in_play_hoerbuch) {
 
 }
 
+// =================== end of hoerbuch
+TEST_F(tonuino_test_fixture, end_play_hoerbuch) {
+  const uint8_t folder = 5;
+  uint8_t track_count = 10;
+  folderSettings card = { folder, pmode_t::hoerbuch, 0, 0 };
+  getSettings().writeFolderSettingToFlash(folder, track_count); // last track
+  goto_play(card, track_count);
+  EXPECT_EQ(getSettings().readFolderSettingFromFlash(folder), track_count);
+  Print::clear_output();
+
+  // nothing happen on next button
+  button_for_command(command::next, state_for_command::play);
+  execute_cycle_for_ms(time_check_play);
+  EXPECT_TRUE(getMp3().is_playing_folder());
+  EXPECT_EQ(getMp3().df_folder, card.folder);
+  EXPECT_EQ(getMp3().df_folder_track, track_count);
+  EXPECT_EQ(getSettings().readFolderSettingFromFlash(folder), track_count);
+
+  // end if finished
+  getMp3().end_track();
+  execute_cycle();
+  EXPECT_TRUE(getMp3().is_stopped());
+  EXPECT_TRUE(SM_tonuino::is_in_state<Idle>());
+  EXPECT_EQ(getSettings().readFolderSettingFromFlash(folder), 1);
+
+  card_out();
+}
+
+TEST_F(tonuino_test_fixture, end_play_hoerbuch_1) {
+  const uint8_t folder = 5;
+  uint8_t track_count = 10;
+  folderSettings card = { folder, pmode_t::hoerbuch_1, 0, 0 };
+  getSettings().writeFolderSettingToFlash(folder, track_count); // last track
+  goto_play(card, track_count);
+  EXPECT_EQ(getSettings().readFolderSettingFromFlash(folder), track_count);
+  Print::clear_output();
+
+  // nothing happen on next button
+  button_for_command(command::next, state_for_command::play);
+  execute_cycle_for_ms(time_check_play);
+  EXPECT_TRUE(getMp3().is_playing_folder());
+  EXPECT_EQ(getMp3().df_folder, card.folder);
+  EXPECT_EQ(getMp3().df_folder_track, track_count);
+  EXPECT_EQ(getSettings().readFolderSettingFromFlash(folder), track_count);
+
+  // end if finished
+  getMp3().end_track();
+  execute_cycle();
+  EXPECT_TRUE(getMp3().is_stopped());
+  EXPECT_TRUE(SM_tonuino::is_in_state<Idle>());
+  EXPECT_EQ(getSettings().readFolderSettingFromFlash(folder), 1);
+
+  card_out();
+}
+