feat: Add JPEG decoder configuration and fix LCD color inversion

- Fixed crash when returning to Setup app (from any of the steps)
- Fixed crash when returning to TimeDateSettings app (after locale selection)
- Fixed GuiService inconsistent behaviour: now always perform operations async (e.g. to show/hide apps). This fixes crashes in some onHide() calls where onHide() might be called before onShow() was called.
- Fix for incorrect WebServService path
- Remove CYD-4848S040C SD card functionality, but added a GPIO fix for releasing 3-wire SPI pin sharing.
- Fix for saving/loading settings for various apps

.github/workflows/build-simulator.yml

@@ -11,6 +11,8 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: "Build"
         uses: ./.github/actions/build-simulator
         with:
@@ -21,6 +23,8 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: "Build"
         uses: ./.github/actions/build-simulator
         with:

.github/workflows/build.yml

@@ -23,6 +23,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: "Build SDK"
         uses: ./.github/actions/build-sdk
         with:
@@ -66,7 +68,6 @@ jobs:
           { id: m5stack-cores3, arch: esp32s3 },
           { id: m5stack-papers3, arch: esp32s3 },
           { id: m5stack-stackchan, arch: esp32s3 },
-          { id: m5stack-stickc-plus, arch: esp32 },
           { id: m5stack-stickc-plus2, arch: esp32 },
           { id: m5stack-sticks3, arch: esp32s3 },
           { id: m5stack-tab5, arch: esp32p4 },
@@ -82,6 +83,8 @@ jobs:
     needs: [ BuildSdk ]
     steps:
       - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: "Build Firmware"
         uses: ./.github/actions/build-firmware
         with:

.github/workflows/tests.yml

@@ -31,8 +31,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout repo"
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
         with:
+          persist-credentials: false
           submodules: recursive
       - name: "Install Python Dependencies"
         shell: bash

Buildscripts/CDN/generate-firmware-files.py

@@ -2,11 +2,9 @@ import subprocess
 from datetime import datetime, UTC
 import os
 import sys
-import configparser
 from dataclasses import dataclass, asdict
 import json
 import shutil
-from configparser import RawConfigParser
 
 VERBOSE = False
 DEVICES_FOLDER = "Devices"
@@ -68,32 +66,29 @@ def exit_with_error(message):
     sys.exit(1)
 
 def read_properties_file(path):
-    config = configparser.RawConfigParser()
-    # Don't convert keys to lowercase
-    config.optionxform = str
-    config.read(path)
-    return config
+    properties = {}
+    with open(path, "r") as file:
+        for line in file:
+            stripped = line.strip()
+            if not stripped or stripped.startswith("#"):
+                continue
+            key, sep, value = line.partition("=")
+            if not sep:
+                continue
+            properties[key.strip()] = value.strip()
+    return properties
 
-def get_property_or_none(properties: RawConfigParser, group: str, key: str):
-    if group not in properties.sections():
-        return None
-    if key not in properties[group].keys():
-        return None
-    return properties[group][key]
+def get_property_or_none(properties: dict, group: str, key: str):
+    return properties.get(f"{group}.{key}")
 
-def get_boolean_property_or_false(properties: RawConfigParser, group: str, key: str):
-    if group not in properties.sections():
-        return False
-    if key not in properties[group].keys():
-        return False
-    return properties[group][key] == "true"
+def get_boolean_property_or_false(properties: dict, group: str, key: str):
+    return properties.get(f"{group}.{key}") == "true"
 
-def get_property_or_exit(properties: RawConfigParser, group: str, key: str):
-    if group not in properties.sections():
-        exit_with_error(f"Device properties does not contain group: {group}")
-    if key not in properties[group].keys():
-        exit_with_error(f"Device properties does not contain key: {key}")
-    return properties[group][key]
+def get_property_or_exit(properties: dict, group: str, key: str):
+    full_key = f"{group}.{key}"
+    if full_key not in properties:
+        exit_with_error(f"Device properties does not contain key: {full_key}")
+    return properties[full_key]
 
 def read_device_properties(device_id):
     mapping_file_path = os.path.join(DEVICES_FOLDER, device_id, "device.properties")
@@ -129,7 +124,7 @@ def to_manifest_chip_name(name):
         return ""
 
 
-def process_device(in_path: str, out_path: str, device_directory: str, device_id: str, device_properties: RawConfigParser, version: str):
+def process_device(in_path: str, out_path: str, device_directory: str, device_id: str, device_properties: dict, version: str):
     in_device_path = os.path.join(in_path, device_directory)
     in_device_binaries_path = os.path.join(in_device_path, "Binaries")
     if not os.path.isdir(in_device_binaries_path):

Buildscripts/gh-download-artifacts.py

@@ -0,0 +1,135 @@
+#!/usr/bin/env python3
+"""Download all artifacts from a GitHub Actions workflow run."""
+
+import argparse
+import os
+import subprocess
+import sys
+import zipfile
+from pathlib import Path
+
+import requests
+
+API_URL = "https://api.github.com"
+
+
+def get_token(cli_token: str | None) -> str:
+    if cli_token:
+        return cli_token
+    env_token = os.environ.get("GITHUB_TOKEN") or os.environ.get("GH_TOKEN")
+    if env_token:
+        return env_token
+    try:
+        result = subprocess.run(
+            ["gh", "auth", "token"], capture_output=True, text=True, check=True
+        )
+        return result.stdout.strip()
+    except (FileNotFoundError, subprocess.CalledProcessError):
+        sys.exit(
+            "No token found. Pass --token, set GITHUB_TOKEN/GH_TOKEN, or run `gh auth login`."
+        )
+
+
+def get_repo(cli_repo: str | None) -> str:
+    if cli_repo:
+        return cli_repo
+    try:
+        result = subprocess.run(
+            ["git", "remote", "get-url", "origin"],
+            capture_output=True,
+            text=True,
+            check=True,
+        )
+        url = result.stdout.strip()
+    except (FileNotFoundError, subprocess.CalledProcessError):
+        sys.exit("Could not detect repo from git remote. Pass --repo owner/name.")
+
+    # Handle both SSH and HTTPS remote URLs.
+    if url.startswith("git@"):
+        path = url.split(":", 1)[1]
+    else:
+        path = url.split("github.com/", 1)[-1]
+    return path.removesuffix(".git")
+
+
+def download_artifacts(repo: str, run_id: str, token: str, out_dir: Path):
+    headers = {
+        "Authorization": f"Bearer {token}",
+        "Accept": "application/vnd.github+json",
+        "X-GitHub-Api-Version": "2022-11-28",
+    }
+
+    out_dir.mkdir(parents=True, exist_ok=True)
+
+    url = f"{API_URL}/repos/{repo}/actions/runs/{run_id}/artifacts"
+    artifacts = []
+    while url:
+        resp = requests.get(url, headers=headers, params={"per_page": 100})
+        resp.raise_for_status()
+        data = resp.json()
+        artifacts.extend(data["artifacts"])
+        url = resp.links.get("next", {}).get("url")
+
+    if not artifacts:
+        print(f"No artifacts found for run {run_id}.")
+        return
+
+    for artifact in artifacts:
+        name = artifact["name"]
+        if name == "all-artifacts":
+            print(f"Skipping {name}")
+            continue
+        if artifact.get("expired"):
+            print(f"Skipping expired artifact: {name}")
+            continue
+
+        print(f"Downloading {name} ({artifact['size_in_bytes']} bytes)...")
+        download_url = artifact["archive_download_url"]
+        resp = requests.get(download_url, headers=headers, stream=True)
+        resp.raise_for_status()
+
+        zip_path = out_dir / f"{name}.zip"
+        with open(zip_path, "wb") as f:
+            for chunk in resp.iter_content(chunk_size=8192):
+                f.write(chunk)
+
+        if name.endswith(".bin"):
+            with zipfile.ZipFile(zip_path) as zf:
+                zf.extractall(out_dir)
+            zip_path.unlink()
+            print(f"  Extracted to {out_dir}")
+        else:
+            print(f"  Saved to {zip_path}")
+
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("run_id", help="GitHub Actions run ID")
+    parser.add_argument(
+        "--repo",
+        help="owner/repo (default: detected from git remote 'origin')",
+    )
+    parser.add_argument(
+        "--token",
+        help="GitHub token (default: $GITHUB_TOKEN, $GH_TOKEN, or `gh auth token`)",
+    )
+    parser.add_argument(
+        "--out",
+        default="artifacts",
+        help="Output directory (default: ./artifacts)",
+    )
+    args = parser.parse_args()
+
+    repo = get_repo(args.repo)
+    token = get_token(args.token)
+    out_dir = Path(args.out)
+
+    print(f"Repo: {repo}")
+    print(f"Run ID: {args.run_id}")
+    print(f"Output: {out_dir.resolve()}")
+
+    download_artifacts(repo, args.run_id, token, out_dir)
+
+
+if __name__ == "__main__":
+    main()

Buildscripts/gh-release-summary.py

@@ -0,0 +1,126 @@
+#!/usr/bin/env python3
+"""Summarize commits between the last 2 pushed git tags into commits.md and pull-requests.md."""
+
+import argparse
+import re
+import subprocess
+import sys
+from pathlib import Path
+
+PR_REF_RE = re.compile(r"#(\d+)")
+
+
+def get_repo(cli_repo: str | None) -> str:
+    if cli_repo:
+        return cli_repo
+    try:
+        result = subprocess.run(
+            ["git", "remote", "get-url", "origin"],
+            capture_output=True,
+            text=True,
+            check=True,
+        )
+        url = result.stdout.strip()
+    except (FileNotFoundError, subprocess.CalledProcessError):
+        sys.exit("Could not detect repo from git remote. Pass --repo owner/name.")
+
+    if url.startswith("git@"):
+        path = url.split(":", 1)[1]
+    else:
+        path = url.split("github.com/", 1)[-1]
+    return path.removesuffix(".git")
+
+
+def get_last_two_tags() -> tuple[str, str]:
+    result = subprocess.run(
+        ["git", "tag", "--sort=-creatordate"],
+        capture_output=True,
+        text=True,
+        check=True,
+    )
+    tags = [t for t in result.stdout.splitlines() if t]
+    if len(tags) < 2:
+        sys.exit(f"Need at least 2 tags, found {len(tags)}.")
+    return tags[1], tags[0]  # previous, latest
+
+
+def get_commits(prev_tag: str, latest_tag: str) -> list[tuple[str, str]]:
+    result = subprocess.run(
+        [
+            "git",
+            "log",
+            "--pretty=format:%H\x1f%s",
+            f"{prev_tag}..{latest_tag}",
+        ],
+        capture_output=True,
+        text=True,
+        check=True,
+    )
+    commits = []
+    for line in result.stdout.splitlines():
+        if not line:
+            continue
+        sha, subject = line.split("\x1f", 1)
+        commits.append((sha, subject))
+    return commits
+
+
+def write_commits_md(path: Path, repo: str, prev_tag: str, latest_tag: str, commits: list[tuple[str, str]]):
+    lines = [f"# Commits: {prev_tag}..{latest_tag}", ""]
+    for sha, subject in commits:
+        link = f"https://github.com/{repo}/commit/{sha}"
+        lines.append(f"- [{subject}]({link})")
+    path.write_text("\n".join(lines) + "\n")
+
+
+def write_pull_requests_md(path: Path, repo: str, commits: list[tuple[str, str]]):
+    pr_numbers = []
+    seen = set()
+    for _, subject in commits:
+        for match in PR_REF_RE.finditer(subject):
+            number = match.group(1)
+            if number not in seen:
+                seen.add(number)
+                pr_numbers.append(number)
+
+    lines = ["# Pull Requests", ""]
+    for number in pr_numbers:
+        lines.append(f"- https://github.com/{repo}/pull/{number}")
+    path.write_text("\n".join(lines) + "\n")
+
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument(
+        "--repo",
+        help="owner/repo (default: detected from git remote 'origin')",
+    )
+    parser.add_argument(
+        "--out",
+        default=".",
+        help="Output directory for commits.md and pull-requests.md (default: current directory)",
+    )
+    args = parser.parse_args()
+
+    repo = get_repo(args.repo)
+    prev_tag, latest_tag = get_last_two_tags()
+    commits = get_commits(prev_tag, latest_tag)
+
+    out_dir = Path(args.out)
+    out_dir.mkdir(parents=True, exist_ok=True)
+
+    commits_path = out_dir / "release-commits.md"
+    prs_path = out_dir / "release-pull-requests.md"
+
+    write_commits_md(commits_path, repo, prev_tag, latest_tag, commits)
+    write_pull_requests_md(prs_path, repo, commits)
+
+    print(f"Repo: {repo}")
+    print(f"Tags: {prev_tag}..{latest_tag}")
+    print(f"Commits: {len(commits)}")
+    print(f"Wrote {commits_path}")
+    print(f"Wrote {prs_path}")
+
+
+if __name__ == "__main__":
+    main()

Buildscripts/properties.cmake

@@ -28,7 +28,6 @@ function(READ_PROPERTIES_TO_MAP PROPERTY_FILE RESULT_VAR)
     endif ()
 
     file(STRINGS ${PROPERTY_FILE_ABS} lines)
-    set(current_section "")
     set(map_content "")
 
     foreach(line IN LISTS lines)
@@ -37,9 +36,7 @@ function(READ_PROPERTIES_TO_MAP PROPERTY_FILE RESULT_VAR)
             continue()
         endif ()
 
-        if (line MATCHES "^\\[.*\\]$")
-            set(current_section "${line}")
-        elseif (line MATCHES "^([^=]+)=(.*)$")
+        if (line MATCHES "^([^=]+)=(.*)$")
             set(key "${CMAKE_MATCH_1}")
             set(value "${CMAKE_MATCH_2}")
             string(STRIP "${key}" key)
@@ -49,7 +46,7 @@ function(READ_PROPERTIES_TO_MAP PROPERTY_FILE RESULT_VAR)
                 set(value "${CMAKE_MATCH_1}")
             endif ()
 
