Some new commands (threshold and fskdemod) that act on the graph window

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 47da5ad50b704c2121531bb1449ad53526fa2a46..dec71dcde6d479c97d322bbee41abaac2db7b381 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -214,7 +214,7 @@ void ModThenAcquireRawAdcSamples125k(int delay_off,int period_0,int period_1,BYT
 void AcquireTiType(void)
 {
        int i;
 void AcquireTiType(void)
 {
        int i;

-       int n = 4000;
+       int n = sizeof(BigBuf);

 
        // clear buffer
        memset(BigBuf,0,sizeof(BigBuf));
 
        // clear buffer
        memset(BigBuf,0,sizeof(BigBuf));

diff --git a/winsrc/command.cpp b/winsrc/command.cpp
index c7c4a75fb5e93212f6c40776f8978804ecf8564c..455e48c826c086936080186d77c1f01478cbbcb0 100644 (file)
--- a/winsrc/command.cpp
+++ b/winsrc/command.cpp
@@ -272,9 +272,9 @@ static void CmdEM410xwatch(char *str)
  * pattern of 320 cycles each (32/32/128/64/64)).\r
  *\r
  * Note that this data may or may not be the UID. It is whatever data\r
  * pattern of 320 cycles each (32/32/128/64/64)).\r
  *\r
  * Note that this data may or may not be the UID. It is whatever data\r

- * is stored in the blocks defined in the control word First and Last \r
+ * is stored in the blocks defined in the control word First and Last\r

  * Word Read values. UID is stored in block 32.\r
  * Word Read values. UID is stored in block 32.\r

- */ \r
+ */\r

 static void CmdEM4x50read(char *str)\r
 {\r
        int i, j, startblock, clock, skip, block, start, end, low, high;\r
 static void CmdEM4x50read(char *str)\r
 {\r
        int i, j, startblock, clock, skip, block, start, end, low, high;\r


@@ -288,7 +288,7 @@ static void CmdEM4x50read(char *str)
        /* first get high and low values */\r
        for (i = 0; i < GraphTraceLen; i++)\r
        {\r
        /* first get high and low values */\r
        for (i = 0; i < GraphTraceLen; i++)\r
        {\r

-               if (GraphBuffer[i] > high)      \r
+               if (GraphBuffer[i] > high)\r

                        high = GraphBuffer[i];\r
                else if (GraphBuffer[i] < low)\r
                        low = GraphBuffer[i];\r
                        high = GraphBuffer[i];\r
                else if (GraphBuffer[i] < low)\r
                        low = GraphBuffer[i];\r


@@ -310,7 +310,7 @@ static void CmdEM4x50read(char *str)
                tmpbuff[j++]= i - start;\r
                }\r
 \r
                tmpbuff[j++]= i - start;\r
                }\r
 \r

-       \r
+\r

        /* look for data start - should be 2 pairs of LW (pulses of 192,128) */\r
        start= -1;\r
        skip= 0;\r
        /* look for data start - should be 2 pairs of LW (pulses of 192,128) */\r
        start= -1;\r
        skip= 0;\r


@@ -457,14 +457,14 @@ static void CmdEM410xread(char *str)
                        if (hithigh && hitlow)\r
                                break;\r
                }\r
                        if (hithigh && hitlow)\r
                                break;\r
                }\r

-               \r
+\r

                /* If we didn't hit both high and low peaks, we had a bit transition */\r
                if (!hithigh || !hitlow)\r
                        bit ^= 1;\r
                /* If we didn't hit both high and low peaks, we had a bit transition */\r
                if (!hithigh || !hitlow)\r
                        bit ^= 1;\r

-               \r
+\r

                BitStream[bit2idx++] = bit;\r
        }\r
                BitStream[bit2idx++] = bit;\r
        }\r

-       \r
+\r

 retest:\r
        /* We go till 5 before the graph ends because we'll get that far below */\r
        for (i = 1; i < bit2idx - 5; i++)\r
 retest:\r
        /* We go till 5 before the graph ends because we'll get that far below */\r
        for (i = 1; i < bit2idx - 5; i++)\r


