ADD: @marshmellows42 's fixes for "lf cmdread" and CHANGELOG.md

[proxmark3-svn] / armsrc / legicrf.c

diff --git a/armsrc/legicrf.c b/armsrc/legicrf.c
index d11436ec72c21905bf89c19764012b3148e80536..68d4e7600356df9f6520cd9809deb14c6ebadde6 100644 (file)
--- a/armsrc/legicrf.c
+++ b/armsrc/legicrf.c
@@ -8,14 +8,14 @@
 // LEGIC RF simulation code
 //-----------------------------------------------------------------------------
 
 // LEGIC RF simulation code
 //-----------------------------------------------------------------------------
 

-#include "../include/proxmark3.h"
+#include "proxmark3.h"

 #include "apps.h"
 #include "util.h"
 #include "string.h"
 
 #include "legicrf.h"
 #include "apps.h"
 #include "util.h"
 #include "string.h"
 
 #include "legicrf.h"

-#include "../include/legic_prng.h"
-#include "../common/crc.h"
+#include "legic_prng.h"
+#include "crc.h"

 
 static struct legic_frame {
        int bits;
 
 static struct legic_frame {
        int bits;


@@ -711,7 +711,7 @@ void LegicRfSimulate(int phase, int frame, int reqresp)
 
    LED_B_ON();
    DbpString("Starting Legic emulator, press button to end");
 
    LED_B_ON();
    DbpString("Starting Legic emulator, press button to end");

-   while(!BUTTON_PRESS()) {
+   while(!BUTTON_PRESS() && !usb_poll_validate_length()) {

       int level = !!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_DIN);
       int time = timer->TC_CV;
                 
       int level = !!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_DIN);
       int time = timer->TC_CV;