github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-16 02:03:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into topaz. Update Changelog.

Browse source
This commit is contained in:
pwpiwi 2015-10-27 20:44:48 +01:00
commit d9cc4e1ae2
10 changed files with 490 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/usb_cmd.h
View file

@ -87,6 +87,7 @@ typedef struct{
#define CMD_T55XX_WRITE_BLOCK 0x0215
#define CMD_T55XX_READ_TRACE 0x0216
#define CMD_PCF7931_READ 0x0217
#define CMD_PCF7931_WRITE 0x0222
#define CMD_EM4X_READ_WORD 0x0218
#define CMD_EM4X_WRITE_WORD 0x0219
#define CMD_IO_DEMOD_FSK 0x021A
@ -99,6 +100,7 @@ typedef struct{
#define CMD_PSK_SIM_TAG 0x0220
#define CMD_AWID_DEMOD_FSK 0x0221
/* CMD_SET_ADC_MUX: ext1 is 0 for lopkd, 1 for loraw, 2 for hipkd, 3 for hiraw */
// For the 13.56 MHz tags