]> cvs.zerfleddert.de Git - proxmark3-svn/commitdiff
Merge branch 'master' of https://github.com/Proxmark/proxmark3
authoriceman1001 <iceman@iuse.se>
Tue, 10 Feb 2015 20:53:16 +0000 (21:53 +0100)
committericeman1001 <iceman@iuse.se>
Tue, 10 Feb 2015 20:53:16 +0000 (21:53 +0100)
Conflicts:
armsrc/appmain.c
armsrc/iclass.c

1  2 
armsrc/appmain.c
armsrc/apps.h
armsrc/hitag2.c
armsrc/iclass.c
armsrc/iso14443.c
armsrc/iso14443a.h
armsrc/util.c
client/cmdlft55xx.c
client/ui.c

index 31e17e880a5c12eed13aaa5d2d569090ba360654,43f1df0203151d94c0c6864819e479b9459ef4a3..f19840b8e13edfd9b6df80ceaa06cff2023b803d
  #include <stdarg.h>
  
  #include "legicrf.h"
 -#include <hitag2.h>
 +#include "../include/hitag2.h"
  #include "lfsampling.h"
+ #include "BigBuf.h"
  #ifdef WITH_LCD
   #include "LCD.h"
  #endif
diff --cc armsrc/apps.h
Simple merge
diff --cc armsrc/hitag2.c
index f9005c7176bcfe412526dca28e5a9bc221b89598,4b173d6f223845620eeb47e96e35c89ffb78f628..2d0645658c2dc2d2b68cf35f8f295308cf364925
  // (c) 2012 Roel Verdult
  //-----------------------------------------------------------------------------
  
 -#include "proxmark3.h"
 +#include "../include/proxmark3.h"
  #include "apps.h"
  #include "util.h"
 -#include "hitag2.h"
 +#include "../include/hitag2.h"
  #include "string.h"
+ #include "BigBuf.h"
  
  static bool bQuiet;
  
diff --cc armsrc/iclass.c
index c0edc1e08db6156c57060a94961efcf93f8d69d6,41c9b8b51e6b700771e17ff1bd31de5c077e3c4d..67130804910a13428772e31189182d3874d1c7af
@@@ -654,12 -652,11 +654,11 @@@ void RAMFUNC SnoopIClass(void
      // The DMA buffer, used to stream samples from the FPGA
      uint8_t *dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
   
-     // reset traceLen to 0
-     iso14a_set_tracing(TRUE);
-     iso14a_clear_trace();
+       set_tracing(TRUE);
+       clear_trace();
      iso14a_set_trigger(FALSE);
  
 -      int lastRxCounter;
 +    int lastRxCounter;
      uint8_t *upTo;
      int smpl;
      int maxBehindBy = 0;
Simple merge
Simple merge
diff --cc armsrc/util.c
Simple merge
index c023d57f6a06467bc9ba16e47f303eeda00994b8,a719c7ad7a56e4a6216e910aa4d28cad3069007d..b6b5ea444e49981666a42a9f311671baa7f82f92
  #include "cmddata.h"\r
  #include "cmdlf.h"\r
  #include "cmdlft55xx.h"\r
 +#include "util.h"\r
 +#include "data.h"\r
 +#include "lfdemod.h"\r
  \r
\r
 -static int CmdHelp(const char *Cmd);\r
 +#define LF_TRACE_BUFF_SIZE 20000 // 32 x 32 x 10  (32 bit times numofblock (7), times clock skip..)\r
 +#define LF_BITSSTREAM_LEN 1000 // more then 1000 bits shouldn't happend..  8block * 4 bytes * 8bits = \r
- static int CmdHelp(const char *Cmd);\r
 +\r
- // int CmdReadBlk(const char *Cmd)\r
- // {\r
-       // int block = -1;\r
-       // sscanf(Cmd, "%d", &block);\r
\r
-       // if ((block > 7) | (block < 0)) {\r
-               // PrintAndLog("Block must be between 0 and 7");\r
-               // return 1;\r
-       // }    \r
\r
-       // UsbCommand c;\r
-       // c.cmd = CMD_T55XX_READ_BLOCK;\r
-       // c.d.asBytes[0] = 0x00;\r
-       // c.arg[0] = 0;\r
-       // c.arg[1] = block;\r
-       // c.arg[2] = 0;\r
-       // SendCommand(&c);\r
-       // WaitForResponse(CMD_ACK, NULL);\r
-       \r
-       // uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};\r
-       \r
-       // GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,0);  //3560 -- should be offset..\r
-       // WaitForResponseTimeout(CMD_ACK,NULL, 1500);\r
\r
-       // for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {\r
-               // GraphBuffer[j] = (int)data[j];\r
-       // }\r
-       // GraphTraceLen = LF_TRACE_BUFF_SIZE;\r
-       // ManchesterDemod(block);\r
-       // RepaintGraphWindow();\r
-   // return 0;\r
- // }\r
++int usage_t55xx_rd(){\r
++      PrintAndLog("Usage:  lf t55xx rd <block> <password>");\r
++    PrintAndLog("     <block>, block number to read. Between 0-7");\r
++    PrintAndLog("     <password>, OPTIONAL password (8 hex characters)");\r
++    PrintAndLog("");\r
++    PrintAndLog("    sample: lf t55xx rd 0           = try reading data from block 0");\r
++      PrintAndLog("          : lf t55xx rd 0 feedbeef  = try reading data from block 0 using password");\r
++      PrintAndLog("");\r
++      return 0;\r
++}\r
++int usage_t55xx_wr(){\r
++      PrintAndLog("Usage:  lf t55xx wr <block> <data> [password]");\r
++    PrintAndLog("     <block>, block number to read. Between 0-7");\r
++      PrintAndLog("     <data>,  4 bytes of data to write (8 hex characters)");\r
++    PrintAndLog("     [password], OPTIONAL password 4bytes (8 hex characters)");\r
++    PrintAndLog("");\r
++    PrintAndLog("    sample: lf t55xx wd 3 11223344  = try writing data 11223344 to block 3");\r
++      PrintAndLog("          : lf t55xx wd 3 11223344 feedbeef  = try writing data 11223344 to block 3 using password feedbeef");\r
++      PrintAndLog("");\r
++      return 0;\r
++}\r
++int usage_t55xx_trace() {\r
++      PrintAndLog("Usage:  lf t55xx trace  [graph buffer data]");\r
++      PrintAndLog("     [graph buffer data], if set, use Graphbuffer otherwise read data from tag.");\r
++      PrintAndLog("");\r
++      PrintAndLog("     sample: lf t55xx trace");\r
++      PrintAndLog("           : lf t55xx trace 1");\r
++      PrintAndLog("");\r
++      return 0;\r
++}\r
++int usage_t55xx_info() {\r
++      PrintAndLog("Usage:  lf t55xx info [graph buffer data]");\r
++      PrintAndLog("     [graph buffer data], if set, use Graphbuffer otherwise read data from tag.");\r
++      PrintAndLog("");\r
++      PrintAndLog("    sample: lf t55xx info");\r
++      PrintAndLog("          : lf t55xx info 1");\r
++      PrintAndLog("");\r
++      return 0;\r
++}\r
\r
++int usage_t55xx_dump(){\r
++      PrintAndLog("Usage:  lf t55xx dump <password>");\r
++    PrintAndLog("     <password>, OPTIONAL password 4bytes (8 hex characters)");\r
++      PrintAndLog("");\r
++      PrintAndLog("        sample: lf t55xx dump");\r
++      PrintAndLog("              : lf t55xx dump feedbeef");\r
++      PrintAndLog("");\r
++      return 0;\r
++}\r
++static int CmdHelp(const char *Cmd);\r
  \r
  int CmdReadBlk(const char *Cmd)\r
  {\r
 -  int Block = 8; //default to invalid block\r
 -  UsbCommand c;\r
 +      int invert = 0;\r
 +      int clk = 0;\r
 +      int block = -1;\r
++      int password = 0xFFFFFFFF; //default to blank Block 7\r
 +      int errCnt;\r
 +      size_t bitlen;\r
-       //int decodedBitlen;\r
++      int maxErr = 100;\r
++    uint8_t askAmp = 0;\r
 +      uint32_t blockData;\r
 +      uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
 +      \r
-       sscanf(Cmd, "%d", &block);\r
 +      \r
-       if ((block > 7) | (block < 0)) {\r
++      char cmdp = param_getchar(Cmd, 0);\r
++      if (cmdp == 'h' || cmdp == 'H') {\r
++              usage_t55xx_rd();\r
++              return 0;\r
++      }\r
\r
 -  sscanf(Cmd, "%d", &Block);\r
++      int res = sscanf(Cmd, "%d %x", &block, &password);\r
\r
 -  if (Block > 7) {\r
 -      PrintAndLog("Block must be between 0 and 7");\r
 -      return 1;\r
 -  }   \r
++      if ( res < 1 || res > 2 ){\r
++              usage_t55xx_rd();\r
++              return 1;\r
++      }\r
++      \r
++      if ((block < 0) | (block > 7)) {\r
 +              PrintAndLog("Block must be between 0 and 7");\r
 +              return 1;\r
++      }       \r
\r
 -  PrintAndLog("Reading block %d", Block);\r
++      UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, block, 0}};\r
++      c.d.asBytes[0] = 0x0; \r
\r
 -  c.cmd = CMD_T55XX_READ_BLOCK;\r
 -  c.d.asBytes[0] = 0x0; //Normal mode\r
 -  c.arg[0] = 0;\r
 -  c.arg[1] = Block;\r
 -  c.arg[2] = 0;\r
 -  SendCommand(&c);\r
 -  return 0;\r
 -}\r
