diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 78e34a3..48b240a 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,6 +1,6 @@ # Release Notes -## 0.1.9 - 2018-10-08 +## 0.1.10 - 2018-10-08 * Stream from Azure Blob Storage diff --git a/src/Client/ReleaseNotes.fs b/src/Client/ReleaseNotes.fs index f88c668..79e2652 100644 --- a/src/Client/ReleaseNotes.fs +++ b/src/Client/ReleaseNotes.fs @@ -1,13 +1,13 @@ module internal ReleaseNotes -let Version = "0.1.9" +let Version = "0.1.10" let IsPrerelease = false let Notes = """ # Release Notes -## 0.1.9 - 2018-10-08 +## 0.1.10 - 2018-10-08 * Stream from Azure Blob Storage diff --git a/src/PiServer/PiServer.fs b/src/PiServer/PiServer.fs index 1ca882d..d92660d 100644 --- a/src/PiServer/PiServer.fs +++ b/src/PiServer/PiServer.fs @@ -181,7 +181,7 @@ startupTask.Wait() if isWindows then () else - let r = nodeServices.InvokeExportAsync("./read-tag", "play", "ard") + let r = nodeServices.InvokeExportAsync("./read-tag", "read", "tag") r.Wait() let token = r.Result let r = executeTag nodeServices token diff --git a/src/PiServer/read-tag.js b/src/PiServer/read-tag.js index efc4c98..b9df404 100644 --- a/src/PiServer/read-tag.js +++ b/src/PiServer/read-tag.js @@ -8,24 +8,19 @@ console.log("scanning..."); console.log("Please put chip or keycard in the antenna inductive zone!"); console.log("Press Ctrl-C to stop."); -var lastTag = ""; exports.read = function (callback, fileName) { - setInterval(function(){ - //# reset card + var lastTag = ""; + var readInterval = setInterval(function(){ mfrc522.reset(); - //# Scan for cards let response = mfrc522.findCard(); if (!response.status) { - if(lastTag != "") { - lastTag = ""; - console.log("Card removed"); - } return; } - console.log("Card detected, CardType: " + response.bitSize); - + + clearInterval(readInterval); + //# Get the UID of the card response = mfrc522.getUid(); if (!response.status) { @@ -40,8 +35,18 @@ exports.read = function (callback, fileName) { console.log("Card read UID: %s", data); callback(null, data); } + }, 500); +} + +exports.removed = function (callback, lastTag) { + var readInterval = setInterval(function(){ + mfrc522.reset(); - //# Stop - mfrc522.stopCrypto(); + let response = mfrc522.findCard(); + if (!response.status) { + clearInterval(readInterval); + callback(null, ""); + return; + } }, 500); } \ No newline at end of file