@@ -539,7 +539,7 @@ retest:
                                header = 0;\r
                }\r
        }\r
                                header = 0;\r
                }\r
        }\r

-       \r
+\r

        /* if we've already retested after flipping bits, return */\r
        if (retested++)\r
                return;\r
        /* if we've already retested after flipping bits, return */\r
        if (retested++)\r
                return;\r


@@ -698,7 +698,7 @@ static void CmdLoCommandRead(char *str)
        static char dummy[3];\r
 \r
        dummy[0]= ' ';\r
        static char dummy[3];\r
 \r
        dummy[0]= ' ';\r

-       \r
+\r

        UsbCommand c;\r
        c.cmd = CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K;\r
        sscanf(str, "%i %i %i %s %s", &c.ext1, &c.ext2, &c.ext3, (char *) &c.d.asBytes,(char *) &dummy+1);\r
        UsbCommand c;\r
        c.cmd = CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K;\r
        sscanf(str, "%i %i %i %s %s", &c.ext1, &c.ext2, &c.ext3, (char *) &c.d.asBytes,(char *) &dummy+1);\r


@@ -795,7 +795,6 @@ static void CmdHisamples(char *str)
        RepaintGraphWindow();\r
 }\r
 \r
        RepaintGraphWindow();\r
 }\r
 \r

-\r

 static int CmdHisamplest(char *str, int nrlow)\r
 {\r
        int cnt = 0;\r
 static int CmdHisamplest(char *str, int nrlow)\r
 {\r
        int cnt = 0;\r


@@ -1406,7 +1405,8 @@ static void CmdTibits(char *str)
 {\r
        int cnt = 0;\r
        int i;\r
 {\r
        int cnt = 0;\r
        int i;\r

-       for(i = 0; i < 1536; i += 12) {\r
+//     for(i = 0; i < 1536; i += 12) {\r
+       for(i = 0; i < 4000; i += 12) {\r

                UsbCommand c;\r
                c.cmd = CMD_DOWNLOAD_RAW_BITS_TI_TYPE;\r
                c.ext1 = i;\r
                UsbCommand c;\r
                c.cmd = CMD_DOWNLOAD_RAW_BITS_TI_TYPE;\r
                c.ext1 = i;\r


@@ -1428,10 +1428,131 @@ static void CmdTibits(char *str)
                        }\r
                }\r
        }\r
                        }\r
                }\r
        }\r

-       GraphTraceLen = 1536*32;\r
+//     GraphTraceLen = 1536*32;\r
+       GraphTraceLen = 4000*32;\r

        RepaintGraphWindow();\r
 }\r
 \r
        RepaintGraphWindow();\r
 }\r
 \r

