#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)
{
int i;
//set first half the clock bit (all 1's or 0's for a 0 or 1 bit)
for (i = 0; i < (int)(clock / 2); ++i)
- GraphBuffer[GraphTraceLen++] = bit ^ 1;
+ GraphBuffer[GraphTraceLen++] = bit ;
//set second half of the clock bit (all 0's or 1's for a 0 or 1 bit)
for (i = (int)(clock / 2); i < clock; ++i)
- GraphBuffer[GraphTraceLen++] = bit;
+ GraphBuffer[GraphTraceLen++] = bit ^ 1;
if (redraw)
RepaintGraphWindow();
return gtl;
}
+// option '1' to save GraphBuffer any other to restore
+void save_restoreGB(uint8_t saveOpt)
+{
+ static int SavedGB[MAX_GRAPH_TRACE_LEN];
+ static int SavedGBlen=0;
+ static bool GB_Saved = false;
+ static int SavedGridOffsetAdj=0;
+
+ if (saveOpt == GRAPH_SAVE) { //save
+ memcpy(SavedGB, GraphBuffer, sizeof(GraphBuffer));
+ SavedGBlen = GraphTraceLen;
+ GB_Saved=true;
+ SavedGridOffsetAdj = GridOffset;
+ } else if (GB_Saved) { //restore
+ memcpy(GraphBuffer, SavedGB, sizeof(GraphBuffer));
+ GraphTraceLen = SavedGBlen;
+ GridOffset = SavedGridOffsetAdj;
+ RepaintGraphWindow();
+ }
+ return;
+}
// DETECT CLOCK NOW IN LFDEMOD.C
PrintAndLog("Failed to copy from graphbuffer");
return -1;
}
- DetectASKClock(grph, size, &clock, 20);
+ //, 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){
- PrintAndLog("Auto-detected clock rate: %d", clock);
+ if (printAns || g_debugMode) {
+ PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start);
}
return clock;
}
+uint8_t GetPskCarrier(const char str[], bool printAns, bool verbose)
+{
+ uint8_t carrier=0;
+ uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
+ size_t size = getFromGraphBuf(grph);
+ if ( size == 0 ) {
+ if (verbose)
+ PrintAndLog("Failed to copy from graphbuffer");
+ return 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) {
+ PrintAndLog("Auto-detected PSK carrier rate: %d", carrier);
+ }
+ return carrier;
+}
+
int GetPskClock(const char str[], bool printAns, bool verbose)
{
int clock;
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;
- uint8_t dummy = 0;
- uint16_t ans = countFC(BitStream, size, &dummy);
+ 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;
+}
projects / proxmark3-svn / blobdiff