FIX: some compiler warnings, sscanf is using unsigned int.

[proxmark3-svn] / client / cmdlfem4x.c

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index c5f57d55b72d3a1d8103ac6cbb4ef85cc0852232..636d2596b29609b740ae1a1b0cbefdabb4ed1e90 100644 (file)
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -1,4 +1,4 @@
- //-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------

 // Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,


@@ -8,26 +8,21 @@
 // Low frequency EM4x commands
 //-----------------------------------------------------------------------------
 
 // Low frequency EM4x commands
 //-----------------------------------------------------------------------------
 

-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
-#include "proxmark3.h"
-#include "ui.h"
-#include "graph.h"
-#include "cmdmain.h"
-#include "cmdparser.h"
-#include "cmddata.h"
-#include "cmdlf.h"

 #include "cmdlfem4x.h"
 #include "cmdlfem4x.h"

-#include "util.h"
-#include "data.h"
-#define LF_TRACE_BUFF_SIZE 12000
-#define LF_BITSSTREAM_LEN 1000

 
 

-char *global_em410xId;
+uint64_t g_em410xid = 0;

 
 static int CmdHelp(const char *Cmd);
 
 
 static int CmdHelp(const char *Cmd);
 

+int CmdEMdemodASK(const char *Cmd)
+{
+       char cmdp = param_getchar(Cmd, 0);
+       uint8_t findone = (cmdp == '1') ? 1 : 0;
+       UsbCommand c = {CMD_EM410X_DEMOD, {findone, 0, 0}};
+       SendCommand(&c);
+       return 0;
+}
+

 /* Read the ID of an EM410x tag.
  * Format:
  *   1111 1111 1           <-- standard non-repeatable header
 /* Read the ID of an EM410x tag.
  * Format:
  *   1111 1111 1           <-- standard non-repeatable header


@@ -38,230 +33,100 @@ static int CmdHelp(const char *Cmd);
  */
 int CmdEM410xRead(const char *Cmd)
 {
  */
 int CmdEM410xRead(const char *Cmd)
 {

-  int i, j, clock, header, rows, bit, hithigh, hitlow, first, bit2idx, high, low;
-  int parity[4];
-  char id[11];
-  char id2[11];
-  int retested = 0;
-  uint8_t BitStream[MAX_GRAPH_TRACE_LEN];
-  high = low = 0;
-
-  /* Detect high and lows and clock */
-  for (i = 0; i < GraphTraceLen; i++)
-  {
-    if (GraphBuffer[i] > high)
-      high = GraphBuffer[i];
-    else if (GraphBuffer[i] < low)
-      low = GraphBuffer[i];
-  }
-
-  /* get clock */
-  clock = GetClock(Cmd, high, 0);
-   
-  /* parity for our 4 columns */
-  parity[0] = parity[1] = parity[2] = parity[3] = 0;
-  header = rows = 0;
-
-  /* manchester demodulate */
-  bit = bit2idx = 0;
-  for (i = 0; i < (int)(GraphTraceLen / clock); i++)
-  {
-    hithigh = 0;
-    hitlow = 0;
-    first = 1;
-
-    /* Find out if we hit both high and low peaks */
-    for (j = 0; j < clock; j++)
-    {
-      if (GraphBuffer[(i * clock) + j] == high)
-        hithigh = 1;
-      else if (GraphBuffer[(i * clock) + j] == low)
-        hitlow = 1;
-
-      /* it doesn't count if it's the first part of our read
-       because it's really just trailing from the last sequence */
-      if (first && (hithigh || hitlow))
-        hithigh = hitlow = 0;
-      else
-        first = 0;
-
-      if (hithigh && hitlow)
-        break;
-    }
-
-    /* If we didn't hit both high and low peaks, we had a bit transition */
-    if (!hithigh || !hitlow)
-      bit ^= 1;
-
-    BitStream[bit2idx++] = bit;
-  }
-
-retest:
-  /* We go till 5 before the graph ends because we'll get that far below */
-  for (i = 0; i < bit2idx - 5; i++)
-  {
-    /* Step 2: We have our header but need our tag ID */
-    if (header == 9 && rows < 10)
-    {
-      /* Confirm parity is correct */
-      if ((BitStream[i] ^ BitStream[i+1] ^ BitStream[i+2] ^ BitStream[i+3]) == BitStream[i+4])
-      {
-        /* Read another byte! */
-        sprintf(id+rows, "%x", (8 * BitStream[i]) + (4 * BitStream[i+1]) + (2 * BitStream[i+2]) + (1 * BitStream[i+3]));
-        sprintf(id2+rows, "%x", (8 * BitStream[i+3]) + (4 * BitStream[i+2]) + (2 * BitStream[i+1]) + (1 * BitStream[i]));
-        rows++;
-
-        /* Keep parity info */
-        parity[0] ^= BitStream[i];
-        parity[1] ^= BitStream[i+1];
-        parity[2] ^= BitStream[i+2];
-        parity[3] ^= BitStream[i+3];
-
-        /* Move 4 bits ahead */
-        i += 4;
-      }
-
-      /* Damn, something wrong! reset */
-      else
-      {
-        PrintAndLog("Thought we had a valid tag but failed at word %d (i=%d)", rows + 1, i);
-
-        /* Start back rows * 5 + 9 header bits, -1 to not start at same place */
-        i -= 9 + (5 * rows) -5;
-
-        rows = header = 0;
-      }
-    }
-
-    /* Step 3: Got our 40 bits! confirm column parity */
-    else if (rows == 10)
-    {
-      /* We need to make sure our 4 bits of parity are correct and we have a stop bit */
-      if (BitStream[i] == parity[0] && BitStream[i+1] == parity[1] &&
-        BitStream[i+2] == parity[2] && BitStream[i+3] == parity[3] &&
-        BitStream[i+4] == 0)
-      {
-        /* Sweet! */
-        PrintAndLog("EM410x Tag ID: %s", id);
-        PrintAndLog("Unique Tag ID: %s", id2);
-
-               global_em410xId = id;
-               
-        /* Stop any loops */
-        return 1;
-      }
-
-      /* Crap! Incorrect parity or no stop bit, start all over */
-      else
-      {
-        rows = header = 0;
-
-        /* Go back 59 bits (9 header bits + 10 rows at 4+1 parity) */
-        i -= 59;
-      }
-    }
-
-    /* Step 1: get our header */
-    else if (header < 9)
-    {
-      /* Need 9 consecutive 1's */
-      if (BitStream[i] == 1)
-        header++;
-
-      /* We don't have a header, not enough consecutive 1 bits */
-      else
-        header = 0;
-    }
-  }
-
-  /* if we've already retested after flipping bits, return */
-  if (retested++){
-    return 0;
+       uint32_t hi=0;
+       uint64_t lo=0;
+
+       if(!AskEm410xDemod("", &hi, &lo, false)) return 0;
+       PrintAndLog("EM410x pattern found: ");
+       printEM410x(hi, lo);
+       if (hi){
+               PrintAndLog ("EM410x XL pattern found");
+               return 0;

        }
        }

+       g_em410xid = lo;
+       return 1;
+}

 
 

-  /* if this didn't work, try flipping bits */
-  for (i = 0; i < bit2idx; i++)
-    BitStream[i] ^= 1;

 
 

-  goto retest;
+int usage_lf_em410x_sim(void) {
+       PrintAndLog("Simulating EM410x tag");
+       PrintAndLog("");
+       PrintAndLog("Usage:  lf em4x em410xsim [h] <uid> <clock>");
+       PrintAndLog("Options:");
+       PrintAndLog("       h         - this help");
+       PrintAndLog("       uid       - uid (10 HEX symbols)");
+       PrintAndLog("       clock     - clock (32|64) (optional)");
+       PrintAndLog("samples:");
+       PrintAndLog("      lf em4x em410xsim 0F0368568B");
+       PrintAndLog("      lf em4x em410xsim 0F0368568B 32");
+       return 0;

 }
 
 }
 

