Skip to content

Commit 0bb3313

Browse files
Fede85Fede85
committed
Merge remote-tracking branch 'upstream/ide-1.5.x' into ide-1.5.x-library-to-new-format
2 parents d94e7e8 + c70cba8 commit 0bb3313

File tree

12 files changed

+102
-38
lines changed

12 files changed

+102
-38
lines changed

‎app/src/processing/app/Base.java‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1169,10 +1169,15 @@ public LibraryList scanLibraries(File folder) throws IOException {
11691169
continue;
11701170
}
11711171

1172-
Library lib = Library.create(subfolder);
1173-
// (also replace previously found libs with the same name)
1174-
if (lib != null)
1175-
res.addOrReplace(lib);
1172+
try {
1173+
Library lib = Library.create(subfolder);
1174+
// (also replace previously found libs with the same name)
1175+
if (lib != null)
1176+
res.addOrReplace(lib);
1177+
} catch (IOException e) {
1178+
System.out.println(I18n.format(_("Invalid library found in {0}: {1}"),
1179+
subfolder, e.getMessage()));
1180+
}
11761181
}
11771182
return res;
11781183
}

‎app/src/processing/app/Editor.java‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
package processing.app;
2424

2525
import processing.app.debug.*;
26+
import processing.app.helpers.PreferencesMapException;
2627
import processing.app.syntax.*;
2728
import processing.app.tools.*;
2829
import processing.core.*;
@@ -2432,6 +2433,10 @@ public void run() {
24322433
if (serialMenu.getItemCount() == 0) statusError(e);
24332434
else if (serialPrompt()) run();
24342435
else statusNotice(_("Upload canceled."));
2436+
} catch (PreferencesMapException e) {
2437+
statusError(I18n.format(
2438+
_("Error while uploading: missing '{0}' configuration parameter"),
2439+
e.getMessage()));
24352440
} catch (RunnerException e) {
24362441
//statusError("Error during upload.");
24372442
//e.printStackTrace();
@@ -2468,6 +2473,10 @@ public void run() {
24682473
if (serialMenu.getItemCount() == 0) statusError(e);
24692474
else if (serialPrompt()) run();
24702475
else statusNotice(_("Upload canceled."));
2476+
} catch (PreferencesMapException e) {
2477+
statusError(I18n.format(
2478+
_("Error while uploading: missing '{0}' configuration parameter"),
2479+
e.getMessage()));
24712480
} catch (RunnerException e) {
24722481
//statusError("Error during upload.");
24732482
//e.printStackTrace();
@@ -2543,9 +2552,10 @@ public void run() {
25432552
statusError(_("Error while burning bootloader."));
25442553
// error message will already be visible
25452554
}
2546-
} catch (RunnerException e) {
2547-
statusError(_("Error while burning bootloader."));
2548-
e.printStackTrace();
2555+
} catch (PreferencesMapException e) {
2556+
statusError(I18n.format(
2557+
_("Error while burning bootloader: missing '{0}' configuration parameter"),
2558+
e.getMessage()));
25492559
//statusError(e);
25502560
} catch (Exception e) {
25512561
statusError(_("Error while burning bootloader."));

‎app/src/processing/app/Sketch.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1581,7 +1581,7 @@ protected boolean exportApplet(boolean usingProgrammer) throws Exception {
15811581
* Handle export to applet.
15821582
*/
15831583
public boolean exportApplet(String appletPath, boolean usingProgrammer)
1584-
throws RunnerException, IOException, SerialException {
1584+
throws Exception {
15851585

15861586
prepare();
15871587

@@ -1660,7 +1660,7 @@ protected void size(PreferencesMap prefs) throws RunnerException {
16601660
}
16611661

16621662
protected String upload(String buildPath, String suggestedClassName, boolean usingProgrammer)
1663-
throws RunnerException, SerialException {
1663+
throws Exception {
16641664

16651665
Uploader uploader;
16661666

‎app/src/processing/app/debug/BasicUploader.java‎

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import processing.app.Serial;
3838
import processing.app.SerialException;
3939
import processing.app.helpers.PreferencesMap;
40+
import processing.app.helpers.PreferencesMapException;
4041
import processing.app.helpers.StringReplacer;
4142

4243
import static processing.app.I18n._;
@@ -45,12 +46,18 @@ public class BasicUploader extends Uploader {
4546

4647
public boolean uploadUsingPreferences(String buildPath, String className,
4748
boolean usingProgrammer)
48-
throws RunnerException, SerialException {
49+
throws Exception {
4950
// FIXME: Preferences should be reorganized
5051
TargetPlatform targetPlatform = Base.getTargetPlatform();
5152
PreferencesMap prefs = Preferences.getMap();
5253
prefs.putAll(Base.getBoardPreferences());
53-
prefs.putAll(targetPlatform.getTool(prefs.get("upload.tool")));
54+
String tool = prefs.getOrExcept("upload.tool");
55+
if (tool.contains(":")) {
56+
String[] split = tool.split(":", 2);
57+
targetPlatform = Base.getCurrentTargetPlatformFromPackage(split[0]);
58+
tool = split[1];
59+
}
60+
prefs.putAll(targetPlatform.getTool(tool));
5461

5562
// if no protocol is specified for this board, assume it lacks a
5663
// bootloader and upload using the selected programmer.
@@ -71,7 +78,7 @@ public boolean uploadUsingPreferences(String buildPath, String className,
7178
boolean waitForUploadPort = (t != null) && t.equals("true");
7279

7380
if (doTouch) {
74-
String uploadPort = prefs.get("serial.port");
81+
String uploadPort = prefs.getOrExcept("serial.port");
7582
try {
7683
// Toggle 1200 bps on selected serial port to force board reset.
7784
List<String> before = Serial.list();
@@ -109,9 +116,9 @@ public boolean uploadUsingPreferences(String buildPath, String className,
109116
prefs.put("build.path", buildPath);
110117
prefs.put("build.project_name", className);
111118
if (verbose)
112-
prefs.put("upload.verbose", prefs.get("upload.params.verbose"));
119+
prefs.put("upload.verbose", prefs.getOrExcept("upload.params.verbose"));
113120
else
114-
prefs.put("upload.verbose", prefs.get("upload.params.quiet"));
121+
prefs.put("upload.verbose", prefs.getOrExcept("upload.params.quiet"));
115122

116123
boolean uploadResult;
117124
try {
@@ -120,7 +127,7 @@ public boolean uploadUsingPreferences(String buildPath, String className,
120127
// flushSerialBuffer();
121128
// }
122129

123-
String pattern = prefs.get("upload.pattern");
130+
String pattern = prefs.getOrExcept("upload.pattern");
124131
String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
125132
uploadResult = executeUploadCommand(cmd);
126133
} catch (Exception e) {
@@ -211,7 +218,7 @@ private String waitForUploadPort(String uploadPort, List<String> before)
211218
}
212219

213220
public boolean uploadUsingProgrammer(String buildPath, String className)
214-
throws RunnerException {
221+
throws Exception {
215222

216223
TargetPlatform targetPlatform = Base.getTargetPlatform();
217224
String programmer = Preferences.get("programmer");
@@ -224,15 +231,15 @@ public boolean uploadUsingProgrammer(String buildPath, String className)
224231
PreferencesMap prefs = Preferences.getMap();
225232
prefs.putAll(Base.getBoardPreferences());
226233
prefs.putAll(targetPlatform.getProgrammer(programmer));
227-
prefs.putAll(targetPlatform.getTool(prefs.get("program.tool")));
234+
prefs.putAll(targetPlatform.getTool(prefs.getOrExcept("program.tool")));
228235

229236
prefs.put("build.path", buildPath);
230237
prefs.put("build.project_name", className);
231238

232239
if (verbose)
233-
prefs.put("program.verbose", prefs.get("program.params.verbose"));
240+
prefs.put("program.verbose", prefs.getOrExcept("program.params.verbose"));
234241
else
235-
prefs.put("program.verbose", prefs.get("program.params.quiet"));
242+
prefs.put("program.verbose", prefs.getOrExcept("program.params.quiet"));
236243

237244
try {
238245
// if (prefs.get("program.disable_flushing") == null
@@ -241,15 +248,15 @@ public boolean uploadUsingProgrammer(String buildPath, String className)
241248
// flushSerialBuffer();
242249
// }
243250

244-
String pattern = prefs.get("program.pattern");
251+
String pattern = prefs.getOrExcept("program.pattern");
245252
String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
246253
return executeUploadCommand(cmd);
247254
} catch (Exception e) {
248255
throw new RunnerException(e);
249256
}
250257
}
251258

252-
public boolean burnBootloader() throws RunnerException {
259+
public boolean burnBootloader() throws RunnerException, PreferencesMapException {
253260
TargetPlatform targetPlatform = Base.getTargetPlatform();
254261

255262
// Find preferences for the selected programmer
@@ -272,7 +279,7 @@ public boolean burnBootloader() throws RunnerException {
272279

273280
// Create configuration for bootloader tool
274281
PreferencesMap toolPrefs = new PreferencesMap();
275-
String tool = prefs.get("bootloader.tool");
282+
String tool = prefs.getOrExcept("bootloader.tool");
276283
if (tool.contains(":")) {
277284
String[] split = tool.split(":", 2);
278285
TargetPlatform platform = Base.getCurrentTargetPlatformFromPackage(split[0]);
@@ -291,20 +298,20 @@ public boolean burnBootloader() throws RunnerException {
291298
// Merge tool with global configuration
292299
prefs.putAll(toolPrefs);
293300
if (verbose) {
294-
prefs.put("erase.verbose", prefs.get("erase.params.verbose"));
295-
prefs.put("bootloader.verbose", prefs.get("bootloader.params.verbose"));
301+
prefs.put("erase.verbose", prefs.getOrExcept("erase.params.verbose"));
302+
prefs.put("bootloader.verbose", prefs.getOrExcept("bootloader.params.verbose"));
296303
} else {
297-
prefs.put("erase.verbose", prefs.get("erase.params.quiet"));
298-
prefs.put("bootloader.verbose", prefs.get("bootloader.params.quiet"));
304+
prefs.put("erase.verbose", prefs.getOrExcept("erase.params.quiet"));
305+
prefs.put("bootloader.verbose", prefs.getOrExcept("bootloader.params.quiet"));
299306
}
300307

301308
try {
302-
String pattern = prefs.get("erase.pattern");
309+
String pattern = prefs.getOrExcept("erase.pattern");
303310
String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
304311
if (!executeUploadCommand(cmd))
305312
return false;
306313

307-
pattern = prefs.get("bootloader.pattern");
314+
pattern = prefs.getOrExcept("bootloader.pattern");
308315
cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
309316
return executeUploadCommand(cmd);
310317
} catch (Exception e) {

‎app/src/processing/app/debug/TargetPackage.java‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,14 @@
2323
*/
2424
package processing.app.debug;
2525

26+
import static processing.app.I18n._;
27+
2628
import java.io.File;
2729
import java.util.Collection;
2830
import java.util.LinkedHashMap;
2931
import java.util.Map;
3032

33+
import processing.app.I18n;
3134
import processing.app.helpers.filefilters.OnlyDirs;
3235

3336
public class TargetPackage {
@@ -47,8 +50,18 @@ public TargetPackage(String _id, File _folder) throws TargetPlatformException {
4750
if (!subFolder.exists() || !subFolder.canRead())
4851
continue;
4952
String arch = subFolder.getName();
50-
TargetPlatform platform = new TargetPlatform(arch, subFolder, this);
51-
platforms.put(arch, platform);
53+
try {
54+
TargetPlatform platform = new TargetPlatform(arch, subFolder, this);
55+
platforms.put(arch, platform);
56+
} catch (TargetPlatformException e) {
57+
System.out.println(e.getMessage());
58+
}
59+
}
60+
61+
if (platforms.size() == 0) {
62+
throw new TargetPlatformException(I18n
63+
.format(_("No valid hardware definitions found in folder {0}."),
64+
_folder.getName()));
5265
}
5366
}
5467

‎app/src/processing/app/debug/Uploader.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import processing.app.I18n;
3636
import processing.app.Preferences;
3737
import processing.app.Serial;
38-
import processing.app.SerialException;
3938
import processing.app.SerialNotFoundException;
4039

4140
public abstract class Uploader implements MessageConsumer {
@@ -52,11 +51,11 @@ public abstract class Uploader implements MessageConsumer {
5251
boolean verbose;
5352

5453
public abstract boolean uploadUsingPreferences(String buildPath, String className, boolean usingProgrammer)
55-
throws RunnerException, SerialException;
54+
throws Exception;
5655

57-
public abstract boolean burnBootloader() throws RunnerException;
56+
public abstract boolean burnBootloader() throws Exception;
5857

59-
protected void flushSerialBuffer() throws RunnerException, SerialException {
58+
protected void flushSerialBuffer() throws Exception {
6059
// Cleanup the serial buffer
6160
try {
6261
Serial serialPort = new Serial();
@@ -87,14 +86,14 @@ protected void flushSerialBuffer() throws RunnerException, SerialException {
8786
}
8887

8988
protected boolean executeUploadCommand(Collection<String> commandDownloader)
90-
throws RunnerException {
89+
throws Exception {
9190
String[] commandArray = new String[commandDownloader.size()];
9291
commandDownloader.toArray(commandArray);
9392
return executeUploadCommand(commandArray);
9493
}
9594

9695
protected boolean executeUploadCommand(String commandArray[])
97-
throws RunnerException
96+
throws Exception
9897
{
9998
firstErrorFound = false; // haven't found any errors yet
10099
secondErrorFound = false;

‎app/src/processing/app/helpers/PreferencesMap.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,22 @@ public String toString(String indent) {
245245
return res;
246246
}
247247

248+
/**
249+
* Returns the value to which the specified key is mapped, or throws a
250+
* PreferencesMapException if not found
251+
*
252+
* @param k
253+
* the key whose associated value is to be returned
254+
* @return the value to which the specified key is mapped
255+
* @throws PreferencesMapException
256+
*/
257+
public String getOrExcept(String k) throws PreferencesMapException {
258+
String r = get(k);
259+
if (r == null)
260+
throw new PreferencesMapException(k);
261+
return r;
262+
}
263+
248264
@Override
249265
public String toString() {
250266
return toString("");

‎app/src/processing/app/helpers/PreferencesMapException.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package processing.app.helpers;
2+
3+
@SuppressWarnings("serial")
4+
public class PreferencesMapException extends Exception {
5+
6+
public PreferencesMapException(String message) {
7+
super(message);
8+
}
9+
10+
}

‎build/shared/examples/02.Digital/tonePitchFollower/tonePitchFollower.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Plays a pitch that changes based on a changing analog input
55
66
circuit:
7-
* 8-ohm speaker on digital pin 8
7+
* 8-ohm speaker on digital pin 9
88
* photoresistor on analog 0 to 5V
99
* 4.7K resistor on analog 0 to ground
1010

‎build/shared/revisions.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ ARDUINO 1.5.3 BETA
1717
* avr: Added support for Flash strings on String class (Jantje)
1818
* Added support for floating point numbers in String class (Tevin Zhang, SebiTimeWaster)
1919
* sam: Fixed String buffer overflows (Paul Stoffregen)
20+
* avr: Added recipe for assembly files (C. A. Church)
2021

2122
[libraries]
2223
* sam: Added CAN library (still in early stage of development) (Palliser)

0 commit comments

Comments
 (0)