X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/73a2a84f75f37c4c4397e06b825d4356507d497b..f513388ee056cfaa34799ed19e451383db1065c3:/client/cmdlf.c diff --git a/client/cmdlf.c b/client/cmdlf.c index 206d5355..f34637db 100644 --- a/client/cmdlf.c +++ b/client/cmdlf.c @@ -34,8 +34,9 @@ #include "cmdlfpyramid.h"// for pyramid menu #include "cmdlfviking.h" // for viking menu #include "cmdlfcotag.h" // for COTAG menu +#include "cmdlfvisa2000.h" // for VISA2000 menu - +bool g_lf_threshold_set = false; static int CmdHelp(const char *Cmd); @@ -63,7 +64,7 @@ int CmdLFCommandRead(const char *Cmd) { static char dummy[3] = {0x20,0x00,0x00}; UsbCommand c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K}; - bool errors = FALSE; + bool errors = false; //uint8_t divisor = 95; //125khz uint8_t cmdp = 0; while(param_getchar(Cmd, cmdp) != 0x00) @@ -484,7 +485,7 @@ int CmdLFSetConfig(const char *Cmd) uint8_t bps = 0; // Bits per sample uint8_t decimation = 0; //How many to keep bool averaging = 1; // Defaults to true - bool errors = FALSE; + bool errors = false; int trigger_threshold =-1;//Means no change uint8_t unsigned_trigg = 0; @@ -510,7 +511,10 @@ int CmdLFSetConfig(const char *Cmd) case 't': errors |= param_getdec(Cmd,cmdp+1,&unsigned_trigg); cmdp+=2; - if(!errors) trigger_threshold = unsigned_trigg; + if(!errors) { + trigger_threshold = unsigned_trigg; + if (trigger_threshold > 0) g_lf_threshold_set = true; + } break; case 'b': errors |= param_getdec(Cmd,cmdp+1,&bps); @@ -557,7 +561,7 @@ int CmdLFSetConfig(const char *Cmd) int CmdLFRead(const char *Cmd) { - + if (offline) return 0; uint8_t cmdp = 0; bool arg1 = false; if (param_getchar(Cmd, cmdp) == 'h') @@ -569,12 +573,14 @@ int CmdLFRead(const char *Cmd) UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {arg1,0,0}}; clearCommandBuffer(); SendCommand(&c); - //WaitForResponse(CMD_ACK,NULL); - if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) { - PrintAndLog("command execution time out"); - return 1; + if (g_lf_threshold_set) { + WaitForResponse(CMD_ACK,NULL); + } else { + if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) { + PrintAndLog("command execution time out"); + return 1; + } } - return 0; } @@ -695,7 +701,7 @@ int CmdLFfskSim(const char *Cmd) // otherwise will need FChigh, FClow, Clock, and bitstream uint8_t fcHigh=0, fcLow=0, clk=0; uint8_t invert=0; - bool errors = FALSE; + bool errors = false; char hexData[32] = {0x00}; // store entered hex data uint8_t data[255] = {0x00}; int dataLen = 0; @@ -729,24 +735,24 @@ int CmdLFfskSim(const char *Cmd) case 'd': dataLen = param_getstr(Cmd, cmdp+1, hexData); if (dataLen==0) { - errors=TRUE; + errors=true; } else { dataLen = hextobinarray((char *)data, hexData); } - if (dataLen==0) errors=TRUE; + 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; + errors = true; break; } if(errors) break; } if(cmdp == 0 && DemodBufferLen == 0) { - errors = TRUE;// No args + errors = true;// No args } //Validations @@ -797,7 +803,7 @@ int CmdLFaskSim(const char *Cmd) // needs clock, invert, manchester/raw as m or r, separator as s, and bitstream uint8_t encoding = 1, separator = 0; uint8_t clk=0, invert=0; - bool errors = FALSE; + bool errors = false; char hexData[32] = {0x00}; uint8_t data[255]= {0x00}; // store entered hex data int dataLen = 0; @@ -835,24 +841,24 @@ int CmdLFaskSim(const char *Cmd) case 'd': dataLen = param_getstr(Cmd, cmdp+1, hexData); if (dataLen==0) { - errors=TRUE; + errors=true; } else { dataLen = hextobinarray((char *)data, hexData); } - if (dataLen==0) errors=TRUE; + 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; + errors = true; break; } if(errors) break; } if(cmdp == 0 && DemodBufferLen == 0) { - errors = TRUE;// No args + errors = true;// No args } //Validations @@ -891,7 +897,7 @@ int CmdLFpskSim(const char *Cmd) //will need carrier, Clock, and bitstream uint8_t carrier=0, clk=0; uint8_t invert=0; - bool errors = FALSE; + bool errors = false; char hexData[32] = {0x00}; // store entered hex data uint8_t data[255] = {0x00}; int dataLen = 0; @@ -930,24 +936,24 @@ int CmdLFpskSim(const char *Cmd) case 'd': dataLen = param_getstr(Cmd, cmdp+1, hexData); if (dataLen==0) { - errors=TRUE; + errors=true; } else { dataLen = hextobinarray((char *)data, hexData); } - if (dataLen==0) errors=TRUE; + 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; + errors = true; break; } if (errors) break; } if (cmdp == 0 && DemodBufferLen == 0) { - errors = TRUE;// No args + errors = true;// No args } //Validations @@ -957,9 +963,9 @@ int CmdLFpskSim(const char *Cmd) } if (dataLen == 0){ //using DemodBuffer PrintAndLog("Getting Clocks"); - if (clk==0) clk = GetPskClock("", FALSE, FALSE); + if (clk==0) clk = GetPskClock("", false, false); PrintAndLog("clk: %d",clk); - if (!carrier) carrier = GetPskCarrier("", FALSE, FALSE); + if (!carrier) carrier = GetPskCarrier("", false, false); PrintAndLog("carrier: %d", carrier); } else { setDemodBuf(data, dataLen, 0); @@ -1190,6 +1196,12 @@ int CmdLFfind(const char *Cmd) return CheckChipType(cmdp); } + ans=CmdVisa2kDemod(""); + if (ans>0) { + PrintAndLog("\nValid Visa2000 ID Found!"); + return CheckChipType(cmdp); + } + ans=CmdG_Prox_II_Demod(""); if (ans>0) { PrintAndLog("\nValid G Prox II ID Found!"); @@ -1231,18 +1243,18 @@ int CmdLFfind(const char *Cmd) ans=CheckChipType(cmdp); //test unknown tag formats (raw mode)0 PrintAndLog("\nChecking for Unknown tags:\n"); - ans=AutoCorrelate(4000, FALSE, FALSE); + ans=AutoCorrelate(4000, false, false); if (ans > 0) PrintAndLog("Possible Auto Correlation of %d repeating samples",ans); - ans=GetFskClock("",FALSE,FALSE); + ans=GetFskClock("",false,false); if (ans != 0){ //fsk - ans=FSKrawDemod("",TRUE); + ans=FSKrawDemod("",true); if (ans>0) { PrintAndLog("\nUnknown FSK Modulated Tag Found!"); return 1; } } - bool st = TRUE; - ans=ASKDemod_ext("0 0 0",TRUE,FALSE,1,&st); + bool st = true; + ans=ASKDemod_ext("0 0 0",true,false,1,&st); if (ans>0) { PrintAndLog("\nUnknown ASK Modulated and Manchester encoded Tag Found!"); PrintAndLog("\nif it does not look right it could instead be ASK/Biphase - try 'data rawdemod ab'"); @@ -1269,12 +1281,13 @@ static command_t CommandTable[] = {"hid", CmdLFHID, 1, "{ HID RFIDs... }"}, {"hitag", CmdLFHitag, 1, "{ Hitag tags and transponders... }"}, {"io", CmdLFIO, 1, "{ ioProx tags... }"}, - {"presco", CmdLFPresco, 1, "{ Presco RFIDs... }"}, + {"presco", CmdLFPresco, 1, "{ Presco RFIDs... }"}, {"pcf7931", CmdLFPCF7931, 1, "{ PCF7931 RFIDs... }"}, {"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...}"}, {"cmdread", CmdLFCommandRead, 0, " ['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"},