mirror of
https://github.com/arduino/Arduino.git
synced 2025-02-20 14:54:31 +01:00
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:
commit
d0d9aa82d1
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user