PrincessPi/esp-idf-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testiung for release

Browse Source
This commit is contained in:
Princess Pi
2025-05-09 22:31:34 -06:00
parent 6034a9648b
commit b47cbbc684
13 changed files with 56 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
-
-8
View File
@@ -1,8 +0,0 @@
esp32
esp32s2
esp32c3
esp32s3
esp32c2
esp32c6
esp32h2
esp32p4
CHANGELOG.txt
+6 -2
View File
@@ -1,4 +1,8 @@
9-rc-11 9-rc-12
created CHANGELOG.txt created CHANGELOG.txt
fixed erase-flash fixed erase-flash
changeesp and add-to-export.txt now dynamically pull targets from idf.py --list-targets changeesp and add-to-export.txt now dynamically pull targets from idf.py --list-targets
simplified alias for idf-tools-cmd
9-rc-final
fixed and renamed ESPIDF_INSTALLDIR ESPIDFTOOLS_INSTALLDIR
README.md
+1 -1
View File
@@ -108,7 +108,7 @@ Some take optional [branch] paramater
* `create-project` alone prompts for a project name * `create-project` alone prompts for a project name
* `create-project <project name>` creates a project with <project name> * `create-project <project name>` creates a project with <project name>
* ex. `create-project hello-world` * ex. `create-project hello-world`
* `esp-install-monitor` monitors install.log. alias for `tail -n 75 -f $ESPIDF_INSTALLDIR/install.log` * `esp-install-monitor` monitors install.log. alias for `tail -n 75 -f $ESPIDFTOOLS_INSTALLDIR/install.log`
* `esp-install-logs` displays full text of install.log and version-data.txt * `esp-install-logs` displays full text of install.log and version-data.txt
* `$examples` is a shortcut for examples directory in esp-idf * `$examples` is a shortcut for examples directory in esp-idf
* ex. cd `$examples` * ex. cd `$examples`
add-to-export-sh.txt
+9 -9
View File
@@ -19,12 +19,12 @@ commitHash=commitTAG
installDate=installDateTAG installDate=installDateTAG
branchData=branchDataTAG branchData=branchDataTAG
if [ -z $ESPIDF_INSTALLDIR ]; then if [ -z $ESPIDTOOLS_INSTALLDIR ]; then
echo -e "\nFAIL: ESPIDF_INSTALLDIR environment variable not found!\nReinstall via script or manually add to ~/.zshrc\n" echo -e "\nFAIL: ESPIDFTOOLS_INSTALLDIR environment variable not found!\nReinstall via script or manually add to ~/.zshrc\n"
exit exit
fi fi
binDir="$ESPIDF_INSTALLDIR/.custom_bin" binDir="$ESPIDFTOOLS_INSTALLDIR/.custom_bin"
echo -e "\nTTY devices found in dmesg:" echo -e "\nTTY devices found in dmesg:"
COUNTER=0 COUNTER=0
@@ -43,14 +43,14 @@ echo -e "Set esp target:\n\tOne of: $(getTargets)"
read esp read esp
# echo -e "\nSetting environment variables\n" # echo -e "\nSetting environment variables\n"
export PATH="$ESPIDF_INSTALLDIR/.custom_bin:$PATH" export PATH="$ESPIDFTOOLS_INSTALLDIR/.custom_bin:$PATH"
export ESPPORT=$ttyselect export ESPPORT=$ttyselect
export ESPBAUD=460800 export ESPBAUD=460800
export ESPTARGET=$esp export ESPTARGET=$esp
export examples="$ESPIDF_INSTALLDIR/esp-idf/examples" export examples="$ESPIDFTOOLS_INSTALLDIR/esp-idf/examples"
echo -e "Installation Variables:" echo -e "Installation Variables:"
tail -1 "$ESPIDF_INSTALLDIR/version-data.log" tail -1 "$ESPIDFTOOLS_INSTALLDIR/version-data.log"
echo -e "\tesp-idf-toolsversion: $versionData" echo -e "\tesp-idf-toolsversion: $versionData"
echo -e "\tesp-idf version: $ESP_IDF_VERSION" echo -e "\tesp-idf version: $ESP_IDF_VERSION"
echo -e "\tcommmit hash: $commitHash" echo -e "\tcommmit hash: $commitHash"
@@ -62,7 +62,7 @@ echo -e "\nEnvironment Variables:"
echo -e "\tESPBAUD = $ESPBAUD" echo -e "\tESPBAUD = $ESPBAUD"
echo -e "\tESPTARGET = $ESPTARGET" echo -e "\tESPTARGET = $ESPTARGET"
echo -e "\tESPPORT = $ESPPORT" echo -e "\tESPPORT = $ESPPORT"
echo -e "\tESPIDF_INSTALLDIR = $ESPIDF_INSTALLDIR" echo -e "\tESPIDFTOOLS_INSTALLDIR = $ESPIDFTOOLS_INSTALLDIR"
echo -e "\tESP_IDF_VERSION = $ESP_IDF_VERSION" echo -e "\tESP_IDF_VERSION = $ESP_IDF_VERSION"
echo -e "\tbinDir = $binDir" echo -e "\tbinDir = $binDir"
echo -e "\texamples = $examples" echo -e "\texamples = $examples"
@@ -73,8 +73,8 @@ alias changebaud="source $binDir/changebaud.sh"
alias changeesp="source $binDir/changeesp.sh" alias changeesp="source $binDir/changeesp.sh"
alias exit-esp-tools="source $binDir/exit-esp-tools.sh" alias exit-esp-tools="source $binDir/exit-esp-tools.sh"
# echo -e "Changing dir to $ESPIDF_INSTALLDIR" # echo -e "Changing dir to $ESPIDFTOOLS_INSTALLDIR"
cd $ESPIDF_INSTALLDIR # cd $ESPIDFTOOLS_INSTALLDIR
echo -e "\nesp-idf version: $ESP_IDF_VERSION commit $commitHash from branch $branchData" echo -e "\nesp-idf version: $ESP_IDF_VERSION commit $commitHash from branch $branchData"
custom_bin/espinfo
+4 -4
View File
@@ -1,7 +1,7 @@
echo "esp-idf-tools install dir: $ESPIDF_INSTALLDIR" echo "esp-idf-tools install dir: $ESPIDFTOOLS_INSTALLDIR"
echo "esp-idf-tools custom_bin dir: $ESPIDF_INSTALLDIR/.custom_bin/" echo "esp-idf-tools custom_bin dir: $ESPIDFTOOLS_INSTALLDIR/.custom_bin/"
echo "esp-idf-tools version: $(cat $ESPIDF_INSTALLDIR/.custom_bin/version.txt)" echo "esp-idf-tools version: $(cat $ESPIDFTOOLS_INSTALLDIR/.custom_bin/version.txt)"
echo "esp-idf-tools last install: $(tail -1 $ESPIDF_INSTALLDIR/version-data.log)" echo "esp-idf-tools last install: $(tail -1 $ESPIDFTOOLS_INSTALLDIR/version-data.log)"
echo "esp-idf path: $IDF_PATH" echo "esp-idf path: $IDF_PATH"
echo "esp-idf version: $ESP_IDF_VERSION" echo "esp-idf version: $ESP_IDF_VERSION"
echo "esp-idf python path: $IDF_PYTHON_ENV_PATH" echo "esp-idf python path: $IDF_PYTHON_ENV_PATH"
custom_bin/exit-esp-tools.sh
+1 -1
View File
@@ -1,4 +1,4 @@
unset ESPIDF_INSTALLDIR unset ESPIDFTOOLS_INSTALLDIR
unset IDF_PATH unset IDF_PATH
unset ESP_IDF_VERSION unset ESP_IDF_VERSION
unset IDF_PYTHON_ENV_PATH unset IDF_PYTHON_ENV_PATH
custom_bin/help-esp-tools
+1 -1
View File
@@ -1 +1 @@
cat $ESPIDF_INSTALLDIR/.custom_bin/help.txt cat $ESPIDFTOOLS_INSTALLDIR/.custom_bin/help.txt
esp-idf
Submodule
+1
Submodule esp-idf added at 565cca2fee
esp-idf-tools-cmd.sh
+26 -33
View File
@@ -12,26 +12,19 @@ rcFile=$HOME/.zshrc # shell rc file
gitJobs=5 # number of jobs to download from github with gitJobs=5 # number of jobs to download from github with
# gitJobs=default # default for no --jobs x arg, integar for a number of jobs # gitJobs=default # default for no --jobs x arg, integar for a number of jobs
rebootMins=3 # minutes of warning before reboot rebootMins=3 # minutes of warning before reboot
defaultInstallDir="$HOME/esp"
# get us our FUCKING ALIASES HOLY FUCK GOD DAMN SHIT FUCK IT\ # get us our FUCKING ALIASES HOLY FUCK GOD DAMN SHIT FUCK IT\
source $rcFile 2>/dev/null # >2?/dev/null is to redirect any errors source $rcFile 2>/dev/null # >2?/dev/null is to redirect any errors
# echo -e "\n\nSource $rcFile\n\t retval: $?\n\n"
if [ -z $ESPIDF_INSTALLDIR ]; then log="" # log file
installDir=$HOME/esp # path to install to. $HOME/esp by default versionData="" # version data log file
else idfDir="" # esp-idf path
installDir=$ESPIDF_INSTALLDIR customBinLocation="" # where custom bin scripts are placed
fi
log=$installDir/install.log # log file
versionData=$installDir/version-data.log # version data log file
idfDir=$installDir/esp-idf # esp-idf path
espressifLocation=$HOME/.espressif # espressif tools install location espressifLocation=$HOME/.espressif # espressif tools install location
customBinLocation=$installDir/.custom_bin # where custom bin scripts are placed
runningDir="$( cd "$( dirname "$0" )" && pwd )" runningDir="$( cd "$( dirname "$0" )" && pwd )"
customBinFrom=$runningDir/custom_bin # dir where custom scripts are coming FROM customBinFrom=$runningDir/custom_bin # dir where custom scripts are coming FROM
helpText=$runningDir/help.txt helpText=$runningDir/help.txt
exportScript=$idfDir/export.sh # export script
exportBackupScript=$runningDir/export.sh.bak # back up to running dir exportBackupScript=$runningDir/export.sh.bak # back up to running dir
scriptVers=$(cat $runningDir/version.txt) # make sure version.txt does NOT have newline scriptVers=$(cat $runningDir/version.txt) # make sure version.txt does NOT have newline
arg=$1 # just rename the argument var for clarity with the functions arg=$1 # just rename the argument var for clarity with the functions
@@ -43,8 +36,6 @@ else
gitCloneCmd="git clone --single-branch --depth 1 --recursive --jobs $gitJobs --branch $gitBranch https://github.com/espressif/esp-idf $idfDir" gitCloneCmd="git clone --single-branch --depth 1 --recursive --jobs $gitJobs --branch $gitBranch https://github.com/espressif/esp-idf $idfDir"
fi fi
# gitCloneCmd="git clone --recursive --single-branch --jobs $gitJobs --branch $gitBranch https://github.com/espressif/esp-idf $idfDir"
gitUpdateCmd="git -C $idfDir reset --hard; git -C $idfDir clean -df; git -C $idfDir pull $idfDir" # mayhapsnasst? gitUpdateCmd="git -C $idfDir reset --hard; git -C $idfDir clean -df; git -C $idfDir pull $idfDir" # mayhapsnasst?
installCmd="$idfDir/install.sh all" installCmd="$idfDir/install.sh all"
@@ -241,7 +232,7 @@ function handleExport() {
} }
function handleSetupEnvironment() { function handleSetupEnvironment() {
# writeToLog "Handling setup environment (function ran)\n" # writeToLog "Handling setup environment (function ran)\n
if [ ! -d "$installDir" ]; then if [ ! -d "$installDir" ]; then
writeToLog "creating $installDir" writeToLog "creating $installDir"
mkdir $installDir mkdir $installDir
@@ -288,18 +279,9 @@ function handleAliasEnviron() {
testAppendAlias "run-esp-cmd" "alias run-esp-cmd='bash $runningDir/esp-idf-tools-cmd.sh'" testAppendAlias "run-esp-cmd" "alias run-esp-cmd='bash $runningDir/esp-idf-tools-cmd.sh'"
testAppendAlias "esp-install-monitor" "alias esp-install-monitor='tail -n 75 -f $log'" testAppendAlias "esp-install-monitor" "alias esp-install-monitor='tail -n 75 -f $log'"
testAppendAlias "esp-install-logs" "alias esp-install-logs='less $versionData;less $log'" testAppendAlias "esp-install-logs" "alias esp-install-logs='less $versionData;less $log'"
if [ -z $ESPIDF_INSTALLDIR ]; then
writeToLog "ESPIDF_INSTALLDIR environment variable not found, appending to $rcFile"
echo -e "export ESPIDF_INSTALLDIR=\"$installDir\"\n" >> $rcFile
returnStatus
aliasInstallDirChk=$?
else
writeToLog "ESPIDF_INSTALLDIR environment variable already installed, skipping\n"
aliasInstallDirChk=0
fi
} }
function handleDownloadInstall() { function handleDownloadInstall() {
# writeToLog "Handling download and install (function ran)\n" # writeToLog "Handling download and install (function ran)\n"
if [[ "$idfGet" == "download" || ! -d "$idfDir" ]]; then if [[ "$idfGet" == "download" || ! -d "$idfDir" ]]; then
@@ -388,14 +370,25 @@ function handleCheckEspIdf() {
} }
function handleStart() { function handleStart() {
if [ -z $sleepMins ]; then if [ -z $ESPIDFTOOLS_INSTALLDIR ]; then
sleepMins="disabled" writeToLog "ESPIDFTOOLS_INSTALLDIR environment variable not found, appending to $rcFile"
echo "export ESPIDFTOOLS_INSTALLDIR=\"$defaultInstallDir\"" >> $rcFile
installDir="$defaultInstallDir"
aliasInstallDirChk=$?
else
writeToLog "ESPIDFTOOLS_INSTALLDIR environment variable already installed, skipping\n"
installDir="$ESPIDFTOOLS_INSTALLDIR"
aliasInstallDirChk=0
fi fi
if [ -z $ESPIDF_INSTALLDIR ]; then log=$installDir/install.log # log file
installDirEnvvar="not set" versionData=$installDir/version-data.log # version data log file
else idfDir=$installDir/esp-idf # esp-idf path
installDirEnvvar=$ESPIDF_INSTALLDIR exportScript=$idfDir/export.sh # export script
customBinLocation=$installDir/.custom_bin # where custom bin scripts are placed
if [ -z $sleepMins ]; then
sleepMins="disabled"
fi fi
if [ "$arg" != "interactive" -a "$arg" != "i" ]; then if [ "$arg" != "interactive" -a "$arg" != "i" ]; then
@@ -407,7 +400,7 @@ function handleStart() {
handleCheckEspIdf handleCheckEspIdf
handleCheckInstallPackages handleCheckInstallPackages
writeToLog "\n\tvars:\n\t\tuser: $USER\n\t\tscriptVers: $scriptVers\n\t\tversionData: $versionData\n\t\tlog: $log\n\t\tsleepMins: $sleepMins\n\t\tinstallDir: $installDir\n\t\tgitJobs: $gitJobs\n\t\tgitBranch: $gitBranch\n\t\tgitCloneCmd: $gitCloneCmd\n\t\tgitUpdateCmd: $gitUpdateCmd\n\t\t\tGitrunningDir: $runningDir\n\t\tidfDir: $idfDir\n\t\tespressifLocation: $espressifLocation\n\t\tcustomBinLocation: $customBinLocation\n\t\tcustomBinFrom: $customBinFrom\n\t\tinstallCmd: $installCmd\n\t\ttoolsInstallCmd: $toolsInstallCmd\n\t\trcFile: $rcFile\n\t\t(envvar) ESPIDF_INSTALLDIR: $installDirEnvvar\n\t\tidfGet: $idfGet\n" writeToLog "\n\tvars:\n\t\tuser: $USER\n\t\tscriptVers: $scriptVers\n\t\tversionData: $versionData\n\t\tlog: $log\n\t\tsleepMins: $sleepMins\n\t\tinstallDir: $installDir\n\t\tgitJobs: $gitJobs\n\t\tgitBranch: $gitBranch\n\t\tgitCloneCmd: $gitCloneCmd\n\t\tgitUpdateCmd: $gitUpdateCmd\n\t\t\tGitrunningDir: $runningDir\n\t\tidfDir: $idfDir\n\t\tespressifLocation: $espressifLocation\n\t\tcustomBinLocation: $customBinLocation\n\t\tcustomBinFrom: $customBinFrom\n\t\tinstallCmd: $installCmd\n\t\ttoolsInstallCmd: $toolsInstallCmd\n\t\trcFile: $rcFile\n\t\t(envvar) ESPIDFTOOLS_INSTALLDIR: $installDir\n\t\tidfGet: $idfGet\n"
} }
function handleEmptyLogs() { function handleEmptyLogs() {
@@ -433,7 +426,7 @@ function handleUninstall() {
} }
function handleChk() { function handleChk() {
retCodes="Error Checking:\n\tPackages install: $pkgInstallChk\n\tGit pull/clone: $gitChk\n\tInstall script: $installChk\n\tInstall tools: $toolsInstallChk\n\tExport append: $exportCatChk\n\tExport edit return: $exportSedReturnChk\n\tExport version: $exportSedVersionChk\n\tExport date: $exportSedDateChk\n\tExport git hash: $exportSedHashChk\n\trun-esp-reinstall alias: $aliasRunEspReinstallChk\n\tesp-monitor alias: $aliasEspMonitorchk\n\tesp-logs alias: $aliasEspLogsChk\n\tESPIDF_INSTALLDIR envvar: $aliasInstallDirChk\n\tWarned Users: $warnChk\n\tLogged out users: $logoutChk\n\tAppended git log to version-data.txt: $gitLogChk\n\tAcquired git hash: $gitHashChk\n\tDeleted esp-idf dir: $rmIdfDirChk\n\tDeleted .espressif dir: $rmEspressifChk\n\tCreated install dir: $mkInstallDirChk\n\tRestored export.sh.bak: $restoreExportScriptChk\n\tDeleted old export.sh: $rmExportScriptCh\n\tBacked up export.sh to export.sh.bak: $backupExportScriptChk\n\tDeleted backup export export.bak.sh: $rmExportBackupChk\n\tMade custom scripts executable: $customBinExecChk\n\tCopied custom scripts: $cpCustomBinChk\n\tDeleted old custom scripts dir: $rmCustomBinChk\n\tWoke from sleep: $sleepChk" retCodes="Error Checking:\n\tPackages install: $pkgInstallChk\n\tGit pull/clone: $gitChk\n\tInstall script: $installChk\n\tInstall tools: $toolsInstallChk\n\tExport append: $exportCatChk\n\tExport edit return: $exportSedReturnChk\n\tExport version: $exportSedVersionChk\n\tExport date: $exportSedDateChk\n\tExport git hash: $exportSedHashChk\n\trun-esp-reinstall alias: $aliasRunEspReinstallChk\n\tesp-monitor alias: $aliasEspMonitorchk\n\tesp-logs alias: $aliasEspLogsChk\n\tESPIDFTOOLS_INSTALLDIR envvar: $installDir\n\tWarned Users: $warnChk\n\tLogged out users: $logoutChk\n\tAppended git log to version-data.txt: $gitLogChk\n\tAcquired git hash: $gitHashChk\n\tDeleted esp-idf dir: $rmIdfDirChk\n\tDeleted .espressif dir: $rmEspressifChk\n\tCreated install dir: $mkInstallDirChk\n\tRestored export.sh.bak: $restoreExportScriptChk\n\tDeleted old export.sh: $rmExportScriptCh\n\tBacked up export.sh to export.sh.bak: $backupExportScriptChk\n\tDeleted backup export export.bak.sh: $rmExportBackupChk\n\tMade custom scripts executable: $customBinExecChk\n\tCopied custom scripts: $cpCustomBinChk\n\tDeleted old custom scripts dir: $rmCustomBinChk\n\tWoke from sleep: $sleepChk"
totalErrorLoad=$(($pkgInstallChk+$gitChk+$gitChk+$installChk+$toolsInstallChk+$exportSedHashChk+$exportCatChk+$exportSedReturnChk+$aliasRunEspReinstallChk+$aliasEspMonitorchk+$aliasEspLogsChk+$aliasInstallDirChk+$warnChk+$logoutChk+$gitLogChk+$gitHashChk+$rmIdfDirChk+$rmEspressifChk+$mkInstallDirChk+$restoreExportScriptChk+$rmExportScriptChk+$backupExportScriptChk+$customBinExecChk+$rmCustomBinChk+$sleepChk+$rmExportBackupChk)) totalErrorLoad=$(($pkgInstallChk+$gitChk+$gitChk+$installChk+$toolsInstallChk+$exportSedHashChk+$exportCatChk+$exportSedReturnChk+$aliasRunEspReinstallChk+$aliasEspMonitorchk+$aliasEspLogsChk+$aliasInstallDirChk+$warnChk+$logoutChk+$gitLogChk+$gitHashChk+$rmIdfDirChk+$rmEspressifChk+$mkInstallDirChk+$restoreExportScriptChk+$rmExportScriptChk+$backupExportScriptChk+$customBinExecChk+$rmCustomBinChk+$sleepChk+$rmExportBackupChk))
help.txt
+1 -1
View File
@@ -103,7 +103,7 @@ Features:
`create-project` alone prompts for a project name `create-project` alone prompts for a project name
`create-project <project name>` creates a project with <project name> `create-project <project name>` creates a project with <project name>
ex. `create-project hello-world` ex. `create-project hello-world`
`esp-install-monitor` monitors install.log. alias for `tail -n 75 -f $ESPIDF_INSTALLDIR/install.log` `esp-install-monitor` monitors install.log. alias for `tail -n 75 -f $ESPIDFTOOLS_INSTALLDIR/install.log`
`esp-install-logs` displays full text of install.log and version-data.txt `esp-install-logs` displays full text of install.log and version-data.txt
`$examples` is a shortcut for examples directory in esp-idf `$examples` is a shortcut for examples directory in esp-idf
ex. cd $examples` ex. cd $examples`
sed
-8
View File
@@ -1,8 +0,0 @@
esp32
esp32s2
esp32c3
esp32s3
esp32c2
esp32c6
esp32h2
esp32p4
todo.txt
+5
View File
@@ -2,9 +2,14 @@ text export and changeesp
test help on cmd, help-esp-tools test help on cmd, help-esp-tools
test sourced scrips changebaud, changeesp, changeport test sourced scrips changebaud, changeesp, changeport
test menuconfig, monitor, flashmonitor, exit-esp-tools test menuconfig, monitor, flashmonitor, exit-esp-tools
test / fix / remove esp-idf-tools-cmd.sh options
remove unneeded code
audit readme audit readme
maybe pretty up maybe pretty up
test all for bugs test all for bugs
add error handling to changeesp, changeport, and export on esp and port functions
figure out esp32 disable sanity check figure out esp32 disable sanity check
create blank project as master create blank project as master
add Kconfig.projbuild sample add Kconfig.projbuild sample
version.txt
+1 -1
View File
@@ -1 +1 @@
9-rc-11 9-rc-final