Skip to content

Commit

Permalink
Update scripts to Arduino IDE 1.8.10.
Browse files Browse the repository at this point in the history
  • Loading branch information
CelliesProjects committed Oct 6, 2019
1 parent 44718f9 commit 8790770
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 2 deletions.
2 changes: 1 addition & 1 deletion compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ else
fi
echo "const char * sketchVersion = \"$currentVersion\";" > gitTagVersion.h
echo -e Compiling aquacontrol32 version: '\e[36m'$currentVersion'\e[0m'
~/arduino-1.8.9/arduino --board espressif:esp32:mhetesp32minikit --pref custom_DebugLevel=esp32_none --port /dev/ttyUSB0 --pref upload.speed=921600 --preserve-temp-files --pref build.path=temp --pref build.partitions=default_ffat --pref build.flash_freq=80m -v --verify aquacontrol32.ino | grep -e 'Using core' -e 'Using board' -e ' uses ' -e 'Using library' -e 'Compiling' -e 'Global'
~/arduino-1.8.10/arduino --board espressif:esp32:mhetesp32minikit --pref custom_DebugLevel=esp32_none --port /dev/ttyUSB0 --pref upload.speed=921600 --preserve-temp-files --pref build.path=temp --pref build.partitions=default_ffat --pref build.flash_freq=80m -v --verify aquacontrol32.ino | grep -e 'Using core' -e 'Using board' -e ' uses ' -e 'Using library' -e 'Compiling' -e 'Global'
rm gitTagVersion.h
16 changes: 16 additions & 0 deletions debug.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
if [ $(grep GIT_TAG deviceSetup.h | grep -ic TRUE) != "1" ]
then
echo -e '\e[31m'ERROR'\e[0m' GIT_TAG not set to true in deviceSetup.h.
exit 1
fi
currentVersion=""
if [ $(git branch | grep \* | cut -d ' ' -f2) == "master" ]
then
currentVersion=$(git describe --tags --always)
else
currentVersion=$(git branch | grep \* | cut -d ' ' -f2):$(git rev-parse --short HEAD)
fi
echo "const char * sketchVersion = \"$currentVersion\";" > gitTagVersion.h
echo -e Compiling and flashing aquacontrol32 version: '\e[36m'$currentVersion'\e[0m'
~/arduino-1.8.10/arduino --board espressif:esp32:esp32 --pref custom_DebugLevel=esp32_info --port /dev/ttyUSB0 --pref upload.speed=921600 --preserve-temp-files --pref build.path=temp --pref build.partitions=default_ffat --pref build.flash_freq=80m -v --upload aquacontrol32.ino | grep -e 'Using core' -e 'Using board' -e ' uses ' -e 'Using library' -e 'Compiling' -e 'Global'
rm gitTagVersion.h
2 changes: 1 addition & 1 deletion flash.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ else
fi
echo "const char * sketchVersion = \"$currentVersion\";" > gitTagVersion.h
echo -e Compiling and flashing aquacontrol32 version: '\e[36m'$currentVersion'\e[0m'
~/arduino-1.8.9/arduino --board espressif:esp32:mhetesp32minikit --pref custom_DebugLevel=esp32_none --port /dev/ttyUSB0 --pref upload.speed=921600 --preserve-temp-files --pref build.path=temp --pref build.partitions=default_ffat --pref build.flash_freq=80m -v --upload aquacontrol32.ino | grep -e 'Using core' -e 'Using board' -e ' uses ' -e 'Using library' -e 'Compiling' -e 'Global'
~/arduino-1.8.10/arduino --board espressif:esp32:mhetesp32minikit --pref custom_DebugLevel=esp32_none --port /dev/ttyUSB0 --pref upload.speed=921600 --preserve-temp-files --pref build.path=temp --pref build.partitions=default_ffat --pref build.flash_freq=80m -v --upload aquacontrol32.ino | grep -e 'Using core' -e 'Using board' -e ' uses ' -e 'Using library' -e 'Compiling' -e 'Global'
rm gitTagVersion.h

0 comments on commit 8790770

Please sign in to comment.