Merge pull request #655 from esprfid/rdm6300-mj

Using a SoftwareSerial to communicate with RDM6300 - take 2
esprfid · Sep 21, 2024 · 5a22a8f · 5a22a8f
2 parents 703e799 + 85e74bb
commit 5a22a8f
Show file tree

Hide file tree

Showing 10 changed files with 88 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -112,9 +112,8 @@ The following table shows the typical pin layout used for connecting readers har
 | GPIO-13 | D7            | D0      | MOSI          | MOSI    |         |
 | GPIO-12 | D6            | D1      | MISO          | MISO    |         |
 | GPIO-14 | D5            |         | SCK           | SCK     |         |
-| GPIO-04 | D2            |         |               |         |         |
+| GPIO-04 | D2            |         |               |         | TX      |
 | GPIO-05 | D1            |         | SS            |         |         |
-| GPIO-03 | RX            |         |               |         | TX      |
 
 For Wiegand based readers, you can configure D0 and D1 pins via settings page. By default, D0 is GPIO-4 and D1 is GPIO-5
 

diff --git a/platformio.ini b/platformio.ini
@@ -7,7 +7,6 @@ f_cpu = 160000000L
 framework = arduino
 board = esp12e
 build_flags = 	-Wl,-Teagle.flash.4m2m.ld
-src_build_flags = !echo "-DBUILD_TAG="$TRAVIS_TAG
 upload_speed = 460800
 monitor_speed = 115200
 lib_deps =
@@ -31,7 +30,6 @@ board = ${common.board}
 lib_deps = ${common.lib_deps}
 extra_scripts = scripts/GENdeploy.py
 build_flags = ${common.build_flags}
-src_build_flags = ${common.src_build_flags}
 ;https://github.com/platformio/platform-espressif8266/issues/153
 upload_speed = ${common.upload_speed}
 monitor_speed = ${common.monitor_speed}
@@ -46,7 +44,6 @@ board = ${common.board}
 lib_deps = ${common.lib_deps}
 build_flags = ${common.build_flags}
 		-DDEBUG
-src_build_flags = ${common.src_build_flags}
 extra_scripts = scripts/DBGdeploy.py
 upload_speed = ${common.upload_speed}
 monitor_speed = ${common.monitor_speed}
diff --git a/src/config.esp b/src/config.esp
@@ -153,6 +153,13 @@ bool ICACHE_FLASH_ATTR loadConfiguration(Config &config)
 		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 (network.containsKey("fallbackmode"))
 	{
 		config.fallbackMode = network["fallbackmode"] == 1;

diff --git a/src/magicnumbers.h b/src/magicnumbers.h
@@ -26,6 +26,9 @@
 #define WIEGANDTYPE_PICC24 24
 #define WIEGANDTYPE_PICC34 34
 
+#define RDM6300_BAUDRATE 9600
+#define RDM6300_READ_TIMEOUT 20
+
 // hardware defines
 
 #define MAX_NUM_RELAYS 4

diff --git a/src/main.cpp b/src/main.cpp
@@ -46,11 +46,13 @@ Config config;
 #include "PN532.h"
 #include <Wiegand.h>
 #include "rfid125kHz.h"
+#include <SoftwareSerial.h>
 
 MFRC522 mfrc522 = MFRC522();
 PN532 pn532;
 WIEGAND wg;
 RFID_Reader RFIDr;
+SoftwareSerial *rdm6300SwSerial = NULL;
 
 // relay specific variables
 bool activateRelay[MAX_NUM_RELAYS] = {false, false, false, false};

diff --git a/src/rfid.esp b/src/rfid.esp
@@ -170,12 +170,10 @@ void pn532Read()
  */
 void genericRead()
 {
-	/*
-	 *  Test RDM6300 125khz reader
-	 */
-	while (Serial.available() > 0)
+	while (rdm6300SwSerial->available() > 0)
 	{
-		RFIDr.rfidSerial(Serial.read());
+		char read = rdm6300SwSerial->read();
+		RFIDr.rfidSerial(read);
 	}
 	if (RFIDr.Available())
 	{
@@ -684,3 +682,10 @@ void ICACHE_FLASH_ATTR setupPN532Reader(int rfidss)
 		}
 	} while (false);
 }
+
+void ICACHE_FLASH_ATTR setupRDM6300Reader(int rmd6300TxPin)
+{
+	rdm6300SwSerial = new SoftwareSerial(rmd6300TxPin, -1);
+	rdm6300SwSerial->begin(RDM6300_BAUDRATE);
+	rdm6300SwSerial->setTimeout(RDM6300_READ_TIMEOUT);
+}
diff --git a/src/webh/esprfid.htm.gz.h b/src/webh/esprfid.htm.gz.h
diff --git a/src/webh/esprfid.js.gz.h b/src/webh/esprfid.js.gz.h
diff --git a/src/websrc/esprfid.htm b/src/websrc/esprfid.htm
@@ -219,6 +219,25 @@ <h6 class="text-muted">Please refer the <a href="https://github.com/esprfid/esp-
             </span>
         </div>
     </div>