++      //Password mode\r
++      if ( res == 2 ) {\r
++              c.arg[2] = password;\r
++              c.d.asBytes[0] = 0x1; \r
 +      }\r
  \r
-       UsbCommand c = { CMD_T55XX_READ_BLOCK, { 0, block, 0 } };\r
 -int CmdReadBlkPWD(const char *Cmd)\r
 -{\r
 -  int Block = 8; //default to invalid block\r
 -  int Password = 0xFFFFFFFF; //default to blank Block 7\r
 -  UsbCommand c;\r
 +      SendCommand(&c);\r
 +      if ( !WaitForResponseTimeout(CMD_ACK,NULL,1500) ) {\r
 +              PrintAndLog("command execution time out");\r
 +              return 2;\r
 +      }\r
 +      \r
 +      CmdSamples("12000");\r
  \r
 -  sscanf(Cmd, "%d %x", &Block, &Password);\r
 +      bitlen = getFromGraphBuf(bits);\r
 +      \r
-       errCnt = askrawdemod(bits, &bitlen, &clk, &invert);\r
++      errCnt = askrawdemod(bits, &bitlen, &clk, &invert, maxErr, askAmp);\r
 +      \r
 +      //throw away static - allow 1 and -1 (in case of threshold command first)\r
 +      if ( errCnt == -1 || bitlen < 16 ){  \r
 +              PrintAndLog("no data found");\r
 +              if (g_debugMode) \r
 +                      PrintAndLog("errCnt: %d, bitlen: %d, clk: %d, invert: %d", errCnt, bitlen, clk, invert);\r
 +              return 3;\r
 +      }\r
 +      if (g_debugMode) \r
 +              PrintAndLog("Using Clock: %d - invert: %d - Bits Found: %d", clk, invert, bitlen);\r
  \r
 -  if (Block > 7) {\r
 -      PrintAndLog("Block must be between 0 and 7");\r
 -      return 1;\r
 -  }   \r
 +      //move bits back to DemodBuffer\r
 +      setDemodBuf(bits, bitlen, 0);\r
 +      printBitStream(bits,bitlen);\r
 +      \r
 +      // bits has the manchester encoded data.\r
 +      errCnt = manrawdecode(bits, &bitlen);   \r
 +      if ( errCnt == -1 || bitlen < 16 ){  \r
 +              PrintAndLog("no data found");\r
 +              if (g_debugMode) \r
 +                      PrintAndLog("errCnt: %d, bitlen: %d, clk: %d, invert: %d", errCnt, bitlen, clk, invert);\r
 +              return 4;\r
 +      }\r
  \r
 -  PrintAndLog("Reading block %d with password %08X", Block, Password);\r
 +      blockData = PackBits(0, 32, bits);\r
  \r
 -  c.cmd = CMD_T55XX_READ_BLOCK;\r
 -  c.d.asBytes[0] = 0x1; //Password mode\r
 -  c.arg[0] = 0;\r
 -  c.arg[1] = Block;\r
 -  c.arg[2] = Password;\r
 -  SendCommand(&c);\r
 -  return 0;\r
 +      if ( block < 0)\r
 +              PrintAndLog(" Decoded     : 0x%08X  %s", blockData, sprint_bin(bits,32) );\r
 +      else\r
 +              PrintAndLog(" Block %d    : 0x%08X  %s", block, blockData, sprint_bin(bits,32) );\r
 +      \r
 +      return 0;\r
  }\r
  \r
