#include "cmdlft55xx.h"
#include "cmdlfpcf7931.h"
#include "cmdlfio.h"
+#include "lfdemod.h"
static int CmdHelp(const char *Cmd);
return 0;
}
-int CmdLFReadUsage()
+int usage_lf_read()
{
- PrintAndLog("Usage: lf read [H|<divisor>] [b <bps>] [d <decim>] [a 0|1]");
+ PrintAndLog("Usage: lf read");
PrintAndLog("Options: ");
PrintAndLog(" h This help");
- PrintAndLog(" H High frequency (134 KHz). Defaults to 125 KHz");
- PrintAndLog(" <divisor> Manually set divisor. 88-> 134KHz, 95-> 125 Hz");
- PrintAndLog(" b <bps> Sets resolution of bits per sample. Default (max): 8");
- PrintAndLog(" d <decim> Sets decimation. A value of N saves only 1 in N samples. Default: 1");
- PrintAndLog(" a [0|1] Averaging - if set, will average the stored sample value when decimating. Default: 1");
+ PrintAndLog("This function takes no arguments. ");
+ PrintAndLog("Use 'lf config' to set parameters.");
+ return 0;
+}
+int usage_lf_snoop()
+{
+ PrintAndLog("Usage: lf snoop");
+ PrintAndLog("Options: ");
+ PrintAndLog(" h This help");
+ PrintAndLog("This function takes no arguments. ");
+ PrintAndLog("Use 'lf config' to set parameters.");
+ return 0;
+}
+
+int usage_lf_config()
+{
+ PrintAndLog("Usage: lf config [H|<divisor>] [b <bps>] [d <decim>] [a 0|1]");
+ PrintAndLog("Options: ");
+ PrintAndLog(" h This help");
+ PrintAndLog(" L Low frequency (125 KHz)");
+ PrintAndLog(" H High frequency (134 KHz)");
+ PrintAndLog(" q <divisor> Manually set divisor. 88-> 134KHz, 95-> 125 Hz");
+ PrintAndLog(" b <bps> Sets resolution of bits per sample. Default (max): 8");
+ PrintAndLog(" d <decim> Sets decimation. A value of N saves only 1 in N samples. Default: 1");
+ PrintAndLog(" a [0|1] Averaging - if set, will average the stored sample value when decimating. Default: 1");
+ PrintAndLog(" t <threshold> Sets trigger threshold. 0 means no threshold");
PrintAndLog("Examples:");
- PrintAndLog(" lf read");
+ PrintAndLog(" lf config b 8 L");
PrintAndLog(" Samples at 125KHz, 8bps.");
- PrintAndLog(" lf read h b 4 d 3");
+ PrintAndLog(" lf config H b 4 d 3");
PrintAndLog(" Samples at 134KHz, averages three samples into one, stored with ");
PrintAndLog(" a resolution of 4 bits per sample.");
+ PrintAndLog(" lf read");
+ PrintAndLog(" Performs a read (active field)");
+ PrintAndLog(" lf snoop");
+ PrintAndLog(" Performs a snoop (no active field)");
return 0;
}
-int CmdLFRead(const char *Cmd)
+
+int CmdLFSetConfig(const char *Cmd)
{
- uint8_t divisor = 95;//Frequency divisor
- uint8_t bps = 8; // Bits per sample
- uint8_t decimation = 1; //How many to keep
- bool averaging = 1; // Should we use averaging when discarding samples?
+
+ uint8_t divisor = 0;//Frequency divisor
+ uint8_t bps = 0; // Bits per sample
+ uint8_t decimation = 0; //How many to keep
+ bool averaging = 1; // Defaults to true
bool errors = FALSE;
+ int trigger_threshold =-1;//Means no change
+ uint8_t unsigned_trigg = 0;
uint8_t cmdp =0;
- if(param_getchar(Cmd, cmdp) == 'h')
- {
- return CmdLFReadUsage();
- }
-
- // Divisor
- if(param_getchar(Cmd, cmdp) == 'H') {
- divisor = 88;
- cmdp++;
- }else if(param_isdec(Cmd,cmdp) )
- {
- errors |= param_getdec(Cmd,cmdp, &divisor);
- }
- //BPS
- if(param_getchar(Cmd, cmdp) == 'b') {
- errors |= param_getdec(Cmd,cmdp+1,&bps);
- cmdp+=2;
- }
- //Decimation
- if(param_getchar(Cmd, cmdp) == 'd')
+ while(param_getchar(Cmd, cmdp) != 0x00)
{
- errors |= param_getdec(Cmd,cmdp+1,&decimation);
- cmdp+=2;
+ switch(param_getchar(Cmd, cmdp))
+ {
+ case 'h':
+ return usage_lf_config();
+ case 'H':
+ divisor = 88;
+ cmdp++;
+ break;
+ case 'L':
+ divisor = 95;
+ cmdp++;
+ break;
+ case 'q':
+ errors |= param_getdec(Cmd,cmdp+1,&divisor);
+ cmdp+=2;
+ break;
+ case 't':
+ errors |= param_getdec(Cmd,cmdp+1,&unsigned_trigg);
+ cmdp+=2;
+ if(!errors) trigger_threshold = unsigned_trigg;
+ break;
+ case 'b':
+ errors |= param_getdec(Cmd,cmdp+1,&bps);
+ cmdp+=2;
+ break;
+ case 'd':
+ errors |= param_getdec(Cmd,cmdp+1,&decimation);
+ cmdp+=2;
+ break;
+ case 'a':
+ averaging = param_getchar(Cmd,cmdp+1) == '1';
+ cmdp+=2;
+ break;
+ default:
+ PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+ errors = 1;
+ break;
+ }
+ if(errors) break;
}
- //Averaging
- if(param_getchar(Cmd, cmdp) == 'a')
+ if(cmdp == 0)
{
- averaging = param_getchar(Cmd,cmdp+1) == '1';
- cmdp+=2;
+ errors = 1;// No args
}
+
//Validations
if(errors)
{
- return CmdLFReadUsage();
+ return usage_lf_config();
}
-
//Bps is limited to 8, so fits in lower half of arg1
- if(bps > 8) bps = 8;
+ if(bps >> 8) bps = 8;
- //Feedback
- PrintAndLog("Sampling config: ");
- PrintAndLog(" divisor: %d ", divisor);
- PrintAndLog(" bps: %d ", bps);
- PrintAndLog(" decimation: %d ", decimation);
- PrintAndLog(" averaging: %d ", averaging);
- PrintAndLog("OBS, this is sticky on the device and affects all LF listening operations");
- PrintAndLog("To reset, issue 'lf read'");
+ sample_config config = {
+ decimation,bps,averaging,divisor,trigger_threshold
+ };
+ //Averaging is a flag on high-bit of arg[1]
+ UsbCommand c = {CMD_SET_LF_SAMPLING_CONFIG};
+ memcpy(c.d.asBytes,&config,sizeof(sample_config));
+ SendCommand(&c);
+ return 0;
+}
+int CmdLFRead(const char *Cmd)
+{
+
+ uint8_t cmdp =0;
+ if(param_getchar(Cmd, cmdp) == 'h')
+ {
+ return usage_lf_read();
+ }
//And ship it to device
- //Averaging is a flag on high-bit of arg[1]
UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K};
- c.arg[0] = divisor;
- c.arg[1] = bps | (averaging << 7) ;
- c.arg[2] = decimation;
+ SendCommand(&c);
+ WaitForResponse(CMD_ACK,NULL);
+ return 0;
+}
+int CmdLFSnoop(const char *Cmd)
+{
+ uint8_t cmdp =0;
+ if(param_getchar(Cmd, cmdp) == 'h')
+ {
+ return usage_lf_snoop();
+ }
+
+ UsbCommand c = {CMD_LF_SNOOP_RAW_ADC_SAMPLES};
SendCommand(&c);
WaitForResponse(CMD_ACK,NULL);
return 0;
static void ChkBitstream(const char *str)
{
int i;
-
+
/* convert to bitstream if necessary */
for (i = 0; i < (int)(GraphTraceLen / 2); i++){
if (GraphBuffer[i] > 1 || GraphBuffer[i] < 0) {
- CmdBitstream(str);
+ CmdGetBitStream("");
break;
}
}
}
-
+//appears to attempt to simulate manchester
int CmdLFSim(const char *Cmd)
{
- int i,j;
+ int i,j;
static int gap;
sscanf(Cmd, "%i", &gap);
/* convert to bitstream if necessary */
+
ChkBitstream(Cmd);
- printf("Sending [%d bytes]", GraphTraceLen);
- for (i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {
+ //can send 512 bits at a time (1 byte sent per bit...)
+ printf("Sending [%d bytes]", GraphTraceLen);
+ for (i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {
UsbCommand c={CMD_DOWNLOADED_SIM_SAMPLES_125K, {i, 0, 0}};
- for (j = 0; j < USB_CMD_DATA_SIZE; j++) {
+ for (j = 0; j < USB_CMD_DATA_SIZE; j++) {
c.d.asBytes[j] = GraphBuffer[i+j];
}
SendCommand(&c);
WaitForResponse(CMD_ACK,NULL);
- printf(".");
+ printf(".");
}
- printf("\n");
- PrintAndLog("Starting to simulate");
+ printf("\n");
+ PrintAndLog("Starting to simulate");
UsbCommand c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}};
SendCommand(&c);
return 0;
}
+int usage_lf_simfsk(void)
+{
+ //print help
+ PrintAndLog("Usage: lf simfsk [c <clock>] [i] [H <fcHigh>] [L <fcLow>] [d <hexdata>]");
+ PrintAndLog("Options: ");
+ PrintAndLog(" h This help");
+ PrintAndLog(" c <clock> Manually set clock - can autodetect if using DemodBuffer");
+ PrintAndLog(" i invert data");
+ PrintAndLog(" H <fcHigh> Manually set the larger Field Clock");
+ PrintAndLog(" L <fcLow> Manually set the smaller Field Clock");
+ //PrintAndLog(" s TBD- -to enable a gap between playback repetitions - default: no gap");
+ PrintAndLog(" d <hexdata> Data to sim as hex - omit to sim from DemodBuffer");
+ PrintAndLog("\n NOTE: if you set one clock manually set them all manually");
+ return 0;
+}
+
+int usage_lf_simask(void)
+{
+ //print help
+ PrintAndLog("Usage: lf simask [c <clock>] [i] [m|r] [s] [d <raw hex to sim>]");
+ PrintAndLog("Options: ");
+ PrintAndLog(" h This help");
+ PrintAndLog(" c <clock> Manually set clock - can autodetect if using DemodBuffer");
+ PrintAndLog(" i invert data");
+ PrintAndLog(" m sim ask/manchester");
+ PrintAndLog(" r sim ask/raw");
+ PrintAndLog(" s TBD- -to enable a gap between playback repetitions - default: no gap");
+ PrintAndLog(" d <hexdata> Data to sim as hex - omit to sim from DemodBuffer");
+ return 0;
+}
+
+int usage_lf_simpsk(void)
+{
+ //print help
+ PrintAndLog("Usage: lf simpsk [1|2|3] [c <clock>] [i] [r <carrier>] [d <raw hex to sim>]");
+ PrintAndLog("Options: ");
+ PrintAndLog(" h This help");
+ PrintAndLog(" c <clock> Manually set clock - can autodetect if using DemodBuffer");
+ PrintAndLog(" i invert data");
+ PrintAndLog(" 1 set PSK1 (default)");
+ PrintAndLog(" 2 set PSK2");
+ PrintAndLog(" 3 set PSK3");
+ PrintAndLog(" r <carrier> 2|4|8 are valid carriers: default = 2");
+ PrintAndLog(" d <hexdata> Data to sim as hex - omit to sim from DemodBuffer");
+ return 0;
+}
+
+// by marshmellow - sim ask data given clock, fcHigh, fcLow, invert
+// - allow pull data from DemodBuffer
+int CmdLFfskSim(const char *Cmd)
+{
+ //might be able to autodetect FC and clock from Graphbuffer if using demod buffer
+ //will need FChigh, FClow, Clock, and bitstream
+ uint8_t fcHigh=0, fcLow=0, clk=0;
+ uint8_t invert=0;
+ bool errors = FALSE;
+ char hexData[32] = {0x00}; // store entered hex data
+ uint8_t data[255] = {0x00};
+ int dataLen = 0;
+ uint8_t cmdp = 0;
+ while(param_getchar(Cmd, cmdp) != 0x00)
+ {
+ switch(param_getchar(Cmd, cmdp))
+ {
+ case 'h':
+ return usage_lf_simfsk();
+ case 'i':
+ invert = 1;
+ cmdp++;
+ break;
+ case 'c':
+ errors |= param_getdec(Cmd,cmdp+1,&clk);
+ cmdp+=2;
+ break;
+ case 'H':
+ errors |= param_getdec(Cmd,cmdp+1,&fcHigh);
+ cmdp+=2;
+ break;
+ case 'L':
+ errors |= param_getdec(Cmd,cmdp+1,&fcLow);
+ cmdp+=2;
+ break;
+ //case 's':
+ // separator=1;
+ // cmdp++;
+ // break;
+ case 'd':
+ dataLen = param_getstr(Cmd, cmdp+1, hexData);
+ if (dataLen==0) {
+ errors=TRUE;
+ } else {
+ dataLen = hextobinarray((char *)data, hexData);
+ }
+ if (dataLen==0) errors=TRUE;
+ if (errors) PrintAndLog ("Error getting hex data");
+ cmdp+=2;
+ break;
+ default:
+ PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+ errors = TRUE;
+ break;
+ }
+ if(errors) break;
+ }
+ if(cmdp == 0 && DemodBufferLen == 0)
+ {
+ errors = TRUE;// No args
+ }
+
+ //Validations
+ if(errors)
+ {
+ return usage_lf_simfsk();
+ }
+
+ if (dataLen == 0){ //using DemodBuffer
+ if (clk==0 || fcHigh==0 || fcLow==0){ //manual settings must set them all
+ uint8_t ans = fskClocks(&fcHigh, &fcLow, &clk, 0);
+ if (ans==0){
+ if (!fcHigh) fcHigh=10;
+ if (!fcLow) fcLow=8;
+ if (!clk) clk=50;
+ }
+ }
+ } else {
+ setDemodBuf(data, dataLen, 0);
+ }
+ if (clk == 0) clk = 50;
+ if (fcHigh == 0) fcHigh = 10;
+ if (fcLow == 0) fcLow = 8;
+
+ uint16_t arg1, arg2;
+ arg1 = fcHigh << 8 | fcLow;
+ arg2 = invert << 8 | clk;
+ size_t size = DemodBufferLen;
+ if (size > USB_CMD_DATA_SIZE) {
+ PrintAndLog("DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
+ size = USB_CMD_DATA_SIZE;
+ }
+ UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
+
+ memcpy(c.d.asBytes, DemodBuffer, size);
+ SendCommand(&c);
+ return 0;
+}
+
+// by marshmellow - sim ask data given clock, invert, manchester or raw, separator
+// - allow pull data from DemodBuffer
+int CmdLFaskSim(const char *Cmd)
+{
+ //autodetect clock from Graphbuffer if using demod buffer
+ //will need clock, invert, manchester/raw as m or r, separator as s, and bitstream
+ uint8_t manchester = 1, separator = 0;
+ //char cmdp = Cmd[0], par3='m', par4=0;
+ uint8_t clk=0, invert=0;
+ bool errors = FALSE;
+ char hexData[32] = {0x00};
+ uint8_t data[255]= {0x00}; // store entered hex data
+ int dataLen = 0;
+ uint8_t cmdp = 0;
+ while(param_getchar(Cmd, cmdp) != 0x00)
+ {
+ switch(param_getchar(Cmd, cmdp))
+ {
+ case 'h':
+ return usage_lf_simask();
+ case 'i':
+ invert = 1;
+ cmdp++;
+ break;
+ case 'c':
+ errors |= param_getdec(Cmd,cmdp+1,&clk);
+ cmdp+=2;
+ break;
+ case 'm':
+ manchester=1;
+ cmdp++;
+ break;
+ case 'r':
+ manchester=0;
+ cmdp++;
+ break;
+ case 's':
+ separator=1;
+ cmdp++;
+ break;
+ case 'd':
+ dataLen = param_getstr(Cmd, cmdp+1, hexData);
+ if (dataLen==0) {
+ errors=TRUE;
+ } else {
+ dataLen = hextobinarray((char *)data, hexData);
+ }
+ if (dataLen==0) errors=TRUE;
+ if (errors) PrintAndLog ("Error getting hex data, datalen: %d",dataLen);
+ cmdp+=2;
+ break;
+ default:
+ PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+ errors = TRUE;
+ break;
+ }
+ if(errors) break;
+ }
+ if(cmdp == 0 && DemodBufferLen == 0)
+ {
+ errors = TRUE;// No args
+ }
+
+ //Validations
+ if(errors)
+ {
+ return usage_lf_simask();
+ }
+ if (dataLen == 0){ //using DemodBuffer
+ if (clk == 0) clk = GetAskClock("0", false, false);
+ } else {
+ setDemodBuf(data, dataLen, 0);
+ }
+ if (clk == 0) clk = 64;
+ if (manchester == 0) clk = clk/2; //askraw needs to double the clock speed
+ uint16_t arg1, arg2;
+ size_t size=DemodBufferLen;
+ arg1 = clk << 8 | manchester;
+ arg2 = invert << 8 | separator;
+ if (size > USB_CMD_DATA_SIZE) {
+ PrintAndLog("DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
+ size = USB_CMD_DATA_SIZE;
+ }
+ UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
+ PrintAndLog("preparing to sim ask data: %d bits", size);
+ memcpy(c.d.asBytes, DemodBuffer, size);
+ SendCommand(&c);
+ return 0;
+}
+
+// by marshmellow - sim psk data given carrier, clock, invert
+// - allow pull data from DemodBuffer or parameters
+int CmdLFpskSim(const char *Cmd)
+{
+ //might be able to autodetect FC and clock from Graphbuffer if using demod buffer
+ //will need carrier, Clock, and bitstream
+ uint8_t carrier=0, clk=0;
+ uint8_t invert=0;
+ bool errors = FALSE;
+ char hexData[32] = {0x00}; // store entered hex data
+ uint8_t data[255] = {0x00};
+ int dataLen = 0;
+ uint8_t cmdp = 0;
+ uint8_t pskType = 1;
+ while(param_getchar(Cmd, cmdp) != 0x00)
+ {
+ switch(param_getchar(Cmd, cmdp))
+ {
+ case 'h':
+ return usage_lf_simpsk();
+ case 'i':
+ invert = 1;
+ cmdp++;
+ break;
+ case 'c':
+ errors |= param_getdec(Cmd,cmdp+1,&clk);
+ cmdp+=2;
+ break;
+ case 'r':
+ errors |= param_getdec(Cmd,cmdp+1,&carrier);
+ cmdp+=2;
+ break;
+ case '1':
+ pskType=1;
+ cmdp++;
+ break;
+ case '2':
+ pskType=2;
+ cmdp++;
+ break;
+ case '3':
+ pskType=3;
+ cmdp++;
+ break;
+ case 'd':
+ dataLen = param_getstr(Cmd, cmdp+1, hexData);
+ if (dataLen==0) {
+ errors=TRUE;
+ } else {
+ dataLen = hextobinarray((char *)data, hexData);
+ }
+ if (dataLen==0) errors=TRUE;
+ if (errors) PrintAndLog ("Error getting hex data");
+ cmdp+=2;
+ break;
+ default:
+ PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+ errors = TRUE;
+ break;
+ }
+ if (errors) break;
+ }
+ if (cmdp == 0 && DemodBufferLen == 0)
+ {
+ errors = TRUE;// No args
+ }
+
+ //Validations
+ if (errors)
+ {
+ return usage_lf_simpsk();
+ }
+ if (dataLen == 0){ //using DemodBuffer
+ PrintAndLog("Getting Clocks");
+ if (clk==0) clk = GetPskClock("", FALSE, FALSE);
+ PrintAndLog("clk: %d",clk);
+ if (!carrier) carrier = GetPskCarrier("", FALSE, FALSE);
+ PrintAndLog("carrier: %d", carrier);
+ } else {
+ setDemodBuf(data, dataLen, 0);
+ }
+
+ if (clk <= 0) clk = 32;
+ if (carrier == 0) carrier = 2;
+ if (pskType != 1){
+ if (pskType == 2){
+ //need to convert psk2 to psk1 data before sim
+ psk2TOpsk1(DemodBuffer, DemodBufferLen);
+ } else {
+ PrintAndLog("Sorry, PSK3 not yet available");
+ }
+ }
+ uint16_t arg1, arg2;
+ arg1 = clk << 8 | carrier;
+ arg2 = invert;
+ size_t size=DemodBufferLen;
+ if (size > USB_CMD_DATA_SIZE) {
+ PrintAndLog("DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
+ size=USB_CMD_DATA_SIZE;
+ }
+ UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};
+ PrintAndLog("DEBUG: Sending DemodBuffer Length: %d", size);
+ memcpy(c.d.asBytes, DemodBuffer, size);
+ SendCommand(&c);
+
+ return 0;
+}
+
int CmdLFSimBidir(const char *Cmd)
{
// Set ADC to twice the carrier for a slight supersampling
}
/* simulate an LF Manchester encoded tag with specified bitstream, clock rate and inter-id gap */
+/*
int CmdLFSimManchester(const char *Cmd)
{
static int clock, gap;
CmdLFSim(gapstring);
return 0;
}
-
-int CmdLFSnoop(const char *Cmd)
-{
- UsbCommand c = {CMD_LF_SNOOP_RAW_ADC_SAMPLES};
-
- // 'h' means higher-low-frequency, 134 kHz
- c.arg[0] = 0;
- c.arg[1] = -1;
-
- if (*Cmd == 'l') {
- sscanf(Cmd, "l %"lli, &c.arg[1]);
- } else if(*Cmd == 'h') {
- c.arg[0] = 1;
- sscanf(Cmd, "h %"lli, &c.arg[1]);
- } else if (sscanf(Cmd, "%"lli" %"lli, &c.arg[0], &c.arg[1]) < 1) {
- PrintAndLog("usage 1: snoop");
- PrintAndLog(" 2: snoop {l,h} [trigger threshold]");
- PrintAndLog(" 3: snoop <divisor> [trigger threshold]");
- return 0;
- }
-
- SendCommand(&c);
- WaitForResponse(CMD_ACK,NULL);
- return 0;
-}
+*/
int CmdVchDemod(const char *Cmd)
{
int CmdLFfind(const char *Cmd)
{
int ans=0;
- char cmdp = param_getchar(Cmd, 0);
-
- if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {
- PrintAndLog("Usage: lf search <0|1>");
- PrintAndLog(" <use data from Graphbuffer>, if not set, try reading data from tag.");
- PrintAndLog("");
- PrintAndLog(" sample: lf search");
- PrintAndLog(" : lf search 1");
- return 0;
- }
+ char cmdp = param_getchar(Cmd, 0);
+ char testRaw = param_getchar(Cmd, 1);
+ if (strlen(Cmd) > 2 || cmdp == 'h' || cmdp == 'H') {
+ PrintAndLog("Usage: lf search <0|1> [u]");
+ PrintAndLog(" <use data from Graphbuffer> , if not set, try reading data from tag.");
+ PrintAndLog(" [Search for Unknown tags] , if not set, reads only known tags.");
+ PrintAndLog("");
+ PrintAndLog(" sample: lf search = try reading data from tag & search for known tags");
+ PrintAndLog(" : lf search 1 = use data from GraphBuffer & search for known tags");
+ PrintAndLog(" : lf search u = try reading data from tag & search for known and unknown tags");
+ PrintAndLog(" : lf search 1 u = use data from GraphBuffer & search for known and unknown tags");
+
+ return 0;
+ }
- if (!offline && (cmdp != '1')){
+ if (!offline && (cmdp != '1')){
ans=CmdLFRead("");
ans=CmdSamples("20000");
- } else if (GraphTraceLen < 1000) {
- PrintAndLog("Data in Graphbuffer was too small.");
- return 0;
+ } else if (GraphTraceLen < 1000) {
+ PrintAndLog("Data in Graphbuffer was too small.");
+ return 0;
}
-
+ if (cmdp == 'u' || cmdp == 'U') testRaw = 'u';
PrintAndLog("NOTE: some demods output possible binary\n if it finds something that looks like a tag");
- PrintAndLog("Checking for known tags:");
+ PrintAndLog("False Positives ARE possible\n");
+ PrintAndLog("\nChecking for known tags:\n");
ans=CmdFSKdemodIO("");
if (ans>0) {
- PrintAndLog("Valid IO Prox ID Found!");
+ PrintAndLog("\nValid IO Prox ID Found!");
+ return 1;
+ }
+ ans=CmdFSKdemodPyramid("");
+ if (ans>0) {
+ PrintAndLog("\nValid Pyramid ID Found!");
+ return 1;
+ }
+ ans=CmdFSKdemodParadox("");
+ if (ans>0) {
+ PrintAndLog("\nValid Paradox ID Found!");
+ return 1;
+ }
+ ans=CmdFSKdemodAWID("");
+ if (ans>0) {
+ PrintAndLog("\nValid AWID ID Found!");
return 1;
}
ans=CmdFSKdemodHID("");
if (ans>0) {
- PrintAndLog("Valid HID Prox ID Found!");
+ PrintAndLog("\nValid HID Prox ID Found!");
return 1;
}
//add psk and indala
- ans=CmdIndalaDecode("0");
+ ans=CmdIndalaDecode("");
+ if (ans>0) {
+ PrintAndLog("\nValid Indala ID Found!");
+ return 1;
+ }
+ ans=CmdAskEM410xDemod("");
if (ans>0) {
- PrintAndLog("Valid Indala ID Found!");
+ PrintAndLog("\nValid EM410x ID Found!");
return 1;
}
- ans=Cmdaskmandemod("");
+ ans=CmdG_Prox_II_Demod("");
if (ans>0) {
- PrintAndLog("Valid EM410x ID Found!");
+ PrintAndLog("\nValid G Prox II ID Found!");
return 1;
}
- PrintAndLog("No Known Tags Found!\n");
+ PrintAndLog("\nNo Known Tags Found!\n");
+ if (testRaw=='u' || testRaw=='U'){
+ //test unknown tag formats (raw mode)
+ PrintAndLog("\nChecking for Unknown tags:\n");
+ ans=CmdDetectClockRate("f");
+ if (ans != 0){ //fsk
+ ans=CmdFSKrawdemod("");
+ if (ans>0) {
+ PrintAndLog("\nUnknown FSK Modulated Tag Found!");
+ return 1;
+ }
+ }
+ ans=Cmdaskmandemod("");
+ if (ans>0) {
+ PrintAndLog("\nUnknown ASK Modulated and Manchester encoded Tag Found!");
+ return 1;
+ }
+ ans=CmdPSK1rawDemod("");
+ if (ans>0) {
+ PrintAndLog("Possible unknown PSK1 Modulated Tag Found above!\n\nCould also be PSK2 - try 'data psk2rawdemod'");
+ PrintAndLog("\nCould also be PSK3 - [currently not supported]");
+ PrintAndLog("\nCould also be NRZ - try 'data nrzrawdemod");
+ return 1;
+ }
+ PrintAndLog("\nNo Data Found!\n");
+ }
return 0;
}
{"help", CmdHelp, 1, "This help"},
{"cmdread", CmdLFCommandRead, 0, "<off period> <'0' period> <'1' period> <command> ['h'] -- Modulate LF reader field to send command before read (all periods in microseconds) (option 'h' for 134)"},
{"em4x", CmdLFEM4X, 1, "{ EM4X RFIDs... }"},
+ {"config", CmdLFSetConfig, 0, "Set config for LF sampling, bit/sample, decimation, frequency"},
{"flexdemod", CmdFlexdemod, 1, "Demodulate samples for FlexPass"},
{"hid", CmdLFHID, 1, "{ HID RFIDs... }"},
{"io", CmdLFIO, 1, "{ ioProx tags... }"},
{"indalademod", CmdIndalaDemod, 1, "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},
{"indalaclone", CmdIndalaClone, 0, "<UID> ['l']-- Clone Indala to T55x7 (tag must be in antenna)(UID in HEX)(option 'l' for 224 UID"},
- {"read", CmdLFRead, 0, "['h' or <divisor>] -- Read 125/134 kHz LF ID-only tag (option 'h' for 134, alternatively: f=12MHz/(divisor+1))"},
- {"search", CmdLFfind, 1, "Read and Search for valid known tag (in offline mode it you can load first then search)"},
+ {"read", CmdLFRead, 0, "Read 125/134 kHz LF ID-only tag. Do 'lf read h' for help"},
+ {"search", CmdLFfind, 1, "[offline] ['u'] Read and Search for valid known tag (in offline mode it you can load first then search) - 'u' to search for unknown tags"},
{"sim", CmdLFSim, 0, "[GAP] -- Simulate LF tag from buffer with optional GAP (in microseconds)"},
+ {"simask", CmdLFaskSim, 0, "[clock] [invert <1|0>] [manchester/raw <'m'|'r'>] [msg separator 's'] [d <hexdata>] -- Simulate LF ASK tag from demodbuffer or input"},
+ {"simfsk", CmdLFfskSim, 0, "[c <clock>] [i] [H <fcHigh>] [L <fcLow>] [d <hexdata>] -- Simulate LF FSK tag from demodbuffer or input"},
+ {"simpsk", CmdLFpskSim, 0, "[1|2|3] [c <clock>] [i] [r <carrier>] [d <raw hex to sim>] -- Simulate LF PSK tag from demodbuffer or input"},
{"simbidir", CmdLFSimBidir, 0, "Simulate LF tag (with bidirectional data transmission between reader and tag)"},
- {"simman", CmdLFSimManchester, 0, "<Clock> <Bitstream> [GAP] Simulate arbitrary Manchester LF tag"},
+ //{"simman", CmdLFSimManchester, 0, "<Clock> <Bitstream> [GAP] Simulate arbitrary Manchester LF tag"},
{"snoop", CmdLFSnoop, 0, "['l'|'h'|<divisor>] [trigger threshold]-- Snoop LF (l:125khz, h:134khz)"},
{"ti", CmdLFTI, 1, "{ TI RFIDs... }"},
{"hitag", CmdLFHitag, 1, "{ Hitag tags and transponders... }"},
projects / proxmark3-svn / blobdiff