Changes for ESP-IDF v4.0

- Before source'ing $IDF_PATH/export.sh, check if IDF_TOOLS_EXPORT_CMD is unset.  This means it hasn't been source'd yet.
- image-project assumes a particular target, config, and binary name.  If image.sh exists, assume that is a more appropriate replacement and run it instead.
- quick-build allows for quicker build iteration with less "safety"
- --release is no longer required, forward command-line flags like in PR #12 since it works just as well for --features as --release

Author: jeikabu

Dockerfile

@@ -144,7 +144,7 @@ ENV CARGO_HOME="${PROJECT}target/cargo"
 VOLUME "${PROJECT}"
 WORKDIR "${PROJECT}"
 
-COPY bindgen-project build-project create-project image-project xbuild-project flash-project /usr/local/bin/
+COPY bindgen-project build-project create-project image-project quick-build xbuild-project flash-project /usr/local/bin/
 COPY templates/ "${TEMPLATES}"
 
 CMD ["/usr/local/bin/build-project"]

build-project

@@ -2,6 +2,8 @@
 
 set -e
 
+[ -z "$IDF_TOOLS_EXPORT_CMD" ] && source "$IDF_PATH/export.sh"
+
 die() { echo "$*" 1>&2 ; exit 1 ; }
 
 test -f Cargo.toml || die "unable to find 'Cargo.toml'. You will need to map the container path /home/project to the path of your Rust project. You can do this using: docker run -ti -v $PWD:/home/project:z rust-esp"

flash-project

@@ -2,6 +2,8 @@
 
 set -e
 
+[ -z "$IDF_TOOLS_EXPORT_CMD" ] && source "$IDF_PATH/export.sh"
+
 "$IDF_PATH/components/esptool_py/esptool/esptool.py" \
      --chip esp32 \
      --port /dev/ttyUSB0 \

image-project

@@ -2,10 +2,18 @@
 
 set -e
 
-"${IDF_PATH}/components/esptool_py/esptool/esptool.py" \
-     --chip esp32 \
-     elf2image \
-     -o build/esp-app.bin \
-     target/xtensa-esp32-none-elf/release/esp-app
+[ -z "$IDF_TOOLS_EXPORT_CMD" ] && source "$IDF_PATH/export.sh"
+
+if [ -x ./image.sh ]
+then
+     # If available, use script generated by esp_idf_build::esptool_write_script()
+     . ./image.sh
+else
+     "${IDF_PATH}/components/esptool_py/esptool/esptool.py" \
+          --chip esp32 \
+          elf2image \
+          -o build/esp-app.bin \
+          target/xtensa-esp32-none-elf/release/esp-app
+fi
 
 echo "You can now flash 'build/esp-app.bin'"

quick-build

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -e
+
+[ -z "$IDF_TOOLS_EXPORT_CMD" ] && source "$IDF_PATH/export.sh"
+
+xbuild-project "$@"
+image-project
+
+echo Build complete

xbuild-project

@@ -2,4 +2,4 @@
 
 set -e
 
-cargo +xtensa xbuild --target "${XARGO_TARGET:-xtensa-esp32-none-elf}" --release
+cargo +xtensa xbuild --target "${XARGO_TARGET:-xtensa-esp32-none-elf}" "$@"