-/* emulate an EM410X tag
- * Format:
- *   1111 1111 1           <-- standard non-repeatable header
- *   XXXX [row parity bit] <-- 10 rows of 5 bits for our 40 bit tag ID
- *   ....
- *   CCCC                  <-- each bit here is parity for the 10 bits above in corresponding column
- *   0                     <-- stop bit, end of tag
- */
+// emulate an EM410X tag

 int CmdEM410xSim(const char *Cmd)
 int CmdEM410xSim(const char *Cmd)

-{      
+{

        int i, n, j, binary[4], parity[4];
        int i, n, j, binary[4], parity[4];

+       uint8_t uid[5] = {0x00};

 
        char cmdp = param_getchar(Cmd, 0);
 
        char cmdp = param_getchar(Cmd, 0);

-       uint8_t uid[5] = {0x00};
+       if (cmdp == 'h' || cmdp == 'H') return usage_lf_em410x_sim();

 
 

-       if (cmdp == 'h' || cmdp == 'H') {
-               PrintAndLog("Usage:  lf em4x 410xsim <UID>");
-               PrintAndLog("");
-               PrintAndLog("     sample: lf em4x 410xsim 0F0368568B");
-               return 0;
-       }
+       /* clock is 64 in EM410x tags */
+       uint8_t clock = 64;

 
        if (param_gethex(Cmd, 0, uid, 10)) {
                PrintAndLog("UID must include 10 HEX symbols");
                return 0;
        }
        
 
        if (param_gethex(Cmd, 0, uid, 10)) {
                PrintAndLog("UID must include 10 HEX symbols");
                return 0;
        }
        

-       PrintAndLog("Starting simulating UID %02X%02X%02X%02X%02X", uid[0],uid[1],uid[2],uid[3],uid[4]);
+       param_getdec(Cmd, 1, &clock);
+       
+       PrintAndLog("Starting simulating UID %02X%02X%02X%02X%02X  clock: %d", uid[0],uid[1],uid[2],uid[3],uid[4],clock);

        PrintAndLog("Press pm3-button to about simulation");
        PrintAndLog("Press pm3-button to about simulation");

-  
-  /* clock is 64 in EM410x tags */
-  int clock = 64;
-
-  /* clear our graph */
-  ClearGraph(0);
-  
-    /* write 9 start bits */
-    for (i = 0; i < 9; i++)
-      AppendGraph(0, clock, 1);
-
-    /* for each hex char */
-    parity[0] = parity[1] = parity[2] = parity[3] = 0;
-    for (i = 0; i < 10; i++)
-    {
-      /* read each hex char */
-      sscanf(&Cmd[i], "%1x", &n);
-      for (j = 3; j >= 0; j--, n/= 2)
-        binary[j] = n % 2;
-
-      /* append each bit */
-      AppendGraph(0, clock, binary[0]);
-      AppendGraph(0, clock, binary[1]);
-      AppendGraph(0, clock, binary[2]);
-      AppendGraph(0, clock, binary[3]);
-
-      /* append parity bit */
-      AppendGraph(0, clock, binary[0] ^ binary[1] ^ binary[2] ^ binary[3]);
-
-      /* keep track of column parity */
-      parity[0] ^= binary[0];
-      parity[1] ^= binary[1];
-      parity[2] ^= binary[2];
-      parity[3] ^= binary[3];
-    }
-
-    /* parity columns */
-    AppendGraph(0, clock, parity[0]);
-    AppendGraph(0, clock, parity[1]);
-    AppendGraph(0, clock, parity[2]);
-    AppendGraph(0, clock, parity[3]);
-
-  /* stop bit */
-  AppendGraph(1, clock, 0);
+
+       /* clear our graph */
+       ClearGraph(0);
+
+       /* write 9 start bits */
+       for (i = 0; i < 9; i++)
+               AppendGraph(0, clock, 1);
+
+       /* for each hex char */
+       parity[0] = parity[1] = parity[2] = parity[3] = 0;
+       for (i = 0; i < 10; i++)
+       {
+               /* read each hex char */
+               sscanf(&Cmd[i], "%1x", &n);
+               for (j = 3; j >= 0; j--, n/= 2)
+                       binary[j] = n % 2;
+
+               /* append each bit */
+               AppendGraph(0, clock, binary[0]);
+               AppendGraph(0, clock, binary[1]);
+               AppendGraph(0, clock, binary[2]);
+               AppendGraph(0, clock, binary[3]);
+
+               /* append parity bit */
+               AppendGraph(0, clock, binary[0] ^ binary[1] ^ binary[2] ^ binary[3]);
+
+               /* keep track of column parity */
+               parity[0] ^= binary[0];
+               parity[1] ^= binary[1];
+               parity[2] ^= binary[2];
+               parity[3] ^= binary[3];
+       }
+
+       /* parity columns */
+       AppendGraph(0, clock, parity[0]);
+       AppendGraph(0, clock, parity[1]);
+       AppendGraph(0, clock, parity[2]);
+       AppendGraph(0, clock, parity[3]);
+
+       /* stop bit */
+       AppendGraph(1, clock, 0);

  
  

-  CmdLFSim("240"); //240 start_gap.
-  return 0;
+       CmdLFSim("0"); //240 start_gap.
+       return 0;

 }
 
 /* Function is equivalent of lf read + data samples + em410xread
 }
 
 /* Function is equivalent of lf read + data samples + em410xread


@@ -272,184 +137,38 @@ int CmdEM410xSim(const char *Cmd)
  *       rate gets lower, then grow the number of samples
  *  Changed by martin, 4000 x 4 = 16000, 
  *  see http://www.proxmark.org/forum/viewtopic.php?pid=7235#p7235
  *       rate gets lower, then grow the number of samples
  *  Changed by martin, 4000 x 4 = 16000, 
  *  see http://www.proxmark.org/forum/viewtopic.php?pid=7235#p7235

-

 */
 int CmdEM410xWatch(const char *Cmd)
 {
 */
 int CmdEM410xWatch(const char *Cmd)
 {

-       int read_h = (*Cmd == 'h');
-       do
-       {
+       do {

                if (ukbhit()) {
                        printf("\naborted via keyboard!\n");
                        break;
                }
                
                if (ukbhit()) {
                        printf("\naborted via keyboard!\n");
                        break;
                }
                

-               CmdLFRead(read_h ? "h" : "");
-               CmdSamples("6000");
-               
-       } while (
-               !CmdEM410xRead("") 
-       );
+               CmdLFRead("s");
+               getSamples("8201",true); //capture enough to get 2 complete preambles (4096*2+9)        
+       } while (!CmdEM410xRead(""));
+

        return 0;
 }
 
        return 0;
 }
 

+//currently only supports manchester modulations
+// todo: helptext

 int CmdEM410xWatchnSpoof(const char *Cmd)
 {
 int CmdEM410xWatchnSpoof(const char *Cmd)
 {

+       // loops if the captured ID was in XL-format.

        CmdEM410xWatch(Cmd);
        CmdEM410xWatch(Cmd);

-    PrintAndLog("# Replaying : %s",global_em410xId);
-    CmdEM410xSim(global_em410xId);
-  return 0;
-}
-
-/* Read the transmitted data of an EM4x50 tag
- * Format:
- *
- *  XXXXXXXX [row parity bit (even)] <- 8 bits plus parity
- *  XXXXXXXX [row parity bit (even)] <- 8 bits plus parity
- *  XXXXXXXX [row parity bit (even)] <- 8 bits plus parity
- *  XXXXXXXX [row parity bit (even)] <- 8 bits plus parity
- *  CCCCCCCC                         <- column parity bits
- *  0                                <- stop bit
- *  LW                               <- Listen Window
- *
- * This pattern repeats for every block of data being transmitted.
- * Transmission starts with two Listen Windows (LW - a modulated
- * pattern of 320 cycles each (32/32/128/64/64)).
- *
- * Note that this data may or may not be the UID. It is whatever data
- * is stored in the blocks defined in the control word First and Last
- * Word Read values. UID is stored in block 32.
- */
-int CmdEM4x50Read(const char *Cmd)
-{
-  int i, j, startblock, skip, block, start, end, low, high;
-  bool complete= false;
-  int tmpbuff[MAX_GRAPH_TRACE_LEN / 64];
-  char tmp[6];
-
-  high= low= 0;
-  memset(tmpbuff, 0, MAX_GRAPH_TRACE_LEN / 64);
-
-  /* first get high and low values */
-  for (i = 0; i < GraphTraceLen; i++)
-  {
-    if (GraphBuffer[i] > high)
-      high = GraphBuffer[i];
-    else if (GraphBuffer[i] < low)
-      low = GraphBuffer[i];
-  }
-
-  /* populate a buffer with pulse lengths */
-  i= 0;
-  j= 0;
-  while (i < GraphTraceLen)
-  {
-    // measure from low to low
-    while ((GraphBuffer[i] > low) && (i<GraphTraceLen))
-      ++i;
-    start= i;
-    while ((GraphBuffer[i] < high) && (i<GraphTraceLen))
-      ++i;
-    while ((GraphBuffer[i] > low) && (i<GraphTraceLen))
-      ++i;
-    if (j>=(MAX_GRAPH_TRACE_LEN/64)) {
-      break;
-    }
-    tmpbuff[j++]= i - start;
-  }
-
-  /* look for data start - should be 2 pairs of LW (pulses of 192,128) */
-  start= -1;
-  skip= 0;
-  for (i= 0; i < j - 4 ; ++i)
-  {
-    skip += tmpbuff[i];
-    if (tmpbuff[i] >= 190 && tmpbuff[i] <= 194)
-      if (tmpbuff[i+1] >= 126 && tmpbuff[i+1] <= 130)
-        if (tmpbuff[i+2] >= 190 && tmpbuff[i+2] <= 194)
-          if (tmpbuff[i+3] >= 126 && tmpbuff[i+3] <= 130)
-          {
-            start= i + 3;
-            break;
-          }
-  }
-  startblock= i + 3;
-
-  /* skip over the remainder of the LW */
-  skip += tmpbuff[i+1]+tmpbuff[i+2];
-  while (skip < MAX_GRAPH_TRACE_LEN && GraphBuffer[skip] > low)
-    ++skip;
-  skip += 8;
-
-  /* now do it again to find the end */
-  end= start;
-  for (i += 3; i < j - 4 ; ++i)
-  {
-    end += tmpbuff[i];
-    if (tmpbuff[i] >= 190 && tmpbuff[i] <= 194)
-      if (tmpbuff[i+1] >= 126 && tmpbuff[i+1] <= 130)
-        if (tmpbuff[i+2] >= 190 && tmpbuff[i+2] <= 194)
-          if (tmpbuff[i+3] >= 126 && tmpbuff[i+3] <= 130)
-          {
-            complete= true;
-            break;
-          }
-  }
-
-  if (start >= 0)
-    PrintAndLog("Found data at sample: %i",skip);
-  else
-  {
-    PrintAndLog("No data found!");
-    PrintAndLog("Try again with more samples.");
-    return 0;
-  }
-
-  if (!complete)
-  {
-    PrintAndLog("*** Warning!");
-    PrintAndLog("Partial data - no end found!");
-    PrintAndLog("Try again with more samples.");
-  }
-
-  /* get rid of leading crap */
-  sprintf(tmp,"%i",skip);
-  CmdLtrim(tmp);
-
-  /* now work through remaining buffer printing out data blocks */
-  block= 0;
-  i= startblock;
-  while (block < 6)
-  {
-    PrintAndLog("Block %i:", block);
-    // mandemod routine needs to be split so we can call it for data
-    // just print for now for debugging
-    CmdManchesterDemod("i 64");
-    skip= 0;
-    /* look for LW before start of next block */
-    for ( ; i < j - 4 ; ++i)
-    {
-      skip += tmpbuff[i];
-      if (tmpbuff[i] >= 190 && tmpbuff[i] <= 194)
-        if (tmpbuff[i+1] >= 126 && tmpbuff[i+1] <= 130)
-          break;
-    }
-    while (GraphBuffer[skip] > low)
-      ++skip;
-    skip += 8;
-    sprintf(tmp,"%i",skip);
-    CmdLtrim(tmp);
-    start += skip;
-    block++;
-  }
-  return 0;
+       PrintAndLog("# Replaying captured ID: %llu", g_em410xid);
+       CmdLFaskSim("");
+       return 0;

 }
 
 int CmdEM410xWrite(const char *Cmd)
 {
 }
 
 int CmdEM410xWrite(const char *Cmd)
 {

-  uint64_t id = 0xFFFFFFFFFFFFFFFF; // invalid id value
-  int card = 0xFF; // invalid card value
-       unsigned int clock = 0; // invalid clock value
+       uint64_t id = 0xFFFFFFFFFFFFFFFF; // invalid id value
+       int card = 0xFF; // invalid card value
+       uint32_t clock = 0; // invalid clock value

 
        sscanf(Cmd, "%" PRIx64 " %d %d", &id, &card, &clock);
 
 
        sscanf(Cmd, "%" PRIx64 " %d %d", &id, &card, &clock);
 


@@ -474,21 +193,13 @@ int CmdEM410xWrite(const char *Cmd)
        }
 
        // Check Clock
        }
 
        // Check Clock

-       if (card == 1)
-       {

                // Default: 64
                // Default: 64

-               if (clock == 0)
-                       clock = 64;
+       if (clock == 0)
+               clock = 64;

 
 

-               // Allowed clock rates: 16, 32 and 64
-               if ((clock != 16) && (clock != 32) && (clock != 64)) {
-                       PrintAndLog("Error! Clock rate %d not valid. Supported clock rates are 16, 32 and 64.\n", clock);
-                       return 0;
-               }
-       }
-       else if (clock != 0)
-       {
-               PrintAndLog("Error! Clock rate is only supported on T55x7 tags.\n");
+       // Allowed clock rates: 16, 32, 40 and 64
+       if ((clock != 16) && (clock != 32) && (clock != 64) && (clock != 40)) {
+               PrintAndLog("Error! Clock rate %d not valid. Supported clock rates are 16, 32, 40 and 64.\n", clock);

                return 0;
        }
 
                return 0;
        }
 


@@ -498,434 +209,486 @@ int CmdEM410xWrite(const char *Cmd)
                //   provide for backwards-compatibility for older firmware, and to avoid
                //   having to add another argument to CMD_EM410X_WRITE_TAG, we just store
                //   the clock rate in bits 8-15 of the card value
                //   provide for backwards-compatibility for older firmware, and to avoid
                //   having to add another argument to CMD_EM410X_WRITE_TAG, we just store
                //   the clock rate in bits 8-15 of the card value

-               card = (card & 0xFF) | (((uint64_t)clock << 8) & 0xFF00);
-       }
-       else if (card == 0)
+               card = (card & 0xFF) | ((clock << 8) & 0xFF00);
+       }       else if (card == 0) {

                PrintAndLog("Writing %s tag with UID 0x%010" PRIx64, "T5555", id, clock);
                PrintAndLog("Writing %s tag with UID 0x%010" PRIx64, "T5555", id, clock);

-       else {
+               card = (card & 0xFF) | ((clock << 8) & 0xFF00);
+       } else {

                PrintAndLog("Error! Bad card type selected.\n");
                return 0;
        }
 
                PrintAndLog("Error! Bad card type selected.\n");
                return 0;
        }
 

