BUG: the lf read now uses "getbigbuffer" which the offset from where the data start...

[proxmark3-svn] / client / cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index fa54d01a69387897b5498ccd8e43270e46a50dbf..f5b9fc9cc103450b58cfd53e896c54e5eee0201a 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -74,12 +74,14 @@ int Cmdaskdemod(const char *Cmd)
   int i;
   int c, high = 0, low = 0;
 
-  // TODO: complain if we do not give 2 arguments here !
-  // (AL - this doesn't make sense! we're only using one argument!!!)
   sscanf(Cmd, "%i", &c);
 
-  /* Detect high and lows and clock */
-  // (AL - clock???)
+  if (c != 0 && c != 1) {
+    PrintAndLog("Invalid argument: %s", Cmd);
+    return 0;
+  }
+  
+  /* Detect high and lows */
   for (i = 0; i < GraphTraceLen; ++i)
   {
     if (GraphBuffer[i] > high)
@@ -87,11 +89,7 @@ int Cmdaskdemod(const char *Cmd)
     else if (GraphBuffer[i] < low)
       low = GraphBuffer[i];
   }
-  if (c != 0 && c != 1) {
-    PrintAndLog("Invalid argument: %s", Cmd);
-    return 0;
-  }
-
+  
   if (GraphBuffer[0] > 0) {
     GraphBuffer[0] = 1-c;
   } else {
@@ -466,8 +464,8 @@ int CmdSamples(const char *Cmd)
   if (n == 0) n = 512;
   if (n > sizeof(got)) n = sizeof(got);
   
-  PrintAndLog("Reading %d samples\n", n);
-  GetFromBigBuf(got,n,0);
+  PrintAndLog("Reading %d samples from device memory\n", n);
+  GetFromBigBuf(got,n,3560);
   WaitForResponse(CMD_ACK,NULL);
   for (int j = 0; j < n; j++) {
     GraphBuffer[cnt++] = ((int)got[j]) - 128;
@@ -588,13 +586,16 @@ int CmdManchesterDemod(const char *Cmd)
     }
   }
 
+  PrintAndLog("Clock:  %d", clock); 
+  
   /* If we're not working with 1/0s, demod based off clock */
   if (high != 1)
   {
+       PrintAndLog("Entering path A"); 
     bit = 0; /* We assume the 1st bit is zero, it may not be
               * the case: this routine (I think) has an init problem.
               * Ed.
-              */
+                         */
     for (; i < (int)(GraphTraceLen / clock); i++)
     {
       hithigh = 0;