diff --git a/README.md b/README.md index ba2d0a9..fb3e72d 100644 --- a/README.md +++ b/README.md @@ -90,8 +90,9 @@ Die SD Karte (Ordner mp3 und advert) hat sich gegenüber der Version 3.1.11 geä # Change Log -## Version 3.1.12 (15.08.2024) +## Version 3.1.12 (16.08.2024) - [Issue 220](https://github.com/tonuino/TonUINO-TNG/issues/220): New shortcut for switching BT on/off +- [Issue 219](https://github.com/tonuino/TonUINO-TNG/issues/219): Disable modification cards during quiz and memory game ## Version 3.1.11 (31.07.2024) - [Issue 212](https://github.com/tonuino/TonUINO-TNG/issues/212): Sleep Timer Modification card doesn't work properly with NeoPixel Ring diff --git a/TonUINO-TNG.ino b/TonUINO-TNG.ino index 7e28696..f7ce1e9 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.12 15.08.24\n")); + LOG(init_log, s_error, F("V3.1.12 16.08.24\n")); #ifdef TonUINO_Classic LOG(init_log, s_error, F("C "), lf_no); diff --git a/src/state_machine.cpp b/src/state_machine.cpp index 0968037..77f9b37 100644 --- a/src/state_machine.cpp +++ b/src/state_machine.cpp @@ -898,6 +898,7 @@ void StartPlay::react(command_e const &/*cmd_e*/) { void Quiz::entry() { LOG(state_log, s_info, str_enter(), str_Quiz()); tonuino.disableStandbyTimer(); + tonuino.resetActiveModifier(); tonuino.playFolder(); numAnswer = tonuino.getMyFolder().special; numSolution = tonuino.getMyFolder().special2; @@ -1139,6 +1140,7 @@ void Quiz::finish() { void Memory::entry() { LOG(state_log, s_info, str_enter(), str_Memory()); tonuino.disableStandbyTimer(); + tonuino.resetActiveModifier(); tonuino.playFolder(); first = 0; second = 0; diff --git a/src/tonuino.cpp b/src/tonuino.cpp index 2819236..5327547 100644 --- a/src/tonuino.cpp +++ b/src/tonuino.cpp @@ -381,6 +381,16 @@ bool Tonuino::specialCard(const folderSettings &nfcTag) { return true; } +#ifdef QUIZ_GAME + if (SM_tonuino::is_in_state() && nfcTag.mode != pmode_t::bt_module) + return false; +#endif // QUIZ_GAME +#ifdef MEMORY_GAME + if (SM_tonuino::is_in_state() && nfcTag.mode != pmode_t::bt_module) + return false; +#endif // MEMORY_GAME + + switch (nfcTag.mode) { case pmode_t::sleep_timer: LOG(card_log, s_info, F("act. sleepTimer")); mp3.playAdvertisement(advertTracks::t_302_sleep , false/*olnyIfIsPlaying*/);