#include "ui.h"
#include "graph.h"
#include "lfdemod.h"
+#include "cmddata.h" //for g_debugmode
int GraphBuffer[MAX_GRAPH_TRACE_LEN];
int GraphTraceLen;
+
+int s_Buff[MAX_GRAPH_TRACE_LEN];
+
/* write a manchester bit to the graph */
void AppendGraph(int redraw, int clock, int bit)
{
PrintAndLog("Failed to copy from graphbuffer");
return -1;
}
- bool st = DetectST(grph, &size, &clock);
- int start = 0;
+ //, size_t *ststart, size_t *stend
+ size_t ststart = 0, stend = 0;
+ bool st = DetectST(grph, &size, &clock, &ststart, &stend);
+ int start = stend;
if (st == false) {
start = DetectASKClock(grph, size, &clock, 20);
}
+ setClockGrid(clock, start);
// Only print this message if we're not looping something
- if (printAns) {
+ if (printAns || g_debugMode) {
PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start);
}
return clock;
PrintAndLog("Failed to copy from graphbuffer");
return 0;
}
- //uint8_t countPSK_FC(uint8_t *BitStream, size_t size)
-
- carrier = countFC(grph,size,0);
+ uint16_t fc = countFC(grph,size,0);
+ carrier = fc & 0xFF;
+ if (carrier != 2 && carrier != 4 && carrier != 8) return 0;
+ if ((fc>>8) == 10 && carrier == 8) return 0;
// Only print this message if we're not looping something
- if (printAns){
+ if (printAns) {
PrintAndLog("Auto-detected PSK carrier rate: %d", carrier);
}
return carrier;
PrintAndLog("Failed to copy from graphbuffer");
return -1;
}
- clock = DetectPSKClock(grph,size,0);
+ size_t firstPhaseShiftLoc = 0;
+ uint8_t curPhase = 0, fc = 0;
+ clock = DetectPSKClock(grph, size, 0, &firstPhaseShiftLoc, &curPhase, &fc);
+ setClockGrid(clock, firstPhaseShiftLoc);
// Only print this message if we're not looping something
if (printAns){
PrintAndLog("Auto-detected clock rate: %d", clock);
PrintAndLog("Failed to copy from graphbuffer");
return -1;
}
- clock = DetectNRZClock(grph, size, 0);
+ size_t clkStartIdx = 0;
+ clock = DetectNRZClock(grph, size, 0, &clkStartIdx);
+ setClockGrid(clock, clkStartIdx);
// Only print this message if we're not looping something
if (printAns){
PrintAndLog("Auto-detected clock rate: %d", clock);
uint8_t fc1=0, fc2=0, rf1=0;
- uint8_t ans = fskClocks(&fc1, &fc2, &rf1, verbose);
+ int firstClockEdge = 0;
+ uint8_t ans = fskClocks(&fc1, &fc2, &rf1, verbose, &firstClockEdge);
if (ans == 0) return 0;
if ((fc1==10 && fc2==8) || (fc1==8 && fc2==5)){
if (printAns) PrintAndLog("Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);
+ setClockGrid(rf1, firstClockEdge);
return rf1;
}
if (verbose){
}
return 0;
}
-uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose)
+uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose, int *firstClockEdge)
{
uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
size_t size = getFromGraphBuf(BitStream);
if (size==0) return 0;
uint16_t ans = countFC(BitStream, size, 1);
if (ans==0) {
- if (verbose) PrintAndLog("DEBUG: No data found");
+ if (verbose || g_debugMode) PrintAndLog("DEBUG: No data found");
return 0;
}
*fc1 = (ans >> 8) & 0xFF;
*fc2 = ans & 0xFF;
-
- *rf1 = detectFSKClk(BitStream, size, *fc1, *fc2);
+ //int firstClockEdge = 0;
+ *rf1 = detectFSKClk(BitStream, size, *fc1, *fc2, firstClockEdge);
if (*rf1==0) {
- if (verbose) PrintAndLog("DEBUG: Clock detect error");
+ if (verbose || g_debugMode) PrintAndLog("DEBUG: Clock detect error");
return 0;
}
return 1;
}
+bool graphJustNoise(int *BitStream, int size)
+{
+ static const uint8_t THRESHOLD = 15; //might not be high enough for noisy environments
+ //test samples are not just noise
+ bool justNoise1 = 1;
+ for(int idx=0; idx < size && justNoise1 ;idx++){
+ justNoise1 = BitStream[idx] < THRESHOLD;
+ }
+ return justNoise1;
+}
+int autoCorr(const int* in, int *out, size_t len, int window)
+{
+ static int CorrelBuffer[MAX_GRAPH_TRACE_LEN];
+
+ if (window == 0) {
+ PrintAndLog("needs a window");
+ return 0;
+ }
+ if (window >= len) {
+ PrintAndLog("window must be smaller than trace (%d samples)",
+ len);
+ return 0;
+ }
+
+ PrintAndLog("performing %d correlations", len - window);
+
+ for (int i = 0; i < len - window; ++i) {
+ int sum = 0;
+ for (int j = 0; j < window; ++j) {
+ sum += (in[j]*in[i + j]) / 256;
+ }
+ CorrelBuffer[i] = sum;
+ }
+ //GraphTraceLen = GraphTraceLen - window;
+ memcpy(out, CorrelBuffer, len * sizeof (int));
+ return 0;
+}
+int directionalThreshold(const int* in, int *out, size_t len, int8_t up, int8_t down)
+{
+ int lastValue = in[0];
+ out[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 < len; ++i) {
+ // Apply first threshold to samples heading up
+ if (in[i] >= up && in[i] > lastValue)
+ {
+ lastValue = out[i]; // Buffer last value as we overwrite it.
+ out[i] = 1;
+ }
+ // Apply second threshold to samples heading down
+ else if (in[i] <= down && in[i] < lastValue)
+ {
+ lastValue = out[i]; // Buffer last value as we overwrite it.
+ out[i] = -1;
+ }
+ else
+ {
+ lastValue = out[i]; // Buffer last value as we overwrite it.
+ out[i] = out[i-1];
+ }
+ }
+ out[0] = out[1]; // Align with first edited sample.
+ return 0;
+}
projects / proxmark3-svn / blobdiff