-            list(APPEND map_content "${current_section}${key}" "${value}")
+            list(APPEND map_content "${key}" "${value}")
         endif ()
     endforeach()
 

Buildscripts/release-summary.py

@@ -0,0 +1,84 @@
+#!/usr/bin/env python3
+"""Generate a release summary markdown by combining gh-release-summary.py output with Claude."""
+
+import argparse
+import subprocess
+import sys
+from pathlib import Path
+
+SCRIPT_DIR = Path(__file__).resolve().parent
+
+SECTIONS = [
+    "New Devices",
+    "New Features",
+    "New Apps",
+    "Improvements & Fixes",
+    "Other Changes",
+    "TactilitySDK",
+    "Known Issues",
+]
+
+
+def run_gh_release_summary(out_dir: Path, repo: str | None):
+    cmd = [sys.executable, str(SCRIPT_DIR / "gh-release-summary.py"), "--out", str(out_dir)]
+    if repo:
+        cmd += ["--repo", repo]
+    subprocess.run(cmd, check=True)
+
+
+def build_prompt() -> str:
+    section_list = "\n".join(f"- {s}" for s in SECTIONS)
+    return (
+        "You are given a list of commits (with GitHub commit links) and a list of pull "
+        "request links from a software release. Write a release summary in Markdown, "
+        "organizing changes into these sections (omit a section if it has no relevant "
+        "changes):\n\n"
+        f"{section_list}\n\n"
+        "Use concise bullet points. Base every bullet strictly on the given commits and "
+        "pull requests, referencing the pull request link where applicable. Output only "
+        "the Markdown, no commentary before or after it."
+        "If a pull request or commit has multiple changes add them as separate entries."
+        "Ignore irrelevant changes: documentation, minor fixes, non-descript fixes, scripts, github workflows."
+        "For 'New Devices': only mention the device name, don't like pull request."
+        "For 'Improvements & Fixes': Avoid non-descript entries, write specifics."
+        "For 'TactilitySDK': Avoid generic changes, be specific. Mention API changes."
+    )
+
+
+def run_claude(commits_md: str, prs_md: str) -> str:
+    prompt = build_prompt()
+    stdin_content = f"## Commits\n\n{commits_md}\n\n## Pull Requests\n\n{prs_md}"
+    result = subprocess.run(
+        ["claude", "-p", prompt],
+        input=stdin_content,
+        capture_output=True,
+        text=True,
+        check=True,
+    )
+    return result.stdout
+
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--repo", help="owner/repo (default: detected from git remote 'origin')")
+    parser.add_argument("--out", default=".", help="Output directory (default: current directory)")
+    args = parser.parse_args()
+
+    out_dir = Path(args.out)
+    out_dir.mkdir(parents=True, exist_ok=True)
+
+    run_gh_release_summary(out_dir, args.repo)
+
+    commits_md = (out_dir / "release-commits.md").read_text()
+    prs_md = (out_dir / "release-pull-requests.md").read_text()
+
+    print("Generating release summary via claude...")
+    summary = run_claude(commits_md, prs_md)
+
+    summary_path = out_dir / "release-summary.md"
+    summary_path.write_text(summary)
+    print(f"Wrote {summary_path}")
+
+
+if __name__ == "__main__":
+    main()

CMakeLists.txt

@@ -54,6 +54,8 @@ if (DEFINED ENV{ESP_IDF_VERSION})
 
     set(EXCLUDE_COMPONENTS "Simulator")
 
+    idf_build_set_property(LINK_OPTIONS "-Wl,--allow-multiple-definition" APPEND)
+
     # Panic handler wrapping is only available on Xtensa architecture
     if (CONFIG_IDF_TARGET_ARCH_XTENSA)
         idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=esp_panic_handler" APPEND)
@@ -76,6 +78,7 @@ else ()
     add_compile_definitions(CONFIG_TT_DEVICE_NAME_SIMPLE="Simulator")
     add_compile_definitions(CONFIG_TT_LAUNCHER_APP_ID="Launcher")
     add_compile_definitions(CONFIG_TT_AUTO_START_APP_ID="")
+    add_compile_definitions(CONFIG_TT_USER_DATA_LOCATION_INTERNAL)
 endif ()
 
 project(Tactility)
@@ -103,8 +106,9 @@ if (NOT DEFINED ENV{ESP_IDF_VERSION})
     target_compile_definitions(freertos_kernel PUBLIC "projCOVERAGE_TEST=0")
 
     # EmbedTLS
-    set(ENABLE_TESTING OFF)
-    set(ENABLE_PROGRAMS OFF)
+    set(ENABLE_TESTING OFF CACHE BOOL "" FORCE)
+    set(ENABLE_PROGRAMS OFF CACHE BOOL "" FORCE)
+    set(MBEDTLS_FATAL_WARNINGS OFF CACHE BOOL "" FORCE)
     add_subdirectory(Libraries/mbedtls)
 
     # SDL

Data/data/service/bluetooth/settings.properties

@@ -1 +0,0 @@
-enableOnBoot=false

Data/data/service/wifi/settings.properties

@@ -1 +0,0 @@
-enableOnBoot=false

Data/data/settings/development.properties

@@ -1 +0,0 @@
-enableOnBoot=false

Data/data/settings/system.properties

@@ -1,5 +0,0 @@
-language=en-US
-timeFormat24h=true
-dateFormat=DD/MM/YYYY
-region=EU
-timezone=Europe/Amsterdam

Data/system/app/WebServer/dashboard.html

@@ -485,7 +485,7 @@
                     <button class="btn btn-secondary btn-sm" onclick="goUp()" id="upBtn">Up</button>
                 </div>
                 <div class="toolbar-sep"></div>
-                <input type="text" id="pathInput" value="/data" onkeydown="if(event.key==='Enter')refreshFiles()">
+                <input type="text" id="pathInput" value="" onkeydown="if(event.key==='Enter')refreshFiles()">
                 <button class="btn btn-primary btn-sm" onclick="refreshFiles()">Go</button>
                 <div class="toolbar-sep"></div>
                 <div class="toolbar-group">
