mirror/TonUINO
1
0
Fork 0
mirror of https://github.com/xfjx/TonUINO.git synced 2025-08-23 16:43:29 +02:00
Code Issues Releases Wiki Activity

Fix für Adminkarten

Browse Source
This commit is contained in:
Thorsten Voß
2019-05-07 22:11:37 +02:00
parent 5bfec397d0
commit 54ca4fdaf0
1 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Tonuino.ino
View File

@@ -1456,10 +1456,12 @@ void resetCard() {
bool setupFolder(folderSettings * theFolder) { bool setupFolder(folderSettings * theFolder) {
// Ordner abfragen // Ordner abfragen
theFolder->folder = voiceMenu(99, 301, 0, true); theFolder->folder = voiceMenu(99, 301, 0, true, 0, 0, true);
if (theFolder->folder == 0) return false;
// Wiedergabemodus abfragen // Wiedergabemodus abfragen
theFolder->mode = voiceMenu(9, 310, 310); theFolder->mode = voiceMenu(9, 310, 310, false, 0, 0, true);
if (theFolder->mode == 0) return false;
// // Hörbuchmodus -> Fortschritt im EEPROM auf 1 setzen // // Hörbuchmodus -> Fortschritt im EEPROM auf 1 setzen
// EEPROM.update(theFolder->folder, 1); // EEPROM.update(theFolder->folder, 1);
@@ -1472,7 +1474,7 @@ bool setupFolder(folderSettings * theFolder) {
if (theFolder->mode == 6) { if (theFolder->mode == 6) {
//theFolder->special = voiceMenu(3, 320, 320); //theFolder->special = voiceMenu(3, 320, 320);
theFolder->folder = 0; theFolder->folder = 0;
theFolder->mode = 0; theFolder->mode = 255;
} }
// Spezialmodus Von-Bis // Spezialmodus Von-Bis
if (theFolder->mode == 7 || theFolder->mode == 8 || theFolder->mode == 9) { if (theFolder->mode == 7 || theFolder->mode == 8 || theFolder->mode == 9) {
@@ -1481,21 +1483,23 @@ bool setupFolder(folderSettings * theFolder) {
theFolder->special2 = voiceMenu(mp3.getFolderTrackCount(theFolder->folder), 322, 0, theFolder->special2 = voiceMenu(mp3.getFolderTrackCount(theFolder->folder), 322, 0,
true, theFolder->folder, theFolder->special); true, theFolder->folder, theFolder->special);
} }
return true;
} }
void setupCard() { void setupCard() {
mp3.pause(); mp3.pause();
Serial.println(F("=== setupCard()")); Serial.println(F("=== setupCard()"));
nfcTagObject newCard; nfcTagObject newCard;
setupFolder(&newCard.nfcFolderSettings); if (setupFolder(&newCard.nfcFolderSettings) == true)
// Karte ist konfiguriert -> speichern {
mp3.pause(); // Karte ist konfiguriert -> speichern
do { mp3.pause();
} while (isPlaying()); do {
if (newCard.nfcFolderSettings.folder != 0 && newCard.nfcFolderSettings.mode != 0) } while (isPlaying());
writeCard(newCard); writeCard(newCard);
}
delay(1000);
} }
bool readCard(nfcTagObject * nfcTag) { bool readCard(nfcTagObject * nfcTag) {
nfcTagObject tempCard; nfcTagObject tempCard;
// Show some details of the PICC (that is: the tag/card) // Show some details of the PICC (that is: the tag/card)
@@ -1637,24 +1641,29 @@ bool readCard(nfcTagObject * nfcTag) {
return false; return false;
} }
} }
if (isPlaying()) { if (tempCard.nfcFolderSettings.mode != 0 && tempCard.nfcFolderSettings.mode != 255) {
mp3.playAdvertisement(260); if (isPlaying()) {
} mp3.playAdvertisement(260);
else { }
mp3.start(); else {
delay(100); mp3.start();
mp3.playAdvertisement(260); delay(100);
delay(100); mp3.playAdvertisement(260);
mp3.pause(); delay(100);
mp3.pause();
}
} }
switch (tempCard.nfcFolderSettings.mode ) { switch (tempCard.nfcFolderSettings.mode ) {
case 0: mfrc522.PICC_HaltA(); mfrc522.PCD_StopCrypto1(); adminMenu(true); break; case 0:
case 255:
mfrc522.PICC_HaltA(); mfrc522.PCD_StopCrypto1(); adminMenu(true); break;
case 1: activeModifier = new SleepTimer(tempCard.nfcFolderSettings.special); break; case 1: activeModifier = new SleepTimer(tempCard.nfcFolderSettings.special); break;
case 2: activeModifier = new FreezeDance(); break; case 2: activeModifier = new FreezeDance(); break;
case 3: activeModifier = new Locked(); break; case 3: activeModifier = new Locked(); break;
case 4: activeModifier = new ToddlerMode(); break; case 4: activeModifier = new ToddlerMode(); break;
case 5: activeModifier = new KindergardenMode(); break; case 5: activeModifier = new KindergardenMode(); break;
case 6: activeModifier = new RepeatSingleModifier(); break; case 6: activeModifier = new RepeatSingleModifier(); break;
} }
delay(2000); delay(2000);
return false; return false;