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 ce803c82a7d101645346fc7ace6662e2acd46a23..8f810669b21d83096fa4687c315ab9664aec538b 100644 (file)
--- a/client/graph.h
+++ b/client/graph.h
@@ -10,14 +10,26 @@
 
 #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 DetectClock(int peak);
-int GetClock(const char *str, int peak, int verbose);
+//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 GetPskCarrier(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);
+uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose);
+void setGraphBuf(uint8_t *buff, size_t size);
+

 bool HasGraphData();
 bool HasGraphData();

+void DetectHighLowInGraph(int *high, int *low, bool addFuzz); 
+
+// Max graph trace len: 40000 (bigbuf) * 8 (at 1 bit per sample)
+#define MAX_GRAPH_TRACE_LEN (40000 * 8 )

 
 

-#define MAX_GRAPH_TRACE_LEN (1024*128)

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