]> git.zerfleddert.de Git - proxmark3-svn/commitdiff
Merge branch 'master' of https://github.com/Proxmark/proxmark3
authoriceman1001 <iceman@iuse.se>
Thu, 12 Mar 2015 18:01:09 +0000 (19:01 +0100)
committericeman1001 <iceman@iuse.se>
Thu, 12 Mar 2015 18:01:09 +0000 (19:01 +0100)
armsrc/lfops.c

index 70c6e33b93b3e46c0f15766abee4ed2f4577a8bc..59bbb8a625a77a02d62244623a17001a4871dbee 100644 (file)
@@ -16,6 +16,7 @@
 #include "string.h"
 #include "lfdemod.h"
 #include "lfsampling.h"
+#include "usb_cdc.h"
 
 
 /**
@@ -399,7 +400,7 @@ void SimulateTagLowFrequency(uint16_t period, uint32_t gap, uint8_t 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