From 5c1410dcb2336343ff09d41edb5e983d3c811812 Mon Sep 17 00:00:00 2001 From: kkloesener Date: Thu, 25 Mar 2021 14:05:33 +0100 Subject: [PATCH] minor corrections --- src/main.cpp | 3 ++- src/settings.h | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index cbcb030..866fa4c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1852,7 +1852,8 @@ void rfidScanner(void *parameter) { if (!mfrc522.PICC_ReadCardSerial()) { continue; } -// mfrc522.PICC_DumpToSerial(); + + //mfrc522.PICC_DumpToSerial(&(mfrc522.uid)); mfrc522.PICC_HaltA(); mfrc522.PCD_StopCrypto1(); diff --git a/src/settings.h b/src/settings.h index cc79957..83a1688 100644 --- a/src/settings.h +++ b/src/settings.h @@ -25,18 +25,18 @@ //########################## MODULES ################################# //#define PORT_EXPANDER_ENABLE // When enabled, buttons can be connected via port-expander PCA9555 #define MDNS_ENABLE // When enabled, you don't have to handle with ESPuino's IP-address. If hostname is set to "ESPuino", you can reach it via ESPuino.local - //#define MQTT_ENABLE // Make sure to configure mqtt-server and (optionally) username+pwd + #define MQTT_ENABLE // Make sure to configure mqtt-server and (optionally) username+pwd #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 LANGUAGE 1 // 1 = deutsch; 2 = 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) #define SHUTDOWN_IF_SD_BOOT_FAILS // Will put ESP to deepsleep if boot fails due to SD. Really recommend this if there's in battery-mode no other way to restart ESP! Interval adjustable via deepsleepTimeAfterBootFails. - //#define MEASURE_BATTERY_VOLTAGE // Enables battery-measurement via GPIO (ADC) and voltage-divider + #define MEASURE_BATTERY_VOLTAGE // Enables battery-measurement via GPIO (ADC) and voltage-divider //#define PLAY_LAST_RFID_AFTER_REBOOT // When restarting ESPuino, the last RFID that was active before, is recalled and played //#define USE_LAST_VOLUME_AFTER_REBOOT // Remembers the volume used at last shutdown after reboot - //#define USEROTARY_ENABLE // If rotary-encoder is used (don't forget to review WAKEUP_BUTTON if you disable this feature!) + #define USEROTARY_ENABLE // If rotary-encoder is used (don't forget to review WAKEUP_BUTTON if you disable this feature!) #define BLUETOOTH_ENABLE // If enabled and bluetooth-mode is active, you can stream to your ESPuino via bluetooth (a2dp-sink). //#define IR_CONTROL_ENABLE // Enables remote control @@ -47,8 +47,8 @@ //################## select RFID reader ############################## - //#define RFID_READER_TYPE_MFRC522_SPI // use MFRC522 via SPI - #define RFID_READER_TYPE_MFRC522_I2C // use MFRC522 via I2C + #define RFID_READER_TYPE_MFRC522_SPI // use MFRC522 via SPI + //#define RFID_READER_TYPE_MFRC522_I2C // use MFRC522 via I2C //#define RFID_READER_TYPE_PN5180 // use PN5180 #ifdef RFID_READER_TYPE_MFRC522_I2C