Merge branch 'master' of https://github.com/iceman1001/proxmark3

diff --git a/armsrc/legicrf.c b/armsrc/legicrf.c
index 1b068404296892aee0eb1fd74cef54cb4af326d3..86e42c1723ed98797e975a8e8aafae46710528f8 100644 (file)
--- a/armsrc/legicrf.c
+++ b/armsrc/legicrf.c
@@ -394,11 +394,10 @@ int legic_read_byte( uint16_t index, uint8_t cmd_sz) {
 
        uint8_t byte, crc, calcCrc = 0;
        uint32_t cmd = (index << 1) | LEGIC_READ;
-
-       //WaitTicks(330); // (4)
-       WaitTicks(240); // (3)
-       //WaitTicks(230); //(2)
-       //WaitTicks(60); //(1)
+       
+       // 90ticks = 60us (should be 100us but crc calc takes time.)
+       //WaitTicks(330); // 330ticks prng(4) - works
+       WaitTicks(240); // 240ticks prng(3) - works
        
        frame_sendAsReader(cmd, cmd_sz);
        frame_receiveAsReader(&current_frame, 12);
@@ -763,7 +762,7 @@ void LegicRfInfo(void){
        }
 
        cmd_send(CMD_ACK, 1, 0, 0, buf, sizeof(legic_card_select_t));
-       
+
 OUT:
        switch_off_tag_rwd();
        LEDsoff();

diff --git a/install.sh b/install.sh
index 666555f5351d55616395ca43b252480900ea1c0f..798efac89ff4562b80ba428a077c35689ce04f58 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -2,7 +2,7 @@ echo "Updating your system..."
 
 # install dependencies for Proxmark3 source code.
 sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev gcc-arm-none-eabi 
-sudo apt-get install libusb-0.1-4 libusb-dev libqt4-dev ncurses-dev perl pkg-config wget
+sudo apt-get install libusb-0.1-4 libusb-dev libqt4-dev libncurses5-dev perl pkg-config wget
 
 #cleaning up
 sudo apt-get install -f -y
@@ -12,5 +12,5 @@ sudo apt-get clean -y
 sudo apt-get update
 
 # Where is my device?
-dmesg | tail -10
+#dmesg | tail -10