Update README.md

[proxmark3-svn] / client / cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 0453effe11126c5fb9cd3131897c43d1cfae3819..dde05cb3d7b49be0acd14d07f463908cfa7dafff 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -123,12 +123,11 @@ int usage_lf_find(void){
 
 /* send a LF command before reading */
 int CmdLFCommandRead(const char *Cmd) {
 
 /* send a LF command before reading */
 int CmdLFCommandRead(const char *Cmd) {

-//     static char dummy[3] = {0x20,0x00,0x00};
+

        bool errors = FALSE;
        bool useHighFreq = FALSE;
        uint16_t one = 0, zero = 0;
        uint8_t cmdp = 0;
        bool errors = FALSE;
        bool useHighFreq = FALSE;
        uint16_t one = 0, zero = 0;
        uint8_t cmdp = 0;

-       int strLength = 0;

        UsbCommand c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, {0,0,0}};
        
        while(param_getchar(Cmd, cmdp) != 0x00) {
        UsbCommand c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K, {0,0,0}};
        
        while(param_getchar(Cmd, cmdp) != 0x00) {


@@ -136,7 +135,6 @@ int CmdLFCommandRead(const char *Cmd) {
                case 'h':
                        return usage_lf_cmdread();
                case 'H':
                case 'h':
                        return usage_lf_cmdread();
                case 'H':

-                       //dummy[1]='h';

                        useHighFreq = TRUE;
                        cmdp++;
                        break;
                        useHighFreq = TRUE;
                        cmdp++;
                        break;


@@ -144,7 +142,7 @@ int CmdLFCommandRead(const char *Cmd) {
                        cmdp++;
                        break;
                case 'c':
                        cmdp++;
                        break;
                case 'c':

-                       strLength = param_getstr(Cmd, cmdp+1, (char *)&c.d.asBytes);
+                       param_getstr(Cmd, cmdp+1, (char *)&c.d.asBytes);

                        cmdp+=2;
                        break;
                case 'd':
                        cmdp+=2;
                        break;
                case 'd':


@@ -173,7 +171,7 @@ int CmdLFCommandRead(const char *Cmd) {
        if (errors) return usage_lf_cmdread();
        
        // zero and one lengths
        if (errors) return usage_lf_cmdread();
        
        // zero and one lengths

-       c.arg[1] = zero << 16 | one;
+       c.arg[1] = (uint32_t)(zero << 16 | one);

        
        // add frequency 125 or 134
        c.arg[2] = useHighFreq;
        
        // add frequency 125 or 134
        c.arg[2] = useHighFreq;


@@ -185,81 +183,68 @@ int CmdLFCommandRead(const char *Cmd) {
 
 int CmdFlexdemod(const char *Cmd)
 {
 
 int CmdFlexdemod(const char *Cmd)
 {

-  int i;
-  for (i = 0; i < GraphTraceLen; ++i) {
-    if (GraphBuffer[i] < 0) {
-      GraphBuffer[i] = -1;
-    } else {
-      GraphBuffer[i] = 1;
-    }
-  }
-
-#define LONG_WAIT 100
-  int start;
-  for (start = 0; start < GraphTraceLen - LONG_WAIT; start++) {
-    int first = GraphBuffer[start];
-    for (i = start; i < start + LONG_WAIT; i++) {
-      if (GraphBuffer[i] != first) {
-        break;
-      }
-    }
-    if (i == (start + LONG_WAIT)) {
-      break;
-    }
-  }
-  if (start == GraphTraceLen - LONG_WAIT) {
-    PrintAndLog("nothing to wait for");
-    return 0;
-  }
-
-  GraphBuffer[start] = 2;
-  GraphBuffer[start+1] = -2;
+#define LONG_WAIT 100  
+       int i, j, start, bit, sum;
+       int phase = 0;
+
+       for (i = 0; i < GraphTraceLen; ++i)
+               GraphBuffer[i] = (GraphBuffer[i] < 0) ? -1 : 1;
+
+       for (start = 0; start < GraphTraceLen - LONG_WAIT; start++) {
+               int first = GraphBuffer[start];
+               for (i = start; i < start + LONG_WAIT; i++) {
+                       if (GraphBuffer[i] != first) {
+                               break;
+                       }
+               }
+               if (i == (start + LONG_WAIT))
+                       break;
+       }
+       
+       if (start == GraphTraceLen - LONG_WAIT) {
+               PrintAndLog("nothing to wait for");
+               return 0;
+       }
+
+       GraphBuffer[start] = 2;
+       GraphBuffer[start+1] = -2;

        uint8_t bits[64] = {0x00};
 
        uint8_t bits[64] = {0x00};
 

-       int bit, sum;
-  i = start;
-  for (bit = 0; bit < 64; bit++) {
+       i = start;
+       for (bit = 0; bit < 64; bit++) {

                sum = 0;
                for (int j = 0; j < 16; j++) {
                sum = 0;
                for (int j = 0; j < 16; j++) {

-      sum += GraphBuffer[i++];
-    }
-
+                       sum += GraphBuffer[i++];
+               }

                bits[bit] = (sum > 0) ? 1 : 0;
                bits[bit] = (sum > 0) ? 1 : 0;

+               PrintAndLog("bit %d sum %d", bit, sum);
+       }

 
 

-    PrintAndLog("bit %d sum %d", bit, sum);
-  }
-
-  for (bit = 0; bit < 64; bit++) {
-    int j;
-    int sum = 0;
-    for (j = 0; j < 16; j++) {
-      sum += GraphBuffer[i++];
-    }
-    if (sum > 0 && bits[bit] != 1) {
-      PrintAndLog("oops1 at %d", bit);
-    }
-    if (sum < 0 && bits[bit] != 0) {
-      PrintAndLog("oops2 at %d", bit);
-    }
-  }
+       for (bit = 0; bit < 64; bit++) {
+               sum = 0;
+               for (j = 0; j < 16; j++)
+                       sum += GraphBuffer[i++];
+
+               if (sum > 0 && bits[bit] != 1) PrintAndLog("oops1 at %d", bit);
+
+               if (sum < 0 && bits[bit] != 0) PrintAndLog("oops2 at %d", bit);
+
+       }

 
        // HACK writing back to graphbuffer.
 
        // HACK writing back to graphbuffer.

-  GraphTraceLen = 32*64;
-  i = 0;
-  int phase = 0;
-  for (bit = 0; bit < 64; bit++) {
-       
+       GraphTraceLen = 32*64;
+       i = 0;
+       for (bit = 0; bit < 64; bit++) {
+               

                phase = (bits[bit] == 0) ? 0 : 1;
                
                phase = (bits[bit] == 0) ? 0 : 1;
                

-    int j;
-    for (j = 0; j < 32; j++) {
-      GraphBuffer[i++] = phase;
-      phase = !phase;
-    }
-  }
-
-  RepaintGraphWindow();
-  return 0;
+               for (j = 0; j < 32; j++) {
+                       GraphBuffer[i++] = phase;
+                       phase = !phase;
+               }
+       }
+       RepaintGraphWindow();
+       return 0;

 }
   
 int CmdIndalaDemod(const char *Cmd)
 }
   
 int CmdIndalaDemod(const char *Cmd)


@@ -272,10 +257,9 @@ int CmdIndalaDemod(const char *Cmd)
 
        // worst case with GraphTraceLen=64000 is < 4096
        // under normal conditions it's < 2048
 
        // worst case with GraphTraceLen=64000 is < 4096
        // under normal conditions it's < 2048

-

        uint8_t rawbits[4096];
        uint8_t rawbits[4096];

-       int rawbit = 0;
-       int worst = 0, worstPos = 0;
+
+       int rawbit = 0, worst = 0, worstPos = 0;

        // PrintAndLog("Expecting a bit less than %d raw bits", GraphTraceLen / 32);
        
        // loop through raw signal - since we know it is psk1 rf/32 fc/2 skip every other value (+=2)
        // PrintAndLog("Expecting a bit less than %d raw bits", GraphTraceLen / 32);
        
        // loop through raw signal - since we know it is psk1 rf/32 fc/2 skip every other value (+=2)


@@ -450,51 +434,49 @@ int CmdIndalaDemod(const char *Cmd)
        return 1;
 }
 
        return 1;
 }
 

-int CmdIndalaClone(const char *Cmd)
-{
-  UsbCommand c;
+int CmdIndalaClone(const char *Cmd){
+       UsbCommand c;

        unsigned int uid1, uid2, uid3, uid4, uid5, uid6, uid7;
 
        uid1 =  uid2 = uid3 = uid4 = uid5 = uid6 = uid7 = 0;
        unsigned int uid1, uid2, uid3, uid4, uid5, uid6, uid7;
 
        uid1 =  uid2 = uid3 = uid4 = uid5 = uid6 = uid7 = 0;

-  int n = 0, i = 0;
-
-  if (strchr(Cmd,'l') != 0) {
-    while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
-      uid1 = (uid1 << 4) | (uid2 >> 28);
-      uid2 = (uid2 << 4) | (uid3 >> 28);
-      uid3 = (uid3 << 4) | (uid4 >> 28);
-      uid4 = (uid4 << 4) | (uid5 >> 28);
-      uid5 = (uid5 << 4) | (uid6 >> 28);
-      uid6 = (uid6 << 4) | (uid7 >> 28);
-       uid7 = (uid7 << 4) | (n & 0xf);
-    }
-    PrintAndLog("Cloning 224bit tag with UID %x%08x%08x%08x%08x%08x%08x", uid1, uid2, uid3, uid4, uid5, uid6, uid7);
-    c.cmd = CMD_INDALA_CLONE_TAG_L;
-    c.d.asDwords[0] = uid1;
-    c.d.asDwords[1] = uid2;
-    c.d.asDwords[2] = uid3;
-    c.d.asDwords[3] = uid4;
-    c.d.asDwords[4] = uid5;
-    c.d.asDwords[5] = uid6;
-    c.d.asDwords[6] = uid7;
+       int n = 0, i = 0;
+
+       if (strchr(Cmd,'l') != 0) {
+               while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
+                       uid1 = (uid1 << 4) | (uid2 >> 28);
+                       uid2 = (uid2 << 4) | (uid3 >> 28);
+                       uid3 = (uid3 << 4) | (uid4 >> 28);
+                       uid4 = (uid4 << 4) | (uid5 >> 28);
+                       uid5 = (uid5 << 4) | (uid6 >> 28);
+                       uid6 = (uid6 << 4) | (uid7 >> 28);
+                       uid7 = (uid7 << 4) | (n & 0xf);
+               }
+               PrintAndLog("Cloning 224bit tag with UID %x%08x%08x%08x%08x%08x%08x", uid1, uid2, uid3, uid4, uid5, uid6, uid7);
+               c.cmd = CMD_INDALA_CLONE_TAG_L;
+               c.d.asDwords[0] = uid1;
+               c.d.asDwords[1] = uid2;
+               c.d.asDwords[2] = uid3;
+               c.d.asDwords[3] = uid4;
+               c.d.asDwords[4] = uid5;
+               c.d.asDwords[5] = uid6;
+               c.d.asDwords[6] = uid7;

        } else {
        } else {

-    while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
-      uid1 = (uid1 << 4) | (uid2 >> 28);
-      uid2 = (uid2 << 4) | (n & 0xf);
-    }
-    PrintAndLog("Cloning 64bit tag with UID %x%08x", uid1, uid2);
-    c.cmd = CMD_INDALA_CLONE_TAG;
-    c.arg[0] = uid1;
-    c.arg[1] = uid2;
-  }
+               while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
+                       uid1 = (uid1 << 4) | (uid2 >> 28);
+                       uid2 = (uid2 << 4) | (n & 0xf);
+               }
+               PrintAndLog("Cloning 64bit tag with UID %x%08x", uid1, uid2);
+               c.cmd = CMD_INDALA_CLONE_TAG;
+               c.arg[0] = uid1;
+               c.arg[1] = uid2;
+       }

 
        clearCommandBuffer();
 
        clearCommandBuffer();

-  SendCommand(&c);
-  return 0;
+       SendCommand(&c);
+       return 0;

 }
 
 }
 

-int CmdLFSetConfig(const char *Cmd)
-{
+int CmdLFSetConfig(const char *Cmd) {

        uint8_t divisor =  0;//Frequency divisor
        uint8_t bps = 0; // Bits per sample
        uint8_t decimation = 0; //How many to keep
        uint8_t divisor =  0;//Frequency divisor
        uint8_t bps = 0; // Bits per sample
        uint8_t decimation = 0; //How many to keep


@@ -504,10 +486,8 @@ int CmdLFSetConfig(const char *Cmd)
        uint8_t unsigned_trigg = 0;
 
        uint8_t cmdp = 0;
        uint8_t unsigned_trigg = 0;
 
        uint8_t cmdp = 0;

-       while(param_getchar(Cmd, cmdp) != 0x00)
-       {
-               switch(param_getchar(Cmd, cmdp))
-               {
+       while(param_getchar(Cmd, cmdp) != 0x00) {
+               switch(param_getchar(Cmd, cmdp)) {

                case 'h':
                        return usage_lf_config();
                case 'H':
                case 'h':
                        return usage_lf_config();
                case 'H':


@@ -566,8 +546,7 @@ int CmdLFSetConfig(const char *Cmd)
        return 0;
 }
 
        return 0;
 }
 

-int CmdLFRead(const char *Cmd)
-{
+int CmdLFRead(const char *Cmd) {

        bool arg1 = false;
        uint8_t cmdp =  param_getchar(Cmd, 0);
        
        bool arg1 = false;
        uint8_t cmdp =  param_getchar(Cmd, 0);
        


@@ -586,8 +565,7 @@ int CmdLFRead(const char *Cmd)
        return 0;
 }
 
        return 0;
 }
 

-int CmdLFSnoop(const char *Cmd)
-{
+int CmdLFSnoop(const char *Cmd) {

        uint8_t cmdp = param_getchar(Cmd, 0);
        if(cmdp == 'h' || cmdp == 'H') return usage_lf_snoop();
        
        uint8_t cmdp = param_getchar(Cmd, 0);
        if(cmdp == 'h' || cmdp == 'H') return usage_lf_snoop();
        


@@ -598,22 +576,18 @@ int CmdLFSnoop(const char *Cmd)
        return 0;
 }
 
        return 0;
 }
 

-static void ChkBitstream(const char *str)
-{
-  int i;
- 
-  /* convert to bitstream if necessary */
-       for (i = 0; i < (int)(GraphTraceLen / 2); i++){
+static void ChkBitstream(const char *str) {
+       // convert to bitstream if necessary
+       for (int i = 0; i < (int)(GraphTraceLen / 2); i++){

                if (GraphBuffer[i] > 1 || GraphBuffer[i] < 0) {
                if (GraphBuffer[i] > 1 || GraphBuffer[i] < 0) {

-      CmdGetBitStream("");
-      break;
-    }
-  }
+                       CmdGetBitStream("");
+                       break;
+               }
+       }

 }
 //Attempt to simulate any wave in buffer (one bit per output sample)
 // converts GraphBuffer to bitstream (based on zero crossings) if needed.
 }
 //Attempt to simulate any wave in buffer (one bit per output sample)
 // converts GraphBuffer to bitstream (based on zero crossings) if needed.

-int CmdLFSim(const char *Cmd)
-{
+int CmdLFSim(const char *Cmd) {

        int i,j;
        static int gap;
 
        int i,j;
        static int gap;
 


@@ -622,8 +596,10 @@ int CmdLFSim(const char *Cmd)
        // convert to bitstream if necessary 
        ChkBitstream(Cmd);
 
        // convert to bitstream if necessary 
        ChkBitstream(Cmd);
 

+       if (g_debugMode) 
+               printf("DEBUG: Sending [%d bytes]\n", GraphTraceLen);
+       

        //can send only 512 bits at a time (1 byte sent per bit...)
        //can send only 512 bits at a time (1 byte sent per bit...)

-       printf("Sending [%d bytes]", GraphTraceLen);

        for (i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {
                UsbCommand c = {CMD_DOWNLOADED_SIM_SAMPLES_125K, {i, 0, 0}};
 
        for (i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {
                UsbCommand c = {CMD_DOWNLOADED_SIM_SAMPLES_125K, {i, 0, 0}};
 


@@ -632,11 +608,12 @@ int CmdLFSim(const char *Cmd)
                }
                clearCommandBuffer();
                SendCommand(&c);
                }
                clearCommandBuffer();
                SendCommand(&c);

-               WaitForResponse(CMD_ACK,NULL);
+               WaitForResponse(CMD_ACK, NULL);

                printf(".");
        }
 
                printf(".");
        }
 

-       PrintAndLog("\nStarting to simulate");
+       PrintAndLog("Starting to simulate");
+

        UsbCommand c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}};
        clearCommandBuffer();
        SendCommand(&c);
        UsbCommand c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}};
        clearCommandBuffer();
        SendCommand(&c);


@@ -657,10 +634,8 @@ int CmdLFfskSim(const char *Cmd)
        int dataLen = 0;
        uint8_t cmdp = 0;
        
        int dataLen = 0;
        uint8_t cmdp = 0;
        

-       while(param_getchar(Cmd, cmdp) != 0x00)
-       {
-               switch(param_getchar(Cmd, cmdp))
-               {
+       while(param_getchar(Cmd, cmdp) != 0x00) {
+               switch(param_getchar(Cmd, cmdp)){

                        case 'h':
                                return usage_lf_simfsk();
                        case 'i':
                        case 'h':
                                return usage_lf_simfsk();
                        case 'i':


@@ -758,6 +733,7 @@ int CmdLFaskSim(const char *Cmd)
        
        while(param_getchar(Cmd, cmdp) != 0x00) {
                switch(param_getchar(Cmd, cmdp)) {
        
        while(param_getchar(Cmd, cmdp) != 0x00) {
                switch(param_getchar(Cmd, cmdp)) {

+                       case 'H':

                        case 'h': return usage_lf_simask();
                        case 'i':
                                invert = 1;
                        case 'h': return usage_lf_simask();
                        case 'i':
                                invert = 1;


@@ -816,7 +792,7 @@ int CmdLFaskSim(const char *Cmd)
                setDemodBuf(data, dataLen, 0);
        }
        if (clk == 0) clk = 64;
                setDemodBuf(data, dataLen, 0);
        }
        if (clk == 0) clk = 64;

-       if (encoding == 0) clk = clk/2; //askraw needs to double the clock speed
+       if (encoding == 0) clk >>= 2; //askraw needs to double the clock speed

        
        size_t size = DemodBufferLen;
 
        
        size_t size = DemodBufferLen;
 


@@ -840,197 +816,191 @@ int CmdLFaskSim(const char *Cmd)
 
 // by marshmellow - sim psk data given carrier, clock, invert 
 // - allow pull data from DemodBuffer or parameters
 
 // by marshmellow - sim psk data given carrier, clock, invert 
 // - allow pull data from DemodBuffer or parameters

-int CmdLFpskSim(const char *Cmd)
-{
-  //might be able to autodetect FC and clock from Graphbuffer if using demod buffer
-  //will need carrier, Clock, and bitstream
-  uint8_t carrier=0, clk=0;
-  uint8_t invert=0;
-  bool errors = FALSE;
-  char hexData[32] = {0x00}; // store entered hex data
-  uint8_t data[255] = {0x00}; 
-  int dataLen = 0;
-  uint8_t cmdp = 0;
-  uint8_t pskType = 1;
-  while(param_getchar(Cmd, cmdp) != 0x00)
-  {
-    switch(param_getchar(Cmd, cmdp))
-    {
-    case 'h':
-      return usage_lf_simpsk();
-    case 'i':
-      invert = 1;
-      cmdp++;
-      break;
-    case 'c':
-      errors |= param_getdec(Cmd,cmdp+1,&clk);
-      cmdp+=2;
-      break;
-    case 'r':
-      errors |= param_getdec(Cmd,cmdp+1,&carrier);
-      cmdp+=2;
-      break;
-    case '1':
-      pskType=1;
-      cmdp++;
-      break;
-    case '2':
-      pskType=2;
-      cmdp++;
-      break;
-    case '3':
-      pskType=3;
-      cmdp++;
-      break;
-    case 'd':
-      dataLen = param_getstr(Cmd, cmdp+1, hexData);
-      if (dataLen==0) {
-        errors=TRUE; 
-      } else {
-        dataLen = hextobinarray((char *)data, hexData);
-      }    
-      if (dataLen==0) errors=TRUE; 
-      if (errors) PrintAndLog ("Error getting hex data");
-      cmdp+=2;
-      break;
-    default:
-      PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-      errors = TRUE;
-      break;
-    }
-    if (errors) break;
-  }
-  if (cmdp == 0 && DemodBufferLen == 0)
-  {
-    errors = TRUE;// No args
-  }
-
-  //Validations
-  if (errors)
-  {
-    return usage_lf_simpsk();
-  }
-  if (dataLen == 0){ //using DemodBuffer
-    PrintAndLog("Getting Clocks");
-    if (clk==0) clk = GetPskClock("", FALSE, FALSE);
-    PrintAndLog("clk: %d",clk);
-    if (!carrier) carrier = GetPskCarrier("", FALSE, FALSE); 
-    PrintAndLog("carrier: %d", carrier);
-  } else {
-    setDemodBuf(data, dataLen, 0);
-  }
-
-  if (clk <= 0) clk = 32;
-  if (carrier == 0) carrier = 2;
-  if (pskType != 1){
-    if (pskType == 2){
-      //need to convert psk2 to psk1 data before sim
-      psk2TOpsk1(DemodBuffer, DemodBufferLen);
-    } else {
-      PrintAndLog("Sorry, PSK3 not yet available");
-    }
-  }
-  uint16_t arg1, arg2;
-  arg1 = clk << 8 | carrier;
-  arg2 = invert;
-  size_t size=DemodBufferLen;
-  if (size > USB_CMD_DATA_SIZE) {
-    PrintAndLog("DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
-    size=USB_CMD_DATA_SIZE;
-  }
-  UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};
-  PrintAndLog("DEBUG: Sending DemodBuffer Length: %d", size);
-  memcpy(c.d.asBytes, DemodBuffer, size);
-       clearCommandBuffer();
-  SendCommand(&c);
+int CmdLFpskSim(const char *Cmd) {
+       //might be able to autodetect FC and clock from Graphbuffer if using demod buffer
+       //will need carrier, Clock, and bitstream
+       uint8_t carrier=0, clk=0;
+       uint8_t invert=0;
+       bool errors = FALSE;
+       char hexData[32] = {0x00}; // store entered hex data
+       uint8_t data[255] = {0x00}; 
+       int dataLen = 0;
+       uint8_t cmdp = 0;
+       uint8_t pskType = 1;
+       
+       while(param_getchar(Cmd, cmdp) != 0x00) {
+               switch(param_getchar(Cmd, cmdp)) {
+                       case 'h':
+                               return usage_lf_simpsk();
+                       case 'i':
+                               invert = 1;
+                               cmdp++;
+                               break;
+                       case 'c':
+                               errors |= param_getdec(Cmd,cmdp+1,&clk);
+                               cmdp +=2;
+                               break;
+                       case 'r':
+                               errors |= param_getdec(Cmd,cmdp+1,&carrier);
+                               cmdp += 2;
+                               break;
+                       case '1':
+                               pskType = 1;
+                               cmdp++;
+                               break;
+                       case '2':
+                               pskType = 2;
+                               cmdp++;
+                               break;
+                       case '3':
+                               pskType = 3;
+                               cmdp++;
+                               break;
+                       case 'd':
+                               dataLen = param_getstr(Cmd, cmdp+1, hexData);
+                               if (dataLen == 0)
+                                       errors = TRUE; 
+                               else
+                                       dataLen = hextobinarray((char *)data, hexData);
+                                   
+                               if (dataLen == 0) errors = TRUE; 
+                               if (errors) PrintAndLog ("Error getting hex data");
+                               cmdp+=2;
+                               break;
+                       default:
+                               PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                               errors = TRUE;
+                               break;
+                       }
+               if (errors) break;
+       }
+       // No args
+       if (cmdp == 0 && DemodBufferLen == 0)
+               errors = TRUE;
+
+       //Validations
+       if (errors) return usage_lf_simpsk();
+
+       if (dataLen == 0){ //using DemodBuffer
+               PrintAndLog("Getting Clocks");
+               
+               if (clk==0) clk = GetPskClock("", FALSE, FALSE);
+               PrintAndLog("clk: %d",clk);
+               
+               if (!carrier) carrier = GetPskCarrier("", FALSE, FALSE); 
+               PrintAndLog("carrier: %d", carrier);
+               
+       } else {
+               setDemodBuf(data, dataLen, 0);
+       }
+
+       if (clk <= 0) clk = 32;
+
+       if (carrier == 0) carrier = 2;

   
   

-  return 0;
+       if (pskType != 1){
+               if (pskType == 2){
+                       //need to convert psk2 to psk1 data before sim
+                       psk2TOpsk1(DemodBuffer, DemodBufferLen);
+               } else {
+                       PrintAndLog("Sorry, PSK3 not yet available");
+               }
+       }
+       uint16_t arg1, arg2;
+       arg1 = clk << 8 | carrier;
+       arg2 = invert;
+       size_t size = DemodBufferLen;
+       if (size > USB_CMD_DATA_SIZE) {
+               PrintAndLog("DemodBuffer too long for current implementation - length: %d - max: %d", size, USB_CMD_DATA_SIZE);
+               size = USB_CMD_DATA_SIZE;
+       }
+       UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};
+       PrintAndLog("DEBUG: Sending DemodBuffer Length: %d", size);
+       memcpy(c.d.asBytes, DemodBuffer, size);
+       clearCommandBuffer();
+       SendCommand(&c);
+       return 0;

 }
 
 }
 

-int CmdLFSimBidir(const char *Cmd)
-{
-  // Set ADC to twice the carrier for a slight supersampling
-  // HACK: not implemented in ARMSRC.
-  PrintAndLog("Not implemented yet.");
-  UsbCommand c = {CMD_LF_SIMULATE_BIDIR, {47, 384, 0}};
-  SendCommand(&c);
-  return 0;
+int CmdLFSimBidir(const char *Cmd) {
+       // Set ADC to twice the carrier for a slight supersampling
+       // HACK: not implemented in ARMSRC.
+       PrintAndLog("Not implemented yet.");
+       UsbCommand c = {CMD_LF_SIMULATE_BIDIR, {47, 384, 0}};
+       SendCommand(&c);
+       return 0;

 }
 
 }
 

-int CmdVchDemod(const char *Cmd)
-{
-  // Is this the entire sync pattern, or does this also include some
-  // data bits that happen to be the same everywhere? That would be
-  // lovely to know.
-  static const int SyncPattern[] = {
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-    1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  };
-
-  // So first, we correlate for the sync pattern, and mark that.
-  int bestCorrel = 0, bestPos = 0;
-  int i;
-  // It does us no good to find the sync pattern, with fewer than
-  // 2048 samples after it...
-  for (i = 0; i < (GraphTraceLen-2048); i++) {
-    int sum = 0;
-    int j;
-    for (j = 0; j < arraylen(SyncPattern); j++) {
-      sum += GraphBuffer[i+j]*SyncPattern[j];
-    }
-    if (sum > bestCorrel) {
-      bestCorrel = sum;
-      bestPos = i;
-    }
-  }
-  PrintAndLog("best sync at %d [metric %d]", bestPos, bestCorrel);
-
-  char bits[257];
-  bits[256] = '\0';
-
-  int worst = INT_MAX;
-  int worstPos = 0;
-
-  for (i = 0; i < 2048; i += 8) {
-    int sum = 0;
-    int j;
-    for (j = 0; j < 8; j++) {
-      sum += GraphBuffer[bestPos+i+j];
-    }
-    if (sum < 0) {
-      bits[i/8] = '.';
-    } else {
-      bits[i/8] = '1';
-    }
-    if(abs(sum) < worst) {
-      worst = abs(sum);
-      worstPos = i;
-    }
-  }
-  PrintAndLog("bits:");
-  PrintAndLog("%s", bits);
-  PrintAndLog("worst metric: %d at pos %d", worst, worstPos);
-
-  if (strcmp(Cmd, "clone")==0) {
-    GraphTraceLen = 0;
-    char *s;
-    for(s = bits; *s; s++) {
-      int j;
-      for(j = 0; j < 16; j++) {
-        GraphBuffer[GraphTraceLen++] = (*s == '1') ? 1 : 0;
-      }
-    }
-    RepaintGraphWindow();
-  }
-  return 0;
+int CmdVchDemod(const char *Cmd) {
+       // Is this the entire sync pattern, or does this also include some
+       // data bits that happen to be the same everywhere? That would be
+       // lovely to know.
+       static const int SyncPattern[] = {
+               1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+               1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+               1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+               1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+               1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+               1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+               1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+               1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+               1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+               1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+       };
+
+       // So first, we correlate for the sync pattern, and mark that.
+       int bestCorrel = 0, bestPos = 0;
+       int i, j, sum = 0;
+
+       // It does us no good to find the sync pattern, with fewer than 2048 samples after it.
+
+       for (i = 0; i < (GraphTraceLen - 2048); i++) {
+               for (j = 0; j < ARRAYLEN(SyncPattern); j++) {
+                       sum += GraphBuffer[i+j] * SyncPattern[j];
+               }
+               if (sum > bestCorrel) {
+                       bestCorrel = sum;
+                       bestPos = i;
+               }
+       }
+       PrintAndLog("best sync at %d [metric %d]", bestPos, bestCorrel);
+
+       char bits[257];
+       bits[256] = '\0';
+
+       int worst = INT_MAX, worstPos = 0;
+
+       for (i = 0; i < 2048; i += 8) {
+               sum = 0;
+               for (j = 0; j < 8; j++) 
+                       sum += GraphBuffer[bestPos+i+j];
+               
+               if (sum < 0)
+                       bits[i/8] = '.';
+               else
+                       bits[i/8] = '1';
+               
+               if(abs(sum) < worst) {
+                       worst = abs(sum);
+                       worstPos = i;
+               }
+       }
+       PrintAndLog("bits:");
+       PrintAndLog("%s", bits);
+       PrintAndLog("worst metric: %d at pos %d", worst, worstPos);
+
+       // clone
+       if (strcmp(Cmd, "clone")==0) {
+               GraphTraceLen = 0;
+               char *s;
+                       for(s = bits; *s; s++) {
+                               for(j = 0; j < 16; j++) {
+                                       GraphBuffer[GraphTraceLen++] = (*s == '1') ? 1 : 0;
+                               }
+                       }
+               RepaintGraphWindow();
+       }
+       return 0;

 }
 
 //by marshmellow
 }
 
 //by marshmellow