X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/0644d5e3a3ed255fea1084c0af564c00f592b36c..refs/heads/graphwork:/client/cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index 0ec73cbb..53a6584c 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -22,7 +22,7 @@
 #include "cmddata.h"
 #include "lfdemod.h"
 #include "usb_cmd.h"
-
+#include "data_operations.h"
 uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
 uint8_t g_debugMode;
 int DemodBufferLen;
@@ -58,6 +58,10 @@ void printDemodBuff()
 		return;
 	}
 	if (bitLen>512) bitLen=512; //max output to 512 bits if we have more - should be plenty
+		
+	// ensure equally divided by 16
+ 	bitLen &= 0xfff0;
+	
 	for (i = 0; i <= (bitLen-16); i+=16) {
 		PrintAndLog("%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i",
 			DemodBuffer[i],
@@ -190,6 +194,11 @@ void printBitStream(uint8_t BitStream[], uint32_t bitLen)
     return;
   }
   if (bitLen>512) bitLen=512;
+  
+  	// ensure equally divided by 16
+ 	bitLen &= 0xfff0;
+
+
    for (i = 0; i <= (bitLen-16); i+=16) {
     PrintAndLog("%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i",
       BitStream[i],
@@ -430,38 +439,16 @@ int Cmdaskrawdemod(const char *Cmd)
   return 1;
 }
 
+
 int CmdAutoCorr(const char *Cmd)
 {
-  static int CorrelBuffer[MAX_GRAPH_TRACE_LEN];
-
   int window = atoi(Cmd);
-
-  if (window == 0) {
-    PrintAndLog("needs a window");
-    return 0;
-  }
-  if (window >= GraphTraceLen) {
-    PrintAndLog("window must be smaller than trace (%d samples)",
-      GraphTraceLen);
-    return 0;
-  }
-
-  PrintAndLog("performing %d correlations", GraphTraceLen - window);
-
-  for (int i = 0; i < GraphTraceLen - window; ++i) {
-    int sum = 0;
-    for (int j = 0; j < window; ++j) {
-      sum += (GraphBuffer[j]*GraphBuffer[i + j]) / 256;
-    }
-    CorrelBuffer[i] = sum;
-  }
-  GraphTraceLen = GraphTraceLen - window;
-  memcpy(GraphBuffer, CorrelBuffer, GraphTraceLen * sizeof (int));
-
+  autoCorr(GraphBuffer, GraphBuffer,GraphTraceLen,window);
   RepaintGraphWindow();
   return 0;
 }
 
+
 int CmdBitsamples(const char *Cmd)
 {
   int cnt = 0;
@@ -1661,8 +1648,8 @@ int CmdLoad(const char *Cmd)
 	
   FILE *f = fopen(filename, "r");
   if (!f) {
-     PrintAndLog("couldn't open '%s'", filename);
-    return 0;
+	PrintAndLog("couldn't open '%s'", filename);
+	return 0;
   }
 
   GraphTraceLen = 0;
@@ -2024,30 +2011,7 @@ int CmdDirectionalThreshold(const char *Cmd)
 
   printf("Applying Up Threshold: %d, Down Threshold: %d\n", upThres, downThres);
 
-  int lastValue = GraphBuffer[0];
-  GraphBuffer[0] = 0; // Will be changed at the end, but init 0 as we adjust to last samples value if no threshold kicks in.
-
-  for (int i = 1; i < GraphTraceLen; ++i) {
-    // Apply first threshold to samples heading up
-    if (GraphBuffer[i] >= upThres && GraphBuffer[i] > lastValue)
-    {
-      lastValue = GraphBuffer[i]; // Buffer last value as we overwrite it.
-      GraphBuffer[i] = 1;
-    }
-    // Apply second threshold to samples heading down
-    else if (GraphBuffer[i] <= downThres && GraphBuffer[i] < lastValue)
-    {
-      lastValue = GraphBuffer[i]; // Buffer last value as we overwrite it.
-      GraphBuffer[i] = -1;
-    }
-    else
-    {
-      lastValue = GraphBuffer[i]; // Buffer last value as we overwrite it.
-      GraphBuffer[i] = GraphBuffer[i-1];
-
-    }
-  }
-  GraphBuffer[0] = GraphBuffer[1]; // Aline with first edited sample.
+  directionalThreshold(GraphBuffer, GraphBuffer,GraphTraceLen, upThres, downThres);
   RepaintGraphWindow();
   return 0;
 }