-  UsbCommand c = {CMD_EM410X_WRITE_TAG, {card, (uint32_t)(id >> 32), (uint32_t)id}};
-  SendCommand(&c);
-
-  return 0;
+       UsbCommand c = {CMD_EM410X_WRITE_TAG, {card, (uint32_t)(id >> 32), (uint32_t)id}};
+       SendCommand(&c);
+       return 0;

 }
 
 }
 

-int CmdReadWord(const char *Cmd)
+bool EM_EndParityTest(uint8_t *BitStream, size_t size, uint8_t rows, uint8_t cols, uint8_t pType)

 {
 {

-       int Word = -1; //default to invalid word
-       UsbCommand c;
-  
-       sscanf(Cmd, "%d", &Word);
-  
-       if ( (Word > 15) | (Word < 0) ) {
-               PrintAndLog("Word must be between 0 and 15");
-               return 1;
+       if (rows*cols>size) return false;
+       uint8_t colP=0;
+       //assume last col is a parity and do not test
+       for (uint8_t colNum = 0; colNum < cols-1; colNum++) {
+               for (uint8_t rowNum = 0; rowNum < rows; rowNum++) {
+                       colP ^= BitStream[(rowNum*cols)+colNum];
+               }
+               if (colP != pType) return false;

        }
        }

-  
-       PrintAndLog("Reading word %d", Word);
-  
-       c.cmd = CMD_EM4X_READ_WORD;
-       c.d.asBytes[0] = 0x0; //Normal mode
-       c.arg[0] = 0;
-       c.arg[1] = Word;
-       c.arg[2] = 0;
-       SendCommand(&c);
-       WaitForResponse(CMD_ACK, NULL);
-
-       uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};
-
-       GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,3560);  //3560 -- should be offset..
-       WaitForResponseTimeout(CMD_ACK,NULL, 1500);
+       return true;
+}

 
 

