Skip to content

Commit 7959d85

Browse files
committed
Allow uploader choice in upload.tool to specify a different platform vendor
1 parent 76fd163 commit 7959d85

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,13 @@ public boolean uploadUsingPreferences(String buildPath, String className,
5050
TargetPlatform targetPlatform = Base.getTargetPlatform();
5151
PreferencesMap prefs = Preferences.getMap();
5252
prefs.putAll(Base.getBoardPreferences());
53-
prefs.putAll(targetPlatform.getTool(prefs.get("upload.tool")));
53+
String tool = prefs.get("upload.tool");
54+
if (tool.contains(":")) {
55+
String[] split = tool.split(":", 2);
56+
targetPlatform = Base.getCurrentTargetPlatformFromPackage(split[0]);
57+
tool = split[1];
58+
}
59+
prefs.putAll(targetPlatform.getTool(tool));
5460

5561
// if no protocol is specified for this board, assume it lacks a
5662
// bootloader and upload using the selected programmer.

0 commit comments

Comments
 (0)