Merge pull request #3 from esp8266/esp8266

pull master

Author: me-no-dev

build/build.xml

@@ -428,15 +428,15 @@
       <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/" />
     </antcall>
 
-    
+
     <antcall target="untar">
-      <param name="archive_file" value="${staging_folder}/esptool-0.4.5-osx.tar.gz" />
-      <param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.5/esptool-0.4.5-osx.tar.gz" />
-      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.5-osx" />
+      <param name="archive_file" value="${staging_folder}/esptool-0.4.6-osx.tar.gz" />
+      <param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.6/esptool-0.4.6-osx.tar.gz" />
+      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.6-osx" />
       <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/" />
     </antcall>
-    <move file="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.5-osx/esptool" tofile="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool" />
-    <delete dir="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.5-osx/" />
+    <move file="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.6-osx/esptool" tofile="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool" />
+    <delete dir="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.6-osx/" />
 
   </target>
 
@@ -713,13 +713,13 @@
     </antcall>
 
     <antcall target="untar">
-      <param name="archive_file" value="${staging_folder}/esptool-0.4.5-linux64.tar.gz" />
-      <param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.5/esptool-0.4.5-linux64.tar.gz" />
-      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.5-linux64" />
+      <param name="archive_file" value="${staging_folder}/esptool-0.4.6-linux64.tar.gz" />
+      <param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.6/esptool-0.4.6-linux64.tar.gz" />
+      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.6-linux64" />
       <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/" />
     </antcall>
-    <move file="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.5-linux64/esptool" tofile="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool" />
-    <delete dir="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.5-linux64/" />
+    <move file="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.6-linux64/esptool" tofile="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool" />
+    <delete dir="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.6-linux64/" />
 
   </target>
 
@@ -970,24 +970,24 @@
     <antcall target="package-library-index-json-bundle"/>
 
     <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools" />
-	
+
   	<antcall target="untar">
       <param name="archive_file" value="${staging_folder}/dist/win32-xtensa-lx106-elf-gb404fb9-2.tgz" />
       <param name="archive_url" value="http://download.igrr.me/win32-xtensa-lx106-elf-gb404fb9-2.tgz" />
       <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/xtensa-lx106-elf" />
       <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/" />
     </antcall>
-	
+
 
     <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/esptool-0.4.5-win32.zip" />
-      <param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.5/esptool-0.4.5-win32.zip" />
-      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.5-win32" />
+      <param name="archive_file" value="${staging_folder}/esptool-0.4.6-win32.zip" />
+      <param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.6/esptool-0.4.6-win32.zip" />
+      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.6-win32" />
       <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/" />
     </antcall>
-    <copy file="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.5-win32/esptool.exe" tofile="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool.exe" />
-    <delete dir="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.5-win32/" />
- 
+    <copy file="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.6-win32/esptool.exe" tofile="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool.exe" />
+    <delete dir="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.6-win32/" />
+
   </target>
 
   <target name="windows-run" depends="build"

build/linux/esptool-0.4.5-linux64.tar.gz.sha

@@ -0,0 +1 @@
+2c5cf6f655813182d786b759456c8b9ea989881e

build/linux/esptool-0.4.6-linux64.tar.gz.sha

@@ -0,0 +1 @@
+0fef818f1def23b63791432fd631aa030e9be79a

build/macosx/esptool-0.4.5-osx.tar.gz.sha

@@ -0,0 +1 @@
+a2380a8f66b88e1166a9e4742013d672a49dfd43

build/macosx/esptool-0.4.6-osx.tar.gz.sha

@@ -232,7 +232,7 @@ nodemcuv2.name=NodeMCU 1.0 (ESP-12E Module)
 
 nodemcuv2.upload.tool=esptool
 nodemcuv2.upload.speed=115200
-nodemcuv2.upload.resetmethod=ck
+nodemcuv2.upload.resetmethod=nodemcu
 nodemcuv2.upload.maximum_size=1044464
 nodemcuv2.upload.maximum_data_size=81920
 nodemcuv2.upload.wait_for_upload_port=true