@@ -739,7 +739,6 @@ function renderDashboard(data) {
             <div class="card">
                 <h2>Quick Actions</h2>
                 <div class="actions">
-                    <button class="btn btn-primary" onclick="syncAssets(this)">Sync Assets</button>
                     ${data.features_enabled?.screenshot ? '<button class="btn btn-secondary" onclick="captureScreenshot(this)">Screenshot</button>' : ''}
                     <button class="btn btn-danger" onclick="rebootDevice(this)">Reboot</button>
                 </div>

Data/webserver/default.html

@@ -1,63 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Tactility Dashboard</title>
-    <style>
-        body {
-            font-family: Arial, sans-serif;
-            max-width: 800px;
-            margin: 20px auto;
-            padding: 20px;
-            background-color: #f5f5f5;
-        }
-        h1 {
-            color: #333;
-            text-align: center;
-        }
-        .placeholder {
-            background: white;
-            padding: 40px;
-            border-radius: 8px;
-            box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-            text-align: center;
-            margin: 20px 0;
-        }
-        .placeholder h2 {
-            color: #666;
-        }
-        .placeholder p {
-            color: #666;
-            line-height: 1.6;
-        }
-        a {
-            color: #007bff;
-            text-decoration: none;
-        }
-        a:hover {
-            text-decoration: underline;
-        }
-    </style>
-</head>
-<body>
-    <h1>Tactility Default Dashboard</h1>
-    
-    <div class="placeholder">
-        <h2>Version 0 - Default Placeholder</h2>
-        <p>This is the default dashboard bundled with firmware.</p>
-        <p>To customize this interface:</p>
-        <ol style="text-align: left; display: inline-block;">
-            <li>Create your custom dashboard HTML/CSS/JS files</li>
-            <li>Add them to <code>/sdcard/tactility/webserver/</code></li>
-            <li>Create <code>version.json</code> with <code>{"version": 1}</code> or higher</li>
-            <li>Reboot or click "Sync Assets" on the <a href="/">Core Interface</a></li>
-        </ol>
-        <p><strong>Your custom assets will automatically replace this page!</strong></p>
-    </div>
-    
-    <div class="placeholder">
-        <p><a href="/">← Back to Core Interface</a></p>
-    </div>
-</body>
-</html>

Data/webserver/version.json

@@ -1,3 +0,0 @@
-{
-  "version": 0
-}

Devices/btt-panda-touch/device.properties

@@ -1,25 +1,22 @@
-[general]
-vendor=BigTreeTech
-name=Panda Touch,K Touch
+general.vendor=BigTreeTech
+general.name=Panda Touch,K Touch
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32S3
-flashSize=16MB
-spiRam=true
-spiRamMode=OCT
-spiRamSpeed=120M
-esptoolFlashFreq=120M
-bluetooth=true
-usbHostEnabled=true
+hardware.target=ESP32S3
+hardware.flashSize=16MB
+hardware.spiRam=true
+hardware.spiRamMode=OCT
+hardware.spiRamSpeed=120M
+hardware.esptoolFlashFreq=120M
+hardware.bluetooth=true
+hardware.usbHostEnabled=true
 
-[display]
-size=5"
-shape=rectangle
-dpi=187
+storage.userDataLocation=Internal
 
-[lvgl]
-colorDepth=16
-fontSize=18
+display.size=5"
+display.shape=rectangle
+display.dpi=187
+
+lvgl.colorDepth=16
+lvgl.fontSize=18

Devices/cyd-2432s024c/device.properties

@@ -1,19 +1,16 @@
-[general]
-vendor=CYD
-name=2432S024C
+general.vendor=CYD
+general.name=2432S024C
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32
-flashSize=4MB
-spiRam=false
+hardware.target=ESP32
+hardware.flashSize=4MB
+hardware.spiRam=false
 
-[display]
-size=2.4"
-shape=rectangle
-dpi=167
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
+display.size=2.4"
+display.shape=rectangle
+display.dpi=167
+
+lvgl.colorDepth=16

Devices/cyd-2432s024r/device.properties

@@ -1,19 +1,16 @@
-[general]
-vendor=CYD
-name=2432S024R
+general.vendor=CYD
+general.name=2432S024R
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32
-flashSize=4MB
-spiRam=false
+hardware.target=ESP32
+hardware.flashSize=4MB
+hardware.spiRam=false
 
-[display]
-size=2.4"
-shape=rectangle
-dpi=167
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
+display.size=2.4"
+display.shape=rectangle
+display.dpi=167
+
+lvgl.colorDepth=16

Devices/cyd-2432s028r/device.properties

@@ -1,22 +1,18 @@
-[general]
-vendor=CYD
-name=2432S028R
+general.vendor=CYD
+general.name=2432S028R
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32
-flashSize=4MB
-spiRam=false
+hardware.target=ESP32
+hardware.flashSize=4MB
+hardware.spiRam=false
 
-[display]
-size=2.8"
-shape=rectangle
-dpi=143
+storage.userDataLocation=SD
 
-[cdn]
-warningMessage=There are 3 hardware variants of this board. This build works on the original variant only ("v1").
+display.size=2.8"
+display.shape=rectangle
+display.dpi=143
 
-[lvgl]
-colorDepth=16
+cdn.warningMessage=There are 3 hardware variants of this board. This build works on the original variant only ("v1").
+
+lvgl.colorDepth=16

Devices/cyd-2432s028rv3/device.properties

@@ -1,22 +1,18 @@
-[general]
-vendor=CYD
-name=2432S028R v3
+general.vendor=CYD
+general.name=2432S028R v3
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32
-flashSize=4MB
-spiRam=false
+hardware.target=ESP32
+hardware.flashSize=4MB
+hardware.spiRam=false
 
-[display]
-size=2.8"
-shape=rectangle
-dpi=143
+storage.userDataLocation=SD
 
-[cdn]
-warningMessage=There are 3 hardware variants of this board. This build only supports board version 3.
+display.size=2.8"
+display.shape=rectangle
+display.dpi=143
 
-[lvgl]
-colorDepth=16
+cdn.warningMessage=There are 3 hardware variants of this board. This build only supports board version 3.
+
+lvgl.colorDepth=16

Devices/cyd-2432s032c/device.properties

@@ -1,19 +1,16 @@
-[general]
-vendor=CYD
-name=2432S032C
+general.vendor=CYD
+general.name=2432S032C
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32
-flashSize=4MB
-spiRam=false
+hardware.target=ESP32
+hardware.flashSize=4MB
+hardware.spiRam=false
 
-[display]
-size=3.2"
-shape=rectangle
-dpi=125
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
+display.size=3.2"
+display.shape=rectangle
+display.dpi=125
+
+lvgl.colorDepth=16

Devices/cyd-3248s035c/device.properties

@@ -1,19 +1,16 @@
-[general]
-vendor=CYD
-name=3248S035C
-
-[apps]
-launcherAppId=Launcher
-
-[hardware]
-target=ESP32
-flashSize=4MB
-spiRam=false
-
-[display]
-size=3.5"
-shape=rectangle
-dpi=165
-
-[lvgl]
-colorDepth=16
+general.vendor=CYD
+general.name=3248S035C
+
+apps.launcherAppId=Launcher
+
+hardware.target=ESP32
+hardware.flashSize=4MB
+hardware.spiRam=false
+
+storage.userDataLocation=SD
+
+display.size=3.5"
+display.shape=rectangle
+display.dpi=165
+
+lvgl.colorDepth=16

Devices/cyd-4848s040c/Source/devices/St7701Display.cpp

@@ -12,9 +12,25 @@
 #include <esp_lcd_panel_ops.h>
 #include <esp_lcd_panel_io_additions.h>
 #include <esp_lcd_st7701.h>
+#include <esp_rom_gpio.h>
+#include <soc/spi_periph.h>
+#include <driver/spi_master.h>
 
 static const auto LOGGER = tt::Logger("St7701Display");
 
+// GPIO47/48 are physically shared between this bit-banged 3-wire command bus
+// and the SD card's real SPI2 bus (no alternate pins exist on this PCB).
+// esp_lcd_new_panel_io_3wire_spi() reconfigures them as plain GPIO via
+// gpio_config(), severing their SPI2 matrix routing. Reconnect them here once
+// the vendor init sequence is done, so SD card reads/writes keep working.
+// Safe only because nothing else calls into the ST7701 IO handle after boot.
+static void reclaimSpiPinsForSdCard() {
+    esp_rom_gpio_connect_out_signal(GPIO_NUM_47, spi_periph_signal[SPI2_HOST].spid_out, false, false);
+    esp_rom_gpio_connect_out_signal(GPIO_NUM_48, spi_periph_signal[SPI2_HOST].spiclk_out, false, false);
+    gpio_set_direction(GPIO_NUM_47, GPIO_MODE_OUTPUT);
+    gpio_set_direction(GPIO_NUM_48, GPIO_MODE_OUTPUT);
+}
+
 static const st7701_lcd_init_cmd_t st7701_lcd_init_cmds[] = {
     //  {cmd, { data }, data_size, delay_ms}
     {0xFF, (uint8_t[]) {0x77, 0x01, 0x00, 0x00, 0x10}, 5, 0},
@@ -181,6 +197,8 @@ bool St7701Display::createPanelHandle(esp_lcd_panel_io_handle_t ioHandle, esp_lc
         return false;
     }
 
+    reclaimSpiPinsForSdCard();
+
     return true;
 }
 

Devices/cyd-4848s040c/Source/module.cpp

@@ -12,7 +12,7 @@ static error_t stop() {
     return ERROR_NONE;
 }
 
-struct Module cyd_4848s040c_module = {
+Module cyd_4848s040c_module = {
     .name = "cyd-4848s040c",
     .start = start,
     .stop = stop,

Devices/cyd-4848s040c/cyd,4848s040c.dts

@@ -28,18 +28,4 @@
 		pin-sda = <&gpio0 19 GPIO_FLAG_NONE>;
 		pin-scl = <&gpio0 45 GPIO_FLAG_NONE>;
 	};
-
-	spi0 {
-		compatible = "espressif,esp32-spi";
-		host = <SPI2_HOST>;
-		cs-gpios = <&gpio0 42 GPIO_FLAG_NONE>;
-		pin-mosi = <&gpio0 47 GPIO_FLAG_NONE>;
-		pin-miso = <&gpio0 41 GPIO_FLAG_NONE>;
-		pin-sclk = <&gpio0 48 GPIO_FLAG_NONE>;
-
-		sdcard@0 {
-			compatible = "espressif,esp32-sdspi";
-			frequency-khz = <20000>;
-		};
-	};
 };

Devices/cyd-4848s040c/device.properties

@@ -1,22 +1,19 @@
-[general]
-vendor=CYD
-name=4848S040C
+general.vendor=CYD
+general.name=4848S040C
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32S3
-flashSize=16MB
-spiRam=true
-spiRamMode=OCT
-spiRamSpeed=80M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=16MB
+hardware.spiRam=true
+hardware.spiRamMode=OCT
+hardware.spiRamSpeed=80M
+hardware.bluetooth=true
 
-[display]
-size=4"
-shape=rectangle
-dpi=170
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
+display.size=4"
+display.shape=rectangle
+display.dpi=170
+
+lvgl.colorDepth=16

Devices/cyd-8048s043c/device.properties

@@ -1,30 +1,26 @@
-[general]
-vendor=CYD
-name=8048S043C
-incubating=false
+general.vendor=CYD
+general.name=8048S043C
+general.incubating=false
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32S3
-flashSize=16MB
-spiRam=true
-spiRamMode=OCT
-spiRamSpeed=80M
-esptoolFlashFreq=80M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=16MB
+hardware.spiRam=true
+hardware.spiRamMode=OCT
+hardware.spiRamSpeed=80M
+hardware.esptoolFlashFreq=80M
+hardware.bluetooth=true
 
-[display]
-size=4.3"
-shape=rectangle
-dpi=217
+storage.userDataLocation=SD
 
-[cdn]
-infoMessage=
-warningMessage=
+display.size=4.3"
+display.shape=rectangle
+display.dpi=217
 
-[lvgl]
-theme=DefaultDark
-colorDepth=16
-fontSize=18
+cdn.infoMessage=
+cdn.warningMessage=
+
+lvgl.theme=DefaultDark
+lvgl.colorDepth=16
+lvgl.fontSize=18

Devices/cyd-e32r28t/device.properties

@@ -1,19 +1,16 @@
-[general]
-vendor=CYD
-name=E32R28T
+general.vendor=CYD
+general.name=E32R28T
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32
-flashSize=4MB
-spiRam=false
+hardware.target=ESP32
+hardware.flashSize=4MB
+hardware.spiRam=false
 
-[display]
-size=2.8"
-shape=rectangle
-dpi=143
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
+display.size=2.8"
+display.shape=rectangle
+display.dpi=143
+
+lvgl.colorDepth=16

Devices/cyd-e32r32p/device.properties

@@ -1,19 +1,16 @@
-[general]
-vendor=CYD
-name=E32R32P
+general.vendor=CYD
+general.name=E32R32P
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32
-flashSize=4MB
-spiRam=false
+hardware.target=ESP32
+hardware.flashSize=4MB
+hardware.spiRam=false
 
-[display]
-size=2.8"
-shape=rectangle
-dpi=125
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
+display.size=2.8"
+display.shape=rectangle
+display.dpi=125
+
+lvgl.colorDepth=16

Devices/elecrow-crowpanel-advance-28/device.properties

@@ -1,24 +1,21 @@
-[general]
-vendor=Elecrow
-name=CrowPanel Advance 2.8"
+general.vendor=Elecrow
+general.name=CrowPanel Advance 2.8"
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32S3
-flashSize=16MB
-spiRam=true
-spiRamMode=OCT
-spiRamSpeed=120M
-tinyUsb=true
-esptoolFlashFreq=120M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=16MB
+hardware.spiRam=true
+hardware.spiRamMode=OCT
+hardware.spiRamSpeed=120M
+hardware.tinyUsb=true
+hardware.esptoolFlashFreq=120M
+hardware.bluetooth=true
 
-[display]
-size=2.8"
-shape=rectangle
-dpi=143
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
+display.size=2.8"
+display.shape=rectangle
+display.dpi=143
+
+lvgl.colorDepth=16

Devices/elecrow-crowpanel-advance-35/device.properties

@@ -1,24 +1,21 @@
-[general]
-vendor=Elecrow
-name=CrowPanel Advance 3.5"
+general.vendor=Elecrow
+general.name=CrowPanel Advance 3.5"
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32S3
-flashSize=16MB
-spiRam=true
-spiRamMode=OCT
-spiRamSpeed=120M
-tinyUsb=true
-esptoolFlashFreq=120M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=16MB
+hardware.spiRam=true
+hardware.spiRamMode=OCT
+hardware.spiRamSpeed=120M
+hardware.tinyUsb=true
+hardware.esptoolFlashFreq=120M
+hardware.bluetooth=true
 
-[display]
-size=3.5"
-shape=rectangle
-dpi=165
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
+display.size=3.5"
+display.shape=rectangle
+display.dpi=165
+
+lvgl.colorDepth=16

Devices/elecrow-crowpanel-advance-50/device.properties

@@ -1,25 +1,22 @@
-[general]
-vendor=Elecrow
-name=CrowPanel Advance 5.0"
+general.vendor=Elecrow
+general.name=CrowPanel Advance 5.0"
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32S3
-flashSize=16MB
-spiRam=true
-spiRamMode=OCT
-spiRamSpeed=120M
-tinyUsb=true
-esptoolFlashFreq=120M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=16MB
+hardware.spiRam=true
+hardware.spiRamMode=OCT
+hardware.spiRamSpeed=120M
+hardware.tinyUsb=true
+hardware.esptoolFlashFreq=120M
+hardware.bluetooth=true
 
-[display]
-size=5"
-shape=rectangle
-dpi=187
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
-fontSize=18
+display.size=5"
+display.shape=rectangle
+display.dpi=187
+
+lvgl.colorDepth=16
+lvgl.fontSize=18

Devices/elecrow-crowpanel-basic-28/device.properties

@@ -1,19 +1,16 @@
-[general]
-vendor=Elecrow
-name=CrowPanel Basic 2.8"
+general.vendor=Elecrow
+general.name=CrowPanel Basic 2.8"
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32
-flashSize=4MB
-spiRam=false
+hardware.target=ESP32
+hardware.flashSize=4MB
+hardware.spiRam=false
 
-[display]
-size=2.8"
-shape=rectangle
-dpi=143
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
+display.size=2.8"
+display.shape=rectangle
+display.dpi=143
+
+lvgl.colorDepth=16

Devices/elecrow-crowpanel-basic-35/device.properties

@@ -1,19 +1,16 @@
-[general]
-vendor=Elecrow
-name=CrowPanel Basic 3.5"
+general.vendor=Elecrow
+general.name=CrowPanel Basic 3.5"
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32
-flashSize=4MB
-spiRam=false
+hardware.target=ESP32
+hardware.flashSize=4MB
+hardware.spiRam=false
 
-[display]
-size=3.5"
-shape=rectangle
-dpi=165
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
+display.size=3.5"
+display.shape=rectangle
+display.dpi=165
+
+lvgl.colorDepth=16

Devices/elecrow-crowpanel-basic-50/device.properties

@@ -1,25 +1,22 @@
-[general]
-vendor=Elecrow
-name=CrowPanel Basic 5.0"
+general.vendor=Elecrow
+general.name=CrowPanel Basic 5.0"
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32S3
-flashSize=4MB
-spiRam=true
-spiRamMode=OCT
-spiRamSpeed=120M
-tinyUsb=true
-esptoolFlashFreq=120M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=4MB
+hardware.spiRam=true
+hardware.spiRamMode=OCT
+hardware.spiRamSpeed=120M
+hardware.tinyUsb=true
+hardware.esptoolFlashFreq=120M
+hardware.bluetooth=true
 
-[display]
-size=5.0"
-shape=rectangle
-dpi=187
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
-fontSize=18
+display.size=5.0"
+display.shape=rectangle
+display.dpi=187
+
+lvgl.colorDepth=16
+lvgl.fontSize=18

Devices/es3c28p/CMakeLists.txt

@@ -3,5 +3,5 @@ file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
 idf_component_register(
     SRCS ${SOURCE_FILES}
     INCLUDE_DIRS "Source"
-    REQUIRES Tactility esp_lvgl_port esp_lcd AXP192 ST7789 ButtonControl
+    REQUIRES Tactility esp_lvgl_port ILI934x FT6x36 PwmBacklight driver vfs fatfs
 )

Devices/es3c28p/Source/Configuration.cpp

@@ -0,0 +1,92 @@
+#include "PwmBacklight.h"
+#include "devices/Display.h"
+#include <driver/gpio.h>
+
+#include <tactility/device.h>
+#include <tactility/drivers/i2c_controller.h>
+#include <tactility/log.h>
+#include <tactility/error.h>
+#include <tactility/freertos/freertos.h>
+
+#include <Tactility/hal/Configuration.h>
+
+using namespace tt::hal;
+
+static constexpr auto* TAG = "ES3C28P";
+static constexpr uint8_t ES8311_I2C_ADDR = 0x18;
+
+static error_t initCodec(::Device* i2c_controller) {
+    static constexpr uint8_t ENABLED_BULK_DATA[] = {
+        0x00, 0x80,  // RESET/CSM POWER ON
+        0x01, 0x3F,  // CLOCK_MANAGER/ use MCLK pin (external), all clocks on
+        0x02, 0x00,  // CLOCK_MANAGER/ pre_div=1 pre_multi=1 (256x MCLK is correct ratio)
+        0x03, 0x10,  // CLOCK_MANAGER/ fs_mode=0, adc_osr=16
+        0x04, 0x10,  // CLOCK_MANAGER/ dac_osr=16
+        0x05, 0x00,  // CLOCK_MANAGER/ adc_div=1, dac_div=1
+        0x06, 0x03,  // CLOCK_MANAGER/ bclk_div=4
+        0x07, 0x00,  // CLOCK_MANAGER/ lrck_h=0
+        0x08, 0xFF,  // CLOCK_MANAGER/ lrck_l=255 (div=256)
+        0x09, 0x0C,  // SDPIN_REG09/ DAC SDP format = standard I2S, word length = 16-bit
+        0x0A, 0x0C,  // SDPOUT_REG0A/ ADC SDP format = standard I2S, word length = 16-bit
+        0x0D, 0x01,  // SYSTEM/ Power up analog circuitry
+        0x0E, 0x02,  // SYSTEM/ Enable analog PGA, enable ADC modulator
+        0x12, 0x00,  // SYSTEM/ power-up DAC
+        0x13, 0x10,  // SYSTEM/ Enable output to HP drive (headphone/speaker)
+        0x14, 0x1A,  // SYSTEM/ Select Mic1p-Mic1n / max PGA gain (+30dB)
+        0x17, 0xFF,  // ADC_REG17/ ADC Volume (MAXGAIN)
+        0x1C, 0x6A,  // ADC_REG1C/ ADC Equalizer bypass, cancel DC offset in digital
+        0x32, 0xBF,  // DAC_REG32/ DAC Volume (0xBF = 191)
+        0x37, 0x08,  // DAC_REG37/ Bypass DAC equalizer
+    };
+
+    return i2c_controller_write_register_array(
+        i2c_controller,
+        ES8311_I2C_ADDR,
+        ENABLED_BULK_DATA,
+        sizeof(ENABLED_BULK_DATA),
+        pdMS_TO_TICKS(1000)
+    );
+}
+
+static bool initBoot() {
+    // 1. Initialize display backlight
+    if (!driver::pwmbacklight::init(LCD_PIN_BACKLIGHT)) {
+        return false;
+    }
+
+    // 2. Initialize and power on the FM8002E Audio Amplifier (GPIO 1, Active LOW)
+    gpio_config_t io_conf = {};
+    io_conf.intr_type = GPIO_INTR_DISABLE;
+    io_conf.mode = GPIO_MODE_OUTPUT;
+    io_conf.pin_bit_mask = (1ULL << GPIO_NUM_1);
+    io_conf.pull_down_en = GPIO_PULLDOWN_DISABLE;
+    io_conf.pull_up_en = GPIO_PULLUP_DISABLE;
+    gpio_config(&io_conf);
+    
+    // Drive LOW to enable the speaker amplifier
+    gpio_set_level(GPIO_NUM_1, 0);
+
+    // 3. Configure the ES8311 Codec over the I2C bus
+    auto* i2c_bus = device_find_by_name("i2c0");
+    if (i2c_bus != nullptr) {
+        error_t error = initCodec(i2c_bus);
+        if (error != ERROR_NONE) {
+            LOG_E(TAG, "Failed to initialize ES8311 codec: %s", error_to_string(error));
+        }
+    } else {
+        LOG_E(TAG, "i2c0 bus not found, skipping ES8311 initialization");
+    }
+
+    return true;
+}
+
+static DeviceVector createDevices() {
+    return {
+        createDisplay()
+    };
+}
+
+extern const Configuration hardwareConfiguration = {
+    .initBoot = initBoot,
+    .createDevices = createDevices
+};

Devices/es3c28p/Source/devices/Display.cpp

@@ -0,0 +1,49 @@
+#include "Display.h"
+
+#include <Ft6x36Touch.h>
+#include <Ili934xDisplay.h>
+#include <PwmBacklight.h>
+
+static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
+    auto configuration = std::make_unique<Ft6x36Touch::Configuration>(
+        I2C_NUM_0,
+        240, // xMax (native portrait width)
+        320, // yMax (native portrait height)
+        true, // swapXy
+        true, // mirrorX
+        false, // mirrorY
+        GPIO_NUM_18, // Touch Reset (RST)
+        GPIO_NUM_17  // Touch Interrupt (INT)
+    );
+
+    return std::make_shared<Ft6x36Touch>(std::move(configuration));
+}
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
+    Ili934xDisplay::Configuration panel_configuration = {
+        .horizontalResolution = LCD_HORIZONTAL_RESOLUTION,
+        .verticalResolution = LCD_VERTICAL_RESOLUTION,
+        .gapX = 0,
+        .gapY = 0,
+        .swapXY = true,
+        .mirrorX = false,
+        .mirrorY = false,
+        .invertColor = true,
+        .swapBytes = true,
+        .bufferSize = LCD_BUFFER_SIZE,
+        .touch = createTouch(),
+        .backlightDutyFunction = driver::pwmbacklight::setBacklightDuty,
+        .resetPin = GPIO_NUM_NC,
+        .rgbElementOrder = LCD_RGB_ELEMENT_ORDER_BGR
+    };
+
+    auto spi_configuration = std::make_shared<Ili934xDisplay::SpiConfiguration>(Ili934xDisplay::SpiConfiguration {
+        .spiHostDevice = LCD_SPI_HOST,
+        .csPin = LCD_PIN_CS,
+        .dcPin = LCD_PIN_DC,
+        .pixelClockFrequency = 40'000'000,
+        .transactionQueueDepth = 10
+    });
+
+    return std::make_shared<Ili934xDisplay>(panel_configuration, spi_configuration, true);
+}

