Merge pull request #227 from pwpiwi/client_fixes

[proxmark3-svn] / client / graph.c

diff --git a/client/graph.c b/client/graph.c
index 11dbc4d595294abaf178fa918b4411e58ac7243f..f40f093a38f4996f21e1b02f3393488932bfb59f 100644 (file)
--- a/client/graph.c
+++ b/client/graph.c
@@ -14,20 +14,20 @@
 #include "ui.h"
 #include "graph.h"
 #include "lfdemod.h"
 #include "ui.h"
 #include "graph.h"
 #include "lfdemod.h"

+#include "cmddata.h" //for g_debugmode

 
 int GraphBuffer[MAX_GRAPH_TRACE_LEN];
 int GraphTraceLen;
 
 int GraphBuffer[MAX_GRAPH_TRACE_LEN];
 int GraphTraceLen;

-
-/* write a bit to the graph */
+/* write a manchester bit to the graph */

 void AppendGraph(int redraw, int clock, int bit)
 {
   int i;
 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)
   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)
   for (i = (int)(clock / 2); i < clock; ++i)

-    GraphBuffer[GraphTraceLen++] = bit;
+    GraphBuffer[GraphTraceLen++] = bit ^ 1;

 
   if (redraw)
     RepaintGraphWindow();
 
   if (redraw)
     RepaintGraphWindow();


@@ -46,6 +46,24 @@ int ClearGraph(int redraw)
 
   return gtl;
 }
 
   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;
+       static bool GB_Saved = false;
+
+       if (saveOpt==1) { //save
+               memcpy(SavedGB, GraphBuffer, sizeof(GraphBuffer));
+               SavedGBlen = GraphTraceLen;
+               GB_Saved=true;
+       } else if (GB_Saved){ //restore
+               memcpy(GraphBuffer, SavedGB, sizeof(GraphBuffer));
+               GraphTraceLen = SavedGBlen;
+               RepaintGraphWindow();
+       }
+       return;
+}

 
 // DETECT CLOCK NOW IN LFDEMOD.C
 
 
 // DETECT CLOCK NOW IN LFDEMOD.C
 


@@ -126,14 +144,38 @@ int GetAskClock(const char str[], bool printAns, bool verbose)
                        PrintAndLog("Failed to copy from graphbuffer");
                return -1;
        }
                        PrintAndLog("Failed to copy from graphbuffer");
                return -1;
        }

-       DetectASKClock(grph, size, &clock, 20);
+       bool st = DetectST(grph, &size, &clock);
+       int start = 0;
+       if (st == false) {
+               start = DetectASKClock(grph, size, &clock, 20);
+       }

        // Only print this message if we're not looping something
        // Only print this message if we're not looping something

-       if (printAns){
-               PrintAndLog("Auto-detected clock rate: %d", clock);
+       if (printAns) {
+               PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start);

        }
        return clock;
 }
 
        }
        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;
+       }
+       //uint8_t countPSK_FC(uint8_t *BitStream, size_t size)
+
+       carrier = countFC(grph,size,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;
 int GetPskClock(const char str[], bool printAns, bool verbose)
 {
        int clock;


@@ -193,24 +235,10 @@ uint8_t GetFskClock(const char str[], bool printAns, bool verbose)
                clock = 0;
        if (clock != 0) return (uint8_t)clock;
 
                clock = 0;
        if (clock != 0) return (uint8_t)clock;
 

-       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); 
-       if (ans==0) {
-               if (verbose) PrintAndLog("DEBUG: No data found");
-               return 0;
-       }
-       uint8_t fc1, fc2;
-       fc1 = (ans >> 8) & 0xFF;
-       fc2 = ans & 0xFF;

 
 

-       uint8_t rf1 = detectFSKClk(BitStream, size, fc1, fc2);
-       if (rf1==0) {
-               if (verbose) PrintAndLog("DEBUG: Clock detect error");
-               return 0;
-       }
+       uint8_t fc1=0, fc2=0, rf1=0;
+       uint8_t ans = fskClocks(&fc1, &fc2, &rf1, verbose);
+       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);
                return rf1;
        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);
                return rf1;


@@ -221,3 +249,33 @@ uint8_t GetFskClock(const char str[], bool printAns, bool verbose)
        }
        return 0;
 }
        }
        return 0;
 }

+uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose)
+{
+       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 || g_debugMode) PrintAndLog("DEBUG: No data found");
+               return 0;
+       }
+       *fc1 = (ans >> 8) & 0xFF;
+       *fc2 = ans & 0xFF;
+
+       *rf1 = detectFSKClk(BitStream, size, *fc1, *fc2);
+       if (*rf1==0) {
+               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;
+}