dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
iceman
2016-10-05 17:57:29 +02:00
parent f8f62cebc6 635d6e9bef
commit fb6e631fbb
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
armsrc/legicrf.c
View File

@@ -394,11 +394,10 @@ int legic_read_byte( uint16_t index, uint8_t cmd_sz) {
uint8_t byte, crc, calcCrc = 0; uint8_t byte, crc, calcCrc = 0;
uint32_t cmd = (index << 1) | LEGIC_READ; uint32_t cmd = (index << 1) | LEGIC_READ;
//WaitTicks(330); // (4) // 90ticks = 60us (should be 100us but crc calc takes time.)
WaitTicks(240); // (3) //WaitTicks(330); // 330ticks prng(4) - works
//WaitTicks(230); //(2) WaitTicks(240); // 240ticks prng(3) - works
//WaitTicks(60); //(1)
frame_sendAsReader(cmd, cmd_sz); frame_sendAsReader(cmd, cmd_sz);
frame_receiveAsReader(&current_frame, 12); 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)); cmd_send(CMD_ACK, 1, 0, 0, buf, sizeof(legic_card_select_t));
OUT: OUT:
switch_off_tag_rwd(); switch_off_tag_rwd();
LEDsoff(); LEDsoff();

4
install.sh
View File

@@ -2,7 +2,7 @@ echo "Updating your system..."
# install dependencies for Proxmark3 source code. # 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 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 #cleaning up
sudo apt-get install -f -y sudo apt-get install -f -y
@@ -12,5 +12,5 @@ sudo apt-get clean -y
sudo apt-get update sudo apt-get update
# Where is my device? # Where is my device?
dmesg | tail -10 #dmesg | tail -10