noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3017 from cmaglie/programmer-pref-override 

programmer.txt definitions must have priority over platforms.txt tools definitions
This commit is contained in:
Federico Fissore 2015-05-06 15:49:33 +02:00
parent 70eaa47f8d a7e6a39f4e
commit d0d9aa82d1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
View File

@ -253,8 +253,8 @@ public class SerialUploader extends Uploader {
if (programmerPrefs == null)
throw new RunnerException(
_("Please select a programmer from Tools->Programmer menu"));
prefs.putAll(targetPlatform.getTool(programmerPrefs.getOrExcept("program.tool")));
prefs.putAll(programmerPrefs);
prefs.putAll(targetPlatform.getTool(prefs.getOrExcept("program.tool")));
prefs.put("build.path", buildPath);
prefs.put("build.project_name", className);