diff options
| author | Cristian Maglie <c.maglie@bug.st> | 2013-09-10 12:10:57 +0200 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@bug.st> | 2013-09-10 12:10:57 +0200 |
| commit | 1d865de59a7caea545ece77622f1ed8bed6458be (patch) | |
| tree | e61d4887be774d2d9247b775f0e82ac83e9321cb | |
| parent | 7dbfd27f654fc123171bf495891d4462ce8e240e (diff) | |
| parent | c0ca10c08b0abb376cdb503ccd3b2635cc50f5d8 (diff) | |
Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery
Conflicts:
build/shared/revisions.txt
| -rw-r--r-- | boards.txt | 4 | ||||
| -rw-r--r-- | cores/arduino/HardwareSerial.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -166,6 +166,7 @@ mega2560.cpu=2560 or ADK mega2560.upload.tool=avrdude mega2560.upload.protocol=wiring mega2560.upload.maximum_size=258048 +mega2560.upload.maximum_data_size=8192 mega2560.upload.speed=115200 mega2560.bootloader.tool=avrdude @@ -190,6 +191,7 @@ mega.cpu=ATmega1280 mega.upload.tool=avrdude mega.upload.protocol=arduino mega.upload.maximum_size=126976 +mega.upload.maximum_data_size=8192 mega.upload.speed=57600 mega.bootloader.tool=avrdude @@ -460,6 +462,7 @@ LilyPadUSB.bootloader.extended_fuses=0xce LilyPadUSB.bootloader.file=caterina-LilyPadUSB/Caterina-LilyPadUSB.hex LilyPadUSB.bootloader.unlock_bits=0x3F LilyPadUSB.bootloader.lock_bits=0x2F + LilyPadUSB.build.mcu=atmega32u4 LilyPadUSB.build.f_cpu=8000000L LilyPadUSB.build.vid=0x1B4F @@ -632,6 +635,7 @@ atmegang.menu.cpu.atmega168.build.mcu=atmega168 atmegang.menu.cpu.atmega8=ATmega8 atmegang.menu.cpu.atmega8.upload.maximum_size=7168 +atmegang.menu.cpu.atmega8.upload.maximum_data_size=1024 atmegang.menu.cpu.atmega8.bootloader.low_fuses=0xdf atmegang.menu.cpu.atmega8.bootloader.high_fuses=0xca diff --git a/cores/arduino/HardwareSerial.cpp b/cores/arduino/HardwareSerial.cpp index e40bfbc..9a86fa0 100644 --- a/cores/arduino/HardwareSerial.cpp +++ b/cores/arduino/HardwareSerial.cpp @@ -91,7 +91,7 @@ inline void store_char(unsigned char c, HardwareSerial *s) #elif defined(UDR) if (bit_is_clear(UCSRA, PE)) { unsigned char c = UDR; - store_char(c, &rx_buffer); + store_char(c, &Serial); } else { unsigned char c = UDR; }; |