From dc8b1ab114e94a71a42a8a1a578d14e7271faa2a Mon Sep 17 00:00:00 2001 From: Ken Van Hoeylandt Date: Tue, 23 Sep 2025 22:36:36 +0200 Subject: [PATCH] Fixes --- Apps/.clang-format => .clang-format | 0 .github/actions/build-app/action.yml | 2 +- Apps/Calculator/tactility.py | 13 ++++++++++--- Apps/GraphicsDemo/tactility.py | 13 ++++++++++--- Apps/HelloWorld/tactility.py | 13 ++++++++++--- 5 files changed, 31 insertions(+), 10 deletions(-) rename Apps/.clang-format => .clang-format (100%) diff --git a/Apps/.clang-format b/.clang-format similarity index 100% rename from Apps/.clang-format rename to .clang-format diff --git a/.github/actions/build-app/action.yml b/.github/actions/build-app/action.yml index 6a21e29..4332e3c 100644 --- a/.github/actions/build-app/action.yml +++ b/.github/actions/build-app/action.yml @@ -20,7 +20,7 @@ runs: - name: 'Upload Artifact' uses: actions/upload-artifact@v4 with: - name: Tactility-Apps + name: ${{ inputs.app_name }} path: Apps/${{ inputs.app_name}}/build/${{ inputs.app_name }}.app retention-days: 30 diff --git a/Apps/Calculator/tactility.py b/Apps/Calculator/tactility.py index faa4dfb..9af53c7 100644 --- a/Apps/Calculator/tactility.py +++ b/Apps/Calculator/tactility.py @@ -14,13 +14,14 @@ import shutil import configparser ttbuild_path = ".tactility" -ttbuild_version = "2.2.0" +ttbuild_version = "2.3.0" ttbuild_cdn = "https://cdn.tactility.one" ttbuild_sdk_json_validity = 3600 # seconds ttport = 6666 verbose = False use_local_sdk = False valid_platforms = ["esp32", "esp32s3"] +no_anmimations = False spinner_pattern = [ "⠋", @@ -71,6 +72,7 @@ def print_help(): print(" --local-sdk Use SDK specified by environment variable TACTILITY_SDK_PATH") print(" --skip-build Run everything except the idf.py/CMake commands") print(" --verbose Show extra console output") + print(" --no-animations Disable animations during building (e.g. for CI jobs)") # region Core @@ -319,13 +321,17 @@ def build_all(version, platforms, skip_build): break def wait_for_build(process, platform): + global no_animations buffer = [] os.set_blocking(process.stdout.fileno(), False) + if no_animations: + print(f"Building for {platform}") while process.poll() is None: for i in spinner_pattern: time.sleep(0.1) - progress_text = f"Building for {platform} {shell_color_cyan}" + str(i) + shell_color_reset - sys.stdout.write(progress_text + "\r") + if not no_animations: + progress_text = f"Building for {platform} {shell_color_cyan}" + str(i) + shell_color_reset + sys.stdout.write(progress_text + "\r") while True: line = process.stdout.readline() decoded_line = line.decode("UTF-8") @@ -566,6 +572,7 @@ if __name__ == "__main__": verbose = "--verbose" in sys.argv skip_build = "--skip-build" in sys.argv use_local_sdk = "--local-sdk" in sys.argv + no_animations = "--no-animations" in sys.argv # Environment setup setup_environment() if not os.path.isfile("manifest.properties"): diff --git a/Apps/GraphicsDemo/tactility.py b/Apps/GraphicsDemo/tactility.py index faa4dfb..9af53c7 100644 --- a/Apps/GraphicsDemo/tactility.py +++ b/Apps/GraphicsDemo/tactility.py @@ -14,13 +14,14 @@ import shutil import configparser ttbuild_path = ".tactility" -ttbuild_version = "2.2.0" +ttbuild_version = "2.3.0" ttbuild_cdn = "https://cdn.tactility.one" ttbuild_sdk_json_validity = 3600 # seconds ttport = 6666 verbose = False use_local_sdk = False valid_platforms = ["esp32", "esp32s3"] +no_anmimations = False spinner_pattern = [ "⠋", @@ -71,6 +72,7 @@ def print_help(): print(" --local-sdk Use SDK specified by environment variable TACTILITY_SDK_PATH") print(" --skip-build Run everything except the idf.py/CMake commands") print(" --verbose Show extra console output") + print(" --no-animations Disable animations during building (e.g. for CI jobs)") # region Core @@ -319,13 +321,17 @@ def build_all(version, platforms, skip_build): break def wait_for_build(process, platform): + global no_animations buffer = [] os.set_blocking(process.stdout.fileno(), False) + if no_animations: + print(f"Building for {platform}") while process.poll() is None: for i in spinner_pattern: time.sleep(0.1) - progress_text = f"Building for {platform} {shell_color_cyan}" + str(i) + shell_color_reset - sys.stdout.write(progress_text + "\r") + if not no_animations: + progress_text = f"Building for {platform} {shell_color_cyan}" + str(i) + shell_color_reset + sys.stdout.write(progress_text + "\r") while True: line = process.stdout.readline() decoded_line = line.decode("UTF-8") @@ -566,6 +572,7 @@ if __name__ == "__main__": verbose = "--verbose" in sys.argv skip_build = "--skip-build" in sys.argv use_local_sdk = "--local-sdk" in sys.argv + no_animations = "--no-animations" in sys.argv # Environment setup setup_environment() if not os.path.isfile("manifest.properties"): diff --git a/Apps/HelloWorld/tactility.py b/Apps/HelloWorld/tactility.py index faa4dfb..9af53c7 100644 --- a/Apps/HelloWorld/tactility.py +++ b/Apps/HelloWorld/tactility.py @@ -14,13 +14,14 @@ import shutil import configparser ttbuild_path = ".tactility" -ttbuild_version = "2.2.0" +ttbuild_version = "2.3.0" ttbuild_cdn = "https://cdn.tactility.one" ttbuild_sdk_json_validity = 3600 # seconds ttport = 6666 verbose = False use_local_sdk = False valid_platforms = ["esp32", "esp32s3"] +no_anmimations = False spinner_pattern = [ "⠋", @@ -71,6 +72,7 @@ def print_help(): print(" --local-sdk Use SDK specified by environment variable TACTILITY_SDK_PATH") print(" --skip-build Run everything except the idf.py/CMake commands") print(" --verbose Show extra console output") + print(" --no-animations Disable animations during building (e.g. for CI jobs)") # region Core @@ -319,13 +321,17 @@ def build_all(version, platforms, skip_build): break def wait_for_build(process, platform): + global no_animations buffer = [] os.set_blocking(process.stdout.fileno(), False) + if no_animations: + print(f"Building for {platform}") while process.poll() is None: for i in spinner_pattern: time.sleep(0.1) - progress_text = f"Building for {platform} {shell_color_cyan}" + str(i) + shell_color_reset - sys.stdout.write(progress_text + "\r") + if not no_animations: + progress_text = f"Building for {platform} {shell_color_cyan}" + str(i) + shell_color_reset + sys.stdout.write(progress_text + "\r") while True: line = process.stdout.readline() decoded_line = line.decode("UTF-8") @@ -566,6 +572,7 @@ if __name__ == "__main__": verbose = "--verbose" in sys.argv skip_build = "--skip-build" in sys.argv use_local_sdk = "--local-sdk" in sys.argv + no_animations = "--no-animations" in sys.argv # Environment setup setup_environment() if not os.path.isfile("manifest.properties"):