arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Code Activity

Now have uploading working with the Boards menu. Improved serial port error messages.

Browse Source
This commit is contained in:
David A. Mellis
2007-10-06 20:26:45 +00:00
parent 1f35dce6a8
commit c78c1efe18
15 changed files with 218 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Sketch.java
View File

@ -1592,9 +1592,7 @@ public class Sketch {
protected void size(String buildPath, String suggestedClassName)
throws RunnerException {
long size = 0;
long maxsize = Preferences.getInteger("upload.maximum_size");
if (Preferences.get("build.mcu").equals("atmega168"))
maxsize *= 2;
long maxsize = Preferences.getInteger("boards." + Preferences.get("board") + ".upload.maximum_size");
Sizer sizer = new Sizer(buildPath, suggestedClassName);
try {
size = sizer.computeSize();
@ -1606,8 +1604,7 @@ public class Sketch {
if (size > maxsize)
throw new RunnerException(
"Sketch too big; try deleting code, removing floats, or see " +
"http://www.arduino.cc/en/Main/FAQ for more advice.");
"Sketch too big; see http://www.arduino.cc/en/Guide/Troubleshooting#size for tips on reducing it.");
}
protected String upload(String buildPath, String suggestedClassName)
@ -1617,11 +1614,7 @@ public class Sketch {
// download the program
//
if ("uisp".equals(Preferences.get("upload.application"))) {
uploader = new UispUploader();
} else {
uploader = new AvrdudeUploader();
}
uploader = new AvrdudeUploader();
// macos9 now officially broken.. see PdeCompilerJavac
//PdeCompiler compiler =
// ((PdeBase.platform == PdeBase.MACOS9) ?
@ -1691,6 +1684,8 @@ public class Sketch {
if (Preferences.getBoolean("editor.external")) {
// nuke previous files and settings
load();
} else {
current.program = editor.getText();
}
zipFileContents = new Hashtable();