Browse Source

Tiny calculation fix / bringing .de back as default-log-language

master
Torsten Stauder 4 years ago
parent
commit
cb18cab209
  1. 4
      src/RfidPn5180.cpp
  2. 2
      src/settings.h

4
src/RfidPn5180.cpp

@ -87,7 +87,7 @@ extern unsigned long Rfid_LastRfidCheckTimestamp;
// Reset to dummy-value if no card is there // 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" // 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 // 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; lastTimeDetected14443 = 0;
for (uint8_t i=0; i<cardIdSize; i++) { for (uint8_t i=0; i<cardIdSize; i++) {
lastCardId[i] = 0; lastCardId[i] = 0;
@ -118,7 +118,7 @@ extern unsigned long Rfid_LastRfidCheckTimestamp;
lastTimeDetected15693 = millis(); lastTimeDetected15693 = millis();
} else { } else {
// lastTimeDetected15693 is used to prevent "new card detection with old card" with single events where no card was detected // 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; lastTimeDetected15693 = 0;
for (uint8_t i=0; i<cardIdSize; i++) { for (uint8_t i=0; i<cardIdSize; i++) {
lastCardId[i] = 0; lastCardId[i] = 0;

2
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 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_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 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 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 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) #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)

Loading…
Cancel
Save