Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 251 Changes to enable configuration of showdown behavior #253

Merged
merged 2 commits into from
Nov 25, 2024
Merged

Issue 251 Changes to enable configuration of showdown behavior #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
706b18d
Issue_251: Changes to enable configuration of showdown behavior
Nov 22, 2024
42450e5
Issue_251: Changes to enable configuration of showdown behavior
Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion TonUINO-TNG.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 4 additions & 0 deletions src/commands.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
5 changes: 3 additions & 2 deletions src/constants.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

// ######################################################################

Expand Down
2 changes: 1 addition & 1 deletion src/tonuino.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down