From 37bd383c59abba9394b9c9c04d6502182dc3996e Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Mon, 6 Jul 2015 12:29:56 +0300 Subject: [PATCH] Part of 7cd54a4 without IDE changes --- platform.txt | 3 ++- tools/espota.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/platform.txt b/platform.txt index 8437e509c..050140f03 100644 --- a/platform.txt +++ b/platform.txt @@ -93,6 +93,7 @@ tools.esptool.upload.protocol=esp tools.esptool.upload.params.verbose=-vv 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.network.pattern="{cmd}" "{path}/espota.py" "{serial.port}" "{network.port}" "{build.path}/{build.project_name}.bin" tools.espota.cmd=python 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.params.verbose= 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" diff --git a/tools/espota.py b/tools/espota.py index f1f2baca6..af421b319 100755 --- a/tools/espota.py +++ b/tools/espota.py @@ -12,7 +12,7 @@ import socket import sys import os -def serve(remoteAddr, filename): +def serve(remoteAddr, remotePort, filename): # Create a TCP/IP socket sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) serverPort = 48266 @@ -22,7 +22,7 @@ def serve(remoteAddr, filename): sock.listen(1) sock2 = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) - remote_address = (remoteAddr, 8266) + remote_address = (remoteAddr, remotePort) content_size = os.path.getsize(filename) print('upload size: %d' % content_size, file=sys.stderr) message = '%d %d %d\n' % (0, serverPort, content_size) @@ -61,7 +61,7 @@ def serve(remoteAddr, filename): return 1 def main(args): - return serve(args[1], args[2]) + return serve(args[1], args[2], args[3])