+static void CmdFSKdemod(char *cmdline)\r
+{\r
+       static const int LowTone[]  = {\r
+               1,  1,  1,  1,  1, -1, -1, -1, -1, -1,\r
+               1,  1,  1,  1,  1, -1, -1, -1, -1, -1,\r
+               1,  1,  1,  1,  1, -1, -1, -1, -1, -1,\r
+               1,  1,  1,  1,  1, -1, -1, -1, -1, -1,\r
+               1,  1,  1,  1,  1, -1, -1, -1, -1, -1\r
+       };\r
+       static const int HighTone[] = {\r
+               1,  1,  1,  1,  1,     -1, -1, -1, -1,\r
+               1,  1,  1,  1,         -1, -1, -1, -1,\r
+               1,  1,  1,  1,         -1, -1, -1, -1,\r
+               1,  1,  1,  1,         -1, -1, -1, -1,\r
+               1,  1,  1,  1,         -1, -1, -1, -1,\r
+               1,  1,  1,  1,     -1, -1, -1, -1, -1,\r
+       };\r
+\r
+       int convLen = max(arraylen(HighTone), arraylen(LowTone));\r
+       DWORD hi = 0, lo = 0;\r
+\r
+       int i, j;\r
+       int minMark=0, maxMark=0;\r
+       int lowLen = arraylen(LowTone);\r
+       int highLen = arraylen(HighTone);\r
+\r
+       for(i = 0; i < GraphTraceLen - convLen; i++) {\r
+               int lowSum = 0, highSum = 0;\r
+\r
+               for(j = 0; j < lowLen; j++) {\r
+                       lowSum += LowTone[j]*GraphBuffer[i+j];\r
+               }\r
+               for(j = 0; j < highLen; j++) {\r
+                       highSum += HighTone[j]*GraphBuffer[i+j];\r
+               }\r
+               lowSum = abs((100*lowSum) / lowLen);\r
+               highSum = abs((100*highSum) / highLen);\r
+               GraphBuffer[i] = (highSum << 16) | lowSum;\r
+       }\r
+\r
+       for(i = 0; i < GraphTraceLen - convLen - 16; i++) {\r
+               int j;\r
+               int lowTot = 0, highTot = 0;\r
+               // 10 and 8 are f_s divided by f_l and f_h, rounded\r
+               for(j = 0; j < 10; j++) {\r
+                       lowTot += (GraphBuffer[i+j] & 0xffff);\r
+               }\r
+               for(j = 0; j < 8; j++) {\r
+                       highTot += (GraphBuffer[i+j] >> 16);\r
+               }\r
+               GraphBuffer[i] = lowTot - highTot;\r
+               if (GraphBuffer[i]>maxMark) maxMark=GraphBuffer[i];\r
+               if (GraphBuffer[i]<minMark) minMark=GraphBuffer[i];\r
+       }\r
+\r
+       GraphTraceLen -= (convLen + 16);\r
+\r
+       RepaintGraphWindow();\r
+\r
+       // Find bit-sync (3 lo followed by 3 high)\r
+       int max = 0, maxPos = 0;\r
+       for(i = 0; i < 6000; i++) {\r
+               int dec = 0;\r
+               for(j = 0; j < 3*arraylen(LowTone); j++) {\r
+                       dec -= GraphBuffer[i+j];\r
+               }\r
+               for(; j < 3*(arraylen(LowTone) + arraylen(HighTone) ); j++) {\r
+                       dec += GraphBuffer[i+j];\r
+               }\r
+               if(dec > max) {\r
+                       max = dec;\r
+                       maxPos = i;\r
+               }\r
+       }\r
+\r
+       // place start of bit sync marker in graph\r
+       GraphBuffer[maxPos] = maxMark;\r
+       GraphBuffer[maxPos+1] = minMark;\r
+\r
+       maxPos += j;\r
+\r
+       // place end of bit sync marker in graph\r
+       GraphBuffer[maxPos] = maxMark;\r
+       GraphBuffer[maxPos+1] = minMark;\r
+\r
+       PrintToScrollback("actual data bits start at sample %d", maxPos);\r
+       PrintToScrollback("length %d/%d", arraylen(HighTone), arraylen(LowTone));\r
+\r
+       BYTE bits[46];\r
+       bits[sizeof(bits)-1] = '\0';\r
+\r
+       // find bit pairs and manchester decode them\r
+       for(i = 0; i < arraylen(bits)-1; i++) {\r
+               int dec = 0;\r
+               for(j = 0; j < arraylen(LowTone); j++) {\r
+                       dec -= GraphBuffer[maxPos+j];\r
+               }\r
+               for(; j < arraylen(LowTone) + arraylen(HighTone); j++) {\r
+                       dec += GraphBuffer[maxPos+j];\r
+               }\r
+               maxPos += j;\r
+               // place inter bit marker in graph\r
+               GraphBuffer[maxPos] = maxMark;\r
+               GraphBuffer[maxPos+1] = minMark;\r
+\r
+               // hi and lo form a 64 bit pair\r
+               hi = (hi<<1)|(lo>>31);\r
+               lo = (lo<<1);\r
+               // store decoded bit as binary (in hi/lo) and text (in bits[])\r
+               if(dec<0) {\r
+                       bits[i] = '1';\r
+                       lo|=1;\r
+               } else {\r
+                       bits[i] = '0';\r
+               }\r
+       }\r
+       PrintToScrollback("bits: '%s'", bits);\r
+       PrintToScrollback("hex: %08x %08x", hi, lo);\r
+}\r
+\r

 static void CmdTidemod(char *cmdline)\r
 {\r
        /* MATLAB as follows:\r
 static void CmdTidemod(char *cmdline)\r
 {\r
        /* MATLAB as follows:\r


@@ -1448,37 +1569,43 @@ h = 2*pi*ones(1, floor(f_s*T_h))*(f_h/f_s);
 l = sign(sin(cumsum(l)));\r
 h = sign(sin(cumsum(h)));\r
        */\r
 l = sign(sin(cumsum(l)));\r
 h = sign(sin(cumsum(h)));\r
        */\r

-       static const int LowTone[] = {\r
-               1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1,\r
-               1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1,\r
-               1, 1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, -1,\r
-               -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1,\r
-               -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1,\r
-               -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, 1,\r
-               1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1,\r
-               1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1,\r
-               1, 1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, -1,\r
-               -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1,\r
-               -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,\r
-               -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, 1,\r
-               1, 1, 1, 1, 1, 1, 1, -1, -1, -1,\r
-       };\r
-       static const int HighTone[] = {\r
-               1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1,\r
-               1, 1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1,\r
-               -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1,\r
-               -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, 1, 1,\r
-               1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1,\r
-               1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, -1, -1,\r
-               -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1,\r
-               -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,\r
-               1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1,\r
-               1, 1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1,\r
-               -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1,\r
-               -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, 1, 1,\r
-               1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1,\r
-               1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1,\r
-       };\r
+ static const int LowTone[] = {\r
+  1,  1,  1,  1,  1,  1,  1,  1,     -1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,  1,     -1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,  1,     -1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,  1,     -1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,  1,  1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,  1,     -1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,  1,     -1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,  1,     -1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,  1,     -1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,  1,     -1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,  1,     -1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,  1,     -1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,  1,     -1, -1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,  1,     -1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,  1,     -1, -1, -1,\r
+ };\r
+ static const int HighTone[] = {\r
+  1,  1,  1,  1,  1,  1,  1,     -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,  1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,  1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,  1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,  1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,     -1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,     -1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,     -1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,     -1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,     -1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,     -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,  1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,  1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,  1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,  1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,     -1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,     -1, -1, -1, -1, -1, -1, -1, -1,\r
+  1,  1,  1,  1,  1,  1,  1,\r
+ };\r

 \r
        int convLen = max(arraylen(HighTone), arraylen(LowTone));\r
 \r
 \r
        int convLen = max(arraylen(HighTone), arraylen(LowTone));\r
 \r


@@ -1550,9 +1677,6 @@ h = sign(sin(cumsum(h)));
 \r
        PrintToScrollback("length %d/%d", arraylen(HighTone), arraylen(LowTone));\r
 \r
 \r
        PrintToScrollback("length %d/%d", arraylen(HighTone), arraylen(LowTone));\r
 \r

-       GraphBuffer[maxPos] = 800;\r
-       GraphBuffer[maxPos+1] = -800;\r
-\r

        BYTE bits[64+16+8+1];\r
        bits[sizeof(bits)-1] = '\0';\r
 \r
        BYTE bits[64+16+8+1];\r
        bits[sizeof(bits)-1] = '\0';\r
 \r


@@ -1667,6 +1791,20 @@ static void CmdZerocrossings(char *str)
        RepaintGraphWindow();\r
 }\r
 \r
        RepaintGraphWindow();\r
 }\r
 \r

