From: iceman1001 <iceman@iuse.se>
Date: Thu, 12 Mar 2015 18:01:09 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/f2d46122d30004b152f9c581a438b9939707bab9?hp=83a42ef965b5d04ae98cce58103b6201b6155d6c

Merge branch 'master' of https://github.com/Proxmark/proxmark3
---

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 70c6e33b..59bbb8a6 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -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;
             }