rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00
Code Issues Releases Activity

Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery

Browse Source 
Conflicts:
	build/shared/revisions.txt
This commit is contained in:
Cristian Maglie 2013-09-10 12:10:57 +02:00
commit d4fe0a13b6
4 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/processing/app/Sketch.java
View File

@ -1634,16 +1634,21 @@ public class Sketch {
long textSize = sizes[0];
long dataSize = sizes[1];
System.out.println();
System.out.println(I18n
.format(_("Binary sketch size: {0} bytes (of a {1} byte maximum) - {2}%% used"),
.format(_("Sketch uses {0} bytes ({2}%%) of program storage space. Maximum is {1} bytes."),
textSize, maxTextSize, textSize * 100 / maxTextSize));
if (dataSize >= 0) {
if (maxDataSize > 0) {
System.out.println(I18n.format(
_("Minimum Memory usage: {0} bytes (of a {1} byte maximum) - {2}%% used"),
dataSize, maxDataSize, dataSize * 100 / maxDataSize));
System.out
.println(I18n
.format(
_("Global variables use {0} bytes ({2}%%) of dynamic memory, leaving {3} bytes for local variables. Maximum is {1} bytes."),
dataSize, maxDataSize, dataSize * 100 / maxDataSize,
maxDataSize - dataSize));
} else {
System.out.println(I18n.format(_("Minimum Memory usage: {0} bytes"), dataSize));
System.out.println(I18n
.format(_("Global variables use {0} bytes of dynamic memory."), dataSize));
}
}

9
build/shared/revisions.txt
View File

@ -1,12 +1,19 @@
ARDUINO 1.5.4 BETA
ARDUINO 1.5.4 BETA 2013.09.10
[ide]
* Revert to English locale if the system default is not available
* Added support for Arduino Yun
* Autodetect of boards connected to each serial port
* Network upload and discovery for Arduino Yun
[libraries]
* sam: fixed wrong SPI initialization (noblepepper)
* updated all instances of Adafruit_GFX to the latest version
* added libraries for Arduino Yun
[core]
* avr: fixed bug introduced with recent optimizations in HardwareSerial (atmega8 cpu) (darryl)
ARDUINO 1.5.3 BETA 2013.08.30

4
hardware/arduino/avr/boards.txt
View File

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

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

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