Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/publish-apps/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ runs:
run: pip install boto3
- name: 'Upload files'
shell: bash
run: python Buildscripts/CDN/upload-app-files.py cdn_files ${{ inputs.sdk_version }} ${{ env.CDN_ID }} ${{ env.CDN_TOKEN_NAME }} ${{ env.CDN_TOKEN_VALUE }}
run: python Scripts/CDN/upload-app-files.py cdn_files ${{ inputs.sdk_version }} ${{ env.CDN_ID }} ${{ env.CDN_TOKEN_NAME }} ${{ env.CDN_TOKEN_VALUE }}
16 changes: 13 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,21 @@ on:
permissions: read-all

jobs:
GenerateAppMatrix:
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/checkout@v4
with:
persist-credentials: false
- id: set-matrix
run: python3 Scripts/gh-generate-app-matrix.py
Build:
strategy:
matrix:
app_name: [Brainfuck, Breakout, Calculator, Diceware, Doom, EpubReader, EspNowBridge, GPIO, GraphicsDemo, HelloWorld, M5UnitTest, Magic8Ball, MediaKeys, MystifyDemo, SerialConsole, Snake, TamaTac, TodoList, TwoEleven]
runs-on: ubuntu-latest
needs: GenerateAppMatrix
strategy:
matrix: ${{ fromJSON(needs.GenerateAppMatrix.outputs.matrix) }}
steps:
- uses: actions/checkout@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions Apps/Brainfuck/manifest.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ manifest.version=0.3
target.sdk=0.8.0-dev
target.platforms=esp32,esp32s3,esp32c6,esp32p4
id=tactility.brainfuck
version.name=0.13.0
version.code=13
version.name=0.14.0
version.code=14
name=Brainfuck
description=Brainfuck esoteric language interpreter
app.0.id=tactility.brainfuck
Expand Down
4 changes: 2 additions & 2 deletions Apps/Breakout/manifest.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ manifest.version=0.3
target.sdk=0.8.0-dev
target.platforms=esp32,esp32s3,esp32c6,esp32p4
id=tactility.breakout
version.name=0.16.0
version.code=16
version.name=0.17.0
version.code=17
name=Breakout
description=Classic brick-breaking arcade game
app.0.id=tactility.breakout
Expand Down
4 changes: 2 additions & 2 deletions Apps/Calculator/manifest.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ manifest.version=0.3
target.sdk=0.8.0-dev
target.platforms=esp32,esp32s3,esp32c6,esp32p4
id=tactility.calculator
version.name=0.14.0
version.code=14
version.name=0.15.0
version.code=15
name=Calculator
app.0.id=tactility.calculator
app.0.name=Calculator
Expand Down
13 changes: 0 additions & 13 deletions Apps/CoreUtils/date/CMakeLists.txt

This file was deleted.

4 changes: 0 additions & 4 deletions Apps/CoreUtils/date/main/CMakeLists.txt

This file was deleted.

12 changes: 0 additions & 12 deletions Apps/CoreUtils/date/main/Source/main.c

This file was deleted.

13 changes: 0 additions & 13 deletions Apps/CoreUtils/echo/CMakeLists.txt

This file was deleted.

4 changes: 0 additions & 4 deletions Apps/CoreUtils/echo/main/CMakeLists.txt

This file was deleted.

12 changes: 0 additions & 12 deletions Apps/CoreUtils/echo/main/Source/main.c

This file was deleted.

16 changes: 0 additions & 16 deletions Apps/CoreUtils/manifest.properties

This file was deleted.

