Attempt to fix the USB serial output stall

diff --git a/src/libs/USBDevice/USBSerial/CircBuffer.h b/src/libs/USBDevice/USBSerial/CircBuffer.h
index 378c7bf..74e2ced 100644 (file)
--- a/src/libs/USBDevice/USBSerial/CircBuffer.h
+++ b/src/libs/USBDevice/USBSerial/CircBuffer.h
@@ -34,10 +34,7 @@ public:
     };
 
        bool isFull() {
-               __disable_irq();
-               bool b= ((write + 1) % size == read);
-               __enable_irq();
-               return b;
+               return ((write + 1) % size == read);
     };
 
     bool isEmpty() {

diff --git a/src/libs/USBDevice/USBSerial/USBSerial.cpp b/src/libs/USBDevice/USBSerial/USBSerial.cpp
index 2ec5d6c..8bdba9b 100644 (file)
--- a/src/libs/USBDevice/USBSerial/USBSerial.cpp
+++ b/src/libs/USBDevice/USBSerial/USBSerial.cpp
@@ -136,23 +136,14 @@ bool USBSerial::USBEvent_EPIn(uint8_t bEP, uint8_t bEPStatus)
     uint8_t b[MAX_PACKET_SIZE_EPBULK];
 
     int l = txbuf.available();
-    iprintf("%d bytes queued\n", l);
     if (l > 0) {
         if (l > MAX_PACKET_SIZE_EPBULK)
             l = MAX_PACKET_SIZE_EPBULK;
-        iprintf("Sending %d bytes:\n\t", l);
         int i;
         for (i = 0; i < l; i++) {
             txbuf.dequeue(&b[i]);
-            if (b[i] >= 32 && b[i] < 128)
-                iprintf("%c", b[i]);
-            else {
-                iprintf("\\x%02X", b[i]);
-            }
         }
-        iprintf("\nSending...\n");
         send(b, l);
-        iprintf("Sent\n");
         if (txbuf.available() == 0)
             r = false;
     } else {