syncing rfid.esp with esp-rfid project

Author: tctlrd

bin/deploydebug.bin

@@ -22,11 +22,13 @@ lib_deps =
 	https://github.com/me-no-dev/ESPAsyncWebServer
 	https://github.com/marvinroger/async-mqtt-client
 	https://github.com/miguelbalboa/rfid
-	https://github.com/pvtex/Wiegand-NG-Multi-Bit-Wiegand-Library-for-Arduino
+	https://github.com/matjack1/Wiegand-Protocol-Library-for-Arduino
 	https://github.com/PaulStoffregen/Time
 	https://github.com/thomasfredericks/Bounce2
 	https://github.com/tctlrd/Desfire
+	https://github.com/miguelbalboa/rfid
 	https://github.com/tctlrd/io2
+	https://github.com/plerup/espsoftwareserial
 
 [env:debug]
 platform = ${common.platform}

platformio.ini

@@ -8,6 +8,9 @@ void beeperBeep()
 		if (currentMillis > beeperOffTime && digitalRead(config.beeperpin) == BEEPERon)
 		{
 			digitalWrite(config.beeperpin, BEEPERoff);
+#ifdef DEBUG
+			Serial.println("Beeper OFF");
+#endif
 			beeperInterval = 0;
 		}
 		else if (beeperInterval != 0)
@@ -18,8 +21,14 @@ void beeperBeep()
     			previousMillis = currentMillis;
 				if (beeperState == BEEPERon) {
 					beeperState = BEEPERoff;
+#ifdef DEBUG
+					Serial.println("Beeper OFF");
+#endif
 				} else {
 					beeperState = BEEPERon;
+#ifdef DEBUG
+					Serial.println("Beeper ON");
+#endif
 				}
 				digitalWrite(config.beeperpin, beeperState);
 			}
@@ -33,6 +42,9 @@ void beeperValidAccess()
 	{
 		beeperOffTime = currentMillis + 2000;
 		digitalWrite(config.beeperpin, BEEPERon);
+#ifdef DEBUG
+		Serial.println("Beeper ON");
+#endif
 	}
 }
 
@@ -41,6 +53,9 @@ void beeperAdminAccess()
 	if (config.beeperpin != 255) {
 		beeperOffTime = currentMillis + 3000;
 		digitalWrite(config.beeperpin, BEEPERon);
+#ifdef DEBUG
+		Serial.println("Beeper ON");
+#endif
 	}
 }
 
@@ -51,4 +66,4 @@ void beeperAccessDenied()
 		beeperOffTime = currentMillis + 1000;
 		beeperInterval = 200;
 	}
-}
+}

src/beeper.esp

@@ -1,5 +1,3 @@
-#define MAX_NUM_RELAYS 4
-
 struct Config
 {
     bool dhcpEnabledEth = false;

src/config.h

@@ -1,6 +1,12 @@
 // reader types
 
+#define READER_MFRC522 0
 #define READER_WIEGAND 1
+#define READER_PN532 2
+#define READER_RDM6300 3
+#define READER_MFRC522_RDM6300 4
+#define READER_WIEGAND_RDM6300 5
+#define READER_PN532_RDM6300 6
 
 // timing constants
 
@@ -18,14 +24,14 @@
 #define WIEGANDTYPE_KEYPRESS4 4
 #define WIEGANDTYPE_KEYPRESS8 8
 #define WIEGANDTYPE_PICC24 24
-#define WIEGANDTYPE_PICC26 26
 #define WIEGANDTYPE_PICC34 34
-#define WIEGANDTYPE_PICC37 37
-#define WIEGANDTYPE_PICC44 44
-#define WIEGANDTYPE_PICC56 56
-#define WIEGANDTYPE_PICC58 58
+
+#define RDM6300_BAUDRATE 9600
+#define RDM6300_READ_TIMEOUT 20
 
 // hardware defines
 
+#define MAX_NUM_RELAYS 4
+
 #define LOCKTYPE_MOMENTARY 0
-#define LOCKTYPE_CONTINUOUS 1
+#define LOCKTYPE_CONTINUOUS 1

src/magicnumbers.h

@@ -48,18 +48,26 @@ IO2 io2 = IO2(); // set I2C address of MOD-IO2
 #include <Bounce2.h>
 #include <Desfire.h>
 #include "Secrets.h"
-#include <PN532.h>
 // #include <esp_task_wdt.h>
 #include <Update.h>
 #include "magicnumbers.h"
 #include "config.h"
 
-#include <WiegandNG.h>
-
 Config config;
+
+#include <MFRC522.h>
+#include "PN532.h"
+#include <Wiegand.h>
+#include "rfid125kHz.h"
+#include <SoftwareSerial.h>
+
 File fsUploadFile;
-WiegandNG wg;
 Desfire desfire;
+MFRC522 mfrc522 = MFRC522();
+PN532 pn532;
+WIEGAND wg;
+RFID_Reader RFIDr;
+SoftwareSerial *rdm6300SwSerial = NULL;
 
 // relay specific variables
 #if MAX_NUM_RELAYS == 4