Revert "Merge branch 'master' into hf_mf_sim"

This reverts commit cbea5d9d02, reversing changes made to b66152feb2.
2019-03-15 21:45:00 +01:00
parent cbea5d9d02
commit cfe2b2797e
161 changed files with 1465 additions and 2004 deletions
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -72,8 +72,7 @@ typedef enum ISO14B_COMMAND {
    ISO14B_REQUEST_TRIGGER = (1 << 4),
    ISO14B_APPEND_CRC = (1 << 5),
    ISO14B_SELECT_STD = (1 << 6),
-    ISO14B_SELECT_SR = (1 << 7),
-    ISO14B_SET_TIMEOUT = (1 << 8),
+    ISO14B_SELECT_SR = (1 << 7)
 } iso14b_command_t;

 typedef enum ISO15_COMMAND {