mirror/TonUINO
1
0
Fork 0
mirror of https://github.com/xfjx/TonUINO.git synced 2025-08-22 15:32:57 +02:00
Code Issues Releases Wiki Activity

VoiceMenu Verbesserungen

Browse Source
This commit is contained in:
Thorsten Voß
2018-12-11 23:25:00 +01:00
parent caf7aca5cb
commit 71bc1405eb
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Tonuino.ino
View File

@@ -66,9 +66,9 @@ class Mp3Notify {
Serial.println(errorCode); Serial.println(errorCode);
} }
static void OnPlayFinished(uint16_t track) { static void OnPlayFinished(uint16_t track) {
Serial.print("Track beendet"); // Serial.print("Track beendet");
Serial.println(track); // Serial.println(track);
delay(100); // delay(100);
nextTrack(track); nextTrack(track);
} }
static void OnCardOnline(uint16_t code) { static void OnCardOnline(uint16_t code) {
@@ -556,7 +556,7 @@ void loop() {
void adminMenu() { void adminMenu() {
mp3.pause(); mp3.pause();
Serial.print(F("Admin Menu")); Serial.println(F("=== adminMenu()"));
knownCard = false; knownCard = false;
int subMenu = voiceMenu(9, 900, 900); int subMenu = voiceMenu(9, 900, 900);
@@ -612,17 +612,25 @@ int voiceMenu(int numberOfOptions, int startMessage, int messageOffset,
int returnValue = defaultValue; int returnValue = defaultValue;
if (startMessage != 0) if (startMessage != 0)
mp3.playMp3FolderTrack(startMessage); mp3.playMp3FolderTrack(startMessage);
Serial.print(F("=== voiceMenu() ("));
Serial.print(numberOfOptions);
Serial.println(F(" Options)"));
do { do {
readButtons(); readButtons();
mp3.loop(); mp3.loop();
if (pauseButton.wasPressed()) { if (pauseButton.wasPressed()) {
if (returnValue != 0) if (returnValue != 0) {
Serial.print(F("=== "));
Serial.print(returnValue);
Serial.println(F(" ==="));
return returnValue; return returnValue;
}
delay(1000); delay(1000);
} }
if (upButton.pressedFor(LONG_PRESS)) { if (upButton.pressedFor(LONG_PRESS)) {
returnValue = min(returnValue + 10, numberOfOptions); returnValue = min(returnValue + 10, numberOfOptions);
Serial.println(returnValue);
mp3.pause(); mp3.pause();
mp3.playMp3FolderTrack(messageOffset + returnValue); mp3.playMp3FolderTrack(messageOffset + returnValue);
waitForTrackToFinish(); waitForTrackToFinish();
@@ -637,6 +645,7 @@ int voiceMenu(int numberOfOptions, int startMessage, int messageOffset,
} else if (upButton.wasReleased()) { } else if (upButton.wasReleased()) {
if (!ignoreUpButton) { if (!ignoreUpButton) {
returnValue = min(returnValue + 1, numberOfOptions); returnValue = min(returnValue + 1, numberOfOptions);
Serial.println(returnValue);
mp3.pause(); mp3.pause();
mp3.playMp3FolderTrack(messageOffset + returnValue); mp3.playMp3FolderTrack(messageOffset + returnValue);
if (preview) { if (preview) {
@@ -652,6 +661,7 @@ int voiceMenu(int numberOfOptions, int startMessage, int messageOffset,
if (downButton.pressedFor(LONG_PRESS)) { if (downButton.pressedFor(LONG_PRESS)) {
returnValue = max(returnValue - 10, 1); returnValue = max(returnValue - 10, 1);
Serial.println(returnValue);
mp3.pause(); mp3.pause();
mp3.playMp3FolderTrack(messageOffset + returnValue); mp3.playMp3FolderTrack(messageOffset + returnValue);
waitForTrackToFinish(); waitForTrackToFinish();
@@ -665,6 +675,7 @@ int voiceMenu(int numberOfOptions, int startMessage, int messageOffset,
} else if (downButton.wasReleased()) { } else if (downButton.wasReleased()) {
if (!ignoreDownButton) { if (!ignoreDownButton) {
returnValue = max(returnValue - 1, 1); returnValue = max(returnValue - 1, 1);
Serial.println(returnValue);
mp3.pause(); mp3.pause();
mp3.playMp3FolderTrack(messageOffset + returnValue); mp3.playMp3FolderTrack(messageOffset + returnValue);
waitForTrackToFinish(); waitForTrackToFinish();