-       for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {
-               GraphBuffer[j] = ((int)data[j]);
+bool EM_ByteParityTest(uint8_t *BitStream, size_t size, uint8_t rows, uint8_t cols, uint8_t pType)
+{
+       if (rows*cols>size) return false;
+       uint8_t rowP=0;
+       //assume last row is a parity row and do not test
+       for (uint8_t rowNum = 0; rowNum < rows-1; rowNum++) {
+               for (uint8_t colNum = 0; colNum < cols; colNum++) {
+                       rowP ^= BitStream[(rowNum*cols)+colNum];
+               }
+               if (rowP != pType) return false;

        }
        }

-       GraphTraceLen = LF_TRACE_BUFF_SIZE;
-       
-       uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};
-       uint8_t * bitstream = bits;
-       manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream,LF_BITSSTREAM_LEN);
-       RepaintGraphWindow();
-  return 0;
+       return true;

 }
 
 }
 

-int CmdReadWordPWD(const char *Cmd)
+uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool pTest)
+{
+       if (size<45) return 0;
+       
+       uint32_t code = bytebits_to_byte(BitStream,8);
+       code = code<<8 | bytebits_to_byte(BitStream+9,8);
+       code = code<<8 | bytebits_to_byte(BitStream+18,8);
+       code = code<<8 | bytebits_to_byte(BitStream+27,8);
+       
+       if (verbose || g_debugMode){
+               for (uint8_t i = 0; i<5; i++){
+                       if (i == 4) PrintAndLog(""); //parity byte spacer
+                       PrintAndLog("%d%d%d%d%d%d%d%d %d -> 0x%02x",
+                           BitStream[i*9],
+                           BitStream[i*9+1],
+                           BitStream[i*9+2],
+                           BitStream[i*9+3],
+                           BitStream[i*9+4],
+                           BitStream[i*9+5],
+                           BitStream[i*9+6],
+                           BitStream[i*9+7],
+                           BitStream[i*9+8],
+                           bytebits_to_byte(BitStream+i*9,8)
+                       );
+               }
+               if (pTest)
+                       PrintAndLog("Parity Passed");
+               else
+                       PrintAndLog("Parity Failed");
+       }
+       return code;
+}
+/* Read the transmitted data of an EM4x50 tag from the graphbuffer
+ * Format:
+ *
+ *  XXXXXXXX [row parity bit (even)] <- 8 bits plus parity
+ *  XXXXXXXX [row parity bit (even)] <- 8 bits plus parity
+ *  XXXXXXXX [row parity bit (even)] <- 8 bits plus parity
+ *  XXXXXXXX [row parity bit (even)] <- 8 bits plus parity
+ *  CCCCCCCC                         <- column parity bits
+ *  0                                <- stop bit
+ *  LW                               <- Listen Window
+ *
+ * This pattern repeats for every block of data being transmitted.
+ * Transmission starts with two Listen Windows (LW - a modulated
+ * pattern of 320 cycles each (32/32/128/64/64)).
+ *
+ * Note that this data may or may not be the UID. It is whatever data
+ * is stored in the blocks defined in the control word First and Last
+ * Word Read values. UID is stored in block 32.
+ */
+ //completed by Marshmellow
+int EM4x50Read(const char *Cmd, bool verbose)

 {
 {

-       int Word = -1; //default to invalid word
-       int Password = 0xFFFFFFFF; //default to blank password
-       UsbCommand c;

 
 

-       sscanf(Cmd, "%d %x", &Word, &Password);
+       uint8_t fndClk[] = {8,16,32,40,50,64,128};
+       int clk = 0; 
+       int invert = 0;
+       int tol = 0;
+       int i, j, startblock, skip, block, start, end, low, high, minClk;
+       bool complete = false;
+       int tmpbuff[MAX_GRAPH_TRACE_LEN / 64];
+       uint32_t Code[6];
+       char tmp[6];
+       char tmp2[20];
+       int phaseoff;
+       high = low = 0;
+       memset(tmpbuff, 0, MAX_GRAPH_TRACE_LEN / 64);
+
+       // get user entry if any
+       sscanf(Cmd, "%i %i", &clk, &invert);
+       
+       // save GraphBuffer - to restore it later       
+       save_restoreGB(1);
+
+       // first get high and low values
+       for (i = 0; i < GraphTraceLen; i++) {
+               if (GraphBuffer[i] > high)
+                       high = GraphBuffer[i];
+               else if (GraphBuffer[i] < low)
+                       low = GraphBuffer[i];
+       }

 
 

-       if ( (Word > 15) | (Word < 0) ) {
-               PrintAndLog("Word must be between 0 and 15");
-               return 1;
+       i = 0;
+       j = 0;
+       minClk = 255;
+       // get to first full low to prime loop and skip incomplete first pulse
+       while ((GraphBuffer[i] < high) && (i < GraphTraceLen))
+               ++i;
+       while ((GraphBuffer[i] > low) && (i < GraphTraceLen))
+               ++i;
+       skip = i;
+
+       // populate tmpbuff buffer with pulse lengths
+       while (i < GraphTraceLen) {
+               // measure from low to low
+               while ((GraphBuffer[i] > low) && (i < GraphTraceLen))
+                       ++i;
+               start= i;
+               while ((GraphBuffer[i] < high) && (i < GraphTraceLen))
+                       ++i;
+               while ((GraphBuffer[i] > low) && (i < GraphTraceLen))
+                       ++i;
+               if (j>=(MAX_GRAPH_TRACE_LEN/64)) {
+                       break;
+               }
+               tmpbuff[j++]= i - start;
+               if (i-start < minClk && i < GraphTraceLen) {
+                       minClk = i - start;
+               }

        }
        }

-  
-       PrintAndLog("Reading word %d with password %08X", Word, Password);
-
-       c.cmd = CMD_EM4X_READ_WORD;
-       c.d.asBytes[0] = 0x1; //Password mode
-       c.arg[0] = 0;
-       c.arg[1] = Word;
-       c.arg[2] = Password;
-       SendCommand(&c);
-       WaitForResponse(CMD_ACK, NULL);
+       // set clock
+       if (!clk) {
+               for (uint8_t clkCnt = 0; clkCnt<7; clkCnt++) {
+                       tol = fndClk[clkCnt]/8;
+                       if (minClk >= fndClk[clkCnt]-tol && minClk <= fndClk[clkCnt]+1) { 
+                               clk=fndClk[clkCnt];
+                               break;
+                       }
+               }
+               if (!clk) {
+                       PrintAndLog("ERROR: EM4x50 - didn't find a clock");
+                       return 0;
+               }
+       } else tol = clk/8;
+
+       // look for data start - should be 2 pairs of LW (pulses of clk*3,clk*2)
+       start = -1;
+       for (i= 0; i < j - 4 ; ++i) {
+               skip += tmpbuff[i];
+               if (tmpbuff[i] >= clk*3-tol && tmpbuff[i] <= clk*3+tol)  //3 clocks
+                       if (tmpbuff[i+1] >= clk*2-tol && tmpbuff[i+1] <= clk*2+tol)  //2 clocks
+                               if (tmpbuff[i+2] >= clk*3-tol && tmpbuff[i+2] <= clk*3+tol) //3 clocks
+                                       if (tmpbuff[i+3] >= clk-tol)  //1.5 to 2 clocks - depends on bit following
+                                       {
+                                               start= i + 4;
+                                               break;
+                                       }
+       }
+       startblock = i + 4;
+
+       // skip over the remainder of LW
+       skip += tmpbuff[i+1] + tmpbuff[i+2] + clk;
+       if (tmpbuff[i+3]>clk) 
+               phaseoff = tmpbuff[i+3]-clk;
+       else
+               phaseoff = 0;
+       // now do it again to find the end
+       end = skip;
+       for (i += 3; i < j - 4 ; ++i) {
+               end += tmpbuff[i];
+               if (tmpbuff[i] >= clk*3-tol && tmpbuff[i] <= clk*3+tol)  //3 clocks
+                       if (tmpbuff[i+1] >= clk*2-tol && tmpbuff[i+1] <= clk*2+tol)  //2 clocks
+                               if (tmpbuff[i+2] >= clk*3-tol && tmpbuff[i+2] <= clk*3+tol) //3 clocks
+                                       if (tmpbuff[i+3] >= clk-tol)  //1.5 to 2 clocks - depends on bit following
+                                       {
+                                               complete= true;
+                                               break;
+                                       }
+       }
+       end = i;
+       // report back
+       if (verbose || g_debugMode) {
+               if (start >= 0) {
+                       PrintAndLog("\nNote: one block = 50 bits (32 data, 12 parity, 6 marker)");
+               }       else {
+                       PrintAndLog("No data found!, clock tried:%d",clk);
+                       PrintAndLog("Try again with more samples.");
+                       PrintAndLog("  or after a 'data askedge' command to clean up the read");
+                       return 0;
+               }
+       } else if (start < 0) return 0;
+       start = skip;
+       snprintf(tmp2, sizeof(tmp2),"%d %d 1000 %d", clk, invert, clk*47);
+       // get rid of leading crap 
+       snprintf(tmp, sizeof(tmp), "%i", skip);
+       CmdLtrim(tmp);
+       bool pTest;
+       bool AllPTest = true;
+       // now work through remaining buffer printing out data blocks
+       block = 0;
+       i = startblock;
+       while (block < 6) {
+               if (verbose || g_debugMode) PrintAndLog("\nBlock %i:", block);
+               skip = phaseoff;

                
                

-       uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};
-
-       GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,3560);  //3560 -- should be offset..
-       WaitForResponseTimeout(CMD_ACK,NULL, 1500);
-
-       for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {
-               GraphBuffer[j] = ((int)data[j]);
+               // look for LW before start of next block
+               for ( ; i < j - 4 ; ++i) {
+                       skip += tmpbuff[i];
+                       if (tmpbuff[i] >= clk*3-tol && tmpbuff[i] <= clk*3+tol)
+                               if (tmpbuff[i+1] >= clk-tol)
+                                       break;
+               }
+               if (i >= j-4) break; //next LW not found
+               skip += clk;
+               if (tmpbuff[i+1]>clk)
+                       phaseoff = tmpbuff[i+1]-clk;
+               else
+                       phaseoff = 0;
+               i += 2;
+               if (ASKDemod(tmp2, false, false, 1) < 1) {
+                       save_restoreGB(0);
+                       return 0;
+               }
+               //set DemodBufferLen to just one block
+               DemodBufferLen = skip/clk;
+               //test parities
+               pTest = EM_ByteParityTest(DemodBuffer,DemodBufferLen,5,9,0);    
+               pTest &= EM_EndParityTest(DemodBuffer,DemodBufferLen,5,9,0);
+               AllPTest &= pTest;
+               //get output
+               Code[block] = OutputEM4x50_Block(DemodBuffer,DemodBufferLen,verbose, pTest);
+               if (g_debugMode) PrintAndLog("\nskipping %d samples, bits:%d", skip, skip/clk);
+               //skip to start of next block
+               snprintf(tmp,sizeof(tmp),"%i",skip);
+               CmdLtrim(tmp);
+               block++;
+               if (i >= end) break; //in case chip doesn't output 6 blocks

        }
        }

