Remove all esptool-ck.exe, hook Windows Python

earlephilhower · earlephilhower · commit b630df3ebe2e · 2019-01-19T15:16:50.000-08:00
Remove all references to esptool-ck and use Python on Windows and Linux
for all recipes where possible.
diff --git a/package/package_esp8266com_index.template.json b/package/package_esp8266com_index.template.json
@@ -107,11 +107,6 @@
                   }
                ],
                "toolsDependencies": [
-                  {
-                     "packager": "esp8266",
-                     "version": "2.5.0-3-20ed2b9",
-                     "name": "esptool"
-                  },
                   {
                      "packager": "esp8266",
                      "version": "2.5.0-3-20ed2b9",
@@ -260,54 +255,6 @@
                   }
                ]
             },
-            {
-               "version": "2.5.0-3-20ed2b9",
-               "name": "esptool",
-               "systems": [
-                  {
-                     "host": "aarch64-linux-gnu",
-                     "url": "https://github.com/earlephilhower/esp-quick-toolchain/releases/download/2.5.0-3/aarch64-linux-gnu.esptool-f80ae31.tar.gz",
-                     "archiveFileName": "aarch64-linux-gnu.esptool-f80ae31.tar.gz",
-                     "checksum": "SHA-256:888425ff1e33a97ea155b6f128de6b578c34468895ba9b4acd1e4f28608d917a",
-                     "size": "14681"
-                  },
-                  {
-                     "host": "arm-linux-gnueabihf",
-                     "url": "https://github.com/earlephilhower/esp-quick-toolchain/releases/download/2.5.0-3/arm-linux-gnueabihf.esptool-f80ae31.tar.gz",
-                     "archiveFileName": "arm-linux-gnueabihf.esptool-f80ae31.tar.gz",
-                     "checksum": "SHA-256:71c878ac6a21ee69dcd615cd28f2dccd29a87079e0b3069eba625089d89e5058",
-                     "size": "13873"
-                  },
-                  {
-                     "host": "i686-mingw32",
-                     "url": "https://github.com/earlephilhower/esp-quick-toolchain/releases/download/2.5.0-3/i686-w64-mingw32.esptool-f80ae31.zip",
-                     "archiveFileName": "i686-w64-mingw32.esptool-f80ae31.zip",
-                     "checksum": "SHA-256:e30f25a19a78635000401b083b479e111d591bac20cfd89b1bfdf36a60e9ee20",
-                     "size": "16466"
-                  },
-                  {
-                     "host": "x86_64-apple-darwin",
-                     "url": "https://github.com/earlephilhower/esp-quick-toolchain/releases/download/2.5.0-3/x86_64-apple-darwin14.esptool-f80ae31.tar.gz",
-                     "archiveFileName": "x86_64-apple-darwin14.esptool-f80ae31.tar.gz",
-                     "checksum": "SHA-256:0f51e487706a476b0b87299a769282ad65623774770655168a79d1748d2506e7",
-                     "size": "15003"
-                  },
-                  {
-                     "host": "x86_64-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/esp-quick-toolchain/releases/download/2.5.0-3/x86_64-linux-gnu.esptool-f80ae31.tar.gz",
-                     "archiveFileName": "x86_64-linux-gnu.esptool-f80ae31.tar.gz",
-                     "checksum": "SHA-256:bded1dca953377838b6086a9bcd40a1dc5286ba5f69f2372c22a1d1819baad24",
-                     "size": "16526"
-                  },
-                  {
-                     "host": "x86_64-mingw32",
-                     "url": "https://github.com/earlephilhower/esp-quick-toolchain/releases/download/2.5.0-3/x86_64-w64-mingw32.esptool-f80ae31.zip",
-                     "archiveFileName": "x86_64-w64-mingw32.esptool-f80ae31.zip",
-                     "checksum": "SHA-256:d6d5976fde82d07e93d5a01f38bbb4f84a7796187ff0541ee62650041791d0e8",
-                     "size": "19724"
-                  }
-               ]
-            },
             {
                "version": "2.5.0-3-20ed2b9",
                "name": "xtensa-lx106-elf-gcc",
@@ -409,4 +356,4 @@
          "name": "esp8266"
       }
    ]
-}
+}
diff --git a/platform.txt b/platform.txt
@@ -11,6 +11,10 @@ version=2.5.0-dev
 runtime.tools.xtensa-lx106-elf-gcc.path={runtime.platform.path}/tools/xtensa-lx106-elf
 runtime.tools.esptool.path={runtime.platform.path}/tools/esptool
 runtime.tools.signing={runtime.platform.path}/tools/signing.py
+runtime.tools.elf2bin={runtime.platform.path}/tools/elf2bin.py
+runtime.tools.eboot={runtime.platform.path}/bootloaders/eboot/eboot.elf
+runtime.tools.python=python
+runtime.tools.python.windows={runtime.platform.path}/tools/python/python.exe
 
 compiler.warning_flags=-w
 compiler.warning_flags.none=-w
