diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 4d72ef3..7e4feeb 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -48,4 +48,10 @@ 1.2-dev-1 fixed small presentation bugs added Sillyfilly-espdumper submodule - added `--preview` to several idf.py commands to use the very latest and esp32c5 \ No newline at end of file + added `--preview` to several idf.py commands to use the very latest and esp32c5 + +1.3-dev-0 + renamed rebuildfull to rebuild-interactive + set rebuild-interactive to fail on any error + added rebuild-auto-flashmonitor to quickly fullclean, set up with defaults and $ESPTARGET, then flashmonitor, failing on any error + more information and better details on espinfo diff --git a/custom_bin/espinfo b/custom_bin/espinfo index e2be0a5..82f4d28 100644 --- a/custom_bin/espinfo +++ b/custom_bin/espinfo @@ -1,15 +1,17 @@ -echo "esp-idf-tools install dir: $ESPIDFTOOLS_INSTALLDIR" +echo "esp-idf-tools install dir (\$ESPIDFTOOLS_INSTALLDIR): $ESPIDFTOOLS_INSTALLDIR" echo "esp-idf-tools custom_bin dir: $ESPIDFTOOLS_INSTALLDIR/.custom_bin/" +echo "tools:" +ls "$ESPIDFTOOLS_INSTALLDIR/.custom_bin/" echo "esp-idf-tools version: $(cat $ESPIDFTOOLS_INSTALLDIR/.custom_bin/version.txt)" echo "esp-idf-tools last install: $(tail -1 $ESPIDFTOOLS_INSTALLDIR/version-data.log)" -echo "esp-idf path: $IDF_PATH" -echo "esp-idf version: $ESP_IDF_VERSION" -echo "esp-idf python path: $IDF_PYTHON_ENV_PATH" -echo "openocd scripts: $OPENOCD_SCRIPTS" -echo "esp-idf rom elf dir: $ESP_ROM_ELF_DIR" -echo "esp-idf-deactivate file path $IDF_DEACTIVATE_FILE_PATH" -echo "esp-idf install cmd: $IDF_TOOLS_INSTALL_CMD" -echo "esp-idf export cmd: $IDF_TOOLS_EXPORT_CMD"es -echo "port: $ESPPORT" -echo "baud: $ESPBAUD" -echo "target device: $ESPTARGET" \ No newline at end of file +echo "esp-idf path (\$IDF_PATH): $IDF_PATH" +echo "esp-idf version (\$ESP_IDF_VERSION): $ESP_IDF_VERSION" +echo "esp-idf python path (\$IDF_PYTHON_ENV_PATH): $IDF_PYTHON_ENV_PATH" +echo "openocd scripts (\$OPENOCD_SCRIPTS): $OPENOCD_SCRIPTS" +echo "esp-idf rom elf dir (\$ESP_ROM_ELF_DIR): $ESP_ROM_ELF_DIR" +echo "esp-idf-deactivate file path (\$IDF_DEACTIVATE_FILE_PATH): $IDF_DEACTIVATE_FILE_PATH" +echo "esp-idf install cmd (\$IDF_TOOLS_INSTALL_CMD): $IDF_TOOLS_INSTALL_CMD" +echo "esp-idf export cmd (\$IDF_TOOLS_EXPORT_CMD): $IDF_TOOLS_EXPORT_CMD" +echo "port (\$ESPPORT): $ESPPORT" +echo "baud (\$ESPBAUD): $ESPBAUD" +echo "target device (\$ESPTARGET): $ESPTARGET" \ No newline at end of file diff --git a/custom_bin/flashmonitor b/custom_bin/flashmonitor index 1e80959..ce9d09e 100644 --- a/custom_bin/flashmonitor +++ b/custom_bin/flashmonitor @@ -1,4 +1,12 @@ #!/bin/bash +set -e # no continue on errrrrrrr + echo -e "\nFlashing and Monitoring for $ESPTARGET on $ESPPORT\n" + +# if tehre is no CMakeLists.txt in cwd, setup to defaults with idf.py set-target and not setup as that goes through menuconfig +if [ ! -f "./CMakeLists.txt" ]; then + idf.py set-target $ESPTARGET +done + idf.py --preview flash monitor echo -e "\nAll done :3\n" \ No newline at end of file diff --git a/custom_bin/rebuild-auto-flashmonitor b/custom_bin/rebuild-auto-flashmonitor new file mode 100644 index 0000000..4b2b6c0 --- /dev/null +++ b/custom_bin/rebuild-auto-flashmonitor @@ -0,0 +1,10 @@ +#!/bin/bash +echo -e "\nFully Rebuildan~\n" + +echo -e "\nFully cleaninnn\n" +bash fullclean + +echo -e "\nSetting up project for $ESPTARGET\n" +idf.py --preview set-target $ESPTARGET # using idf.py set-target because it sticks to all defaults and doesnt do menuconfig like setup + +bash flashmonitor \ No newline at end of file diff --git a/custom_bin/rebuildfull b/custom_bin/rebuild-interactive similarity index 97% rename from custom_bin/rebuildfull rename to custom_bin/rebuild-interactive index 8df1c32..2f89782 100644 --- a/custom_bin/rebuildfull +++ b/custom_bin/rebuild-interactive @@ -1,4 +1,6 @@ #!/bin/bash +set -e # fail on any error + echo -e "\nFully Rebuildan~\n" bash fullclean diff --git a/help.txt b/help.txt index 1dbf1ce..33534b3 100644 --- a/help.txt +++ b/help.txt @@ -90,6 +90,7 @@ Features: `clean` idf.py clean `fullclean` fully resets a project, 'idf.py fullclean' plus remove the build dir and delete some temp and backup files `rebuildfull` does a `fullclean` but also an `erase-flash` and also `setup` + rebuild-flash-monitor does a `fullclean` then `idf.py set-target` and finally `flashmonitor` `setup` same as running `idf.py set-target $ESPTARGET; idf.py menuconfig; idf.py build` `flash` idf.py flash `monitor` idf.py monitor diff --git a/version.txt b/version.txt index 0f0b5bc..0bbffa9 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.2-dev-1 \ No newline at end of file +1.3-dev-0 \ No newline at end of file