Merge branch 'master' into master

doc/reference.md

@@ -178,7 +178,7 @@ SweetPea ESP-210 | 4M | 1M, 3M
 
 *ESP8266FS* is a tool which integrates into the Arduino IDE. It adds a menu item to *Tools* menu for uploading the contents of sketch data directory into ESP8266 flash file system.
 
-- Download the tool: http://arduino.esp8266.com/ESP8266FS-1.6.5-1105-g98d2458.zip
+- Download the tool: https://github.com/esp8266/arduino-esp8266fs-plugin/releases/download/0.1.3/ESP8266FS-0.1.3.zip.
 - In your Arduino sketchbook directory, create `tools` directory if it doesn't exist yet
 - Unpack the tool into `tools` directory (the path will look like `<home_dir>/Arduino/tools/ESP8266FS/tool/esp8266fs.jar`)
 - Restart Arduino IDE

libraries/ArduinoOTA/ArduinoOTA.cpp

@@ -63,7 +63,7 @@ void ArduinoOTAClass::begin() {
 
   if (!_hostname.length()) {
     char tmp[15];
-    sprintf(tmp, "esp8266-%02x", ESP.getChipId());
+    sprintf(tmp, "esp8266-%06x", ESP.getChipId());
     _hostname = tmp;
   }
   if (!_port) {
@@ -199,7 +199,7 @@ void ArduinoOTAClass::handle() {
 #endif
 
     _udp_ota.beginPacket(_ota_ip, _udp_ota.remotePort());
-    if (_password){
+    if (_password.length()){
       MD5Builder nonce_md5;
       nonce_md5.begin();
       nonce_md5.add(String(micros()));

tools/espota.py

@@ -30,17 +30,44 @@ import os
 import optparse
 import logging
 import hashlib
+import random
 
 # Commands
 FLASH = 0
 SPIFFS = 100
 AUTH = 200
-
+PROGRESS = False
+# update_progress() : Displays or updates a console progress bar
+## Accepts a float between 0 and 1. Any int will be converted to a float.
+## A value under 0 represents a 'halt'.
+## A value at 1 or bigger represents 100%
+def update_progress(progress):
+  if (PROGRESS):
+    barLength = 60 # Modify this to change the length of the progress bar
+    status = ""
+    if isinstance(progress, int):
+      progress = float(progress)
+    if not isinstance(progress, float):
+      progress = 0
+      status = "error: progress var must be float\r\n"
+    if progress < 0:
+      progress = 0
+      status = "Halt...\r\n"
+    if progress >= 1:
+      progress = 1
+      status = "Done...\r\n"
+    block = int(round(barLength*progress))
+    text = "\rUploading: [{0}] {1}% {2}".format( "="*block + " "*(barLength-block), int(progress*100), status)
+    sys.stderr.write(text)
+    sys.stderr.flush()
+  else:
+    sys.stderr.write('.')
+    sys.stderr.flush()
 
 def serve(remoteAddr, remotePort, password, filename, command = FLASH):
   # Create a TCP/IP socket
   sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-  serverPort = 48266
+  serverPort = random.randint(10000,60000)
   server_address = ('0.0.0.0', serverPort)
   logging.info('Starting on %s:%s', str(server_address[0]), str(server_address[1]))
   try:
@@ -115,13 +142,17 @@ def serve(remoteAddr, remotePort, password, filename, command = FLASH):
 
   try:
     f = open(filename, "rb")
+    if (PROGRESS):
+      update_progress(0)
+    else:
       sys.stderr.write('Uploading')
       sys.stderr.flush()
+    offset = 0
     while True:
       chunk = f.read(1460)
       if not chunk: break
-      sys.stderr.write('.')
+      offset += len(chunk)
-      sys.stderr.flush()
+      update_progress(offset/float(content_size))
       connection.settimeout(10)
       try:
         connection.sendall(chunk)
@@ -220,6 +251,12 @@ def parser():
     action = "store_true",
     default = False
   )
+  group.add_option("-r", "--progress",
+    dest = "progress",
+    help = "Show progress output. Does not work for ArduinoIDE",
+    action = "store_true",
+    default = False
+  )
   parser.add_option_group(group)
 
   (options, args) = parser.parse_args()
@@ -244,6 +281,8 @@ def main(args):
   logging.debug("Options: %s", str(options))
 
   # check options
+  global PROGRESS
+  PROGRESS = options.progress
   if (not options.esp_ip or not options.image):
     logging.critical("Not enough arguments.")