aboutsummaryrefslogtreecommitdiff
path: root/cores
diff options
context:
space:
mode:
authorCristian Maglie <c.maglie@bug.st>2012-12-10 15:55:05 +0100
committerCristian Maglie <c.maglie@bug.st>2012-12-10 15:55:05 +0100
commit433090f18b6218319fe0a721c24e1dc69285ea3e (patch)
treee7dc4da5b6ff077f1bc255350506dfc0bf87c6c3 /cores
parentc453e0a32e7adf5e7bab7bfb7c8f7a21e30ca563 (diff)
parente624b841b3b5d22f6e9cb7ec515beb47f96f46f2 (diff)
Merged 1.0.3
Diffstat (limited to 'cores')
-rw-r--r--cores/arduino/HardwareSerial.cpp3
-rw-r--r--cores/arduino/USBCore.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/cores/arduino/HardwareSerial.cpp b/cores/arduino/HardwareSerial.cpp
index 719f3f6..794a7be 100644
--- a/cores/arduino/HardwareSerial.cpp
+++ b/cores/arduino/HardwareSerial.cpp
@@ -36,8 +36,7 @@
/*
* on ATmega8, the uart and its bits are not numbered, so there is no "TXC0"
- * definition. It is slightly cleaner to define this here instead of having
- * conditional code in the cpp module.
+ * definition.
*/
#if !defined(TXC0)
#if defined(TXC)
diff --git a/cores/arduino/USBCore.cpp b/cores/arduino/USBCore.cpp
index dfc0f21..d3e0170 100644
--- a/cores/arduino/USBCore.cpp
+++ b/cores/arduino/USBCore.cpp
@@ -55,6 +55,8 @@ const u16 STRING_IPRODUCT[17] = {
'A','r','d','u','i','n','o',' ','L','e','o','n','a','r','d','o'
#elif USB_PID == 0x8037
'A','r','d','u','i','n','o',' ','M','i','c','r','o',' ',' ',' '
+#elif USB_PID == 0x803C
+ 'A','r','d','u','i','n','o',' ','E','s','p','l','o','r','a',' '
#elif USB_PID == 0x9208
'L','i','l','y','P','a','d','U','S','B',' ',' ',' ',' ',' ',' '
#else