Devices/es3c28p/Source/devices/Display.h

@@ -1,18 +1,20 @@
 #pragma once
 
 #include <Tactility/hal/display/DisplayDevice.h>
-#include <memory>
 #include <driver/gpio.h>
 #include <driver/spi_common.h>
+#include <memory>
 
+// Display
 constexpr auto LCD_SPI_HOST = SPI2_HOST;
-constexpr auto LCD_PIN_CS = GPIO_NUM_5;
-constexpr auto LCD_PIN_DC = GPIO_NUM_23;
-constexpr auto LCD_PIN_RESET = GPIO_NUM_18;
-constexpr auto LCD_HORIZONTAL_RESOLUTION = 135;
+constexpr auto LCD_PIN_CS = GPIO_NUM_10;
+constexpr auto LCD_PIN_DC = GPIO_NUM_46;
+constexpr auto LCD_HORIZONTAL_RESOLUTION = 320;
 constexpr auto LCD_VERTICAL_RESOLUTION = 240;
-constexpr auto LCD_BUFFER_HEIGHT = LCD_VERTICAL_RESOLUTION / 3;
+constexpr auto LCD_BUFFER_HEIGHT = LCD_VERTICAL_RESOLUTION / 10;
 constexpr auto LCD_BUFFER_SIZE = LCD_HORIZONTAL_RESOLUTION * LCD_BUFFER_HEIGHT;
-constexpr auto LCD_SPI_TRANSFER_SIZE_LIMIT = LCD_BUFFER_SIZE * LV_COLOR_DEPTH / 8;
+
+// Backlight pin
+constexpr auto LCD_PIN_BACKLIGHT = GPIO_NUM_45;
 
 std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Devices/es3c28p/Source/module.cpp

@@ -12,8 +12,8 @@ static error_t stop() {
     return ERROR_NONE;
 }
 
