Merge remote-tracking branch 'upstream/master'

2015-02-06 14:45:46 -05:00
parent 6de4350803 146c201cbe
commit be2cf126bf
31 changed files with 2120 additions and 266 deletions
--- a/client/graph.h
+++ b/client/graph.h
@@ -24,7 +24,9 @@ void setGraphBuf(uint8_t *buff, size_t size);
 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