From d6370f7dc35e499385e4df80f50c5846e87e734a Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <igrokhotkov@gmail.com>
Date: Mon, 22 Dec 2014 18:43:20 +0300
Subject: [PATCH] Use esptool-ck for flashing

---
 hardware/arduino/esp8266/boards.txt      |  2 +-
 hardware/arduino/esp8266/platform.txt    |  8 ++++----
 hardware/arduino/esp8266/programmers.txt | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/hardware/arduino/esp8266/boards.txt b/hardware/arduino/esp8266/boards.txt
index 8f9340160..cf7ebb3d0 100644
--- a/hardware/arduino/esp8266/boards.txt
+++ b/hardware/arduino/esp8266/boards.txt
@@ -1,7 +1,7 @@
 ##############################################################
 esp01.name=ESP-01
 
-esp01.upload.tool=esptoolpy
+esp01.upload.tool=esptool
 esp01.upload.speed=115200
 esp01.upload.wait_for_upload_port=true
 
diff --git a/hardware/arduino/esp8266/platform.txt b/hardware/arduino/esp8266/platform.txt
index ab9179bcd..72b56c295 100644
--- a/hardware/arduino/esp8266/platform.txt
+++ b/hardware/arduino/esp8266/platform.txt
@@ -80,9 +80,9 @@ recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
 
 # ------------------------------
 
-tools.esptoolpy.cmd.path={runtime.ide.path}/hardware/tools/esp8266/espflash
+tools.esptool.cmd.path={runtime.ide.path}/hardware/tools/esp8266/esptool
 
-tools.esptoolpy.program.params.verbose=
-tools.esptoolpy.program.params.quiet=
-tools.esptoolpy.program.pattern="{cmd.path}" --port={serial.port} write_flash 0x00000 "{build.path}/{build.project_name}_00000.bin" 0x40000 "{build.path}/{build.project_name}_40000.bin"
+tools.esptool.program.params.verbose=-v -v
+tools.esptool.program.params.quiet=-q
+tools.esptool.program.pattern="{cmd.path}" -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/hardware/arduino/esp8266/programmers.txt b/hardware/arduino/esp8266/programmers.txt
index 4e4d90e67..5be88335a 100644
--- a/hardware/arduino/esp8266/programmers.txt
+++ b/hardware/arduino/esp8266/programmers.txt
@@ -1,6 +1,6 @@
-esptoolpy.name=esptool
-esptoolpy.communication=serial
-esptoolpy.protocol=esp
-esptoolpy.program.protocol=esp
-esptoolpy.program.tool=esptoolpy
-esptoolpy.program.extra_params=
+esptool.name=esptool
+esptool.communication=serial
+esptool.protocol=esp
+esptool.program.protocol=esp
+esptool.program.tool=esptool
+esptool.program.extra_params=