mirror/TonUINO
1
0
Fork 0
mirror of https://github.com/xfjx/TonUINO.git synced 2025-08-14 06:54:27 +02:00
Code Issues Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Thorsten Voß
2019-04-19 00:13:25 +02:00
parent c4a7663ed4
commit c5fa2c77c3
5 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
SD-Karte-Apple-Stimme/mp3/0800_waiting_for_card.mp3 Normal file
View File

Binary file not shown.

BIN
SD-Karte-Google-Stimme/mp3/0800_waiting_for_card.mp3 Normal file
View File

Binary file not shown.

BIN
SD-Karte-hohe-Stimme/mp3/0800_waiting_for_card.mp3 Normal file
View File

Binary file not shown.

12
Tonuino.ino
View File

@@ -1168,6 +1168,7 @@ void adminMenu(bool fromCard = false) {
case 4: tempCard.nfcFolderSettings.special = 60; break;
}
}
mp3.playMp3FolderTrack(800);
do {
readButtons();
if (upButton.wasReleased() || downButton.wasReleased()) {
@@ -1423,7 +1424,7 @@ void resetCard() {
setupCard();
}
void setupFolder(folderSettings * theFolder) {
bool setupFolder(folderSettings * theFolder) {
// Ordner abfragen
theFolder->folder = voiceMenu(99, 301, 0, true);
@@ -1455,12 +1456,13 @@ void setupFolder(folderSettings * theFolder) {
void setupCard() {
mp3.pause();
Serial.println(F("=== setupCard()"));
setupFolder(&myCard.nfcFolderSettings);
nfcTagObject newCard;
setupFolder(&newCard.nfcFolderSettings);
// Karte ist konfiguriert -> speichern
mp3.pause();
do {
} while (isPlaying());
writeCard(myCard);
writeCard(newCard);
}
bool readCard(nfcTagObject * nfcTag) {
@@ -1595,7 +1597,7 @@ bool readCard(nfcTagObject * nfcTag) {
}
switch (tempCard.nfcFolderSettings.mode ) {
case 0: adminMenu(true); break;
case 0: mfrc522.PICC_HaltA(); mfrc522.PCD_StopCrypto1(); adminMenu(true); break;
case 1: activeModifier = new SleepTimer(tempCard.nfcFolderSettings.special); break;
case 2: activeModifier = new FreezeDance(); break;
case 3: activeModifier = new Locked(); break;
@@ -1704,7 +1706,7 @@ void writeCard(nfcTagObject nfcTag) {
else
mp3.playMp3FolderTrack(400);
Serial.println();
delay(100);
delay(1000);
}

1
soundfiles.txt
View File

@@ -26,6 +26,7 @@ mp3/0322_select_last_file.mp3|Wähle nun bitte die Enddatei mit den Lautstärket
#mp3/0332.mp3|Ja, Nummer ansagen.
mp3/0400_ok.mp3|OK. Ich habe die Karte konfiguriert.
mp3/0401_error.mp3|Oh weh! Das hat leider nicht geklappt!
mp3/0800_waiting_for_card.mp3|Bitte lege nun die Karte auf!
mp3/0802_reset_aborted.mp3|OK, ich habe den Vorgang abgebrochen.
mp3/0900_admin.mp3|Willkommen im Admin Menü. Bitte wähle eine Funktion mit den Lautstärketasten aus und bestätige sie mit der Pausetaste! Durch einen langen Druck auf die Pausetaste kannst du den Vorgang abbrechen.
mp3/0901_card_reset.mp3|Eine Karte neu konfigurieren.