arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-22 08:22:04 +03:00
Code Activity

boards.txt modified. java code updated

Browse Source
This commit is contained in:
Federico Fissore
2013-04-16 09:18:00 +02:00
parent 09f643972c
commit 0b8489d31e
4 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1661,7 +1661,7 @@ public class Sketch {
TargetPlatform target = Base.getTargetPlatform();
String board = Preferences.get("board");
Uploader uploader = new UploaderFactory().newUploader(target.getBoards().get(board));
Uploader uploader = new UploaderFactory().newUploader(target.getBoards().get(board), Preferences.get("serial.port"));
boolean success = uploader.uploadUsingPreferences(buildPath, suggestedClassName, usingProgrammer);

11
app/src/processing/app/debug/UploaderFactory.java
View File

@ -1,15 +1,14 @@
package processing.app.debug;
import processing.app.Base;
import processing.app.Preferences;
import processing.app.helpers.Maps;
import java.util.Map;
import java.util.regex.Pattern;
public class UploaderFactory {
public Uploader newUploader(Map<String, String> preferences) {
if ("http".equals(preferences.get("upload.tool"))) {
private static final Pattern IPV4_ADDRESS = Pattern.compile("\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}");
public Uploader newUploader(Map<String, String> preferences, String port) {
if ("true".equals(preferences.get("upload.via_http")) && IPV4_ADDRESS.matcher(port).find()) {
return new HttpUploader();
}