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

quick fingers...

Browse Source
This commit is contained in:
John Doe
2015-07-01 23:54:58 +03:00
parent 70b33da7bb
commit 7cd54a4f7b
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@
package cc.arduino.packages.uploaders;
import cc.arduino.packages.BoardPort;
import cc.arduino.packages.Uploader;
import processing.app.*;
import processing.app.debug.RunnerException;
@ -47,17 +48,19 @@ public class SerialUploader extends Uploader {
public SerialUploader()
{
super();
this.boardPort = null;
}
public SerialUploader(boolean noUploadPort)
{
super(noUploadPort);
this.boardPort = null;
}
public SerialUploader(BoardPort port)
{
this.boardPort = port;
super();
this.boardPort = port;
}
public boolean uploadUsingPreferences(File sourcePath, String buildPath, String className, boolean usingProgrammer, List<String> warningsAccumulator) throws Exception {
@ -162,7 +165,7 @@ public class SerialUploader extends Uploader {
boolean uploadResult;
try {
String pattern;
if(this.boardPort && "network".equals(this.boardPort.getProtocol())){
if(this.boardPort != null && "network".equals(this.boardPort.getProtocol())){
prefs.put("network.port", this.boardPort.getPrefs().get("port"));
pattern = prefs.get("network.pattern");
if(pattern == null)