rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-15 12:29:26 +01:00
Code Issues Releases Activity

Merge pull request #2126 from damellis/issue-1791

Browse Source 
Proceed with upload even if port can't be found.
This commit is contained in:
Cristian Maglie 2014-06-13 11:33:20 +02:00
commit 65a4b4034d
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/cc/arduino/packages/UploaderAndMonitorFactory.java
View File

@ -40,7 +40,7 @@ import processing.app.debug.TargetBoard;
public class UploaderAndMonitorFactory { public class UploaderAndMonitorFactory {
public Uploader newUploader(TargetBoard board, BoardPort port) { 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); return new SSHUploader(port);
} }

6
app/src/cc/arduino/packages/uploaders/SerialUploader.java
View File

@ -121,6 +121,8 @@ public class SerialUploader extends Uploader {
String pattern = prefs.getOrExcept("upload.pattern"); String 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) {
throw e;
} catch (Exception e) { } catch (Exception e) {
throw new RunnerException(e); throw new RunnerException(e);
} }
@ -228,6 +230,8 @@ public class SerialUploader extends Uploader {
String pattern = prefs.getOrExcept("program.pattern"); String pattern = prefs.getOrExcept("program.pattern");
String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true); String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
return executeUploadCommand(cmd); return executeUploadCommand(cmd);
} catch (RunnerException e) {
throw e;
} catch (Exception e) { } catch (Exception e) {
throw new RunnerException(e); throw new RunnerException(e);
} }
@ -287,6 +291,8 @@ public class SerialUploader extends Uploader {
pattern = prefs.getOrExcept("bootloader.pattern"); pattern = prefs.getOrExcept("bootloader.pattern");
cmd = StringReplacer.formatAndSplit(pattern, prefs, true); cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
return executeUploadCommand(cmd); return executeUploadCommand(cmd);
} catch (RunnerException e) {
throw e;
} catch (Exception e) { } catch (Exception e) {
throw new RunnerException(e); throw new RunnerException(e);
} }

5
app/src/processing/app/Sketch.java
View File

@ -1692,11 +1692,6 @@ public class Sketch {
BoardPort boardPort = Base.getDiscoveryManager().find(Preferences.get("serial.port")); 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); Uploader uploader = new UploaderAndMonitorFactory().newUploader(target.getBoards().get(board), boardPort);
boolean success = false; boolean success = false;