rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-15 12:29:26 +01:00
Code Issues Releases Activity

Better check for programmers configuration when uploading using programmer

Browse Source
This commit is contained in:
Cristian Maglie 2014-08-06 11:17:10 +02:00
parent 8ae1d36a00
commit dcc1020a6e
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/cc/arduino/packages/uploaders/SerialUploader.java
View File

@ -26,18 +26,22 @@
package cc.arduino.packages.uploaders; package cc.arduino.packages.uploaders;
import cc.arduino.packages.Uploader; import static processing.app.I18n._;
import processing.app.*;
import processing.app.debug.RunnerException;
import processing.app.debug.TargetPlatform;
import processing.app.helpers.PreferencesMap;
import processing.app.helpers.StringReplacer;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import static processing.app.I18n._; import processing.app.Base;
import processing.app.I18n;
import processing.app.Preferences;
import processing.app.Serial;
import processing.app.SerialException;
import processing.app.debug.RunnerException;
import processing.app.debug.TargetPlatform;
import processing.app.helpers.PreferencesMap;
import processing.app.helpers.StringReplacer;
import cc.arduino.packages.Uploader;
public class SerialUploader extends Uploader { public class SerialUploader extends Uploader {
@ -209,7 +213,11 @@ public class SerialUploader extends Uploader {
PreferencesMap prefs = Preferences.getMap(); PreferencesMap prefs = Preferences.getMap();
prefs.putAll(Base.getBoardPreferences()); prefs.putAll(Base.getBoardPreferences());
prefs.putAll(targetPlatform.getProgrammer(programmer)); PreferencesMap programmerPrefs = targetPlatform.getProgrammer(programmer);
if (programmerPrefs == null)
throw new RunnerException(
_("Please select a programmer from Tools->Programmer menu"));
prefs.putAll(programmerPrefs);
prefs.putAll(targetPlatform.getTool(prefs.getOrExcept("program.tool"))); prefs.putAll(targetPlatform.getTool(prefs.getOrExcept("program.tool")));
prefs.put("build.path", buildPath); prefs.put("build.path", buildPath);
@ -251,6 +259,9 @@ public class SerialUploader extends Uploader {
} else { } else {
programmerPrefs = targetPlatform.getProgrammer(programmer); programmerPrefs = targetPlatform.getProgrammer(programmer);
} }
if (programmerPrefs == null)
throw new RunnerException(
_("Please select a programmer from Tools->Programmer menu"));
// Build configuration for the current programmer // Build configuration for the current programmer
PreferencesMap prefs = Preferences.getMap(); PreferencesMap prefs = Preferences.getMap();