Merge pull request #253: Issue 251 Changes to enable configuration of…

… showdown behavior
tonuino · Nov 25, 2024 · 1b80e10 · 1b80e10
2 parents 9ade86b + 42450e5
commit 1b80e10
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 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.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): 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
 

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.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
@@ -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
@@ -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
@@ -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