From 9d9c62ed28083439ffdd52c530550e2634092268 Mon Sep 17 00:00:00 2001
From: Sandeep Mistry <sandeep.mistry@gmail.com>
Date: Tue, 31 Mar 2015 19:39:34 -0400
Subject: [PATCH 1/2] remove trailing whitespace

---
 README.md    | 14 +++++++-------
 platform.txt |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 6bdbe0dc9..ad87537a1 100644
--- a/README.md
+++ b/README.md
@@ -37,17 +37,17 @@ GPIO16 can be ```INPUT``` or ```OUTPUT```.
 
 ```analogRead(0)``` reads the value of the ADC channel connected to the TOUT pin.
 
-Pin interrupts are supported through ```attachInterrupt```, ```detachInterrupt``` functions. 
-Interrupts may be attached to any GPIO pin, except GPIO16. Standard Arduino interrupt 
+Pin interrupts are supported through ```attachInterrupt```, ```detachInterrupt``` functions.
+Interrupts may be attached to any GPIO pin, except GPIO16. Standard Arduino interrupt
 types are supported: ```CHANGE```, ```RISING```, ```FALLING```.
 
 #### Timing and delays ####
-```millis``` and ```micros``` return the number of milliseconds and microseconds elapsed after reset, respectively. 
+```millis``` and ```micros``` return the number of milliseconds and microseconds elapsed after reset, respectively.
 
 ```delay``` pauses the sketch for a given number of milliseconds and allows WiFi and TCP/IP tasks to run.
 ```delayMicroseconds``` pauses for a given number of microseconds.
 
-Remember that there is a lot of code that needs to run on the chip besides the sketch 
+Remember that there is a lot of code that needs to run on the chip besides the sketch
 when WiFi is connected. WiFi and TCP/IP libraries get a chance to handle any pending
 events each time the ```loop()``` function completes, OR when ```delay(...)``` is called.
 If you have a loop somewhere in your sketch that takes a lot of time (>50ms) without
@@ -62,7 +62,7 @@ more than 20 milliseconds is not recommended.
 
 ```Serial``` object works much the same way as on a regular Arduino. Apart from hardware FIFO (128 bytes for TX and RX) HardwareSerial has additional 256-byte TX and RX buffers. Both transmit and receive is interrupt-driven. Write and read functions only block the sketch execution when the respective FIFO/buffers are full/empty.
 
-Only 8n1 mode is supported right now. 
+Only 8n1 mode is supported right now.
 
 By default the diagnostic output from WiFi libraries is disabled when you call ```Serial.begin```. To enable debug output again, call ```Serial.setDebugOutput(true);```
 
@@ -93,7 +93,7 @@ Size can be anywhere between 4 and 4096 bytes.
 
 ```EEPROM.write``` does not write to flash immediately, instead you must call ```EEPROM.commit()```
 whenever you wish to save changes to flash. ```EEPROM.end()``` will also commit, and will
-release the RAM copy of EEPROM contents. 
+release the RAM copy of EEPROM contents.
 
 Three examples included.
 
@@ -125,7 +125,7 @@ Libraries that don't rely on low-level access to AVR registers should work well.
 
 #### Upload via serial port ####
 Select "esptool" as a programmer, and pick the correct serial port.