+static void CmdThreshold(char *str)\r
+{\r
+       int i;\r
+       int threshold = atoi(str);\r
+\r
+       for(i = 0; i < GraphTraceLen; i++) {\r
+               if(GraphBuffer[i]>= threshold)\r
+                       GraphBuffer[i]=127;\r
+               else\r
+                       GraphBuffer[i]=-128;\r
+       }\r
+       RepaintGraphWindow();\r
+}\r
+\r

 static void CmdLtrim(char *str)\r
 {\r
        int i;\r
 static void CmdLtrim(char *str)\r
 {\r
        int i;\r


@@ -2397,7 +2535,7 @@ static void Cmdmanchesterdemod(char *str) {
                                        return;\r
                                }\r
                        }\r
                                        return;\r
                                }\r
                        }\r

-               }       \r
+               }\r

        }\r
 \r
        PrintToScrollback("Manchester decoded bitstream");\r
        }\r
 \r
        PrintToScrollback("Manchester decoded bitstream");\r


@@ -2423,8 +2561,6 @@ static void Cmdmanchesterdemod(char *str) {
        }\r
 }\r
 \r
        }\r
 }\r
 \r

-\r
-\r

 /*\r
  * Usage ???\r
  */\r
 /*\r
  * Usage ???\r
  */\r


