data autocorr additions

diff --git a/client/Makefile b/client/Makefile
index 6ec34469a14837ce8910be8c24a7aea984e977bd..81af01499fa75425b4495d557f4666bd4fa05cad 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -66,6 +66,7 @@ CMDSRCS =     nonce2key/crapto1.c\
                loclass/elite_crack.c\
                loclass/fileutils.c\
                        mifarehost.c\
                loclass/elite_crack.c\
                loclass/fileutils.c\
                        mifarehost.c\

+                       crc.c \

                        crc16.c \
                        iso14443crc.c \
                        iso15693tools.c \
                        crc16.c \
                        iso14443crc.c \
                        iso15693tools.c \

diff --git a/client/cmddata.c b/client/cmddata.c
index 9e3cd3046934891b002716d29e7844ca68b532d3..d5b072c01ca444cdc35597b865bee0706ed22bb8 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -774,20 +774,34 @@ int AutoCorrelate(int window, bool SaveGrph, bool verbose)
   return Correlation;
 }
 
   return Correlation;
 }
 

+int usage_data_autocorr(void)
+{
+  //print help
+  PrintAndLog("Usage: data autocorr [window] [g]");
+  PrintAndLog("Options:        ");
+  PrintAndLog("       h              This help");
+  PrintAndLog("       [window]       window length for correlation - default = 4000");
+  PrintAndLog("       g              save back to GraphBuffer (overwrite)");
+  return 0;
+}
+

 int CmdAutoCorr(const char *Cmd)
 {
 int CmdAutoCorr(const char *Cmd)
 {

-  int window = atoi(Cmd);
+  char cmdp = param_getchar(Cmd, 0);
+  if (cmdp == 'h' || cmdp == 'H') 
+    return usage_data_autocorr();
+  int window = 4000; //set default
+  char grph=0;
+  bool updateGrph = FALSE;
+  sscanf(Cmd, "%i %c", &window, &grph);

 
 

-  if (window == 0) {
-    PrintAndLog("needs a window");
-    return 0;
-  }

   if (window >= GraphTraceLen) {
     PrintAndLog("window must be smaller than trace (%d samples)",
       GraphTraceLen);
     return 0;
   }
   if (window >= GraphTraceLen) {
     PrintAndLog("window must be smaller than trace (%d samples)",
       GraphTraceLen);
     return 0;
   }

-  return AutoCorrelate(window, TRUE, TRUE);
+  if (grph == 'g') updateGrph=TRUE;
+  return AutoCorrelate(window, updateGrph, TRUE);

 }
 
 int CmdBitsamples(const char *Cmd)
 }
 
 int CmdBitsamples(const char *Cmd)


@@ -1471,7 +1485,7 @@ int CmdFSKdemodPyramid(const char *Cmd)
     csBuff[i] = bytebits_to_byte(BitStream + idx + 16 + (i*8), 8);
   }
   //check checksum calc
     csBuff[i] = bytebits_to_byte(BitStream + idx + 16 + (i*8), 8);
   }
   //check checksum calc

-  int checkCS =  CRC8Maxim(csBuff,13);
+  uint32_t checkCS =  CRC8Maxim(csBuff,13);

 
   //get raw ID before removing parities
   uint32_t rawLo = bytebits_to_byte(BitStream+idx+96,32);
 
   //get raw ID before removing parities
   uint32_t rawLo = bytebits_to_byte(BitStream+idx+96,32);


@@ -2625,7 +2639,7 @@ static command_t CommandTable[] =
   {"askgproxiidemod",CmdG_Prox_II_Demod,1, "Demodulate a G Prox II tag from GraphBuffer"},
   //{"askmandemod",   Cmdaskmandemod,     1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate ASK/Manchester tags and output binary (args optional)"},
   //{"askrawdemod",   Cmdaskrawdemod,     1, "[clock] [invert<0|1>] -- Attempt to demodulate ASK tags and output bin (args optional)"},
   {"askgproxiidemod",CmdG_Prox_II_Demod,1, "Demodulate a G Prox II tag from GraphBuffer"},
   //{"askmandemod",   Cmdaskmandemod,     1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate ASK/Manchester tags and output binary (args optional)"},
   //{"askrawdemod",   Cmdaskrawdemod,     1, "[clock] [invert<0|1>] -- Attempt to demodulate ASK tags and output bin (args optional)"},

-  {"autocorr",      CmdAutoCorr,        1, "<window length> -- Autocorrelation over window"},
+  {"autocorr",      CmdAutoCorr,        1, "[window length] [g] -- Autocorrelation over window - g to save back to GraphBuffer (overwrite)"},

   {"biphaserawdecode",CmdBiphaseDecodeRaw,1,"[offset] [invert<0|1>] Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"},
   {"bitsamples",    CmdBitsamples,      0, "Get raw samples as bitstring"},
   //{"bitstream",     CmdBitstream,       1, "[clock rate] -- Convert waveform into a bitstream"},
   {"biphaserawdecode",CmdBiphaseDecodeRaw,1,"[offset] [invert<0|1>] Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"},
   {"bitsamples",    CmdBitsamples,      0, "Get raw samples as bitstring"},
   //{"bitstream",     CmdBitstream,       1, "[clock rate] -- Convert waveform into a bitstream"},

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index c16b9674137d8c74441d86b325bdd72e692fc287..468243fc594ace7a2d74e3beb334d1956216a18c 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1539,7 +1539,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
        char buf[64] = {0x00};\r
        uint8_t buf8[64] = {0x00};\r
        uint8_t fillFromEmulator = 0;\r
        char buf[64] = {0x00};\r
        uint8_t buf8[64] = {0x00};\r
        uint8_t fillFromEmulator = 0;\r

-       int i, len, blockNum, flags;\r
+       int i, len, blockNum, flags=0;\r

        \r
        if (param_getchar(Cmd, 0) == 'h' || param_getchar(Cmd, 0)== 0x00) {\r
                PrintAndLog("It loads magic Chinese card from the file `filename.eml`");\r
        \r
        if (param_getchar(Cmd, 0) == 'h' || param_getchar(Cmd, 0)== 0x00) {\r
                PrintAndLog("It loads magic Chinese card from the file `filename.eml`");\r