Skip to content

Proceed with upload even if port can't be found. #2126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 13, 2014
Merged

Proceed with upload even if port can't be found. #2126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5fe1b1
Proceed with upload even if port can't be found. (Issue #1791)
damellis Jun 11, 2014
fcd6336
Don't wrap a RunnerException in a redundant RunnerException.
damellis Jun 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/cc/arduino/packages/UploaderAndMonitorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
public class UploaderAndMonitorFactory {

public Uploader newUploader(TargetBoard board, BoardPort port) {
if ("true".equals(board.getPreferences().get("upload.via_ssh")) && "network".equals(port.getProtocol())) {
if ("true".equals(board.getPreferences().get("upload.via_ssh")) && port != null && "network".equals(port.getProtocol())) {
return new SSHUploader(port);
}

Expand Down
6 changes: 6 additions & 0 deletions app/src/cc/arduino/packages/uploaders/SerialUploader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
String pattern = prefs.getOrExcept("upload.pattern");
String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
uploadResult = executeUploadCommand(cmd);
} catch (RunnerException e) {
throw e;
} catch (Exception e) {
throw new RunnerException(e);
}
Expand Down Expand Up @@ -228,6 +230,8 @@ public boolean uploadUsingProgrammer(String buildPath, String className) throws
String pattern = prefs.getOrExcept("program.pattern");
String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
return executeUploadCommand(cmd);
} catch (RunnerException e) {
throw e;
} catch (Exception e) {
throw new RunnerException(e);
}
Expand Down Expand Up @@ -287,6 +291,8 @@ public boolean burnBootloader() throws Exception {
pattern = prefs.getOrExcept("bootloader.pattern");
cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
return executeUploadCommand(cmd);
} catch (RunnerException e) {
throw e;
} catch (Exception e) {
throw new RunnerException(e);
}
Expand Down
5 changes: 0 additions & 5 deletions app/src/processing/app/Sketch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1692,11 +1692,6 @@ protected boolean upload(String buildPath, String suggestedClassName, boolean us

BoardPort boardPort = Base.getDiscoveryManager().find(Preferences.get("serial.port"));

if (boardPort == null) {
editor.statusError(I18n.format("Board at {0} is not available", Preferences.get("serial.port")));
return false;
}

Uploader uploader = new UploaderAndMonitorFactory().newUploader(target.getBoards().get(board), boardPort);

boolean success = false;
Expand Down