- int CmdReadBlkPWD(const char *Cmd)\r
+ int CmdWriteBlk(const char *Cmd)\r
  {\r
-       int Block = -1; //default to invalid block\r
-       int Password = 0xFFFFFFFF; //default to blank Block 7\r
\r
\r
-       sscanf(Cmd, "%d %x", &Block, &Password);\r
 -  int Block = 8; //default to invalid block\r
 -  int Data = 0xFFFFFFFF; //default to blank Block \r
 -  UsbCommand c;\r
++      int block = 8; //default to invalid block\r
++      int data = 0xFFFFFFFF; //default to blank Block \r
++      int password = 0xFFFFFFFF; //default to blank Block 7\r
++      \r
++      char cmdp = param_getchar(Cmd, 0);\r
++      if (cmdp == 'h' || cmdp == 'H') {\r
++              usage_t55xx_wr();\r
++              return 0;\r
++      }\r
++  \r
++      int res = sscanf(Cmd, "%d %x %x",&block, &data, &password);\r
++      \r
++      if ( res < 2 || res > 3) {\r
++              usage_t55xx_wr();\r
++              return 1;\r
++      }\r
  \r
-       if ((Block > 7) | (Block < 0)) {\r
 -  sscanf(Cmd, "%x %d", &Data, &Block);\r
++      if (block > 7) {\r
 +              PrintAndLog("Block must be between 0 and 7");\r
 +              return 1;\r
-       }       \r
\r
-       PrintAndLog("Reading page 0 block %d pwd %08X", Block, Password);\r
\r
-       UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, Block, Password} };\r
-       c.d.asBytes[0] = 0x1; //Password mode\r
-       SendCommand(&c);\r
-       WaitForResponse(CMD_ACK, NULL);\r
-               \r
-       uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};\r
\r
-       GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,0);\r
-       WaitForResponseTimeout(CMD_ACK,NULL, 1500);\r
\r
-       for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {\r
-               GraphBuffer[j] = ((int)data[j]);\r
 +      }\r
-       GraphTraceLen = LF_TRACE_BUFF_SIZE;\r
-       ManchesterDemod(Block); \r
\r
-       RepaintGraphWindow();\r
-   return 0;\r
- }\r
\r
- int CmdWriteBlk(const char *Cmd)\r
- {\r
-   int Block = 8; //default to invalid block\r
-   int Data = 0xFFFFFFFF; //default to blank Block \r
\r
-       sscanf(Cmd, "%d %x", &Block, &Data);\r
\r
-   if (Block > 7) {\r
-       PrintAndLog("Block must be between 0 and 7");\r
-       return 1;\r
-   }   \r
\r
-       PrintAndLog("Writing block %d  data %08X", Block, Data);\r
\r
-       UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {Data, Block, 0}};\r
-   c.d.asBytes[0] = 0x0; //Normal mode\r
-   SendCommand(&c);\r
-   return 0;\r
- }\r
\r
- int CmdWriteBlkPWD(const char *Cmd)\r
- {\r
-   int Block = 8; //default to invalid block\r
-   int Data = 0xFFFFFFFF; //default to blank Block \r
-   int Password = 0xFFFFFFFF; //default to blank Block 7\r
\r
\r
-       sscanf(Cmd, "%d %x %x",&Block, &Data, &Password);\r
\r
-   if (Block > 7) {\r
-       PrintAndLog("Block must be between 0 and 7");\r
-       return 1;\r
-   }   \r
\r
-       PrintAndLog("Writing block %d  data %08X  password %08X", Block, Data, Password);\r
\r
-       UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {Data, Block, Password}};\r
-   c.d.asBytes[0] = 0x1; //Password mode\r
-   SendCommand(&c);\r
-   return 0;\r
++      \r
++      UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};\r
++      c.d.asBytes[0] = 0x0; \r
\r
 -  if (Block > 7) {\r
 -      PrintAndLog("Block must be between 0 and 7");\r
 -      return 1;\r
 -  }   \r