@@ -2583,66 +2719,68 @@ static struct {
        {"askdemod",                    Cmdaskdemod,1,          "<samples per bit> <0|1> -- Attempt to demodulate simple ASK tags"},\r
        {"autocorr",                    CmdAutoCorr,1,          "<window length> -- Autocorrelation over window"},\r
        {"bitsamples",          CmdBitsamples,0,        "    Get raw samples as bitstring"},\r
        {"askdemod",                    Cmdaskdemod,1,          "<samples per bit> <0|1> -- Attempt to demodulate simple ASK tags"},\r
        {"autocorr",                    CmdAutoCorr,1,          "<window length> -- Autocorrelation over window"},\r
        {"bitsamples",          CmdBitsamples,0,        "    Get raw samples as bitstring"},\r

-       {"bitstream",           Cmdbitstream,1,         "[clock rate] -- Convert waveform into a bitstream"},\r
-       {"buffclear",           CmdBuffClear,0,         "    Clear sample buffer and graph window"},\r
-       {"dec",                         CmdDec,1,               "    Decimate samples"},\r
+       {"bitstream",                   Cmdbitstream,1,         "[clock rate] -- Convert waveform into a bitstream"},\r
+       {"buffclear",                   CmdBuffClear,0,         "    Clear sample buffer and graph window"},\r
+       {"dec",                                         CmdDec,1,               "    Decimate samples"},\r

        {"detectclock",         Cmddetectclockrate,1, "    Detect clock rate"},\r
        {"detectclock",         Cmddetectclockrate,1, "    Detect clock rate"},\r

-       {"detectreader",                CmdDetectReader,0, "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)"},\r
-       {"em410xsim",           CmdEM410xsim,1,         "<UID> -- Simulate EM410x tag"},\r
+       {"detectreader",        CmdDetectReader,0, "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)"},\r
+       {"em410xsim",                   CmdEM410xsim,1,         "<UID> -- Simulate EM410x tag"},\r

        {"em410xread",          CmdEM410xread,1,        "[clock rate] -- Extract ID from EM410x tag"},\r
        {"em410xwatch",         CmdEM410xwatch,0,       "    Watches for EM410x tags"},\r
        {"em4x50read",          CmdEM4x50read,1,        "    Extract data from EM4x50 tag"},\r
        {"em410xread",          CmdEM410xread,1,        "[clock rate] -- Extract ID from EM410x tag"},\r
        {"em410xwatch",         CmdEM410xwatch,0,       "    Watches for EM410x tags"},\r
        {"em4x50read",          CmdEM4x50read,1,        "    Extract data from EM4x50 tag"},\r

-       {"exit",                                CmdQuit,1,                      "    Exit program"},\r
-       {"flexdemod",           CmdFlexdemod,1,         "    Demodulate samples for FlexPass"},\r
-       {"fpgaoff",                     CmdFPGAOff,0,           "    Set FPGA off"},                                                    // ## FPGA Control\r
+       {"exit",                                        CmdQuit,1,                      "    Exit program"},\r
+       {"flexdemod",                   CmdFlexdemod,1,         "    Demodulate samples for FlexPass"},\r
+       {"fpgaoff",                             CmdFPGAOff,0,           "    Set FPGA off"},                                                    // ## FPGA Control\r
+       {"fskdemod",                    CmdFSKdemod,1,          "    Demodulate graph window as a HID FSK"},\r

        {"hexsamples",          CmdHexsamples,0,        "<blocks> -- Dump big buffer as hex bytes"},\r
        {"hexsamples",          CmdHexsamples,0,        "<blocks> -- Dump big buffer as hex bytes"},\r

-       {"hi14alist",           CmdHi14alist,0,         "    List ISO 14443a history"},                         // ## New list command\r
+       {"hi14alist",                   CmdHi14alist,0,         "    List ISO 14443a history"},                         // ## New list command\r

        {"hi14areader",         CmdHi14areader,0,       "    Act like an ISO14443 Type A reader"},      // ## New reader command\r
        {"hi14asim",                    CmdHi14asim,0,          "<UID> -- Fake ISO 14443a tag"},                                        // ## Simulate 14443a tag\r
        {"hi14asnoop",          CmdHi14asnoop,0,        "    Eavesdrop ISO 14443 Type A"},                      // ## New snoop command\r
        {"hi14bdemod",          CmdHi14bdemod,1,        "    Demodulate ISO14443 Type B from tag"},\r
        {"hi14list",                    CmdHi14list,0,          "    List ISO 14443 history"},\r
        {"hi14read",                    CmdHi14read,0,          "    Read HF tag (ISO 14443)"},\r
        {"hi14areader",         CmdHi14areader,0,       "    Act like an ISO14443 Type A reader"},      // ## New reader command\r
        {"hi14asim",                    CmdHi14asim,0,          "<UID> -- Fake ISO 14443a tag"},                                        // ## Simulate 14443a tag\r
        {"hi14asnoop",          CmdHi14asnoop,0,        "    Eavesdrop ISO 14443 Type A"},                      // ## New snoop command\r
        {"hi14bdemod",          CmdHi14bdemod,1,        "    Demodulate ISO14443 Type B from tag"},\r
        {"hi14list",                    CmdHi14list,0,          "    List ISO 14443 history"},\r
        {"hi14read",                    CmdHi14read,0,          "    Read HF tag (ISO 14443)"},\r

-       {"hi14sim",                     CmdHi14sim,0,           "    Fake ISO 14443 tag"},\r
-       {"hi14snoop",           CmdHi14snoop,0,         "    Eavesdrop ISO 14443"},\r
-       {"hi15demod",           CmdHi15demod,1,         "    Demodulate ISO15693 from tag"},\r
+       {"hi14sim",                             CmdHi14sim,0,           "    Fake ISO 14443 tag"},\r
+       {"hi14snoop",                   CmdHi14snoop,0,         "    Eavesdrop ISO 14443"},\r
+       {"hi15demod",                   CmdHi15demod,1,         "    Demodulate ISO15693 from tag"},\r

        {"hi15read",                    CmdHi15read,0,          "    Read HF tag (ISO 15693)"},\r
        {"hi15reader",          CmdHi15reader,0,        "    Act like an ISO15693 reader"}, // new command greg\r
        {"hi15read",                    CmdHi15read,0,          "    Read HF tag (ISO 15693)"},\r
        {"hi15reader",          CmdHi15reader,0,        "    Act like an ISO15693 reader"}, // new command greg\r

-       {"hi15sim",                     CmdHi15tag,0,           "    Fake an ISO15693 tag"}, // new command greg\r
+       {"hi15sim",                             CmdHi15tag,0,           "    Fake an ISO15693 tag"}, // new command greg\r

        {"hiddemod",                    CmdHiddemod,1,          "    Demodulate HID Prox Card II (not optimal)"},\r
        {"hiddemod",                    CmdHiddemod,1,          "    Demodulate HID Prox Card II (not optimal)"},\r

-       {"hide",                                CmdHide,1,              "    Hide graph window"},\r
+       {"hide",                                        CmdHide,1,              "    Hide graph window"},\r

        {"hidfskdemod",         CmdHIDdemodFSK,0,       "    Realtime HID FSK demodulator"},\r
        {"hidfskdemod",         CmdHIDdemodFSK,0,       "    Realtime HID FSK demodulator"},\r

-       {"hidsimtag",           CmdHIDsimTAG,0,         "<ID> -- HID tag simulator"},\r
-       {"higet",                       CmdHi14read_sim,0,      "<samples> -- Get samples HF, 'analog'"},\r
-       {"hisamples",           CmdHisamples,0,         "    Get raw samples for HF tag"},\r
+       {"hidsimtag",                   CmdHIDsimTAG,0,         "<ID> -- HID tag simulator"},\r
+       {"higet",                                       CmdHi14read_sim,0,      "<samples> -- Get samples HF, 'analog'"},\r
+       {"hisamples",                   CmdHisamples,0,         "    Get raw samples for HF tag"},\r

        {"hisampless",          CmdHisampless,0,        "<samples> -- Get signed raw samples, HF tag"},\r
        {"hisamplest",          CmdHi14readt,0,         "    Get samples HF, for testing"},\r
        {"hisimlisten",         CmdHisimlisten,0,       "    Get HF samples as fake tag"},\r
        {"hisampless",          CmdHisampless,0,        "<samples> -- Get signed raw samples, HF tag"},\r
        {"hisamplest",          CmdHi14readt,0,         "    Get samples HF, for testing"},\r
        {"hisimlisten",         CmdHisimlisten,0,       "    Get HF samples as fake tag"},\r

-       {"hpf",                         CmdHpf,1,               "    Remove DC offset from trace"},\r
+       {"hpf",                                         CmdHpf,1,               "    Remove DC offset from trace"},\r

        {"indalademod",         CmdIndalademod,0,         "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},\r
        {"indalademod",         CmdIndalademod,0,         "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},\r

-       {"lcd",                         CmdLcd,0,                       "<HEX command> <count> -- Send command/data to LCD"},\r
+       {"lcd",                                         CmdLcd,0,                       "<HEX command> <count> -- Send command/data to LCD"},\r

        {"lcdreset",                    CmdLcdReset,0,          "    Hardware reset LCD"},\r
        {"lcdreset",                    CmdLcdReset,0,          "    Hardware reset LCD"},\r

-       {"load",                                CmdLoad,1,              "<filename> -- Load trace (to graph window"},\r
+       {"load",                                        CmdLoad,1,              "<filename> -- Load trace (to graph window"},\r

        {"locomread",                   CmdLoCommandRead,0,             "<off period> <'0' period> <'1' period> <command> ['h'] -- Modulate LF reader field to send command before read (all periods in microseconds) (option 'h' for 134)"},\r
        {"locomread",                   CmdLoCommandRead,0,             "<off period> <'0' period> <'1' period> <command> ['h'] -- Modulate LF reader field to send command before read (all periods in microseconds) (option 'h' for 134)"},\r

-       {"loread",                      CmdLoread,0,            "['h'] -- Read 125/134 kHz LF ID-only tag (option 'h' for 134)"},\r
-       {"losamples",           CmdLosamples,0,         "[128 - 16000] -- Get raw samples for LF tag"},\r
-       {"losim",                       CmdLosim,0,             "    Simulate LF tag"},\r
-       {"ltrim",                       CmdLtrim,1,             "<samples> -- Trim samples from left of trace"},\r
+       {"loread",                              CmdLoread,0,            "['h'] -- Read 125/134 kHz LF ID-only tag (option 'h' for 134)"},\r
+       {"losamples",                   CmdLosamples,0,         "[128 - 16000] -- Get raw samples for LF tag"},\r
+       {"losim",                                       CmdLosim,0,             "    Simulate LF tag"},\r
+       {"ltrim",                                       CmdLtrim,1,             "<samples> -- Trim samples from left of trace"},\r

        {"mandemod",                    Cmdmanchesterdemod,1,   "[i] [clock rate] -- Manchester demodulate binary stream (option 'i' to invert output)"},\r
        {"mandemod",                    Cmdmanchesterdemod,1,   "[i] [clock rate] -- Manchester demodulate binary stream (option 'i' to invert output)"},\r

-       {"manmod",                      Cmdmanchestermod,1,     "[clock rate] -- Manchester modulate a binary stream"},\r
-       {"norm",                                CmdNorm,1,              "    Normalize max/min to +/-500"},\r
-       {"plot",                                CmdPlot,1,              "    Show graph window"},\r
-       {"quit",                                CmdQuit,1,                      "    Quit program"},\r
-       {"readmem",                     CmdReadmem,0,                   "    [address] -- Read memory at decimal address from flash"},\r
-       {"reset",                       CmdReset,0,                     "    Reset the Proxmark3"},\r
-       {"save",                                CmdSave,1,              "<filename> -- Save trace (from graph window)"},\r
-       {"scale",                       CmdScale,1,             "<int> -- Set cursor display scale"},\r
-       {"setlfdivisor",                CmdSetDivisor,0,        "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},\r
+       {"manmod",                              Cmdmanchestermod,1,     "[clock rate] -- Manchester modulate a binary stream"},\r
+       {"norm",                                        CmdNorm,1,              "    Normalize max/min to +/-500"},\r
+       {"plot",                                        CmdPlot,1,              "    Show graph window"},\r
+       {"quit",                                        CmdQuit,1,                      "    Quit program"},\r
+       {"readmem",                             CmdReadmem,0,                   "    [address] -- Read memory at decimal address from flash"},\r
+       {"reset",                                       CmdReset,0,                     "    Reset the Proxmark3"},\r
+       {"save",                                        CmdSave,1,              "<filename> -- Save trace (from graph window)"},\r
+       {"scale",                                       CmdScale,1,             "<int> -- Set cursor display scale"},\r
+       {"setlfdivisor",        CmdSetDivisor,0,        "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},\r

        {"sri512read",          CmdSri512read,0,        "<int> -- Read contents of a SRI512 tag"},\r
        {"sri512read",          CmdSri512read,0,        "<int> -- Read contents of a SRI512 tag"},\r

-       {"tibits",                      CmdTibits,0,            "    Get raw bits for TI-type LF tag"},\r
-       {"tidemod",                     CmdTidemod,0,           "    Demodulate raw bits for TI-type LF tag"},\r
-       {"tiread",                      CmdTiread,0,            "    Read a TI-type 134 kHz tag"},\r
-       {"tune",                                CmdTune,0,              "    Measure antenna tuning"},\r
+       {"tibits",                              CmdTibits,0,            "    Get raw bits for TI-type LF tag"},\r
+       {"tidemod",                             CmdTidemod,1,           "    Demodulate raw bits for TI-type LF tag"},\r
+       {"tiread",                              CmdTiread,0,            "    Read a TI-type 134 kHz tag"},\r
+       {"threshold",                   CmdThreshold,1,         "    Maximize/minimize every value in the graph window depending on threshold"},\r
+       {"tune",                                        CmdTune,0,              "    Measure antenna tuning"},\r

        {"vchdemod",                    CmdVchdemod,0,          "['clone'] -- Demodulate samples for VeriChip"},\r
        {"zerocrossings",       CmdZerocrossings,1,     "    Count time between zero-crossings"},\r
 };\r
        {"vchdemod",                    CmdVchdemod,0,          "['clone'] -- Demodulate samples for VeriChip"},\r
        {"zerocrossings",       CmdZerocrossings,1,     "    Count time between zero-crossings"},\r
 };\r


@@ -2756,11 +2894,11 @@ void UsbCommandReceived(UsbCommand *c)
                        PrintToScrollback("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1));\r
                        PrintToScrollback("# HF antenna: %5.2f V @    13.56 MHz", vHf/1000.0);\r
                        if (peakv<2000)\r
                        PrintToScrollback("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1));\r
                        PrintToScrollback("# HF antenna: %5.2f V @    13.56 MHz", vHf/1000.0);\r
                        if (peakv<2000)\r

-                               PrintToScrollback("# Your LF antenna is unusable."); \r
+                               PrintToScrollback("# Your LF antenna is unusable.");\r

                        else if (peakv<10000)\r
                                PrintToScrollback("# Your LF antenna is marginal.");\r
                        if (vHf<2000)\r
                        else if (peakv<10000)\r
                                PrintToScrollback("# Your LF antenna is marginal.");\r
                        if (vHf<2000)\r

-                               PrintToScrollback("# Your HF antenna is unusable."); \r
+                               PrintToScrollback("# Your HF antenna is unusable.");\r

                        else if (vHf<5000)\r
                                PrintToScrollback("# Your HF antenna is marginal.");\r
                        break;\r
                        else if (vHf<5000)\r
                                PrintToScrollback("# Your HF antenna is marginal.");\r
                        break;\r