From 706b18d33f42890cf1d8319fbcea2079805ce5f6 Mon Sep 17 00:00:00 2001 From: boerge1 Date: Fri, 22 Nov 2024 13:26:28 +0100 Subject: [PATCH 1/2] Issue_251: Changes to enable configuration of showdown behavior --- README.md | 3 ++- TonUINO-TNG.ino | 2 +- src/commands.cpp | 4 ++++ src/constants.hpp | 5 +++-- src/tonuino.cpp | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2602b60..2b37a76 100644 --- 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.11 geä # Change Log -## Version 3.2.1 (22.11.2024) +## Version 3.2.1 (23.11.2024) +- [Issue 251](https://github.com/tonuino/TonUINO-TNG/issues/251): Update the non-German texts for advert and mp3 tracks - [Issue 250](https://github.com/tonuino/TonUINO-TNG/issues/250): Update the non-German texts for advert and mp3 tracks - [Issue 248](https://github.com/tonuino/TonUINO-TNG/issues/248): Add the possibility to change the antenna gain of the RFRC522 module diff --git a/TonUINO-TNG.ino b/TonUINO-TNG.ino index 0a63511..364752a 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.2.1 22.11.24\n")); + LOG(init_log, s_error, F("V3.2.1 23.11.24\n")); #ifdef TonUINO_Classic LOG(init_log, s_error, F("C "), lf_no); diff --git a/src/commands.cpp b/src/commands.cpp index f5bfe66..c2c8b68 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -9,7 +9,11 @@ const command cmd_table[][4] PROGMEM = { /* start, */ ,{ command::none , command::start , command::none , command::none } /* allLong, */ ,{ command::none , command::admin , command::admin , command::admin } /* pause, */ ,{ command::select , command::pause , command::pause , command::pause } +#ifndef DISABLE_SHUTDOWN_VIA_BUTTON /* pauseLong, */ ,{ command::adm_end , command::shutdown , command::track , command::track } +#else +/* pauseLong, */ ,{ command::adm_end , command::shortcut1 , command::track , command::track } +#endif #ifdef FIVEBUTTONS /* up, */ ,{ command::next , command::bright_up , command::next , command::none } /* upLong, */ ,{ command::next10 , command::shortcut2 , command::next10 , command::none } diff --git a/src/constants.hpp b/src/constants.hpp index b330eef..75c646a 100644 --- a/src/constants.hpp +++ b/src/constants.hpp @@ -314,10 +314,11 @@ inline constexpr float batVoltageEmpty = 2.90; // ###################################################################### -/* uncomment the below line if you use Pololu Powerswitch for shutdown - * wenn der Pololu Powerswitch für das Shutdown verwendet wird, in der nächste Zeile den Kommentar entfernen +/* uncomment the below lines if you use Pololu Powerswitch or Traeger Platine for shutdown + * wenn der Pololu Powerswitch oder die Traeger Platine für das Shutdown verwendet wird, in den nächsten Zeile den Kommentar entfernen */ //#define USE_POLOLU_SHUTDOWN +//#define USE_TRAEGER_PLATINE_SHUTDOWN // ###################################################################### diff --git a/src/tonuino.cpp b/src/tonuino.cpp index 825a750..f383c58 100644 --- a/src/tonuino.cpp +++ b/src/tonuino.cpp @@ -396,7 +396,7 @@ void Tonuino::shutdown() { digitalWrite(shutdownPin, getLevel(shutdownPinType, level::active)); delay(500); -#ifdef USE_POLOLU_SHUTDOWN +#if defined(USE_POLOLU_SHUTDOWN) or defined(USE_TRAEGER_PLATINE_SHUTDOWN) return; #endif From 42450e5a8c216b9be8fa83ee6ef9758369fe3594 Mon Sep 17 00:00:00 2001 From: boerge1 Date: Mon, 25 Nov 2024 12:55:13 +0100 Subject: [PATCH 2/2] Issue_251: Changes to enable configuration of showdown behavior --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2b37a76..af04dd8 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ Die SD Karte (Ordner mp3 und advert) hat sich gegenüber der Version 3.1.11 geä # Change Log ## Version 3.2.1 (23.11.2024) -- [Issue 251](https://github.com/tonuino/TonUINO-TNG/issues/251): Update the non-German texts for advert and mp3 tracks +- [Issue 251](https://github.com/tonuino/TonUINO-TNG/issues/251): Changes to enable configuration of showdown behavior - [Issue 250](https://github.com/tonuino/TonUINO-TNG/issues/250): Update the non-German texts for advert and mp3 tracks - [Issue 248](https://github.com/tonuino/TonUINO-TNG/issues/248): Add the possibility to change the antenna gain of the RFRC522 module