++      if (res == 2) {\r
++              PrintAndLog("Writing block %d  data %08X", block, data);\r
++      } else {\r
++              //Password mode\r
++              c.arg[2] = password;\r
++              c.d.asBytes[0] = 0x1; \r
++              PrintAndLog("Writing block %d  data %08X  password %08X", block, data, password);\r
++      }\r
++      \r
++      SendCommand(&c);\r
++      return 0;\r
 +}\r
 +\r
 +int CmdReadTrace(const char *Cmd)\r
 +{\r
 +      char cmdp = param_getchar(Cmd, 0);\r
 +\r
 +      if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {\r
-               PrintAndLog("Usage:  lf t55xx trace  [use data from Graphbuffer]");\r
-               PrintAndLog("     [use data from Graphbuffer], if not set, try reading data from tag.");\r
-               PrintAndLog("");\r
-               PrintAndLog("     sample: lf t55xx trace");\r
-               PrintAndLog("           : lf t55xx trace 1");\r
++              usage_t55xx_trace();\r
 +              return 0;\r
 +      }\r
 +\r
 +      if ( strlen(Cmd)==0){\r
 +      \r
 +              UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};\r
 +              SendCommand(&c);\r
 +              WaitForResponse(CMD_ACK, NULL);\r
  \r
 -  PrintAndLog("Writting block %d with data %08X", Block, Data);\r
 +              uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};\r
  \r
 -  c.cmd = CMD_T55XX_WRITE_BLOCK;\r
 -  c.d.asBytes[0] = 0x0; //Normal mode\r
 -  c.arg[0] = Data;\r
 -  c.arg[1] = Block;\r
 -  c.arg[2] = 0;\r
 -  SendCommand(&c);\r
 +              GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,0);  //3560 -- should be offset..\r
 +              WaitForResponseTimeout(CMD_ACK,NULL, 1500);\r
 +\r
 +              for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {\r
 +                      GraphBuffer[j] = ((int)data[j]);\r
 +              }\r
 +              GraphTraceLen = LF_TRACE_BUFF_SIZE;\r
 +      }\r
 +      \r
 +      uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};\r
 +      uint8_t * bitstream = bits;\r
 +      \r
 +      manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream, LF_BITSSTREAM_LEN);\r
 +      RepaintGraphWindow();\r
 +\r
 +      uint8_t si = 5;\r
 +      uint32_t bl0     = PackBits(si, 32, bitstream);\r
 +      uint32_t bl1     = PackBits(si+32, 32, bitstream);\r
 +      \r
 +      uint32_t acl     = PackBits(si,  8, bitstream); si += 8;\r
 +      uint32_t mfc     = PackBits(si, 8, bitstream); si += 8;\r
 +      uint32_t cid     = PackBits(si, 5, bitstream); si += 5;\r
 +      uint32_t icr     = PackBits(si, 3, bitstream); si += 3;\r
 +      uint32_t year    = PackBits(si, 4, bitstream); si += 4;\r
 +      uint32_t quarter = PackBits(si, 2, bitstream); si += 2;\r
 +      uint32_t lotid    = PackBits(si, 12, bitstream); si += 12;\r
 +      uint32_t wafer   = PackBits(si, 5, bitstream); si += 5;\r
 +      uint32_t dw      = PackBits(si, 15, bitstream); \r
 +      \r
 +      PrintAndLog("");\r
 +      PrintAndLog("-- T55xx Trace Information ----------------------------------");\r
 +      PrintAndLog("-------------------------------------------------------------");\r
 +      PrintAndLog(" ACL Allocation class (ISO/IEC 15963-1)  : 0x%02X (%d)", acl, acl);\r
 +      PrintAndLog(" MFC Manufacturer ID (ISO/IEC 7816-6)    : 0x%02X (%d)", mfc, mfc);\r
 +      PrintAndLog(" CID                                     : 0x%02X (%d)", cid, cid);\r
 +      PrintAndLog(" ICR IC Revision                         : %d",icr );\r
 +      PrintAndLog(" Manufactured");\r
 +      PrintAndLog("     Year/Quarter : %d/%d",2000+year, quarter );\r
 +      PrintAndLog("     Lot ID       : %d", lotid );\r
 +      PrintAndLog("     Wafer number : %d", wafer);\r
 +      PrintAndLog("     Die Number   : %d", dw);\r
 +      PrintAndLog("-------------------------------------------------------------");\r
 +      PrintAndLog(" Raw Data - Page 1");\r
 +      PrintAndLog("     Block 0  : 0x%08X  %s", bl0, sprint_bin(bitstream+5,32) );\r
 +      PrintAndLog("     Block 0  : 0x%08X  %s", bl1, sprint_bin(bitstream+37,32) );\r
 +      PrintAndLog("-------------------------------------------------------------");\r
 +      /*\r
 +      TRACE - BLOCK O\r
 +              Bits    Definition                                                              HEX\r
 +              1-8             ACL Allocation class (ISO/IEC 15963-1)  0xE0 \r
 +              9-16    MFC Manufacturer ID (ISO/IEC 7816-6)    0x15 Atmel Corporation\r
 +              17-21   CID                                                                             0x1 = Atmel ATA5577M1  0x2 = Atmel ATA5577M2 \r
 +              22-24   ICR IC revision\r
 +              25-28   YEAR (BCD encoded)                                              9 (= 2009)\r
 +              29-30   QUARTER                                                                 1,2,3,4 \r
 +              31-32   LOT ID\r
 +      \r
 +      TRACE - BLOCK 1\r
 +              1-12    LOT ID  \r
 +              13-17   Wafer number\r
 +              18-32   DW,  die number sequential\r
 +      */\r
 +      \r
    return 0;\r
  }\r
  \r
 -int CmdWriteBlkPWD(const char *Cmd)\r
 -{\r
 -  int Block = 8; //default to invalid block\r
 -  int Data = 0xFFFFFFFF; //default to blank Block \r
 -  int Password = 0xFFFFFFFF; //default to blank Block 7\r
 -  UsbCommand c;\r
 -\r
 -  sscanf(Cmd, "%x %d %x", &Data, &Block, &Password);\r
 -\r
 -  if (Block > 7) {\r
 -      PrintAndLog("Block must be between 0 and 7");\r
 -      return 1;\r
 -  }   \r
 -\r
 -  PrintAndLog("Writting block %d with data %08X and password %08X", Block, Data, Password);\r
 -\r
 -  c.cmd = CMD_T55XX_WRITE_BLOCK;\r
 -  c.d.asBytes[0] = 0x1; //Password mode\r
 -  c.arg[0] = Data;\r
 -  c.arg[1] = Block;\r
 -  c.arg[2] = Password;\r
 -  SendCommand(&c);\r
 -  return 0;\r
 +int CmdInfo(const char *Cmd){\r
 +      /*\r
 +              Page 0 Block 0 Configuration data.\r
 +              Normal mode\r
 +              Extended mode\r
 +      */\r
 +      char cmdp = param_getchar(Cmd, 0);\r
 +\r
 +      if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {\r
-               PrintAndLog("Usage:  lf t55xx info  [use data from Graphbuffer]");\r
-               PrintAndLog("     [use data from Graphbuffer], if not set, try reading data from tag.");\r
-               PrintAndLog("");\r
-               PrintAndLog("    sample: lf t55xx info");\r
-               PrintAndLog("    sample: lf t55xx info 1");\r
++              usage_t55xx_info();\r
 +              return 0;\r
-       }\r
\r
-       if ( strlen(Cmd) == 0 ){\r
++      } else {\r
 +              CmdReadBlk("0");\r
 +      }       \r
 +\r
 +      uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};\r
 +\r
 +      manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bits, LF_BITSSTREAM_LEN);\r
 +      \r
 +      uint8_t si = 5;\r
 +      uint32_t bl0      = PackBits(si, 32, bits);\r
 +      \r
 +      uint32_t safer    = PackBits(si, 4, bits); si += 4;     \r
 +      uint32_t resv     = PackBits(si, 7, bits); si += 7;\r
 +      uint32_t dbr      = PackBits(si, 3, bits); si += 3;\r
 +      uint32_t extend   = PackBits(si, 1, bits); si += 1;\r
 +      uint32_t datamodulation   = PackBits(si, 5, bits); si += 5;\r
 +      uint32_t pskcf    = PackBits(si, 2, bits); si += 2;\r
 +      uint32_t aor      = PackBits(si, 1, bits); si += 1;     \r
 +      uint32_t otp      = PackBits(si, 1, bits); si += 1;     \r
 +      uint32_t maxblk   = PackBits(si, 3, bits); si += 3;\r
 +      uint32_t pwd      = PackBits(si, 1, bits); si += 1;     \r
 +      uint32_t sst      = PackBits(si, 1, bits); si += 1;     \r
 +      uint32_t fw       = PackBits(si, 1, bits); si += 1;\r
 +      uint32_t inv      = PackBits(si, 1, bits); si += 1;     \r
 +      uint32_t por      = PackBits(si, 1, bits); si += 1;\r
 +              \r
 +      PrintAndLog("");\r
 +      PrintAndLog("-- T55xx Configuration & Tag Information --------------------");\r
 +      PrintAndLog("-------------------------------------------------------------");\r
 +      PrintAndLog(" Safer key                 : %s", GetSaferStr(safer));\r
 +      PrintAndLog(" reserved                  : %d", resv);\r
 +      PrintAndLog(" Data bit rate             : %s", GetBitRateStr(dbr));\r
 +      PrintAndLog(" eXtended mode             : %s", (extend) ? "Yes - Warning":"No");\r
 +      PrintAndLog(" Modulation                : %s", GetModulationStr(datamodulation) );\r
 +      PrintAndLog(" PSK clock freq            : %d", pskcf);\r
 +      PrintAndLog(" AOR - Answer on Request   : %s", (aor) ? "Yes":"No");\r
 +      PrintAndLog(" OTP - One Time Pad        : %s", (otp) ? "Yes - Warning":"No" );\r
 +      PrintAndLog(" Max block                 : %d", maxblk);\r
 +      PrintAndLog(" Password mode             : %s", (pwd) ? "Yes":"No");\r
 +      PrintAndLog(" Sequence Start Terminator : %s", (sst) ? "Yes":"No");\r
 +      PrintAndLog(" Fast Write                : %s", (fw) ? "Yes":"No");\r
 +      PrintAndLog(" Inverse data              : %s", (inv) ? "Yes":"No");\r
 +      PrintAndLog(" POR-Delay                 : %s", (por) ? "Yes":"No");\r
 +      PrintAndLog("-------------------------------------------------------------");\r
 +      PrintAndLog(" Raw Data - Page 0");\r
 +      PrintAndLog("     Block 0  : 0x%08X  %s", bl0, sprint_bin(bits+5,32) );\r
 +      PrintAndLog("-------------------------------------------------------------");\r
 +      \r
 +      return 0;\r
  }\r
  \r
 -int CmdReadTrace(const char *Cmd)\r
 -{\r
 +int CmdDump(const char *Cmd){\r
  \r
-       char cmdp = param_getchar(Cmd, 0);\r
-       char s[20];\r
 -  PrintAndLog("Reading traceability data");\r
++      char s[20] = {0x00};\r
 +      uint8_t pwd[4] = {0x00};\r
-       bool hasPwd = ( strlen(Cmd) > 0);\r
-       \r
\r
 -  UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};\r
 -  SendCommand(&c);\r
 -  return 0;\r
++      char cmdp = param_getchar(Cmd, 0);\r
 +      if ( cmdp == 'h' || cmdp == 'H') {\r
-               PrintAndLog("Usage:  lf t55xx dump <password>");\r
-               PrintAndLog("        sample: lf t55xx dump FFFFFFFF");\r
++              usage_t55xx_dump();\r
 +              return 0;\r
 +      }\r
-       \r
++\r
++      bool hasPwd = ( strlen(Cmd) > 0);       \r
 +      if ( hasPwd ){\r
 +              if (param_gethex(Cmd, 0, pwd, 8)) {\r
 +                      PrintAndLog("password must include 8 HEX symbols");\r
 +                      return 1;\r
 +              }\r
 +      }\r
 +      \r
 +      for ( int i = 0; i <8; ++i){\r
 +              memset(s,0,sizeof(s));\r
 +              if ( hasPwd ) {\r
 +                      sprintf(s,"%d %02x%02x%02x%02x", i, pwd[0],pwd[1],pwd[2],pwd[3]);\r
-                       CmdReadBlkPWD(s);\r
 +              } else {\r
 +                      sprintf(s,"%d", i);\r
-                       CmdReadBlk(s);\r
 +              }\r
++              CmdReadBlk(s);\r
 +      }\r
 +      return 0;\r
 +}\r
 +\r
 +int CmdIceFsk(const char *Cmd){\r
 +\r
 +      if (!HasGraphData()) return 0;\r
 +\r
 +      iceFsk3(GraphBuffer, LF_TRACE_BUFF_SIZE);\r
 +      RepaintGraphWindow();\r
 +      return 0;\r
 +}\r
 +int CmdIceManchester(const char *Cmd){\r
 +      ManchesterDemod( -1);\r
 +      return 0;\r
 +}\r
 +int ManchesterDemod(int blockNum){\r
 +\r
 +      if (!HasGraphData()) return 0;\r
 +              \r
 +      uint8_t sizebyte = 32;\r
 +      // the value 5 was selected during empirical studies of the decoded data. Some signal noise to skip.\r
 +      uint8_t offset = 5;\r
 +      uint32_t blockData;\r
 +      uint8_t  bits[LF_BITSSTREAM_LEN] = {0x00};\r
 +      uint8_t * bitstream = bits;\r
 +      \r
 +      manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bits, LF_BITSSTREAM_LEN);    \r
 +      blockData = PackBits(offset, sizebyte, bits);\r
 +\r
 +      if ( blockNum < 0)\r
 +              PrintAndLog(" Decoded     : 0x%08X  %s", blockData, sprint_bin(bitstream+offset,sizebyte) );\r
 +              else\r
 +              PrintAndLog(" Block %d    : 0x%08X  %s", blockNum, blockData, sprint_bin(bitstream+offset,sizebyte) );\r
 +      \r
 +      return 0;\r
 +} \r
 +\r
 +char * GetBitRateStr(uint32_t id){\r
 +      static char buf[40];\r
 +      char *retStr = buf;\r
 +              switch (id){\r
 +              case 0: \r
 +                      sprintf(retStr,"%d - RF/8",id);\r
 +                      break;\r
 +              case 1:\r
 +                      sprintf(retStr,"%d - RF/16",id);\r
 +                      break;\r
 +              case 2:         \r
 +                      sprintf(retStr,"%d - RF/32",id);\r
 +                      break;\r
 +              case 3:\r
 +                      sprintf(retStr,"%d - RF/40",id);\r
 +                      break;\r
 +              case 4:\r
 +                      sprintf(retStr,"%d - RF/50",id);\r
 +                      break;\r
 +              case 5:\r
 +                      sprintf(retStr,"%d - RF/64",id);\r
 +                      break;\r
 +              case 6:\r
 +                      sprintf(retStr,"%d - RF/100",id);\r
 +                      break;\r
 +              case 7:\r
 +                      sprintf(retStr,"%d - RF/128",id);\r
 +                      break;\r
 +              default:\r
 +                      sprintf(retStr,"%d - (Unknown)",id);\r
 +                      break;\r
 +              }\r
 +\r
 +      return buf;\r
 +}\r
 +\r
 +char * GetSaferStr(uint32_t id){\r
 +      static char buf[40];\r
 +      char *retStr = buf;\r
 +      \r
 +      sprintf(retStr,"%d",id);\r
 +      if (id == 6) {\r
 +              sprintf(retStr,"%d - pasdwd",id);\r
 +      }\r
 +      if (id == 9 ){\r
 +              sprintf(retStr,"%d - testmode ",id);\r
 +      }\r
 +      \r
 +      return buf;\r
 +}\r
 +char * GetModulationStr( uint32_t id){\r
 +      static char buf[40];\r
 +      char *retStr = buf;\r
 +      \r
 +      switch (id){\r
 +              case 0: \r
 +                      sprintf(retStr,"%d - DIRECT (ASK/NRZ)",id);\r
 +                      break;\r
 +              case 1:\r
 +                      sprintf(retStr,"%d - PSK 1 phase change when input changes",id);\r
 +                      break;\r
 +              case 2:         \r
 +                      sprintf(retStr,"%d - PSK 2 phase change on bitclk if input high",id);\r
 +                      break;\r
 +              case 3:\r
 +                      sprintf(retStr,"%d - PSK 3 phase change on rising edge of input",id);\r
 +                      break;\r
 +              case 4:\r
 +                      sprintf(retStr,"%d - FSK 1 RF/8  RF/5",id);\r
 +                      break;\r
 +              case 5:\r
 +                      sprintf(retStr,"%d - FSK 2 RF/8  RF/10",id);\r
 +                      break;\r
 +              case 6:\r
 +                      sprintf(retStr,"%d - FSK 1a RF/5  RF/8",id);\r
 +                      break;\r
 +              case 7:\r
 +                      sprintf(retStr,"%d - FSK 2a RF/10  RF/8",id);\r
 +                      break;\r
 +              case 8:\r
 +                      sprintf(retStr,"%d - Manschester",id);\r
 +                      break;\r
 +              case 16:\r
 +                      sprintf(retStr,"%d - Biphase",id);\r
 +                      break;\r
 +              case 17:\r
 +                      sprintf(retStr,"%d - Reserved",id);\r
 +                      break;\r
 +              default:\r
 +                      sprintf(retStr,"0x%02X (Unknown)",id);\r
 +                      break;\r
 +              }\r
 +      return buf;\r
 +}\r
 +\r
 +\r
 +uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){\r
 +      \r
 +      int i = start;\r
 +      int j = len-1;\r
 +      if (len > 32) {\r
 +              return 0;\r
 +      }\r
 +      uint32_t tmp = 0;\r
 +      for (; j >= 0; --j, ++i){\r
 +              tmp     |= bits[i] << j;\r
 +      }\r
 +      return tmp;\r
  }\r
  \r
  static command_t CommandTable[] =\r
  {\r
 -  {"help",          CmdHelp,        1, "This help"},\r
 -  {"readblock",     CmdReadBlk,     1, "<Block> -- Read T55xx block data (page 0)"},\r
 -  {"readblockPWD",  CmdReadBlkPWD,  1, "<Block> <Password> -- Read T55xx block data in password mode(page 0)"},\r
 -  {"writeblock",    CmdWriteBlk,    1, "<Data> <Block> -- Write T55xx block data (page 0)"},\r
 -  {"writeblockPWD", CmdWriteBlkPWD, 1, "<Data> <Block> <Password> -- Write T55xx block data in password mode(page 0)"},\r
 -  {"readtrace",     CmdReadTrace,   1, "Read T55xx traceability data (page 1)"},\r
 +  {"help",   CmdHelp,        1, "This help"},\r
-   {"rd",     CmdReadBlk,     0, "<block> -- Read T55xx block data (page 0)"},\r
-   {"rdpwd",  CmdReadBlkPWD,  0, "<block> <password> -- Read T55xx block data with password mode"},\r
-   {"wr",     CmdWriteBlk,    0, "<block> <data> -- Write T55xx block data (page 0)"},\r
-   {"wrpwd",  CmdWriteBlkPWD, 0, "<block> <password> <data> -- Write T55xx block data with password"},\r
++  {"rd",     CmdReadBlk,     0, "<block> [password] -- Read T55xx block data (page 0) [optional password]"},\r
++  {"wr",     CmdWriteBlk,    0, "<block> <data> [password] -- Write T55xx block data (page 0) [optional password]"},\r
 +  {"trace",  CmdReadTrace,   0, "[1] Read T55xx traceability data (page 1/ blk 0-1)"},\r
 +  {"info",   CmdInfo,        0, "[1] Read T55xx configuration data (page 0/ blk 0)"},\r
-   {"dump",   CmdDump,        0, "[password] Dump T55xx card block 0-7. optional with password"},\r
-   //{"fsk",    CmdIceFsk,      0, "FSK demod"},\r
++  {"dump",   CmdDump,        0, "[password] Dump T55xx card block 0-7. [optional password]"},\r
 +  {"man",    CmdIceManchester,      0, "Manchester demod (with SST)"},\r
    {NULL, NULL, 0, NULL}\r
  };\r
  \r
