Merge branch 'master' into sha

This commit is contained in:
Iceman authored and GitHub committed 2022-02-25 11:42:20 +01:00
commit 1c6abece54
42 files changed
+726 -278

No files matched your search

+2 -2
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
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