4 changes: 2 additions & 2 deletions Apps/Diceware/manifest.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ manifest.version=0.3
target.sdk=0.8.0-dev
target.platforms=esp32,esp32s3,esp32c6,esp32p4
id=tactility.diceware
version.name=0.16.0
version.code=16
version.name=0.17.0
version.code=17
name=Diceware
description=Password generator
app.0.id=tactility.diceware
Expand Down
4 changes: 2 additions & 2 deletions Apps/Doom/manifest.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ manifest.version=0.3
target.sdk=0.8.0-dev
target.platforms=esp32p4
id=tactility.doom
version.name=0.7.0
version.code=7
version.name=0.8.0
version.code=8
name=Doom
description=Classic DOOM. Tab5 only, keyboard required to play.
app.0.id=tactility.doom
Expand Down
4 changes: 2 additions & 2 deletions Apps/EpubReader/manifest.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ manifest.version=0.3
target.sdk=0.8.0-dev
target.platforms=esp32s3,esp32p4
id=tactility.epubreader
version.name=0.13.0
version.code=13
version.name=0.14.0
version.code=14
name=ePub Reader
description=ePub and text file reader. Requires PSRAM!
app.0.id=tactility.epubreader
Expand Down
2 changes: 2 additions & 0 deletions Apps/EspNowBridge/main/Source/EspNowBridge.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,8 @@ static void onUpdateButtonClicked(lv_event_t* /*event*/) {
.buffer = ctx->pickFileBuffer,
.buffer_capacity = sizeof(ctx->pickFileBuffer),
.event_group = ctx->eventGroup,
.window_size = {},
.alias_fd = -1,
};
uint32_t instanceId = 0;
if (app_start_for_result_with_streams(FILE_SELECTION_APP_ID, 1, argv, &binding, 1, ctx->appInstanceId, &instanceId) == ERROR_NONE) {
Expand Down
4 changes: 2 additions & 2 deletions Apps/EspNowBridge/manifest.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ manifest.version=0.3
target.sdk=0.8.0-dev
target.platforms=esp32p4
id=tactility.espnowbridge
version.name=0.11.0
version.code=11
version.name=0.12.0
version.code=12
name=ESP-NOW Bridge
description=Companion app for updating P4 device C6 co-processor firmware to enable ESP-NOW bridge support.
app.0.id=tactility.espnowbridge
Expand Down
4 changes: 2 additions & 2 deletions Apps/GPIO/manifest.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ manifest.version=0.3
target.sdk=0.8.0-dev
target.platforms=esp32,esp32s3,esp32c6,esp32p4
id=tactility.gpio
version.name=0.16.0
version.code=16
version.name=0.17.0
version.code=17
name=GPIO
description=Shows the live state of all GPIO pins
app.0.id=tactility.gpio
Expand Down
4 changes: 2 additions & 2 deletions Apps/GraphicsDemo/manifest.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ manifest.version=0.3
target.sdk=0.8.0-dev
target.platforms=esp32,esp32s3,esp32c6,esp32p4
id=tactility.graphicsdemo
version.name=0.14.0
version.code=14
version.name=0.15.0
version.code=15
name=Graphics Demo
app.0.id=tactility.graphicsdemo
app.0.name=Graphics Demo
Expand Down
4 changes: 2 additions & 2 deletions Apps/HelloWorld/manifest.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ manifest.version=0.3
target.sdk=0.8.0-dev
target.platforms=esp32,esp32s3,esp32c6,esp32p4,posix-x86_64
id=tactility.helloworld
version.name=0.14.0
version.code=14
version.name=0.15.0
version.code=15
name=Hello World
app.0.id=tactility.helloworld
app.0.name=Hello World
Expand Down
4 changes: 2 additions & 2 deletions Apps/M5UnitTest/manifest.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ manifest.version=0.3
target.sdk=0.8.0-dev
target.platforms=esp32s3,esp32p4
id=tactility.m5unittest
version.name=0.12.0
version.code=12
version.name=0.13.0
version.code=13
name=M5 Unit Test
app.0.id=tactility.m5unittest
app.0.name=M5 Unit Test
Expand Down
4 changes: 2 additions & 2 deletions Apps/Magic8Ball/manifest.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ manifest.version=0.3
target.sdk=0.8.0-dev
target.platforms=esp32,esp32s3,esp32c6,esp32p4
id=tactility.magic8ball
version.name=0.13.0
version.code=13
version.name=0.14.0
version.code=14
name=Magic 8-Ball
app.0.id=tactility.magic8ball
app.0.name=Magic 8-Ball
Expand Down
4 changes: 2 additions & 2 deletions Apps/MediaKeys/manifest.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ manifest.version=0.3
target.sdk=0.8.0-dev
target.platforms=esp32s3,esp32p4
id=tactility.mediakeys
version.name=0.14.0
version.code=14
version.name=0.15.0
version.code=15
name=Media Keys
description=Bluetooth media keys. Touch or Physical Keyboard control\nB - previous, P - play/pause, N - next, M - mute, D - volume down, U - volume up.\nQ or ESC to exit focus.
app.0.id=tactility.mediakeys
Expand Down
4 changes: 2 additions & 2 deletions Apps/MystifyDemo/manifest.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ manifest.version=0.3
target.sdk=0.8.0-dev
target.platforms=esp32,esp32s3,esp32c6,esp32p4
id=tactility.mystifydemo
version.name=0.15.0
version.code=15
version.name=0.16.0
version.code=16
name=Mystify Demo
description=A graphics demo that is inspired by a Windows 95 screensaver.
app.0.id=tactility.mystifydemo
Expand Down
4 changes: 2 additions & 2 deletions Apps/SerialConsole/manifest.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ manifest.version=0.3
target.sdk=0.8.0-dev
target.platforms=esp32,esp32s3,esp32c6,esp32p4
id=tactility.serialconsole
version.name=0.16.0
version.code=16
version.name=0.17.0
version.code=17
name=Serial Console
app.0.id=tactility.serialconsole
app.0.name=Serial Console
Expand Down
4 changes: 2 additions & 2 deletions Apps/Snake/manifest.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ manifest.version=0.3
target.sdk=0.8.0-dev
target.platforms=esp32,esp32s3,esp32c6,esp32p4
id=tactility.snake
version.name=0.17.0
version.code=17
version.name=0.18.0
version.code=18
name=Snake
description=Classic Snake game
app.0.id=tactility.snake
Expand Down
4 changes: 2 additions & 2 deletions Apps/TamaTac/manifest.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ manifest.version=0.3
target.sdk=0.8.0-dev
target.platforms=esp32,esp32s3,esp32c6,esp32p4
id=tactility.tamatac
version.name=0.12.0
version.code=12
version.name=0.13.0
version.code=13
name=TamaTac
description=Virtual pet inspired by Tamagotchi. Only runs on devices with PSRAM.
app.0.id=tactility.tamatac
Expand Down
4 changes: 2 additions & 2 deletions Apps/TodoList/manifest.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ manifest.version=0.3
target.sdk=0.8.0-dev
target.platforms=esp32,esp32s3,esp32c6,esp32p4
id=tactility.todolist
version.name=0.15.0
version.code=15
version.name=0.16.0
version.code=16
name=Todo List
description=Simple task list manager
app.0.id=tactility.todolist
Expand Down
4 changes: 2 additions & 2 deletions Apps/TwoEleven/manifest.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ manifest.version=0.3
target.sdk=0.8.0-dev
target.platforms=esp32,esp32s3,esp32c6,esp32p4
id=tactility.twoeleven
version.name=0.16.0
version.code=16
version.name=0.17.0
version.code=17
name=2048
description=A fun, customizable 2048 sliding tile game for tactility!\nSlide tiles to combine numbers and reach 2048.\nChoose grid sizes: 3x3 (easy), 4x4 (classic), 5x5, or 6x6 (expert).
app.0.id=tactility.twoeleven
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions Tools/bump-versions.py → Scripts/bump-versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"""Bump app.version.name and app.version.code in all app manifests.

Usage:
python Tools/bump-versions.py major # 0.10.0 -> 1.0.0
python Tools/bump-versions.py minor # 0.10.0 -> 0.11.0
python Tools/bump-versions.py patch # 0.10.0 -> 0.10.1
python Scripts/bump-versions.py major # 0.10.0 -> 1.0.0
python Scripts/bump-versions.py minor # 0.10.0 -> 0.11.0
python Scripts/bump-versions.py patch # 0.10.0 -> 0.10.1

Regardless of the argument, app.version.code is incremented by 1.
"""
Expand Down
38 changes: 38 additions & 0 deletions Scripts/gh-generate-app-matrix.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#!/usr/bin/env python3
"""Discover app directories under Apps/ and emit a GitHub Actions matrix.

Used by .github/workflows/main.yml's GenerateAppMatrix job so new apps are
picked up automatically instead of needing to be added to a hardcoded list.
"""

import json
import os
import sys
from pathlib import Path

APPS_DIR = Path(__file__).resolve().parent.parent / "Apps"
MANIFEST = "manifest.properties"


def get_app_names():
names = []
for entry in sorted(os.listdir(APPS_DIR)):
app_dir = APPS_DIR / entry
if app_dir.is_dir() and (app_dir / MANIFEST).is_file():
names.append(entry)
return names


def main():
matrix_json = json.dumps({"app_name": get_app_names()})

github_output = os.environ.get("GITHUB_OUTPUT")
if github_output:
with open(github_output, "a") as file:
file.write(f"matrix={matrix_json}\n")
else:
print(matrix_json)


if __name__ == "__main__":
main()
File renamed without changes.
4 changes: 3 additions & 1 deletion tactility.py
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env python3

import json
import os
import re
Expand All @@ -12,7 +14,7 @@
from urllib.parse import urlparse

ttbuild_path = ".tactility"
ttbuild_version = "6.0.0"
ttbuild_version = "6.1.0"
ttbuild_cdn = "https://cdn.tactilityproject.org"
ttbuild_sdk_json_validity = 3600 # seconds
ttport = 6666
Expand Down
Loading