fix length test

[proxmark3-svn] / client / graph.c

diff --git a/client/graph.c b/client/graph.c
index 995a32da6a451cba3e57eb34ec8503f98c15c213..12f5ff7119051c0aa1a48c8fb977839c66f0de76 100644 (file)
--- a/client/graph.c
+++ b/client/graph.c
@@ -150,7 +150,7 @@ int GetAskClock(const char str[], bool printAns, bool verbose)
                start = DetectASKClock(grph, size, &clock, 20);
        }
        // Only print this message if we're not looping something
                start = DetectASKClock(grph, size, &clock, 20);
        }
        // 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("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start);
        }
        return clock;


@@ -166,11 +166,12 @@ uint8_t GetPskCarrier(const char str[], bool printAns, bool verbose)
                        PrintAndLog("Failed to copy from graphbuffer");
                return 0;
        }
                        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
        // 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("Auto-detected PSK carrier rate: %d", carrier);
        }
        return carrier;


@@ -193,7 +194,9 @@ int GetPskClock(const char str[], bool printAns, bool verbose)
                        PrintAndLog("Failed to copy from graphbuffer");
                return -1;
        }
                        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);

        // Only print this message if we're not looping something
        if (printAns){
                PrintAndLog("Auto-detected clock rate: %d", clock);
        // Only print this message if we're not looping something
        if (printAns){
                PrintAndLog("Auto-detected clock rate: %d", clock);