Merge branch 'leonardo-usbserial' of https://github.com/cmaglie/Arduino

arduino · Nov 24, 2015 · 1da7979 · 1da7979
2 parents 4f34152 + e46375c
commit 1da7979
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
@@ -19,6 +19,7 @@ ARDUINO 1.6.7
 * Stream: Optional lookahead and skipChar options added to parseInt and parseFloat, 
   parseFloat also support parsing floats without a leading 0,
   Stream::find(char) added to SAM. Thanks @Chris--A.
+* Leonardo/Micro (and other atmega32u4 based boards) now have SerialUSB alias for Serial
 
 ARDUINO 1.6.6 - 2015.11.03
 

diff --git a/hardware/arduino/avr/variants/leonardo/pins_arduino.h b/hardware/arduino/avr/variants/leonardo/pins_arduino.h
@@ -356,4 +356,7 @@ const uint8_t PROGMEM analog_pin_to_channel_PGM[] = {
 #define SERIAL_PORT_HARDWARE       Serial1
 #define SERIAL_PORT_HARDWARE_OPEN  Serial1
 
+// Alias SerialUSB to Serial
+#define SerialUSB SERIAL_PORT_USBVIRTUAL
+
 #endif /* Pins_Arduino_h */