derpant

.gitignore

@@ -1,5 +1,6 @@
 test-scratch.sh
 notes.txt
+todo.txt
 *.bak
 next-*
 old

add-to-export-sh.txt

@@ -43,9 +43,6 @@ alias changeesp="source ${binDir}/changeesp.sh"
 alias monitor="idf.py monitor"
 alias flashmonitor="idf.py flash monitor"
 alias menuconfig="idf.py menuconfig"
-alias step-flash-monitor="idf.py flash; idf.py monitor"
-alias clean-build="idf.py clean; idf.py build"
-alias fullclean-build="idf.py fullclean; idf.py build"
 
 echo "Changing dir to ${HOME}/esp"
 cd "${HOME}/esp"

cron-reinstall-esp-idf.sh

@@ -13,7 +13,7 @@ startTime=$(date '+%s')
 # 	crontab -e
 # 	0 8 * * * bash $HOME/esp/esp-install-custom/cron-reinstall-esp-idf.sh
 
-cronVers=55-dev.2 # version of this script
+# cronVers=55-dev.3 # version of this script
 myUser=princesspi
 test=$1
 
@@ -27,6 +27,7 @@ idfDir=$installDir/esp-idf
 espressifLocation=$HOME/.espressif
 customBinLocation=$installDir/.custom_bin
 customBinFrom=$runningDir/custom_bin
+cronVers=$(cat $runningDir/version.txt)
 
 function return_status() {
 	strii="\treturn status: ${?}"

custom_bin/fullclean

@@ -26,4 +26,4 @@ else
 	echo -e "\nNo sdkconfig.old, skipping delete\n"
 fi
 
-echo "\nAll done :3\n"
+echo -e "\nAll done :3\n"

custom_bin/rebuildfull

@@ -5,27 +5,27 @@ echo -e "\nRunning fullclean\n"
 
 idf.py fullclean
 
-echo -e "\nRunning manual delete tasks\n"
+echo -e "\nRunning manual delete tasks:"
 
 if [ -f build ]; then
-	echo -e "\nDeleting build dir\n"
+	echo -e "\tDeleting build dir"
 	rm -rf build
 else
-	echo -e "\nNo build dir, skipping delete\n"
+	echo -e "\tNo build dir, skipping delete"
 fi
 
 if [ -f sdkconfig ]; then
-	echo -e "\nDeleting sdkconfig\n"
+	echo -e "\tDeleting sdkconfig"
 	rm sdkconfig
 else
-	echo -e "\nNo sdkconfig, skipping delete\n"
+	echo -e "\tNo sdkconfig, skipping delete"
 fi
 
 if [ -f sdkconfig.old ]; then
-	echo -e "\nDeleting sdkconfig.old\n"
+	echo -e "\tDeleting sdkconfig.old"
 	rm sdkconfig.old
 else
-	echo -e "\nNo sdkconfig.old, skipping delete\n"
+	echo -e "\tNo sdkconfig.old, skipping delete"
 fi
 
 echo -e "\nSetting up project for $ESPTARGET\n"
@@ -34,15 +34,22 @@ idf.py 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
 	echo -e "\nFlash wiped\n"
 fi
 
-idf.py menuconfig
+echo -e "\nRun menuconfig?\n"
+read menuconfig
+if [ "$wipe" == "y" ]; then
+	echo -e "\n\Executing menuconfig"
+	idf.py menuconfig
+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"
 fi

custom_bin/save-defconfig

@@ -1,7 +1,7 @@
 #!/bin/bash
 echo -e "\nSaving default config\n"
 
-if [-f ./sdkconfig.defaults ]; then
+if [ -f ./sdkconfig.defaults ]; then
     echo -e "backing up sdkconfig.defaults to sdkconfig.defaults.bak"
     cp sdkconfig.defaults sdkconfig.defaults.bak
 else

custom_bin/step-flash-monitor

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e # die on error in theory
+
+echo -e "Clean, build, flash, monitor in steps, dying on error"
+
+echo -e "\ncleaning up first\n"
+idf.py clean
+
+echo -e "\nBuilding\n"
+idf.py build
+
+echo -e "\nFlashing to ${ESPPORT}\n"
+idf.py flash
+
+echo -e "\nMonitor time on ${ESPPORT} for target ${ESPTARGET} at ${ESPBAUD}\n"
+idf.py monitor
+
+echo -e "\nAll done :3\n"

retool.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+# script to replace the .custom_bins and add-to-expport.txt without other reinstall
+echo -e "\ndeleting old export.sh\n"
+rm $HOME/esp/esp-idf/export.sh # ~/esp/esp-idf/export.sh.bak.2
+
+echo -e "\nReplacing original export.sh from export.sh.bak\n"
+cp $HOME/esp/esp-idf/export.sh.bak $HOME/esp/esp-idf/export.sh
+
+echo -e "\nAppending new add-to-export.txt to export.sh\n"
+cat add-to-export.txt >> $HOME/esp/esp-idf/export.sh
+
+echo -e "\nDeleting .custom_bins dir\n"
+rm -rf $HOME/esp/.custom_bins
+
+echo -e "\nCoppying new custom_bins and making them executable\n"
+cp -r custom_bins ~/esp/.custom_bins
+chmod +x $HOME/esp/.custom_bins/*
+
+echo -e "\nAll done :3\n"

version.txt

@@ -1 +1 @@
-55-dev.2
+56-dev.3