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

Merge branch 'master' into fpga

Browse Source 
* master: (27 commits)
  fix a bug in demodParadox()
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  fix #833  - missing some configblocks and spelling
  remove verichip.
  chg 'lf t55xx info' - detection of t55x7 configuration blocks
  remove
  disable verichip stuff.  should be inside FDX already
  textual
  lf t55 configblock detection updated
  textual
  fix: missing define on some mingw
  chg: hf mf decrypt - helptext (thanks @AdamLaurie)
  Update bt_manual_v10.md
  textual
  ...
This commit is contained in:
Philippe Teuwen
2020-07-11 15:25:20 +02:00
parent a25a5322dd 7106b48065
commit eb61524923
28 changed files with 591 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
armsrc/appmain.c
View File

@@ -1023,7 +1023,10 @@ static void PacketReceived(PacketCommandNG *packet) {
em4x50_read((em4x50_data_t *)packet->data.asBytes);
break;
}
case CMD_LF_EM4X50_WIPE: {
em4x50_wipe((em4x50_data_t *)packet->data.asBytes);
break;
}
#endif
#ifdef WITH_ISO15693