]> cvs.zerfleddert.de Git - proxmark3-svn/commitdiff
the timeout on lf read makes the threshold ...
authormarshmellow42 <marshmellowrf@gmail.com>
Fri, 24 Feb 2017 06:02:25 +0000 (01:02 -0500)
committermarshmellow42 <marshmellowrf@gmail.com>
Fri, 24 Feb 2017 06:02:25 +0000 (01:02 -0500)
option not work as expected..  need to find a more robust option...

+ added iceman's lf_em410x_sim help text..

client/cmdlf.c
client/cmdlfem4x.c

index 206d5355807b2ad20515deb101e2e3dab8eb0e0d..5683a589eec4dc99edf44a9bf20465d4e561242b 100644 (file)
@@ -569,11 +569,11 @@ 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;
-       }
+       WaitForResponse(CMD_ACK,NULL);  
+       //if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
+       //      PrintAndLog("command execution time out");
+       //      return 1;
+       //}
 
        return 0;
 }
index c26b4f392b7b04f2392c0ca3af704bfd7a1ad502..38bb5c5d19ee7e6b6f0a10c8c20792146e8efb26 100644 (file)
@@ -63,6 +63,20 @@ int CmdEM410xRead(const char *Cmd)
        return 1;
 }
 
+int usage_lf_em410x_sim(void) {
+       PrintAndLog("Simulating EM410x tag");
+       PrintAndLog("");
+       PrintAndLog("Usage:  lf em 410xsim [h] <uid> <clock>");
+       PrintAndLog("Options:");
+       PrintAndLog("       h         - this help");
+       PrintAndLog("       uid       - uid (10 HEX symbols)");
+       PrintAndLog("       clock     - clock (32|64) (optional)");
+       PrintAndLog("samples:");
+       PrintAndLog("      lf em 410xsim 0F0368568B");
+       PrintAndLog("      lf em 410xsim 0F0368568B 32");
+       return 0;
+}
+
 // emulate an EM410X tag
 int CmdEM410xSim(const char *Cmd)
 {
@@ -71,12 +85,7 @@ int CmdEM410xSim(const char *Cmd)
        char cmdp = param_getchar(Cmd, 0);
        uint8_t uid[5] = {0x00};
 
-       if (cmdp == 'h' || cmdp == 'H') {
-               PrintAndLog("Usage:  lf em 410xsim <UID> <clock>");
-               PrintAndLog("");
-               PrintAndLog("     sample: lf em 410xsim 0F0368568B");
-               return 0;
-       }
+       if (cmdp == 'h' || cmdp == 'H') return usage_lf_em410x_sim();
        /* clock is 64 in EM410x tags */
        uint8_t clock = 64;
 
Impressum, Datenschutz