Compare commits

...

22 Commits

Author SHA1 Message Date
Adolfo Reyna e4b95396dd feat: Add JPEG decoder configuration and fix LCD color inversion 2026-07-08 23:20:06 -04:00
Adolfo Reyna 4003065074 fix(es3c28p): convert device.properties to dot-notation format to support Bluetooth in upstream build 2026-07-08 17:09:45 -04:00
Adolfo Reyna 300ddb3a7f feat: integrate MCP and ES3C28P audio support with upstream compatibility updates 2026-07-04 15:41:37 -04:00
Adolfo Reyna b8bf59fedf Merge remote-tracking branch 'origin/main' into main 2026-07-04 15:39:52 -04:00
Ken Van Hoeylandt ecad2248d9 Various improvements (#547)
- 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
2026-07-04 21:26:43 +02:00
Ken Van Hoeylandt a323f8e148 Implement SD card for WaveShare S3 Touch LCD 4.3" (#546) 2026-07-04 09:28:31 +02:00
Ken Van Hoeylandt 05720821f8 Require SD card or >4MB flash (#545) 2026-07-03 23:56:03 +02:00
Ken Van Hoeylandt 90afba647e Update properties parsing for app manifest and device manifest files (#544) 2026-07-03 00:29:01 +02:00
Ken Van Hoeylandt 35fd7dd536 Post-release changes (#543)
- Update version to 0.8.0-dev
- Add new release scripts
- Update release docs
2026-07-02 20:52:26 +02:00
Adolfo Reyna 68a6ca0ce3 Associate .mp3 files with the Mp3Player application in Files browser 2026-06-28 22:23:01 -04:00
Adolfo Reyna 430f8889ac Merge remote-tracking branch 'origin/main' 2026-06-28 21:13:35 -04:00
Adolfo Reyna e0a92ea50e feat: migrate all large MCP server allocations and MP3 buffers to PSRAM (SPIRAM) 2026-06-27 10:04:30 -04:00
Adolfo Reyna 0ae9b43f87 fix: increase HTTP server stack size to 16KB to prevent MP3 decode stack overflow and reset I2S controller on stop to eliminate static noise 2026-06-27 10:00:36 -04:00
Adolfo Reyna 598af546fd fix: ensure backlight turns back on during startMcpScreensaver and invalidate canvas on drawText 2026-06-27 09:41:40 -04:00
Adolfo Reyna cd921e1aa9 feat: implement MCP drawing as screensaver instead of standalone app
- Add ScreensaverType::McpScreen to DisplaySettings enum, toString/fromString
- Add 'MCP Screen' option to the Display settings screensaver dropdown
- New McpScreensaver (Screensaver subclass): creates full-screen lv_canvas on
  the overlay, allocates framebuffer in SPIRAM, registers canvas pointer in
  McpSystemState, shows 'Waiting for LLM...' until first draw command arrives
- Wire McpScreensaver into DisplayIdle::activateScreensaver() switch
- McpSystem::ensureOverrideScreen() now calls displayidle::findService()->
  startScreensaver() instead of launching McpOverrideApp — canvas appears
  automatically on any LLM draw command
- Remove McpOverrideApp (replaced by screensaver), deregister from Tactility.cpp
- Remove mcpOverrideEnabled from McpSettings — no longer needed
- Simplify McpSettingsApp: remove Screen Override toggle, update info text to
  direct users to Settings -> Display -> Screensaver -> MCP Screen
2026-06-27 09:17:50 -04:00
Adolfo Reyna 41004a3c6f feat: integrate MCP server and screen override into system firmware
- Add McpSettings (load/save mcpEnabled, mcpOverrideEnabled to /data/service/mcp/settings.properties)
- Add McpSystem: global state, canvas drawing (RGB565, BMP, PBM, text), I2S audio (WAV, MP3 via minimp3, tone, record)
- Add McpHandler: unauthenticated POST /api/mcp (JSON-RPC 2.0, 13 tools) and POST /api/screen/raw endpoints
- Route MCP endpoints before Basic Auth check in WebServerService::handleApiPost
- Start HTTP server at boot if either webServerEnabled OR mcpEnabled is set
- Fix setEnabled: start unconditionally when called with true; only stop if both WS and MCP are disabled
- Add McpSettingsApp (Settings category): toggle MCP service + screen override, show live endpoint URL
- Add McpOverrideApp (appId one.tactility.mcpscreen): full-screen LVGL canvas for LLM-driven display override
- Register both new apps in Tactility.cpp
2026-06-26 23:02:09 -04:00
Adolfo Reyna 28ff01561a Fix mouse coordinates, sequence BLE discovery/encryption, and prevent mouse from disabling on-screen keyboard 2026-06-26 21:47:08 -04:00
Adolfo Reyna 68bf8f5a01 Revert "Fix BLE connection collision and filter unnamed devices"
This reverts commit bf7e40f0f1.
2026-06-26 13:40:20 -04:00
Adolfo Reyna bf7e40f0f1 Fix BLE connection collision and filter unnamed devices 2026-06-23 19:29:41 -04:00
Adolfo Reyna 71cc05e276 feat(es3c28p): fix audio speed-up, boost mic gain, and correct I2S pinout 2026-06-23 18:32:33 -04:00
Adolfo Reyna 94b5cdbfc4 feat(es3c28p): add audio playback and mic support, and fix chmod stub bug
Build Simulator / Linux (push) Has been cancelled
Build Simulator / macOS (push) Has been cancelled
Build Firmware / BuildSdk (map[arch:esp32 id:generic-esp32]) (push) Has been cancelled
Build Firmware / BuildSdk (map[arch:esp32c6 id:generic-esp32c6]) (push) Has been cancelled
Build Firmware / BuildSdk (map[arch:esp32p4 id:generic-esp32p4]) (push) Has been cancelled
Build Firmware / BuildSdk (map[arch:esp32s3 id:generic-esp32s3]) (push) Has been cancelled
Tests / TactilityTests (push) Has been cancelled
Tests / DevicetreeTests (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:cyd-2432s024c]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:cyd-2432s024r]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:cyd-2432s028r]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:cyd-2432s028rv3]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:cyd-2432s032c]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:cyd-3248s035c]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:cyd-e32r28t]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:cyd-e32r32p]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:elecrow-crowpanel-basic-28]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:elecrow-crowpanel-basic-35]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:guition-jc2432w328c]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:lilygo-tdisplay]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:m5stack-core2]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:m5stack-stickc-plus2]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:m5stack-stickc-plus]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32p4 id:guition-jc1060p470ciwy]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32p4 id:m5stack-tab5]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:btt-panda-touch]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:cyd-4848s040c]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:cyd-8048s043c]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:elecrow-crowpanel-advance-28]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:elecrow-crowpanel-advance-35]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:elecrow-crowpanel-advance-50]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:elecrow-crowpanel-basic-50]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:guition-jc3248w535c]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:guition-jc8048w550c]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:heltec-wifi-lora-32-v3]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:lilygo-tdeck]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:lilygo-tdisplay-s3]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:lilygo-tdongle-s3]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:lilygo-thmi]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:lilygo-tlora-pager]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:m5stack-cardputer-adv]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:m5stack-cardputer]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:m5stack-cores3]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:m5stack-papers3]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:m5stack-stackchan]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:m5stack-sticks3]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:unphone]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:waveshare-esp32-s3-geek]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:waveshare-s3-lcd-13]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:waveshare-s3-touch-lcd-128]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:waveshare-s3-touch-lcd-147]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:waveshare-s3-touch-lcd-43]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:wireless-tag-wt32-sc01-plus]) (push) Has been cancelled
Build Firmware / BundleArtifacts (push) Has been cancelled
Build Firmware / PublishFirmwareSnapshot (push) Has been cancelled
Build Firmware / PublishFirmwareStable (push) Has been cancelled
Build Firmware / PublishSdk (push) Has been cancelled
2026-06-23 12:34:32 -04:00
Adolfo Reyna 5c535490ea Fix compatibility issues for ESP-IDF v5.3.2 and add es3c28p target support
Build Simulator / Linux (push) Has been cancelled
Build Simulator / macOS (push) Has been cancelled
Build Firmware / BuildSdk (map[arch:esp32 id:generic-esp32]) (push) Has been cancelled
Build Firmware / BuildSdk (map[arch:esp32c6 id:generic-esp32c6]) (push) Has been cancelled
Build Firmware / BuildSdk (map[arch:esp32p4 id:generic-esp32p4]) (push) Has been cancelled
Build Firmware / BuildSdk (map[arch:esp32s3 id:generic-esp32s3]) (push) Has been cancelled
Tests / TactilityTests (push) Has been cancelled
Tests / DevicetreeTests (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:cyd-2432s024c]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:cyd-2432s024r]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:cyd-2432s028r]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:cyd-2432s028rv3]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:cyd-2432s032c]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:cyd-3248s035c]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:cyd-e32r28t]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:cyd-e32r32p]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:elecrow-crowpanel-basic-28]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:elecrow-crowpanel-basic-35]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:guition-jc2432w328c]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:lilygo-tdisplay]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:m5stack-core2]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:m5stack-stickc-plus2]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32 id:m5stack-stickc-plus]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32p4 id:guition-jc1060p470ciwy]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32p4 id:m5stack-tab5]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:btt-panda-touch]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:cyd-4848s040c]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:cyd-8048s043c]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:elecrow-crowpanel-advance-28]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:elecrow-crowpanel-advance-35]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:elecrow-crowpanel-advance-50]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:elecrow-crowpanel-basic-50]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:guition-jc3248w535c]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:guition-jc8048w550c]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:heltec-wifi-lora-32-v3]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:lilygo-tdeck]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:lilygo-tdisplay-s3]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:lilygo-tdongle-s3]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:lilygo-thmi]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:lilygo-tlora-pager]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:m5stack-cardputer-adv]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:m5stack-cardputer]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:m5stack-cores3]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:m5stack-papers3]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:m5stack-stackchan]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:m5stack-sticks3]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:unphone]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:waveshare-esp32-s3-geek]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:waveshare-s3-lcd-13]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:waveshare-s3-touch-lcd-128]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:waveshare-s3-touch-lcd-147]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:waveshare-s3-touch-lcd-43]) (push) Has been cancelled
Build Firmware / BuildFirmware (map[arch:esp32s3 id:wireless-tag-wt32-sc01-plus]) (push) Has been cancelled
Build Firmware / BundleArtifacts (push) Has been cancelled
Build Firmware / PublishFirmwareSnapshot (push) Has been cancelled
Build Firmware / PublishFirmwareStable (push) Has been cancelled
Build Firmware / PublishSdk (push) Has been cancelled
2026-06-23 11:59:47 -04:00
199 changed files with 9124 additions and 1995 deletions
+4
View File
@@ -11,6 +11,8 @@ jobs:
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with:
persist-credentials: false
- name: "Build" - name: "Build"
uses: ./.github/actions/build-simulator uses: ./.github/actions/build-simulator
with: with:
@@ -21,6 +23,8 @@ jobs:
runs-on: macos-latest runs-on: macos-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with:
persist-credentials: false
- name: "Build" - name: "Build"
uses: ./.github/actions/build-simulator uses: ./.github/actions/build-simulator
with: with:
+4 -1
View File
@@ -23,6 +23,8 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with:
persist-credentials: false
- name: "Build SDK" - name: "Build SDK"
uses: ./.github/actions/build-sdk uses: ./.github/actions/build-sdk
with: with:
@@ -66,7 +68,6 @@ jobs:
{ id: m5stack-cores3, arch: esp32s3 }, { id: m5stack-cores3, arch: esp32s3 },
{ id: m5stack-papers3, arch: esp32s3 }, { id: m5stack-papers3, arch: esp32s3 },
{ id: m5stack-stackchan, arch: esp32s3 }, { id: m5stack-stackchan, arch: esp32s3 },
{ id: m5stack-stickc-plus, arch: esp32 },
{ id: m5stack-stickc-plus2, arch: esp32 }, { id: m5stack-stickc-plus2, arch: esp32 },
{ id: m5stack-sticks3, arch: esp32s3 }, { id: m5stack-sticks3, arch: esp32s3 },
{ id: m5stack-tab5, arch: esp32p4 }, { id: m5stack-tab5, arch: esp32p4 },
@@ -82,6 +83,8 @@ jobs:
needs: [ BuildSdk ] needs: [ BuildSdk ]
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with:
persist-credentials: false
- name: "Build Firmware" - name: "Build Firmware"
uses: ./.github/actions/build-firmware uses: ./.github/actions/build-firmware
with: with:
+2 -1
View File
@@ -31,8 +31,9 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: "Checkout repo" - name: "Checkout repo"
uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
persist-credentials: false
submodules: recursive submodules: recursive
- name: "Install Python Dependencies" - name: "Install Python Dependencies"
shell: bash shell: bash
+21 -26
View File
@@ -2,11 +2,9 @@ import subprocess
from datetime import datetime, UTC from datetime import datetime, UTC
import os import os
import sys import sys
import configparser
from dataclasses import dataclass, asdict from dataclasses import dataclass, asdict
import json import json
import shutil import shutil
from configparser import RawConfigParser
VERBOSE = False VERBOSE = False
DEVICES_FOLDER = "Devices" DEVICES_FOLDER = "Devices"
@@ -68,32 +66,29 @@ def exit_with_error(message):
sys.exit(1) sys.exit(1)
def read_properties_file(path): def read_properties_file(path):
config = configparser.RawConfigParser() properties = {}
# Don't convert keys to lowercase with open(path, "r") as file:
config.optionxform = str for line in file:
config.read(path) stripped = line.strip()
return config 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): def get_property_or_none(properties: dict, group: str, key: str):
if group not in properties.sections(): return properties.get(f"{group}.{key}")
return None
if key not in properties[group].keys():
return None
return properties[group][key]
def get_boolean_property_or_false(properties: RawConfigParser, group: str, key: str): def get_boolean_property_or_false(properties: dict, group: str, key: str):
if group not in properties.sections(): return properties.get(f"{group}.{key}") == "true"
return False
if key not in properties[group].keys():
return False
return properties[group][key] == "true"
def get_property_or_exit(properties: RawConfigParser, group: str, key: str): def get_property_or_exit(properties: dict, group: str, key: str):
if group not in properties.sections(): full_key = f"{group}.{key}"
exit_with_error(f"Device properties does not contain group: {group}") if full_key not in properties:
if key not in properties[group].keys(): exit_with_error(f"Device properties does not contain key: {full_key}")
exit_with_error(f"Device properties does not contain key: {key}") return properties[full_key]
return properties[group][key]
def read_device_properties(device_id): def read_device_properties(device_id):
mapping_file_path = os.path.join(DEVICES_FOLDER, device_id, "device.properties") mapping_file_path = os.path.join(DEVICES_FOLDER, device_id, "device.properties")
@@ -129,7 +124,7 @@ def to_manifest_chip_name(name):
return "" 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_path = os.path.join(in_path, device_directory)
in_device_binaries_path = os.path.join(in_device_path, "Binaries") in_device_binaries_path = os.path.join(in_device_path, "Binaries")
if not os.path.isdir(in_device_binaries_path): if not os.path.isdir(in_device_binaries_path):
+135
View File
@@ -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()
+126
View File
@@ -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()
+2 -5
View File
@@ -28,7 +28,6 @@ function(READ_PROPERTIES_TO_MAP PROPERTY_FILE RESULT_VAR)
endif () endif ()
file(STRINGS ${PROPERTY_FILE_ABS} lines) file(STRINGS ${PROPERTY_FILE_ABS} lines)
set(current_section "")
set(map_content "") set(map_content "")
foreach(line IN LISTS lines) foreach(line IN LISTS lines)
@@ -37,9 +36,7 @@ function(READ_PROPERTIES_TO_MAP PROPERTY_FILE RESULT_VAR)
continue() continue()
endif () endif ()
if (line MATCHES "^\\[.*\\]$") if (line MATCHES "^([^=]+)=(.*)$")
set(current_section "${line}")
elseif (line MATCHES "^([^=]+)=(.*)$")
set(key "${CMAKE_MATCH_1}") set(key "${CMAKE_MATCH_1}")
set(value "${CMAKE_MATCH_2}") set(value "${CMAKE_MATCH_2}")
string(STRIP "${key}" key) string(STRIP "${key}" key)
@@ -49,7 +46,7 @@ function(READ_PROPERTIES_TO_MAP PROPERTY_FILE RESULT_VAR)
set(value "${CMAKE_MATCH_1}") set(value "${CMAKE_MATCH_1}")
endif () endif ()
list(APPEND map_content "${current_section}${key}" "${value}") list(APPEND map_content "${key}" "${value}")
endif () endif ()
endforeach() endforeach()
+84
View File
@@ -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()
+6 -2
View File
@@ -54,6 +54,8 @@ if (DEFINED ENV{ESP_IDF_VERSION})
set(EXCLUDE_COMPONENTS "Simulator") set(EXCLUDE_COMPONENTS "Simulator")
idf_build_set_property(LINK_OPTIONS "-Wl,--allow-multiple-definition" APPEND)
# Panic handler wrapping is only available on Xtensa architecture # Panic handler wrapping is only available on Xtensa architecture
if (CONFIG_IDF_TARGET_ARCH_XTENSA) if (CONFIG_IDF_TARGET_ARCH_XTENSA)
idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=esp_panic_handler" APPEND) 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_DEVICE_NAME_SIMPLE="Simulator")
add_compile_definitions(CONFIG_TT_LAUNCHER_APP_ID="Launcher") add_compile_definitions(CONFIG_TT_LAUNCHER_APP_ID="Launcher")
add_compile_definitions(CONFIG_TT_AUTO_START_APP_ID="") add_compile_definitions(CONFIG_TT_AUTO_START_APP_ID="")
add_compile_definitions(CONFIG_TT_USER_DATA_LOCATION_INTERNAL)
endif () endif ()
project(Tactility) project(Tactility)
@@ -103,8 +106,9 @@ if (NOT DEFINED ENV{ESP_IDF_VERSION})
target_compile_definitions(freertos_kernel PUBLIC "projCOVERAGE_TEST=0") target_compile_definitions(freertos_kernel PUBLIC "projCOVERAGE_TEST=0")
# EmbedTLS # EmbedTLS
set(ENABLE_TESTING OFF) set(ENABLE_TESTING OFF CACHE BOOL "" FORCE)
set(ENABLE_PROGRAMS OFF) set(ENABLE_PROGRAMS OFF CACHE BOOL "" FORCE)
set(MBEDTLS_FATAL_WARNINGS OFF CACHE BOOL "" FORCE)
add_subdirectory(Libraries/mbedtls) add_subdirectory(Libraries/mbedtls)
# SDL # SDL
@@ -1 +0,0 @@
enableOnBoot=false
@@ -1 +0,0 @@
enableOnBoot=false
@@ -1 +0,0 @@
enableOnBoot=false
-5
View File
@@ -1,5 +0,0 @@
language=en-US
timeFormat24h=true
dateFormat=DD/MM/YYYY
region=EU
timezone=Europe/Amsterdam
@@ -485,7 +485,7 @@
<button class="btn btn-secondary btn-sm" onclick="goUp()" id="upBtn">Up</button> <button class="btn btn-secondary btn-sm" onclick="goUp()" id="upBtn">Up</button>
</div> </div>
<div class="toolbar-sep"></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> <button class="btn btn-primary btn-sm" onclick="refreshFiles()">Go</button>
<div class="toolbar-sep"></div> <div class="toolbar-sep"></div>
<div class="toolbar-group"> <div class="toolbar-group">
@@ -739,7 +739,6 @@ function renderDashboard(data) {
<div class="card"> <div class="card">
<h2>Quick Actions</h2> <h2>Quick Actions</h2>
<div class="actions"> <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>' : ''} ${data.features_enabled?.screenshot ? '<button class="btn btn-secondary" onclick="captureScreenshot(this)">Screenshot</button>' : ''}
<button class="btn btn-danger" onclick="rebootDevice(this)">Reboot</button> <button class="btn btn-danger" onclick="rebootDevice(this)">Reboot</button>
</div> </div>
-63
View File
@@ -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>
-3
View File
@@ -1,3 +0,0 @@
{
"version": 0
}
+18 -21
View File
@@ -1,25 +1,22 @@
[general] general.vendor=BigTreeTech
vendor=BigTreeTech general.name=Panda Touch,K Touch
name=Panda Touch,K Touch
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=OCT
spiRamMode=OCT hardware.spiRamSpeed=120M
spiRamSpeed=120M hardware.esptoolFlashFreq=120M
esptoolFlashFreq=120M hardware.bluetooth=true
bluetooth=true hardware.usbHostEnabled=true
usbHostEnabled=true
[display] storage.userDataLocation=Internal
size=5"
shape=rectangle
dpi=187
[lvgl] display.size=5"
colorDepth=16 display.shape=rectangle
fontSize=18 display.dpi=187
lvgl.colorDepth=16
lvgl.fontSize=18
+12 -15
View File
@@ -1,19 +1,16 @@
[general] general.vendor=CYD
vendor=CYD general.name=2432S024C
name=2432S024C
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32
target=ESP32 hardware.flashSize=4MB
flashSize=4MB hardware.spiRam=false
spiRam=false
[display] storage.userDataLocation=SD
size=2.4"
shape=rectangle
dpi=167
[lvgl] display.size=2.4"
colorDepth=16 display.shape=rectangle
display.dpi=167
lvgl.colorDepth=16
+12 -15
View File
@@ -1,19 +1,16 @@
[general] general.vendor=CYD
vendor=CYD general.name=2432S024R
name=2432S024R
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32
target=ESP32 hardware.flashSize=4MB
flashSize=4MB hardware.spiRam=false
spiRam=false
[display] storage.userDataLocation=SD
size=2.4"
shape=rectangle
dpi=167
[lvgl] display.size=2.4"
colorDepth=16 display.shape=rectangle
display.dpi=167
lvgl.colorDepth=16
+13 -17
View File
@@ -1,22 +1,18 @@
[general] general.vendor=CYD
vendor=CYD general.name=2432S028R
name=2432S028R
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32
target=ESP32 hardware.flashSize=4MB
flashSize=4MB hardware.spiRam=false
spiRam=false
[display] storage.userDataLocation=SD
size=2.8"
shape=rectangle
dpi=143
[cdn] display.size=2.8"
warningMessage=There are 3 hardware variants of this board. This build works on the original variant only ("v1"). display.shape=rectangle
display.dpi=143
[lvgl] cdn.warningMessage=There are 3 hardware variants of this board. This build works on the original variant only ("v1").
colorDepth=16
lvgl.colorDepth=16
+13 -17
View File
@@ -1,22 +1,18 @@
[general] general.vendor=CYD
vendor=CYD general.name=2432S028R v3
name=2432S028R v3
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32
target=ESP32 hardware.flashSize=4MB
flashSize=4MB hardware.spiRam=false
spiRam=false
[display] storage.userDataLocation=SD
size=2.8"
shape=rectangle
dpi=143
[cdn] display.size=2.8"
warningMessage=There are 3 hardware variants of this board. This build only supports board version 3. display.shape=rectangle
display.dpi=143
[lvgl] cdn.warningMessage=There are 3 hardware variants of this board. This build only supports board version 3.
colorDepth=16
lvgl.colorDepth=16
+12 -15
View File
@@ -1,19 +1,16 @@
[general] general.vendor=CYD
vendor=CYD general.name=2432S032C
name=2432S032C
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32
target=ESP32 hardware.flashSize=4MB
flashSize=4MB hardware.spiRam=false
spiRam=false
[display] storage.userDataLocation=SD
size=3.2"
shape=rectangle
dpi=125
[lvgl] display.size=3.2"
colorDepth=16 display.shape=rectangle
display.dpi=125
lvgl.colorDepth=16
+12 -15
View File
@@ -1,19 +1,16 @@
[general] general.vendor=CYD
vendor=CYD general.name=3248S035C
name=3248S035C
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32
target=ESP32 hardware.flashSize=4MB
flashSize=4MB hardware.spiRam=false
spiRam=false
[display] storage.userDataLocation=SD
size=3.5"
shape=rectangle
dpi=165
[lvgl] display.size=3.5"
colorDepth=16 display.shape=rectangle
display.dpi=165
lvgl.colorDepth=16
@@ -12,9 +12,25 @@
#include <esp_lcd_panel_ops.h> #include <esp_lcd_panel_ops.h>
#include <esp_lcd_panel_io_additions.h> #include <esp_lcd_panel_io_additions.h>
#include <esp_lcd_st7701.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"); 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[] = { static const st7701_lcd_init_cmd_t st7701_lcd_init_cmds[] = {
// {cmd, { data }, data_size, delay_ms} // {cmd, { data }, data_size, delay_ms}
{0xFF, (uint8_t[]) {0x77, 0x01, 0x00, 0x00, 0x10}, 5, 0}, {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; return false;
} }
reclaimSpiPinsForSdCard();
return true; return true;
} }
+1 -1
View File
@@ -12,7 +12,7 @@ static error_t stop() {
return ERROR_NONE; return ERROR_NONE;
} }
struct Module cyd_4848s040c_module = { Module cyd_4848s040c_module = {
.name = "cyd-4848s040c", .name = "cyd-4848s040c",
.start = start, .start = start,
.stop = stop, .stop = stop,
-14
View File
@@ -28,18 +28,4 @@
pin-sda = <&gpio0 19 GPIO_FLAG_NONE>; pin-sda = <&gpio0 19 GPIO_FLAG_NONE>;
pin-scl = <&gpio0 45 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>;
};
};
}; };
+15 -18
View File
@@ -1,22 +1,19 @@
[general] general.vendor=CYD
vendor=CYD general.name=4848S040C
name=4848S040C
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=OCT
spiRamMode=OCT hardware.spiRamSpeed=80M
spiRamSpeed=80M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=4"
shape=rectangle
dpi=170
[lvgl] display.size=4"
colorDepth=16 display.shape=rectangle
display.dpi=170
lvgl.colorDepth=16
+21 -25
View File
@@ -1,30 +1,26 @@
[general] general.vendor=CYD
vendor=CYD general.name=8048S043C
name=8048S043C general.incubating=false
incubating=false
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=OCT
spiRamMode=OCT hardware.spiRamSpeed=80M
spiRamSpeed=80M hardware.esptoolFlashFreq=80M
esptoolFlashFreq=80M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=4.3"
shape=rectangle
dpi=217
[cdn] display.size=4.3"
infoMessage= display.shape=rectangle
warningMessage= display.dpi=217
[lvgl] cdn.infoMessage=
theme=DefaultDark cdn.warningMessage=
colorDepth=16
fontSize=18 lvgl.theme=DefaultDark
lvgl.colorDepth=16
lvgl.fontSize=18
+12 -15
View File
@@ -1,19 +1,16 @@
[general] general.vendor=CYD
vendor=CYD general.name=E32R28T
name=E32R28T
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32
target=ESP32 hardware.flashSize=4MB
flashSize=4MB hardware.spiRam=false
spiRam=false
[display] storage.userDataLocation=SD
size=2.8"
shape=rectangle
dpi=143
[lvgl] display.size=2.8"
colorDepth=16 display.shape=rectangle
display.dpi=143
lvgl.colorDepth=16
+12 -15
View File
@@ -1,19 +1,16 @@
[general] general.vendor=CYD
vendor=CYD general.name=E32R32P
name=E32R32P
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32
target=ESP32 hardware.flashSize=4MB
flashSize=4MB hardware.spiRam=false
spiRam=false
[display] storage.userDataLocation=SD
size=2.8"
shape=rectangle
dpi=125
[lvgl] display.size=2.8"
colorDepth=16 display.shape=rectangle
display.dpi=125
lvgl.colorDepth=16
@@ -1,24 +1,21 @@
[general] general.vendor=Elecrow
vendor=Elecrow general.name=CrowPanel Advance 2.8"
name=CrowPanel Advance 2.8"
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=OCT
spiRamMode=OCT hardware.spiRamSpeed=120M
spiRamSpeed=120M hardware.tinyUsb=true
tinyUsb=true hardware.esptoolFlashFreq=120M
esptoolFlashFreq=120M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=2.8"
shape=rectangle
dpi=143
[lvgl] display.size=2.8"
colorDepth=16 display.shape=rectangle
display.dpi=143
lvgl.colorDepth=16
@@ -1,24 +1,21 @@
[general] general.vendor=Elecrow
vendor=Elecrow general.name=CrowPanel Advance 3.5"
name=CrowPanel Advance 3.5"
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=OCT
spiRamMode=OCT hardware.spiRamSpeed=120M
spiRamSpeed=120M hardware.tinyUsb=true
tinyUsb=true hardware.esptoolFlashFreq=120M
esptoolFlashFreq=120M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=3.5"
shape=rectangle
dpi=165
[lvgl] display.size=3.5"
colorDepth=16 display.shape=rectangle
display.dpi=165
lvgl.colorDepth=16
@@ -1,25 +1,22 @@
[general] general.vendor=Elecrow
vendor=Elecrow general.name=CrowPanel Advance 5.0"
name=CrowPanel Advance 5.0"
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=OCT
spiRamMode=OCT hardware.spiRamSpeed=120M
spiRamSpeed=120M hardware.tinyUsb=true
tinyUsb=true hardware.esptoolFlashFreq=120M
esptoolFlashFreq=120M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=5"
shape=rectangle
dpi=187
[lvgl] display.size=5"
colorDepth=16 display.shape=rectangle
fontSize=18 display.dpi=187
lvgl.colorDepth=16
lvgl.fontSize=18
@@ -1,19 +1,16 @@
[general] general.vendor=Elecrow
vendor=Elecrow general.name=CrowPanel Basic 2.8"
name=CrowPanel Basic 2.8"
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32
target=ESP32 hardware.flashSize=4MB
flashSize=4MB hardware.spiRam=false
spiRam=false
[display] storage.userDataLocation=SD
size=2.8"
shape=rectangle
dpi=143
[lvgl] display.size=2.8"
colorDepth=16 display.shape=rectangle
display.dpi=143
lvgl.colorDepth=16
@@ -1,19 +1,16 @@
[general] general.vendor=Elecrow
vendor=Elecrow general.name=CrowPanel Basic 3.5"
name=CrowPanel Basic 3.5"
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32
target=ESP32 hardware.flashSize=4MB
flashSize=4MB hardware.spiRam=false
spiRam=false
[display] storage.userDataLocation=SD
size=3.5"
shape=rectangle
dpi=165
[lvgl] display.size=3.5"
colorDepth=16 display.shape=rectangle
display.dpi=165
lvgl.colorDepth=16
@@ -1,25 +1,22 @@
[general] general.vendor=Elecrow
vendor=Elecrow general.name=CrowPanel Basic 5.0"
name=CrowPanel Basic 5.0"
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=4MB
flashSize=4MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=OCT
spiRamMode=OCT hardware.spiRamSpeed=120M
spiRamSpeed=120M hardware.tinyUsb=true
tinyUsb=true hardware.esptoolFlashFreq=120M
esptoolFlashFreq=120M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=5.0"
shape=rectangle
dpi=187
[lvgl] display.size=5.0"
colorDepth=16 display.shape=rectangle
fontSize=18 display.dpi=187
lvgl.colorDepth=16
lvgl.fontSize=18
@@ -3,5 +3,5 @@ file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
idf_component_register( idf_component_register(
SRCS ${SOURCE_FILES} SRCS ${SOURCE_FILES}
INCLUDE_DIRS "Source" INCLUDE_DIRS "Source"
REQUIRES Tactility esp_lvgl_port esp_lcd AXP192 ST7789 ButtonControl REQUIRES Tactility esp_lvgl_port ILI934x FT6x36 PwmBacklight driver vfs fatfs
) )
+92
View File
@@ -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
};
@@ -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);
}
@@ -1,18 +1,20 @@
#pragma once #pragma once
#include <Tactility/hal/display/DisplayDevice.h> #include <Tactility/hal/display/DisplayDevice.h>
#include <memory>
#include <driver/gpio.h> #include <driver/gpio.h>
#include <driver/spi_common.h> #include <driver/spi_common.h>
#include <memory>
// Display
constexpr auto LCD_SPI_HOST = SPI2_HOST; constexpr auto LCD_SPI_HOST = SPI2_HOST;
constexpr auto LCD_PIN_CS = GPIO_NUM_5; constexpr auto LCD_PIN_CS = GPIO_NUM_10;
constexpr auto LCD_PIN_DC = GPIO_NUM_23; constexpr auto LCD_PIN_DC = GPIO_NUM_46;
constexpr auto LCD_PIN_RESET = GPIO_NUM_18; constexpr auto LCD_HORIZONTAL_RESOLUTION = 320;
constexpr auto LCD_HORIZONTAL_RESOLUTION = 135;
constexpr auto LCD_VERTICAL_RESOLUTION = 240; 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_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(); std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();
@@ -12,8 +12,8 @@ static error_t stop() {
return ERROR_NONE; return ERROR_NONE;
} }
struct Module m5stack_stickc_plus_module = { struct Module es3c28p_module = {
.name = "m5stack-stickc-plus", .name = "es3c28p",
.start = start, .start = start,
.stop = stop, .stop = stop,
.symbols = nullptr, .symbols = nullptr,
+22
View File
@@ -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
+3
View File
@@ -0,0 +1,3 @@
dependencies:
- Platforms/platform-esp32
dts: es3c28p.dts
+81
View File
@@ -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";
};
};
};
+7 -9
View File
@@ -1,12 +1,10 @@
[general] general.vendor=Generic
vendor=Generic general.name=ESP32
name=ESP32
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32
target=ESP32 hardware.flashSize=8MB
flashSize=4MB hardware.spiRam=false
spiRam=false
storage.userDataLocation=Internal
+7 -9
View File
@@ -1,12 +1,10 @@
[general] general.vendor=Generic
vendor=Generic general.name=ESP32-C6
name=ESP32-C6
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32C6
target=ESP32C6 hardware.flashSize=8MB
flashSize=4MB hardware.spiRam=false
spiRam=false
storage.userDataLocation=Internal
+7 -9
View File
@@ -1,12 +1,10 @@
[general] general.vendor=Generic
vendor=Generic general.name=ESP32-P4
name=ESP32-P4
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32P4
target=ESP32P4 hardware.flashSize=8MB
flashSize=4MB hardware.spiRam=false
spiRam=false
storage.userDataLocation=Internal
+7 -9
View File
@@ -1,12 +1,10 @@
[general] general.vendor=Generic
vendor=Generic general.name=ESP32-S3
name=ESP32-S3
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=8MB
flashSize=4MB hardware.spiRam=false
spiRam=false
storage.userDataLocation=Internal
@@ -1,33 +1,29 @@
[general] general.vendor=Guition
vendor=Guition general.name=JC1060P470C-I-W-Y
name=JC1060P470C-I-W-Y
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32P4
target=ESP32P4 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=OCT
spiRamMode=OCT hardware.spiRamSpeed=200M
spiRamSpeed=200M hardware.esptoolFlashFreq=80M
esptoolFlashFreq=80M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=7"
shape=rectangle
dpi=187
[lvgl] display.size=7"
colorDepth=16 display.shape=rectangle
display.dpi=187
[sdkconfig] lvgl.colorDepth=16
CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30 sdkconfig.CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y sdkconfig.CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
CONFIG_ESP_HOSTED_ENABLED=y sdkconfig.CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
CONFIG_ESP_HOSTED_P4_DEV_BOARD_FUNC_BOARD=y sdkconfig.CONFIG_ESP_HOSTED_ENABLED=y
CONFIG_ESP_HOSTED_SDIO_HOST_INTERFACE=y sdkconfig.CONFIG_ESP_HOSTED_P4_DEV_BOARD_FUNC_BOARD=y
CONFIG_SLAVE_IDF_TARGET_ESP32C6=y sdkconfig.CONFIG_ESP_HOSTED_SDIO_HOST_INTERFACE=y
CONFIG_ESP_HOSTED_USE_MEMPOOL=n sdkconfig.CONFIG_SLAVE_IDF_TARGET_ESP32C6=y
sdkconfig.CONFIG_ESP_HOSTED_USE_MEMPOOL=n
+12 -15
View File
@@ -1,19 +1,16 @@
[general] general.vendor=Guition
vendor=Guition general.name=JC2432W328C
name=JC2432W328C
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32
target=ESP32 hardware.flashSize=4MB
flashSize=4MB hardware.spiRam=false
spiRam=false
[display] storage.userDataLocation=SD
size=2.8"
shape=rectangle
dpi=143
[lvgl] display.size=2.8"
colorDepth=16 display.shape=rectangle
display.dpi=143
lvgl.colorDepth=16
+17 -20
View File
@@ -1,24 +1,21 @@
[general] general.vendor=Guition
vendor=Guition general.name=JC3248W535C
name=JC3248W535C
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=OCT
spiRamMode=OCT hardware.spiRamSpeed=120M
spiRamSpeed=120M hardware.tinyUsb=true
tinyUsb=true hardware.esptoolFlashFreq=120M
esptoolFlashFreq=120M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=3.5"
shape=rectangle
dpi=165
[lvgl] display.size=3.5"
colorDepth=16 display.shape=rectangle
display.dpi=165
lvgl.colorDepth=16
+17 -20
View File
@@ -1,24 +1,21 @@
[general] general.vendor=Guition
vendor=Guition general.name=JC8048W550C
name=JC8048W550C
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=OCT
spiRamMode=OCT hardware.spiRamSpeed=80M
spiRamSpeed=80M hardware.esptoolFlashFreq=80M
esptoolFlashFreq=80M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=5"
shape=rectangle
dpi=187
[lvgl] display.size=5"
colorDepth=16 display.shape=rectangle
fontSize=18 display.dpi=187
lvgl.colorDepth=16
lvgl.fontSize=18
@@ -1,30 +1,26 @@
[general] general.vendor=Heltec
vendor=Heltec general.name=WiFi LoRa 32 v3
name=WiFi LoRa 32 v3 general.incubating=true
incubating=true
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher apps.autoStartAppId=ApWebServer
autoStartAppId=ApWebServer
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=8MB
flashSize=8MB hardware.spiRam=false
spiRam=false hardware.tinyUsb=true
tinyUsb=true hardware.esptoolFlashFreq=120M
esptoolFlashFreq=120M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=Internal
size=0.96"
shape=rectangle
dpi=149
[cdn] display.size=0.96"
infoMessage=Due to the small size of the screen, the icons don't render properly. display.shape=rectangle
display.dpi=149
[lvgl] cdn.infoMessage=Due to the small size of the screen, the icons don't render properly.
theme=Mono
colorDepth=16 lvgl.theme=Mono
uiScale=70 lvgl.colorDepth=16
uiDensity=compact lvgl.uiScale=70
lvgl.uiDensity=compact
+18 -22
View File
@@ -1,27 +1,23 @@
[general] general.vendor=LilyGO
vendor=LilyGO general.name=T-Deck,T-Deck Plus
name=T-Deck,T-Deck Plus
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=OCT
spiRamMode=OCT hardware.spiRamSpeed=120M
spiRamSpeed=120M hardware.tinyUsb=true
tinyUsb=true hardware.esptoolFlashFreq=120M
esptoolFlashFreq=120M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=2.8"
shape=rectangle
dpi=143
[cdn] display.size=2.8"
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.shape=rectangle
display.dpi=143
[lvgl] 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.
colorDepth=16
lvgl.colorDepth=16
+18 -21
View File
@@ -1,25 +1,22 @@
[general] general.vendor=LilyGO
vendor=LilyGO general.name=T-Display S3
name=T-Display S3
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher apps.autoStartAppId=ApWebServer
autoStartAppId=ApWebServer
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=OCT
spiRamMode=OCT hardware.spiRamSpeed=120M
spiRamSpeed=120M hardware.tinyUsb=true
tinyUsb=true hardware.esptoolFlashFreq=120M
esptoolFlashFreq=120M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=Internal
size=1.9"
shape=rectangle
dpi=191
[lvgl] display.size=1.9"
colorDepth=16 display.shape=rectangle
display.dpi=191
lvgl.colorDepth=16
+16 -19
View File
@@ -1,23 +1,20 @@
[general] general.vendor=LilyGO
vendor=LilyGO general.name=T-Display
name=T-Display general.incubating=true
incubating=true
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher apps.autoStartAppId=ApWebServer
autoStartAppId=ApWebServer
[hardware] hardware.target=ESP32
target=ESP32 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=false
spiRam=false hardware.esptoolFlashFreq=80M
esptoolFlashFreq=80M
[display] storage.userDataLocation=Internal
size=1.14"
shape=rectangle
dpi=242
[lvgl] display.size=1.14"
colorDepth=16 display.shape=rectangle
uiDensity=compact display.dpi=242
lvgl.colorDepth=16
lvgl.uiDensity=compact
+19 -22
View File
@@ -1,26 +1,23 @@
[general] general.vendor=LilyGO
vendor=LilyGO general.name=T-Dongle S3
name=T-Dongle S3 general.incubating=true
incubating=true
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher apps.autoStartAppId=ApWebServer
autoStartAppId=ApWebServer
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=false
spiRam=false hardware.tinyUsb=true
tinyUsb=true hardware.esptoolFlashFreq=120M
esptoolFlashFreq=120M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=0.96"
shape=rectangle
dpi=186
[lvgl] display.size=0.96"
colorDepth=16 display.shape=rectangle
uiDensity=compact display.dpi=186
fontSize=10
lvgl.colorDepth=16
lvgl.uiDensity=compact
lvgl.fontSize=10
+17 -20
View File
@@ -1,24 +1,21 @@
[general] general.vendor=LilyGO
vendor=LilyGO general.name=T-HMI
name=T-HMI
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=OCT
spiRamMode=OCT hardware.spiRamSpeed=120M
spiRamSpeed=120M hardware.tinyUsb=true
tinyUsb=true hardware.esptoolFlashFreq=120M
esptoolFlashFreq=120M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=2.8"
shape=rectangle
dpi=125
[lvgl] display.size=2.8"
colorDepth=16 display.shape=rectangle
display.dpi=125
lvgl.colorDepth=16
+19 -22
View File
@@ -1,26 +1,23 @@
[general] general.vendor=LilyGO
vendor=LilyGO general.name=T-Lora Pager
name=T-Lora Pager
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=16MB
flashSize=16MB hardware.flashMode=DIO
flashMode=DIO hardware.spiRam=true
spiRam=true hardware.spiRamMode=AUTO
spiRamMode=AUTO hardware.spiRamSpeed=120M
spiRamSpeed=120M hardware.tinyUsb=true
tinyUsb=true hardware.esptoolFlashFreq=40M
esptoolFlashFreq=40M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=2.33"
shape=rectangle
dpi=227
[lvgl] display.size=2.33"
colorDepth=16 display.shape=rectangle
dpi=150 display.dpi=227
lvgl.colorDepth=16
lvgl.dpi=150
+16 -19
View File
@@ -1,24 +1,21 @@
[general] general.vendor=M5Stack
vendor=M5Stack general.name=Cardputer Adv
name=Cardputer Adv
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=8MB
flashSize=8MB hardware.spiRam=false
spiRam=false hardware.tinyUsb=true
tinyUsb=true hardware.esptoolFlashFreq=120M
esptoolFlashFreq=120M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=1.14"
shape=rectangle 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) # TODO: dps is actually 242, but this breaks UI (button selection becomes invisible and switch visibility is reduced)
dpi=139 display.dpi=139
[lvgl] lvgl.colorDepth=16
colorDepth=16 lvgl.uiDensity=compact
uiDensity=compact
+16 -19
View File
@@ -1,24 +1,21 @@
[general] general.vendor=M5Stack
vendor=M5Stack general.name=Cardputer,Cardputer v1.1
name=Cardputer,Cardputer v1.1
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=8MB
flashSize=8MB hardware.spiRam=false
spiRam=false hardware.tinyUsb=true
tinyUsb=true hardware.esptoolFlashFreq=120M
esptoolFlashFreq=120M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=1.14"
shape=rectangle 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) # TODO: dps is actually 242, but this breaks UI (button selection becomes invisible and switch visibility is reduced)
dpi=139 display.dpi=139
[lvgl] lvgl.colorDepth=16
colorDepth=16 lvgl.uiDensity=compact
uiDensity=compact
+16 -20
View File
@@ -1,25 +1,21 @@
[general] general.vendor=M5Stack
vendor=M5Stack general.name=Core2
name=Core2
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32
target=ESP32 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=QUAD
spiRamMode=QUAD hardware.spiRamSpeed=80M
spiRamSpeed=80M hardware.esptoolFlashFreq=80M
esptoolFlashFreq=80M
[display] storage.userDataLocation=SD
size=2"
shape=rectangle
dpi=200
[cdn] display.size=2"
warningMessage=This board implementation concerns the original Core2 hardware and **not** the v1.1 variant display.shape=rectangle
display.dpi=200
[lvgl] cdn.warningMessage=This board implementation concerns the original Core2 hardware and **not** the v1.1 variant
colorDepth=16
lvgl.colorDepth=16
+17 -20
View File
@@ -1,24 +1,21 @@
[general] general.vendor=M5Stack
vendor=M5Stack general.name=CoreS3
name=CoreS3
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=QUAD
spiRamMode=QUAD hardware.spiRamSpeed=120M
spiRamSpeed=120M hardware.tinyUsb=true
tinyUsb=true hardware.esptoolFlashFreq=120M
esptoolFlashFreq=120M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=2"
shape=rectangle
dpi=200
[lvgl] display.size=2"
colorDepth=16 display.shape=rectangle
display.dpi=200
lvgl.colorDepth=16
+20 -26
View File
@@ -1,32 +1,26 @@
[general] general.vendor=M5Stack
vendor=M5Stack general.name=PaperS3
name=PaperS3 general.incubating=true
incubating=true
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=esp32s3
target=esp32s3 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=OPI
spiRamMode=OPI hardware.spiRamSpeed=80M
spiRamSpeed=80M hardware.esptoolFlashFreq=80M
esptoolFlashFreq=80M hardware.tinyUsb=true
tinyUsb=true hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=4.7"
shape=rectangle
dpi=235
[lvgl] display.size=4.7"
colorDepth=8 display.shape=rectangle
fontSize=24 display.dpi=235
theme=Mono
[sdkconfig]
CONFIG_EPD_DISPLAY_TYPE_ED047TC2=y
lvgl.colorDepth=8
lvgl.fontSize=24
lvgl.theme=Mono
sdkconfig.CONFIG_EPD_DISPLAY_TYPE_ED047TC2=y
+17 -20
View File
@@ -1,24 +1,21 @@
[general] general.vendor=M5Stack
vendor=M5Stack general.name=StackChan
name=StackChan
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=QUAD
spiRamMode=QUAD hardware.spiRamSpeed=120M
spiRamSpeed=120M hardware.tinyUsb=true
tinyUsb=true hardware.esptoolFlashFreq=120M
esptoolFlashFreq=120M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=2"
shape=rectangle
dpi=200
[lvgl] display.size=2"
colorDepth=16 display.shape=rectangle
display.dpi=200
lvgl.colorDepth=16
@@ -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
};
@@ -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);
}
@@ -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;
});
}
@@ -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();
@@ -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
@@ -1,5 +0,0 @@
dependencies:
- Platforms/platform-esp32
- Drivers/mpu6886-module
- Drivers/bm8563-module
dts: 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>;
};
};
+18 -21
View File
@@ -1,25 +1,22 @@
[general] general.vendor=M5Stack
vendor=M5Stack general.name=StickC Plus2
name=StickC Plus2 general.incubating=true
incubating=true
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher apps.autoStartAppId=ApWebServer
autoStartAppId=ApWebServer
[hardware] hardware.target=ESP32
target=ESP32 hardware.flashSize=8MB
flashSize=8MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=QUAD
spiRamMode=QUAD hardware.spiRamSpeed=80M
spiRamSpeed=80M hardware.esptoolFlashFreq=80M
esptoolFlashFreq=80M
[display] storage.userDataLocation=Internal
size=1.14"
shape=rectangle
dpi=242
[lvgl] display.size=1.14"
colorDepth=16 display.shape=rectangle
uiDensity=compact display.dpi=242
lvgl.colorDepth=16
lvgl.uiDensity=compact
+18 -21
View File
@@ -1,25 +1,22 @@
[general] general.vendor=M5Stack
vendor=M5Stack general.name=StickS3
name=StickS3
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=8MB
flashSize=8MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=OCT
spiRamMode=OCT hardware.spiRamSpeed=80M
spiRamSpeed=80M hardware.esptoolFlashFreq=80M
esptoolFlashFreq=80M hardware.tinyUsb=true
tinyUsb=true hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=1.14"
shape=rectangle
dpi=242
[lvgl] display.size=1.14"
colorDepth=16 display.shape=rectangle
uiDensity=compact display.dpi=242
lvgl.colorDepth=16
lvgl.uiDensity=compact
+1 -1
View File
@@ -3,5 +3,5 @@ file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
idf_component_register( idf_component_register(
SRCS ${SOURCE_FILES} SRCS ${SOURCE_FILES}
INCLUDE_DIRS "Source" 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
) )
+39 -43
View File
@@ -1,51 +1,47 @@
[general] general.vendor=M5Stack
vendor=M5Stack general.name=Tab5
name=Tab5
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32P4
target=ESP32P4 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=HEX
spiRamMode=HEX hardware.spiRamSpeed=200M
spiRamSpeed=200M hardware.esptoolFlashFreq=80M
esptoolFlashFreq=80M hardware.bluetooth=true
bluetooth=true hardware.usbHostEnabled=true
usbHostEnabled=true hardware.tinyUsb=true
tinyUsb=true
[display] storage.userDataLocation=SD
size=5"
shape=rectangle
dpi=294
[lvgl] display.size=5"
colorDepth=16 display.shape=rectangle
fontSize=28 display.dpi=294
dpi=250
[sdkconfig] lvgl.colorDepth=16
CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16 lvgl.fontSize=28
CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30 lvgl.dpi=250
CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
CONFIG_SLAVE_IDF_TARGET_ESP32C6=y sdkconfig.CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
CONFIG_ESP_HOSTED_ENABLED=y sdkconfig.CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
CONFIG_ESP_HOSTED_SDIO_HOST_INTERFACE=y sdkconfig.CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
CONFIG_ESP_HOSTED_SDIO_SLOT_1=y sdkconfig.CONFIG_SLAVE_IDF_TARGET_ESP32C6=y
CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_CMD_SLOT_1=13 sdkconfig.CONFIG_ESP_HOSTED_ENABLED=y
CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_CLK_SLOT_1=12 sdkconfig.CONFIG_ESP_HOSTED_SDIO_HOST_INTERFACE=y
CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D0_SLOT_1=11 sdkconfig.CONFIG_ESP_HOSTED_SDIO_SLOT_1=y
CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D1_4BIT_BUS_SLOT_1=10 sdkconfig.CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_CMD_SLOT_1=13
CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D2_4BIT_BUS_SLOT_1=9 sdkconfig.CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_CLK_SLOT_1=12
CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D3_4BIT_BUS_SLOT_1=8 sdkconfig.CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D0_SLOT_1=11
CONFIG_ESP_HOSTED_SDIO_GPIO_RESET_SLAVE=15 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 # 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 # 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) # Performance: use P4's PPA (pixel processing accelerator for rotation)
CONFIG_LVGL_PORT_ENABLE_PPA=y sdkconfig.CONFIG_LVGL_PORT_ENABLE_PPA=y
CONFIG_LV_DRAW_BUF_ALIGN=64 sdkconfig.CONFIG_LV_DRAW_BUF_ALIGN=64
CONFIG_LV_DEF_REFR_PERIOD=15 sdkconfig.CONFIG_LV_DEF_REFR_PERIOD=15
+8 -10
View File
@@ -1,13 +1,11 @@
[general] general.vendor=Simulator
vendor=Simulator general.name=Tab5Simulator
name=Tab5Simulator
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=POSIX
target=POSIX
[lvgl] storage.userDataLocation=Internal
colorDepth=16
fontSize=14 lvgl.colorDepth=16
lvgl.fontSize=14
+16 -20
View File
@@ -1,25 +1,21 @@
[general] general.vendor=unPhone
vendor=unPhone general.name=unPhone
name=unPhone
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=8MB
flashSize=8MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=OCT
spiRamMode=OCT hardware.spiRamSpeed=80M
spiRamSpeed=80M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=3.5"
shape=rectangle
dpi=165
[cdn] display.size=3.5"
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.shape=rectangle
display.dpi=165
[lvgl] 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.
colorDepth=24
lvgl.colorDepth=24
@@ -1,33 +1,29 @@
[general] general.vendor=Waveshare
vendor=Waveshare general.name=ESP32 S3 GEEK
name=ESP32 S3 GEEK general.incubating=true
incubating=true
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher apps.autoStartAppId=ApWebServer
autoStartAppId=ApWebServer
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=QUAD
spiRamMode=QUAD hardware.spiRamSpeed=120M
spiRamSpeed=120M hardware.tinyUsb=true
tinyUsb=true hardware.esptoolFlashFreq=120M
esptoolFlashFreq=120M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=1.14"
shape=rectangle
dpi=143
[lvgl] display.size=1.14"
colorDepth=16 display.shape=rectangle
uiDensity=compact display.dpi=143
lvgl.colorDepth=16
lvgl.uiDensity=compact
[sdkconfig]
# Fix error "PSRAM space not enough for the Flash instructions" on boot: # Fix error "PSRAM space not enough for the Flash instructions" on boot:
CONFIG_SPIRAM_FETCH_INSTRUCTIONS=n sdkconfig.CONFIG_SPIRAM_FETCH_INSTRUCTIONS=n
CONFIG_SPIRAM_RODATA=n sdkconfig.CONFIG_SPIRAM_RODATA=n
CONFIG_SPIRAM_XIP_FROM_PSRAM=n sdkconfig.CONFIG_SPIRAM_XIP_FROM_PSRAM=n
+20 -23
View File
@@ -1,27 +1,24 @@
[general] general.vendor=WaveShare
vendor=WaveShare general.name=S3 LCD 1.3"
name=S3 LCD 1.3" general.incubating=true
incubating=true
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher apps.autoStartAppId=ApWebServer
autoStartAppId=ApWebServer
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=OCT
spiRamMode=OCT hardware.spiRamSpeed=120M
spiRamSpeed=120M hardware.tinyUsb=true
tinyUsb=true hardware.esptoolFlashFreq=120M
esptoolFlashFreq=120M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=1.3"
shape=rectangle
dpi=261
[lvgl] display.size=1.3"
colorDepth=16 display.shape=rectangle
uiDensity=compact display.dpi=261
lvgl.colorDepth=16
lvgl.uiDensity=compact
@@ -1,33 +1,29 @@
[general] general.vendor=WaveShare
vendor=WaveShare general.name=S3 Touch LCD 1.28"
name=S3 Touch LCD 1.28" general.incubating=true
incubating=true
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher apps.autoStartAppId=ApWebServer
autoStartAppId=ApWebServer
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=QUAD
spiRamMode=QUAD hardware.spiRamSpeed=120M
spiRamSpeed=120M hardware.tinyUsb=true
tinyUsb=true hardware.esptoolFlashFreq=120M
esptoolFlashFreq=120M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=1.28"
shape=circle
dpi=265
[lvgl] display.size=1.28"
colorDepth=16 display.shape=circle
uiDensity=compact display.dpi=265
lvgl.colorDepth=16
lvgl.uiDensity=compact
[sdkconfig]
# Fix error "PSRAM space not enough for the Flash instructions" on boot: # Fix error "PSRAM space not enough for the Flash instructions" on boot:
CONFIG_SPIRAM_FETCH_INSTRUCTIONS=n sdkconfig.CONFIG_SPIRAM_FETCH_INSTRUCTIONS=n
CONFIG_SPIRAM_RODATA=n sdkconfig.CONFIG_SPIRAM_RODATA=n
CONFIG_SPIRAM_XIP_FROM_PSRAM=n sdkconfig.CONFIG_SPIRAM_XIP_FROM_PSRAM=n
@@ -1,30 +1,26 @@
[general] general.vendor=WaveShare
vendor=WaveShare general.name=S3 Touch LCD 1.47"
name=S3 Touch LCD 1.47" general.incubating=true
incubating=true
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher apps.autoStartAppId=ApWebServer
autoStartAppId=ApWebServer
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=OCT
spiRamMode=OCT hardware.spiRamSpeed=120M
spiRamSpeed=120M hardware.tinyUsb=true
tinyUsb=true hardware.esptoolFlashFreq=120M
esptoolFlashFreq=120M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=1.47"
shape=rectangle
dpi=247
[cdn] display.size=1.47"
warningMessage=Touch doesn't work yet display.shape=rectangle
display.dpi=247
[lvgl] cdn.warningMessage=Touch doesn't work yet
colorDepth=16
uiDensity=compact lvgl.colorDepth=16
lvgl.uiDensity=compact
@@ -2,8 +2,22 @@
#include <Tactility/hal/Configuration.h> #include <Tactility/hal/Configuration.h>
#include <tactility/drivers/i2c_controller.h>
using namespace tt::hal; 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() { static DeviceVector createDevices() {
return { return {
createDisplay(), createDisplay(),
@@ -11,5 +25,6 @@ static DeviceVector createDevices() {
} }
extern const Configuration hardwareConfiguration = { extern const Configuration hardwareConfiguration = {
.initBoot = init,
.createDevices = createDevices .createDevices = createDevices
}; };
@@ -12,7 +12,7 @@ static error_t stop() {
return ERROR_NONE; return ERROR_NONE;
} }
struct Module waveshare_s3_touch_lcd_43_module = { Module waveshare_s3_touch_lcd_43_module = {
.name = "waveshare-s3-touch-lcd-43", .name = "waveshare-s3-touch-lcd-43",
.start = start, .start = start,
.stop = stop, .stop = stop,
@@ -1,25 +1,23 @@
[general] general.vendor=WaveShare
vendor=WaveShare general.name=S3 Touch LCD 4.3"
name=S3 Touch LCD 4.3"
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32S3
target=ESP32S3 # Some models have 16MB flash, but some have 8MB. We only support the latter to avoid making more builds.
flashSize=4MB hardware.flashSize=8MB
spiRam=true hardware.spiRam=true
spiRamMode=OCT hardware.spiRamMode=OCT
spiRamSpeed=120M hardware.spiRamSpeed=120M
tinyUsb=true hardware.tinyUsb=true
esptoolFlashFreq=120M hardware.esptoolFlashFreq=120M
bluetooth=true hardware.bluetooth=true
[display] storage.userDataLocation=SD
size=4.3"
shape=rectangle
dpi=217
[lvgl] display.size=4.3"
colorDepth=16 display.shape=rectangle
fontSize=18 display.dpi=217
lvgl.colorDepth=16
lvgl.fontSize=18
@@ -26,8 +26,8 @@
compatible = "espressif,esp32-i2c"; compatible = "espressif,esp32-i2c";
port = <I2C_NUM_0>; port = <I2C_NUM_0>;
clock-frequency = <400000>; clock-frequency = <400000>;
pin-sda = <&gpio0 8 GPIO_FLAG_NONE>; pin-sda = <&gpio0 8 GPIO_FLAG_PULL_UP>;
pin-scl = <&gpio0 9 GPIO_FLAG_NONE>; pin-scl = <&gpio0 9 GPIO_FLAG_PULL_UP>;
}; };
spi0 { spi0 {
@@ -1,24 +1,21 @@
[general] general.vendor=Wireless Tag
vendor=Wireless Tag general.name=WT32 SC01 Plus
name=WT32 SC01 Plus
[apps] apps.launcherAppId=Launcher
launcherAppId=Launcher
[hardware] hardware.target=ESP32S3
target=ESP32S3 hardware.flashSize=16MB
flashSize=16MB hardware.spiRam=true
spiRam=true hardware.spiRamMode=QUAD
spiRamMode=QUAD hardware.spiRamSpeed=80M
spiRamSpeed=80M hardware.tinyUsb=true
tinyUsb=true hardware.esptoolFlashFreq=80M
esptoolFlashFreq=80M hardware.bluetooth=true
bluetooth=true
[display] storage.userDataLocation=SD
size=3.5"
shape=rectangle
dpi=165
[lvgl] display.size=3.5"
colorDepth=16 display.shape=rectangle
display.dpi=165
lvgl.colorDepth=16
+1 -12
View File
@@ -12,8 +12,6 @@
## Higher Priority ## 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 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: - 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: 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_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_before_stop: e.g. to stop using a device that was started before
- on_after_stop: ? - on_after_stop: ?
- DTS: support for #defines
- DTS: support for aliases
- SPI kernel driver - SPI kernel driver
- Kernel concepts for ELF loading (generic approach for GUI apps, console apps, libraries). - 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 - Fix glitches when installing app via App Hub with 4.3" Waveshare
- TCA9534 keyboards should use interrupts - 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) - 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. - 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 - 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. 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 intent can have an action (e.g. view), a URL and an optional bundle.
The manifest can provide the intent handler 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 direct installation of an `.app` file with `tactility.py install helloworld.app <ip>`
- Support `tactility.py target <ip>` to remember the device IP address. - Support `tactility.py target <ip>` to remember the device IP address.
- minitar/untarFile(): "entry->metadata.path" can escape its confined path (e.g. "../something") - 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 ## Medium Priority
@@ -91,7 +80,7 @@
- Audio player app - Audio player app
- Audio recording app - Audio recording app
- OTA updates - 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 - 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. - 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. - Wrapper for lvgl slider widget that shows "+" and "-" buttons, and also the value in a label.
+13 -15
View File
@@ -4,24 +4,22 @@
2. Set the new version in the Tactility repository: 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 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. 2. Merge the branch and wait for a build.
3. Upload the new Tactility SDK to the CDN 3. Push a tag e.g. `v1.2.3` - the `v` prefix is crucial for the pipelines.
1. Upload it to the [CDN](https://dash.cloudflare.com) 4. Wait for the SDK and firmwares to be published on the CDN.
2. Update `sdk.json` from [TactilityTool](https://github.com/TactilityProject/TactilityTool) and upload it to [CDN](https://dash.cloudflare.com) 5. Test the firmwares on all devices with the web installer
4. Update the [TactilityApps](https://github.com/TactilityProject/TactilityApps) with the new SDK and also release these to the CDN: 6. Run `Buildscripts/gh-download-artifacts.py [actionId] --token [token]` and let it run in the background.
1. Download the `cdn-files.zip` from the pipelines Get a token from [here](https://github.com/settings/personal-access-tokens)
2. Upload them to the CDN at `apps/x.y.z/` 7. Update the [TactilityApps](https://github.com/TactilityProject/TactilityApps) with the new SDK version and bump the app versions.
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 8. After merging the apps, manually upload to CDN, then test them.
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.
9. Make a new version of the docs available at [TactilityDocs](https://github.com/TactilityProject/TactilityDocs) 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) 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. 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 ### Post-release
@@ -6,6 +6,7 @@
#include <esp_lcd_types.h> #include <esp_lcd_types.h>
#include <esp_lvgl_port_disp.h> #include <esp_lvgl_port_disp.h>
#include <hal/gpio_types.h>
constexpr auto DEFAULT_BUFFER_SIZE = 0; constexpr auto DEFAULT_BUFFER_SIZE = 0;
@@ -18,8 +18,6 @@ bool EspLcdSpiDisplay::createIoHandle(esp_lcd_panel_io_handle_t& outHandle) {
.user_ctx = nullptr, .user_ctx = nullptr,
.lcd_cmd_bits = 8, .lcd_cmd_bits = 8,
.lcd_param_bits = 8, .lcd_param_bits = 8,
.cs_ena_pretrans = 0,
.cs_ena_posttrans = 0,
.flags = { .flags = {
.dc_high_on_cmd = 0, .dc_high_on_cmd = 0,
.dc_low_on_data = 0, .dc_low_on_data = 0,
@@ -48,6 +48,11 @@ bool EspLcdTouch::startLvgl(lv_disp_t* display) {
return false; return false;
} }
if (touchHandle == nullptr) {
LOGGER.error("Cannot start LVGL touch: touchHandle is null");
return false;
}
if (touchDriver != nullptr && touchDriver.use_count() > 1) { if (touchDriver != nullptr && touchDriver.use_count() > 1) {
LOGGER.warn("TouchDriver is still in use."); LOGGER.warn("TouchDriver is still in use.");
} }
@@ -39,7 +39,6 @@ bool init(gpio_num_t pin, uint32_t frequencyHz, ledc_timer_t timer, ledc_channel
.timer_sel = backlightTimer, .timer_sel = backlightTimer,
.duty = 0, .duty = 0,
.hpoint = 0, .hpoint = 0,
.sleep_mode = LEDC_SLEEP_MODE_NO_ALIVE_NO_PD,
.flags = { .flags = {
.output_invert = 0 .output_invert = 0
} }
+7 -4
View File
@@ -18,11 +18,13 @@ endif ()
set(DEVICETREE_LOCATION "${PROJECT_ROOT}/Devices/${TACTILITY_DEVICE_ID}") set(DEVICETREE_LOCATION "${PROJECT_ROOT}/Devices/${TACTILITY_DEVICE_ID}")
find_package(Python3 COMPONENTS Interpreter REQUIRED)
# Check if device has Bluetooth enabled # Check if device has Bluetooth enabled
# Fixes the sdkconfig bluetooth enable options from getting nuked on non-P4+C6 builds when idf build runs # Fixes the sdkconfig bluetooth enable options from getting nuked on non-P4+C6 builds when idf build runs
if (DEFINED ENV{ESP_IDF_VERSION}) if (DEFINED ENV{ESP_IDF_VERSION})
file(READ "${DEVICETREE_LOCATION}/device.properties" device_properties_content) 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) list(APPEND REQUIRES_LIST bt)
endif() endif()
endif() endif()
@@ -32,7 +34,7 @@ endif()
# #
execute_process( 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}" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
) )
@@ -41,7 +43,7 @@ execute_process(
# #
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}" WORKING_DIRECTORY "${PROJECT_ROOT}"
OUTPUT_VARIABLE DEVICE_DEPENDENCIES OUTPUT_VARIABLE DEVICE_DEPENDENCIES
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -107,7 +109,7 @@ add_custom_target(AlwaysRun
add_custom_command( add_custom_command(
OUTPUT "${GENERATED_DIR}/devicetree.c" OUTPUT "${GENERATED_DIR}/devicetree.c"
"${GENERATED_DIR}/devicetree.h" "${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}" "${DEVICETREE_LOCATION}" "${GENERATED_DIR}"
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
DEPENDS AlwaysRun "${DEVICETREE_LOCATION}/devicetree.yaml" # AlwaysRun ensures it always gets built 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 # Update target for generated code
target_sources(${COMPONENT_LIB} PRIVATE "${GENERATED_DIR}/devicetree.c") target_sources(${COMPONENT_LIB} PRIVATE "${GENERATED_DIR}/devicetree.c")
target_include_directories(${COMPONENT_LIB} PRIVATE "${GENERATED_DIR}") target_include_directories(${COMPONENT_LIB} PRIVATE "${GENERATED_DIR}")
add_dependencies(${COMPONENT_LIB} Generated)
+12
View File
@@ -77,6 +77,18 @@ menu "Tactility App"
config TT_TDECK_WORKAROUND config TT_TDECK_WORKAROUND
bool "Temporary work-around until we fix the T-Deck keyboard and trackball settings" bool "Temporary work-around until we fix the T-Deck keyboard and trackball settings"
default n 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 config TT_SPLASH_DURATION
int "Splash Duration (ms)" int "Splash Duration (ms)"
default 1000 default 1000
+2 -2
View File
@@ -29,7 +29,6 @@ dependencies:
espressif/esp_lcd_touch_ft5x06: "1.0.6~1" espressif/esp_lcd_touch_ft5x06: "1.0.6~1"
espressif/esp_io_expander: "1.0.1" espressif/esp_io_expander: "1.0.1"
espressif/esp_io_expander_tca95xx_16bit: "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" lambage/esp_lcd_touch_ft6336u: "1.0.8"
espressif/esp_lcd_st7701: espressif/esp_lcd_st7701:
version: "1.1.3" version: "1.1.3"
@@ -81,5 +80,6 @@ dependencies:
version: "1.1.4" version: "1.1.4"
rules: rules:
- if: "target in [esp32s3, esp32p4]" - if: "target in [esp32s3, esp32p4]"
idf: '5.5.2' espressif/mdns: "*"
idf: '>=5.2.0'
+5 -3
View File
@@ -38,9 +38,11 @@
#define __QRCODE_H_ #define __QRCODE_H_
#ifndef __cplusplus #ifndef __cplusplus
typedef unsigned char bool; #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L)
static const bool false = 0; // C23 has bool, true, false as standard keywords
static const bool true = 1; #else
#include <stdbool.h>
#endif
#endif #endif
#include <stdint.h> #include <stdint.h>
+2 -2
View File
@@ -44,7 +44,7 @@ READ_PROPERTIES_TO_MAP(
device_properties device_properties
) )
# Read UI density # 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 # Define UiDensity enum value
if (ui_density) if (ui_density)
if (ui_density STREQUAL "default") if (ui_density STREQUAL "default")
@@ -52,7 +52,7 @@ if (ui_density)
elseif (ui_density STREQUAL "compact") elseif (ui_density STREQUAL "compact")
set(ui_density_variable "LVGL_UI_DENSITY_COMPACT") set(ui_density_variable "LVGL_UI_DENSITY_COMPACT")
else () 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 () endif ()
message("UI density set to '${ui_density}' via properties") message("UI density set to '${ui_density}' via properties")
else () else ()

Some files were not shown because too many files have changed in this diff Show More