From: pwpiwi Date: Fri, 10 Jan 2020 07:33:50 +0000 (+0100) Subject: fix "Sending bytes to proxmark failed" after BUTTON_PRESS() X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/refs/pull/909/head fix "Sending bytes to proxmark failed" after BUTTON_PRESS() --- diff --git a/armsrc/appmain.c b/armsrc/appmain.c index 6a3b6e81..70cabd2e 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -1483,25 +1483,18 @@ void __attribute__((noreturn)) AppMain(void) { size_t rx_len; for(;;) { - if (usb_poll()) { - rx_len = usb_read(rx, sizeof(UsbCommand)); - if (rx_len) { - UsbPacketReceived(rx, rx_len); - } - } WDT_HIT(); - -#ifdef WITH_LF_StandAlone -#ifndef WITH_ISO14443a_StandAlone - if (BUTTON_HELD(1000) > 0) - SamyRun(); -#endif -#endif -#ifdef WITH_ISO14443a -#ifdef WITH_ISO14443a_StandAlone - if (BUTTON_HELD(1000) > 0) - StandAloneMode14a(); + if (usb_poll() && (rx_len = usb_read(rx, sizeof(rx)))) { + UsbPacketReceived(rx, rx_len); + } else { +#if defined(WITH_LF_StandAlone) && !defined(WITH_ISO14443a_StandAlone) + if (BUTTON_HELD(1000) > 0) + SamyRun(); #endif +#if defined(WITH_ISO14443a) && defined(WITH_ISO14443a_StandAlone) + if (BUTTON_HELD(1000) > 0) + StandAloneMode14a(); #endif + } } }