diff --git a/custom_bin/build b/custom_bin/build old mode 100644 new mode 100755 diff --git a/custom_bin/changebaud b/custom_bin/changebaud old mode 100644 new mode 100755 index 63df161..270388c --- a/custom_bin/changebaud +++ b/custom_bin/changebaud @@ -1,31 +1,26 @@ -#!/bin/bash - -echo -e "\nChanging ESPBAUD\n" -read -p "Select New Baudrate:\n\t1: 9600\n\t2: 115200\n\t3: 230400\n\t4: 460800\n\t5: 1152000\n\t6: 1500000\nDefault: ${ESPBAUD}" baud - -baud=${baud:-$ESPBAUD} - -echo "Select New Baudrate:\n\t1: 9600\n\t2: 115200\n\t3: 230400\n\t4: 460800\n\t5: 1152000\n\t6: 1500000" -read baud -if [ "${baud}" == 1 ]; then - selection=9600 -elif [ "${baud}" == 2 ]; then - selection=115200 -elif [ "${baud}" == 3 ]; then - selection=230400 -elif [ "${baud}" == 4 ]; then - selection=460800 -elif [ "${baud}" == 5 ]; then - selection=1152000 -elif [ "${baud}" == 5 ]; then - selection=1152000 -elif [ "${baud}" == 6 ]; then - selection=1500000 -else - echo "\nBad Selection\n" - return -fi - -export ESPBAUD=$selection - +echo "\nChanging ESPBAUD\n\t1: 9600\n\t2: 115200\n\t3: 230400\n\t4: 460800\n\t5: 1152000\n\t6: 1500000\n" +read -p baud +if [[ $baud == "1" ]]; then + selection=9600 +elif [[ $baud == "2" ]]; then + selection=115200 +elif [[ $baud == "3" ]]; then + selection=230400 +elif [[ $baud == "4" ]]; then + selection=460800 +elif [[ $baud == "5" ]]; then + selection=1152000 +elif [[ $baud == "5" ]]; then + selection=1152000 +elif [[ $baud == "6" ]]; then + selection=1500000 +else + echo "\nBad Selection\n" + return +fi + +echo "\n$selection\n" + +export ESPBAUD=$selection + echo "\nAll done :3\n" \ No newline at end of file diff --git a/custom_bin/changeesp b/custom_bin/changeesp old mode 100644 new mode 100755 index 88ef110..ae5364d --- a/custom_bin/changeesp +++ b/custom_bin/changeesp @@ -1,8 +1,8 @@ -echo "\nChanging ESPTARGET\n" -echo "Set esp target (esp32, esp32s3, esp32c6, esp8266, etc)" -read esp - -export ESPTARGET="${esp}" - -echo "\nESPTARGET set to ${ESPTARGET}\n" +echo "\nChanging ESPTARGET\n" +echo "Set esp target (esp32, esp32s3, esp32c6, esp8266, etc)" +read esp + +export ESPTARGET="${esp}" + +echo "\nESPTARGET set to ${ESPTARGET}\n" echo "\nall done :3\n" \ No newline at end of file diff --git a/custom_bin/changeport b/custom_bin/changeport old mode 100644 new mode 100755 index 915aeb4..a53d32a --- a/custom_bin/changeport +++ b/custom_bin/changeport @@ -1,16 +1,16 @@ -echo "\nChanging ESPPORT\n" -echo "TTY devices found in dmesg:" -COUNTER=0 -devarr=() -for line in $(dmesg | tail -50 | grep -o -E "tty[A-Z]{3}[0-9]{0,2}" | sort -u); do - echo "$COUNTER /dev/$line" - devarr+=("/dev/$line") - COUNTER=$((COUNTER+1)) -done - -echo "\nEnter TTY Number You'd Like:" -read tty -ttyselect=$devarr[(($tty+1))] -export ESPPORT="${ttyselect}" -echo "\nESPPORT set to ${ESPPORT}\n" +echo "\nChanging ESPPORT\n" +echo "TTY devices found in dmesg:" +COUNTER=0 +devarr=() +for line in $(dmesg | tail -50 | grep -o -E "tty[A-Z]{3}[0-9]{0,2}" | sort -u); do + echo "$COUNTER /dev/$line" + devarr+=("/dev/$line") + COUNTER=$((COUNTER+1)) +done + +echo "\nEnter TTY Number You'd Like:" +read tty +ttyselect=$devarr[(($tty+1))] +export ESPPORT="${ttyselect}" +echo "\nESPPORT set to ${ESPPORT}\n" echo "\nall done :3\n" \ No newline at end of file diff --git a/custom_bin/clean b/custom_bin/clean old mode 100644 new mode 100755 diff --git a/custom_bin/flashmonitor b/custom_bin/flashmonitor old mode 100644 new mode 100755 diff --git a/custom_bin/fullclean b/custom_bin/fullclean old mode 100644 new mode 100755 diff --git a/custom_bin/menuconfig b/custom_bin/menuconfig old mode 100644 new mode 100755 diff --git a/custom_bin/rebuildfull b/custom_bin/rebuildfull old mode 100644 new mode 100755 diff --git a/custom_bin/setup b/custom_bin/setup old mode 100644 new mode 100755 diff --git a/reinstall-esp-idf.sh b/reinstall-esp-idf.sh index f5292a2..beb77ef 100644 --- a/reinstall-esp-idf.sh +++ b/reinstall-esp-idf.sh @@ -1,26 +1,26 @@ #!/bin/bash - -runningDir="$( cd "$( dirname "$0" )" && pwd )" - echo -e "\n===== LFGGGGGGGG ======\n" +echo -e "\n" +read -p "Enter directory to install/reinstall to (default ${HOME}/esp):" installDir +installDir=${installDir:-$HOME/esp} + echo -e "\nInstalling prerequisites\n" sudo apt install -y git wget flex bison gperf python3 python3-pip python3-venv cmake ninja-build ccache libffi-dev libssl-dev dfu-util libusb-1.0-0 -echo -e "\n" - -read -p "Enter directory to install/reinstall to (default ${HOME}/esp):" installDir - -installDir=${installDir:-$HOME/esp} +runningDir="$( cd "$( dirname "$0" )" && pwd )" idfDir="${installDir}/esp-idf" +espressifLocation="${HOME}/.espressif" +customBinLocation="${installDir}/.custom_bin" +customBinFrom="${runningDir}/custom_bin" echo -e "\nInstalling to ${installDir} esp-idf path will be ${idfDir}\n" echo -e "\nCleaning up environment\n" -if ! [ -d $installDir ]; then +if ! [ -d "${installDir}" ]; then echo -e "\n${installDir} not found, creating\n" - mkdir $installDir + mkdir "${installDir}" else echo -e "\n${installDir} found, skipping delete\n" fi @@ -32,23 +32,23 @@ else echo -e "\n${idfDir} not found, skipping delete\n" fi -if [ -d "${HOME}/.espressif" ]; then - echo -e "\n${HOME}/.espressif found, deleting\n" - rm -rf "${HOME}/.espressif" +if [ -d "${espressifLocation}" ]; then + echo -e "\n${espressifLocation} found, deleting\n" + rm -rf "${espressifLocation}" else - echo -e "\n${HOME} not found, skipping delete\n" + echo -e "\n${espressifLocation} not found, skipping delete\n" fi -if [ -d "${installDir}/.custom_bin" ]; then - echo -e "\n${installDir}/.custom_bin found, deleting\n" - rm -rf "${installDir}/.custom_bin" +if [ -d "${customBinLocation}" ]; then + echo -e "\n${customBinLocation} found, deleting\n" + rm -rf "${customBinLocation}" else - echo -e "\n${installDir}/.custom_bin not found, skipping delete\n" + echo -e "\n${customBinLocation} not found, skipping delete\n" fi -echo -e "\nPlacing and enabeling custom bins\n" -cp -r "${runningDir}/custom_bin" "${installDir}/.custom_bin" -chmod -R +x "${installDir}/.custom_bin" +echo -e "\nPlacing and enabeling custom scripts at ${customBinLocation}\n" +cp -r "${customBinFrom}" "${customBinLocation}" +chmod -R +x "${customBinLocation}" echo -e "\nPulling latest esp-idf code from github\n" git clone --recursive --jobs 5 https://github.com/espressif/esp-idf.git $idfDir @@ -80,8 +80,8 @@ cat "${runningDir}/add-to-export-sh.txt" >> "${idfDir}/export.sh" echo -e "\nCreating version/commit and date file at ${idfDir}/version-date.txt\n" datestamp=$(date +"%A, %B %-d %Y at %r %Z (epoch %s)") -commitHash=$(git -C "${idfDir}" rev-parse HEAD) -gitBranch=$(git -C "${idfDir}" rev-parse --abbrev-ref HEAD) +commitHash=$(git -C $idfDir rev-parse HEAD) +gitBranch=$(git -C $idfDir rev-parse --abbrev-ref HEAD) echo -e "Installed at:\n\t${datestamp}\n\tat commit ${commitHash}\n\tfrom branch ${gitBranch}\n\tsource: https://github.com/espressif/esp-idf" > "${idfDir}/version-data.txt"