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

Define cardCookie constant

Browse Source
This commit is contained in:
Hendrik van der Heijden
2019-01-01 22:16:19 +01:00
committed by Thorsten Voß
parent a88bec1ef7
commit 957bdbae7b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Tonuino.ino
View File

@@ -6,6 +6,8 @@
#include <SoftwareSerial.h> #include <SoftwareSerial.h>
#include <avr/sleep.h> #include <avr/sleep.h>
static const uint32_t cardCookie = 322417479;
// DFPlayer Mini // DFPlayer Mini
SoftwareSerial mySoftwareSerial(2, 3); // RX, TX SoftwareSerial mySoftwareSerial(2, 3); // RX, TX
uint16_t numTracksInFolder; uint16_t numTracksInFolder;
@@ -116,7 +118,7 @@ void writeSettingsToFlash() {
void resetSettings() { void resetSettings() {
Serial.println(F("=== resetSettings()")); Serial.println(F("=== resetSettings()"));
mySettings.cookie = 322417479; mySettings.cookie = cardCookie;
mySettings.version = 1; mySettings.version = 1;
mySettings.maxVolume = 25; mySettings.maxVolume = 25;
mySettings.minVolume = 5; mySettings.minVolume = 5;
@@ -140,7 +142,7 @@ void loadSettingsFromFlash() {
Serial.println(F("=== loadSettingsFromFlash()")); Serial.println(F("=== loadSettingsFromFlash()"));
int address = sizeof(myFolder->folder) * 100; int address = sizeof(myFolder->folder) * 100;
EEPROM.get(address, mySettings); EEPROM.get(address, mySettings);
if (mySettings.cookie != 322417479) if (mySettings.cookie != cardCookie)
resetSettings(); resetSettings();
migradeSettings(mySettings.version); migradeSettings(mySettings.version);
@@ -662,7 +664,7 @@ void loop() {
if (readCard(&myCard) == true) { if (readCard(&myCard) == true) {
// make random a little bit more "random" // make random a little bit more "random"
randomSeed(millis() + random(1000)); randomSeed(millis() + random(1000));
if (myCard.cookie == 322417479 && myFolder->folder != 0 && myFolder->mode != 0) { if (myCard.cookie == cardCookie && myFolder->folder != 0 && myFolder->mode != 0) {
playFolder(); playFolder();
} }
@@ -728,7 +730,7 @@ void adminMenu() {
// Create Cards for Folder // Create Cards for Folder
// Ordner abfragen // Ordner abfragen
nfcTagObject tempCard; nfcTagObject tempCard;
tempCard.cookie = 322417479; tempCard.cookie = cardCookie;
tempCard.version = 1; tempCard.version = 1;
tempCard.nfcFolderSettings.mode = 4; tempCard.nfcFolderSettings.mode = 4;
tempCard.nfcFolderSettings.folder = voiceMenu(99, 301, 0, true); tempCard.nfcFolderSettings.folder = voiceMenu(99, 301, 0, true);