-       GraphTraceLen = LF_TRACE_BUFF_SIZE;
-       
-       uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};
-       uint8_t * bitstream = bits;     
-       manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream, LF_BITSSTREAM_LEN);
-       RepaintGraphWindow();
-  return 0;
+       //print full code:
+       if (verbose || g_debugMode || AllPTest){
+               if (!complete) {
+                       PrintAndLog("*** Warning!");
+                       PrintAndLog("Partial data - no end found!");
+                       PrintAndLog("Try again with more samples.");
+               }
+               PrintAndLog("Found data at sample: %i - using clock: %i", start, clk);    
+               end = block;
+               for (block=0; block < end; block++){
+                       PrintAndLog("Block %d: %08x",block,Code[block]);
+               }
+               if (AllPTest) {
+                       PrintAndLog("Parities Passed");
+               } else {
+                       PrintAndLog("Parities Failed");
+                       PrintAndLog("Try cleaning the read samples with 'data askedge'");
+               }
+       }
+
+       //restore GraphBuffer
+       save_restoreGB(0);
+       return (int)AllPTest;

 }
 
 }
 

-int CmdWriteWord(const char *Cmd)
-{
-  int Word = 16; //default to invalid block
-  int Data = 0xFFFFFFFF; //default to blank data
-  UsbCommand c;
-  
-  sscanf(Cmd, "%x %d", &Data, &Word);
-  
-  if (Word > 15) {
-    PrintAndLog("Word must be between 0 and 15");
-    return 1;
-  }
-  
-  PrintAndLog("Writing word %d with data %08X", Word, Data);
-  
-  c.cmd = CMD_EM4X_WRITE_WORD;
-  c.d.asBytes[0] = 0x0; //Normal mode
-  c.arg[0] = Data;
-  c.arg[1] = Word;
-  c.arg[2] = 0;
-  SendCommand(&c);
-  return 0;
+int CmdEM4x50Read(const char *Cmd) {
+       return EM4x50Read(Cmd, true);

 }
 
 }
 

