SerialUSB: shadow mbed object

facchinm · facchinm · commit e928558ee8bb · 2021-03-29T12:03:56.000+02:00
diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h
@@ -105,6 +105,7 @@ extern analogin_config_t adcCurrentConfig;
 #include "Serial.h"
 #if defined(SERIAL_CDC)
 #define Serial _UART_USB_
+#define SerialUSB _UART_USB_
 #else
 #define Serial _UART1_
 #endif
diff --git a/cores/arduino/Serial.cpp b/cores/arduino/Serial.cpp
@@ -127,7 +127,7 @@ void UART::on_rx() {
 void UART::end() {
 #if defined(SERIAL_CDC)
 	if (is_usb) {
-		return SerialUSB.end();
+		return _SerialUSB.end();
 	}
 #endif
 	if (_serial->obj != NULL) {
@@ -139,7 +139,7 @@ void UART::end() {
 int UART::available() {
 #if defined(SERIAL_CDC)
 	if (is_usb) {
-		return SerialUSB.available();
+		return _SerialUSB.available();
 	}
 #endif
 	return rx_buffer.available();
@@ -148,7 +148,7 @@ int UART::available() {
 int UART::peek() {
 #if defined(SERIAL_CDC)
 	if (is_usb) {
-		return SerialUSB.peek();
+		return _SerialUSB.peek();
 	}
 #endif
 	return rx_buffer.peek();
@@ -157,7 +157,7 @@ int UART::peek() {
 int UART::read() {
 #if defined(SERIAL_CDC)
 	if (is_usb) {
-		return SerialUSB.read();
+		return _SerialUSB.read();
 	}
 #endif
 	return rx_buffer.read_char();
@@ -170,7 +170,7 @@ void UART::flush() {
 size_t UART::write(uint8_t c) {
 #if defined(SERIAL_CDC)
 	if (is_usb) {
-		return SerialUSB.write(c);
+		return _SerialUSB.write(c);
 	}
 #endif
 	while (!_serial->obj->writeable()) {}
@@ -181,7 +181,7 @@ size_t UART::write(uint8_t c) {
 size_t UART::write(const uint8_t* c, size_t len) {
 #if defined(SERIAL_CDC)
 	if (is_usb) {
-		return SerialUSB.write(c, len);
+		return _SerialUSB.write(c, len);
 	}
 #endif
 	while (!_serial->obj->writeable()) {}
@@ -197,7 +197,7 @@ void UART::block_tx(int _a) {
 UART::operator bool() {
 #if defined(SERIAL_CDC)
 	if (is_usb) {
-		return SerialUSB;
+		return _SerialUSB;
 	}
 #endif
 	return _serial != NULL && _serial->obj != NULL;
@@ -206,37 +206,37 @@ UART::operator bool() {
 #if defined(SERIAL_CDC)
 	uint32_t UART::baud() {
 		if (is_usb) {
-			return SerialUSB.baud();
+			return _SerialUSB.baud();
 		}
 		return 0;
 	}
 	uint8_t UART::stopbits() {
 		if (is_usb) {
-			return SerialUSB.stopbits();
+			return _SerialUSB.stopbits();
 		}
 		return 0;
 	}
 	uint8_t UART::paritytype() {
 		if (is_usb) {
-			return SerialUSB.paritytype();
+			return _SerialUSB.paritytype();
 		}
 		return 0;
 	}
 	uint8_t UART::numbits() {
 		if (is_usb) {
-			return SerialUSB.numbits();
+			return _SerialUSB.numbits();
 		}
 		return 0;
 	}
 	bool UART::dtr() {
 		if (is_usb) {
-			return SerialUSB.dtr();
+			return _SerialUSB.dtr();
 		}
 		return false;
 	}
 	bool UART::rts() {
 		if (is_usb) {
-			return SerialUSB.rts();
+			return _SerialUSB.rts();
 		}
 		return false;
 	}
diff --git a/cores/arduino/USB/PluggableUSBSerial.h b/cores/arduino/USB/PluggableUSBSerial.h
@@ -325,6 +325,6 @@ class USBSerial: public USBCDC, public ::mbed::Stream, public HardwareSerial {
 };
 }
 
-extern arduino::USBSerial SerialUSB;
+extern arduino::USBSerial _SerialUSB;
 
 #endif
diff --git a/cores/arduino/USB/USBSerial.cpp b/cores/arduino/USB/USBSerial.cpp
@@ -30,7 +30,7 @@ static void waitForPortClose() {
     // wait for DTR be 0 (port closed) and timeout to be over
     long start = millis();
     static const int WAIT_TIMEOUT = 200;
-    while (SerialUSB.connected() || (millis() - start) < WAIT_TIMEOUT) {
+    while (_SerialUSB.connected() || (millis() - start) < WAIT_TIMEOUT) {
         // the delay is needed to handle other "concurrent" IRQ events
         delay(1);
     }
@@ -122,6 +122,6 @@ bool USBSerial::connected()
     return _terminal_connected;
 }
 
-USBSerial SerialUSB(false);
+USBSerial _SerialUSB(false);
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -325,6 +325,6 @@ class USBSerial: public USBCDC, public ::mbed::Stream, public HardwareSerial {`
`325`	`325`	`};`
`326`	`326`	`}`
`327`	`327`
`328`		`-extern arduino::USBSerial SerialUSB;`
	`328`	`+extern arduino::USBSerial _SerialUSB;`
`329`	`329`
`330`	`330`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ static void waitForPortClose() {`
`30`	`30`	`// wait for DTR be 0 (port closed) and timeout to be over`
`31`	`31`	`long start = millis();`
`32`	`32`	`static const int WAIT_TIMEOUT = 200;`
`33`		`- while (SerialUSB.connected() \|\| (millis() - start) < WAIT_TIMEOUT) {`
	`33`	`+ while (_SerialUSB.connected() \|\| (millis() - start) < WAIT_TIMEOUT) {`
`34`	`34`	`// the delay is needed to handle other "concurrent" IRQ events`
`35`	`35`	`delay(1);`
`36`	`36`	`}`
`@@ -122,6 +122,6 @@ bool USBSerial::connected()`
`122`	`122`	`return _terminal_connected;`
`123`	`123`	`}`
`124`	`124`
`125`		`-USBSerial SerialUSB(false);`
	`125`	`+USBSerial _SerialUSB(false);`
`126`	`126`
`127`	`127`	`#endif`