arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00
Code Activity

enable defining another command for network uploads

Browse Source
This commit is contained in:
John Doe
2015-07-01 23:46:00 +03:00
parent 9c9c66b02d
commit 70b33da7bb
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ public class UploaderFactory {
return new SSHUploader(port); return new SSHUploader(port);
} }
return new SerialUploader(); return new SerialUploader(port);
} }
} }

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

@ -42,6 +42,8 @@ import static processing.app.I18n._;
public class SerialUploader extends Uploader { public class SerialUploader extends Uploader {
private final BoardPort boardPort;
public SerialUploader() public SerialUploader()
{ {
super(); super();
@ -52,6 +54,12 @@ public class SerialUploader extends Uploader {
super(noUploadPort); super(noUploadPort);
} }
public SerialUploader(BoardPort port)
{
this.boardPort = port;
super();
}
public boolean uploadUsingPreferences(File sourcePath, String buildPath, String className, boolean usingProgrammer, List<String> warningsAccumulator) throws Exception { public boolean uploadUsingPreferences(File sourcePath, String buildPath, String className, boolean usingProgrammer, List<String> warningsAccumulator) throws Exception {
// FIXME: Preferences should be reorganized // FIXME: Preferences should be reorganized
TargetPlatform targetPlatform = BaseNoGui.getTargetPlatform(); TargetPlatform targetPlatform = BaseNoGui.getTargetPlatform();
@ -153,7 +161,15 @@ public class SerialUploader extends Uploader {
boolean uploadResult; boolean uploadResult;
try { try {
String pattern = prefs.getOrExcept("upload.pattern"); String pattern;
if(this.boardPort && "network".equals(this.boardPort.getProtocol())){
prefs.put("network.port", this.boardPort.getPrefs().get("port"));
pattern = prefs.get("network.pattern");
if(pattern == null)
pattern = prefs.getOrExcept("upload.pattern");
} else {
pattern = prefs.getOrExcept("upload.pattern");
}
String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true); String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
uploadResult = executeUploadCommand(cmd); uploadResult = executeUploadCommand(cmd);
} catch (RunnerException e) { } catch (RunnerException e) {