mirror of
https://github.com/esp8266/Arduino.git
synced 2025-06-17 22:23:10 +03:00
Merge remote-tracking branch 'arduino/ide-1.5.x' into ide-1.5.x
This commit is contained in:
@ -1630,7 +1630,7 @@ public class Sketch {
|
|||||||
editor.status.progressUpdate(percent);
|
editor.status.progressUpdate(percent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected void size(PreferencesMap prefs) throws RunnerException {
|
protected void size(PreferencesMap prefs) throws RunnerException {
|
||||||
long size = 0;
|
long size = 0;
|
||||||
String maxsizeString = prefs.get("upload.maximum_size");
|
String maxsizeString = prefs.get("upload.maximum_size");
|
||||||
@ -1641,8 +1641,8 @@ public class Sketch {
|
|||||||
try {
|
try {
|
||||||
size = sizer.computeSize();
|
size = sizer.computeSize();
|
||||||
System.out.println(I18n
|
System.out.println(I18n
|
||||||
.format(_("Binary sketch size: {0} bytes (of a {1} byte maximum)"),
|
.format(_("Binary sketch size: {0} bytes (of a {1} byte maximum) - {2}% used"),
|
||||||
size, maxsize));
|
size, maxsize, size * 100 / maxsize));
|
||||||
} catch (RunnerException e) {
|
} catch (RunnerException e) {
|
||||||
System.err.println(I18n.format(_("Couldn't determine program size: {0}"),
|
System.err.println(I18n.format(_("Couldn't determine program size: {0}"),
|
||||||
e.getMessage()));
|
e.getMessage()));
|
||||||
|
Reference in New Issue
Block a user