mirror
/
micropython-lib
kopia lustrzana https://github.com/micropython/micropython-lib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

usb-device-cdc: Fix short delays when timeout is 0. 

Previously even with timeout set to zero, a read could block
for up to 1ms + machine.idle() timeout period.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
Angus Gratton 2024-04-04 15:44:50 +11:00
rodzic 163f8ea953
commit a215fc47bb
1 zmienionych plików z 4 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
micropython/usb/usb-device-cdc/usb/device/cdc.py
Wyświetl plik

@ -367,9 +367,11 @@ class CDCInterface(io.IOBase, Interface):
mv = mv[nbytes:] mv = mv[nbytes:]
# check for timeout # check for timeout
if time.ticks_diff(time.ticks_ms(), start) > self._timeout: if time.ticks_diff(time.ticks_ms(), start) >= self._timeout:
return len(buf) - len(mv) return len(buf) - len(mv)
machine.idle()
def read(self, size): def read(self, size):
start = time.ticks_ms() start = time.ticks_ms()
@ -404,7 +406,7 @@ class CDCInterface(io.IOBase, Interface):
if n == len(b): if n == len(b):
break # Done, exit before we reach the sleep break # Done, exit before we reach the sleep
if time.ticks_diff(time.ticks_ms(), start) > self._timeout: if time.ticks_diff(time.ticks_ms(), start) >= self._timeout:
break # Timed out break # Timed out
machine.idle() machine.idle()