diff --git a/add-to-export-sh.txt b/add-to-export-sh.txt index 31eee38..708f097 100644 --- a/add-to-export-sh.txt +++ b/add-to-export-sh.txt @@ -31,7 +31,7 @@ echo -e "\nEnter TTY Number You'd Like:" read tty ttyselect=$devarr[(($tty+1))] -echo -e "Set esp target:\n\tOne of: esp32, esp32s2, esp32c3, esp32s3, esp32c2, esp32c6, esp32h2, esp32p4, linux, esp32c5, or esp32c61" +echo -e "Set esp target:\n\tOne of: esp32, esp32s2, esp32c3, esp32s3, esp32c2, esp32c6, esp32h2, esp32p4, linux, esp32c5, esp32c61, or esp8266" read esp # echo -e "\nSetting environment variables\n" diff --git a/custom_bin/rebuildfull b/custom_bin/rebuildfull index e5b62f6..1dc8308 100644 --- a/custom_bin/rebuildfull +++ b/custom_bin/rebuildfull @@ -19,14 +19,33 @@ read menuconfig if [ "$menuconfig" == "y" ]; then echo -e "\nExecuting menuconfig\n" idf.py menuconfig + echo -e "\nConfig Complete\n" fi -echo -e "\nBuild now? y/n" -read build -if [ "$build" == "y" ]; then - echo -e "\nBuildan~\n" - idf.py build - echo -e "\nBuild complete\n" +echo -e "\nSave as Default Config? y/n?\n" +read defconfig +if [ "$defconfig" == "y" ]; then + echo -e "\nExecuting save-defconfig\n" + idf.py save-defconfig + echo -e "\nDefault Config Saved\n" +fi + +echo -e "\nBuild, Flash, and Monitor Now? y/n" +read flashmon +if [ "$flashmon" == "y" ]; then + echo -e "\nBuild, Flashing, and Monitoran~\n" + echo -e "\nFlashed... Short Delay Before Monitor\n" + idf.py flash + sleep 1 + idf.py monitor +else + echo -e "\nBuild Now? y/n" + read build + if [ "$build" == "y" ]; then + echo -e "\nBuildan~\n" + idf.py build + echo -e "\nBuild complete\n" + fi fi echo -e "\nAll done :3\n" \ No newline at end of file diff --git a/reinstall-esp-idf.sh b/reinstall-esp-idf.sh index cffb259..25edd22 100644 --- a/reinstall-esp-idf.sh +++ b/reinstall-esp-idf.sh @@ -253,9 +253,9 @@ function testAppendAlias() { function handleAliasEnviron() { testAppendAlias "get_idf" "alias get_idf='. $exportScript'" - testAppendAlias "run_esp_reinstall" "alias run_esp_reinstall='git -C $runningDir pull;echo -e \"\nVersion:\";cat $runningDir/version.txt;echo -e \"\n\";bash $runningDir/reinstall-esp-idf.sh '" - testAppendAlias "esp_monitor" "alias esp_monitor='tail -n 75 -f $installDir/install.log'" - testAppendAlias "esp_logs" "alias esp_logs='less $installDir/install.log; less $installDir/version-data.txt'" + testAppendAlias "run_esp_reinstall" "alias run_esp_reinstall='git -C $runningDir pull;echo -e \"\nOld Version:\";tail -1 $versionData;echo -e \"\n\";bash $runningDir/reinstall-esp-idf.sh n'" + testAppendAlias "esp_install_monitor" "alias esp_monitor='tail -n 75 -f $log'" + testAppendAlias "esp_install_logs" "alias esp_logs='less $versionData;less $log'" if [ -z $ESPIDF_INSTALLDIR ]; then writeToLog "ESPIDF_INSTALLDIR environment variable not found, appending to $rcFile" diff --git a/todo.txt b/todo.txt index 35f612c..9622567 100644 --- a/todo.txt +++ b/todo.txt @@ -62,4 +62,11 @@ figure out how to message users properly verbosity levels? less verbose on git commands and installers? -get current esp-idf version plox \ No newline at end of file +get current esp-idf version plox + +document: + run_esp_reinstall + esp_install_monitor + esp_install_logs + +possibly upgrade step-flash-monitor with better resets \ No newline at end of file diff --git a/version.txt b/version.txt index 49cd99e..a81ca7d 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -6-release \ No newline at end of file +7.0-dev \ No newline at end of file