From 957bdbae7b0208c8af3c002dbccb96cd8b7a8989 Mon Sep 17 00:00:00 2001 From: Hendrik van der Heijden Date: Tue, 1 Jan 2019 22:16:19 +0100 Subject: [PATCH] Define cardCookie constant --- Tonuino.ino | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Tonuino.ino b/Tonuino.ino index c198f91..b55c76d 100644 --- a/Tonuino.ino +++ b/Tonuino.ino @@ -6,6 +6,8 @@ #include #include +static const uint32_t cardCookie = 322417479; + // DFPlayer Mini SoftwareSerial mySoftwareSerial(2, 3); // RX, TX uint16_t numTracksInFolder; @@ -116,7 +118,7 @@ void writeSettingsToFlash() { void resetSettings() { Serial.println(F("=== resetSettings()")); - mySettings.cookie = 322417479; + mySettings.cookie = cardCookie; mySettings.version = 1; mySettings.maxVolume = 25; mySettings.minVolume = 5; @@ -140,7 +142,7 @@ void loadSettingsFromFlash() { Serial.println(F("=== loadSettingsFromFlash()")); int address = sizeof(myFolder->folder) * 100; EEPROM.get(address, mySettings); - if (mySettings.cookie != 322417479) + if (mySettings.cookie != cardCookie) resetSettings(); migradeSettings(mySettings.version); @@ -662,7 +664,7 @@ void loop() { if (readCard(&myCard) == true) { // make random a little bit more "random" 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(); } @@ -728,7 +730,7 @@ void adminMenu() { // Create Cards for Folder // Ordner abfragen nfcTagObject tempCard; - tempCard.cookie = 322417479; + tempCard.cookie = cardCookie; tempCard.version = 1; tempCard.nfcFolderSettings.mode = 4; tempCard.nfcFolderSettings.folder = voiceMenu(99, 301, 0, true);