csamuelson
diff --git a/‎supervisor/shared/usb/usb.c‎
Lines changed: 5 additions & 0 deletions b/‎supervisor/shared/usb/usb.c‎
Lines changed: 5 additions & 0 deletions
@@ -83,6 +83,7 @@ void usb_init(void) {
 
     // Don't watch for ctrl-C if there is no REPL.
     if (usb_cdc_console_enabled()) {
+        // Console will always be itf 0.
         tud_cdc_set_wanted_char(CHAR_CTRL_C);
     }
     #endif
@@ -156,9 +157,12 @@ void usb_background(void) {
         tud_task();
         #endif
         // No need to flush if there's no REPL.
+        #if CIRCUITPY_USB_CDC
         if (usb_cdc_console_enabled()) {
+            // Console will always be itf 0.
             tud_cdc_write_flush();
         }
+        #endif
     }
 }
 
@@ -212,6 +216,7 @@ void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts) {
     // DTR = false is counted as disconnected
     if (!dtr) {
         cdc_line_coding_t coding;
+        // Use whichever CDC is itf 0.
         tud_cdc_get_line_coding(&coding);
 
         if (coding.bit_rate == 1200) {
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ void usb_init(void) {`
`83`	`83`
`84`	`84`	`// Don't watch for ctrl-C if there is no REPL.`
`85`	`85`	`if (usb_cdc_console_enabled()) {`
	`86`	`+ // Console will always be itf 0.`
`86`	`87`	`tud_cdc_set_wanted_char(CHAR_CTRL_C);`
`87`	`88`	`}`
`88`	`89`	`#endif`
`@@ -156,9 +157,12 @@ void usb_background(void) {`
`156`	`157`	`tud_task();`
`157`	`158`	`#endif`
`158`	`159`	`// No need to flush if there's no REPL.`
	`160`	`+ #if CIRCUITPY_USB_CDC`
`159`	`161`	`if (usb_cdc_console_enabled()) {`
	`162`	`+ // Console will always be itf 0.`
`160`	`163`	`tud_cdc_write_flush();`
`161`	`164`	`}`
	`165`	`+ #endif`
`162`	`166`	`}`
`163`	`167`	`}`
`164`	`168`
`@@ -212,6 +216,7 @@ void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts) {`
`212`	`216`	`// DTR = false is counted as disconnected`
`213`	`217`	`if (!dtr) {`
`214`	`218`	`cdc_line_coding_t coding;`
	`219`	`+ // Use whichever CDC is itf 0.`
`215`	`220`	`tud_cdc_get_line_coding(&coding);`
`216`	`221`
`217`	`222`	`if (coding.bit_rate == 1200) {`