-You need to put ESP8266 into bootloader mode before uploading code (pull GPIO0 low and 
+You need to put ESP8266 into bootloader mode before uploading code (pull GPIO0 low and
 toggle power).
 
 ### Things not done yet ###
diff --git a/platform.txt b/platform.txt
index 54b68832c..7dd38f590 100644
--- a/platform.txt
+++ b/platform.txt
@@ -26,7 +26,7 @@ compiler.c.elf.cmd=xtensa-lx106-elf-gcc
 compiler.c.elf.libs=-lc -lgcc -lhal -lphy -lnet80211 -llwip -lwpa -lmain -lpp
 
 compiler.cpp.cmd=xtensa-lx106-elf-g++
-compiler.cpp.flags=-c -Os -mlongcalls -mtext-section-literals -fno-exceptions -fno-rtti -std=c++11 -MMD 
+compiler.cpp.flags=-c -Os -mlongcalls -mtext-section-literals -fno-exceptions -fno-rtti -std=c++11 -MMD
 
 compiler.as.cmd=xtensa-lx106-elf-as
 
@@ -66,7 +66,7 @@ recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.fla
 recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{build.path}/{archive_file}" "{object_file}"
 
 ## Combine gc-sections, archives, and objects
-recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" -Wl,--start-group {object_files} "{build.path}/{archive_file}" {compiler.c.elf.libs} -Wl,--end-group "-L{build.path}" 
+recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" -Wl,--start-group {object_files} "{build.path}/{archive_file}" {compiler.c.elf.libs} -Wl,--end-group "-L{build.path}"
 
 ## Create eeprom
 recipe.objcopy.eep.pattern=
@@ -89,6 +89,6 @@ tools.esptool.cmd.windows=esptool.exe
 tools.esptool.path={runtime.ide.path}/hardware/tools/esp8266
 
 tools.esptool.program.params.verbose=-vv
-tools.esptool.program.params.quiet= 
+tools.esptool.program.params.quiet=
 tools.esptool.program.pattern="{path}/{cmd}" {program.verbose} -cd {upload.resetmethod} -cb {upload.speed} -cp {serial.port} -ca 0x00000 -cf "{build.path}/{build.project_name}_00000.bin" -ca 0x40000 -cf "{build.path}/{build.project_name}_40000.bin"
 

From 187080f40a19e6090866565f125c63672bd26925 Mon Sep 17 00:00:00 2001
From: Sandeep Mistry <sandeep.mistry@gmail.com>
Date: Tue, 31 Mar 2015 19:43:49 -0400
Subject: [PATCH 2/2] remove the need to set programmer, by setting upload tool

---
 README.md       | 2 +-
 boards.txt      | 2 ++
 platform.txt    | 7 ++++---
 programmers.txt | 6 ------
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index ad87537a1..330d8aae9 100644
--- a/README.md
+++ b/README.md
@@ -124,7 +124,7 @@ Libraries that don't rely on low-level access to AVR registers should work well.
 
 
 #### Upload via serial port ####
-Select "esptool" as a programmer, and pick the correct serial port.
+Pick the correct serial port.
 You need to put ESP8266 into bootloader mode before uploading code (pull GPIO0 low and
 toggle power).
 
diff --git a/boards.txt b/boards.txt
index d070048fb..cad4c27d4 100644
--- a/boards.txt
+++ b/boards.txt
@@ -13,6 +13,7 @@ esp01.build.board=ESP8266_ESP01
 esp01.build.core=esp8266
 esp01.build.variant=esp01
 
+esp01.upload.tool=esptool
 
 ##############################################################
 wifio.name=WIFIO
@@ -29,3 +30,4 @@ wifio.build.board=ESP8266_WIFIO
 wifio.build.core=esp8266
 wifio.build.variant=wifio
 
+wifio.upload.tool=esptool
diff --git a/platform.txt b/platform.txt
index 7dd38f590..27e0cf669 100644
--- a/platform.txt
+++ b/platform.txt
@@ -88,7 +88,8 @@ tools.esptool.cmd=esptool
 tools.esptool.cmd.windows=esptool.exe
 tools.esptool.path={runtime.ide.path}/hardware/tools/esp8266
 
-tools.esptool.program.params.verbose=-vv
-tools.esptool.program.params.quiet=
-tools.esptool.program.pattern="{path}/{cmd}" {program.verbose} -cd {upload.resetmethod} -cb {upload.speed} -cp {serial.port} -ca 0x00000 -cf "{build.path}/{build.project_name}_00000.bin" -ca 0x40000 -cf "{build.path}/{build.project_name}_40000.bin"
+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}_00000.bin" -ca 0x40000 -cf "{build.path}/{build.project_name}_40000.bin"
 
diff --git a/programmers.txt b/programmers.txt
index 5be88335a..e69de29bb 100644
--- a/programmers.txt
+++ b/programmers.txt
@@ -1,6 +0,0 @@
-esptool.name=esptool
-esptool.communication=serial
-esptool.protocol=esp
-esptool.program.protocol=esp
-esptool.program.tool=esptool
-esptool.program.extra_params=