Merge branch 'master' of https://github.com/Proxmark/proxmark3

[proxmark3-svn] / client / graph.h

diff --git a/client/graph.h b/client/graph.h
index c745270d4118e24c4a033d72471d7ad5152da556..e4872afc4a371ebee7e094e5b3904cf7847923e3 100644 (file)
--- a/client/graph.h
+++ b/client/graph.h
@@ -10,16 +10,24 @@
 
 #ifndef GRAPH_H__
 #define GRAPH_H__
 
 #ifndef GRAPH_H__
 #define GRAPH_H__

+#include <stdint.h>

 
 void AppendGraph(int redraw, int clock, int bit);
 int ClearGraph(int redraw);
 
 void AppendGraph(int redraw, int clock, int bit);
 int ClearGraph(int redraw);

-int GetFromGraphBuf(uint8_t *buff);
-int GetClock(const char *str, int verbose);
-void SetGraphBuf(uint8_t *buff,int size);
+//int DetectClock(int peak);
+size_t getFromGraphBuf(uint8_t *buff);
+int GetAskClock(const char str[], bool printAns, bool verbose);
+int GetPskClock(const char str[], bool printAns, bool verbose);
+uint8_t GetNrzClock(const char str[], bool printAns, bool verbose);
+uint8_t GetFskClock(const char str[], bool printAns, bool verbose);
+void setGraphBuf(uint8_t *buff, size_t size);
+

 bool HasGraphData();
 void DetectHighLowInGraph(int *high, int *low, bool addFuzz); 
 
 bool HasGraphData();
 void DetectHighLowInGraph(int *high, int *low, bool addFuzz); 
 

-#define MAX_GRAPH_TRACE_LEN (1024*128)
+// Max graph trace len: 40000 (bigbuf) * 8 (at 1 bit per sample)
+#define MAX_GRAPH_TRACE_LEN (40000 * 8 )
+

 extern int GraphBuffer[MAX_GRAPH_TRACE_LEN];
 extern int GraphTraceLen;
 #endif
 extern int GraphBuffer[MAX_GRAPH_TRACE_LEN];
 extern int GraphTraceLen;
 #endif