-int CmdWriteWordPWD(const char *Cmd)
-{
-  int Word = 16; //default to invalid word
-  int Data = 0xFFFFFFFF; //default to blank data
-  int Password = 0xFFFFFFFF; //default to blank password
-  UsbCommand c;
-  
-  sscanf(Cmd, "%x %d %x", &Data, &Word, &Password);
-  
-  if (Word > 15) {
-    PrintAndLog("Word must be between 0 and 15");
-    return 1;
-  }
-  
-  PrintAndLog("Writing word %d with data %08X and password %08X", Word, Data, Password);
-  
-  c.cmd = CMD_EM4X_WRITE_WORD;
-  c.d.asBytes[0] = 0x1; //Password mode
-  c.arg[0] = Data;
-  c.arg[1] = Word;
-  c.arg[2] = Password;
-  SendCommand(&c);
-  return 0;
+int usage_lf_em_read(void) {
+       PrintAndLog("Read EM4x50.  Tag must be on antenna. ");
+       PrintAndLog("");
+       PrintAndLog("Usage:  lf em readword [h] <address> <pwd>");
+       PrintAndLog("Options:");
+       PrintAndLog("       h         - this help");
+       PrintAndLog("       address   - memory address to read. (0-15)");
+       PrintAndLog("       pwd       - password (hex) (optional)");
+       PrintAndLog("samples:");
+       PrintAndLog("      lf em readword 1");
+       PrintAndLog("      lf em readword 1 11223344");
+       return 0;

 }
 }

+int CmdReadWord(const char *Cmd) {
+       int addr, pwd;
+       bool usePwd = false;
+       uint8_t ctmp = param_getchar(Cmd, 0);
+       if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em_read();
+
+       addr = param_get8ex(Cmd, 0, -1, 10);
+       pwd =  param_get32ex(Cmd, 1, -1, 16);
+       
+       if ( (addr > 15) || (addr < 0 ) || ( addr == -1) ) {
+               PrintAndLog("Address must be between 0 and 15");
+               return 1;
+       }
+       if ( pwd == -1 )
+               PrintAndLog("Reading address %d", addr);
+       else {
+               usePwd = true;
+               PrintAndLog("Reading address %d | password %08X", addr, pwd);
+       }
+       
+       UsbCommand c = {CMD_EM4X_READ_WORD, {addr, pwd, usePwd}};
+       clearCommandBuffer();
+       SendCommand(&c);
+       UsbCommand resp;        
+       if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)){
+               PrintAndLog("Command timed out");
+               return -1;
+       }
+       
+       uint8_t got[6000];
+       GetFromBigBuf(got, sizeof(got), 0);
+       if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500) ) {
+               PrintAndLog("command execution time out");
+               return -1;
+       }
+       setGraphBuf(got, sizeof(got));
+       
+       
+       int ans = 0;
+       //bool ST = true;
+       DemodBufferLen = 0x00;  
+
+       //ans = ASKDemod_ext("0 0 1", FALSE, FALSE, 1, &ST);
+       ans = ASKbiphaseDemod("0 0 1", FALSE);
+       if (!ans) { 
+               if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/Manchester Demod failed");
+               return -1;
+       }

 
 

-static command_t CommandTable[] =
-{
-  {"help", CmdHelp, 1, "This help"},
-  
-  {"410xread", CmdEM410xRead, 1, "[clock rate] -- Extract ID from EM410x tag"},
-  {"410xsim", CmdEM410xSim, 0, "<UID> -- Simulate EM410x tag"},
-  {"replay",  MWRem4xReplay, 0, "Watches for tag and simulates manchester encoded em4x tag"},
-  {"410xwatch", CmdEM410xWatch, 0, "['h'] -- Watches for EM410x 125/134 kHz tags (option 'h' for 134)"},
-  {"410xspoof", CmdEM410xWatchnSpoof, 0, "['h'] --- Watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)" },
-  {"410xwrite", CmdEM410xWrite, 1, "<UID> <'0' T5555> <'1' T55x7> [clock rate] -- Write EM410x UID to T5555(Q5) or T55x7 tag, optionally setting clock rate"},
-  {"4x50read", CmdEM4x50Read, 1, "Extract data from EM4x50 tag"},
-  {"rd", CmdReadWord, 1, "<Word 1-15> -- Read EM4xxx word data"},
-  {"rdpwd", CmdReadWordPWD, 1, "<Word 1-15> <Password> -- Read EM4xxx word data  in password mode "},
-  {"wr", CmdWriteWord, 1, "<Data> <Word 1-15> -- Write EM4xxx word data"},
-  {"wrpwd", CmdWriteWordPWD, 1, "<Data> <Word 1-15> <Password> -- Write EM4xxx word data in password mode"},
-  {NULL, NULL, 0, NULL}
-};
+       size_t startIdx = 0, size = DemodBufferLen; 

 
 

+       PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size);

 
 

-//Confirms the parity of a bitstream as well as obtaining the data (TagID) from within the appropriate memory space.
-//Arguments:
-// Pointer to a string containing the desired bitsream
-// Pointer to a string that will receive the decoded tag ID
-// Length of the bitsream pointed at in the first argument, char* _strBitStream
-//Retuns:
-//1 Parity confirmed
-//0 Parity not confirmed
-int ConfirmEm410xTagParity( char* _strBitStream, char* pID, int LengthOfBitstream )
-{
-       int i = 0;
-       int rows = 0;
-       int Parity[4] = {0x00};
-       char ID[11] = {0x00};
-       int k = 0;
-       int BitStream[70] = {0x00};
-       int counter = 0;
-       //prepare variables
-       for ( i = 0; i <= LengthOfBitstream; i++)
-       {
-               if (_strBitStream[i] == '1')
-               {
-                       k =1;
-                       memcpy(&BitStream[i], &k,4);
-               }
-               else if (_strBitStream[i] == '0')
-               {
-                       k = 0;
-                       memcpy(&BitStream[i], &k,4);
-               }
+       
+       uint8_t preamble[8] = {0,0,0,0,1,0,1,0};        
+       uint8_t errChk = !preambleSearch(DemodBuffer, preamble, sizeof(preamble), &size, &startIdx);
+       if ( errChk == 0) {
+               if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
+               return -1;

        }
        }

-       while ( counter < 2 )
-       {
-               //set/reset variables and counters
-               memset(ID,0x00,sizeof(ID));
-               memset(Parity,0x00,sizeof(Parity));
-               rows = 0;
-               for ( i = 9; i <= LengthOfBitstream; i++)
-               {
-                       if ( rows < 10 )
-                       {
-                               if ((BitStream[i] ^ BitStream[i+1] ^ BitStream[i+2] ^ BitStream[i+3]) == BitStream[i+4])
-                               {
-                                       sprintf(ID+rows, "%x", (8 * BitStream[i]) + (4 * BitStream[i+1]) + (2 * BitStream[i+2]) + (1 * BitStream[i+3]));
-                                       rows++;
-                                       /* Keep parity info and move four bits ahead*/
-                                       Parity[0] ^= BitStream[i];
-                                       Parity[1] ^= BitStream[i+1];
-                                       Parity[2] ^= BitStream[i+2];
-                                       Parity[3] ^= BitStream[i+3];
-                                       i += 4;
-                               }
-                       }
-                       if ( rows == 10 )
-                       {
-                               if (    BitStream[i] == Parity[0] && BitStream[i+1] == Parity[1] &&
-                                       BitStream[i+2] == Parity[2] && BitStream[i+3] == Parity[3] &&
-                                       BitStream[i+4] == 0)
-                               {
-                                       memcpy(pID,ID,strlen(ID));
-                                       return 1;
-                               }
-                       }
-               }
-               printf("[PARITY ->]Failed. Flipping Bits, and rechecking parity for bitstream:\n[PARITY ->]");  
-               for (k = 0; k < LengthOfBitstream; k++)
-               {
-                       BitStream[k] ^= 1;
-                       printf("%i", BitStream[k]);
-               }
-               puts(" ");
-               counter++;
+
+       // sanity check. 
+       if (size != 32) {
+               if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 incorrect data length found,  %u", size );
+               return -1;

        }
        }

+
+       //setDemodBuf(BitStream, 32, preambleIndex);
+       
+       return 1;
+}
+
+int usage_lf_em_write(void) {
+       PrintAndLog("Write EM4x50.  Tag must be on antenna. ");
+       PrintAndLog("");
+       PrintAndLog("Usage:  lf em writeword [h] <address> <data> <pwd>");
+       PrintAndLog("Options:");
+       PrintAndLog("       h         - this help");
+       PrintAndLog("       address   - memory address to write to. (0-15)");
+       PrintAndLog("       data      - data to write (hex)");  
+       PrintAndLog("       pwd       - password (hex) (optional)");
+       PrintAndLog("samples:");
+       PrintAndLog("      lf em writeword 1");
+       PrintAndLog("      lf em writeword 1 deadc0de 11223344");

        return 0;
 }
        return 0;
 }

