X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/b2f565142ce739ff94a6f4c55d63a81ffed56759..a9968da347298c146828b97954d135165799659f:/client/cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 341f1fe4..8d789a8e 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -40,6 +40,8 @@
 #include "cmdlffdx.h"    // for fdx-b menu
 #include "cmdlfparadox.h"// for paradox menu
 #include "cmdlfnexwatch.h"//for nexwatch menu
+#include "cmdlfjablotron.h" //for jablotron menu
+#include "cmdlfnoralsy.h"// for noralsy menu
 
 bool g_lf_threshold_set = false;
 static int CmdHelp(const char *Cmd);
@@ -987,13 +989,25 @@ int CmdLFfind(const char *Cmd)
 	if (ans>0) {
 		PrintAndLog("\nValid EM4x50 ID Found!");
 		return 1;
-	}	
+	}
+
+	ans=CmdJablotronDemod("");
+	if (ans>0) {
+		PrintAndLog("\nValid Jablotron ID Found!");
+		return CheckChipType(cmdp);
+	}
+
+	ans=CmdNoralsyDemod("");
+	if (ans>0) {
+		PrintAndLog("\nValid Noralsy ID Found!");
+		return CheckChipType(cmdp);
+	}
 
 	ans=CmdVikingDemod("");
 	if (ans>0) {
 		PrintAndLog("\nValid Viking ID Found!");
 		return CheckChipType(cmdp);
-	}	
+	}
 
 	ans=CmdIndalaDecode("");
 	if (ans>0) {
@@ -1053,7 +1067,9 @@ static command_t CommandTable[] =
 	{"hitag",       CmdLFHitag,         1, "{ Hitag CHIPs...             }"},
 	{"io",          CmdLFIO,            1, "{ ioProx RFIDs...            }"},
 	{"indala",      CmdLFINDALA,        1, "{ Indala RFIDs...            }"},
+	{"jablotron",   CmdLFJablotron,     1, "{ Jablotron RFIDs...         }"},
 	{"nexwatch",    CmdLFNexWatch,      1, "{ NexWatch RFIDs...          }"},
+	{"noralsy",     CmdLFNoralsy,       1, "{ Noralsy RFIDs...           }"},
 	{"paradox",     CmdLFParadox,       1, "{ Paradox RFIDs...           }"},
 	{"presco",      CmdLFPresco,        1, "{ Presco RFIDs...            }"},
 	{"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 CHIPs...           }"},