libs/RFID.MFRC522
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update AccessControl.ino (#303)

Browse Source 
* alterate Wipe button polling method without using other library
* updated delay functions to monitorWipeButton
* changes millis to uint_32 for compatibility
* fix bug: eeprom size erase counter from 8 to 16 bit.
This commit is contained in:
Saurabh Shandilya
2017-04-08 15:32:52 +05:30
committed by Rotzbua
parent 9e48c308da
commit 507c84f4e5
1 changed files with 80 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
examples/AccessControl/AccessControl.ino
View File

@@ -1,10 +1,10 @@
/* /*
* -------------------------------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------------------------------
* Example sketch/program showing An Arduino Door Access Control featuring RFID, EEPROM, Relay Example sketch/program showing An Arduino Door Access Control featuring RFID, EEPROM, Relay
* -------------------------------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------------------------------
* This is a MFRC522 library example; for further details and other examples see: https://github.com/miguelbalboa/rfid This is a MFRC522 library example; for further details and other examples see: https://github.com/miguelbalboa/rfid
*
* This example showing a complete Door Access Control System This example showing a complete Door Access Control System
Simple Work Flow (not limited to) : Simple Work Flow (not limited to) :
+---------+ +---------+
@@ -30,34 +30,34 @@
+----+ | EEPROM | |EEPROM| | | +----+ | EEPROM | |EEPROM| | |
+-----------+ +------+ +-------------------------------+ +-----------+ +------+ +-------------------------------+
*
* Use a Master Card which is act as Programmer then you can able to choose card holders who will granted access or not Use a Master Card which is act as Programmer then you can able to choose card holders who will granted access or not
*
* **Easy User Interface** * **Easy User Interface**
*
* Just one RFID tag needed whether Delete or Add Tags. You can choose to use Leds for output or Serial LCD module to inform users. Just one RFID tag needed whether Delete or Add Tags. You can choose to use Leds for output or Serial LCD module to inform users.
*
* **Stores Information on EEPROM** * **Stores Information on EEPROM**
*
* Information stored on non volatile Arduino's EEPROM memory to preserve Users' tag and Master Card. No Information lost Information stored on non volatile Arduino's EEPROM memory to preserve Users' tag and Master Card. No Information lost
* if power lost. EEPROM has unlimited Read cycle but roughly 100,000 limited Write cycle. if power lost. EEPROM has unlimited Read cycle but roughly 100,000 limited Write cycle.
*
* **Security** * **Security**
* To keep it simple we are going to use Tag's Unique IDs. It's simple and not hacker proof. To keep it simple we are going to use Tag's Unique IDs. It's simple and not hacker proof.
*
* @license Released into the public domain. @license Released into the public domain.
*
* Typical pin layout used: Typical pin layout used:
* ----------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------
* MFRC522 Arduino Arduino Arduino Arduino Arduino MFRC522 Arduino Arduino Arduino Arduino Arduino
* Reader/PCD Uno/101 Mega Nano v3 Leonardo/Micro Pro Micro Reader/PCD Uno/101 Mega Nano v3 Leonardo/Micro Pro Micro
* Signal Pin Pin Pin Pin Pin Pin Signal Pin Pin Pin Pin Pin Pin
* ----------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------
* RST/Reset RST 9 5 D9 RESET/ICSP-5 RST RST/Reset RST 9 5 D9 RESET/ICSP-5 RST
* SPI SS SDA(SS) 10 53 D10 10 10 SPI SS SDA(SS) 10 53 D10 10 10
* SPI MOSI MOSI 11 / ICSP-4 51 D11 ICSP-4 16 SPI MOSI MOSI 11 / ICSP-4 51 D11 ICSP-4 16
* SPI MISO MISO 12 / ICSP-1 50 D12 ICSP-1 14 SPI MISO MISO 12 / ICSP-1 50 D12 ICSP-1 14
* SPI SCK SCK 13 / ICSP-3 52 D13 ICSP-3 15 SPI SCK SCK 13 / ICSP-3 52 D13 ICSP-3 15
*/ */
#include <EEPROM.h> // We are going to read and write PICC's UIDs from/to EEPROM #include <EEPROM.h> // We are going to read and write PICC's UIDs from/to EEPROM
@@ -138,12 +138,12 @@ void setup() {
if (digitalRead(wipeB) == LOW) { // when button pressed pin should get low, button connected to ground if (digitalRead(wipeB) == LOW) { // when button pressed pin should get low, button connected to ground
digitalWrite(redLed, LED_ON); // Red Led stays on to inform user we are going to wipe digitalWrite(redLed, LED_ON); // Red Led stays on to inform user we are going to wipe
Serial.println(F("Wipe Button Pressed")); Serial.println(F("Wipe Button Pressed"));
Serial.println(F("You have 15 seconds to Cancel")); Serial.println(F("You have 10 seconds to Cancel"));
Serial.println(F("This will be remove all records and cannot be undone")); Serial.println(F("This will be remove all records and cannot be undone"));
delay(15000); // Give user enough time to cancel operation bool buttonState = monitorWipeButton(10000); // Give user enough time to cancel operation
if (digitalRead(wipeB) == LOW) { // If button still be pressed, wipe EEPROM if (buttonState == true && digitalRead(wipeB) == LOW) { // If button still be pressed, wipe EEPROM
Serial.println(F("Starting Wiping EEPROM")); Serial.println(F("Starting Wiping EEPROM"));
for (uint8_t x = 0; x < EEPROM.length(); x = x + 1) { //Loop end of EEPROM address for (uint16_t x = 0; x < EEPROM.length(); x = x + 1) { //Loop end of EEPROM address
if (EEPROM.read(x) == 0) { //If EEPROM address 0 if (EEPROM.read(x) == 0) { //If EEPROM address 0
// do nothing, already clear, go to the next address in order to save time and reduce writes to EEPROM // do nothing, already clear, go to the next address in order to save time and reduce writes to EEPROM
} }
@@ -196,7 +196,7 @@ void setup() {
} }
Serial.println(""); Serial.println("");
Serial.println(F("-------------------")); Serial.println(F("-------------------"));
Serial.println(F("Everything Ready")); Serial.println(F("Everything is ready"));
Serial.println(F("Waiting PICCs to be scanned")); Serial.println(F("Waiting PICCs to be scanned"));
cycleLeds(); // Everything ready lets give user some feedback by cycling leds cycleLeds(); // Everything ready lets give user some feedback by cycling leds
} }
@@ -215,12 +215,14 @@ void loop () {
// Give some feedback // Give some feedback
Serial.println(F("Wipe Button Pressed")); Serial.println(F("Wipe Button Pressed"));
Serial.println(F("Master Card will be Erased! in 10 seconds")); Serial.println(F("Master Card will be Erased! in 10 seconds"));
delay(10000); // Wait 10 seconds to see user still wants to wipe bool buttonState = monitorWipeButton(10000); // Give user enough time to cancel operation
if (digitalRead(wipeB) == LOW) { if (buttonState == true && digitalRead(wipeB) == LOW) { // If button still be pressed, wipe EEPROM
EEPROM.write(1, 0); // Reset Magic Number. EEPROM.write(1, 0); // Reset Magic Number.
Serial.println(F("Restart device to re-program Master Card")); Serial.println(F("Master Card Erased from device"));
Serial.println(F("Please reset to re-program Master Card"));
while (1); while (1);
} }
Serial.println(F("Master Card Erase Cancelled"));
} }
if (programMode) { if (programMode) {
cycleLeds(); // Program Mode cycles through Red Green Blue waiting to read a new card cycleLeds(); // Program Mode cycles through Red Green Blue waiting to read a new card
@@ -534,3 +536,15 @@ boolean isMaster( byte test[] ) {
else else
return false; return false;
} }
bool monitorWipeButton(uint32_t interval) {
uint32_t now = (uint32_t)millis();
while ((uint32_t)millis() - now < interval) {
// check on every half a second
if (((uint32_t)millis() % 500) == 0) {
if (digitalRead(wipeB) != LOW)
return false;
}
}
return true;
}