From 55236eb53f441b5b74ae385f35fb9a81b3484710 Mon Sep 17 00:00:00 2001 From: Epic Curious <109078515+epiccurious@users.noreply.github.com> Date: Wed, 13 Dec 2023 11:38:05 -0500 Subject: [PATCH 1/8] feat: update the main script --- flash_your_device | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/flash_your_device b/flash_your_device index f5e9644..690912e 100755 --- a/flash_your_device +++ b/flash_your_device @@ -1,9 +1,16 @@ #!/bin/bash set -e +cleanup() { + rm -rf -- "${temp_directory}" + if [ "$(stat -c '%a' ${tty_device})" != "${initial_tty_device_permissions}" ]; then + sudo chmod "${initial_tty_device_permissions}" "${tty_device}" + fi +} + working_directory="${HOME}/Downloads/diy_jade" temp_directory="${working_directory}/temp" -trap 'rm -rf -- "${temp_directory}"' EXIT +trap cleanup EXIT jade_git_tag="1.0.26" jade_save_directory="${working_directory}/jade" @@ -181,6 +188,10 @@ echo sed -i.bak '/CONFIG_DEBUG_MODE/d' ./sdkconfig.defaults sed -i.bak '1s/^/CONFIG_LOG_DEFUALT_LEVEL_NONE=y\n/' sdkconfig.defaults +echo -n "Creating the Jade firmware... " +idf.py build &> /dev/null +echo "ok." + case "${machine}" in Linux*) while [ ! -c "${tty_device}" ]; do @@ -188,8 +199,9 @@ case "${machine}" in done tty_device_permissions="$(stat -c '%a' "${tty_device}")" if [ "${tty_device_permissions:2}" -lt 6 ]; then - echo -e "ERROR:\nYou need elevated permissions to write to the device.\nPlease update your device permissoins by running:\n\nsudo chmod o+rw ${tty_device}\n" - exit 1 + echo -e "\nElevating write permissions for ${chosen_device}" + sudo chmod o+rw "${tty_device}" + echo fi ;; macOS*) From 1c0fae2e8107991914dedebe68ba0773d6860be8 Mon Sep 17 00:00:00 2001 From: Epic Curious <109078515+epiccurious@users.noreply.github.com> Date: Wed, 13 Dec 2023 11:38:40 -0500 Subject: [PATCH 2/8] refactor: remove commented lines from main script --- flash_your_device | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/flash_your_device b/flash_your_device index 690912e..fea2192 100755 --- a/flash_your_device +++ b/flash_your_device @@ -205,17 +205,6 @@ case "${machine}" in fi ;; macOS*) - #macos_usb_serial=$(ioreg -p IOUSB -n "USB Single Serial" | grep "USB Serial Number" | cut -c 34-43) - - #[ -z "${macos_usb_serial}" ] && echo "serial does not exist" - - #while [ -z "${macos_usb_serial}" ] - #do - # echo -e "Connect your ${chosen_device} with a USB-C cable,\n click \"Allow\" if you see a macOS security popup," - # sleep 5 - # macos_usb_serial=$(ioreg -p IOUSB -n "USB Single Serial" | grep "USB Serial Number" | cut -c 34-43) - - #done echo -e "Connect your ${chosen_device} with a USB-C cable,\n and click Allow if you see a security popup." read -srn1 -p " PRESS ANY KEY to continue... " && echo && echo ;; From 0afbee1308952199d0828a76362dda8ac1b2674d Mon Sep 17 00:00:00 2001 From: Epic Curious <109078515+epiccurious@users.noreply.github.com> Date: Wed, 13 Dec 2023 11:40:46 -0500 Subject: [PATCH 3/8] fix: satisfy shellcheck --- flash_your_device | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flash_your_device b/flash_your_device index fea2192..7cb7fb6 100755 --- a/flash_your_device +++ b/flash_your_device @@ -3,7 +3,7 @@ set -e cleanup() { rm -rf -- "${temp_directory}" - if [ "$(stat -c '%a' ${tty_device})" != "${initial_tty_device_permissions}" ]; then + if [ "$(stat -c '%a' "${tty_device}")" != "${initial_tty_device_permissions}" ]; then sudo chmod "${initial_tty_device_permissions}" "${tty_device}" fi } @@ -197,8 +197,8 @@ case "${machine}" in while [ ! -c "${tty_device}" ]; do read -srn1 -p "Connect your ${chosen_device} and PRESS ANY KEY to continue... " && echo done - tty_device_permissions="$(stat -c '%a' "${tty_device}")" - if [ "${tty_device_permissions:2}" -lt 6 ]; then + initial_tty_device_permissions="$(stat -c '%a' "${tty_device}")" + if [ "${initial_tty_device_permissions:2}" -lt 6 ]; then echo -e "\nElevating write permissions for ${chosen_device}" sudo chmod o+rw "${tty_device}" echo From 127608995e51167d0706616cd59ae1f997be9f0f Mon Sep 17 00:00:00 2001 From: Epic Curious <109078515+epiccurious@users.noreply.github.com> Date: Wed, 13 Dec 2023 14:06:40 -0500 Subject: [PATCH 4/8] refactor: remove more commented lines --- flash_your_device | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/flash_your_device b/flash_your_device index 7cb7fb6..ab1c315 100755 --- a/flash_your_device +++ b/flash_your_device @@ -68,22 +68,12 @@ case "$(uname -s)" in echo -n "Checking for cmake... " if ! command -v cmake &>/dev/null; then if [ ! -d /Applications/CMake.app ]; then - #read -srk "? CMake is not found in your Applications directory.\n PRESS ANY KEY to download CMake... " && echo - #cmake_macos_url="https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4-macos-universal.tar.gz" - #cmake_macos_tarball="${HOME}"/$(basename "${cmake_macos_url}") - #cmake_macos_extract_dir="${HOME}/$(basename "${cmake_macos_url}" .tar.gz)" - #wget -P "${HOME}" "${cmake_macos_url}" - #tar -xf "${cmake_macos_tarball}" -C "${HOME}/" - #cp -r "${cmake_macos_extract_dir}"/CMake.app/ /Applications/CMake.app/ cmake_macos_url="https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4-macos-universal.dmg" cmake_macos_dmg="$(basename ${cmake_macos_url})" - #cmake_macos_volume="/Volumes/$(basename ${cmake_macos_url} .dmg)" if [ ! -f "${HOME}"/Downloads/"${cmake_macos_dmg}" ] then echo -ne "\n Downloading CMake... " - #wget --quiet -P "${HOME}" "${cmake_macos_url}" - #wget --quiet -P "${HOME}/Downloads" "${cmake_macos_url}" curl -sL "${cmake_macos_url}" --output "${HOME}"/Downloads/"${cmake_macos_dmg}" echo "ok." fi @@ -94,13 +84,6 @@ case "$(uname -s)" in echo "Please open the file from your Downloads folder." echo -e "************************************************************\n" exit 1 - - #echo -n " Installing cmake..." - #hdiutil attach -quiet -nobrowse "${HOME}"/"${cmake_macos_dmg}" - #cp -r ${cmake_macos_volume}/CMake.app/ /Applications/CMake.app/ - #hdiutil detach -quiet ${cmake_macos_volume} - #rm "${HOME}"/"${cmake_macos_dmg}" - #echo "ok." fi PATH="/Applications/CMake.app/Contents/bin${PATH:+:${PATH}}" fi From 5ab0e0f176cb8b25e8842da513443f4cfbe30928 Mon Sep 17 00:00:00 2001 From: Epic Curious <109078515+epiccurious@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:47:31 -0500 Subject: [PATCH 5/8] feat: appmy change to device-specific scripts --- device_specific/flash_the_m5stack_core_basic | 29 ++++++++++------ device_specific/flash_the_m5stack_fire | 29 ++++++++++------ .../flash_the_m5stack_m5stickc_plus | 33 ++++++++++++------- device_specific/flash_the_ttgo_tdisplay | 29 ++++++++++------ flash_your_device | 1 - 5 files changed, 79 insertions(+), 42 deletions(-) diff --git a/device_specific/flash_the_m5stack_core_basic b/device_specific/flash_the_m5stack_core_basic index 35c4415..c7bf06f 100755 --- a/device_specific/flash_the_m5stack_core_basic +++ b/device_specific/flash_the_m5stack_core_basic @@ -1,9 +1,16 @@ #!/bin/bash set -e +cleanup() { + rm -rf -- "${temp_directory}" + if [ "$(stat -c '%a' "${tty_device}")" != "${initial_tty_device_permissions}" ]; then + sudo chmod "${initial_tty_device_permissions}" "${tty_device}" + fi +} + working_directory="${HOME}/Downloads/diy_jade" temp_directory="${working_directory}/temp" -trap 'rm -rf -- "${temp_directory}"' EXIT +trap cleanup EXIT jade_git_tag="1.0.26" jade_save_directory="${working_directory}/jade" @@ -14,7 +21,7 @@ esp_idf_temp_directory="${temp_directory}/esp-idf" esp_idf_save_directory="${working_directory}/esp-idf" esp_idf_repo_url="https://github.com/espressif/esp-idf.git" -device="M5Stack Core Basic" +chosen_device="M5Stack Core Basic" tty_device="/dev/ttyACM0" clear @@ -23,7 +30,6 @@ echo "------------------------------------------------------------" echo "--- ---" echo "--- Do-It-Yourself Jade Install Script ---" echo "--- Written by Epic Curious ---" -echo "--- Twitter: @epic_curious ---" echo "--- ---" echo "------------------------------------------------------------" echo "------------------------------------------------------------" @@ -33,7 +39,7 @@ if [ "$(whoami)" = "root" ]; then echo -e "ALERT: You're running the script as root/superuser.\nYou may notice PIP 'sudo -H' warnings.\n" fi -echo "LINUX ONLY. Flashing the ${device}..." +echo "LINUX ONLY. Flashing the ${chosen_device}..." if ! command -v cmake &>/dev/null; then echo -e "\nERROR:\ncmake was not found on your system.\nPlease install cmake by running:\n\nsudo apt update && sudo apt install -y cmake\n" @@ -73,15 +79,18 @@ sed -i.bak '/CONFIG_DEBUG_MODE/d' ./sdkconfig.defaults sed -i.bak '1s/^/CONFIG_LOG_DEFUALT_LEVEL_NONE=y\n/' sdkconfig.defaults rm sdkconfig.defaults.bak +idf.py build + while [ ! -c "${tty_device}" ]; do - read -srn1 -p "Connect your ${device} and PRESS ANY KEY to continue... " && echo + read -srn1 -p "Connect your ${chosen_device} and PRESS ANY KEY to continue... " && echo done -tty_device_permissions="$(stat -c '%a' ${tty_device})" -if [ "${tty_device_permissions:2}" -lt 6 ]; then - echo -e "ERROR:\nYou need elevated permissions to write to the device.\nPlease update your device permissoins by running:\n\nsudo chmod o+rw ${tty_device}\n" - exit 1 +initial_tty_device_permissions="$(stat -c '%a' "${tty_device}")" +if [ "${initial_tty_device_permissions:2}" -lt 6 ]; then + echo -e "\nElevating write permissions for ${chosen_device}" + sudo chmod o+rw "${tty_device}" + echo fi idf.py flash -echo -e "\nSUCCESS! Your ${device} is now running Jade." +echo -e "\nSUCCESS! Jade ${jade_version} is now installed on your ${chosen_device}.\nYou can close this window.\n" diff --git a/device_specific/flash_the_m5stack_fire b/device_specific/flash_the_m5stack_fire index d7d741c..2361c38 100755 --- a/device_specific/flash_the_m5stack_fire +++ b/device_specific/flash_the_m5stack_fire @@ -1,9 +1,16 @@ #!/bin/bash set -e +cleanup() { + rm -rf -- "${temp_directory}" + if [ "$(stat -c '%a' "${tty_device}")" != "${initial_tty_device_permissions}" ]; then + sudo chmod "${initial_tty_device_permissions}" "${tty_device}" + fi +} + working_directory="${HOME}/Downloads/diy_jade" temp_directory="${working_directory}/temp" -trap 'rm -rf -- "${temp_directory}"' EXIT +trap cleanup EXIT jade_git_tag="1.0.26" jade_save_directory="${working_directory}/jade" @@ -14,7 +21,7 @@ esp_idf_temp_directory="${temp_directory}/esp-idf" esp_idf_save_directory="${working_directory}/esp-idf" esp_idf_repo_url="https://github.com/espressif/esp-idf.git" -device="M5Stack FIRE" +chosen_device="M5Stack FIRE" tty_device="/dev/ttyACM0" clear @@ -23,7 +30,6 @@ echo "------------------------------------------------------------" echo "--- ---" echo "--- Do-It-Yourself Jade Install Script ---" echo "--- Written by Epic Curious ---" -echo "--- Twitter: @epic_curious ---" echo "--- ---" echo "------------------------------------------------------------" echo "------------------------------------------------------------" @@ -33,7 +39,7 @@ if [ "$(whoami)" = "root" ]; then echo -e "ALERT: You're running the script as root/superuser.\nYou may notice PIP 'sudo -H' warnings.\n" fi -echo "LINUX ONLY. Flashing the ${device}..." +echo "LINUX ONLY. Flashing the ${chosen_device}..." if ! command -v cmake &>/dev/null; then echo -e "\nERROR:\ncmake was not found on your system.\nPlease install cmake by running:\n\nsudo apt update && sudo apt install -y cmake\n" @@ -73,15 +79,18 @@ sed -i.bak '/CONFIG_DEBUG_MODE/d' ./sdkconfig.defaults sed -i.bak '1s/^/CONFIG_LOG_DEFUALT_LEVEL_NONE=y\n/' sdkconfig.defaults rm sdkconfig.defaults.bak +idf.py build + while [ ! -c "${tty_device}" ]; do - read -srn1 -p "Connect your ${device} and PRESS ANY KEY to continue... " && echo + read -srn1 -p "Connect your ${chosen_device} and PRESS ANY KEY to continue... " && echo done -tty_device_permissions="$(stat -c '%a' ${tty_device})" -if [ "${tty_device_permissions:2}" -lt 6 ]; then - echo -e "ERROR:\nYou need elevated permissions to write to the device.\nPlease update your device permissoins by running:\n\nsudo chmod o+rw ${tty_device}\n" - exit 1 +initial_tty_device_permissions="$(stat -c '%a' "${tty_device}")" +if [ "${initial_tty_device_permissions:2}" -lt 6 ]; then + echo -e "\nElevating write permissions for ${chosen_device}" + sudo chmod o+rw "${tty_device}" + echo fi idf.py flash -echo -e "\nSUCCESS! Your ${device} is now running Jade." +echo -e "\nSUCCESS! Jade ${jade_version} is now installed on your ${chosen_device}.\nYou can close this window.\n" diff --git a/device_specific/flash_the_m5stack_m5stickc_plus b/device_specific/flash_the_m5stack_m5stickc_plus index 94260b5..1605e52 100755 --- a/device_specific/flash_the_m5stack_m5stickc_plus +++ b/device_specific/flash_the_m5stack_m5stickc_plus @@ -1,9 +1,16 @@ #!/bin/bash set -e +cleanup() { + rm -rf -- "${temp_directory}" + if [ "$(stat -c '%a' "${tty_device}")" != "${initial_tty_device_permissions}" ]; then + sudo chmod "${initial_tty_device_permissions}" "${tty_device}" + fi +} + working_directory="${HOME}/Downloads/diy_jade" temp_directory="${working_directory}/temp" -trap 'rm -rf -- "${temp_directory}"' EXIT +trap cleanup EXIT jade_git_tag="1.0.26" jade_save_directory="${working_directory}/jade" @@ -14,7 +21,7 @@ esp_idf_temp_directory="${temp_directory}/esp-idf" esp_idf_save_directory="${working_directory}/esp-idf" esp_idf_repo_url="https://github.com/espressif/esp-idf.git" -device="M5Stack M5StickC PLUS" +chosen_device="M5Stack M5StickC PLUS" tty_device="/dev/ttyUSB0" clear @@ -23,7 +30,6 @@ echo "------------------------------------------------------------" echo "--- ---" echo "--- Do-It-Yourself Jade Install Script ---" echo "--- Written by Epic Curious ---" -echo "--- Twitter: @epic_curious ---" echo "--- ---" echo "------------------------------------------------------------" echo "------------------------------------------------------------" @@ -33,7 +39,7 @@ if [ "$(whoami)" = "root" ]; then echo -e "ALERT: You're running the script as root/superuser.\nYou may notice PIP 'sudo -H' warnings.\n" fi -echo "LINUX ONLY. Flashing the ${device}..." +echo "LINUX ONLY. Flashing the ${chosen_device}..." if ! command -v cmake &>/dev/null; then echo -e "\nERROR:\ncmake was not found on your system.\nPlease install cmake by running:\n\nsudo apt update && sudo apt install -y cmake\n" @@ -73,15 +79,20 @@ sed -i.bak '/CONFIG_DEBUG_MODE/d' ./sdkconfig.defaults sed -i.bak '1s/^/CONFIG_LOG_DEFUALT_LEVEL_NONE=y\n/' sdkconfig.defaults rm sdkconfig.defaults.bak +idf.py build + while [ ! -c "${tty_device}" ]; do - read -srn1 -p "Connect your ${device} and PRESS ANY KEY to continue... " && echo + read -srn1 -p "Connect your ${chosen_device} and PRESS ANY KEY to continue... " && echo done -tty_device_permissions="$(stat -c '%a' ${tty_device})" -if [ "${tty_device_permissions:2}" -lt 6 ]; then - echo -e "ERROR:\nYou need elevated permissions to write to the device.\nPlease update your device permissoins by running:\n\nsudo chmod o+rw ${tty_device}\n" - exit 1 +initial_tty_device_permissions="$(stat -c '%a' "${tty_device}")" +if [ "${initial_tty_device_permissions:2}" -lt 6 ]; then + echo -e "\nElevating write permissions for ${chosen_device}" + sudo chmod o+rw "${tty_device}" + echo fi -idf.py -b 115200 flash +idf.py flash + +idf.py -p ${tty_device} -b 115200 flash -echo -e "\nSUCCESS! Your ${device} is now running Jade." +echo -e "\nSUCCESS! Jade ${jade_version} is now installed on your ${chosen_device}.\nYou can close this window.\n" diff --git a/device_specific/flash_the_ttgo_tdisplay b/device_specific/flash_the_ttgo_tdisplay index e421187..27dc644 100755 --- a/device_specific/flash_the_ttgo_tdisplay +++ b/device_specific/flash_the_ttgo_tdisplay @@ -1,9 +1,16 @@ #!/bin/bash set -e +cleanup() { + rm -rf -- "${temp_directory}" + if [ "$(stat -c '%a' "${tty_device}")" != "${initial_tty_device_permissions}" ]; then + sudo chmod "${initial_tty_device_permissions}" "${tty_device}" + fi +} + working_directory="${HOME}/Downloads/diy_jade" temp_directory="${working_directory}/temp" -trap 'rm -rf -- "${temp_directory}"' EXIT +trap cleanup EXIT jade_git_tag="1.0.26" jade_save_directory="${working_directory}/jade" @@ -14,7 +21,7 @@ esp_idf_temp_directory="${temp_directory}/esp-idf" esp_idf_save_directory="${working_directory}/esp-idf" esp_idf_repo_url="https://github.com/espressif/esp-idf.git" -device="TTGO T-Display" +chosen_device="TTGO T-Display" tty_device="/dev/ttyACM0" clear @@ -23,7 +30,6 @@ echo "------------------------------------------------------------" echo "--- ---" echo "--- Do-It-Yourself Jade Install Script ---" echo "--- Written by Epic Curious ---" -echo "--- Twitter: @epic_curious ---" echo "--- ---" echo "------------------------------------------------------------" echo "------------------------------------------------------------" @@ -33,7 +39,7 @@ if [ "$(whoami)" = "root" ]; then echo -e "ALERT: You're running the script as root/superuser.\nYou may notice PIP 'sudo -H' warnings.\n" fi -echo "LINUX ONLY. Flashing the ${device}..." +echo "LINUX ONLY. Flashing the ${chosen_device}..." if ! command -v cmake &>/dev/null; then echo -e "\nERROR:\ncmake was not found on your system.\nPlease install cmake by running:\n\nsudo apt update && sudo apt install -y cmake\n" @@ -73,15 +79,18 @@ sed -i.bak '/CONFIG_DEBUG_MODE/d' ./sdkconfig.defaults sed -i.bak '1s/^/CONFIG_LOG_DEFUALT_LEVEL_NONE=y\n/' sdkconfig.defaults rm sdkconfig.defaults.bak +idf.py build + while [ ! -c "${tty_device}" ]; do - read -srn1 -p "Connect your ${device} and PRESS ANY KEY to continue... " && echo + read -srn1 -p "Connect your ${chosen_device} and PRESS ANY KEY to continue... " && echo done -tty_device_permissions="$(stat -c '%a' ${tty_device})" -if [ "${tty_device_permissions:2}" -lt 6 ]; then - echo -e "ERROR:\nYou need elevated permissions to write to the device.\nPlease update your device permissoins by running:\n\nsudo chmod o+rw ${tty_device}\n" - exit 1 +initial_tty_device_permissions="$(stat -c '%a' "${tty_device}")" +if [ "${initial_tty_device_permissions:2}" -lt 6 ]; then + echo -e "\nElevating write permissions for ${chosen_device}" + sudo chmod o+rw "${tty_device}" + echo fi idf.py flash -echo -e "\nSUCCESS! Your ${device} is now running Jade." +echo -e "\nSUCCESS! Jade ${jade_version} is now installed on your ${chosen_device}.\nYou can close this window.\n" diff --git a/flash_your_device b/flash_your_device index ab1c315..35ce53f 100755 --- a/flash_your_device +++ b/flash_your_device @@ -32,7 +32,6 @@ echo "------------------------------------------------------------" echo "--- ---" echo "--- Do-It-Yourself Jade Install Script ---" echo "--- Written by Epic Curious ---" -echo "--- Twitter: @epic_curious ---" echo "--- ---" echo "------------------------------------------------------------" echo "------------------------------------------------------------" From 89da3ed99de3a2332ef2c3002fbe657e7a10b04e Mon Sep 17 00:00:00 2001 From: Epic Curious <109078515+epiccurious@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:50:05 -0500 Subject: [PATCH 6/8] fix: pull jade_version from the cloned repo --- device_specific/flash_the_m5stack_core_basic | 1 + device_specific/flash_the_m5stack_fire | 1 + device_specific/flash_the_m5stack_m5stickc_plus | 1 + device_specific/flash_the_ttgo_tdisplay | 1 + 4 files changed, 4 insertions(+) diff --git a/device_specific/flash_the_m5stack_core_basic b/device_specific/flash_the_m5stack_core_basic index c7bf06f..c4de571 100755 --- a/device_specific/flash_the_m5stack_core_basic +++ b/device_specific/flash_the_m5stack_core_basic @@ -73,6 +73,7 @@ if [ ! -d "${jade_save_directory}" ]; then git submodule update --depth 1 --init --recursive &> /dev/null fi cd "${jade_save_directory}" +jade_version="$(git describe --tags)" cp configs/sdkconfig_display_m5blackgray.defaults sdkconfig.defaults sed -i.bak '/CONFIG_DEBUG_MODE/d' ./sdkconfig.defaults diff --git a/device_specific/flash_the_m5stack_fire b/device_specific/flash_the_m5stack_fire index 2361c38..706a42b 100755 --- a/device_specific/flash_the_m5stack_fire +++ b/device_specific/flash_the_m5stack_fire @@ -73,6 +73,7 @@ if [ ! -d "${jade_save_directory}" ]; then git submodule update --depth 1 --init --recursive &> /dev/null fi cd "${jade_save_directory}" +jade_version="$(git describe --tags)" cp configs/sdkconfig_display_m5fire.defaults sdkconfig.defaults sed -i.bak '/CONFIG_DEBUG_MODE/d' ./sdkconfig.defaults diff --git a/device_specific/flash_the_m5stack_m5stickc_plus b/device_specific/flash_the_m5stack_m5stickc_plus index 1605e52..e48082a 100755 --- a/device_specific/flash_the_m5stack_m5stickc_plus +++ b/device_specific/flash_the_m5stack_m5stickc_plus @@ -73,6 +73,7 @@ if [ ! -d "${jade_save_directory}" ]; then git submodule update --depth 1 --init --recursive &> /dev/null fi cd "${jade_save_directory}" +jade_version="$(git describe --tags)" cp configs/sdkconfig_display_m5stickcplus.defaults sdkconfig.defaults sed -i.bak '/CONFIG_DEBUG_MODE/d' ./sdkconfig.defaults diff --git a/device_specific/flash_the_ttgo_tdisplay b/device_specific/flash_the_ttgo_tdisplay index 27dc644..3bce1c5 100755 --- a/device_specific/flash_the_ttgo_tdisplay +++ b/device_specific/flash_the_ttgo_tdisplay @@ -73,6 +73,7 @@ if [ ! -d "${jade_save_directory}" ]; then git submodule update --depth 1 --init --recursive &> /dev/null fi cd "${jade_save_directory}" +jade_version="$(git describe --tags)" cp configs/sdkconfig_display_ttgo_tdisplay.defaults sdkconfig.defaults sed -i.bak '/CONFIG_DEBUG_MODE/d' ./sdkconfig.defaults From 55229ed512dedce8ef69edc7fb2e54746de8003f Mon Sep 17 00:00:00 2001 From: Epic Curious <109078515+epiccurious@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:52:14 -0500 Subject: [PATCH 7/8] fix: broken link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 93d1d56..f3ebd6e 100644 --- a/README.md +++ b/README.md @@ -212,4 +212,4 @@ After the build and flash process completes, you should see the Jade initializat Inspiration for this project came from: - [Blockstream Jade](https://github.com/Blockstream/Jade/graphs/contributors) -- [@YTCryptoGuide](https://twitter.com/YTCryptoGuidelink) ([YouTube](https://youtube.com/CryptoGuide)). +- [@YTCryptoGuide](https://twitter.com/YTCryptoGuide) ([YouTube](https://youtube.com/CryptoGuide)). From 3a4e9b37dc3bb93496cfc66b2398edfc27a94652 Mon Sep 17 00:00:00 2001 From: Epic Curious <109078515+epiccurious@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:54:03 -0500 Subject: [PATCH 8/8] fix: remove broken link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f3ebd6e..349dd08 100644 --- a/README.md +++ b/README.md @@ -212,4 +212,4 @@ After the build and flash process completes, you should see the Jade initializat Inspiration for this project came from: - [Blockstream Jade](https://github.com/Blockstream/Jade/graphs/contributors) -- [@YTCryptoGuide](https://twitter.com/YTCryptoGuide) ([YouTube](https://youtube.com/CryptoGuide)). +- @YTCryptoGuide ([YouTube](https://youtube.com/CryptoGuide)).