From cb18cab209fcfd22e70e7a3c5ce02065c84d983c Mon Sep 17 00:00:00 2001
From: Torsten Stauder <stauder@ts-cs.de>
Date: Sun, 4 Jul 2021 21:59:01 +0200
Subject: [PATCH] Tiny calculation fix / bringing .de back as
 default-log-language

---
 src/RfidPn5180.cpp | 4 ++--
 src/settings.h     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/RfidPn5180.cpp b/src/RfidPn5180.cpp
index 1e9fe84..b57f654 100644
--- a/src/RfidPn5180.cpp
+++ b/src/RfidPn5180.cpp
@@ -87,7 +87,7 @@ extern unsigned long Rfid_LastRfidCheckTimestamp;
                 // Reset to dummy-value if no card is there
                 // Necessary to differentiate between "card is still applied" and "card is re-applied again after removal"
                 // lastTimeDetected14443 is used to prevent "new card detection with old card" with single events where no card was detected
-                if (!lastTimeDetected14443 || (lastTimeDetected14443 - millis() >= 300)) {
+                if (!lastTimeDetected14443 || (millis() - lastTimeDetected14443 >= 300)) {
                     lastTimeDetected14443 = 0;
                     for (uint8_t i=0; i<cardIdSize; i++) {
                         lastCardId[i] = 0;
@@ -118,7 +118,7 @@ extern unsigned long Rfid_LastRfidCheckTimestamp;
                 lastTimeDetected15693 = millis();
             } else {
                 // lastTimeDetected15693 is used to prevent "new card detection with old card" with single events where no card was detected
-                if (!lastTimeDetected15693 || (lastTimeDetected15693 - millis() >= 300)) {
+                if (!lastTimeDetected15693 || (millis() - lastTimeDetected15693 >= 300)) {
                     lastTimeDetected15693 = 0;
                     for (uint8_t i=0; i<cardIdSize; i++) {
                         lastCardId[i] = 0;
diff --git a/src/settings.h b/src/settings.h
index f20b32f..c997bc0 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -30,7 +30,7 @@
     #define FTP_ENABLE                      // Enables FTP-server; DON'T FORGET TO ACTIVATE AFTER BOOT BY PRESSING PAUSE + NEXT-BUTTONS (IN PARALLEL)!
     #define NEOPIXEL_ENABLE                 // Don't forget configuration of NUM_LEDS if enabled
     //#define NEOPIXEL_REVERSE_ROTATION     // Some Neopixels are adressed/soldered counter-clockwise. This can be configured here.
-    #define LANGUAGE EN                     // DE = deutsch; EN = english
+    #define LANGUAGE DE                     // DE = deutsch; EN = english
     //#define STATIC_IP_ENABLE              // Enables static IP-configuration (change static ip-section accordingly)
     //#define HEADPHONE_ADJUST_ENABLE       // Used to adjust (lower) volume for optional headphone-pcb (refer maxVolumeSpeaker / maxVolumeHeadphone) and to enable stereo (if PLAY_MONO_SPEAKER is set)
     #define PLAY_MONO_SPEAKER               // If only one speaker is used enabling mono should make sense. Please note: headphones is always stereo (if HEADPHONE_ADJUST_ENABLE is active)