-//Reads and demodulates an em410x RFID tag. It further allows slight modification to the decoded bitstream
-//Once a suitable bitstream has been identified, and if needed, modified, it is replayed. Allowing emulation of the
-//"stolen" rfid tag.
-//No meaningful returns or arguments.
-int MWRem4xReplay(const char* Cmd)
-{
-       // //header traces
-       // static char ArrayTraceZero[] = { '0','0','0','0','0','0','0','0','0' };
-       // static char ArrayTraceOne[] =  { '1','1','1','1','1','1','1','1','1' };
-       // //local string variables
-       // char strClockRate[10] = {0x00};
-       // char strAnswer[4] = {0x00};
-       // char strTempBufferMini[2] = {0x00}; 
-       // //our outbound bit-stream
-       // char strSimulateBitStream[65] = {0x00};
-       // //integers
-       // int iClockRate = 0;
-       // int needle = 0;
-       // int j = 0;
-       // int iFirstHeaderOffset = 0x00000000;
-       // int numManchesterDemodBits=0;
-       // //boolean values
-       // bool bInverted = false;
-       // //pointers to strings. memory will be allocated.
-       // char* pstrInvertBitStream = 0x00000000;
-       // char* pTempBuffer = 0x00000000;
-       // char* pID = 0x00000000;
-       // char* strBitStreamBuffer = 0x00000000;
+int CmdWriteWord(const char *Cmd) {
+       uint8_t ctmp = param_getchar(Cmd, 0);
+       if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em_write();
+       
+       bool usePwd = false;

                
                

-
-       // puts("###################################");
-       // puts("#### Em4x Replay                 ##");
-       // puts("#### R.A.M.           June 2013  ##");
-       // puts("###################################");
-       // //initialize
-       // CmdLFRead("");
-       // //Collect ourselves 10,000 samples
-       // CmdSamples("10000");
-       // puts("[->]preforming ASK demodulation\n");
-       // //demodulate ask
-       // Cmdaskdemod("0");
-       // iClockRate = DetectClock(0);
-       // sprintf(strClockRate, "%i\n",iClockRate);
-       // printf("[->]Detected ClockRate: %s\n", strClockRate);
+       int addr = 16; // default to invalid address
+       int data = 0xFFFFFFFF; // default to blank data
+       int pwd = 0xFFFFFFFF; // default to blank password
+       
+       addr = param_get8ex(Cmd, 0, -1, 10);
+       data = param_get32ex(Cmd, 1, -1, 16);
+       pwd =  param_get32ex(Cmd, 2, -1, 16);

        
        

-       // //If detected clock rate is something completely unreasonable, dont go ahead
-       // if ( iClockRate < 0xFFFE )
-       // {  
-           // pTempBuffer = (char*)malloc(MAX_GRAPH_TRACE_LEN);
-           // if (pTempBuffer == 0x00000000)
-             // return 0;
-           // memset(pTempBuffer,0x00,MAX_GRAPH_TRACE_LEN);
-           // //Preform manchester de-modulation and display in a single line.
-           // numManchesterDemodBits = CmdManchesterDemod( strClockRate ); 
-           // //note: numManchesterDemodBits is set above in CmdManchesterDemod()
-           // if ( numManchesterDemodBits == 0 )
-             // return 0;
-           // strBitStreamBuffer = malloc(numManchesterDemodBits+1);
-           // if ( strBitStreamBuffer == 0x00000000 )
-               // return 0;
-           // memset(strBitStreamBuffer, 0x00, (numManchesterDemodBits+1));
-           // //fill strBitStreamBuffer with demodulated, string formatted bits.
-           // for ( j = 0; j <= numManchesterDemodBits; j++ )
-           // {
-               // sprintf(strTempBufferMini, "%i",BitStream[j]);
-               // strcat(strBitStreamBuffer,strTempBufferMini);
-           // }
-           // printf("[->]Demodulated Bitstream: \n%s\n", strBitStreamBuffer);
-           // //Reset counter and select most probable bit stream
-           // j = 0;
-               // while ( j < numManchesterDemodBits )
-               // {
-                   // memset(strSimulateBitStream,0x00,64);
-                   // //search for header of nine (9) 0's : 000000000 or nine (9) 1's : 1111 1111 1
-                       // if ( ( strncmp(strBitStreamBuffer+j, ArrayTraceZero, sizeof(ArrayTraceZero)) == 0 ) ||
-                           // ( strncmp(strBitStreamBuffer+j, ArrayTraceOne, sizeof(ArrayTraceOne)) == 0  ) )
-                       // {
-                               // iFirstHeaderOffset = j;
-                           // memcpy(strSimulateBitStream, strBitStreamBuffer+j,64);
-                           // printf("[->]Offset of Header");
-                               // if ( strncmp(strBitStreamBuffer+iFirstHeaderOffset, "0", 1) == 0 )
-                                       // printf("'%s'", ArrayTraceZero );
-                               // else
-                                       // printf("'%s'", ArrayTraceOne );
-                               // printf(": %i\nHighlighted string : %s\n",iFirstHeaderOffset,strSimulateBitStream);
-                           // //allow us to escape loop or choose another frame
-                           // puts("[<-]Are we happy with this sample? [Y]es/[N]o");
-                           // gets(strAnswer);
-                           // if ( ( strncmp(strAnswer,"y",1) == 0 )  || ( strncmp(strAnswer,"Y",1) == 0 ) )
-                           // {
-                                   // j = numManchesterDemodBits+1;
-                                   // break;
-                           // }
-                       // }
-                       // j++;
-               // }
-       // }
-       // else return 0;

        
        

-       // //Do we want the buffer inverted?
-       // memset(strAnswer, 0x00, sizeof(strAnswer));
-       // printf("[<-]Do you wish to invert the highlighted bitstream? [Y]es/[N]o\n");
-       // gets(strAnswer);
-       // if ( ( strncmp("y", strAnswer,1) == 0 )  || ( strncmp("Y", strAnswer, 1 ) == 0 ) )
-       // {
-               // //allocate heap memory
-               // pstrInvertBitStream = (char*)malloc(numManchesterDemodBits);
-               // if ( pstrInvertBitStream != 0x00000000 )
-               // {
-                       // memset(pstrInvertBitStream,0x00,numManchesterDemodBits);
-                       // bInverted = true;
-                       // //Invert Bitstream
-                       // for ( needle = 0; needle <= numManchesterDemodBits; needle++ )
-                       // {
-                               // if (strSimulateBitStream[needle] == '0')
-                                       // strcat(pstrInvertBitStream,"1");
-                               // else if (strSimulateBitStream[needle] == '1')
-                                       // strcat(pstrInvertBitStream,"0");
-                       // }
-                       // printf("[->]Inverted bitstream: %s\n", pstrInvertBitStream);
-               // }
-       // }    
-    // //Confirm parity of selected string
-       // pID = (char*)malloc(11);
-       // if (pID != 0x00000000)
-       // {
-               // memset(pID, 0x00, 11);
-               // if (ConfirmEm410xTagParity(strSimulateBitStream,pID, 64) == 1)
-               // {
-                       // printf("[->]Parity confirmed for selected bitstream!\n");
-                       // printf("[->]Tag ID was detected as: [hex]:%s\n",pID );
-               // }
-               // else
-                       // printf("[->]Parity check failed for the selected bitstream!\n");     
-       // }
+       if ( (addr > 15) || (addr < 0 ) || ( addr == -1) ) {
+               PrintAndLog("Address must be between 0 and 15");
+               return 1;
+       }
+       if ( pwd == -1 )
+               PrintAndLog("Writing address %d data %08X", addr, data);        
+       else {
+               usePwd = true;
+               PrintAndLog("Writing address %d data %08X using password %08X", addr, data, pwd);               
+       }
+       
+       uint16_t flag = (addr << 8 ) | usePwd;
+       
+       UsbCommand c = {CMD_EM4X_WRITE_WORD, {flag, data, pwd}};
+       clearCommandBuffer();
+       SendCommand(&c);
+       UsbCommand resp;        
+       if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)){
+               PrintAndLog("Error occurred, device did not respond during write operation.");
+               return -1;
+       }
+       
+       //get response if there is one
+       uint8_t got[6000]; // 8 bit preamble + 32 bit word response (max clock (128) * 40bits = 5120 samples)
+       GetFromBigBuf(got, sizeof(got), 0);
+       if ( !WaitForResponseTimeout(CMD_ACK, NULL, 8000) ) {
+               PrintAndLog("command execution time out");
+               return -2;
+       }
+       setGraphBuf(got, sizeof(got));

        
        

