]> git.zerfleddert.de Git - proxmark3-svn/commitdiff
Merge pull request #77 from Proxmark/usb_check
authorMartin Holst Swende <martin@swende.se>
Thu, 12 Mar 2015 17:15:08 +0000 (18:15 +0100)
committerMartin Holst Swende <martin@swende.se>
Thu, 12 Mar 2015 17:15:08 +0000 (18:15 +0100)
Implemented usb_poll() within LF sim.

armsrc/lfops.c

index 468f58302862c1cdf6d9559f988d3176ed41ac47..16c428554a348be12ee5f648afae634243d74144 100644 (file)
@@ -16,6 +16,7 @@
 #include "string.h"
 #include "lfdemod.h"
 #include "lfsampling.h"
+#include "usb_cdc.h"
 
 
 /**
@@ -401,7 +402,7 @@ void SimulateTagLowFrequency(int period, int gap, int ledcontrol)
     for(;;) {
         //wait until SSC_CLK goes HIGH
         while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)) {
-            if(BUTTON_PRESS()) {
+                       if(BUTTON_PRESS() || usb_poll()) {
                 DbpString("Stopped");
                 return;
             }
Impressum, Datenschutz