+    <div class="" id="rdm6300" style="display:none">
+        <div class="row form-group">
+            <label class="col-xs-3">RDM6300 TX pin<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign" aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right" data-content="Choose which ESP pin is connected to RDM6300 TX pin"></i></label>
+            <span class="col-xs-9 col-md-5">
+                  <select class="form-control input-sm" id="rdm6300pin">
+                    <option value="0">GPIO-0</option>
+                    <option value="1">GPIO-1</option>
+                    <option value="2">GPIO-2</option>
+                    <option selected="selected" value="4">GPIO-4</option>
+                    <option value="5">GPIO-5</option>
+                    <option value="12">GPIO-12</option>
+                    <option value="13">GPIO-13</option>
+                    <option value="14">GPIO-14</option>
+                    <option value="15">GPIO-15</option>
+                    <option value="16">GPIO-16</option>
+                  </select>
+                </span>
+        </div>
+    </div>
     <div class="" id="mfrc522Form" style="display:none">
         <div class="row form-group">
             <label class="col-xs-3">SPI SS<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign" aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right" data-content="Choose which ESP port is connected to RFID Hardware SDA pin"></i></label>

diff --git a/src/websrc/js/esprfid.js b/src/websrc/js/esprfid.js
@@ -34,6 +34,7 @@ var config = {
         "readertype": 1,
         "wgd0pin": 4,
         "wgd1pin": 5,
+        "rdm6300pin": 4,
         "sspin": 0,
         "rfidgain": 32,
         "wifipin": 255,
@@ -149,21 +150,40 @@ function syncBrowserTime() {
 
 function handleReader() {
   var rType = parseInt(document.getElementById("readertype").value);
-  if (rType === 0 || rType === 4) {
+  if (rType === 0) {
     document.getElementById("wiegandForm").style.display = "none";
     document.getElementById("mfrc522Form").style.display = "block";
     document.getElementById("rc522gain").style.display = "block";
-  } else if (rType === 1 || rType === 5) {
+    document.getElementById("rdm6300").style.display = "none";
+  } else if (rType === 1) {
     document.getElementById("wiegandForm").style.display = "block";
     document.getElementById("mfrc522Form").style.display = "none";
-  } else if (rType === 2 || rType === 6) {
+    document.getElementById("rdm6300").style.display = "none";
+  } else if (rType === 2) {
     document.getElementById("wiegandForm").style.display = "none";
     document.getElementById("mfrc522Form").style.display = "block";
     document.getElementById("rc522gain").style.display = "none";
+    document.getElementById("rdm6300").style.display = "none";
   } else if (rType === 3) {
     document.getElementById("wiegandForm").style.display = "none";
     document.getElementById("mfrc522Form").style.display = "none";
     document.getElementById("rc522gain").style.display = "none";
+    document.getElementById("rdm6300").style.display = "block";
+  } else if (rType === 4) {
+    document.getElementById("wiegandForm").style.display = "none";
+    document.getElementById("mfrc522Form").style.display = "block";
+    document.getElementById("rc522gain").style.display = "none";
+    document.getElementById("rdm6300").style.display = "block";
+  } else if (rType === 5) {
+    document.getElementById("wiegandForm").style.display = "block";
+    document.getElementById("mfrc522Form").style.display = "none";
+    document.getElementById("rc522gain").style.display = "none";
+    document.getElementById("rdm6300").style.display = "block";
+  } else if (rType === 6) {
+    document.getElementById("wiegandForm").style.display = "none";
+    document.getElementById("mfrc522Form").style.display = "block";
+    document.getElementById("rc522gain").style.display = "none";
+    document.getElementById("rdm6300").style.display = "block";
   }
 }
 
@@ -197,6 +217,7 @@ function listhardware() {
   document.getElementById("readertype").value = config.hardware.readertype;
   document.getElementById("wg0pin").value = config.hardware.wgd0pin;
   document.getElementById("wg1pin").value = config.hardware.wgd1pin;
+  document.getElementById("rdm6300pin").value = config.hardware.rdm6300pin;
   document.getElementById("gpioss").value = config.hardware.sspin;
   document.getElementById("gain").value = config.hardware.rfidgain;
   document.getElementById("gpiorly").value = config.hardware.rpin;
@@ -249,6 +270,7 @@ function savehardware() {
   config.hardware.readertype = parseInt(document.getElementById("readertype").value);
   config.hardware.wgd0pin = parseInt(document.getElementById("wg0pin").value);
   config.hardware.wgd1pin = parseInt(document.getElementById("wg1pin").value);
+  config.hardware.rdm6300pin = parseInt(document.getElementById("rdm6300pin").value);
   config.hardware.useridstoragemode = document.getElementById("useridstoragemode").value;
   config.hardware.requirepincodeafterrfid = document.getElementById("requirepincodeafterrfid").checked;
   config.hardware.allowpincodeonly = document.getElementById("allowpincodeonly").checked;