Merge branch 'master' into experimental_varlen2

* master: (33 commits) unified Proxmark3 text removed more colors rearranged banner output and messages textual revert revert revert style spaces fix fake com port style style styles not null? style style style style style style ...
2019-04-16 20:58:58 +02:00
parent 83571f02a0 436910605b
commit 8b99df9074
34 changed files with 148 additions and 177 deletions
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -376,6 +376,7 @@ void printUSBSpeed(void) {
    uint32_t bytes_transferred = 0;

    LED_B_ON();
+    
    while (end_time < start_time + USB_SPEED_TEST_MIN_TIME) {
        cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, 0, USB_CMD_DATA_SIZE, 0, test_data, USB_CMD_DATA_SIZE);
        end_time = GetTickCount();