arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-30 16:24:09 +03:00
Code Activity

Merged 1.0.3

Browse Source
This commit is contained in:
Cristian Maglie
2012-12-10 15:55:05 +01:00
parent 9fdb047197 6dbc2bfc57
commit 66ee23b885
49 changed files with 24128 additions and 16320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hardware/arduino/avr/cores/arduino/HardwareSerial.cpp
View File

@ -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)

2
hardware/arduino/avr/cores/arduino/USBCore.cpp
View File

@ -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