-       // //Spoof
-       // memset(strAnswer, 0x00, sizeof(strAnswer));  
-       // printf("[<-]Do you wish to continue with the EM4x simulation? [Y]es/[N]o\n");
-       // gets(strAnswer);
-       // if ( ( strncmp(strAnswer,"y",1) == 0 )  || ( strncmp(strAnswer,"Y",1) == 0 ) )
-       // {
-               // strcat(pTempBuffer, strClockRate);
-               // strcat(pTempBuffer, " ");
-               // if (bInverted == true)
-                       // strcat(pTempBuffer,pstrInvertBitStream);
-               // if (bInverted == false)
-                       // strcat(pTempBuffer,strSimulateBitStream);
-               // //inform the user
-               // puts("[->]Starting simulation now: \n");
-               // //Simulate tag with prepared buffer.
-               // CmdLFSimManchester(pTempBuffer);
-       // }
-       // else if ( ( strcmp("n", strAnswer) == 0 )  || ( strcmp("N", strAnswer ) == 0 ) )
-               // printf("[->]Exiting procedure now...\n");
-       // else
-               // printf("[->]Erroneous selection\nExiting procedure now....\n");
+       int ans = 0;
+       //bool ST = true;
+       DemodBufferLen = 0x00;  
+
+       //ans = ASKDemod_ext("0 0 1", FALSE, FALSE, 1, &ST);
+       ans = ASKbiphaseDemod("0 0 1", FALSE);
+       if (!ans) { 
+               if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/Manchester Demod failed");
+               return -3;
+       }
+       PrintAndLog("ANS: %d", ans);

        
        

-       // //Clean up -- Exit function
-       // //clear memory, then release pointer.
-       // if ( pstrInvertBitStream != 0x00000000 )
-       // {
-           // memset(pstrInvertBitStream,0x00,numManchesterDemodBits);
-           // free(pstrInvertBitStream);
-       // }
-       // if ( pTempBuffer != 0x00000000 )
-       // {
-           // memset(pTempBuffer,0x00,MAX_GRAPH_TRACE_LEN);
-           // free(pTempBuffer);
-       // }
-       // if ( pID != 0x00000000 )
-       // {
-           // memset(pID,0x00,11);
-           // free(pID);
-       // }
-       // if ( strBitStreamBuffer != 0x00000000 )
-       // {
-           // memset(strBitStreamBuffer,0x00,numManchesterDemodBits);
-           // free(strBitStreamBuffer);
-       // }
+       //todo: check response for 00001010 then write data for write confirmation!     
+       size_t startIdx = 0, size = DemodBufferLen; 
+
+       uint8_t preamble[8] = {0,0,0,0,1,0,1,0};                
+       if (!preambleSearch(DemodBuffer, preamble, sizeof(preamble), &size, &startIdx)){
+               if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
+               return -4;
+       }
+       PrintAndLog("Write OK");

        return 0;
 }
 
        return 0;
 }
 

-int CmdLFEM4X(const char *Cmd)
-{
-  CmdsParse(CommandTable, Cmd);
-  return 0;
+static command_t CommandTable[] = {
+       {"help",                CmdHelp,                        1, "This help"},
+       {"em410xdemod", CmdEMdemodASK,          0, "[findone] -- Extract ID from EM410x tag (option 0 for continuous loop, 1 for only 1 tag)"},  
+       {"em410xread",  CmdEM410xRead,          1, "[clock rate] -- Extract ID from EM410x tag in GraphBuffer"},
+       {"em410xsim",   CmdEM410xSim,           0, "<UID> -- Simulate EM410x tag"},
+       {"em410xwatch", CmdEM410xWatch,         0, "['h'] -- Watches for EM410x 125/134 kHz tags (option 'h' for 134)"},
+       {"em410xspoof", CmdEM410xWatchnSpoof, 0, "['h'] --- Watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)" },
+       {"em410xwrite", CmdEM410xWrite,         0, "<UID> <'0' T5555> <'1' T55x7> [clock rate] -- Write EM410x UID to T5555(Q5) or T55x7 tag, optionally setting clock rate"},
+       {"em4x50read",  CmdEM4x50Read,          1, "demod data from EM4x50 tag from the graphbuffer"},
+       {"readword",    CmdReadWord,            1, "read EM4x05/4x69 data"},
+       {"writeword",   CmdWriteWord,           1, "write EM405/4x69 data"},
+       {NULL, NULL, 0, NULL}
+};
+
+int CmdLFEM4X(const char *Cmd) {
+       clearCommandBuffer();
+       CmdsParse(CommandTable, Cmd);
+       return 0;

 }
 
 }
 

-int CmdHelp(const char *Cmd)
-{
-  CmdsHelp(CommandTable);
-  return 0;
+int CmdHelp(const char *Cmd) {
+       CmdsHelp(CommandTable);
+       return 0;

 }
 }