@@ -76,7 +80,7 @@ compiler.elf2hex.extra_flags=
 
 ## generate file with git version number
 ## needs bash, git, and echo
-recipe.hooks.core.prebuild.1.pattern=python "{runtime.tools.signing}" --mode header --publickey "{build.source.path}/public.key" --out "{build.path}/core/Updater_Signing.h"
+recipe.hooks.core.prebuild.1.pattern="{runtime.tools.python}" "{runtime.tools.signing}" --mode header --publickey "{build.source.path}/public.key" --out "{build.path}/core/Updater_Signing.h"
 recipe.hooks.core.prebuild.2.pattern=bash -c "mkdir -p {build.path}/core && echo \#define ARDUINO_ESP8266_GIT_VER 0x`git --git-dir {runtime.platform.path}/.git rev-parse --short=8 HEAD 2>/dev/null || echo ffffffff` >{build.path}/core/core_version.h"
 recipe.hooks.core.prebuild.3.pattern=bash -c "mkdir -p {build.path}/core && echo \#define ARDUINO_ESP8266_GIT_DESC `cd "{runtime.platform.path}"; git describe --tags 2>/dev/null || echo unix-{version}` >>{build.path}/core/core_version.h"
 
@@ -107,14 +111,8 @@ recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {build.exception_
 recipe.objcopy.eep.pattern=
 
 ## Create hex
-#recipe.objcopy.hex.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.hex"
-
-recipe.objcopy.hex.1.pattern="{runtime.tools.esptool.path}/{compiler.esptool.cmd}" -eo "{runtime.platform.path}/bootloaders/eboot/eboot.elf" -bo "{build.path}/{build.project_name}.bin" -bm {build.flash_mode} -bf {build.flash_freq} -bz {build.flash_size} -bs .text -bp 4096 -ec -eo "{build.path}/{build.project_name}.elf" -bs .irom0.text -bs .text -bs .data -bs .rodata -bc -ec
-recipe.objcopy.hex.2.pattern=python "{runtime.tools.signing}" --mode sign --privatekey "{build.source.path}/private.key" --bin "{build.path}/{build.project_name}.bin" --out "{build.path}/{build.project_name}.bin.signed"
-
-# No signing on Windows
-recipe.objcopy.hex.1.pattern.windows="{runtime.tools.esptool.path}/{compiler.esptool.cmd}" -eo "{runtime.platform.path}/bootloaders/eboot/eboot.elf" -bo "{build.path}/{build.project_name}.bin" -bm {build.flash_mode} -bf {build.flash_freq} -bz {build.flash_size} -bs .text -bp 4096 -ec -eo "{build.path}/{build.project_name}.elf" -bs .irom0.text -bs .text -bs .data -bs .rodata -bc -ec
-recipe.objcopy.hex.2.pattern.windows=
+recipe.objcopy.hex.1.pattern="{runtime.tools.python}" "{runtime.tools.elf2bin}" --eboot "{runtime.tools.eboot}" --app "{build.path}/{build.project_name}.elf" --flash_mode {build.flash_mode} --flash_freq {build.flash_freq} --flash_size {build.flash_size} --path "{runtime.tools.xtensa-lx106-elf-gcc.path}/bin" --out "{build.path}/{build.project_name}.bin"
+recipe.objcopy.hex.2.pattern="{runtime.tools.python}" "{runtime.tools.signing}" --mode sign --privatekey "{build.source.path}/private.key" --bin "{build.path}/{build.project_name}.bin" --out "{build.path}/{build.project_name}.bin.signed"
 
 ## Save hex
 recipe.output.tmp_file={build.project_name}.bin
@@ -128,17 +126,18 @@ recipe.size.regex.data=^(?:\.data|\.rodata|\.bss)\s+([0-9]+).*
 
 # ------------------------------
 
-tools.esptool.cmd=esptool
-tools.esptool.cmd.windows=esptool.exe
-tools.esptool.path={runtime.platform.path}/tools/esptool
+# Need to duplicate the python path because Arduino does not replace properly in this stage
+tools.esptool.cmd=python
+tools.esptool.cmd.windows={runtime.platform.path}/tools/python/python.exe
+tools.esptool.path=
 tools.esptool.network_cmd=python
-tools.esptool.network_cmd.windows=python.exe
+tools.esptool.network_cmd.windows={runtime.platform.path}/tools/python/python.exe
 
 tools.esptool.upload.protocol=esp
 tools.esptool.upload.params.verbose=--trace
 tools.esptool.upload.params.quiet=
 
-tools.esptool.upload.pattern="python" -c "import sys; sys.path.append('{runtime.platform.path}/tools/pyserial'); execfile('{runtime.platform.path}/tools/esptool/esptool.py')" --chip esp8266 --port "{serial.port}" --baud "{upload.speed}" "{upload.verbose}" write_flash 0x0 "{build.path}/{build.project_name}.bin"
+tools.esptool.upload.pattern="{cmd}" -c "import sys; sys.path.append('{runtime.platform.path}/tools/pyserial'); execfile('{runtime.platform.path}/tools/esptool/esptool.py')" --chip esp8266 --port "{serial.port}" --baud "{upload.speed}" "{upload.verbose}" write_flash 0x0 "{build.path}/{build.project_name}.bin"
 
 tools.esptool.upload.network_pattern="{network_cmd}" "{runtime.platform.path}/tools/espota.py" -i "{serial.port}" -p "{network.port}" "--auth={network.password}" -f "{build.path}/{build.project_name}.bin"
 
diff --git a/tools/elf2bin.py b/tools/elf2bin.py
@@ -22,9 +22,10 @@
 import re
 import os
 import subprocess
+import sys
 import tempfile
 
-fmodeb = { 'DOUT': 3, 'DIO': 2, 'QOUT': 1, 'QIO': 0 }
+fmodeb = { 'dout': 3, 'dio': 2, 'quot': 1, 'qio': 0 }
 ffreqb = { '40': 0, '26': 1, '20': 2, '80': 15 }
 fsizeb = { '512K': 0, '256K': 1, '1M': 2, '2M': 3, '4M': 4, '8M': 8, '16M': 9 }
 
@@ -87,21 +88,27 @@ def write_bin(out, elf, segments, to_addr, flash_mode, flash_size, flash_freq, p
         while total_size < to_addr:
             out.write(bytearray([0xaa]))
             total_size += 1
+def main():
+    parser = argparse.ArgumentParser(description='Create a BIN file from eboot.elf and Arduino sketch.elf for upload by esptool.py')
+    parser.add_argument('-e', '--eboot', action='store', required=True, help='Path to the Arduino eboot.elf bootloader')
+    parser.add_argument('-a', '--app', action='store', required=True, help='Path to the Arduino sketch ELF')
+    parser.add_argument('-m', '--flash_mode', action='store', required=True, choices=['dout', 'dio', 'qout', 'qio'], help='SPI flash mode')
+    parser.add_argument('-f', '--flash_freq', action='store', required=True, choices=['20', '26', '40', '80'], help='SPI flash speed')
+    parser.add_argument('-s', '--flash_size', action='store', required=True, choices=['256K', '512K', '1M', '2M', '4M', '8M', '16M'], help='SPI flash size')
+    parser.add_argument('-o', '--out', action='store', required=True, help='Output BIN filename')
+    parser.add_argument('-p', '--path', action='store', required=True, help='Path to Xtensa toolchain binaries')
 
-parser = argparse.ArgumentParser(description='Create a BIN file from eboot.elf and Arduino sketch.elf for upload by esptool.py')
-parser.add_argument('-e', '--eboot', action='store', required=True, help='Path to the Arduino eboot.elf bootloader')
-parser.add_argument('-a', '--app', action='store', required=True, help='Path to the Arduino sketch ELF')
-parser.add_argument('-m', '--flash_mode', action='store', required=True, choices=['DOUT', 'DIO', 'QOUT', 'QIO'], help='SPI flash mode')
-parser.add_argument('-f', '--flash_freq', action='store', required=True, choices=['20', '26', '40', '80'], help='SPI flash speed')
-parser.add_argument('-s', '--flash_size', action='store', required=True, choices=['256K', '512K', '1M', '2M', '4M', '8M', '16M'], help='SPI flash size')
-parser.add_argument('-o', '--out', action='store', required=True, help='Output BIN filename')
-parser.add_argument('-p', '--path', action='store', required=True, help='Path to Xtensa toolchain binaries')
+    args = parser.parse_args()
 
-args = parser.parse_args()
+    print 'Creating BIN file "' + args.out + '" using "' + args.app + '"'
 
-print 'Creating BIN file "' + args.out + '" using "' + args.app + '"'
+    out = open(args.out, "wb")
+    write_bin(out, args.eboot, ['.text'], 4096, args.flash_mode, args.flash_size, args.flash_freq, args.path)
+    write_bin(out, args.app, ['.irom0.text', '.text', '.data', '.rodata'], 0, args.flash_mode, args.flash_size, args.flash_freq, args.path)
+    out.close()
 
-out = open(args.out, "wb")
-write_bin(out, args.eboot, ['.text'], 4096, args.flash_mode, args.flash_size, args.flash_freq, args.path)
-write_bin(out, args.app, ['.irom0.text', '.text', '.data', '.rodata'], 0, args.flash_mode, args.flash_size, args.flash_freq, args.path)
-out.close()
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(main())