diff --cc client/ui.c
index 10ae1310692d4ba03c5526a3aa21329fea2bcdbd,c0d01bc32983a2efb313f99640d745ce3af8cde9..6645a99ea5e5f7519380a6d2dc306c1cc9ae879f
@@@ -94,388 -90,3 +94,388 @@@ void SetLogFilename(char *fn
  {
    logfilename = fn;
  }
-       clock = GetClock("",0, 0);      
 +
 +int manchester_decode( int * data, const size_t len, uint8_t * dataout,  size_t dataoutlen){
 +      
 +      int bitlength = 0;
 +      int clock, high, low, startindex;
 +      low = startindex = 0;
 +      high = 1;
 +      uint8_t * bitStream =  (uint8_t* ) malloc(sizeof(uint8_t) * dataoutlen);        
 +      memset(bitStream, 0x00, dataoutlen);    
 +      
 +      /* Detect high and lows */
 +      DetectHighLowInGraph(&high, &low, TRUE); 
 +
 +      /* get clock */
++      clock = GetAskClock("",false, false);
 +
 +      startindex = DetectFirstTransition(data, len, high);
 +  
 +      if (high != 1)
 +              // decode "raw"
 +              bitlength = ManchesterConvertFrom255(data, len, bitStream, dataoutlen, high, low, clock, startindex);
 +      else
 +              // decode manchester
 +              bitlength = ManchesterConvertFrom1(data, len, bitStream, dataoutlen, clock, startindex);
 +
 +      memcpy(dataout, bitStream, bitlength);
 +      free(bitStream);
 +      return bitlength;
 +}
 + 
 + int DetectFirstTransition(const int * data, const size_t len, int threshold){
 +
 +      int i = 0;
 +      /* now look for the first threshold */
 +      for (; i < len; ++i) {
 +              if (data[i] == threshold) {
 +                      break;
 +              }
 +      }
 +      return i;
 + }
 +
 + int ManchesterConvertFrom255(const int * data, const size_t len, uint8_t * dataout, int dataoutlen, int high, int low, int clock, int startIndex){
 +
 +      int i, j, z, hithigh, hitlow, bitIndex, startType;
 +      i = 0;
 +      bitIndex = 0;
 +      
 +      int isDamp = 0;
 +      int damplimit = (int)((high / 2) * 0.3);
 +      int dampHi =  (high/2)+damplimit;
 +      int dampLow = (high/2)-damplimit;
 +      int firstST = 0;
 +
 +      // i = clock frame of data
 +      for (; i < (int)(len/clock); i++)
 +      {
 +              hithigh = 0;
 +              hitlow = 0;
 +              startType = -1;
 +              z = startIndex + (i*clock);
 +              isDamp = 0;
 +                      
 +              /* Find out if we hit both high and low peaks */
 +              for (j = 0; j < clock; j++)
 +              {               
 +                      if (data[z+j] == high){
 +                              hithigh = 1;
 +                              if ( startType == -1)
 +                                      startType = 1;
 +                      }
 +                      
 +                      if (data[z+j] == low ){
 +                              hitlow = 1;
 +                              if ( startType == -1)
 +                                      startType = 0;
 +                      } 
 +              
 +                      if (hithigh && hitlow)
 +                        break;
 +              }
 +              
 +              // No high value found, are we in a dampening field?
 +              if ( !hithigh ) {
 +                      //PrintAndLog(" # Entering damp test at index : %d (%d)", z+j, j);
 +                      for (j = 0; j < clock; j++) {
 +                              if ( 
 +                                   (data[z+j] <= dampHi && data[z+j] >= dampLow)
 +                                 ){
 +                                 isDamp++;
 +                              }
 +                      }
 +              }
 +
 +              /*  Manchester Switching..
 +                      0: High -> Low   
 +                      1: Low -> High  
 +              */
 +              if (startType == 0)
 +                      dataout[bitIndex++] = 1;
 +              else if (startType == 1) 
 +                      dataout[bitIndex++] = 0;
 +              else
 +                      dataout[bitIndex++] = 2;
 +                      
 +              if ( isDamp > clock/2 ) {
 +                      firstST++;
 +              }
 +              
 +              if ( firstST == 4)
 +                      break;
 +              if ( bitIndex >= dataoutlen-1 )
 +                      break;
 +      }
 +      return bitIndex;
 + }
 + 
 + int ManchesterConvertFrom1(const int * data, const size_t len, uint8_t * dataout,int dataoutlen, int clock, int startIndex){
 +
 +      int i,j, bitindex, lc, tolerance, warnings;
 +      warnings = 0;
 +      int upperlimit = len*2/clock+8;
 +      i = startIndex;
 +      j = 0;
 +      tolerance = clock/4;
 +      uint8_t decodedArr[len];
 +      
 +      /* Detect duration between 2 successive transitions */
 +      for (bitindex = 1; i < len; i++) {
 +      
 +              if (data[i-1] != data[i]) {
 +                      lc = i - startIndex;
 +                      startIndex = i;
 +
 +                      // Error check: if bitindex becomes too large, we do not
 +                      // have a Manchester encoded bitstream or the clock is really wrong!
 +                      if (bitindex > upperlimit ) {
 +                              PrintAndLog("Error: the clock you gave is probably wrong, aborting.");
 +                              return 0;
 +                      }
 +                      // Then switch depending on lc length:
 +                      // Tolerance is 1/4 of clock rate (arbitrary)
 +                      if (abs((lc-clock)/2) < tolerance) {
 +                              // Short pulse : either "1" or "0"
 +                              decodedArr[bitindex++] = data[i-1];
 +                      } else if (abs(lc-clock) < tolerance) {
 +                              // Long pulse: either "11" or "00"
 +                              decodedArr[bitindex++] = data[i-1];
 +                              decodedArr[bitindex++] = data[i-1];
 +                      } else {
 +                              ++warnings;
 +                              PrintAndLog("Warning: Manchester decode error for pulse width detection.");
 +                              if (warnings > 10) {
 +                                      PrintAndLog("Error: too many detection errors, aborting.");
 +                                      return 0; 
 +                              }
 +                      }
 +              }
 +      }
 +      
 +      /* 
 +      * We have a decodedArr of "01" ("1") or "10" ("0")
 +      * parse it into final decoded dataout
 +    */ 
 +    for (i = 0; i < bitindex; i += 2) {
 +
 +          if ((decodedArr[i] == 0) && (decodedArr[i+1] == 1)) {
 +                      dataout[j++] = 1;
 +              } else if ((decodedArr[i] == 1) && (decodedArr[i+1] == 0)) {
 +                      dataout[j++] = 0;
 +              } else {
 +                      i++;
 +                      warnings++;
 +                      PrintAndLog("Unsynchronized, resync...");
 +                      PrintAndLog("(too many of those messages mean the stream is not Manchester encoded)");
 +
 +                      if (warnings > 10) {    
 +                              PrintAndLog("Error: too many decode errors, aborting.");
 +                              return 0;
 +                      }
 +              }
 +    }
 +      
 +      PrintAndLog("%s", sprint_hex(dataout, j));
 +      return j;
 + }
 + 
 + void ManchesterDiffDecodedString(const uint8_t* bitstream, size_t len, uint8_t invert){
 +      /* 
 +      * We have a bitstream of "01" ("1") or "10" ("0")
 +      * parse it into final decoded bitstream
 +    */ 
 +      int i, j, warnings; 
 +      uint8_t decodedArr[(len/2)+1];
 +
 +      j = warnings = 0;
 +      
 +      uint8_t lastbit = 0;
 +      
 +    for (i = 0; i < len; i += 2) {
 +      
 +              uint8_t first = bitstream[i];
 +              uint8_t second = bitstream[i+1];
 +
 +              if ( first == second ) {
 +                      ++i;
 +                      ++warnings;
 +                      if (warnings > 10) {
 +                              PrintAndLog("Error: too many decode errors, aborting.");
 +                              return;
 +                      }
 +              } 
 +              else if ( lastbit != first ) {
 +                      decodedArr[j++] = 0 ^ invert;
 +              }
 +              else {
 +                      decodedArr[j++] = 1 ^ invert;
 +              }
 +              lastbit = second;
 +    }
 +      
 +      PrintAndLog("%s", sprint_hex(decodedArr, j));
 +}
 + 
 +void PrintPaddedManchester( uint8_t* bitStream, size_t len, size_t blocksize){
 +
 +      PrintAndLog(" Manchester decoded  : %d bits", len);
 +        
 +      uint8_t mod = len % blocksize;
 +      uint8_t div = len / blocksize;
 +      int i;
 +  
 +      // Now output the bitstream to the scrollback by line of 16 bits
 +      for (i = 0; i < div*blocksize; i+=blocksize) {
 +              PrintAndLog(" %s", sprint_bin(bitStream+i,blocksize) );
 +      }
 +      
 +      if ( mod > 0 )
 +              PrintAndLog(" %s", sprint_bin(bitStream+i, mod) );      
 +}
 +
 +/* Sliding DFT
 +   Smooths out 
 +*/ 
 +void iceFsk2(int * data, const size_t len){
 +
 +      int i, j;
 +      int * output =  (int* ) malloc(sizeof(int) * len);      
 +      memset(output, 0x00, len);
 +
 +      // for (i=0; i<len-5; ++i){
 +              // for ( j=1; j <=5; ++j) {
 +                      // output[i] += data[i*j];
 +              // }
 +              // output[i] /= 5;
 +      // }
 +      int rest = 127;
 +      int tmp =0;
 +      for (i=0; i<len; ++i){
 +              if ( data[i] < 127)
 +                      output[i] = 0;
 +              else {
 +                      tmp =  (100 * (data[i]-rest)) / rest;
 +                      output[i] = (tmp > 60)? 100:0;
 +              }
 +      }
 +      
 +      for (j=0; j<len; ++j)
 +              data[j] = output[j];
 +              
 +      free(output);
 +}
 +
 +void iceFsk3(int * data, const size_t len){
 +
 +      int i,j;
 +      
 +      int * output =  (int* ) malloc(sizeof(int) * len);      
 +      memset(output, 0x00, len);
 +      float fc           = 0.1125f;          // center frequency
 +      size_t adjustedLen = len;
 +      
 +    // create very simple low-pass filter to remove images (2nd-order Butterworth)
 +    float complex iir_buf[3] = {0,0,0};
 +    float b[3] = {0.003621681514929,  0.007243363029857, 0.003621681514929};
 +    float a[3] = {1.000000000000000, -1.822694925196308, 0.837181651256023};
 +    
 +    float sample           = 0;      // input sample read from file
 +    float complex x_prime  = 1.0f;   // save sample for estimating frequency
 +    float complex x;
 +              
 +      for (i=0; i<adjustedLen; ++i) {
 +
 +              sample = data[i]+128;
 +              
 +        // remove DC offset and mix to complex baseband
 +        x = (sample - 127.5f) * cexpf( _Complex_I * 2 * M_PI * fc * i );
 +
 +        // apply low-pass filter, removing spectral image (IIR using direct-form II)
 +        iir_buf[2] = iir_buf[1];
 +        iir_buf[1] = iir_buf[0];
 +        iir_buf[0] = x - a[1]*iir_buf[1] - a[2]*iir_buf[2];
 +        x          = b[0]*iir_buf[0] +
 +                     b[1]*iir_buf[1] +
 +                     b[2]*iir_buf[2];
 +                                       
 +        // compute instantaneous frequency by looking at phase difference
 +        // between adjacent samples
 +        float freq = cargf(x*conjf(x_prime));
 +        x_prime = x;    // retain this sample for next iteration
 +
 +              output[i] =(freq > 0)? 10 : -10;
 +    } 
 +
 +      // show data
 +      for (j=0; j<adjustedLen; ++j)
 +              data[j] = output[j];
 +              
 +      CmdLtrim("30");
 +      adjustedLen -= 30;
 +      
 +      // zero crossings.
 +      for (j=0; j<adjustedLen; ++j){
 +              if ( data[j] == 10) break;
 +      }
 +      int startOne =j;
 +      
 +      for (;j<adjustedLen; ++j){
 +              if ( data[j] == -10 ) break;
 +      }
 +      int stopOne = j-1;
 +      
 +      int fieldlen = stopOne-startOne;
 +      
 +      fieldlen = (fieldlen == 39 || fieldlen == 41)? 40 : fieldlen;
 +      fieldlen = (fieldlen == 59 || fieldlen == 51)? 50 : fieldlen;
 +      if ( fieldlen != 40 && fieldlen != 50){
 +              printf("Detected field Length: %d \n", fieldlen);
 +              printf("Can only handle 40 or 50.  Aborting...\n");
 +              return;
 +      }
 +      
 +      // FSK sequence start == 000111
 +      int startPos = 0;
 +      for (i =0; i<adjustedLen; ++i){
 +              int dec = 0;
 +              for ( j = 0; j < 6*fieldlen; ++j){
 +                      dec += data[i + j];
 +              }
 +              if (dec == 0) {
 +                      startPos = i;
 +                      break;
 +              }
 +      }
 +      
 +      printf("000111 position: %d \n", startPos);
 +
 +      startPos += 6*fieldlen+5;
 +      
 +      int bit =0;
 +      printf("BINARY\n");
 +      printf("R/40 :  ");
 +      for (i =startPos ; i < adjustedLen; i += 40){
 +              bit = data[i]>0 ? 1:0;
 +              printf("%d", bit );
 +      }
 +      printf("\n");   
 +      
 +      printf("R/50 :  ");
 +      for (i =startPos ; i < adjustedLen; i += 50){
 +              bit = data[i]>0 ? 1:0;
 +              printf("%d", bit );     }
 +      printf("\n");   
 +      
 +      free(output);
 +}
 +
 +float complex cexpf (float complex Z)
 +{
 +  float complex  Res;
 +  double rho = exp (__real__ Z);
 +  __real__ Res = rho * cosf(__imag__ Z);
 +  __imag__ Res = rho * sinf(__imag__ Z);
 +  return Res;
 +}
Impressum, Datenschutz