more bugfixes
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
scratch.txt
|
scratch.txt
|
||||||
|
test-scratch.sh
|
||||||
*.bak
|
*.bak
|
||||||
*.old
|
*.old
|
||||||
old
|
old
|
||||||
|
|||||||
@@ -3,12 +3,12 @@ subprocess() {
|
|||||||
read baudRate
|
read baudRate
|
||||||
echo -e "\n"
|
echo -e "\n"
|
||||||
case $baudRate in
|
case $baudRate in
|
||||||
1) selection=9600 ;;
|
1) selection=9600;;
|
||||||
2) selection=115200 ;;
|
2) selection=115200;;
|
||||||
3) selection=230400 ;;
|
3) selection=230400;;
|
||||||
4) selection=460800 ;;
|
4) selection=460800;;
|
||||||
5) selection=1152000 ;;
|
5) selection=1152000;;
|
||||||
6) selection=1500000 ;;
|
6) selection=1500000;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
return $selection
|
return $selection
|
||||||
@@ -17,10 +17,10 @@ subprocess() {
|
|||||||
if [ ! -z $1 ]; then
|
if [ ! -z $1 ]; then
|
||||||
ret="$1"
|
ret="$1"
|
||||||
else
|
else
|
||||||
ret=''
|
ret=subprocess
|
||||||
subprocess ret
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo "ret: $ret"
|
||||||
export ESPBAUD=$ret
|
export ESPBAUD=$ret
|
||||||
echo "\nBaudrate set to $ESPBAUD\n"
|
echo "\nBaudrate set to $ESPBAUD\n"
|
||||||
echo "\nAll done :3\n"
|
echo "\nAll done :3\n"
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
echo "esp-idf-tools install dir: $ESPIDF_INSTALLDIR"
|
echo "esp-idf-tools install dir: $ESPIDF_INSTALLDIR"
|
||||||
|
echo "esp-idf-tools version: $(cat $ESPIDF_INSTALLDIR/esp-idf-tools/version.txt)"
|
||||||
echo "esp-idf-tools last install: $(tail -1 $ESPIDF_INSTALLDIR/version-data.log)"
|
echo "esp-idf-tools last install: $(tail -1 $ESPIDF_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"
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
cat $ESPIDF_INSTALLDIR/help.txt
|
cat $ESPIDF_INSTALLDIR/esp-idf-tools/help.txt
|
||||||
|
|||||||
@@ -123,7 +123,9 @@ function messagePTY() {
|
|||||||
|
|
||||||
for pts in $(ls -q /dev/pts); do
|
for pts in $(ls -q /dev/pts); do
|
||||||
sudo echo -e "$message" > /dev/pts/$pts # requires passwordless sudo
|
sudo echo -e "$message" > /dev/pts/$pts # requires passwordless sudo
|
||||||
|
writeToLog "messagePTY: $message send to $pts"
|
||||||
done
|
done
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# this is not needed so long as warn doesnt god damned fucking work lmfao
|
# this is not needed so long as warn doesnt god damned fucking work lmfao
|
||||||
@@ -459,7 +461,7 @@ function handleEnd() {
|
|||||||
endTime=$(date '+%s')
|
endTime=$(date '+%s')
|
||||||
timeElapsed=$(($endTime-$startTime))
|
timeElapsed=$(($endTime-$startTime))
|
||||||
|
|
||||||
echo -e "\nesp-idf (re)installed! run \`source $rcFile\` and then \`get_idf\`\n\nAll done :3\n\n"
|
echo -e "\nesp-idf (re)installed! run \`source $rcFile\` and then \`get-esp-tools\`\n\nAll done :3\n\n"
|
||||||
|
|
||||||
writeToLog "Reinstall completed in $timeElapsed seconds\n"
|
writeToLog "Reinstall completed in $timeElapsed seconds\n"
|
||||||
writeToLog " === Finished ===\n\n"
|
writeToLog " === Finished ===\n\n"
|
||||||
@@ -501,7 +503,6 @@ elif [[ "$arg" == "retool" || "$arg" == "rt" ]]; then # just reinstall bins and
|
|||||||
|
|
||||||
handleStart
|
handleStart
|
||||||
handleCustomBins
|
handleCustomBins
|
||||||
handleExport
|
|
||||||
handleEnd
|
handleEnd
|
||||||
|
|
||||||
exit
|
exit
|
||||||
@@ -565,7 +566,7 @@ elif [[ "$arg" == "cron" || "$arg" == "c" ]]; then # full install with warn, sle
|
|||||||
idfGet="update"
|
idfGet="update"
|
||||||
sleepMins=0
|
sleepMins=0
|
||||||
|
|
||||||
messagePTY "esp-idf-tools action $action started!\nWill reboot with $sleepMins minutes delay when complete!"
|
messagePTY "\n\nesp-idf-tools action $action started!\nWill reboot with $sleepMins minutes delay when complete!\n\n"
|
||||||
handleStart
|
handleStart
|
||||||
handleClearInstallLog
|
handleClearInstallLog
|
||||||
handleSetupEnvironment
|
handleSetupEnvironment
|
||||||
@@ -617,7 +618,7 @@ elif [[ "$arg" == "nukereboot" || "$arg" == "nr" ]]; then
|
|||||||
sleepMins=1
|
sleepMins=1
|
||||||
idfGet="download"
|
idfGet="download"
|
||||||
|
|
||||||
messagePTY "esp-idf-tools action $action started!\nWill reboot with $sleepMins minutes delay when complete!"
|
messagePTY "\n\nesp-idf-tools action $action started!\nWill reboot with $sleepMins minutes delay when complete!\n\n"
|
||||||
handleStart
|
handleStart
|
||||||
handleClearInstallLog
|
handleClearInstallLog
|
||||||
handleSetupEnvironment
|
handleSetupEnvironment
|
||||||
|
|||||||
@@ -1,4 +1,13 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
function test_fun() {
|
||||||
|
echo "function name? $0"
|
||||||
|
}
|
||||||
|
|
||||||
|
echo "script name? $0"
|
||||||
|
test_fun
|
||||||
|
test_fun "one" "two" 3
|
||||||
|
|
||||||
if [[ ! -z $1 ]]; then
|
if [[ ! -z $1 ]]; then
|
||||||
message="$1"
|
message="$1"
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
test new pts messaging system
|
test new pts messaging system
|
||||||
integrate
|
integrate
|
||||||
test espinfo
|
test espinfo
|
||||||
test all for bugs
|
|
||||||
audit readme
|
audit readme
|
||||||
maybe pretty up
|
maybe pretty up
|
||||||
test/fix changebaud/changebaud <baud>
|
test/fix changebaud/changebaud <baud>
|
||||||
test menuconfig, monitor, flashmonitor
|
test menuconfig, monitor, flashmonitor, exit-esp-tools
|
||||||
|
test all for bugs
|
||||||
|
|
||||||
mayhaps support bash?
|
mayhaps support bash?
|
||||||
# mayhaps it already works mayhaps? test
|
# mayhaps it already works mayhaps? test
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
9-rc-3
|
9-rc-2
|
||||||
|
|||||||
Reference in New Issue
Block a user