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

Merge branch 'master' into experimental_varlen

Browse Source 
* master:
  remove redundant def
  chg:  forgot to readd hitag support :)
  Guard Hitag code
This commit is contained in:
Philippe Teuwen
2019-04-25 20:59:27 +02:00
parent eababdd3ef 27e94f5669
commit 0fc79824dd
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
armsrc/Makefile
View File

@@ -31,6 +31,7 @@ APP_CFLAGS = $(PLATFORM_DEFS) \
-DWITH_CRC \ -DWITH_CRC \
-DON_DEVICE \ -DON_DEVICE \
-DWITH_LF \ -DWITH_LF \
-DWITH_HITAG \
-DWITH_ISO15693 \ -DWITH_ISO15693 \
-DWITH_LEGICRF \ -DWITH_LEGICRF \
-DWITH_ISO14443b \ -DWITH_ISO14443b \
@@ -42,7 +43,6 @@ APP_CFLAGS = $(PLATFORM_DEFS) \
-fno-strict-aliasing -ffunction-sections -fdata-sections -fno-strict-aliasing -ffunction-sections -fdata-sections
### IMPORTANT - move the commented variable below this line ### IMPORTANT - move the commented variable below this line
# -DWITH_HITAG \
# -DWITH_FPC \ # -DWITH_FPC \
# -DWITH_LCD \ # -DWITH_LCD \
# -DWITH_EMV \ # -DWITH_EMV \

4
client/cmdlf.c
View File

@@ -858,7 +858,9 @@ int CmdLFfind(const char *Cmd) {
// The improved noise detection will find Cotag. // The improved noise detection will find Cotag.
if (getSignalProperties()->isnoise) { if (getSignalProperties()->isnoise) {
#ifdef WITH_HITAG
if (readHitagUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Hitag") " found!"); return 1;} if (readHitagUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Hitag") " found!"); return 1;}
#endif
if (readCOTAGUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("COTAG ID") " found!"); return 1;} if (readCOTAGUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("COTAG ID") " found!"); return 1;}
PrintAndLogEx(FAILED, "\n" _YELLOW_("No data found!") " - Signal looks like noise. Maybe not an LF tag?"); PrintAndLogEx(FAILED, "\n" _YELLOW_("No data found!") " - Signal looks like noise. Maybe not an LF tag?");
@@ -947,7 +949,9 @@ static command_t CommandTable[] = {
{"fdx", CmdLFFdx, 1, "{ FDX-B RFIDs... }"}, {"fdx", CmdLFFdx, 1, "{ FDX-B RFIDs... }"},
{"gproxii", CmdLFGuard, 1, "{ Guardall Prox II RFIDs... }"}, {"gproxii", CmdLFGuard, 1, "{ Guardall Prox II RFIDs... }"},
{"hid", CmdLFHID, 1, "{ HID RFIDs... }"}, {"hid", CmdLFHID, 1, "{ HID RFIDs... }"},
#ifdef WITH_HITAG
{"hitag", CmdLFHitag, 1, "{ Hitag CHIPs... }"}, {"hitag", CmdLFHitag, 1, "{ Hitag CHIPs... }"},
#endif
{"indala", CmdLFINDALA, 1, "{ Indala RFIDs... }"}, {"indala", CmdLFINDALA, 1, "{ Indala RFIDs... }"},
{"io", CmdLFIO, 1, "{ ioProx RFIDs... }"}, {"io", CmdLFIO, 1, "{ ioProx RFIDs... }"},
{"jablotron", CmdLFJablotron, 1, "{ Jablotron RFIDs... }"}, {"jablotron", CmdLFJablotron, 1, "{ Jablotron RFIDs... }"},