From 4bd8194592e7b67aa683cf8f0305400eddaf5bc9 Mon Sep 17 00:00:00 2001 From: hPrnicessPi3 Date: Sun, 18 May 2025 19:24:55 -0600 Subject: [PATCH] 1.2-dev-1 --- .gitmodules | 3 +++ CHANGELOG.txt | 7 ++++++- README.md | 5 ++++- Sillyfilly-espdumper | 1 + add-to-export-sh.txt | 4 +--- custom_bin/build | 2 +- custom_bin/changeesp.sh | 2 +- custom_bin/chipinfo | 2 +- custom_bin/clean | 2 +- custom_bin/create-project | 2 +- custom_bin/flash | 2 +- custom_bin/flashmonitor | 2 +- custom_bin/fullclean | 2 +- custom_bin/imagesize | 7 ++++--- custom_bin/menuconfig | 2 +- custom_bin/monitor | 2 +- custom_bin/rebuildfull | 14 +++++++------- custom_bin/save-defconfig | 2 +- custom_bin/setup | 4 ++-- custom_bin/step-flash-monitor | 10 +++++----- help.txt | 5 ++++- version.txt | 2 +- 22 files changed, 49 insertions(+), 35 deletions(-) create mode 100644 .gitmodules create mode 160000 Sillyfilly-espdumper diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..7bc16ae --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "Sillyfilly-espdumper"] + path = Sillyfilly-espdumper + url = https://github.com/PrincessPi3/Sillyfilly-espdumper.git diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 4ccea05..4d72ef3 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -43,4 +43,9 @@ a shortcut for applying esp-idf patches 1.1-dev-2 - improved speed of downloading esp-dev-kits \ No newline at end of file + improved speed of downloading esp-dev-kits + +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 diff --git a/README.md b/README.md index 63483b0..b653c91 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ some features require user to have passwordless sudo rights Literally the most schizophrenically overengineered thing I have ever made. idk why I did that ## Quick start -1. `git clone https://github.com/PrincessPi3/esp-idf-tools.git ~/esp-idf-tools` +1. `git clone --recursive https://github.com/PrincessPi3/esp-idf-tools.git ~/esp-idf-tools` 2. `bash ~/esp-idf-tools/esp-idf-tools-cmd.sh install` 3. `source ~/.zshrc` 4. `get-esp-tools` @@ -116,6 +116,9 @@ Some take optional [branch] paramater * `$examples` is a shortcut for examples directory in esp-idf * ex. cd `$examples` +### Sillyfilly-espdumper +todo: integrate + ### Cronjob reinstall from master everyday at 4am, logging out users with warn delays and rebooting after * `crontab -e` diff --git a/Sillyfilly-espdumper b/Sillyfilly-espdumper new file mode 160000 index 0000000..16a9a22 --- /dev/null +++ b/Sillyfilly-espdumper @@ -0,0 +1 @@ +Subproject commit 16a9a223c70315751b164e5b5065d55a14c402f7 diff --git a/add-to-export-sh.txt b/add-to-export-sh.txt index 2553112..d3d66d2 100644 --- a/add-to-export-sh.txt +++ b/add-to-export-sh.txt @@ -7,7 +7,7 @@ function getTargets() { tmpFile='/tmp/targets.tmp' - idf.py --list-targets > "$tmpFile" + idf.py --preview --list-targets > "$tmpFile" tr '\n' ' ' < "$tmpFile" rm "$tmpFile" } @@ -81,8 +81,6 @@ alias exit-esp-tools="source $binDir/exit-esp-tools.sh" echo -e "\nesp-idf version: $ESP_IDF_VERSION commit $commitHash from branch $branchData" -echo -e "\nrun with 'get-esp-tools'" - echo -e "\nWelcome to esp-idf!\nAll done :3\n" ############################################### diff --git a/custom_bin/build b/custom_bin/build index 36ae812..f423294 100644 --- a/custom_bin/build +++ b/custom_bin/build @@ -1,4 +1,4 @@ #!/bin/bash echo -e "\nBuilding\n" -idf.py build +idf.py --preview build echo -e "\nAll done :3\n" diff --git a/custom_bin/changeesp.sh b/custom_bin/changeesp.sh index b0f03fd..c26fef3 100644 --- a/custom_bin/changeesp.sh +++ b/custom_bin/changeesp.sh @@ -1,6 +1,6 @@ function getTargets() { tmpFile='/tmp/targets.tmp' - idf.py --list-targets > "$tmpFile" + idf.py --preview --list-targets > "$tmpFile" tr '\n' ' ' < "$tmpFile" rm "$tmpFile" } diff --git a/custom_bin/chipinfo b/custom_bin/chipinfo index 9deb61a..857f2ee 100644 --- a/custom_bin/chipinfo +++ b/custom_bin/chipinfo @@ -16,7 +16,7 @@ esptool.py --port $ESPPORT --baud $ESPBAUD --chip auto get_security_info if [ -f "./CMakeLists.txt" ]; then echo -e "\nEfuse Table:" - idf.py --port $ESPPORT --baud $ESPBAUD efuse-dump + idf.py --preview --port $ESPPORT --baud $ESPBAUD efuse-dump fi echo -e "\nAll donsies~ :3\n" diff --git a/custom_bin/clean b/custom_bin/clean index 8ad755c..987f839 100644 --- a/custom_bin/clean +++ b/custom_bin/clean @@ -1,4 +1,4 @@ #!/bin/bash echo -e "\nCleaning...\n" -idf.py clean +idf.py --preview clean echo -e "\nAll done :3\n" \ No newline at end of file diff --git a/custom_bin/create-project b/custom_bin/create-project index f717814..3846507 100644 --- a/custom_bin/create-project +++ b/custom_bin/create-project @@ -6,4 +6,4 @@ else read projname; fi -idf.py create-project "$projname" \ No newline at end of file +idf.py --preview create-project "$projname" \ No newline at end of file diff --git a/custom_bin/flash b/custom_bin/flash index d73e852..c77289e 100644 --- a/custom_bin/flash +++ b/custom_bin/flash @@ -1,4 +1,4 @@ #!/bin/bash echo -e "\nFlashing an $ESPTARGET on $ESPPORT\n" -idf.py flash +idf.py --preview flash echo -e "\nAll done :3\n" \ No newline at end of file diff --git a/custom_bin/flashmonitor b/custom_bin/flashmonitor index e01828c..1e80959 100644 --- a/custom_bin/flashmonitor +++ b/custom_bin/flashmonitor @@ -1,4 +1,4 @@ #!/bin/bash echo -e "\nFlashing and Monitoring for $ESPTARGET on $ESPPORT\n" -idf.py flash monitor +idf.py --preview flash monitor echo -e "\nAll done :3\n" \ No newline at end of file diff --git a/custom_bin/fullclean b/custom_bin/fullclean index f631f08..83a9e87 100644 --- a/custom_bin/fullclean +++ b/custom_bin/fullclean @@ -33,6 +33,6 @@ if [ -f dependencies.lock ]; then rm -f dependencies.lock fi -idf.py fullclean +idf.py --preview fullclean echo -e "\nAll done :3\n" \ No newline at end of file diff --git a/custom_bin/imagesize b/custom_bin/imagesize index 4ff749f..6bfd02b 100644 --- a/custom_bin/imagesize +++ b/custom_bin/imagesize @@ -2,12 +2,13 @@ echo -e "\nProject sizes\n" echo -e "\nGeneral:\n" -idf.py size +idf.py --preview fullclean +idf.py --preview size echo -e "\nComponants:\n" -idf.py size-components +idf.py --preview size-components echo -e "\nFiles:\n" -idf.py size-files +idf.py --preview size-files echo -e "\nAll done :3\n" \ No newline at end of file diff --git a/custom_bin/menuconfig b/custom_bin/menuconfig index 42e2c09..ce5e3d9 100644 --- a/custom_bin/menuconfig +++ b/custom_bin/menuconfig @@ -1,4 +1,4 @@ #!/bin/bash echo -e "\nRunning Menuconfig\n" -idf.py menuconfig +idf.py --preview menuconfig echo -e "\nAll done :3\n" \ No newline at end of file diff --git a/custom_bin/monitor b/custom_bin/monitor index 5fab0f0..b69104d 100644 --- a/custom_bin/monitor +++ b/custom_bin/monitor @@ -1,4 +1,4 @@ #!/bin/bash echo -e "\nMonitoring on $ESPPORT\n" -idf.py monitor +idf.py --preview monitor echo -e "\nAll done :3\n" \ No newline at end of file diff --git a/custom_bin/rebuildfull b/custom_bin/rebuildfull index 5948e08..8df1c32 100644 --- a/custom_bin/rebuildfull +++ b/custom_bin/rebuildfull @@ -4,13 +4,13 @@ echo -e "\nFully Rebuildan~\n" bash fullclean echo -e "\nSetting up project for $ESPTARGET\n" -idf.py set-target $ESPTARGET +idf.py --preview set-target $ESPTARGET echo -e "\nErase flash? y/n" read wipe if [ "$wipe" == "y" ]; then echo -e "\nExecuting erase-flash\n" - idf.py erase-flash + idf.py --preview erase-flash echo -e "\nFlash wiped\n" fi @@ -18,7 +18,7 @@ echo -e "\nRun menuconfig y/n?\n" read menuconfig if [ "$menuconfig" == "y" ]; then echo -e "\nExecuting menuconfig\n" - idf.py menuconfig + idf.py --preview menuconfig echo -e "\nConfig Complete\n" fi @@ -26,7 +26,7 @@ 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 + idf.py --preview save-defconfig echo -e "\nDefault Config Saved\n" fi @@ -34,16 +34,16 @@ echo -e "\nBuild, Flash, and Monitor Now? y/n" read flashmon if [ "$flashmon" == "y" ]; then echo -e "\nBuild, Flashing, and Monitoran~\n" - idf.py flash + idf.py --preview flash echo -e "\nFlashed... Short Delay Before Monitor\n" sleep 1 - idf.py monitor + idf.py --preview monitor else echo -e "\nBuild Now? y/n" read build if [ "$build" == "y" ]; then echo -e "\nBuildan~\n" - idf.py build + idf.py --preview build echo -e "\nBuild complete\n" fi fi diff --git a/custom_bin/save-defconfig b/custom_bin/save-defconfig index 31425f8..c9c4b20 100644 --- a/custom_bin/save-defconfig +++ b/custom_bin/save-defconfig @@ -10,7 +10,7 @@ fi echo -e "\nRunning save-defconfig\n" -idf.py save-defconfig +idf.py --preview save-defconfig echo -e "\nDefaults saved to sdkconfig.defaults\n" echo -e "\nAll done :3\n" \ No newline at end of file diff --git a/custom_bin/setup b/custom_bin/setup index 224958a..6d42293 100644 --- a/custom_bin/setup +++ b/custom_bin/setup @@ -1,5 +1,5 @@ #!/bin/bash echo -e "\nSetting up for $ESPTARGET\n" -idf.py set-target $ESPTARGET -idf.py menuconfig +idf.py --preview set-target $ESPTARGET +idf.py --preview menuconfig echo -e "\nAll done :3\n" \ No newline at end of file diff --git a/custom_bin/step-flash-monitor b/custom_bin/step-flash-monitor index 227323a..b55094d 100644 --- a/custom_bin/step-flash-monitor +++ b/custom_bin/step-flash-monitor @@ -3,16 +3,16 @@ set -e # die on error echo -e "Clean, build, flash, monitor in steps, dying on error" -echo -e "\ncleaning up first\n" -bash fullclean +# echo -e "\ncleaning up first\n" +# bash fullclean echo -e "\nBuilding\n" -idf.py build +idf.py --preview build echo -e "\nFlashing to $ESPPORT\n" -idf.py flash +idf.py --preview flash echo -e "\nMonitor time on $ESPPORT for target $ESPTARGET at $ESPBAUD\n" -idf.py monitor +idf.py --preview monitor echo -e "\nAll done :3\n" \ No newline at end of file diff --git a/help.txt b/help.txt index 2423e8f..1dbf1ce 100644 --- a/help.txt +++ b/help.txt @@ -109,7 +109,10 @@ Features: ex. `patch-esp-idf ./some.patch` `$examples` is a shortcut for examples directory in esp-idf ex. cd $examples` - + +Sillyfilly-espdumper: + todo: populate + Cronjob: reinstall from master everyday at 4am, logging out users with warn delays and rebooting after `crontab -e` diff --git a/version.txt b/version.txt index d35a3a6..0f0b5bc 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.1-dev-2 \ No newline at end of file +1.2-dev-1 \ No newline at end of file