diff options
| author | Dan Halbert <halbert@adafruit.com> | 2020-10-31 12:28:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-31 12:28:20 -0400 |
| commit | 144eb131ae7c290c8ad03edd1e293b7962c00dc4 (patch) | |
| tree | de81dd9bc41645095fea88e9e39e36483471e998 /supervisor/shared/serial.c | |
| parent | 0938d4e9c1e78bb79ae82b4bea2cab017ffc1573 (diff) | |
| parent | bbed1b03546802c03f3f20cdcb36d23cd54d047b (diff) | |
Merge pull request #3627 from adafruit/6.0.x
Merge 6.0.x bugfixes to main
Diffstat (limited to 'supervisor/shared/serial.c')
| -rw-r--r-- | supervisor/shared/serial.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/supervisor/shared/serial.c b/supervisor/shared/serial.c index 91e90671d..7383cc228 100644 --- a/supervisor/shared/serial.c +++ b/supervisor/shared/serial.c @@ -47,8 +47,6 @@ busio_uart_obj_t debug_uart; byte buf_array[64]; #endif -volatile bool _serial_connected; - void serial_early_init(void) { #if defined(DEBUG_UART_TX) && defined(DEBUG_UART_RX) debug_uart.base.type = &busio_uart_type; @@ -71,7 +69,9 @@ bool serial_connected(void) { #if defined(DEBUG_UART_TX) && defined(DEBUG_UART_RX) return true; #else - return _serial_connected; + // True if DTR is asserted, and the USB connection is up. + // tud_cdc_get_line_state(): bit 0 is DTR, bit 1 is RTS + return (tud_cdc_get_line_state() & 1) && tud_ready(); #endif } |