FIX: maybe I should actually send the uid bytes with the command request....

[proxmark3-svn] / client / cmdlfem4x.c

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index aa87132e7f6decf57bef6542a4194d9d69d921cd..67013b2e813a483a1fc70853f752f51c1d4910f3 100644 (file)
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -57,7 +57,7 @@ int CmdEM410xRead(const char *Cmd)
 
   /* get clock */
   clock = GetClock(Cmd, high, 0);
-
+   
   /* parity for our 4 columns */
   parity[0] = parity[1] = parity[2] = parity[3] = 0;
   header = rows = 0;
@@ -98,7 +98,7 @@ int CmdEM410xRead(const char *Cmd)
 
 retest:
   /* We go till 5 before the graph ends because we'll get that far below */
-  for (i = 1; i < bit2idx - 5; i++)
+  for (i = 0; i < bit2idx - 5; i++)
   {
     /* Step 2: We have our header but need our tag ID */
     if (header == 9 && rows < 10)
@@ -127,7 +127,7 @@ retest:
         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;
+        i -= 9 + (5 * rows) -2;
 
         rows = header = 0;
       }
@@ -213,15 +213,15 @@ int CmdEM410xSim(const char *Cmd)
                return 0;
        }
        
-       PrintAndLog("Starting simulating with UID %02X %02X %02X %02X %02X", uid[0],uid[1],uid[2],uid[3],uid[4]);
-       
+       PrintAndLog("Starting simulating UID %02X%02X%02X%02X%02X", uid[0],uid[1],uid[2],uid[3],uid[4]);
+       PrintAndLog("Press pm3-button to about simulation");
   
   /* clock is 64 in EM410x tags */
   int clock = 64;
 
   /* clear our graph */
-  ClearGraph(0);
-
+  ClearGraph(1);
+  
   /* write it out a few times */
   for (h = 0; h < 4; h++)
   {
@@ -265,7 +265,7 @@ int CmdEM410xSim(const char *Cmd)
   }
 
   /* modulate that biatch */
-  CmdManchesterMod("");
+  CmdManchesterMod("64");
 
   /* booyah! */
   RepaintGraphWindow();
@@ -298,7 +298,7 @@ int CmdEM410xWatch(const char *Cmd)
                CmdSamples("16000");
                
        } while (
-               !CmdEM410xRead("64") 
+               !CmdEM410xRead("") 
        );
        return 0;
 }
@@ -362,7 +362,7 @@ int CmdEM4x50Read(const char *Cmd)
       ++i;
     while ((GraphBuffer[i] > low) && (i<GraphTraceLen))
       ++i;
-    if (j>(MAX_GRAPH_TRACE_LEN/64)) {
+    if (j>=(MAX_GRAPH_TRACE_LEN/64)) {
       break;
     }
     tmpbuff[j++]= i - start;
@@ -615,7 +615,7 @@ int CmdWriteWord(const char *Cmd)
     return 1;
   }
   
-  PrintAndLog("Writting word %d with data %08X", Word, Data);
+  PrintAndLog("Writing word %d with data %08X", Word, Data);
   
   c.cmd = CMD_EM4X_WRITE_WORD;
   c.d.asBytes[0] = 0x0; //Normal mode
@@ -628,7 +628,7 @@ int CmdWriteWord(const char *Cmd)
 
 int CmdWriteWordPWD(const char *Cmd)
 {
-  int Word = 8; //default to invalid word
+  int Word = 16; //default to invalid word
   int Data = 0xFFFFFFFF; //default to blank data
   int Password = 0xFFFFFFFF; //default to blank password
   UsbCommand c;
@@ -640,7 +640,7 @@ int CmdWriteWordPWD(const char *Cmd)
     return 1;
   }
   
-  PrintAndLog("Writting word %d with data %08X and password %08X", Word, Data, Password);
+  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