PN532 is now working

Author: tctlrd

.gitignore

@@ -1,5 +1,6 @@
 .pio
 .vscode
+src/websrc/process
 tools/webfilesbuilder/node_modules
 tools/webfilesbuilder/package-lock.json
 tools/wsemulator/node_modules

src/config.esp

@@ -132,12 +132,55 @@ bool loadConfiguration(Config &config)
 		config.numRelays = 1;
 
 	config.readertype = hardware["readertype"];
+	int rfidss;
 	config.pinCodeRequested = false;
 	config.pinCodeOnly = false;
-
-	config.wgd0pin = hardware["wgd0pin"];
-	config.wgd1pin = hardware["wgd1pin"];
-	config.wiegandbits = hardware["wiegandbits"];
+	if (config.readertype == READER_WIEGAND || config.readertype == READER_WIEGAND_RDM6300)
+	{
+		int wgd0pin = hardware["wgd0pin"];
+		int wgd1pin = hardware["wgd1pin"];
+		config.wiegandbits = hardware["wiegandbits"];
+		if (hardware["requirepincodeafterrfid"].is<bool>())
+		{
+			config.pinCodeRequested = hardware["requirepincodeafterrfid"];
+		}
+		if (hardware["allowpincodeonly"].is<bool>())
+		{
+			config.pinCodeOnly = hardware["allowpincodeonly"];
+		}
+		if (hardware["removeparitybits"].is<bool>())
+		{
+			config.removeParityBits = hardware["removeparitybits"];
+		}
+		if (hardware["useridstoragemode"].is<String>())
+		{
+			config.wiegandReadHex = hardware["useridstoragemode"] == "hexadecimal";
+		}
+		setupWiegandReader(wgd0pin, wgd1pin, config.removeParityBits); // also some other settings like weather to use keypad or not, LED pin, BUZZER pin, Wiegand 26/34 version
+	}
+	else if (config.readertype == READER_MFRC522 || config.readertype == READER_MFRC522_RDM6300)
+	{
+		if (hardware["sspin"].is<int>())
+		{
+			rfidss = hardware["sspin"];
+		}
+		int rfidgain = hardware["rfidgain"];
+		setupMFRC522Reader(rfidss, rfidgain);
+	}
+	else if (config.readertype == READER_PN532 || config.readertype == READER_PN532_RDM6300)
+	{
+		if (hardware["sspin"].is<int>())
+		{
+			rfidss = hardware["sspin"];
+		}
+		setupPN532Reader(rfidss);
+	}
+	// RDM6300 can be configured alongside the other readers
+	if (config.readertype > READER_PN532)
+	{
+		int rmd6300TxPin = hardware["rdm6300pin"];
+		setupRDM6300Reader(rmd6300TxPin);
+	}
 
 	if (hardware["requirepincodeafterrfid"].is<bool>())
 	{

src/config.h

@@ -55,7 +55,7 @@ struct Config
     bool pinCodeOnly = false;
     bool wiegandReadHex = true;
     bool present = false;
-    int readertype = 1;
+    int readertype = 2;
     int relayType[MAX_NUM_RELAYS];
     bool removeParityBits = true;
     IPAddress subnetIp;

src/main.cpp

@@ -43,6 +43,11 @@ Config config;
 #include "rfid125kHz.h"
 #include <SoftwareSerial.h>
 
+#define PN532_SCK  (14)
+#define PN532_MISO (15)
+#define PN532_MOSI (2)
+int rfidss = 5;
+
 Desfire desfire;
 MFRC522 mfrc522 = MFRC522();
 PN532 pn532;

src/rfid.esp

@@ -185,7 +185,6 @@ void pn532Read()
 	}
 }
 
-
 /*
  *  Try first to read from RDM6300 hardware. If that received
  *  nothing, check the other configured reader.
@@ -273,7 +272,6 @@ void rfidRead()
 	}
 }
 
-
 /*
  *  Try and read a PIN code from Wiegand hardware
  */
@@ -344,15 +342,13 @@ int weekdayFromMonday(int weekdayFromSunday) {
 	return ( weekdayFromSunday + 5 ) % 7;
 }
 
-
 /*
  *  If we have successfully read an RFID card, check if access
  *  should be granted
  */
 void rfidProcess()
 {
-	if (rfidState == waitingRfid ||
-			(config.pinCodeRequested && rfidState == cardSwiped))
+	if (rfidState == waitingRfid || (config.pinCodeRequested && rfidState == cardSwiped))
 	{
 		return;
 	}
@@ -657,7 +653,7 @@ void setupMFRC522Reader(int rfidss, int rfidgain)
 void setupPN532Reader(int rfidss)
 {
 	// init controller
-	pn532.InitSoftwareSPI(14, 12, 13, rfidss, 0);
+	pn532.InitSoftwareSPI(PN532_SCK, PN532_MISO, PN532_MOSI, rfidss, 0);
 	do
 	{ // pseudo loop (just used for aborting with break;)
 		// Reset the PN532

src/webh/esprfid.js.gz.h

@@ -36,11 +36,11 @@ var config = {
     "dnseth": ""
   },
   "hardware": {
-    "readertype": 1,
+    "readertype": 2,
     "wgd0pin": 4,
     "wgd1pin": 5,
     "rdm6300pin": 4,
-    "sspin": 0,
+    "sspin": 5,
     "rfidgain": 32,
     "wifipin": 255,
     "rtype": 1,
@@ -54,7 +54,7 @@ var config = {
     "doorbellpin": 255,
     "accessdeniedpin": 255,
     "useridstoragemode": "hexadecimal",
-    "requirepincodeafterrfid": 1,
+    "requirepincodeafterrfid": 0,
     "allowpincodeonly": 0,
     "removeparitybits": 1,
     "doorstatpin": 255,