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/proxmark3.sh
+++ b/proxmark3.sh
@@ -2,7 +2,7 @@

 function wait4proxmark_Linux {
    echo >&2 "Waiting for Proxmark to appear..."
-    while [ ! -c /dev/ttyACM? -a ! -c /dev/pm3-? ]; do
+    while [ ! -c /dev/ttyACM? -a ! -L /dev/pm3-? ]; do
        sleep .1
    done
    local PM3=`ls -1 /dev/pm3-? /dev/ttyACM? 2>/dev/null | head -1`