From 7cd54a4f7bd7ce8be48483e4cad4cdf0e5d6ab3b Mon Sep 17 00:00:00 2001
From: John Doe <ficeto@Hristos-Mac-mini-2.local>
Date: Wed, 1 Jul 2015 23:54:58 +0300
Subject: [PATCH] quick fingers...

---
 .../src/cc/arduino/packages/uploaders/SerialUploader.java  | 7 +++++--
 hardware/esp8266com/esp8266/platform.txt                   | 3 ++-
 hardware/esp8266com/esp8266/tools/espota.py                | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java b/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
index 23bcc0cdf..4ee992cb9 100644
--- a/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
+++ b/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
@@ -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)
diff --git a/hardware/esp8266com/esp8266/platform.txt b/hardware/esp8266com/esp8266/platform.txt
index 8437e509c..050140f03 100644
--- a/hardware/esp8266com/esp8266/platform.txt
+++ b/hardware/esp8266com/esp8266/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/hardware/esp8266com/esp8266/tools/espota.py b/hardware/esp8266com/esp8266/tools/espota.py
index f1f2baca6..af421b319 100755
--- a/hardware/esp8266com/esp8266/tools/espota.py
+++ b/hardware/esp8266com/esp8266/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])