Inital test for the "lf em4x 410xsim / lf em4x 410xwatch" which I try to verify that...

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 6f8b0150f887022f5cd16b100001449d9eba3407..d239ceb05cd6cfb44766d94476399503136798e8 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -18,12 +18,13 @@
 #include "util.h"
 #include "printf.h"
 #include "string.h"
 #include "util.h"
 #include "printf.h"
 #include "string.h"

-

 #include <stdarg.h>
 
 #include <stdarg.h>
 

+

 #include "legicrf.h"
 #include "../include/hitag2.h"
 
 #include "legicrf.h"
 #include "../include/hitag2.h"
 

+

 #ifdef WITH_LCD
  #include "LCD.h"
 #endif
 #ifdef WITH_LCD
  #include "LCD.h"
 #endif


@@ -359,6 +360,7 @@ void SamyRun()
 
        int selected = 0;
        int playing = 0;
 
        int selected = 0;
        int playing = 0;

+       int cardRead = 0;

 
        // Turn on selected LED
        LED(selected + 1, 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
                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);
                {
                        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;
                        // 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)
                }
 
                // Change where to record (or begin playing)


@@ -597,7 +633,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
 {
        UsbCommand *c = (UsbCommand *)packet;
 
 {
        UsbCommand *c = (UsbCommand *)packet;
 

-//  Dbprintf("received %d bytes, with command: 0x%04x and args: %d %d %d",len,c->cmd,c->arg[0],c->arg[1],c->arg[2]);
+  //Dbprintf("received %d bytes, with command: 0x%04x and args: %d %d %d",len,c->cmd,c->arg[0],c->arg[1],c->arg[2]);

   
        switch(c->cmd) {
 #ifdef WITH_LF
   
        switch(c->cmd) {
 #ifdef WITH_LF


@@ -842,14 +878,18 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        MifareDES_Auth1(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
                        break;
                case CMD_MIFARE_DESFIRE_AUTH2:
                        MifareDES_Auth1(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
                        break;
                case CMD_MIFARE_DESFIRE_AUTH2:

-                       MifareDES_Auth2(c->arg[0],c->d.asBytes);
+                       //MifareDES_Auth2(c->arg[0],c->d.asBytes);

                        break;
                // case CMD_MIFARE_DES_READER:
                        // ReaderMifareDES(c->arg[0], c->arg[1], c->d.asBytes);
                        break;
                // case CMD_MIFARE_DES_READER:
                        // ReaderMifareDES(c->arg[0], c->arg[1], c->d.asBytes);

-                       break;
+                       //break;

                case CMD_MIFARE_DESFIRE_INFO:
                        MifareDesfireGetInformation();
                        break;
                case CMD_MIFARE_DESFIRE_INFO:
                        MifareDesfireGetInformation();
                        break;

+               case CMD_MIFARE_DESFIRE:
+                       MifareSendCommand(c->arg[0], c->arg[1], c->d.asBytes);
+                       break;
+

 #endif
 
 #ifdef WITH_ICLASS
 #endif
 
 #ifdef WITH_ICLASS


@@ -909,7 +949,6 @@ 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);
                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]);

                        cmd_send(CMD_ACK,0,0,0,0,0);
                        break;
                }       
                        cmd_send(CMD_ACK,0,0,0,0,0);
                        break;
                }       


@@ -993,8 +1032,8 @@ void  __attribute__((noreturn)) AppMain(void)
        LED_B_OFF();
        LED_A_OFF();
 
        LED_B_OFF();
        LED_A_OFF();
 

-  // Init USB device`
-  usb_enable();
+       // Init USB device
+       usb_enable();

 
        // The FPGA gets its clock from us from PCK0 output, so set that up.
        AT91C_BASE_PIOA->PIO_BSR = GPIO_PCK0;
 
        // The FPGA gets its clock from us from PCK0 output, so set that up.
        AT91C_BASE_PIOA->PIO_BSR = GPIO_PCK0;


@@ -1024,12 +1063,12 @@ void  __attribute__((noreturn)) AppMain(void)
        size_t rx_len;
   
        for(;;) {
        size_t rx_len;
   
        for(;;) {

-    if (usb_poll()) {
-      rx_len = usb_read(rx,sizeof(UsbCommand));
-      if (rx_len) {
-        UsbPacketReceived(rx,rx_len);
-      }
-    }
+               if (usb_poll()) {
+                       rx_len = usb_read(rx,sizeof(UsbCommand));
+                       if (rx_len) {
+                               UsbPacketReceived(rx,rx_len);
+                       }
+               }

                WDT_HIT();
 
 #ifdef WITH_LF
                WDT_HIT();
 
 #ifdef WITH_LF