Merge branch 'master' into master

Author: larsenglund

README.md

@@ -26,7 +26,7 @@ Starting with 1.6.4, Arduino allows installation of third-party platform package
 - Open Boards Manager from Tools > Board menu and install *esp8266* platform (and don't forget to select your ESP8266 board from Tools > Board menu after installation).
 
 The best place to ask questions related to this core is ESP8266 community forum: http://www.esp8266.com/arduino.
-If you find this forum or the ESP8266 Boards Manager package useful, please consider supporting it with a donation.
+If you find this forum or the ESP8266 Boards Manager package useful, please consider supporting it with a donation. <br />
 [![Donate](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.com/webscr?cmd=_s-xclick&hosted_button_id=4M56YCWV6PX66)
 
 #### Available versions
@@ -79,7 +79,7 @@ Documentation for latest development version:
 - [Reference](doc/reference.md)
 - [Libraries](doc/libraries.md)
 - [File system](doc/filesystem.md)
-- [OTA update](doc/ota_updates/ota_updates.md)
+- [OTA update](doc/ota_updates/readme.md)
 - [Supported boards](doc/boards.md)
 - [Change log](doc/changes.md)
 
@@ -88,6 +88,8 @@ Documentation for latest development version:
 If you encounter an issue, you are welcome to submit it here on Github: https://github.com/esp8266/Arduino/issues.
 Please provide as much context as possible: version which you are using (you can check it in Boards Manager), your sketch code, serial output, board model, IDE settings (board selection, flash size, etc).
 
+If you can not find the answers above, you can also try [ESP8266 Community Forum](http://www.esp8266.com/arduino)
+
 ### Contributing
 
 For minor fixes of code and documentation, go ahead and submit a pull request.

boards.txt

@@ -3,7 +3,6 @@ menu.CpuFrequency=CPU Frequency
 menu.FlashSize=Flash Size
 menu.FlashMode=Flash Mode
 menu.FlashFreq=Flash Frequency
-menu.UploadTool=Upload Using
 menu.ResetMethod=Reset Method
 menu.ESPModule=Module
 menu.Debug=Debug port
@@ -31,12 +30,6 @@ generic.build.spiffs_pagesize=256
 generic.build.debug_port=
 generic.build.debug_level=
 
-generic.menu.UploadTool.esptool=Serial
-generic.menu.UploadTool.esptool.upload.tool=esptool
-generic.menu.UploadTool.esptool.upload.verbose=-vv
-generic.menu.UploadTool.espota=OTA
-generic.menu.UploadTool.espota.upload.tool=espota
-
 generic.menu.CpuFrequency.80=80 MHz
 generic.menu.CpuFrequency.80.build.f_cpu=80000000L
 generic.menu.CpuFrequency.160=160 MHz
@@ -260,12 +253,6 @@ espduino.menu.CpuFrequency.80.build.f_cpu=80000000L
 espduino.menu.CpuFrequency.160=160 MHz
 espduino.menu.CpuFrequency.160.build.f_cpu=160000000L
 
-espduino.menu.UploadTool.esptool=Serial
-espduino.menu.UploadTool.esptool.upload.tool=esptool
-espduino.menu.UploadTool.esptool.upload.verbose=-vv
-espduino.menu.UploadTool.espota=OTA
-espduino.menu.UploadTool.espota.upload.tool=espota
-
 espduino.menu.UploadSpeed.115200=115200
 espduino.menu.UploadSpeed.115200.upload.speed=115200
 espduino.menu.UploadSpeed.9600=9600
@@ -329,10 +316,6 @@ huzzah.menu.CpuFrequency.80.build.f_cpu=80000000L
 huzzah.menu.CpuFrequency.160=160 MHz
 huzzah.menu.CpuFrequency.160.build.f_cpu=160000000L
 
-huzzah.menu.UploadTool.esptool=Serial
-huzzah.menu.UploadTool.esptool.upload.tool=esptool
-huzzah.menu.UploadTool.esptool.upload.verbose=-vv
-
 huzzah.menu.UploadSpeed.115200=115200
 huzzah.menu.UploadSpeed.115200.upload.speed=115200
 huzzah.menu.UploadSpeed.9600=9600
@@ -382,13 +365,6 @@ espresso_lite_v1.menu.CpuFrequency.80.build.f_cpu=80000000L
 espresso_lite_v1.menu.CpuFrequency.160=160 MHz
 espresso_lite_v1.menu.CpuFrequency.160.build.f_cpu=160000000L
 
-espresso_lite_v1.menu.UploadTool.esptool=Serial
-espresso_lite_v1.menu.UploadTool.esptool.upload.tool=esptool
-espresso_lite_v1.menu.UploadTool.esptool.upload.verbose=-vv
-
-espresso_lite_v1.menu.UploadTool.espota=OTA
-espresso_lite_v1.menu.UploadTool.espota.upload.tool=espota
-
 espresso_lite_v1.menu.UploadSpeed.115200=115200
 espresso_lite_v1.menu.UploadSpeed.115200.upload.speed=115200
 espresso_lite_v1.menu.UploadSpeed.57600=57600
@@ -454,14 +430,6 @@ espresso_lite_v2.menu.CpuFrequency.80.build.f_cpu=80000000L
 espresso_lite_v2.menu.CpuFrequency.160=160 MHz
 espresso_lite_v2.menu.CpuFrequency.160.build.f_cpu=160000000L
 
-espresso_lite_v2.menu.UploadTool.esptool=Serial
-espresso_lite_v2.menu.UploadTool.esptool.upload.tool=esptool
-espresso_lite_v2.menu.UploadTool.esptool.upload.verbose=-vv
-
-espresso_lite_v2.menu.UploadTool.espota=OTA
-espresso_lite_v2.menu.UploadTool.espota.upload.tool=espota
-
-
 espresso_lite_v2.menu.UploadSpeed.115200=115200
 espresso_lite_v2.menu.UploadSpeed.115200.upload.speed=115200
 espresso_lite_v2.menu.UploadSpeed.57600=57600
@@ -533,10 +501,6 @@ nodemcu.menu.CpuFrequency.80.build.f_cpu=80000000L
 nodemcu.menu.CpuFrequency.160=160 MHz
 nodemcu.menu.CpuFrequency.160.build.f_cpu=160000000L
 
-nodemcu.menu.UploadTool.esptool=Serial
-nodemcu.menu.UploadTool.esptool.upload.tool=esptool
-nodemcu.menu.UploadTool.esptool.upload.verbose=-vv
-
 nodemcu.menu.UploadSpeed.115200=115200
 nodemcu.menu.UploadSpeed.115200.upload.speed=115200
 nodemcu.menu.UploadSpeed.9600=9600
@@ -601,12 +565,6 @@ nodemcuv2.menu.CpuFrequency.80.build.f_cpu=80000000L
 nodemcuv2.menu.CpuFrequency.160=160 MHz
 nodemcuv2.menu.CpuFrequency.160.build.f_cpu=160000000L
 
-nodemcuv2.menu.UploadTool.esptool=Serial
-nodemcuv2.menu.UploadTool.esptool.upload.tool=esptool
-nodemcuv2.menu.UploadTool.esptool.upload.verbose=-vv
-nodemcuv2.menu.UploadTool.espota=OTA
-nodemcuv2.menu.UploadTool.espota.upload.tool=espota
-
 nodemcuv2.menu.UploadSpeed.115200=115200
 nodemcuv2.menu.UploadSpeed.115200.upload.speed=115200
 nodemcuv2.menu.UploadSpeed.9600=9600
@@ -678,10 +636,6 @@ modwifi.menu.CpuFrequency.80.build.f_cpu=80000000L
 modwifi.menu.CpuFrequency.160=160 MHz
 modwifi.menu.CpuFrequency.160.build.f_cpu=160000000L
 
-modwifi.menu.UploadTool.esptool=Serial
-modwifi.menu.UploadTool.esptool.upload.tool=esptool
-modwifi.menu.UploadTool.esptool.upload.verbose=-vv
-
 modwifi.menu.UploadSpeed.115200=115200
 modwifi.menu.UploadSpeed.115200.upload.speed=115200
 modwifi.menu.UploadSpeed.9600=9600
@@ -736,10 +690,6 @@ thing.menu.CpuFrequency.80.build.f_cpu=80000000L
 thing.menu.CpuFrequency.160=160 MHz
 thing.menu.CpuFrequency.160.build.f_cpu=160000000L
 
-thing.menu.UploadTool.esptool=Serial
-thing.menu.UploadTool.esptool.upload.tool=esptool
-thing.menu.UploadTool.esptool.upload.verbose=-vv
-
 thing.menu.UploadSpeed.115200=115200
 thing.menu.UploadSpeed.115200.upload.speed=115200
 thing.menu.UploadSpeed.9600=9600
@@ -789,10 +739,6 @@ thingdev.menu.CpuFrequency.80.build.f_cpu=80000000L
 thingdev.menu.CpuFrequency.160=160 MHz
 thingdev.menu.CpuFrequency.160.build.f_cpu=160000000L
 
-thingdev.menu.UploadTool.esptool=Serial
-thingdev.menu.UploadTool.esptool.upload.tool=esptool
-thingdev.menu.UploadTool.esptool.upload.verbose=-vv
-
 thingdev.menu.UploadSpeed.115200=115200
 thingdev.menu.UploadSpeed.115200.upload.speed=115200
 thingdev.menu.UploadSpeed.9600=9600
@@ -840,10 +786,6 @@ esp210.menu.CpuFrequency.80.build.f_cpu=80000000L
 esp210.menu.CpuFrequency.160=160 MHz
 esp210.menu.CpuFrequency.160.build.f_cpu=160000000L
 
-esp210.menu.UploadTool.esptool=Serial
-esp210.menu.UploadTool.esptool.upload.tool=esptool
-esp210.menu.UploadTool.esptool.upload.verbose=-vv
-
 esp210.menu.UploadSpeed.57600=57600
 esp210.menu.UploadSpeed.57600.upload.speed=57600
 esp210.menu.UploadSpeed.115200=115200
@@ -935,13 +877,6 @@ d1_mini.menu.CpuFrequency.80.build.f_cpu=80000000L
 d1_mini.menu.CpuFrequency.160=160 MHz
 d1_mini.menu.CpuFrequency.160.build.f_cpu=160000000L
 
-d1_mini.menu.UploadTool.esptool=Serial
-d1_mini.menu.UploadTool.esptool.upload.tool=esptool
-d1_mini.menu.UploadTool.esptool.upload.verbose=-vv
-
-d1_mini.menu.UploadTool.espota=OTA
-d1_mini.menu.UploadTool.espota.upload.tool=espota
-
 d1_mini.menu.UploadSpeed.921600=921600
 d1_mini.menu.UploadSpeed.921600.upload.speed=921600
 d1_mini.menu.UploadSpeed.115200=115200
@@ -1008,13 +943,6 @@ d1.menu.CpuFrequency.80.build.f_cpu=80000000L
 d1.menu.CpuFrequency.160=160 MHz
 d1.menu.CpuFrequency.160.build.f_cpu=160000000L
 
-d1.menu.UploadTool.esptool=Serial
-d1.menu.UploadTool.esptool.upload.tool=esptool
-d1.menu.UploadTool.esptool.upload.verbose=-vv
-
-d1.menu.UploadTool.espota=OTA
-d1.menu.UploadTool.espota.upload.tool=espota
-
 d1.menu.UploadSpeed.921600=921600
 d1.menu.UploadSpeed.921600.upload.speed=921600
 d1.menu.UploadSpeed.115200=115200
@@ -1078,12 +1006,6 @@ espino.build.spiffs_pagesize=256
 espino.build.debug_port=
 espino.build.debug_level=
 
-espino.menu.UploadTool.esptool=Serial
-espino.menu.UploadTool.esptool.upload.tool=esptool
-espino.menu.UploadTool.esptool.upload.verbose=-vv
-espino.menu.UploadTool.espota=OTA
-espino.menu.UploadTool.espota.upload.tool=espota
-
 espino.menu.CpuFrequency.80=80 MHz
 espino.menu.CpuFrequency.80.build.f_cpu=80000000L
 espino.menu.CpuFrequency.160=160 MHz
@@ -1161,12 +1083,6 @@ espinotee.menu.CpuFrequency.80.build.f_cpu=80000000L
 espinotee.menu.CpuFrequency.160=160 MHz
 espinotee.menu.CpuFrequency.160.build.f_cpu=160000000L
 
-espinotee.menu.UploadTool.esptool=Serial
-espinotee.menu.UploadTool.esptool.upload.tool=esptool
-espinotee.menu.UploadTool.esptool.upload.verbose=-vv
-espinotee.menu.UploadTool.espota=OTA
-espinotee.menu.UploadTool.espota.upload.tool=espota
-
 espinotee.menu.UploadSpeed.115200=115200
 espinotee.menu.UploadSpeed.115200.upload.speed=115200
 espinotee.menu.UploadSpeed.9600=9600
@@ -1301,12 +1217,6 @@ wifinfo.menu.ESPModule.ESP12.build.spiffs_blocksize=8192
 wifinfo.menu.ESPModule.ESP12.build.spiffs_pagesize=256
 wifinfo.menu.ESPModule.ESP12.upload.maximum_size=1044464
 
-wifinfo.menu.UploadTool.esptool=Serial
-wifinfo.menu.UploadTool.esptool.upload.tool=esptool
-wifinfo.menu.UploadTool.esptool.upload.verbose=-vv
-wifinfo.menu.UploadTool.espota=OTA
-wifinfo.menu.UploadTool.espota.upload.tool=espota
-
 wifinfo.menu.CpuFrequency.80=80 MHz
 wifinfo.menu.CpuFrequency.80.build.f_cpu=80000000L
 wifinfo.menu.CpuFrequency.160=160 MHz