github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-14 18:48:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into sha

Browse source
This commit is contained in:
Iceman 2022-02-25 11:42:20 +01:00 • committed by GitHub
commit 1c6abece54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 726 additions and 278 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/common.h
View file

@ -159,11 +159,11 @@ extern bool g_tearoff_enabled;
// Nibble logic
#ifndef NIBBLE_HIGH
# define NIBBLE_HIGH(b) ( (b & 0xF0) >> 4 )
# define NIBBLE_HIGH(b) ( ((b) & 0xF0) >> 4 )
#endif
#ifndef NIBBLE_LOW
# define NIBBLE_LOW(b) ( b & 0x0F )
# define NIBBLE_LOW(b) ((b) & 0x0F )
#endif
#ifndef CRUMB

1
include/pm3_cmd.h
View file

@ -519,6 +519,7 @@ typedef struct {
#define CMD_HF_ISO15693_FINDAFI 0x0315
#define CMD_HF_ISO15693_CSETUID 0x0316
#define CMD_HF_ISO15693_SLIX_L_DISABLE_PRIVACY 0x0317
#define CMD_HF_ISO15693_SLIX_L_DISABLE_AESAFI 0x0318
#define CMD_LF_SNIFF_RAW_ADC 0x0360