FIX: "lf sim" after changes to ticks timers on device side, there was a "starticks...

[proxmark3-svn] / client / cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index 378fb78f0a7bffe77411c30ea7dfbe744b903c7c..f263bbe9ef4a52f1edb650de13b085abb5166c28 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -458,23 +458,36 @@ void printEM410x(uint32_t hi, uint64_t id)
 int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo )
 {
        size_t idx = 0;
 int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo )
 {
        size_t idx = 0;

-       size_t BitLen = DemodBufferLen;
+       size_t size = DemodBufferLen;

        uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
        uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

-       memcpy(BitStream, DemodBuffer, BitLen); 
-       if (Em410xDecode(BitStream, &BitLen, &idx, hi, lo)){
-               //set GraphBuffer for clone or sim command
-               setDemodBuf(BitStream, BitLen, idx);
+       memcpy(BitStream, DemodBuffer, size); 
+       int ans = Em410xDecode(BitStream, &size, &idx, hi, lo);
+       if ( ans < 0){

                if (g_debugMode){
                if (g_debugMode){

-                       PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen);
-                       printDemodBuff();
-               }
-               if (verbose){
-                       PrintAndLog("EM410x pattern found: ");
-                       printEM410x(*hi, *lo);
+
+                       if (ans == -1)
+                               PrintAndLog("DEBUG: Error - Em410x not only 0|1 in decoded bitstream");
+                       else if (ans == -3)
+                               PrintAndLog("DEBUG: Error - Em410x Size not correct: %d", size);
+                       else if (ans == -4)
+                               PrintAndLog("DEBUG: Error - Em410x preamble not found");
+                       else if (ans == -5)
+                               PrintAndLog("DEBUG: Error - Em410x parity failed");

                }
                }

-               return 1;
+               return 0;

        }
        }

-       return 0;
+       
+       //set GraphBuffer for clone or sim command
+       setDemodBuf(BitStream, size, idx);
+       if (g_debugMode){
+               PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, size);
+               printDemodBuff();
+       }
+       if (verbose){
+               PrintAndLog("EM410x pattern found: ");
+               printEM410x(*hi, *lo);
+       }
+       return 1;

 }
 
 int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose)
 }
 
 int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose)


@@ -969,17 +982,17 @@ int CmdUndec(const char *Cmd)
 //shift graph zero up or down based on input + or -
 int CmdGraphShiftZero(const char *Cmd)
 {
 //shift graph zero up or down based on input + or -
 int CmdGraphShiftZero(const char *Cmd)
 {

-       int shift=0;
+       int shift = 0, shiftedVal = 0;

        //set options from parameters entered with the command
        sscanf(Cmd, "%i", &shift);
        //set options from parameters entered with the command
        sscanf(Cmd, "%i", &shift);

-       int shiftedVal=0;
+

        for(int i = 0; i<GraphTraceLen; i++){
                shiftedVal=GraphBuffer[i]+shift;
        for(int i = 0; i<GraphTraceLen; i++){
                shiftedVal=GraphBuffer[i]+shift;

-               if (shiftedVal>127) 
-                       shiftedVal=127;
-               else if (shiftedVal<-127) 
-                       shiftedVal=-127;
-               GraphBuffer[i]= shiftedVal;
+               if (shiftedVal > 127) 
+                       shiftedVal = 127;
+               else if (shiftedVal < -127) 
+                       shiftedVal = -127;
+               GraphBuffer[i] = shiftedVal;

        }
        CmdNorm("");
        return 0;
        }
        CmdNorm("");
        return 0;


@@ -2146,10 +2159,14 @@ int CmdTuneSamples(const char *Cmd)
        peakf = resp.arg[2] & 0xffff;
        peakv = resp.arg[2] >> 16;
        PrintAndLog("");
        peakf = resp.arg[2] & 0xffff;
        peakv = resp.arg[2] >> 16;
        PrintAndLog("");

-       PrintAndLog("# LF antenna: %5.2f V @   125.00 kHz", vLf125/1000.0);
-       PrintAndLog("# LF antenna: %5.2f V @   134.00 kHz", vLf134/1000.0);
-       PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1));
-       PrintAndLog("# HF antenna: %5.2f V @    13.56 MHz", vHf/1000.0);
+       if ( vLf125 > 0 )
+               PrintAndLog("# LF antenna: %5.2f V @   125.00 kHz", vLf125/1000.0);
+       if ( vLf134 > 0 )
+               PrintAndLog("# LF antenna: %5.2f V @   134.00 kHz", vLf134/1000.0);
+       if ( peakv > 0 && peakf > 0 )
+               PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1));
+       if ( vHf > 0 )
+               PrintAndLog("# HF antenna: %5.2f V @    13.56 MHz", vHf/1000.0);

 
  #define LF_UNUSABLE_V         2948            // was 2000. Changed due to bugfix in voltage measurements. LF results are now 47% higher.
  #define LF_MARGINAL_V         14739           // was 10000. Changed due to bugfix bug in voltage measurements. LF results are now 47% higher.
 
  #define LF_UNUSABLE_V         2948            // was 2000. Changed due to bugfix in voltage measurements. LF results are now 47% higher.
  #define LF_MARGINAL_V         14739           // was 10000. Changed due to bugfix bug in voltage measurements. LF results are now 47% higher.