-struct Module m5stack_stickc_plus_module = {
-    .name = "m5stack-stickc-plus",
+struct Module es3c28p_module = {
+    .name = "es3c28p",
     .start = start,
     .stop = stop,
     .symbols = nullptr,

Devices/es3c28p/device.properties

@@ -0,0 +1,22 @@
+general.vendor=LCDWIKI
+general.name=ES3C28P
+
+apps.launcherAppId=Launcher
+
+hardware.target=ESP32S3
+hardware.flashSize=16MB
+hardware.spiRam=true
+hardware.spiRamMode=OCT
+hardware.spiRamSpeed=120M
+hardware.tinyUsb=true
+hardware.usbHostEnabled=false
+hardware.esptoolFlashFreq=120M
+hardware.bluetooth=true
+
+display.size=2.8"
+display.shape=rectangle
+display.dpi=143
+
+lvgl.colorDepth=16
+
+storage.userDataLocation=SD

Devices/es3c28p/devicetree.yaml

@@ -0,0 +1,3 @@
+dependencies:
+  - Platforms/platform-esp32
+dts: es3c28p.dts

Devices/es3c28p/es3c28p.dts

@@ -0,0 +1,81 @@
+/dts-v1/;
+
+#include <tactility/bindings/root.h>
+#include <tactility/bindings/esp32_ble.h>
+#include <tactility/bindings/esp32_gpio.h>
+#include <tactility/bindings/esp32_i2c.h>
+#include <tactility/bindings/esp32_sdmmc.h>
+#include <tactility/bindings/esp32_spi.h>
+#include <tactility/bindings/esp32_i2s.h>
+#include <tactility/bindings/esp32_usbhost.h>
+
+/ {
+	compatible = "root";
+	model = "LCDWIKI ES3C28P";
+
+	ble0 {
+		compatible = "espressif,esp32-ble";
+	};
+
+	gpio0 {
+		compatible = "espressif,esp32-gpio";
+		gpio-count = <49>;
+	};
+
+	i2c0 {
+		compatible = "espressif,esp32-i2c";
+		port = <I2C_NUM_0>;
+		clock-frequency = <100000>;
+		pin-sda = <&gpio0 16 GPIO_FLAG_NONE>;
+		pin-scl = <&gpio0 15 GPIO_FLAG_NONE>;
+	};
+
+	i2s0 {
+		compatible = "espressif,esp32-i2s";
+		port = <I2S_NUM_0>;
+		pin-bclk = <&gpio0 5 GPIO_FLAG_NONE>;
+		pin-ws = <&gpio0 7 GPIO_FLAG_NONE>;
+		pin-data-out = <&gpio0 8 GPIO_FLAG_NONE>;
+		pin-data-in = <&gpio0 6 GPIO_FLAG_NONE>;
+		pin-mclk = <&gpio0 4 GPIO_FLAG_NONE>;
+	};
+
+	display_spi: spi0 {
+		compatible = "espressif,esp32-spi";
+		host = <SPI2_HOST>;
+		pin-mosi = <&gpio0 11 GPIO_FLAG_NONE>;
+		pin-sclk = <&gpio0 12 GPIO_FLAG_NONE>;
+	};
+
+	sdmmc0 {
+		compatible = "espressif,esp32-sdmmc";
+		pin-clk = <&gpio0 38 GPIO_FLAG_NONE>;
+		pin-cmd = <&gpio0 40 GPIO_FLAG_NONE>;
+		pin-d0 = <&gpio0 39 GPIO_FLAG_NONE>;
+		pin-d1 = <&gpio0 41 GPIO_FLAG_NONE>;
+		pin-d2 = <&gpio0 48 GPIO_FLAG_NONE>;
+		pin-d3 = <&gpio0 47 GPIO_FLAG_NONE>;
+		slot = <SDMMC_HOST_SLOT_1>;
+		bus-width = <4>;
+	};
+
+	usbhost0 {
+		compatible = "espressif,esp32-usbhost";
+		status = "disabled";
+
+		usbhosthid0 {
+			compatible = "espressif,esp32-usbhost-hid";
+			status = "disabled";
+		};
+
+		usbhostmidi0 {
+			compatible = "espressif,esp32-usbhost-midi";
+			status = "disabled";
+		};
+
+		usbhostmsc0 {
+			compatible = "espressif,esp32-usbhost-msc";
+			status = "disabled";
+		};
+	};
+};

Devices/generic-esp32/device.properties

@@ -1,12 +1,10 @@
-[general]
-vendor=Generic
-name=ESP32
+general.vendor=Generic
+general.name=ESP32
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32
-flashSize=4MB
-spiRam=false
+hardware.target=ESP32
+hardware.flashSize=8MB
+hardware.spiRam=false
 
+storage.userDataLocation=Internal

Devices/generic-esp32c6/device.properties

@@ -1,12 +1,10 @@
-[general]
-vendor=Generic
-name=ESP32-C6
+general.vendor=Generic
+general.name=ESP32-C6
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32C6
-flashSize=4MB
-spiRam=false
+hardware.target=ESP32C6
+hardware.flashSize=8MB
+hardware.spiRam=false
 
+storage.userDataLocation=Internal

Devices/generic-esp32p4/device.properties

@@ -1,12 +1,10 @@
-[general]
-vendor=Generic
-name=ESP32-P4
+general.vendor=Generic
+general.name=ESP32-P4
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32P4
-flashSize=4MB
-spiRam=false
+hardware.target=ESP32P4
+hardware.flashSize=8MB
+hardware.spiRam=false
 
+storage.userDataLocation=Internal

Devices/generic-esp32s3/device.properties

@@ -1,12 +1,10 @@
-[general]
-vendor=Generic
-name=ESP32-S3
+general.vendor=Generic
+general.name=ESP32-S3
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32S3
-flashSize=4MB
-spiRam=false
+hardware.target=ESP32S3
+hardware.flashSize=8MB
+hardware.spiRam=false
 
+storage.userDataLocation=Internal

Devices/guition-jc1060p470ciwy/device.properties

@@ -1,33 +1,29 @@
-[general]
-vendor=Guition
-name=JC1060P470C-I-W-Y
+general.vendor=Guition
+general.name=JC1060P470C-I-W-Y
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32P4
-flashSize=16MB
-spiRam=true
-spiRamMode=OCT
-spiRamSpeed=200M
-esptoolFlashFreq=80M
-bluetooth=true
+hardware.target=ESP32P4
+hardware.flashSize=16MB
+hardware.spiRam=true
+hardware.spiRamMode=OCT
+hardware.spiRamSpeed=200M
+hardware.esptoolFlashFreq=80M
+hardware.bluetooth=true
 
-[display]
-size=7"
-shape=rectangle
-dpi=187
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
+display.size=7"
+display.shape=rectangle
+display.dpi=187
 
-[sdkconfig]
-CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
-CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
-CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
-CONFIG_ESP_HOSTED_ENABLED=y
-CONFIG_ESP_HOSTED_P4_DEV_BOARD_FUNC_BOARD=y
-CONFIG_ESP_HOSTED_SDIO_HOST_INTERFACE=y
-CONFIG_SLAVE_IDF_TARGET_ESP32C6=y
-CONFIG_ESP_HOSTED_USE_MEMPOOL=n
+lvgl.colorDepth=16
+
+sdkconfig.CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
+sdkconfig.CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
+sdkconfig.CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
+sdkconfig.CONFIG_ESP_HOSTED_ENABLED=y
+sdkconfig.CONFIG_ESP_HOSTED_P4_DEV_BOARD_FUNC_BOARD=y
+sdkconfig.CONFIG_ESP_HOSTED_SDIO_HOST_INTERFACE=y
+sdkconfig.CONFIG_SLAVE_IDF_TARGET_ESP32C6=y
+sdkconfig.CONFIG_ESP_HOSTED_USE_MEMPOOL=n

Devices/guition-jc2432w328c/device.properties

@@ -1,19 +1,16 @@
-[general]
-vendor=Guition
-name=JC2432W328C
+general.vendor=Guition
+general.name=JC2432W328C
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32
-flashSize=4MB
-spiRam=false
+hardware.target=ESP32
+hardware.flashSize=4MB
+hardware.spiRam=false
 
-[display]
-size=2.8"
-shape=rectangle
-dpi=143
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
+display.size=2.8"
+display.shape=rectangle
+display.dpi=143
+
+lvgl.colorDepth=16

Devices/guition-jc3248w535c/device.properties

@@ -1,24 +1,21 @@
-[general]
-vendor=Guition
-name=JC3248W535C
+general.vendor=Guition
+general.name=JC3248W535C
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32S3
-flashSize=16MB
-spiRam=true
-spiRamMode=OCT
-spiRamSpeed=120M
-tinyUsb=true
-esptoolFlashFreq=120M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=16MB
+hardware.spiRam=true
+hardware.spiRamMode=OCT
+hardware.spiRamSpeed=120M
+hardware.tinyUsb=true
+hardware.esptoolFlashFreq=120M
+hardware.bluetooth=true
 
-[display]
-size=3.5"
-shape=rectangle
-dpi=165
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
+display.size=3.5"
+display.shape=rectangle
+display.dpi=165
+
+lvgl.colorDepth=16

Devices/guition-jc8048w550c/device.properties

@@ -1,24 +1,21 @@
-[general]
-vendor=Guition
-name=JC8048W550C
+general.vendor=Guition
+general.name=JC8048W550C
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32S3
-flashSize=16MB
-spiRam=true
-spiRamMode=OCT
-spiRamSpeed=80M
-esptoolFlashFreq=80M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=16MB
+hardware.spiRam=true
+hardware.spiRamMode=OCT
+hardware.spiRamSpeed=80M
+hardware.esptoolFlashFreq=80M
+hardware.bluetooth=true
 
-[display]
-size=5"
-shape=rectangle
-dpi=187
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
-fontSize=18
+display.size=5"
+display.shape=rectangle
+display.dpi=187
+
+lvgl.colorDepth=16
+lvgl.fontSize=18

Devices/heltec-wifi-lora-32-v3/device.properties

@@ -1,30 +1,26 @@
-[general]
-vendor=Heltec
-name=WiFi LoRa 32 v3
-incubating=true
+general.vendor=Heltec
+general.name=WiFi LoRa 32 v3
+general.incubating=true
 
-[apps]
-launcherAppId=Launcher
-autoStartAppId=ApWebServer
+apps.launcherAppId=Launcher
+apps.autoStartAppId=ApWebServer
 
-[hardware]
-target=ESP32S3
-flashSize=8MB
-spiRam=false
-tinyUsb=true
-esptoolFlashFreq=120M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=8MB
+hardware.spiRam=false
+hardware.tinyUsb=true
+hardware.esptoolFlashFreq=120M
+hardware.bluetooth=true
 
-[display]
-size=0.96"
-shape=rectangle
-dpi=149
+storage.userDataLocation=Internal
 
-[cdn]
-infoMessage=Due to the small size of the screen, the icons don't render properly.
+display.size=0.96"
+display.shape=rectangle
+display.dpi=149
 
-[lvgl]
-theme=Mono
-colorDepth=16
-uiScale=70
-uiDensity=compact
+cdn.infoMessage=Due to the small size of the screen, the icons don't render properly.
+
+lvgl.theme=Mono
+lvgl.colorDepth=16
+lvgl.uiScale=70
+lvgl.uiDensity=compact

Devices/lilygo-tdeck/device.properties

@@ -1,27 +1,23 @@
-[general]
-vendor=LilyGO
-name=T-Deck,T-Deck Plus
+general.vendor=LilyGO
+general.name=T-Deck,T-Deck Plus
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32S3
-flashSize=16MB
-spiRam=true
-spiRamMode=OCT
-spiRamSpeed=120M
-tinyUsb=true
-esptoolFlashFreq=120M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=16MB
+hardware.spiRam=true
+hardware.spiRamMode=OCT
+hardware.spiRamSpeed=120M
+hardware.tinyUsb=true
+hardware.esptoolFlashFreq=120M
+hardware.bluetooth=true
 
-[display]
-size=2.8"
-shape=rectangle
-dpi=143
+storage.userDataLocation=SD
 
-[cdn]
-infoMessage=To put the device into bootloader mode: <br/>1. Press the trackball and then the reset button at the same time,<br/>2. Let go of the reset button, then the trackball.<br/><br/>When this website reports that flashing is finished, you likely have to press the reset button.
+display.size=2.8"
+display.shape=rectangle
+display.dpi=143
 
-[lvgl]
-colorDepth=16
+cdn.infoMessage=To put the device into bootloader mode: <br/>1. Press the trackball and then the reset button at the same time,<br/>2. Let go of the reset button, then the trackball.<br/><br/>When this website reports that flashing is finished, you likely have to press the reset button.
+
+lvgl.colorDepth=16

Devices/lilygo-tdisplay-s3/device.properties

@@ -1,25 +1,22 @@
-[general]
-vendor=LilyGO
-name=T-Display S3
+general.vendor=LilyGO
+general.name=T-Display S3
 
-[apps]
-launcherAppId=Launcher
-autoStartAppId=ApWebServer
+apps.launcherAppId=Launcher
+apps.autoStartAppId=ApWebServer
 
-[hardware]
-target=ESP32S3
-flashSize=16MB
-spiRam=true
-spiRamMode=OCT
-spiRamSpeed=120M
-tinyUsb=true
-esptoolFlashFreq=120M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=16MB
+hardware.spiRam=true
+hardware.spiRamMode=OCT
+hardware.spiRamSpeed=120M
+hardware.tinyUsb=true
+hardware.esptoolFlashFreq=120M
+hardware.bluetooth=true
 
-[display]
-size=1.9"
-shape=rectangle
-dpi=191
+storage.userDataLocation=Internal
 
-[lvgl]
-colorDepth=16
+display.size=1.9"
+display.shape=rectangle
+display.dpi=191
+
+lvgl.colorDepth=16

Devices/lilygo-tdisplay/device.properties

@@ -1,23 +1,20 @@
-[general]
-vendor=LilyGO
-name=T-Display
-incubating=true
+general.vendor=LilyGO
+general.name=T-Display
+general.incubating=true
 
-[apps]
-launcherAppId=Launcher
-autoStartAppId=ApWebServer
+apps.launcherAppId=Launcher
+apps.autoStartAppId=ApWebServer
 
-[hardware]
-target=ESP32
-flashSize=16MB
-spiRam=false
-esptoolFlashFreq=80M
+hardware.target=ESP32
+hardware.flashSize=16MB
+hardware.spiRam=false
+hardware.esptoolFlashFreq=80M
 
-[display]
-size=1.14"
-shape=rectangle
-dpi=242
+storage.userDataLocation=Internal
 
-[lvgl]
-colorDepth=16
-uiDensity=compact
+display.size=1.14"
+display.shape=rectangle
+display.dpi=242
+
+lvgl.colorDepth=16
+lvgl.uiDensity=compact

Devices/lilygo-tdongle-s3/device.properties

@@ -1,26 +1,23 @@
-[general]
-vendor=LilyGO
-name=T-Dongle S3
-incubating=true
+general.vendor=LilyGO
+general.name=T-Dongle S3
+general.incubating=true
 
-[apps]
-launcherAppId=Launcher
-autoStartAppId=ApWebServer
+apps.launcherAppId=Launcher
+apps.autoStartAppId=ApWebServer
 
-[hardware]
-target=ESP32S3
-flashSize=16MB
-spiRam=false
-tinyUsb=true
-esptoolFlashFreq=120M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=16MB
+hardware.spiRam=false
+hardware.tinyUsb=true
+hardware.esptoolFlashFreq=120M
+hardware.bluetooth=true
 
-[display]
-size=0.96"
-shape=rectangle
-dpi=186
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
-uiDensity=compact
-fontSize=10
+display.size=0.96"
+display.shape=rectangle
+display.dpi=186
+
+lvgl.colorDepth=16
+lvgl.uiDensity=compact
+lvgl.fontSize=10

Devices/lilygo-thmi/device.properties

@@ -1,24 +1,21 @@
-[general]
-vendor=LilyGO
-name=T-HMI
+general.vendor=LilyGO
+general.name=T-HMI
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32S3
-flashSize=16MB
-spiRam=true
-spiRamMode=OCT
-spiRamSpeed=120M
-tinyUsb=true
-esptoolFlashFreq=120M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=16MB
+hardware.spiRam=true
+hardware.spiRamMode=OCT
+hardware.spiRamSpeed=120M
+hardware.tinyUsb=true
+hardware.esptoolFlashFreq=120M
+hardware.bluetooth=true
 
-[display]
-size=2.8"
-shape=rectangle
-dpi=125
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
+display.size=2.8"
+display.shape=rectangle
+display.dpi=125
+
+lvgl.colorDepth=16

Devices/lilygo-tlora-pager/device.properties

@@ -1,26 +1,23 @@
-[general]
-vendor=LilyGO
-name=T-Lora Pager
+general.vendor=LilyGO
+general.name=T-Lora Pager
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32S3
-flashSize=16MB
-flashMode=DIO
-spiRam=true
-spiRamMode=AUTO
-spiRamSpeed=120M
-tinyUsb=true
-esptoolFlashFreq=40M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=16MB
+hardware.flashMode=DIO
+hardware.spiRam=true
+hardware.spiRamMode=AUTO
+hardware.spiRamSpeed=120M
+hardware.tinyUsb=true
+hardware.esptoolFlashFreq=40M
+hardware.bluetooth=true
 
-[display]
-size=2.33"
-shape=rectangle
-dpi=227
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
-dpi=150
+display.size=2.33"
+display.shape=rectangle
+display.dpi=227
+
+lvgl.colorDepth=16
+lvgl.dpi=150

Devices/m5stack-cardputer-adv/device.properties

@@ -1,24 +1,21 @@
-[general]
-vendor=M5Stack
-name=Cardputer Adv
+general.vendor=M5Stack
+general.name=Cardputer Adv
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32S3
-flashSize=8MB
-spiRam=false
-tinyUsb=true
-esptoolFlashFreq=120M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=8MB
+hardware.spiRam=false
+hardware.tinyUsb=true
+hardware.esptoolFlashFreq=120M
+hardware.bluetooth=true
 
-[display]
-size=1.14"
-shape=rectangle
+storage.userDataLocation=SD
+
+display.size=1.14"
+display.shape=rectangle
 # TODO: dps is actually 242, but this breaks UI (button selection becomes invisible and switch visibility is reduced)
-dpi=139
+display.dpi=139
 
-[lvgl]
-colorDepth=16
-uiDensity=compact
+lvgl.colorDepth=16
+lvgl.uiDensity=compact

Devices/m5stack-cardputer/device.properties

@@ -1,24 +1,21 @@
-[general]
-vendor=M5Stack
-name=Cardputer,Cardputer v1.1
+general.vendor=M5Stack
+general.name=Cardputer,Cardputer v1.1
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32S3
-flashSize=8MB
-spiRam=false
-tinyUsb=true
-esptoolFlashFreq=120M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=8MB
+hardware.spiRam=false
+hardware.tinyUsb=true
+hardware.esptoolFlashFreq=120M
+hardware.bluetooth=true
 
-[display]
-size=1.14"
-shape=rectangle
+storage.userDataLocation=SD
+
+display.size=1.14"
+display.shape=rectangle
 # TODO: dps is actually 242, but this breaks UI (button selection becomes invisible and switch visibility is reduced)
-dpi=139
+display.dpi=139
 
-[lvgl]
-colorDepth=16
-uiDensity=compact
+lvgl.colorDepth=16
+lvgl.uiDensity=compact

Devices/m5stack-core2/device.properties

@@ -1,25 +1,21 @@
-[general]
-vendor=M5Stack
-name=Core2
+general.vendor=M5Stack
+general.name=Core2
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32
-flashSize=16MB
-spiRam=true
-spiRamMode=QUAD
-spiRamSpeed=80M
-esptoolFlashFreq=80M
+hardware.target=ESP32
+hardware.flashSize=16MB
+hardware.spiRam=true
+hardware.spiRamMode=QUAD
+hardware.spiRamSpeed=80M
+hardware.esptoolFlashFreq=80M
 
-[display]
-size=2"
-shape=rectangle
-dpi=200
+storage.userDataLocation=SD
 
-[cdn]
-warningMessage=This board implementation concerns the original Core2 hardware and **not** the v1.1 variant
+display.size=2"
+display.shape=rectangle
+display.dpi=200
 
-[lvgl]
-colorDepth=16
+cdn.warningMessage=This board implementation concerns the original Core2 hardware and **not** the v1.1 variant
+
+lvgl.colorDepth=16

Devices/m5stack-cores3/device.properties

@@ -1,24 +1,21 @@
-[general]
-vendor=M5Stack
-name=CoreS3
+general.vendor=M5Stack
+general.name=CoreS3
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32S3
-flashSize=16MB
-spiRam=true
-spiRamMode=QUAD
-spiRamSpeed=120M
-tinyUsb=true
-esptoolFlashFreq=120M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=16MB
+hardware.spiRam=true
+hardware.spiRamMode=QUAD
+hardware.spiRamSpeed=120M
+hardware.tinyUsb=true
+hardware.esptoolFlashFreq=120M
+hardware.bluetooth=true
 
-[display]
-size=2"
-shape=rectangle
-dpi=200
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
+display.size=2"
+display.shape=rectangle
+display.dpi=200
+
+lvgl.colorDepth=16

Devices/m5stack-papers3/device.properties

@@ -1,32 +1,26 @@
-[general]
-vendor=M5Stack
-name=PaperS3
-incubating=true
+general.vendor=M5Stack
+general.name=PaperS3
+general.incubating=true
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=esp32s3
-flashSize=16MB
-spiRam=true
-spiRamMode=OPI
-spiRamSpeed=80M
-esptoolFlashFreq=80M
-tinyUsb=true
-bluetooth=true
+hardware.target=esp32s3
+hardware.flashSize=16MB
+hardware.spiRam=true
+hardware.spiRamMode=OPI
+hardware.spiRamSpeed=80M
+hardware.esptoolFlashFreq=80M
+hardware.tinyUsb=true
+hardware.bluetooth=true
 
-[display]
-size=4.7"
-shape=rectangle
-dpi=235
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=8
-fontSize=24
-theme=Mono
-
-[sdkconfig]
-CONFIG_EPD_DISPLAY_TYPE_ED047TC2=y
+display.size=4.7"
+display.shape=rectangle
+display.dpi=235
 
+lvgl.colorDepth=8
+lvgl.fontSize=24
+lvgl.theme=Mono
 
+sdkconfig.CONFIG_EPD_DISPLAY_TYPE_ED047TC2=y

Devices/m5stack-stackchan/device.properties

@@ -1,24 +1,21 @@
-[general]
-vendor=M5Stack
-name=StackChan
+general.vendor=M5Stack
+general.name=StackChan
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32S3
-flashSize=16MB
-spiRam=true
-spiRamMode=QUAD
-spiRamSpeed=120M
-tinyUsb=true
-esptoolFlashFreq=120M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=16MB
+hardware.spiRam=true
+hardware.spiRamMode=QUAD
+hardware.spiRamSpeed=120M
+hardware.tinyUsb=true
+hardware.esptoolFlashFreq=120M
+hardware.bluetooth=true
 
-[display]
-size=2"
-shape=rectangle
-dpi=200
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
+display.size=2"
+display.shape=rectangle
+display.dpi=200
+
+lvgl.colorDepth=16

Devices/m5stack-stickc-plus/Source/Configuration.cpp

@@ -1,29 +0,0 @@
-#include "devices/Display.h"
-#include "devices/Power.h"
-
-#include <Tactility/hal/Configuration.h>
-#include <ButtonControl.h>
-
-using namespace tt::hal;
-
-static bool initBoot() {
-    // CH552 applies 4 V to GPIO 0, which reduces Wi-Fi sensitivity
-    // Setting output to high adds a bias of 3.3 V and suppresses over-voltage:
-    gpio::configure(0, gpio::Mode::Output, false, false);
-    gpio::setLevel(0, true);
-
-    return initAxp();
-}
-
-static DeviceVector createDevices() {
-    return {
-        getAxp192(),
-        ButtonControl::createTwoButtonControl(37, 39),
-        createDisplay()
-    };
-}
-
-extern const Configuration hardwareConfiguration = {
-    .initBoot = initBoot,
-    .createDevices = createDevices
-};

Devices/m5stack-stickc-plus/Source/devices/Display.cpp

@@ -1,67 +0,0 @@
-#include "Display.h"
-#include "Power.h"
-
-#include <Tactility/Logger.h>
-
-#include <St7789Display.h>
-#include <bitset>
-
-static const auto LOGGER = tt::Logger("StickCPlus");
-
-static void setBacklightOn(bool on) {
-    const auto axp = getAxp192();
-    const auto* driver = axp->getAxp192();
-    uint8_t state;
-    if (axp192_read(driver, AXP192_DCDC13_LDO23_CONTROL, &state) != AXP192_OK) {
-        LOGGER.info("Failed to read LCD brightness state");
-        return;
-    }
-    std::bitset<8> new_state = state;
-    if (new_state[2] != on) {
-        new_state[2] = on;
-        const auto new_state_long = new_state.to_ulong();
-        axp192_write(driver, AXP192_DCDC13_LDO23_CONTROL, static_cast<uint8_t>(new_state_long)); // Display on/off
-    }
-}
-
-static void setBrightness(uint8_t brightness) {
-    const auto axp = getAxp192();
-    if (brightness)
-    {
-        brightness = (((brightness >> 1) + 8) / 13) + 5;
-        setBacklightOn(true);
-        axp192_write(axp->getAxp192(), AXP192_LDO23_VOLTAGE, brightness << 4); // Display brightness
-    }
-    else
-    {
-        setBacklightOn(false);
-    }
-}
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
-    St7789Display::Configuration panel_configuration = {
-        .horizontalResolution = LCD_HORIZONTAL_RESOLUTION,
-        .verticalResolution = LCD_VERTICAL_RESOLUTION,
-        .gapX = 52,
-        .gapY = 40,
-        .swapXY = false,
-        .mirrorX = false,
-        .mirrorY = false,
-        .invertColor = true,
-        .bufferSize = LCD_BUFFER_SIZE,
-        .touch = nullptr,
-        .backlightDutyFunction = setBrightness,
-        .resetPin = LCD_PIN_RESET,
-        .lvglSwapBytes = false
-    };
-
-    auto spi_configuration = std::make_shared<St7789Display::SpiConfiguration>(St7789Display::SpiConfiguration {
-        .spiHostDevice = LCD_SPI_HOST,
-        .csPin = LCD_PIN_CS,
-        .dcPin = LCD_PIN_DC,
-        .pixelClockFrequency = 40'000'000,
-        .transactionQueueDepth = 10
-    });
-
-    return std::make_shared<St7789Display>(panel_configuration, spi_configuration);
-}

Devices/m5stack-stickc-plus/Source/devices/Power.cpp

@@ -1,39 +0,0 @@
-#include <Axp192.h>
-#include <tactility/device.h>
-
-static std::shared_ptr<Axp192> axp192 = nullptr;
-
-std::shared_ptr<Axp192> createAxp192() {
-    assert(axp192 == nullptr);
-    auto configuration = std::make_unique<Axp192::Configuration>(device_find_by_name("i2c_internal"));
-    axp192 = std::make_shared<Axp192>(std::move(configuration));
-    return axp192;
-}
-
-std::shared_ptr<Axp192> getAxp192() {
-    assert(axp192 != nullptr);
-    return axp192;
-}
-
-bool initAxp() {
-    const auto axp = createAxp192();
-    return axp->init([](auto* driver) {
-        // Reference: https://github.com/pr3y/Bruce/blob/main/lib/utility/AXP192.cpp
-        axp192_ioctl(driver, AXP192_LDO23_VOLTAGE, 3300); // LCD backlight
-        axp192_ioctl(driver, AXP192_ADC_ENABLE_1, 0xff); // Set all ADC enabled
-        axp192_ioctl(driver, AXP192_CHARGE_CONTROL_1, 0xc0); // Battery charging at 4.2 V and 100 mA
-        axp192_ioctl(driver, AXP192_ADC_ENABLE_1, 0xff); // Enable battery, AC in, Vbus, APS ADC
-        uint8_t buffer;
-        axp192_read(driver, AXP192_DCDC13_LDO23_CONTROL, &buffer);
-        axp192_ioctl(driver, AXP192_DCDC13_LDO23_CONTROL, buffer | 0x4D); // Enable Ext, LDO2, LDO3, DCDC1
-        axp192_ioctl(driver, AXP192_PEK, 0x0C); // 128 ms power on, 4 s power off
-        axp192_ioctl(driver, AXP192_GPIO0_LDOIO0_VOLTAGE, 0xF0); // 3.3 V RTC voltage
-        axp192_ioctl(driver, AXP192_GPIO0_CONTROL, 0x02); // Set GPIO0 to LDO
-        axp192_ioctl(driver, AXP192_VBUS_IPSOUT_CHANNEL, 0x80); // Disable Vbus hold limit
-        axp192_ioctl(driver, AXP192_BATTERY_CHARGE_HIGH_TEMP, 0xFC); // Set temperature protection
-        axp192_ioctl(driver, AXP192_BATTERY_CHARGE_CONTROL, 0xA2); // Enable RTC BAT charge
-        axp192_ioctl(driver, AXP192_SHUTDOWN_BATTERY_CHGLED_CONTROL, 0x46); // Enable bat detection
-        return true;
-    });
-
-}

Devices/m5stack-stickc-plus/Source/devices/Power.h

@@ -1,9 +0,0 @@
-#pragma once
-
-#include <Axp192.h>
-
-bool initAxp();
-
-// Must call initAxp() first before this returns a non-nullptr response
-std::shared_ptr<Axp192> getAxp192();
-

Devices/m5stack-stickc-plus/device.properties

@@ -1,23 +0,0 @@
-[general]
-vendor=M5Stack
-name=StickC Plus
-incubating=true
-
-[apps]
-launcherAppId=Launcher
-autoStartAppId=ApWebServer
-
-[hardware]
-target=ESP32
-flashSize=4MB
-spiRam=false
-esptoolFlashFreq=80M
-
-[display]
-size=1.14"
-shape=rectangle
-dpi=242
-
-[lvgl]
-colorDepth=16
-uiDensity=compact

Devices/m5stack-stickc-plus/devicetree.yaml

@@ -1,5 +0,0 @@
-dependencies:
-- Platforms/platform-esp32
-- Drivers/mpu6886-module
-- Drivers/bm8563-module
-dts: m5stack,stickc-plus.dts

Devices/m5stack-stickc-plus/m5stack,stickc-plus.dts

@@ -1,66 +0,0 @@
-/dts-v1/;
-
-#include <tactility/bindings/root.h>
-#include <tactility/bindings/esp32_gpio.h>
-#include <tactility/bindings/esp32_i2c.h>
-#include <tactility/bindings/esp32_spi.h>
-#include <tactility/bindings/esp32_uart.h>
-#include <bindings/mpu6886.h>
-#include <bindings/bm8563.h>
-#include <tactility/bindings/display_placeholder.h>
-
-/ {
-	compatible = "root";
-	model = "M5Stack StickC Plus";
-
-	gpio0 {
-		compatible = "espressif,esp32-gpio";
-		gpio-count = <40>;
-	};
-
-	i2c_internal {
-		compatible = "espressif,esp32-i2c";
-		port = <I2C_NUM_0>;
-		clock-frequency = <400000>;
-		pin-sda = <&gpio0 21 GPIO_FLAG_NONE>;
-		pin-scl = <&gpio0 22 GPIO_FLAG_NONE>;
-
-		mpu6886 {
-			compatible = "invensense,mpu6886";
-			reg = <0x68>;
-		};
-
-		bm8563 {
-			compatible = "belling,bm8563";
-			reg = <0x51>;
-		};
-	};
-
-	i2c_grove {
-		compatible = "espressif,esp32-i2c";
-		port = <I2C_NUM_1>;
-		clock-frequency = <400000>;
-		pin-sda = <&gpio0 32 GPIO_FLAG_NONE>;
-		pin-scl = <&gpio0 33 GPIO_FLAG_NONE>;
-	};
-
-	spi0 {
-		compatible = "espressif,esp32-spi";
-		host = <SPI2_HOST>;
-		cs-gpios = <&gpio0 5 GPIO_FLAG_NONE>;
-		pin-mosi = <&gpio0 15 GPIO_FLAG_NONE>;
-		pin-sclk = <&gpio0 13 GPIO_FLAG_NONE>;
-	
-		display {
-			compatible = "display-placeholder";
-		};
-	};
-
-	uart_grove: uart1 {
-		compatible = "espressif,esp32-uart";
-		status = "disabled";
-		port = <UART_NUM_1>;
-		pin-tx = <&gpio0 33 GPIO_FLAG_NONE>;
-		pin-rx = <&gpio0 32 GPIO_FLAG_NONE>;
-	};
-};

Devices/m5stack-stickc-plus2/device.properties

@@ -1,25 +1,22 @@
-[general]
-vendor=M5Stack
-name=StickC Plus2
-incubating=true
+general.vendor=M5Stack
+general.name=StickC Plus2
+general.incubating=true
 
-[apps]
-launcherAppId=Launcher
-autoStartAppId=ApWebServer
+apps.launcherAppId=Launcher
+apps.autoStartAppId=ApWebServer
 
-[hardware]
-target=ESP32
-flashSize=8MB
-spiRam=true
-spiRamMode=QUAD
-spiRamSpeed=80M
-esptoolFlashFreq=80M
+hardware.target=ESP32
+hardware.flashSize=8MB
+hardware.spiRam=true
+hardware.spiRamMode=QUAD
+hardware.spiRamSpeed=80M
+hardware.esptoolFlashFreq=80M
 
-[display]
-size=1.14"
-shape=rectangle
-dpi=242
+storage.userDataLocation=Internal
 
-[lvgl]
-colorDepth=16
-uiDensity=compact
+display.size=1.14"
+display.shape=rectangle
+display.dpi=242
+
+lvgl.colorDepth=16
+lvgl.uiDensity=compact

Devices/m5stack-sticks3/device.properties

@@ -1,25 +1,22 @@
-[general]
-vendor=M5Stack
-name=StickS3
+general.vendor=M5Stack
+general.name=StickS3
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32S3
-flashSize=8MB
-spiRam=true
-spiRamMode=OCT
-spiRamSpeed=80M
-esptoolFlashFreq=80M
-tinyUsb=true
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=8MB
+hardware.spiRam=true
+hardware.spiRamMode=OCT
+hardware.spiRamSpeed=80M
+hardware.esptoolFlashFreq=80M
+hardware.tinyUsb=true
+hardware.bluetooth=true
 
-[display]
-size=1.14"
-shape=rectangle
-dpi=242
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
-uiDensity=compact
+display.size=1.14"
+display.shape=rectangle
+display.dpi=242
+
+lvgl.colorDepth=16
+lvgl.uiDensity=compact

Devices/m5stack-tab5/CMakeLists.txt

@@ -3,5 +3,5 @@ file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
 idf_component_register(
     SRCS ${SOURCE_FILES}
     INCLUDE_DIRS "Source"
-    REQUIRES Tactility esp_lvgl_port esp_lcd EspLcdCompat esp_lcd_ili9881c esp_lcd_st7123 esp_lcd_touch_st7123 GT911 PwmBacklight driver esp_driver_i2c vfs fatfs ina226-module
+    REQUIRES Tactility esp_lvgl_port esp_lcd EspLcdCompat esp_lcd_ili9881c esp_lcd_st7123 esp_lcd_touch_st7123 GT911 PwmBacklight driver vfs fatfs ina226-module
 )

Devices/m5stack-tab5/device.properties

@@ -1,51 +1,47 @@
-[general]
-vendor=M5Stack
-name=Tab5
+general.vendor=M5Stack
+general.name=Tab5
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32P4
-flashSize=16MB
-spiRam=true
-spiRamMode=HEX
-spiRamSpeed=200M
-esptoolFlashFreq=80M
-bluetooth=true
-usbHostEnabled=true
-tinyUsb=true
+hardware.target=ESP32P4
+hardware.flashSize=16MB
+hardware.spiRam=true
+hardware.spiRamMode=HEX
+hardware.spiRamSpeed=200M
+hardware.esptoolFlashFreq=80M
+hardware.bluetooth=true
+hardware.usbHostEnabled=true
+hardware.tinyUsb=true
 
-[display]
-size=5"
-shape=rectangle
-dpi=294
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
-fontSize=28
-dpi=250
+display.size=5"
+display.shape=rectangle
+display.dpi=294
 
-[sdkconfig]
-CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
-CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
-CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
-CONFIG_SLAVE_IDF_TARGET_ESP32C6=y
-CONFIG_ESP_HOSTED_ENABLED=y
-CONFIG_ESP_HOSTED_SDIO_HOST_INTERFACE=y
-CONFIG_ESP_HOSTED_SDIO_SLOT_1=y
-CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_CMD_SLOT_1=13
-CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_CLK_SLOT_1=12
-CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D0_SLOT_1=11
-CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D1_4BIT_BUS_SLOT_1=10
-CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D2_4BIT_BUS_SLOT_1=9
-CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D3_4BIT_BUS_SLOT_1=8
-CONFIG_ESP_HOSTED_SDIO_GPIO_RESET_SLAVE=15
+lvgl.colorDepth=16
+lvgl.fontSize=28
+lvgl.dpi=250
+
+sdkconfig.CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
+sdkconfig.CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
+sdkconfig.CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
+sdkconfig.CONFIG_SLAVE_IDF_TARGET_ESP32C6=y
+sdkconfig.CONFIG_ESP_HOSTED_ENABLED=y
+sdkconfig.CONFIG_ESP_HOSTED_SDIO_HOST_INTERFACE=y
+sdkconfig.CONFIG_ESP_HOSTED_SDIO_SLOT_1=y
+sdkconfig.CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_CMD_SLOT_1=13
+sdkconfig.CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_CLK_SLOT_1=12
+sdkconfig.CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D0_SLOT_1=11
+sdkconfig.CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D1_4BIT_BUS_SLOT_1=10
+sdkconfig.CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D2_4BIT_BUS_SLOT_1=9
+sdkconfig.CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D3_4BIT_BUS_SLOT_1=8
+sdkconfig.CONFIG_ESP_HOSTED_SDIO_GPIO_RESET_SLAVE=15
 # Fixes recent changes to esp_hosted
-CONFIG_ESP_HOSTED_USE_MEMPOOL=n
+sdkconfig.CONFIG_ESP_HOSTED_USE_MEMPOOL=n
 # Performance: larger L2 cache reduces PSRAM stalls for draw/DPI buffers
-CONFIG_CACHE_L2_CACHE_256KB=y
+sdkconfig.CONFIG_CACHE_L2_CACHE_256KB=y
 # Performance: use P4's PPA (pixel processing accelerator for rotation)
-CONFIG_LVGL_PORT_ENABLE_PPA=y
-CONFIG_LV_DRAW_BUF_ALIGN=64
-CONFIG_LV_DEF_REFR_PERIOD=15
+sdkconfig.CONFIG_LVGL_PORT_ENABLE_PPA=y
+sdkconfig.CONFIG_LV_DRAW_BUF_ALIGN=64
+sdkconfig.CONFIG_LV_DEF_REFR_PERIOD=15

Devices/simulator/device.properties

@@ -1,13 +1,11 @@
-[general]
-vendor=Simulator
-name=Tab5Simulator
+general.vendor=Simulator
+general.name=Tab5Simulator
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=POSIX
+hardware.target=POSIX
 
-[lvgl]
-colorDepth=16
-fontSize=14
+storage.userDataLocation=Internal
+
+lvgl.colorDepth=16
+lvgl.fontSize=14

Devices/unphone/device.properties

@@ -1,25 +1,21 @@
-[general]
-vendor=unPhone
-name=unPhone
+general.vendor=unPhone
+general.name=unPhone
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32S3
-flashSize=8MB
-spiRam=true
-spiRamMode=OCT
-spiRamSpeed=80M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=8MB
+hardware.spiRam=true
+hardware.spiRamMode=OCT
+hardware.spiRamSpeed=80M
+hardware.bluetooth=true
 
-[display]
-size=3.5"
-shape=rectangle
-dpi=165
+storage.userDataLocation=SD
 
-[cdn]
-warningMessage=Put the device into bootloader mode by pressing the center nav button and reset for 2-3 seconds, then release reset, then release the nav button.<br/>After flashing is finished, press the reset button to reboot.
+display.size=3.5"
+display.shape=rectangle
+display.dpi=165
 
-[lvgl]
-colorDepth=24
+cdn.warningMessage=Put the device into bootloader mode by pressing the center nav button and reset for 2-3 seconds, then release reset, then release the nav button.<br/>After flashing is finished, press the reset button to reboot.
+
+lvgl.colorDepth=24

Devices/waveshare-esp32-s3-geek/device.properties

@@ -1,33 +1,29 @@
-[general]
-vendor=Waveshare
-name=ESP32 S3 GEEK
-incubating=true
+general.vendor=Waveshare
+general.name=ESP32 S3 GEEK
+general.incubating=true
 
-[apps]
-launcherAppId=Launcher
-autoStartAppId=ApWebServer
+apps.launcherAppId=Launcher
+apps.autoStartAppId=ApWebServer
 
-[hardware]
-target=ESP32S3
-flashSize=16MB
-spiRam=true
-spiRamMode=QUAD
-spiRamSpeed=120M
-tinyUsb=true
-esptoolFlashFreq=120M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=16MB
+hardware.spiRam=true
+hardware.spiRamMode=QUAD
+hardware.spiRamSpeed=120M
+hardware.tinyUsb=true
+hardware.esptoolFlashFreq=120M
+hardware.bluetooth=true
 
-[display]
-size=1.14"
-shape=rectangle
-dpi=143
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
-uiDensity=compact
+display.size=1.14"
+display.shape=rectangle
+display.dpi=143
+
+lvgl.colorDepth=16
+lvgl.uiDensity=compact
 
-[sdkconfig]
 # Fix error "PSRAM space not enough for the Flash instructions" on boot:
-CONFIG_SPIRAM_FETCH_INSTRUCTIONS=n
-CONFIG_SPIRAM_RODATA=n
-CONFIG_SPIRAM_XIP_FROM_PSRAM=n
+sdkconfig.CONFIG_SPIRAM_FETCH_INSTRUCTIONS=n
+sdkconfig.CONFIG_SPIRAM_RODATA=n
+sdkconfig.CONFIG_SPIRAM_XIP_FROM_PSRAM=n

Devices/waveshare-s3-lcd-13/device.properties

@@ -1,27 +1,24 @@
-[general]
-vendor=WaveShare
-name=S3 LCD 1.3"
-incubating=true
+general.vendor=WaveShare
+general.name=S3 LCD 1.3"
+general.incubating=true
 
-[apps]
-launcherAppId=Launcher
-autoStartAppId=ApWebServer
+apps.launcherAppId=Launcher
+apps.autoStartAppId=ApWebServer
 
-[hardware]
-target=ESP32S3
-flashSize=16MB
-spiRam=true
-spiRamMode=OCT
-spiRamSpeed=120M
-tinyUsb=true
-esptoolFlashFreq=120M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=16MB
+hardware.spiRam=true
+hardware.spiRamMode=OCT
+hardware.spiRamSpeed=120M
+hardware.tinyUsb=true
+hardware.esptoolFlashFreq=120M
+hardware.bluetooth=true
 
-[display]
-size=1.3"
-shape=rectangle
-dpi=261
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
-uiDensity=compact
+display.size=1.3"
+display.shape=rectangle
+display.dpi=261
+
+lvgl.colorDepth=16
+lvgl.uiDensity=compact

Devices/waveshare-s3-touch-lcd-128/device.properties

@@ -1,33 +1,29 @@
-[general]
-vendor=WaveShare
-name=S3 Touch LCD 1.28"
-incubating=true
+general.vendor=WaveShare
+general.name=S3 Touch LCD 1.28"
+general.incubating=true
 
-[apps]
-launcherAppId=Launcher
-autoStartAppId=ApWebServer
+apps.launcherAppId=Launcher
+apps.autoStartAppId=ApWebServer
 
-[hardware]
-target=ESP32S3
-flashSize=16MB
-spiRam=true
-spiRamMode=QUAD
-spiRamSpeed=120M
-tinyUsb=true
-esptoolFlashFreq=120M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=16MB
+hardware.spiRam=true
+hardware.spiRamMode=QUAD
+hardware.spiRamSpeed=120M
+hardware.tinyUsb=true
+hardware.esptoolFlashFreq=120M
+hardware.bluetooth=true
 
-[display]
-size=1.28"
-shape=circle
-dpi=265
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
-uiDensity=compact
+display.size=1.28"
+display.shape=circle
+display.dpi=265
+
+lvgl.colorDepth=16
+lvgl.uiDensity=compact
 
-[sdkconfig]
 # Fix error "PSRAM space not enough for the Flash instructions" on boot:
-CONFIG_SPIRAM_FETCH_INSTRUCTIONS=n
-CONFIG_SPIRAM_RODATA=n
-CONFIG_SPIRAM_XIP_FROM_PSRAM=n
+sdkconfig.CONFIG_SPIRAM_FETCH_INSTRUCTIONS=n
+sdkconfig.CONFIG_SPIRAM_RODATA=n
+sdkconfig.CONFIG_SPIRAM_XIP_FROM_PSRAM=n

Devices/waveshare-s3-touch-lcd-147/device.properties

@@ -1,30 +1,26 @@
-[general]
-vendor=WaveShare
-name=S3 Touch LCD 1.47"
-incubating=true
+general.vendor=WaveShare
+general.name=S3 Touch LCD 1.47"
+general.incubating=true
 
-[apps]
-launcherAppId=Launcher
-autoStartAppId=ApWebServer
+apps.launcherAppId=Launcher
+apps.autoStartAppId=ApWebServer
 
-[hardware]
-target=ESP32S3
-flashSize=16MB
-spiRam=true
-spiRamMode=OCT
-spiRamSpeed=120M
-tinyUsb=true
-esptoolFlashFreq=120M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=16MB
+hardware.spiRam=true
+hardware.spiRamMode=OCT
+hardware.spiRamSpeed=120M
+hardware.tinyUsb=true
+hardware.esptoolFlashFreq=120M
+hardware.bluetooth=true
 
-[display]
-size=1.47"
-shape=rectangle
-dpi=247
+storage.userDataLocation=SD
 
-[cdn]
-warningMessage=Touch doesn't work yet
+display.size=1.47"
+display.shape=rectangle
+display.dpi=247
 
-[lvgl]
-colorDepth=16
-uiDensity=compact
+cdn.warningMessage=Touch doesn't work yet
+
+lvgl.colorDepth=16
+lvgl.uiDensity=compact

Devices/waveshare-s3-touch-lcd-43/Source/Configuration.cpp

@@ -2,8 +2,22 @@
 
 #include <Tactility/hal/Configuration.h>
 
+#include <tactility/drivers/i2c_controller.h>
+
 using namespace tt::hal;
 
+static bool init() {
+    auto* i2c = device_find_by_name("i2c0");
+    check(i2c);
+
+    uint8_t write_buf = 0x01;
+    i2c_controller_write(i2c, 0x24, &write_buf, 1, 200 / portTICK_PERIOD_MS);
+    write_buf = 0x0E; // Pin 2, 3 and 4 high, pin 1 and 5 low
+    i2c_controller_write(i2c, 0x38, &write_buf, 1, 200 / portTICK_PERIOD_MS);
+
+    return true;
+}
+
 static DeviceVector createDevices() {
     return {
         createDisplay(),
@@ -11,5 +25,6 @@ static DeviceVector createDevices() {
 }
 
 extern const Configuration hardwareConfiguration = {
+    .initBoot = init,
     .createDevices = createDevices
 };

Devices/waveshare-s3-touch-lcd-43/Source/module.cpp

@@ -12,7 +12,7 @@ static error_t stop() {
     return ERROR_NONE;
 }
 
-struct Module waveshare_s3_touch_lcd_43_module = {
+Module waveshare_s3_touch_lcd_43_module = {
     .name = "waveshare-s3-touch-lcd-43",
     .start = start,
     .stop = stop,

Devices/waveshare-s3-touch-lcd-43/device.properties

@@ -1,25 +1,23 @@
-[general]
-vendor=WaveShare
-name=S3 Touch LCD 4.3"
+general.vendor=WaveShare
+general.name=S3 Touch LCD 4.3"
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32S3
-flashSize=4MB
-spiRam=true
-spiRamMode=OCT
-spiRamSpeed=120M
-tinyUsb=true
-esptoolFlashFreq=120M
-bluetooth=true
+hardware.target=ESP32S3
+# Some models have 16MB flash, but some have 8MB. We only support the latter to avoid making more builds.
+hardware.flashSize=8MB
+hardware.spiRam=true
+hardware.spiRamMode=OCT
+hardware.spiRamSpeed=120M
+hardware.tinyUsb=true
+hardware.esptoolFlashFreq=120M
+hardware.bluetooth=true
 
-[display]
-size=4.3"
-shape=rectangle
-dpi=217
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
-fontSize=18
+display.size=4.3"
+display.shape=rectangle
+display.dpi=217
+
+lvgl.colorDepth=16
+lvgl.fontSize=18

Devices/waveshare-s3-touch-lcd-43/waveshare,s3-touch-lcd-43.dts

@@ -26,8 +26,8 @@
 		compatible = "espressif,esp32-i2c";
 		port = <I2C_NUM_0>;
 		clock-frequency = <400000>;
-		pin-sda = <&gpio0 8 GPIO_FLAG_NONE>;
-		pin-scl = <&gpio0 9 GPIO_FLAG_NONE>;
+		pin-sda = <&gpio0 8 GPIO_FLAG_PULL_UP>;
+		pin-scl = <&gpio0 9 GPIO_FLAG_PULL_UP>;
 	};
 
 	spi0 {
@@ -37,7 +37,7 @@
 		pin-mosi = <&gpio0 11 GPIO_FLAG_NONE>;
 		pin-miso = <&gpio0 13 GPIO_FLAG_NONE>;
 		pin-sclk = <&gpio0 12 GPIO_FLAG_NONE>;
-	
+
 		sdcard@0 {
 			compatible = "espressif,esp32-sdspi";
 			frequency-khz = <20000>;

Devices/wireless-tag-wt32-sc01-plus/device.properties

@@ -1,24 +1,21 @@
-[general]
-vendor=Wireless Tag
-name=WT32 SC01 Plus
+general.vendor=Wireless Tag
+general.name=WT32 SC01 Plus
 
-[apps]
-launcherAppId=Launcher
+apps.launcherAppId=Launcher
 
-[hardware]
-target=ESP32S3
-flashSize=16MB
-spiRam=true
-spiRamMode=QUAD
-spiRamSpeed=80M
-tinyUsb=true
-esptoolFlashFreq=80M
-bluetooth=true
+hardware.target=ESP32S3
+hardware.flashSize=16MB
+hardware.spiRam=true
+hardware.spiRamMode=QUAD
+hardware.spiRamSpeed=80M
+hardware.tinyUsb=true
+hardware.esptoolFlashFreq=80M
+hardware.bluetooth=true
 
-[display]
-size=3.5"
-shape=rectangle
-dpi=165
+storage.userDataLocation=SD
 
-[lvgl]
-colorDepth=16
+display.size=3.5"
+display.shape=rectangle
+display.dpi=165
+
+lvgl.colorDepth=16

Documentation/ideas.md

@@ -12,8 +12,6 @@
 
 ## Higher Priority
 
-- Require either SD card present or at least 8MB of flash. This way we can increase firmware size, ensure performance, and have a single location for storing data.
-- Consider storing data on SD card in `/tactility` folder (for usage with Launcher)
 - Add font design tokens such as "regular", "title" and "smaller". Perhaps via the LVGL kernel module.
 - Add kernel listening mechanism so that the root device init can be notified when a device becomes available: 
   Callback for device/start stop with filtering on device type:
@@ -21,13 +19,10 @@
     - on_after_start: e.g. to initialize an I2S device via its I2C connection, once I2C becomes available
     - on_before_stop: e.g. to stop using a device that was started before
     - on_after_stop: ?
-- DTS: support for #defines
-- DTS: support for aliases
 - SPI kernel driver
 - Kernel concepts for ELF loading (generic approach for GUI apps, console apps, libraries).
 - Fix glitches when installing app via App Hub with 4.3" Waveshare
 - TCA9534 keyboards should use interrupts
-- GT911 drivers should use interrupts if it's stable
 - Fix Cardputer (original): use LV_KEY_NEXT and _PREV in keyboard mapping instead of encoder driver hack (and check GPIO app if it then hangs too)
 - Expose http::download() and main dispatcher to TactiltyC.
 - External app loading: Check the version of Tactility and check ESP target hardware to check for compatibility
@@ -36,15 +31,9 @@
   Create some kind of "intent" handler like on Android.
   The intent can have an action (e.g. view), a URL and an optional bundle.
   The manifest can provide the intent handler
-- When an SD card is detected, check if it has been initialized and assigned as data partition.
-  If the user choses to select it, then copy files from /data over to it.
-  Write the user choice to a file on the card.
-  File contains 3 statuses: ignore, data, .. initdata?
-  The latter is used for auto-selecting it as data partition.
 - Support direct installation of an `.app` file with `tactility.py install helloworld.app <ip>`
 - Support `tactility.py target <ip>` to remember the device IP address.
 - minitar/untarFile(): "entry->metadata.path" can escape its confined path (e.g. "../something")
-- Refactor elf loader code to make it multi-platform and to support multiple types of executables
 
 ## Medium Priority
 
@@ -91,7 +80,7 @@
 - Audio player app
 - Audio recording app
 - OTA updates
-- T-Deck Plus: Create separate device config?
+- T-Deck Plus: Create separate device config (pre-requisite: needs more kernel drivers so the driver count in the device project is reduced)
 - If present, use LED to show boot/wifi status
 - Capacity based on voltage: estimation for various devices uses a linear voltage curve, but it should use a battery discharge curve.
 - Wrapper for lvgl slider widget that shows "+" and "-" buttons, and also the value in a label.

Documentation/releasing.md

@@ -4,24 +4,22 @@
 2. Set the new version in the Tactility repository:
     1. Update `version.txt` in the Tactility project and create a branch to start a build for it
     2. Merge the branch and wait for a build.
-3. Upload the new Tactility SDK to the CDN
-    1. Upload it to the [CDN](https://dash.cloudflare.com)
-    2. Update `sdk.json` from [TactilityTool](https://github.com/TactilityProject/TactilityTool) and upload it to [CDN](https://dash.cloudflare.com)
-4. Update the [TactilityApps](https://github.com/TactilityProject/TactilityApps) with the new SDK and also release these to the CDN:
-    1. Download the `cdn-files.zip` from the pipelines
-    2. Upload them to the CDN at `apps/x.y.z/`
-    3. Also upload them to the CDN for the upcoming version, because the upcoming a.b.c version will also need some basic apps to download
-5. Test the latest unstable version of Tactility on several devices using the [web installer](https://install.tactilityproject.org). Pay special attention to:
-    1. The version of the unstable channel (should be updated!)
-    2. App Hub
-    3. Wi-Fi
-6. Test the firmwares on all devices with the local web installer
-7. Push a tag e.g. `v1.2.3` - the `v` prefix is crucial for the pipelines
-8. The pipelines should now kick off a build that releases the build to the stable channel of the Web Installer. Verify that.
+3. Push a tag e.g. `v1.2.3` - the `v` prefix is crucial for the pipelines.
+4. Wait for the SDK and firmwares to be published on the CDN.
+5. Test the firmwares on all devices with the web installer
+6. Run `Buildscripts/gh-download-artifacts.py [actionId] --token [token]` and let it run in the background.
+   Get a token from [here](https://github.com/settings/personal-access-tokens)
+7. Update the [TactilityApps](https://github.com/TactilityProject/TactilityApps) with the new SDK version and bump the app versions.
+8. After merging the apps, manually upload to CDN, then test them.
 9. Make a new version of the docs available at [TactilityDocs](https://github.com/TactilityProject/TactilityDocs)
+   1. Copy `docs/versions/main/` into new version folder
+   2. Edit `index.html` to include the new version
+   3. Push code directly to `main` branch
 10. Make a new [GitHub release](https://github.com/TactilityProject/Tactility/releases/new)
+    Run `Buildscripts/release-summary.py` to generate a release, then review it
 11. Double-check that all CDN/TactilityApps/Tactility repository changes are merged.
-12. Ensure that the CDN is not in development mode anymore.
+12. Add the `-dev` postfix from `version.txt` and bump the version. Merge it to `main`.
+13. Ensure that the CDN is not in development mode anymore.
 
 ### Post-release
 

Drivers/EspLcdCompat/Source/EspLcdDisplayV2.h

@@ -6,6 +6,7 @@
 
 #include <esp_lcd_types.h>
 #include <esp_lvgl_port_disp.h>
+#include <hal/gpio_types.h>
 
 constexpr auto DEFAULT_BUFFER_SIZE = 0;
 

Drivers/EspLcdCompat/Source/EspLcdSpiDisplay.cpp

@@ -18,8 +18,6 @@ bool EspLcdSpiDisplay::createIoHandle(esp_lcd_panel_io_handle_t& outHandle) {
         .user_ctx = nullptr,
         .lcd_cmd_bits = 8,
         .lcd_param_bits = 8,
-        .cs_ena_pretrans = 0,
-        .cs_ena_posttrans = 0,
         .flags = {
             .dc_high_on_cmd = 0,
             .dc_low_on_data = 0,

Drivers/EspLcdCompat/Source/EspLcdTouch.cpp

@@ -48,6 +48,11 @@ bool EspLcdTouch::startLvgl(lv_disp_t* display) {
         return false;
     }
 
+    if (touchHandle == nullptr) {
+        LOGGER.error("Cannot start LVGL touch: touchHandle is null");
+        return false;
+    }
+
     if (touchDriver != nullptr && touchDriver.use_count() > 1) {
         LOGGER.warn("TouchDriver is still in use.");
     }

Drivers/PwmBacklight/Source/PwmBacklight.cpp

@@ -39,7 +39,6 @@ bool init(gpio_num_t pin, uint32_t frequencyHz, ledc_timer_t timer, ledc_channel
         .timer_sel = backlightTimer,
         .duty = 0,
         .hpoint = 0,
-        .sleep_mode = LEDC_SLEEP_MODE_NO_ALIVE_NO_PD,
         .flags = {
             .output_invert = 0
         }

Firmware/CMakeLists.txt

@@ -18,11 +18,13 @@ endif ()
 
 set(DEVICETREE_LOCATION "${PROJECT_ROOT}/Devices/${TACTILITY_DEVICE_ID}")
 
+find_package(Python3 COMPONENTS Interpreter REQUIRED)
+
 # Check if device has Bluetooth enabled
 # Fixes the sdkconfig bluetooth enable options from getting nuked on non-P4+C6 builds when idf build runs
 if (DEFINED ENV{ESP_IDF_VERSION})
     file(READ "${DEVICETREE_LOCATION}/device.properties" device_properties_content)
-    if (device_properties_content MATCHES "bluetooth=true")
+    if (device_properties_content MATCHES "hardware\\.bluetooth=true")
         list(APPEND REQUIRES_LIST bt)
     endif()
 endif()
@@ -32,7 +34,7 @@ endif()
 #
 
 execute_process(
-    COMMAND python -m pip install lark==1.3.1 pyyaml==6.0.3
+    COMMAND ${Python3_EXECUTABLE} -m pip install --break-system-packages lark==1.3.1 pyyaml==6.0.3
     WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
 )
 
@@ -41,7 +43,7 @@ execute_process(
 #
 
 execute_process(
-    COMMAND python "${PROJECT_ROOT}/Buildscripts/DevicetreeCompiler/dependencies.py" "${DEVICETREE_LOCATION}"
+    COMMAND ${Python3_EXECUTABLE} "${PROJECT_ROOT}/Buildscripts/DevicetreeCompiler/dependencies.py" "${DEVICETREE_LOCATION}"
     WORKING_DIRECTORY "${PROJECT_ROOT}"
     OUTPUT_VARIABLE DEVICE_DEPENDENCIES
     OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -107,7 +109,7 @@ add_custom_target(AlwaysRun
 add_custom_command(
     OUTPUT "${GENERATED_DIR}/devicetree.c"
         "${GENERATED_DIR}/devicetree.h"
-    COMMAND python "${CMAKE_SOURCE_DIR}/Buildscripts/DevicetreeCompiler/compile.py"
+    COMMAND ${Python3_EXECUTABLE} "${CMAKE_SOURCE_DIR}/Buildscripts/DevicetreeCompiler/compile.py"
         "${DEVICETREE_LOCATION}" "${GENERATED_DIR}"
     WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
     DEPENDS AlwaysRun "${DEVICETREE_LOCATION}/devicetree.yaml" # AlwaysRun ensures it always gets built
@@ -119,3 +121,4 @@ set_source_files_properties("${GENERATED_DIR}/devicetree.h" PROPERTIES GENERATED
 # Update target for generated code
 target_sources(${COMPONENT_LIB} PRIVATE "${GENERATED_DIR}/devicetree.c")
 target_include_directories(${COMPONENT_LIB} PRIVATE "${GENERATED_DIR}")
+add_dependencies(${COMPONENT_LIB} Generated)

Firmware/Kconfig

@@ -77,6 +77,18 @@ menu "Tactility App"
     config TT_TDECK_WORKAROUND
         bool "Temporary work-around until we fix the T-Deck keyboard and trackball settings"
         default n
+    choice TT_USER_DATA_LOCATION
+        prompt "User Data Location"
+        default TT_USER_DATA_LOCATION_INTERNAL
+        help
+            Where user data is stored on this device.
+            "Internal Flash" assumes /data always exists.
+            "SD Card" looks for the first mounted SD card at runtime and requires one to be present.
+        config TT_USER_DATA_LOCATION_SD
+            bool "SD Card"
+        config TT_USER_DATA_LOCATION_INTERNAL
+            bool "Internal Flash"
+    endchoice
     config TT_SPLASH_DURATION
        int "Splash Duration (ms)"
        default 1000

Firmware/idf_component.yml

@@ -29,7 +29,6 @@ dependencies:
   espressif/esp_lcd_touch_ft5x06: "1.0.6~1"
   espressif/esp_io_expander: "1.0.1"
   espressif/esp_io_expander_tca95xx_16bit: "1.0.1"
-  espressif/esp_lcd_axs15231b: "2.0.2"
   lambage/esp_lcd_touch_ft6336u: "1.0.8"
   espressif/esp_lcd_st7701:
     version: "1.1.3"
@@ -81,5 +80,6 @@ dependencies:
     version: "1.1.4"
     rules:
       - if: "target in [esp32s3, esp32p4]"
-  idf: '5.5.2'
+  espressif/mdns: "*"
+  idf: '>=5.2.0'
 

Libraries/QRCode/src/qrcode.h

@@ -38,9 +38,11 @@
 #define __QRCODE_H_
 
 #ifndef __cplusplus
-typedef unsigned char bool;
-static const bool false = 0;
-static const bool true = 1;
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L)
+// C23 has bool, true, false as standard keywords
+#else
+#include <stdbool.h>
+#endif
 #endif
 
 #include <stdint.h>

Modules/lvgl-module/CMakeLists.txt

@@ -44,7 +44,7 @@ READ_PROPERTIES_TO_MAP(
     device_properties
 )
 # Read UI density
-GET_VALUE_FROM_MAP(device_properties "[lvgl]uiDensity" ui_density)
+GET_VALUE_FROM_MAP(device_properties "lvgl.uiDensity" ui_density)
 # Define UiDensity enum value
 if (ui_density)
     if (ui_density STREQUAL "default")
@@ -52,7 +52,7 @@ if (ui_density)
     elseif (ui_density STREQUAL "compact")
         set(ui_density_variable "LVGL_UI_DENSITY_COMPACT")
     else ()
-        message(FATAL_ERROR "Invalid [lvgl]uiDensity: '${ui_density}'. Must be either 'default' or 'compact'")
+        message(FATAL_ERROR "Invalid lvgl.uiDensity: '${ui_density}'. Must be either 'default' or 'compact'")
     endif ()
     message("UI density set to '${ui_density}' via properties")
 else ()