X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/edf751bb62607c66684fd0750888d1fd6efd30e7..160dba86970b71e23770929cb2b15b2454a1496f:/client/cmdlf.c?ds=sidebyside

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 21203535..341f1fe4 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -36,6 +36,10 @@
 #include "cmdlfcotag.h"  // for COTAG menu
 #include "cmdlfvisa2000.h"  // for VISA2000 menu
 #include "cmdlfindala.h" // for indala menu
+#include "cmdlfgproxii.h"// for gproxii menu
+#include "cmdlffdx.h"    // for fdx-b menu
+#include "cmdlfparadox.h"// for paradox menu
+#include "cmdlfnexwatch.h"//for nexwatch menu
 
 bool g_lf_threshold_set = false;
 static int CmdHelp(const char *Cmd);
@@ -973,7 +977,7 @@ int CmdLFfind(const char *Cmd)
 		return CheckChipType(cmdp);
 	}
 
-	ans=CmdFDXBdemodBI("");
+	ans=CmdFdxDemod("");
 	if (ans>0) {
 		PrintAndLog("\nValid FDX-B ID Found!");
 		return CheckChipType(cmdp);
@@ -1040,20 +1044,24 @@ int CmdLFfind(const char *Cmd)
 static command_t CommandTable[] = 
 {
 	{"help",        CmdHelp,            1, "This help"},
-	{"awid",        CmdLFAWID,          1, "{ AWID RFIDs...    }"},
-	{"cotag",       CmdLFCOTAG,         1, "{ COTAG RFIDs...   }"},
-	{"em",          CmdLFEM4X,          1, "{ EM4X RFIDs...    }"},
-	{"hid",         CmdLFHID,           1, "{ HID RFIDs...     }"},
-	{"hitag",       CmdLFHitag,         1, "{ Hitag tags and transponders... }"},
-	{"io",          CmdLFIO,            1, "{ ioProx tags...   }"},
-	{"indala",      CmdLFINDALA,        1, "{ Indala tags...   }"},
-	{"presco",      CmdLFPresco,        1, "{ Presco RFIDs...  }"},
-	{"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 RFIDs... }"},
+	{"awid",        CmdLFAWID,          1, "{ AWID RFIDs...              }"},
+	{"cotag",       CmdLFCOTAG,         1, "{ COTAG CHIPs...             }"},
+	{"em",          CmdLFEM4X,          1, "{ EM4X CHIPs & RFIDs...      }"},
+	{"fdx",         CmdLFFdx,           1, "{ FDX-B RFIDs...             }"},
+	{"gproxii",     CmdLF_G_Prox_II,    1, "{ G Prox II RFIDs...         }"},
+	{"hid",         CmdLFHID,           1, "{ HID RFIDs...               }"},
+	{"hitag",       CmdLFHitag,         1, "{ Hitag CHIPs...             }"},
+	{"io",          CmdLFIO,            1, "{ ioProx RFIDs...            }"},
+	{"indala",      CmdLFINDALA,        1, "{ Indala RFIDs...            }"},
+	{"nexwatch",    CmdLFNexWatch,      1, "{ NexWatch RFIDs...          }"},
+	{"paradox",     CmdLFParadox,       1, "{ Paradox RFIDs...           }"},
+	{"presco",      CmdLFPresco,        1, "{ Presco RFIDs...            }"},
+	{"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 CHIPs...           }"},
 	{"pyramid",     CmdLFPyramid,       1, "{ Farpointe/Pyramid RFIDs... }"},
-	{"t55xx",       CmdLFT55XX,         1, "{ T55xx RFIDs...   }"},
-	{"ti",          CmdLFTI,            1, "{ TI RFIDs...      }"},
-	{"viking",      CmdLFViking,        1, "{ Viking tags...   }"},
-	{"visa2000",    CmdLFVisa2k,        1, "{ Visa2000 RFIDs...}"},
+	{"t55xx",       CmdLFT55XX,         1, "{ T55xx CHIPs...             }"},
+	{"ti",          CmdLFTI,            1, "{ TI CHIPs...                }"},
+	{"viking",      CmdLFViking,        1, "{ Viking RFIDs...            }"},
+	{"visa2000",    CmdLFVisa2k,        1, "{ Visa2000 RFIDs...          }"},
 	{"cmdread",     CmdLFCommandRead,   0, "<d period> <z period> <o period> <c command> ['H'] -- Modulate LF reader field to send command before read (all periods in microseconds) (option 'H' for 134)"},
 	{"config",      CmdLFSetConfig,     0, "Set config for LF sampling, bit/sample, decimation, frequency"},
 	{"flexdemod",   CmdFlexdemod,       1, "Demodulate samples for FlexPass"},