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; package cc.arduino.packages.uploaders;
import cc.arduino.packages.BoardPort;
import cc.arduino.packages.Uploader; import cc.arduino.packages.Uploader;
import processing.app.*; import processing.app.*;
import processing.app.debug.RunnerException; import processing.app.debug.RunnerException;
@ -47,17 +48,19 @@ public class SerialUploader extends Uploader {
public SerialUploader() public SerialUploader()
{ {
super(); super();
this.boardPort = null;
} }
public SerialUploader(boolean noUploadPort) public SerialUploader(boolean noUploadPort)
{ {
super(noUploadPort); super(noUploadPort);
this.boardPort = null;
} }
public SerialUploader(BoardPort port) public SerialUploader(BoardPort port)
{ {
this.boardPort = port;
super(); super();
this.boardPort = port;
} }
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 {
@ -162,7 +165,7 @@ public class SerialUploader extends Uploader {
boolean uploadResult; boolean uploadResult;
try { try {
String pattern; 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")); prefs.put("network.port", this.boardPort.getPrefs().get("port"));
pattern = prefs.get("network.pattern"); pattern = prefs.get("network.pattern");
if(pattern == null) if(pattern == null)

3
hardware/esp8266com/esp8266/platform.txt
View File

@ -93,6 +93,7 @@ tools.esptool.upload.protocol=esp
tools.esptool.upload.params.verbose=-vv tools.esptool.upload.params.verbose=-vv
tools.esptool.upload.params.quiet= tools.esptool.upload.params.quiet=
tools.esptool.upload.pattern="{path}/{cmd}" {upload.verbose} -cd {upload.resetmethod} -cb {upload.speed} -cp "{serial.port}" -ca 0x00000 -cf "{build.path}/{build.project_name}.bin" tools.esptool.upload.pattern="{path}/{cmd}" {upload.verbose} -cd {upload.resetmethod} -cb {upload.speed} -cp "{serial.port}" -ca 0x00000 -cf "{build.path}/{build.project_name}.bin"
tools.esptool.network.pattern="{cmd}" "{path}/espota.py" "{serial.port}" "{network.port}" "{build.path}/{build.project_name}.bin"
tools.espota.cmd=python tools.espota.cmd=python
tools.espota.cmd.windows=python.exe tools.espota.cmd.windows=python.exe
@ -101,4 +102,4 @@ tools.espota.path={runtime.platform.path}/tools
tools.espota.upload.protocol=espota tools.espota.upload.protocol=espota
tools.espota.upload.params.verbose= tools.espota.upload.params.verbose=
tools.espota.upload.params.quiet= tools.espota.upload.params.quiet=
tools.espota.upload.pattern="{cmd}" "{path}/espota.py" "{serial.port}" "{build.path}/{build.project_name}.bin" tools.espota.upload.pattern="{cmd}" "{path}/espota.py" "{serial.port}" 8266 "{build.path}/{build.project_name}.bin"

6
hardware/esp8266com/esp8266/tools/espota.py
View File

@ -12,7 +12,7 @@ import socket
import sys import sys
import os import os
def serve(remoteAddr, filename): def serve(remoteAddr, remotePort, filename):
# Create a TCP/IP socket # Create a TCP/IP socket
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
serverPort = 48266 serverPort = 48266
@ -22,7 +22,7 @@ def serve(remoteAddr, filename):
sock.listen(1) sock.listen(1)
sock2 = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) sock2 = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
remote_address = (remoteAddr, 8266) remote_address = (remoteAddr, remotePort)
content_size = os.path.getsize(filename) content_size = os.path.getsize(filename)
print('upload size: %d' % content_size, file=sys.stderr) print('upload size: %d' % content_size, file=sys.stderr)
message = '%d %d %d\n' % (0, serverPort, content_size) message = '%d %d %d\n' % (0, serverPort, content_size)
@ -61,7 +61,7 @@ def serve(remoteAddr, filename):
return 1 return 1
def main(args): def main(args):
return serve(args[1], args[2]) return serve(args[1], args[2], args[3])