ADD: added identification for Mifare TNP3xxx tags.

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index afed56b77b5a7f2b4b2792e0ed9823d6f0839db5..be904b4fe2bd131e80b314a1c15d00c2eb7ba657 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -24,6 +24,7 @@
 #include "legicrf.h"
 #include "../include/hitag2.h"
 
+
 #ifdef WITH_LCD
  #include "LCD.h"
 #endif
@@ -359,6 +360,7 @@ void SamyRun()
 
        int selected = 0;
        int playing = 0;
+       int cardRead = 0;
 
        // Turn on selected LED
        LED(selected + 1, 0);
@@ -374,7 +376,7 @@ void SamyRun()
                SpinDelay(300);
 
                // Button was held for a second, begin recording
-               if (button_pressed > 0)
+               if (button_pressed > 0 && cardRead == 0)
                {
                        LEDsoff();
                        LED(selected + 1, 0);
@@ -400,6 +402,40 @@ void SamyRun()
                        // If we were previously playing, set playing off
                        // so next button push begins playing what we recorded
                        playing = 0;
+                       
+                       cardRead = 1;
+       
+               }
+
+               else if (button_pressed > 0 && cardRead == 1)
+               {
+                                       LEDsoff();
+                                       LED(selected + 1, 0);
+                                       LED(LED_ORANGE, 0);
+
+                                       // record
+                                       Dbprintf("Cloning %x %x %x", selected, high[selected], low[selected]);
+
+                                       // wait for button to be released
+                                       while(BUTTON_PRESS())
+                                               WDT_HIT();
+
+                                       /* need this delay to prevent catching some weird data */
+                                       SpinDelay(500);
+
+                                       CopyHIDtoT55x7(high[selected], low[selected], 0, 0);
+                                       Dbprintf("Cloned %x %x %x", selected, high[selected], low[selected]);
+
+                                       LEDsoff();
+                                       LED(selected + 1, 0);
+                                       // Finished recording
+
+                                       // If we were previously playing, set playing off
+                                       // so next button push begins playing what we recorded
+                                       playing = 0;
+                                       
+                                       cardRead = 0;
+                       
                }
 
                // Change where to record (or begin playing)
@@ -638,7 +674,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        break;
                case CMD_SIMULATE_TAG_125K:
                        LED_A_ON();
-                       SimulateTagLowFrequency(c->arg[0], c->arg[1], 1);
+                       SimulateTagLowFrequency(c->arg[0], c->arg[1], 0);
                        LED_A_OFF();
                        break;
                case CMD_LF_SIMULATE_BIDIR:
@@ -707,7 +743,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        ReaderIso15693(c->arg[0]);
                        break;
                case CMD_SIMTAG_ISO_15693:
-                       SimTagIso15693(c->arg[0]);
+                       SimTagIso15693(c->arg[0], c->d.asBytes);
                        break;
 #endif
 
@@ -912,8 +948,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
 
                case CMD_DOWNLOADED_SIM_SAMPLES_125K: {
                        uint8_t *b = (uint8_t *)BigBuf;
-                       memcpy(b+c->arg[0], c->d.asBytes, 48);
-                       //Dbprintf("copied 48 bytes to %i",b+c->arg[0]);
+                       memcpy(b+c->arg[0], c->d.asBytes, USB_CMD_DATA_SIZE);
                        cmd_send(CMD_ACK,0,0,0,0,0);
                        break;
                }