Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 89e8baf517 | |||
| 2060095028 | |||
| 620d56e19a | |||
| a0583e3a30 | |||
| 054d1286b2 | |||
| 85da419a98 | |||
| 87c82f5314 | |||
| 4b7f82c38f | |||
| 6d55f0b200 | |||
| 61fc67cf4c | |||
| c8ee763f3d | |||
| 9e3dc3dc15 | |||
| a321bfeb4c | |||
| f95cd7df4c |
@@ -63,3 +63,7 @@ Strong success criteria let you loop independently. Weak criteria ("make it work
|
|||||||
---
|
---
|
||||||
|
|
||||||
**These guidelines are working if:** fewer unnecessary changes in diffs, fewer rewrites due to overcomplication, and clarifying questions come before implementation rather than after mistakes.
|
**These guidelines are working if:** fewer unnecessary changes in diffs, fewer rewrites due to overcomplication, and clarifying questions come before implementation rather than after mistakes.
|
||||||
|
|
||||||
|
For current-firmware merges, board customization retention, ESP-IDF build/flash,
|
||||||
|
and external-app compatibility verification, also follow
|
||||||
|
`.claude/skills/tactility-firmware-development/SKILL.md`.
|
||||||
|
|||||||
@@ -0,0 +1,198 @@
|
|||||||
|
---
|
||||||
|
name: tactility-firmware-development
|
||||||
|
description: Use when merging current Tactility firmware, preserving local ES3C28P/ES3C35P customizations, building/flashing ESP32 firmware, or validating external apps against it.
|
||||||
|
---
|
||||||
|
|
||||||
|
# Tactility firmware development
|
||||||
|
|
||||||
|
## Scope and success criteria
|
||||||
|
|
||||||
|
Use this skill for firmware upgrades, especially when upstream changes the app
|
||||||
|
loader, dashboard API, SDK export, or device model. Before editing, record the
|
||||||
|
active branch, `git status --short`, selected `Devices/<id>`, serial port, and
|
||||||
|
the expected device identity. Preserve user work and local board
|
||||||
|
customizations; do not reset or overwrite a dirty tree.
|
||||||
|
|
||||||
|
Success is not merely a successful flash: the board must boot, mount storage,
|
||||||
|
return `/api/sysinfo`, expose required internal apps, and accept an external
|
||||||
|
app rebuilt against this exact firmware.
|
||||||
|
|
||||||
|
## Upgrade and customization audit
|
||||||
|
|
||||||
|
1. Fetch and compare the intended upstream branch before merging. Treat
|
||||||
|
`upstream/main` as distinct from experimental release/IDF branches unless
|
||||||
|
the task explicitly asks for one of those branches.
|
||||||
|
2. Merge without discarding local work (for example, `git merge --autostash
|
||||||
|
upstream/main` after inspecting status). Resolve conflicts by preserving
|
||||||
|
required ES3C28P and ES3C35P device definitions, partition selection,
|
||||||
|
display/font customizations, and product features.
|
||||||
|
3. Compare the pre-upgrade customization commit against the resulting worktree.
|
||||||
|
Check new app registrations, CMake/source inclusion, settings pages,
|
||||||
|
web-server endpoints, and board-specific `sdkconfig` entries—not just files
|
||||||
|
that happen to conflict.
|
||||||
|
4. Commit the resulting firmware customization as a focused, reviewable
|
||||||
|
commit after `git diff --check`.
|
||||||
|
|
||||||
|
## Multi-binary external-app compatibility
|
||||||
|
|
||||||
|
Upstream app packaging changed to `bin/<platform>/<binary>.elf`. The old
|
||||||
|
`elf/<platform>.elf` archive layout produces a loader `Not executable` error.
|
||||||
|
|
||||||
|
- Manifest v0.2: `bin/esp32s3/app.elf`
|
||||||
|
- Manifest v0.3: `bin/esp32s3/<app.0.binary>.elf`
|
||||||
|
|
||||||
|
When this change arrives, update the companion app tool and rebuild every app
|
||||||
|
from a fresh SDK exported from this firmware. Do not attempt to repair a
|
||||||
|
packaged ELF on the SD card: its layout and ABI must both be regenerated.
|
||||||
|
|
||||||
|
## Build and flash
|
||||||
|
|
||||||
|
Use the installed IDF 5.5 environment; host virtual environments can corrupt
|
||||||
|
both Python dependencies and IDF tooling:
|
||||||
|
|
||||||
|
```zsh
|
||||||
|
unset VIRTUAL_ENV PYTHONPATH PYTHONHOME
|
||||||
|
export IDF_PYTHON_ENV_PATH=/Users/adolforeyna/.espressif/python_env/idf5.5_py3.9_env
|
||||||
|
source /Users/adolforeyna/esp/esp-idf/export.sh
|
||||||
|
|
||||||
|
# Select/check the intended board before this step.
|
||||||
|
python device.py <device-id>
|
||||||
|
idf.py build
|
||||||
|
idf.py -p /dev/cu.usbmodemXXXX flash
|
||||||
|
```
|
||||||
|
|
||||||
|
`Tactility/CMakeLists.txt` uses a non-configure-dependent source glob. After
|
||||||
|
adding a new `.c`/`.cpp` file, run `idf.py reconfigure build`; otherwise a
|
||||||
|
linker error for a newly referenced symbol may only mean CMake has not
|
||||||
|
discovered the source file yet.
|
||||||
|
|
||||||
|
## Boot and feature acceptance
|
||||||
|
|
||||||
|
Capture serial at 115200 after flash or reset. Confirm the board name, SD-card
|
||||||
|
mount, HTTP-server start, Wi-Fi address, and any feature-specific startup logs.
|
||||||
|
Then query the resolved device:
|
||||||
|
|
||||||
|
```zsh
|
||||||
|
curl -fsS http://<ip>/api/sysinfo
|
||||||
|
curl -fsS http://<ip>/api/apps
|
||||||
|
```
|
||||||
|
|
||||||
|
For MCP settings, verify the `McpSettings` internal app appears in `/api/apps`.
|
||||||
|
When enabled, verify MCP stream startup logs. For a feature restored from an
|
||||||
|
older customization, validate its registration path and persisted settings,
|
||||||
|
not only its source files.
|
||||||
|
|
||||||
|
## External-app acceptance gate
|
||||||
|
|
||||||
|
Use the companion app skill's exact-firmware wrapper:
|
||||||
|
|
||||||
|
```zsh
|
||||||
|
cd /path/to/tactility_apps
|
||||||
|
scripts/build_current_firmware_app.sh Apps/MyApp --firmware /path/to/tactility
|
||||||
|
```
|
||||||
|
|
||||||
|
Inspect the resulting tar member path, install through port-80 dashboard API,
|
||||||
|
launch it, and read serial. Required evidence is the loader's `Loading
|
||||||
|
.../bin/...`, an ELF entry address, `Task started`, and app-specific startup
|
||||||
|
logs. HTTP 200 or a package simply appearing in `/api/apps` is insufficient.
|
||||||
|
|
||||||
|
## Host simulator (buildsim) + web viewer
|
||||||
|
|
||||||
|
The POSIX simulator runs the real firmware (LVGL, services, web server) on
|
||||||
|
macOS/Linux with an SDL backend. macOS has no visible window (upstream
|
||||||
|
`.github/workflows/build-simulator.yml`: "macOS simulator currently fails due
|
||||||
|
to main thread requirement for rendering" — AppKit menu init must happen on
|
||||||
|
the process main thread, but FreeRTOS-POSIX parks main in `sigwait` and runs
|
||||||
|
everything on pthreads). The supported loop is **headless + web viewer**:
|
||||||
|
screenshots render server-side regardless of any window.
|
||||||
|
|
||||||
|
Code locations:
|
||||||
|
|
||||||
|
- `Devices/simulator/Source/module.cpp` — display resolution + `SIM_DISPLAY_W/H`
|
||||||
|
- `Devices/simulator/Source/drivers/sdl_display.{h,cpp}` — SDL backend
|
||||||
|
- `Devices/simulator/Source/drivers/sdl_input.{h,cpp}` — pointer/key state +
|
||||||
|
web touch-injection override
|
||||||
|
- `Tactility/Source/service/webserver/WebServerService.cpp` — `/sim` viewer,
|
||||||
|
`/sim/api/*` aliases, `POST /api/sim/touch`, `GET /api/screenshot?fast=`
|
||||||
|
- `Tactility/Private/Tactility/service/webserver/WebServerService.h` — handler decls
|
||||||
|
|
||||||
|
### Build and run
|
||||||
|
|
||||||
|
```zsh
|
||||||
|
# one-time host deps (outside any ESP-IDF env)
|
||||||
|
mkdir -p /tmp/simbin && ln -sf "$(which python3)" /tmp/simbin/python
|
||||||
|
pip3 install --break-system-packages lark pyyaml # devicetree compiler
|
||||||
|
|
||||||
|
cd /path/to/tactility
|
||||||
|
export PATH="/tmp/simbin:$PATH"
|
||||||
|
env -u ESP_IDF_VERSION -u IDF_PATH cmake -S . -B buildsim -DCMAKE_BUILD_TYPE=Release
|
||||||
|
env -u ESP_IDF_VERSION -u IDF_PATH cmake --build buildsim --target Tactility -j "$(sysctl -n hw.ncpu)"
|
||||||
|
|
||||||
|
# POSIX SDK for host apps (arm64)
|
||||||
|
env -u ESP_IDF_VERSION -u IDF_PATH cmake --build buildsim --target TactilityKernel lvgl minitar minmea \
|
||||||
|
app-module crypt-module gps-module http-module lvgl-module lvgl-window-manager-module service-module
|
||||||
|
env -u ESP_IDF_VERSION -u IDF_PATH python3 Buildscripts/release-sdk-posix.py /tmp/sim-sdk
|
||||||
|
|
||||||
|
# release + headless run (MUST run from the firmware root: release-simulator.sh
|
||||||
|
# uses relative version.txt / Data paths)
|
||||||
|
sh Buildscripts/release-simulator.sh buildsim /tmp/simrun
|
||||||
|
(cd /tmp/simrun && SIM_DISPLAY_W=480 SIM_DISPLAY_H=320 SDL_VIDEODRIVER=dummy \
|
||||||
|
nohup ./Tactility > /tmp/sim_web.log 2>&1 &)
|
||||||
|
curl -s --max-time 5 http://127.0.0.1/api/sysinfo | head -c 120
|
||||||
|
```
|
||||||
|
|
||||||
|
Display resolution: `SIM_DISPLAY_W/H` env (default **480x320 landscape**,
|
||||||
|
matching on-device screenshots). ES3C35P panel is 320x480 portrait in DTS but
|
||||||
|
presents 480x320 landscape; ES3C28P is 320x240. The chosen geometry is logged
|
||||||
|
as `Simulator Sim display WxH`. `SDL_VIDEODRIVER=dummy` is expected to log one
|
||||||
|
`SdlDisplay Failed to create SDL window: Couldn't find matching render
|
||||||
|
driver` line — LVGL still renders and screenshots work.
|
||||||
|
|
||||||
|
### Web viewer, touch, screenshots
|
||||||
|
|
||||||
|
- `GET /sim` → 301 to `/sim/` (trailing slash required so the page's relative
|
||||||
|
`api/` URLs resolve under `/sim/`). Viewer polls `api/screenshot?fast=1`
|
||||||
|
every 500 ms, footer shows live `naturalWidth×naturalHeight`, click/tap
|
||||||
|
POSTs `api/sim/touch?x=&y=`.
|
||||||
|
- `POST /api/sim/touch?x=123&y=456[&down=0|1]` (also `/sim/api/sim/touch` via
|
||||||
|
alias). Coordinates are LVGL logical pixels. `down=1` (default) presses and
|
||||||
|
**auto-releases after 1500 ms** (`SIM_TOUCH_HOLD_MS` in `sdl_input.cpp`),
|
||||||
|
long enough for LVGL indev polls to register a click. Simulator-only: 404 on
|
||||||
|
ESP32 (`#ifndef ESP_PLATFORM`).
|
||||||
|
- `GET /api/screenshot?fast=1` (default): `lv_snapshot_take` (RGB888) → in-place
|
||||||
|
BGR→RGB swap → `lodepng_encode24` **to memory** → chunked HTTP. No filesystem
|
||||||
|
touch, ~8 ms/shot. `?fast=0` keeps the legacy `webscreenshotN.png` file path
|
||||||
|
(slot scan + accumulation — avoid for viewer loops).
|
||||||
|
- lodepng include in `.cpp`: `#define LODEPNG_NO_COMPILE_CPP` before
|
||||||
|
`#include "src/libs/lodepng/lodepng.h"`, otherwise its C++ `std::vector`
|
||||||
|
overloads collide with the C declarations (`conflicting types for 'encode'`).
|
||||||
|
- MCP includes and `settings::mcp` reads are `#ifdef ESP_PLATFORM`-gated; the
|
||||||
|
sim has no `McpSystem`.
|
||||||
|
|
||||||
|
### Tailscale viewer
|
||||||
|
|
||||||
|
```zsh
|
||||||
|
tailscale serve --bg --set-path=/simagent http://127.0.0.1:80/
|
||||||
|
# open: https://<node>/simagent/sim/
|
||||||
|
```
|
||||||
|
|
||||||
|
The serve target must be `/` (not `/sim`): the page resolves `api/` against
|
||||||
|
its own directory, so at `/simagent/sim/` fetches go to `/simagent/sim/api/…`,
|
||||||
|
which tailscale strips to `/sim/api/…` and the firmware's `/sim/api/*`
|
||||||
|
aliases (GET+POST, registered in `startServer()`) handle. Absolute `/api/…`
|
||||||
|
URLs would 404 at the edge (no `/api` mount there).
|
||||||
|
|
||||||
|
### Simulator pitfalls
|
||||||
|
|
||||||
|
- **Rebuild ≠ redeploy.** `cmake --build buildsim` updates `buildsim/` only.
|
||||||
|
Re-run `release-simulator.sh`, restart the process, then retest. A stale
|
||||||
|
`/tmp/simrun/Tactility` serves old handlers with new logs nowhere to be found.
|
||||||
|
- **C array `sizeof` decay.** A helper like
|
||||||
|
`f(HttpServerRequest*, char uri[256])` sees `sizeof(uri) == 8`, truncating
|
||||||
|
`get_uri` output to 7 chars (`/api/sy`, `/sim/ap` 404s). Pass the size
|
||||||
|
explicitly: `f(request, buf, sizeof(buf))`.
|
||||||
|
- **Log truncation.** `LOG_QUEUE_MESSAGE_MAX_LENGTH` is 256 (`TactilityKernel/
|
||||||
|
private/tactility/log_queue.h`), including color/timestamp prefix. Long URIs
|
||||||
|
and messages truncate — don't over-interpret a short path in the log.
|
||||||
|
- **Auth.** The viewer and API handlers enforce `validateRequestAuth` like any
|
||||||
|
other endpoint; failures surface as 401/404, not viewer bugs.
|
||||||
@@ -311,11 +311,39 @@ def test_compile_missing_config():
|
|||||||
print("PASSED")
|
print("PASSED")
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def test_es3c35p_uses_current_runtime_contract():
|
||||||
|
print("Running test_es3c35p_uses_current_runtime_contract...")
|
||||||
|
repository_root = os.path.abspath(os.path.join(SCRIPT_DIR, "..", "..", ".."))
|
||||||
|
device_dir = os.path.join(repository_root, "Devices", "es3c35p")
|
||||||
|
with open(os.path.join(device_dir, "device.properties")) as f:
|
||||||
|
properties = f.read()
|
||||||
|
with open(os.path.join(device_dir, "es3c35p.dts")) as f:
|
||||||
|
devicetree = f.read()
|
||||||
|
|
||||||
|
requirements = [
|
||||||
|
("apps.launcherAppId=tactility.launcher" in properties, "current launcher app id"),
|
||||||
|
("hardware.tinyUsb=" not in properties, "no obsolete hardware.tinyUsb property"),
|
||||||
|
('wifi0 {\n\t\tcompatible = "espressif,esp32-wifi-pinned";\n\t};' in devicetree,
|
||||||
|
"Wi-Fi enabled for web server and MCP"),
|
||||||
|
('ble0 {\n\t\tcompatible = "espressif,esp32-ble";\n\t};' in devicetree,
|
||||||
|
"BLE node matches hardware.bluetooth=true"),
|
||||||
|
]
|
||||||
|
missing = [description for condition, description in requirements if not condition]
|
||||||
|
if missing:
|
||||||
|
print("FAILED: " + ", ".join(missing))
|
||||||
|
return False
|
||||||
|
|
||||||
|
print("PASSED")
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
tests = [
|
tests = [
|
||||||
test_compile_success,
|
test_compile_success,
|
||||||
test_compile_invalid_dts,
|
test_compile_invalid_dts,
|
||||||
test_compile_missing_config,
|
test_compile_missing_config,
|
||||||
|
test_es3c35p_uses_current_runtime_contract,
|
||||||
test_minmax_within_range_succeeds,
|
test_minmax_within_range_succeeds,
|
||||||
test_minmax_below_minimum_fails,
|
test_minmax_below_minimum_fails,
|
||||||
test_minmax_above_maximum_fails,
|
test_minmax_above_maximum_fails,
|
||||||
|
|||||||
Executable
+87
@@ -0,0 +1,87 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
|
||||||
|
"""Convert an image to an uncompressed LVGL RGB565 launcher background."""
|
||||||
|
|
||||||
|
import argparse
|
||||||
|
import shutil
|
||||||
|
import struct
|
||||||
|
import subprocess
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
|
LV_IMAGE_HEADER_MAGIC = 0x19
|
||||||
|
LV_COLOR_FORMAT_RGB565 = 0x12
|
||||||
|
|
||||||
|
|
||||||
|
def parse_args() -> argparse.Namespace:
|
||||||
|
parser = argparse.ArgumentParser(
|
||||||
|
description=(
|
||||||
|
"Create an uncompressed LVGL .bin image for "
|
||||||
|
"/sdcard/tactility/launcher/background.bin. Use a square image sized "
|
||||||
|
"to the display's longest edge to support both orientations without scaling "
|
||||||
|
"(for example, 320x320 for a 320x240 display)."
|
||||||
|
)
|
||||||
|
)
|
||||||
|
parser.add_argument("input", type=Path, help="Source image")
|
||||||
|
parser.add_argument("output", type=Path, help="Destination .bin file")
|
||||||
|
parser.add_argument("--width", type=int, required=True, help="Output width")
|
||||||
|
parser.add_argument("--height", type=int, required=True, help="Output height")
|
||||||
|
return parser.parse_args()
|
||||||
|
|
||||||
|
|
||||||
|
def main() -> None:
|
||||||
|
args = parse_args()
|
||||||
|
if args.width <= 0 or args.width > 65535 or args.height <= 0 or args.height > 65535:
|
||||||
|
raise SystemExit("width and height must be between 1 and 65535")
|
||||||
|
|
||||||
|
magick = shutil.which("magick")
|
||||||
|
if magick is None:
|
||||||
|
raise SystemExit("ImageMagick is required (the 'magick' command was not found)")
|
||||||
|
|
||||||
|
command = [
|
||||||
|
magick,
|
||||||
|
str(args.input),
|
||||||
|
"-resize",
|
||||||
|
f"{args.width}x{args.height}^",
|
||||||
|
"-gravity",
|
||||||
|
"center",
|
||||||
|
"-extent",
|
||||||
|
f"{args.width}x{args.height}",
|
||||||
|
"-depth",
|
||||||
|
"8",
|
||||||
|
"rgb:-",
|
||||||
|
]
|
||||||
|
rgb888 = subprocess.run(command, check=True, stdout=subprocess.PIPE).stdout
|
||||||
|
expected_size = args.width * args.height * 3
|
||||||
|
if len(rgb888) != expected_size:
|
||||||
|
raise SystemExit(f"unexpected ImageMagick output: {len(rgb888)} bytes, expected {expected_size}")
|
||||||
|
|
||||||
|
rgb565 = bytearray(args.width * args.height * 2)
|
||||||
|
for source_offset in range(0, len(rgb888), 3):
|
||||||
|
r, g, b = rgb888[source_offset : source_offset + 3]
|
||||||
|
pixel = ((r >> 3) << 11) | ((g >> 2) << 5) | (b >> 3)
|
||||||
|
destination_offset = (source_offset // 3) * 2
|
||||||
|
struct.pack_into("<H", rgb565, destination_offset, pixel)
|
||||||
|
|
||||||
|
stride = args.width * 2
|
||||||
|
header = struct.pack(
|
||||||
|
"<BBHHHHH",
|
||||||
|
LV_IMAGE_HEADER_MAGIC,
|
||||||
|
LV_COLOR_FORMAT_RGB565,
|
||||||
|
0,
|
||||||
|
args.width,
|
||||||
|
args.height,
|
||||||
|
stride,
|
||||||
|
0,
|
||||||
|
)
|
||||||
|
|
||||||
|
args.output.parent.mkdir(parents=True, exist_ok=True)
|
||||||
|
args.output.write_bytes(header + rgb565)
|
||||||
|
print(
|
||||||
|
f"Wrote {args.output} ({args.width}x{args.height}, "
|
||||||
|
f"{len(header) + len(rgb565)} bytes, uncompressed RGB565)"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
@@ -17,7 +17,7 @@ apOpenNetwork=0
|
|||||||
apChannel=1
|
apChannel=1
|
||||||
|
|
||||||
# Web Server Settings
|
# Web Server Settings
|
||||||
webServerEnabled=0
|
webServerEnabled=1
|
||||||
webServerPort=80
|
webServerPort=80
|
||||||
|
|
||||||
# HTTP Basic Authentication (optional)
|
# HTTP Basic Authentication (optional)
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 298 KiB |
@@ -19,3 +19,8 @@ display.dpi=143
|
|||||||
lvgl.colorDepth=16
|
lvgl.colorDepth=16
|
||||||
|
|
||||||
storage.userDataLocation=SD
|
storage.userDataLocation=SD
|
||||||
|
|
||||||
|
# Launcher clock and full-screen wallpaper
|
||||||
|
sdkconfig.CONFIG_LV_FONT_MONTSERRAT_48=y
|
||||||
|
sdkconfig.CONFIG_LV_CACHE_DEF_SIZE=1048576
|
||||||
|
sdkconfig.CONFIG_LV_IMAGE_HEADER_CACHE_DEF_CNT=16
|
||||||
|
|||||||
@@ -90,6 +90,7 @@
|
|||||||
compatible = "everest,es8311";
|
compatible = "everest,es8311";
|
||||||
reg = <0x18>;
|
reg = <0x18>;
|
||||||
i2s = <&i2s0>;
|
i2s = <&i2s0>;
|
||||||
|
input-gain-percent = <100>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
idf_component_register(
|
||||||
|
SRCS "source/module.cpp"
|
||||||
|
REQUIRES TactilityKernel
|
||||||
|
)
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
general.vendor=LCDWIKI/Hosyond
|
||||||
|
general.name=ES3C35P
|
||||||
|
|
||||||
|
apps.launcherAppId=tactility.launcher
|
||||||
|
|
||||||
|
hardware.target=ESP32S3
|
||||||
|
hardware.flashSize=16MB
|
||||||
|
hardware.spiRam=true
|
||||||
|
hardware.spiRamMode=OCT
|
||||||
|
hardware.spiRamSpeed=120M
|
||||||
|
hardware.esptoolFlashFreq=120M
|
||||||
|
hardware.bluetooth=true
|
||||||
|
|
||||||
|
display.size=3.5"
|
||||||
|
display.shape=rectangle
|
||||||
|
display.dpi=165
|
||||||
|
|
||||||
|
lvgl.colorDepth=16
|
||||||
|
lvgl.fontSize=16
|
||||||
|
|
||||||
|
storage.userDataLocation=SD
|
||||||
|
|
||||||
|
dependencies.useDeprecatedHal=false
|
||||||
|
|
||||||
|
# Launcher clock and full-screen wallpaper
|
||||||
|
sdkconfig.CONFIG_LV_FONT_MONTSERRAT_48=y
|
||||||
|
sdkconfig.CONFIG_LV_CACHE_DEF_SIZE=1048576
|
||||||
|
sdkconfig.CONFIG_LV_IMAGE_HEADER_CACHE_DEF_CNT=16
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
dependencies:
|
||||||
|
- Platforms/platform-esp32
|
||||||
|
- Drivers/st77922-module
|
||||||
|
- Drivers/es8311-module
|
||||||
|
- Drivers/audio-stream-module
|
||||||
|
dts: es3c35p.dts
|
||||||
@@ -0,0 +1,142 @@
|
|||||||
|
/dts-v1/;
|
||||||
|
|
||||||
|
#include <tactility/bindings/root.h>
|
||||||
|
#include <tactility/bindings/esp32_adc_oneshot.h>
|
||||||
|
#include <tactility/bindings/esp32_ble.h>
|
||||||
|
#include <tactility/bindings/esp32_gpio.h>
|
||||||
|
#include <tactility/bindings/esp32_i2c.h>
|
||||||
|
#include <tactility/bindings/esp32_i2s.h>
|
||||||
|
#include <tactility/bindings/esp32_pwm_ledc.h>
|
||||||
|
#include <tactility/bindings/esp32_sdmmc.h>
|
||||||
|
#include <tactility/bindings/esp32_spi.h>
|
||||||
|
#include <tactility/bindings/esp32_wifi_pinned.h>
|
||||||
|
#include <tactility/bindings/battery_sense.h>
|
||||||
|
#include <tactility/bindings/gpio_hog.h>
|
||||||
|
#include <tactility/bindings/pwm_backlight.h>
|
||||||
|
#include <bindings/st77922.h>
|
||||||
|
#include <bindings/st77922_touch.h>
|
||||||
|
#include <bindings/es8311.h>
|
||||||
|
|
||||||
|
/ {
|
||||||
|
compatible = "root";
|
||||||
|
model = "LCDWIKI/Hosyond ES3C35P";
|
||||||
|
|
||||||
|
wifi0 {
|
||||||
|
compatible = "espressif,esp32-wifi-pinned";
|
||||||
|
};
|
||||||
|
|
||||||
|
ble0 {
|
||||||
|
compatible = "espressif,esp32-ble";
|
||||||
|
};
|
||||||
|
|
||||||
|
gpio0 {
|
||||||
|
compatible = "espressif,esp32-gpio";
|
||||||
|
gpio-count = <49>;
|
||||||
|
};
|
||||||
|
|
||||||
|
/* FM8002E speaker amplifier enable, active-low on GPIO1. */
|
||||||
|
amp_enable {
|
||||||
|
compatible = "gpio-hog";
|
||||||
|
pin = <&gpio0 1 GPIO_FLAG_NONE>;
|
||||||
|
mode = <GPIO_HOG_MODE_OUTPUT_LOW>;
|
||||||
|
};
|
||||||
|
|
||||||
|
adc0 {
|
||||||
|
compatible = "espressif,esp32-adc-oneshot";
|
||||||
|
unit-id = <ADC_UNIT_1>;
|
||||||
|
clk-src = <ADC_RTC_CLK_SRC_DEFAULT>;
|
||||||
|
channels = <ADC_CHANNEL_7 ADC_ATTEN_DB_12 ADC_BITWIDTH_DEFAULT>;
|
||||||
|
};
|
||||||
|
|
||||||
|
/* BAT+ through a 200K/200K divider into GPIO8 / ADC1_CH7. */
|
||||||
|
battery-sense {
|
||||||
|
compatible = "battery-sense";
|
||||||
|
io-channel = <&adc0 0>;
|
||||||
|
reference-voltage-mv = <3300>;
|
||||||
|
multiplier = <2000>;
|
||||||
|
};
|
||||||
|
|
||||||
|
i2s0 {
|
||||||
|
compatible = "espressif,esp32-i2s";
|
||||||
|
port = <I2S_NUM_0>;
|
||||||
|
pin-bclk = <&gpio0 18 GPIO_FLAG_NONE>;
|
||||||
|
pin-ws = <&gpio0 21 GPIO_FLAG_NONE>;
|
||||||
|
pin-data-out = <&gpio0 15 GPIO_FLAG_NONE>;
|
||||||
|
pin-data-in = <&gpio0 16 GPIO_FLAG_NONE>;
|
||||||
|
pin-mclk = <&gpio0 17 GPIO_FLAG_NONE>;
|
||||||
|
};
|
||||||
|
|
||||||
|
i2c0 {
|
||||||
|
compatible = "espressif,esp32-i2c";
|
||||||
|
port = <I2C_NUM_0>;
|
||||||
|
clock-frequency = <400000>;
|
||||||
|
pin-sda = <&gpio0 38 GPIO_FLAG_NONE>;
|
||||||
|
pin-scl = <&gpio0 39 GPIO_FLAG_NONE>;
|
||||||
|
|
||||||
|
touch@55 {
|
||||||
|
compatible = "sitronix,st77922-touch";
|
||||||
|
reg = <0x55>;
|
||||||
|
x-max = <320>;
|
||||||
|
y-max = <480>;
|
||||||
|
pin-reset = <&gpio0 48 GPIO_FLAG_NONE>;
|
||||||
|
pin-interrupt = <&gpio0 47 GPIO_FLAG_NONE>;
|
||||||
|
};
|
||||||
|
|
||||||
|
es8311: es8311@18 {
|
||||||
|
compatible = "everest,es8311";
|
||||||
|
reg = <0x18>;
|
||||||
|
i2s = <&i2s0>;
|
||||||
|
input-gain-percent = <100>;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
display_backlight_pwm {
|
||||||
|
compatible = "espressif,esp32-pwm-ledc";
|
||||||
|
pin = <&gpio0 41 GPIO_FLAG_NONE>;
|
||||||
|
period-ns = <200000>;
|
||||||
|
ledc-timer = <0>;
|
||||||
|
ledc-channel = <0>;
|
||||||
|
};
|
||||||
|
|
||||||
|
display_backlight {
|
||||||
|
compatible = "pwm-backlight";
|
||||||
|
status = "disabled";
|
||||||
|
pwm = <&display_backlight_pwm>;
|
||||||
|
};
|
||||||
|
|
||||||
|
spi0 {
|
||||||
|
compatible = "espressif,esp32-spi";
|
||||||
|
host = <SPI2_HOST>;
|
||||||
|
pin-sclk = <&gpio0 12 GPIO_FLAG_NONE>;
|
||||||
|
pin-mosi = <&gpio0 11 GPIO_FLAG_NONE>;
|
||||||
|
pin-miso = <&gpio0 13 GPIO_FLAG_NONE>;
|
||||||
|
pin-wp = <&gpio0 14 GPIO_FLAG_NONE>;
|
||||||
|
pin-hd = <&gpio0 9 GPIO_FLAG_NONE>;
|
||||||
|
cs-gpios = <&gpio0 10 GPIO_FLAG_NONE>;
|
||||||
|
/* Accommodate the driver's 1/10-frame DMA staging transfers, matching
|
||||||
|
* the vendor LVGL port's full-frame refresh path. */
|
||||||
|
max-transfer-size = <65536>;
|
||||||
|
|
||||||
|
display@0 {
|
||||||
|
compatible = "sitronix,st77922";
|
||||||
|
horizontal-resolution = <320>;
|
||||||
|
vertical-resolution = <480>;
|
||||||
|
/* 80 MHz works in the vendor demo, but produces visible QSPI corruption on
|
||||||
|
* some modules/cables. The component's 40 MHz default is reliably clean. */
|
||||||
|
pixel-clock-hz = <40000000>;
|
||||||
|
backlight = <&display_backlight>;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
sdmmc0 {
|
||||||
|
compatible = "espressif,esp32-sdmmc";
|
||||||
|
pin-clk = <&gpio0 5 GPIO_FLAG_NONE>;
|
||||||
|
pin-cmd = <&gpio0 4 GPIO_FLAG_NONE>;
|
||||||
|
pin-d0 = <&gpio0 6 GPIO_FLAG_NONE>;
|
||||||
|
pin-d1 = <&gpio0 7 GPIO_FLAG_NONE>;
|
||||||
|
pin-d2 = <&gpio0 2 GPIO_FLAG_NONE>;
|
||||||
|
pin-d3 = <&gpio0 3 GPIO_FLAG_NONE>;
|
||||||
|
slot = <SDMMC_HOST_SLOT_1>;
|
||||||
|
bus-width = <4>;
|
||||||
|
};
|
||||||
|
};
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
#include <tactility/module.h>
|
||||||
|
|
||||||
|
extern "C" {
|
||||||
|
|
||||||
|
Module es3c35p_module = {
|
||||||
|
.name = "es3c35p"
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
@@ -14,6 +14,34 @@ constexpr size_t KEY_QUEUE_CAPACITY = 32;
|
|||||||
|
|
||||||
SdlPointerState pointer_state = { 0, 0, false };
|
SdlPointerState pointer_state = { 0, 0, false };
|
||||||
|
|
||||||
|
} // namespace
|
||||||
|
|
||||||
|
// Web touch-injection override (headless sim viewer). Guarded by tick count so
|
||||||
|
// a press auto-releases even if the viewer never sends the release event.
|
||||||
|
// File-scope (not anonymous namespace): the extern "C" setters below must be
|
||||||
|
// visible to the linker for WebServerService's touch endpoint.
|
||||||
|
bool touch_override_active = false;
|
||||||
|
SdlPointerState touch_override = { 0, 0, false };
|
||||||
|
uint32_t touch_override_until_tick = 0;
|
||||||
|
#define SIM_TOUCH_HOLD_MS 1500
|
||||||
|
|
||||||
|
extern "C" void sdl_input_set_touch_override(int32_t x, int32_t y, bool pressed) {
|
||||||
|
touch_override.x = x;
|
||||||
|
touch_override.y = y;
|
||||||
|
touch_override.pressed = pressed;
|
||||||
|
touch_override_active = pressed;
|
||||||
|
if (pressed) {
|
||||||
|
touch_override_until_tick = SDL_GetTicks() + SIM_TOUCH_HOLD_MS;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
extern "C" void sdl_input_clear_touch_override(void) {
|
||||||
|
touch_override_active = false;
|
||||||
|
touch_override.pressed = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
|
||||||
uint32_t key_queue[KEY_QUEUE_CAPACITY];
|
uint32_t key_queue[KEY_QUEUE_CAPACITY];
|
||||||
size_t key_queue_head = 0;
|
size_t key_queue_head = 0;
|
||||||
size_t key_queue_count = 0;
|
size_t key_queue_count = 0;
|
||||||
@@ -70,7 +98,7 @@ uint32_t keycode_to_key(SDL_Keycode sdl_key, bool shift) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
} // namespace
|
||||||
|
|
||||||
void sdl_input_pump() {
|
void sdl_input_pump() {
|
||||||
if (!text_input_started) {
|
if (!text_input_started) {
|
||||||
@@ -125,6 +153,17 @@ void sdl_input_pump() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void sdl_input_get_pointer_state(SdlPointerState* out_state) {
|
void sdl_input_get_pointer_state(SdlPointerState* out_state) {
|
||||||
|
if (touch_override_active) {
|
||||||
|
// Auto-release: viewer sends press only; LVGL needs press then release
|
||||||
|
// to register a click. Hold long enough for several indev polls.
|
||||||
|
if ((int32_t)(SDL_GetTicks() - touch_override_until_tick) >= 0) {
|
||||||
|
touch_override_active = false;
|
||||||
|
touch_override.pressed = false;
|
||||||
|
} else {
|
||||||
|
*out_state = touch_override;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
*out_state = pointer_state;
|
*out_state = pointer_state;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -42,6 +42,16 @@ bool sdl_input_pop_key(uint32_t* out_key);
|
|||||||
*/
|
*/
|
||||||
bool sdl_input_has_queued_key(void);
|
bool sdl_input_has_queued_key(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Web-injected touch override (for headless sim viewer without SDL window).
|
||||||
|
* When active, sdl_pointer_get_touched_points() reports this state instead of
|
||||||
|
* the SDL mouse state. Coordinates are in LVGL logical pixels (e.g. 640x480).
|
||||||
|
* Pass pressed=false to release. Auto-releases after SIM_TOUCH_HOLD_MS unless
|
||||||
|
* refreshed (tap = press, wait, release handled by the web viewer).
|
||||||
|
*/
|
||||||
|
void sdl_input_set_touch_override(int32_t x, int32_t y, bool pressed);
|
||||||
|
void sdl_input_clear_touch_override(void);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -29,7 +29,28 @@ static Driver* const simulator_drivers[] = {
|
|||||||
// These devices have no real bus to attach to (SDL has no notion of one), but every non-root
|
// These devices have no real bus to attach to (SDL has no notion of one), but every non-root
|
||||||
// device is still expected to have a parent (see Device::parent) - they're parented to root once
|
// device is still expected to have a parent (see Device::parent) - they're parented to root once
|
||||||
// it's available below.
|
// it's available below.
|
||||||
static const SdlDisplayConfig sdl_display_config = { 640, 480 };
|
// Display resolution is overridable at runtime via SIM_DISPLAY_W/H env vars
|
||||||
|
// so the sim can match real hardware (e.g. ES3C35P 3.5" = 320x480 portrait,
|
||||||
|
// ES3C28P 2.8" = 320x240 landscape). Defaults to 640x480.
|
||||||
|
static uint16_t sim_display_width(void) {
|
||||||
|
const char* w = getenv("SIM_DISPLAY_W");
|
||||||
|
if (w != nullptr) {
|
||||||
|
long v = atol(w);
|
||||||
|
if (v >= 120 && v <= 2048) return (uint16_t)v;
|
||||||
|
}
|
||||||
|
return 480;
|
||||||
|
}
|
||||||
|
|
||||||
|
static uint16_t sim_display_height(void) {
|
||||||
|
const char* h = getenv("SIM_DISPLAY_H");
|
||||||
|
if (h != nullptr) {
|
||||||
|
long v = atol(h);
|
||||||
|
if (v >= 120 && v <= 2048) return (uint16_t)v;
|
||||||
|
}
|
||||||
|
return 320;
|
||||||
|
}
|
||||||
|
|
||||||
|
static SdlDisplayConfig sdl_display_config = { 480, 320 };
|
||||||
static Device sdl_display_device {};
|
static Device sdl_display_device {};
|
||||||
static Device sdl_pointer_device {};
|
static Device sdl_pointer_device {};
|
||||||
static Device sdl_keyboard_device {};
|
static Device sdl_keyboard_device {};
|
||||||
@@ -81,6 +102,10 @@ static void on_root_started(Device* device, DeviceEvent event, void* context) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sdl_display_config.horizontal_resolution = sim_display_width();
|
||||||
|
sdl_display_config.vertical_resolution = sim_display_height();
|
||||||
|
LOG_I(TAG, "Sim display %dx%d (SIM_DISPLAY_W/H override, default 480x320 landscape)",
|
||||||
|
sdl_display_config.horizontal_resolution, sdl_display_config.vertical_resolution);
|
||||||
construct_add_start(&sdl_display_device, device, "display0", &sdl_display_config, "tactility,sdl-display");
|
construct_add_start(&sdl_display_device, device, "display0", &sdl_display_config, "tactility,sdl-display");
|
||||||
construct_add_start(&sdl_pointer_device, device, "pointer0", nullptr, "tactility,sdl-pointer");
|
construct_add_start(&sdl_pointer_device, device, "pointer0", nullptr, "tactility,sdl-pointer");
|
||||||
construct_add_start(&sdl_keyboard_device, device, "keyboard0", nullptr, "tactility,sdl-keyboard");
|
construct_add_start(&sdl_keyboard_device, device, "keyboard0", nullptr, "tactility,sdl-keyboard");
|
||||||
|
|||||||
@@ -9,3 +9,7 @@ properties:
|
|||||||
type: phandle
|
type: phandle
|
||||||
required: true
|
required: true
|
||||||
description: "I2S controller device that carries audio data"
|
description: "I2S controller device that carries audio data"
|
||||||
|
input-gain-percent:
|
||||||
|
type: int
|
||||||
|
default: 100
|
||||||
|
description: "Extra digital gain multiplier applied by audio_stream on top of the ES8311's own 42dB hardware ADC gain, as an integer percentage (100 = 1.0x / no extra boost). For quiet MEMS mic capsules that are still quiet even at max hardware gain."
|
||||||
|
|||||||
@@ -25,6 +25,14 @@ struct Es8311Config {
|
|||||||
uint8_t address;
|
uint8_t address;
|
||||||
/** I2S controller device that carries audio data */
|
/** I2S controller device that carries audio data */
|
||||||
struct Device* i2s_device;
|
struct Device* i2s_device;
|
||||||
|
/**
|
||||||
|
* Extra fixed digital gain multiplier applied by audio_stream on top of the ES8311's
|
||||||
|
* own hardware ADC gain (0..42dB), as an integer percentage (100 = 1.0x / no extra boost).
|
||||||
|
* Small MEMS mic capsules can still sound quiet even near max hardware gain; this is for
|
||||||
|
* boards where 42dB hardware gain alone isn't enough. devicetree has no float property type,
|
||||||
|
* hence the x100 integer encoding.
|
||||||
|
*/
|
||||||
|
uint16_t input_gain_percent;
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ struct Es8311Data {
|
|||||||
bool is_open = false;
|
bool is_open = false;
|
||||||
AudioCodecDirection open_direction = AUDIO_CODEC_DIR_BOTH;
|
AudioCodecDirection open_direction = AUDIO_CODEC_DIR_BOTH;
|
||||||
esp_codec_dev_sample_info_t open_sample_info = {};
|
esp_codec_dev_sample_info_t open_sample_info = {};
|
||||||
|
float input_gain = 1.0f;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define GET_CONFIG(device) (static_cast<const Es8311Config*>((device)->config))
|
#define GET_CONFIG(device) (static_cast<const Es8311Config*>((device)->config))
|
||||||
@@ -144,8 +145,8 @@ error_t set_volume(Device* device, AudioCodecDirection direction, float volume_p
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (direction == AUDIO_CODEC_DIR_INPUT) {
|
if (direction == AUDIO_CODEC_DIR_INPUT) {
|
||||||
// ES8311 ADC gain range is roughly 0..24 dB; map 0..100% linearly onto it.
|
// ES8311 ADC gain supports 0..42dB (0,6,12,18,24,30,36,42) in 6dB steps
|
||||||
float db = (volume_percent / 100.0f) * 24.0f;
|
float db = (volume_percent / 100.0f) * 42.0f;
|
||||||
return (esp_codec_dev_set_in_gain(data->codec_device, db) == ESP_CODEC_DEV_OK) ? ERROR_NONE : ERROR_RESOURCE;
|
return (esp_codec_dev_set_in_gain(data->codec_device, db) == ESP_CODEC_DEV_OK) ? ERROR_NONE : ERROR_RESOURCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -172,7 +173,8 @@ error_t get_volume(Device* device, AudioCodecDirection direction, float* volume_
|
|||||||
if (esp_codec_dev_get_in_gain(data->codec_device, &db) != ESP_CODEC_DEV_OK) {
|
if (esp_codec_dev_get_in_gain(data->codec_device, &db) != ESP_CODEC_DEV_OK) {
|
||||||
return ERROR_RESOURCE;
|
return ERROR_RESOURCE;
|
||||||
}
|
}
|
||||||
*volume_percent = (db / 24.0f) * 100.0f;
|
*volume_percent = (db / 42.0f) * 100.0f;
|
||||||
|
if (*volume_percent > 100.0f) *volume_percent = 100.0f;
|
||||||
return ERROR_NONE;
|
return ERROR_NONE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -235,6 +237,12 @@ error_t get_capabilities(Device* device, AudioCodecDirection* supported_directio
|
|||||||
return ERROR_NONE;
|
return ERROR_NONE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
error_t get_input_gain_multiplier(Device* device, float* gain) {
|
||||||
|
auto* data = GET_DATA(device);
|
||||||
|
*gain = data->input_gain;
|
||||||
|
return ERROR_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
static const struct AudioCodecApi API = {
|
static const struct AudioCodecApi API = {
|
||||||
.open = open,
|
.open = open,
|
||||||
.close = close,
|
.close = close,
|
||||||
@@ -247,7 +255,7 @@ static const struct AudioCodecApi API = {
|
|||||||
.get_native_sample_rate = get_native_sample_rate,
|
.get_native_sample_rate = get_native_sample_rate,
|
||||||
.get_native_channels = get_native_channels,
|
.get_native_channels = get_native_channels,
|
||||||
.get_capabilities = get_capabilities,
|
.get_capabilities = get_capabilities,
|
||||||
.get_input_gain_multiplier = nullptr,
|
.get_input_gain_multiplier = get_input_gain_multiplier,
|
||||||
};
|
};
|
||||||
|
|
||||||
// endregion
|
// endregion
|
||||||
@@ -257,6 +265,11 @@ static const struct AudioCodecApi API = {
|
|||||||
error_t start_device(Device* device) {
|
error_t start_device(Device* device) {
|
||||||
const auto* config = GET_CONFIG(device);
|
const auto* config = GET_CONFIG(device);
|
||||||
|
|
||||||
|
if (config->input_gain_percent > 2000) {
|
||||||
|
LOG_E(TAG, "Invalid input_gain_percent %u (must be 0..2000)", config->input_gain_percent);
|
||||||
|
return ERROR_RESOURCE;
|
||||||
|
}
|
||||||
|
|
||||||
auto* i2c_controller = device_get_parent(device);
|
auto* i2c_controller = device_get_parent(device);
|
||||||
if (i2c_controller == nullptr || device_get_type(i2c_controller) != &I2C_CONTROLLER_TYPE) {
|
if (i2c_controller == nullptr || device_get_type(i2c_controller) != &I2C_CONTROLLER_TYPE) {
|
||||||
LOG_E(TAG, "Parent is not an I2C controller");
|
LOG_E(TAG, "Parent is not an I2C controller");
|
||||||
@@ -270,6 +283,8 @@ error_t start_device(Device* device) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
auto* data = new Es8311Data();
|
auto* data = new Es8311Data();
|
||||||
|
data->input_gain = (float) config->input_gain_percent / 100.0f;
|
||||||
|
if (config->input_gain_percent == 0) data->input_gain = 1.0f; // 0 means unset
|
||||||
|
|
||||||
data->ctrl_if = audio_codec_adapter_new_i2c_ctrl(i2c_controller, config->address);
|
data->ctrl_if = audio_codec_adapter_new_i2c_ctrl(i2c_controller, config->address);
|
||||||
data->data_if = audio_codec_adapter_new_i2s_data(i2s_controller);
|
data->data_if = audio_codec_adapter_new_i2s_data(i2s_controller);
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
cmake_minimum_required(VERSION 3.20)
|
||||||
|
|
||||||
|
include("${CMAKE_CURRENT_LIST_DIR}/../../Buildscripts/module.cmake")
|
||||||
|
|
||||||
|
file(GLOB_RECURSE SOURCE_FILES "source/*.c*")
|
||||||
|
|
||||||
|
tactility_add_module(st77922-module
|
||||||
|
SRCS ${SOURCE_FILES}
|
||||||
|
INCLUDE_DIRS include/
|
||||||
|
REQUIRES TactilityKernel platform-esp32 esp_lcd_st77922 driver
|
||||||
|
)
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
description: Touch interface integrated in the Sitronix ST77922 TDDI
|
||||||
|
|
||||||
|
include: ["i2c-device.yaml"]
|
||||||
|
|
||||||
|
compatible: "sitronix,st77922-touch"
|
||||||
|
|
||||||
|
bus: i2c
|
||||||
|
|
||||||
|
properties:
|
||||||
|
x-max:
|
||||||
|
type: int
|
||||||
|
required: true
|
||||||
|
description: Maximum X coordinate
|
||||||
|
y-max:
|
||||||
|
type: int
|
||||||
|
required: true
|
||||||
|
description: Maximum Y coordinate
|
||||||
|
swap-xy:
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
|
description: Swap the X and Y axes
|
||||||
|
mirror-x:
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
|
description: Mirror the X axis
|
||||||
|
mirror-y:
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
|
description: Mirror the Y axis
|
||||||
|
pin-reset:
|
||||||
|
type: phandles
|
||||||
|
default: GPIO_PIN_SPEC_NONE
|
||||||
|
description: Reset GPIO pin
|
||||||
|
pin-interrupt:
|
||||||
|
type: phandles
|
||||||
|
default: GPIO_PIN_SPEC_NONE
|
||||||
|
description: Interrupt GPIO pin
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
description: Sitronix ST77922 QSPI display panel
|
||||||
|
|
||||||
|
compatible: "sitronix,st77922"
|
||||||
|
|
||||||
|
bus: spi
|
||||||
|
|
||||||
|
properties:
|
||||||
|
horizontal-resolution:
|
||||||
|
type: int
|
||||||
|
required: true
|
||||||
|
description: Horizontal resolution in pixels
|
||||||
|
vertical-resolution:
|
||||||
|
type: int
|
||||||
|
required: true
|
||||||
|
description: Vertical resolution in pixels
|
||||||
|
mirror-x:
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
|
description: Mirror the X axis
|
||||||
|
mirror-y:
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
|
description: Mirror the Y axis
|
||||||
|
invert-color:
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
|
description: Invert the panel's color output
|
||||||
|
bgr-order:
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
|
description: Use BGR element order instead of RGB
|
||||||
|
bits-per-pixel:
|
||||||
|
type: int
|
||||||
|
default: 16
|
||||||
|
description: Color depth in bits per pixel
|
||||||
|
pixel-clock-hz:
|
||||||
|
type: int
|
||||||
|
default: 80000000
|
||||||
|
description: QSPI pixel clock frequency in Hz
|
||||||
|
transaction-queue-depth:
|
||||||
|
type: int
|
||||||
|
default: 10
|
||||||
|
description: Size of the internal SPI transaction queue
|
||||||
|
backlight:
|
||||||
|
type: phandle
|
||||||
|
default: "NULL"
|
||||||
|
description: Optional reference to this display's backlight device
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
dependencies:
|
||||||
|
- TactilityKernel
|
||||||
|
bindings: bindings
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <tactility/bindings/bindings.h>
|
||||||
|
#include <drivers/st77922.h>
|
||||||
|
|
||||||
|
DEFINE_DEVICETREE(st77922, struct St77922Config)
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <tactility/bindings/bindings.h>
|
||||||
|
#include <drivers/st77922_touch.h>
|
||||||
|
|
||||||
|
DEFINE_DEVICETREE(st77922_touch, struct St77922TouchConfig)
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
#include <tactility/device.h>
|
||||||
|
|
||||||
|
struct St77922Config {
|
||||||
|
uint16_t horizontal_resolution;
|
||||||
|
uint16_t vertical_resolution;
|
||||||
|
bool mirror_x;
|
||||||
|
bool mirror_y;
|
||||||
|
bool invert_color;
|
||||||
|
bool bgr_order;
|
||||||
|
uint32_t bits_per_pixel;
|
||||||
|
uint32_t pixel_clock_hz;
|
||||||
|
uint8_t transaction_queue_depth;
|
||||||
|
struct Device* backlight;
|
||||||
|
};
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
#include <tactility/drivers/gpio.h>
|
||||||
|
|
||||||
|
struct St77922TouchConfig {
|
||||||
|
uint8_t address;
|
||||||
|
uint16_t x_max;
|
||||||
|
uint16_t y_max;
|
||||||
|
bool swap_xy;
|
||||||
|
bool mirror_x;
|
||||||
|
bool mirror_y;
|
||||||
|
struct GpioPinSpec pin_reset;
|
||||||
|
struct GpioPinSpec pin_interrupt;
|
||||||
|
};
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <tactility/module.h>
|
||||||
|
|
||||||
|
extern Module st77922_module;
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
#include <tactility/driver.h>
|
||||||
|
#include <tactility/module.h>
|
||||||
|
|
||||||
|
extern "C" {
|
||||||
|
|
||||||
|
extern Driver st77922_driver;
|
||||||
|
extern Driver st77922_touch_driver;
|
||||||
|
|
||||||
|
static Driver* const st77922_drivers[] = {
|
||||||
|
&st77922_driver,
|
||||||
|
&st77922_touch_driver,
|
||||||
|
nullptr
|
||||||
|
};
|
||||||
|
|
||||||
|
Module st77922_module = {
|
||||||
|
.name = "st77922",
|
||||||
|
.drivers = st77922_drivers
|
||||||
|
};
|
||||||
|
|
||||||
|
} // extern "C"
|
||||||
@@ -0,0 +1,270 @@
|
|||||||
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
#include <drivers/st77922.h>
|
||||||
|
#include <st77922_module.h>
|
||||||
|
#include "st77922_init.h"
|
||||||
|
|
||||||
|
#include <tactility/check.h>
|
||||||
|
#include <tactility/device.h>
|
||||||
|
#include <tactility/driver.h>
|
||||||
|
#include <tactility/drivers/display.h>
|
||||||
|
#include <tactility/drivers/esp32_spi.h>
|
||||||
|
#include <tactility/drivers/spi_controller.h>
|
||||||
|
#include <tactility/log.h>
|
||||||
|
|
||||||
|
#include <esp_err.h>
|
||||||
|
#include <esp_heap_caps.h>
|
||||||
|
#include <esp_lcd_io_spi.h>
|
||||||
|
#include <esp_lcd_panel_io.h>
|
||||||
|
#include <esp_lcd_panel_ops.h>
|
||||||
|
#include <esp_lcd_st77922.h>
|
||||||
|
#include <freertos/semphr.h>
|
||||||
|
#include <cstdlib>
|
||||||
|
|
||||||
|
#define TAG "ST77922"
|
||||||
|
#define GET_CONFIG(device) (static_cast<const St77922Config*>((device)->config))
|
||||||
|
|
||||||
|
struct St77922Internal {
|
||||||
|
esp_lcd_panel_io_handle_t io_handle;
|
||||||
|
esp_lcd_panel_handle_t panel_handle;
|
||||||
|
SemaphoreHandle_t draw_done;
|
||||||
|
uint8_t* transfer_buffer;
|
||||||
|
size_t transfer_buffer_size;
|
||||||
|
};
|
||||||
|
|
||||||
|
static bool IRAM_ATTR transfer_done(esp_lcd_panel_io_handle_t, esp_lcd_panel_io_event_data_t*, void* context) {
|
||||||
|
auto* internal = static_cast<St77922Internal*>(context);
|
||||||
|
BaseType_t task_woken = pdFALSE;
|
||||||
|
xSemaphoreGiveFromISR(internal->draw_done, &task_woken);
|
||||||
|
return task_woken == pdTRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static error_t start(Device* device) {
|
||||||
|
auto* parent = device_get_parent(device);
|
||||||
|
check(device_get_type(parent) == &SPI_CONTROLLER_TYPE);
|
||||||
|
const auto* spi = static_cast<const Esp32SpiConfig*>(parent->config);
|
||||||
|
const auto* config = GET_CONFIG(device);
|
||||||
|
|
||||||
|
GpioPinSpec cs;
|
||||||
|
if (esp32_spi_get_cs_pin(device, &cs) != ERROR_NONE) {
|
||||||
|
return ERROR_RESOURCE;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto* internal = static_cast<St77922Internal*>(calloc(1, sizeof(St77922Internal)));
|
||||||
|
if (internal == nullptr) {
|
||||||
|
return ERROR_OUT_OF_MEMORY;
|
||||||
|
}
|
||||||
|
internal->draw_done = xSemaphoreCreateBinary();
|
||||||
|
if (internal->draw_done == nullptr) {
|
||||||
|
free(internal);
|
||||||
|
return ERROR_OUT_OF_MEMORY;
|
||||||
|
}
|
||||||
|
// The vendor port renders a complete frame in PSRAM, then copies it through a
|
||||||
|
// 1/10-frame DMA buffer. Besides making full-frame refresh possible, this keeps
|
||||||
|
// the panel's GRAM synchronized when animated objects invalidate old and new
|
||||||
|
// positions in separate LVGL regions.
|
||||||
|
const size_t bytes_per_pixel = config->bits_per_pixel / 8;
|
||||||
|
const size_t rows_per_transfer = config->vertical_resolution > 10
|
||||||
|
? config->vertical_resolution / 10 : config->vertical_resolution;
|
||||||
|
internal->transfer_buffer_size =
|
||||||
|
static_cast<size_t>(config->horizontal_resolution) * rows_per_transfer * bytes_per_pixel;
|
||||||
|
if (spi->max_transfer_size > 0
|
||||||
|
&& internal->transfer_buffer_size > static_cast<size_t>(spi->max_transfer_size)) {
|
||||||
|
internal->transfer_buffer_size = static_cast<size_t>(spi->max_transfer_size);
|
||||||
|
}
|
||||||
|
internal->transfer_buffer = static_cast<uint8_t*>(heap_caps_malloc(
|
||||||
|
internal->transfer_buffer_size, MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT));
|
||||||
|
if (internal->transfer_buffer == nullptr) {
|
||||||
|
vSemaphoreDelete(internal->draw_done);
|
||||||
|
free(internal);
|
||||||
|
return ERROR_OUT_OF_MEMORY;
|
||||||
|
}
|
||||||
|
|
||||||
|
esp_lcd_panel_io_spi_config_t io_config = {
|
||||||
|
.cs_gpio_num = static_cast<int>(cs.pin),
|
||||||
|
.dc_gpio_num = -1,
|
||||||
|
.spi_mode = 0,
|
||||||
|
.pclk_hz = config->pixel_clock_hz,
|
||||||
|
.trans_queue_depth = config->transaction_queue_depth,
|
||||||
|
.on_color_trans_done = transfer_done,
|
||||||
|
.user_ctx = internal,
|
||||||
|
.lcd_cmd_bits = 32,
|
||||||
|
.lcd_param_bits = 8,
|
||||||
|
.cs_ena_pretrans = 0,
|
||||||
|
.cs_ena_posttrans = 0,
|
||||||
|
.flags = {
|
||||||
|
.dc_high_on_cmd = 0,
|
||||||
|
.dc_low_on_data = 0,
|
||||||
|
.dc_low_on_param = 0,
|
||||||
|
.octal_mode = 0,
|
||||||
|
.quad_mode = 1,
|
||||||
|
.sio_mode = 0,
|
||||||
|
.lsb_first = 0,
|
||||||
|
.cs_high_active = 0,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
esp_err_t result = esp_lcd_new_panel_io_spi(
|
||||||
|
static_cast<esp_lcd_spi_bus_handle_t>(spi->host), &io_config, &internal->io_handle);
|
||||||
|
if (result != ESP_OK) {
|
||||||
|
LOG_E(TAG, "Failed to create panel IO: %s", esp_err_to_name(result));
|
||||||
|
heap_caps_free(internal->transfer_buffer);
|
||||||
|
vSemaphoreDelete(internal->draw_done);
|
||||||
|
free(internal);
|
||||||
|
return ERROR_RESOURCE;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t init_count = 0;
|
||||||
|
st77922_vendor_config_t vendor = {
|
||||||
|
.init_cmds = st77922_board_init_commands(&init_count),
|
||||||
|
.init_cmds_size = static_cast<uint16_t>(init_count),
|
||||||
|
.flags = { .use_qspi_interface = 1 },
|
||||||
|
};
|
||||||
|
esp_lcd_panel_dev_config_t panel_config = {
|
||||||
|
.reset_gpio_num = -1,
|
||||||
|
.rgb_ele_order = config->bgr_order ? LCD_RGB_ELEMENT_ORDER_BGR : LCD_RGB_ELEMENT_ORDER_RGB,
|
||||||
|
.data_endian = LCD_RGB_DATA_ENDIAN_LITTLE,
|
||||||
|
.bits_per_pixel = config->bits_per_pixel,
|
||||||
|
.flags = { .reset_active_high = false },
|
||||||
|
.vendor_config = &vendor,
|
||||||
|
};
|
||||||
|
result = esp_lcd_new_panel_st77922(internal->io_handle, &panel_config, &internal->panel_handle);
|
||||||
|
bool ok = result == ESP_OK;
|
||||||
|
ok = ok && esp_lcd_panel_reset(internal->panel_handle) == ESP_OK;
|
||||||
|
ok = ok && esp_lcd_panel_init(internal->panel_handle) == ESP_OK;
|
||||||
|
ok = ok && ((!config->mirror_x && !config->mirror_y)
|
||||||
|
|| esp_lcd_panel_mirror(internal->panel_handle, config->mirror_x, config->mirror_y) == ESP_OK);
|
||||||
|
ok = ok && (!config->invert_color || esp_lcd_panel_invert_color(internal->panel_handle, true) == ESP_OK);
|
||||||
|
ok = ok && esp_lcd_panel_disp_on_off(internal->panel_handle, true) == ESP_OK;
|
||||||
|
if (!ok) {
|
||||||
|
LOG_E(TAG, "Failed to bring up panel: %s", esp_err_to_name(result));
|
||||||
|
if (internal->panel_handle != nullptr) esp_lcd_panel_del(internal->panel_handle);
|
||||||
|
esp_lcd_panel_io_del(internal->io_handle);
|
||||||
|
heap_caps_free(internal->transfer_buffer);
|
||||||
|
vSemaphoreDelete(internal->draw_done);
|
||||||
|
free(internal);
|
||||||
|
return ERROR_RESOURCE;
|
||||||
|
}
|
||||||
|
device_set_driver_data(device, internal);
|
||||||
|
return ERROR_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static error_t stop(Device* device) {
|
||||||
|
auto* internal = static_cast<St77922Internal*>(device_get_driver_data(device));
|
||||||
|
if (esp_lcd_panel_del(internal->panel_handle) != ESP_OK
|
||||||
|
|| esp_lcd_panel_io_del(internal->io_handle) != ESP_OK) {
|
||||||
|
return ERROR_RESOURCE;
|
||||||
|
}
|
||||||
|
heap_caps_free(internal->transfer_buffer);
|
||||||
|
vSemaphoreDelete(internal->draw_done);
|
||||||
|
free(internal);
|
||||||
|
device_set_driver_data(device, nullptr);
|
||||||
|
return ERROR_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static error_t reset(Device* device) {
|
||||||
|
auto* data = static_cast<St77922Internal*>(device_get_driver_data(device));
|
||||||
|
return esp_lcd_panel_reset(data->panel_handle) == ESP_OK ? ERROR_NONE : ERROR_RESOURCE;
|
||||||
|
}
|
||||||
|
static error_t init(Device* device) {
|
||||||
|
auto* data = static_cast<St77922Internal*>(device_get_driver_data(device));
|
||||||
|
return esp_lcd_panel_init(data->panel_handle) == ESP_OK ? ERROR_NONE : ERROR_RESOURCE;
|
||||||
|
}
|
||||||
|
static error_t draw_bitmap(Device* device, int32_t xs, int32_t ys, int32_t xe, int32_t ye, const void* pixels) {
|
||||||
|
auto* data = static_cast<St77922Internal*>(device_get_driver_data(device));
|
||||||
|
const auto* config = GET_CONFIG(device);
|
||||||
|
const size_t row_bytes = static_cast<size_t>(xe - xs) * config->bits_per_pixel / 8;
|
||||||
|
if (row_bytes == 0 || row_bytes > data->transfer_buffer_size) {
|
||||||
|
return ERROR_OUT_OF_RANGE;
|
||||||
|
}
|
||||||
|
|
||||||
|
const size_t rows_per_transfer = data->transfer_buffer_size / row_bytes;
|
||||||
|
const auto* source = static_cast<const uint8_t*>(pixels);
|
||||||
|
int32_t chunk_y = ys;
|
||||||
|
while (chunk_y < ye) {
|
||||||
|
const size_t remaining_rows = static_cast<size_t>(ye - chunk_y);
|
||||||
|
const size_t chunk_rows = remaining_rows < rows_per_transfer ? remaining_rows : rows_per_transfer;
|
||||||
|
const size_t chunk_bytes = chunk_rows * row_bytes;
|
||||||
|
memcpy(data->transfer_buffer, source, chunk_bytes);
|
||||||
|
|
||||||
|
xSemaphoreTake(data->draw_done, 0);
|
||||||
|
if (esp_lcd_panel_draw_bitmap(
|
||||||
|
data->panel_handle, xs, chunk_y, xe, chunk_y + static_cast<int32_t>(chunk_rows),
|
||||||
|
data->transfer_buffer) != ESP_OK) {
|
||||||
|
LOG_E(TAG, "Failed to queue color transfer at y=%ld", static_cast<long>(chunk_y));
|
||||||
|
return ERROR_RESOURCE;
|
||||||
|
}
|
||||||
|
if (xSemaphoreTake(data->draw_done, pdMS_TO_TICKS(1000)) != pdTRUE) {
|
||||||
|
LOG_E(TAG, "Timed out waiting for color transfer at y=%ld", static_cast<long>(chunk_y));
|
||||||
|
return ERROR_TIMEOUT;
|
||||||
|
}
|
||||||
|
|
||||||
|
source += chunk_bytes;
|
||||||
|
chunk_y += static_cast<int32_t>(chunk_rows);
|
||||||
|
}
|
||||||
|
return ERROR_NONE;
|
||||||
|
}
|
||||||
|
static error_t mirror(Device* device, bool x, bool y) {
|
||||||
|
auto* data = static_cast<St77922Internal*>(device_get_driver_data(device));
|
||||||
|
return esp_lcd_panel_mirror(data->panel_handle, x, y) == ESP_OK ? ERROR_NONE : ERROR_RESOURCE;
|
||||||
|
}
|
||||||
|
static bool get_mirror_x(Device* device) { return GET_CONFIG(device)->mirror_x; }
|
||||||
|
static bool get_mirror_y(Device* device) { return GET_CONFIG(device)->mirror_y; }
|
||||||
|
static error_t invert(Device* device, bool value) {
|
||||||
|
auto* data = static_cast<St77922Internal*>(device_get_driver_data(device));
|
||||||
|
return esp_lcd_panel_invert_color(data->panel_handle, value) == ESP_OK ? ERROR_NONE : ERROR_RESOURCE;
|
||||||
|
}
|
||||||
|
static error_t on_off(Device* device, bool value) {
|
||||||
|
auto* data = static_cast<St77922Internal*>(device_get_driver_data(device));
|
||||||
|
return esp_lcd_panel_disp_on_off(data->panel_handle, value) == ESP_OK ? ERROR_NONE : ERROR_RESOURCE;
|
||||||
|
}
|
||||||
|
static error_t sleep(Device* device, bool value) {
|
||||||
|
auto* data = static_cast<St77922Internal*>(device_get_driver_data(device));
|
||||||
|
return esp_lcd_panel_disp_sleep(data->panel_handle, value) == ESP_OK ? ERROR_NONE : ERROR_RESOURCE;
|
||||||
|
}
|
||||||
|
static DisplayColorFormat color_format(Device*) { return DISPLAY_COLOR_FORMAT_RGB565_SWAPPED; }
|
||||||
|
static uint16_t resolution_x(Device* device) { return GET_CONFIG(device)->horizontal_resolution; }
|
||||||
|
static uint16_t resolution_y(Device* device) { return GET_CONFIG(device)->vertical_resolution; }
|
||||||
|
static void frame_buffer(Device*, uint8_t, void** output) { *output = nullptr; }
|
||||||
|
static uint8_t frame_buffer_count(Device*) { return 0; }
|
||||||
|
static error_t backlight(Device* device, Device** output) {
|
||||||
|
*output = GET_CONFIG(device)->backlight;
|
||||||
|
return *output == nullptr ? ERROR_NOT_SUPPORTED : ERROR_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static const DisplayApi display_api = {
|
||||||
|
.capabilities = DISPLAY_CAPABILITY_CAP_MIRROR | DISPLAY_CAPABILITY_INVERT_COLOR |
|
||||||
|
DISPLAY_CAPABILITY_ON_OFF | DISPLAY_CAPABILITY_SLEEP | DISPLAY_CAPABILITY_BACKLIGHT |
|
||||||
|
DISPLAY_CAPABILITY_REQUIRES_FULL_FRAME,
|
||||||
|
.reset = reset,
|
||||||
|
.init = init,
|
||||||
|
.draw_bitmap = draw_bitmap,
|
||||||
|
.mirror = mirror,
|
||||||
|
.swap_xy = nullptr,
|
||||||
|
.get_swap_xy = nullptr,
|
||||||
|
.get_mirror_x = get_mirror_x,
|
||||||
|
.get_mirror_y = get_mirror_y,
|
||||||
|
.set_gap = nullptr,
|
||||||
|
.get_gap_x = nullptr,
|
||||||
|
.get_gap_y = nullptr,
|
||||||
|
.invert_color = invert,
|
||||||
|
.disp_on_off = on_off,
|
||||||
|
.disp_sleep = sleep,
|
||||||
|
.get_color_format = color_format,
|
||||||
|
.get_resolution_x = resolution_x,
|
||||||
|
.get_resolution_y = resolution_y,
|
||||||
|
.get_frame_buffer = frame_buffer,
|
||||||
|
.get_frame_buffer_count = frame_buffer_count,
|
||||||
|
.get_backlight = backlight,
|
||||||
|
.has_capability = nullptr,
|
||||||
|
};
|
||||||
|
|
||||||
|
Driver st77922_driver = {
|
||||||
|
.name = "st77922",
|
||||||
|
.compatible = (const char*[]) { "sitronix,st77922", nullptr },
|
||||||
|
.start_device = start,
|
||||||
|
.stop_device = stop,
|
||||||
|
.api = &display_api,
|
||||||
|
.device_type = &DISPLAY_TYPE,
|
||||||
|
.owner = &st77922_module,
|
||||||
|
.internal = nullptr
|
||||||
|
};
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
#include "st77922_init.h"
|
||||||
|
|
||||||
|
// Initialization sequence supplied with the LCDWIKI/Hosyond ES3C35P vendor ESP-IDF demo.
|
||||||
|
static const st77922_lcd_init_cmd_t init_commands[] = {
|
||||||
|
{0xF1, (uint8_t []){0x00}, 1, 0},
|
||||||
|
{0x60, (uint8_t []){0x00, 0x00, 0x00}, 3, 0},
|
||||||
|
{0x65, (uint8_t []){0x80}, 1, 0},
|
||||||
|
{0x79, (uint8_t []){0x06}, 1, 0},
|
||||||
|
{0x7B, (uint8_t []){0x00, 0x08, 0x08}, 3, 0},
|
||||||
|
{0x80, (uint8_t []){0x55, 0x62, 0x2F, 0x17, 0xF0, 0x52, 0x70, 0xD2, 0x52, 0x62, 0xEA}, 11, 0},
|
||||||
|
{0x81, (uint8_t []){0x26, 0x52, 0x72, 0x27}, 4, 0},
|
||||||
|
{0x84, (uint8_t []){0x92, 0x25}, 2, 0},
|
||||||
|
{0x87, (uint8_t []){0x10, 0x10, 0x58, 0x00, 0x02, 0x3A}, 6, 0},
|
||||||
|
{0x88, (uint8_t []){0x00, 0x00, 0x2C, 0x10, 0x04, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x06}, 15, 0},
|
||||||
|
{0x89, (uint8_t []){0x00, 0x00, 0x00}, 3, 0},
|
||||||
|
{0x8A, (uint8_t []){0x13, 0x00, 0x2C, 0x00, 0x00, 0x2C, 0x10, 0x10, 0x00, 0x3E, 0x19}, 11, 0},
|
||||||
|
{0x8B, (uint8_t []){0x15, 0xB1, 0xB1, 0x44, 0x96, 0x2C, 0x10, 0x97, 0x8E}, 9, 0},
|
||||||
|
{0x8C, (uint8_t []){0x1D, 0xB1, 0xB1, 0x44, 0x96, 0x2C, 0x10, 0x50, 0x0F, 0x01, 0xC5, 0x12, 0x09}, 13, 0},
|
||||||
|
{0x8D, (uint8_t []){0x0C}, 1, 0},
|
||||||
|
{0x8E, (uint8_t []){0x33, 0x01, 0x0C, 0x13, 0x01, 0x01}, 6, 0},
|
||||||
|
{0xB3, (uint8_t []){0x00, 0x30}, 2, 0},
|
||||||
|
{0xF1, (uint8_t []){0x00}, 1, 0},
|
||||||
|
{0x71, (uint8_t []){0xD0}, 1, 0},
|
||||||
|
{0x66, (uint8_t []){0x02, 0x3F}, 2, 0},
|
||||||
|
{0xBE, (uint8_t []){0x26, 0x00, 0x9D}, 3, 0},
|
||||||
|
{0x70, (uint8_t []){0x01, 0xA0, 0x11, 0x40, 0xE0, 0x00, 0x11, 0x69, 0x11, 0x00, 0x00, 0x1A}, 12, 0},
|
||||||
|
{0x90, (uint8_t []){0x04, 0x04, 0x55, 0x74, 0x00, 0x40, 0x43, 0x27, 0x27}, 9, 0},
|
||||||
|
{0x91, (uint8_t []){0x04, 0x04, 0x55, 0x75, 0x00, 0x40, 0x42, 0x27, 0x27}, 9, 0},
|
||||||
|
{0x92, (uint8_t []){0x04, 0x44, 0x55, 0xC0, 0x06, 0x00, 0x07, 0x05, 0x90, 0x27}, 10, 0},
|
||||||
|
{0x93, (uint8_t []){0x04, 0x43, 0x11, 0x00, 0x00, 0x00, 0x00, 0x05, 0x90, 0x27}, 10, 0},
|
||||||
|
{0x94, (uint8_t []){0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 6, 0},
|
||||||
|
{0x95, (uint8_t []){0x96, 0x16, 0x00, 0x00, 0xFF}, 5, 0},
|
||||||
|
{0x96, (uint8_t []){0x44, 0x53, 0x03, 0x12, 0x23, 0x24, 0x06, 0x05, 0x94, 0x27, 0x00, 0x44}, 12, 0},
|
||||||
|
{0x97, (uint8_t []){0x44, 0x53, 0x47, 0x56, 0x20, 0x20, 0x02, 0x01, 0x94, 0x27, 0x00, 0x44}, 12, 0},
|
||||||
|
{0xBA, (uint8_t []){0x55, 0x94, 0x2D, 0x94, 0x27}, 5, 0},
|
||||||
|
{0x9A, (uint8_t []){0x40, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00}, 7, 0},
|
||||||
|
{0x9B, (uint8_t []){0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00}, 7, 0},
|
||||||
|
{0x9C, (uint8_t []){0x5C, 0x12, 0x00, 0x00, 0x10, 0x12, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 0x00}, 13, 0},
|
||||||
|
{0x9D, (uint8_t []){0x8A, 0x51, 0x00, 0x00, 0x00, 0x80, 0x1E, 0x01}, 8, 0},
|
||||||
|
{0x9E, (uint8_t []){0x51, 0x00, 0x00, 0x00, 0x80, 0x1E, 0x01}, 7, 0},
|
||||||
|
{0xB4, (uint8_t []){0x1D, 0x1C, 0x1E, 0x0B, 0x14, 0x02, 0x13, 0x09, 0x1E, 0x00, 0x1E, 0x10}, 12, 0},
|
||||||
|
{0xB5, (uint8_t []){0x1D, 0x1C, 0x1E, 0x0A, 0x15, 0x03, 0x11, 0x08, 0x1E, 0x01, 0x1E, 0x12}, 12, 0},
|
||||||
|
{0xB6, (uint8_t []){0x77, 0x77, 0x00, 0x0A, 0xFF, 0x0A, 0xFF}, 7, 0},
|
||||||
|
{0x86, (uint8_t []){0xCD, 0x04, 0xB1, 0x02, 0x58, 0x12, 0x58, 0x0C, 0x13, 0x01, 0xA5, 0x00, 0xA5, 0xA5}, 14, 0},
|
||||||
|
{0xB7, (uint8_t []){0x07, 0x0A, 0x0E, 0x06, 0x05, 0x03, 0x2B, 0x03, 0x03, 0x42, 0x07, 0x10, 0x10, 0x2E, 0x3F, 0x0D}, 16, 0},
|
||||||
|
{0xB8, (uint8_t []){0x07, 0x0A, 0x0D, 0x05, 0x05, 0x02, 0x2B, 0x02, 0x03, 0x42, 0x06, 0x10, 0x0F, 0x2E, 0x3F, 0x0D}, 16, 0},
|
||||||
|
{0xB9, (uint8_t []){0x23, 0x23}, 2, 0},
|
||||||
|
{0xBF, (uint8_t []){0x10, 0x14, 0x14, 0x0B, 0x0B, 0x0B}, 6, 0},
|
||||||
|
{0xF2, (uint8_t []){0x00}, 1, 0},
|
||||||
|
{0x73, (uint8_t []){0x04, 0xDA, 0x12, 0x54, 0x47}, 5, 0},
|
||||||
|
{0x77, (uint8_t []){0x6B, 0x5B, 0xFD, 0xC3, 0xC5}, 5, 0},
|
||||||
|
{0x7A, (uint8_t []){0x15, 0x27}, 2, 0},
|
||||||
|
{0x7B, (uint8_t []){0x04, 0x57}, 2, 0},
|
||||||
|
{0x7E, (uint8_t []){0x01, 0x0E}, 2, 0},
|
||||||
|
{0xBF, (uint8_t []){0x36}, 1, 0},
|
||||||
|
{0xE3, (uint8_t []){0x40, 0x40}, 2, 0},
|
||||||
|
{0xF0, (uint8_t []){0x00}, 1, 0},
|
||||||
|
{0xD0, (uint8_t []){0x00}, 1, 0},
|
||||||
|
{0x2A, (uint8_t []){0x00, 0x00, 0x01, 0x3F}, 4, 0},
|
||||||
|
{0x2B, (uint8_t []){0x00, 0x00, 0x01, 0xDF}, 4, 0},
|
||||||
|
{0x21, NULL, 0, 0},
|
||||||
|
{0x11, NULL, 0, 120},
|
||||||
|
{0x29, NULL, 0, 0},
|
||||||
|
{0x2C, NULL, 0, 0},
|
||||||
|
{0x3A, (uint8_t []){0x01}, 1, 0},
|
||||||
|
{0x36, (uint8_t []){0x00}, 1, 0},
|
||||||
|
{0x35, (uint8_t []){0x01}, 1, 20},
|
||||||
|
};
|
||||||
|
|
||||||
|
const st77922_lcd_init_cmd_t* st77922_board_init_commands(size_t* count) {
|
||||||
|
*count = sizeof(init_commands) / sizeof(init_commands[0]);
|
||||||
|
return init_commands;
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <stddef.h>
|
||||||
|
#include <esp_lcd_st77922.h>
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
const st77922_lcd_init_cmd_t* st77922_board_init_commands(size_t* count);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
@@ -0,0 +1,207 @@
|
|||||||
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
#include <drivers/st77922_touch.h>
|
||||||
|
#include <st77922_module.h>
|
||||||
|
|
||||||
|
#include <tactility/check.h>
|
||||||
|
#include <tactility/device.h>
|
||||||
|
#include <tactility/driver.h>
|
||||||
|
#include <tactility/drivers/gpio_controller.h>
|
||||||
|
#include <tactility/drivers/i2c_controller.h>
|
||||||
|
#include <tactility/drivers/pointer.h>
|
||||||
|
#include <tactility/log.h>
|
||||||
|
|
||||||
|
#include <freertos/task.h>
|
||||||
|
#include <algorithm>
|
||||||
|
#include <cstdlib>
|
||||||
|
|
||||||
|
#define TAG "ST77922 touch"
|
||||||
|
#define GET_CONFIG(device) (static_cast<const St77922TouchConfig*>((device)->config))
|
||||||
|
|
||||||
|
static constexpr uint16_t REG_MAX_TOUCHES = 0x0009;
|
||||||
|
static constexpr uint16_t REG_TOUCH_INFO = 0x0010;
|
||||||
|
static constexpr uint16_t REG_TOUCH_POINT0 = 0x0014;
|
||||||
|
static constexpr uint8_t MAX_POINTS = 10;
|
||||||
|
static constexpr TickType_t TIMEOUT = pdMS_TO_TICKS(1000);
|
||||||
|
|
||||||
|
struct TouchPoint {
|
||||||
|
uint16_t x;
|
||||||
|
uint16_t y;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct St77922TouchInternal {
|
||||||
|
Device* i2c;
|
||||||
|
GpioDescriptor* reset;
|
||||||
|
uint8_t supported_points;
|
||||||
|
uint8_t point_count;
|
||||||
|
TouchPoint points[MAX_POINTS];
|
||||||
|
bool swap_xy;
|
||||||
|
bool mirror_x;
|
||||||
|
bool mirror_y;
|
||||||
|
};
|
||||||
|
|
||||||
|
static error_t read_register(Device* i2c, uint16_t reg, uint8_t* data, size_t size, TickType_t timeout) {
|
||||||
|
const uint8_t address[] = {
|
||||||
|
static_cast<uint8_t>(reg >> 8),
|
||||||
|
static_cast<uint8_t>(reg & 0xFF),
|
||||||
|
};
|
||||||
|
return i2c_controller_write_read(i2c, 0x55, address, sizeof(address), data, size, timeout);
|
||||||
|
}
|
||||||
|
|
||||||
|
static error_t start(Device* device) {
|
||||||
|
auto* parent = device_get_parent(device);
|
||||||
|
check(device_get_type(parent) == &I2C_CONTROLLER_TYPE);
|
||||||
|
const auto* config = GET_CONFIG(device);
|
||||||
|
|
||||||
|
auto* internal = static_cast<St77922TouchInternal*>(calloc(1, sizeof(St77922TouchInternal)));
|
||||||
|
if (internal == nullptr) {
|
||||||
|
return ERROR_OUT_OF_MEMORY;
|
||||||
|
}
|
||||||
|
internal->i2c = parent;
|
||||||
|
internal->supported_points = 1;
|
||||||
|
internal->swap_xy = config->swap_xy;
|
||||||
|
internal->mirror_x = config->mirror_x;
|
||||||
|
internal->mirror_y = config->mirror_y;
|
||||||
|
|
||||||
|
if (config->pin_reset.gpio_controller != nullptr) {
|
||||||
|
internal->reset = gpio_descriptor_acquire(config->pin_reset.gpio_controller,
|
||||||
|
config->pin_reset.pin, GPIO_FLAG_DIRECTION_OUTPUT | GPIO_FLAG_ACTIVE_LOW, GPIO_OWNER_GPIO);
|
||||||
|
if (internal->reset == nullptr) {
|
||||||
|
free(internal);
|
||||||
|
return ERROR_RESOURCE;
|
||||||
|
}
|
||||||
|
if (gpio_descriptor_set_level(internal->reset, true) != ERROR_NONE) {
|
||||||
|
gpio_descriptor_release(internal->reset);
|
||||||
|
free(internal);
|
||||||
|
return ERROR_RESOURCE;
|
||||||
|
}
|
||||||
|
vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
|
gpio_descriptor_set_level(internal->reset, false);
|
||||||
|
vTaskDelay(pdMS_TO_TICKS(100));
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t supported = 0;
|
||||||
|
if (read_register(parent, REG_MAX_TOUCHES, &supported, 1, TIMEOUT) == ERROR_NONE
|
||||||
|
&& supported > 0 && supported <= MAX_POINTS) {
|
||||||
|
internal->supported_points = supported;
|
||||||
|
}
|
||||||
|
LOG_I(TAG, "Controller reports %u touch points", internal->supported_points);
|
||||||
|
device_set_driver_data(device, internal);
|
||||||
|
return ERROR_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static error_t stop(Device* device) {
|
||||||
|
auto* internal = static_cast<St77922TouchInternal*>(device_get_driver_data(device));
|
||||||
|
if (internal->reset != nullptr) {
|
||||||
|
gpio_descriptor_release(internal->reset);
|
||||||
|
}
|
||||||
|
free(internal);
|
||||||
|
device_set_driver_data(device, nullptr);
|
||||||
|
return ERROR_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static error_t enter_sleep(Device*) { return ERROR_NOT_SUPPORTED; }
|
||||||
|
static error_t exit_sleep(Device*) { return ERROR_NOT_SUPPORTED; }
|
||||||
|
|
||||||
|
static error_t read_data(Device* device, TickType_t timeout) {
|
||||||
|
auto* internal = static_cast<St77922TouchInternal*>(device_get_driver_data(device));
|
||||||
|
uint8_t touch_info = 0;
|
||||||
|
if (read_register(internal->i2c, REG_TOUCH_INFO, &touch_info, 1, timeout) != ERROR_NONE) {
|
||||||
|
internal->point_count = 0;
|
||||||
|
return ERROR_RESOURCE;
|
||||||
|
}
|
||||||
|
if ((touch_info & 0x08) == 0) {
|
||||||
|
internal->point_count = 0;
|
||||||
|
return ERROR_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t data[7 * MAX_POINTS] = {};
|
||||||
|
const size_t read_size = 7 * internal->supported_points;
|
||||||
|
if (read_register(internal->i2c, REG_TOUCH_POINT0, data, read_size, timeout) != ERROR_NONE) {
|
||||||
|
internal->point_count = 0;
|
||||||
|
return ERROR_RESOURCE;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal->point_count = 0;
|
||||||
|
for (uint8_t index = 0; index < internal->supported_points; index++) {
|
||||||
|
const uint8_t offset = index * 7;
|
||||||
|
if ((data[offset] & 0x80) == 0) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
internal->points[internal->point_count++] = {
|
||||||
|
.x = static_cast<uint16_t>(((data[offset] & 0x3F) << 8) | data[offset + 1]),
|
||||||
|
.y = static_cast<uint16_t>(((data[offset + 2] & 0x3F) << 8) | data[offset + 3]),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return ERROR_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool get_touched_points(Device* device, uint16_t* x, uint16_t* y, uint16_t* strength,
|
||||||
|
uint8_t* count, uint8_t maximum) {
|
||||||
|
auto* internal = static_cast<St77922TouchInternal*>(device_get_driver_data(device));
|
||||||
|
const auto* config = GET_CONFIG(device);
|
||||||
|
*count = std::min(internal->point_count, maximum);
|
||||||
|
for (uint8_t index = 0; index < *count; index++) {
|
||||||
|
uint16_t point_x = internal->points[index].x;
|
||||||
|
uint16_t point_y = internal->points[index].y;
|
||||||
|
if (internal->swap_xy) {
|
||||||
|
std::swap(point_x, point_y);
|
||||||
|
}
|
||||||
|
const uint16_t max_x = internal->swap_xy ? config->y_max : config->x_max;
|
||||||
|
const uint16_t max_y = internal->swap_xy ? config->x_max : config->y_max;
|
||||||
|
x[index] = internal->mirror_x ? max_x - point_x : point_x;
|
||||||
|
y[index] = internal->mirror_y ? max_y - point_y : point_y;
|
||||||
|
if (strength != nullptr) {
|
||||||
|
strength[index] = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return *count > 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static error_t set_swap_xy(Device* device, bool value) {
|
||||||
|
static_cast<St77922TouchInternal*>(device_get_driver_data(device))->swap_xy = value;
|
||||||
|
return ERROR_NONE;
|
||||||
|
}
|
||||||
|
static error_t get_swap_xy(Device* device, bool* value) {
|
||||||
|
*value = static_cast<St77922TouchInternal*>(device_get_driver_data(device))->swap_xy;
|
||||||
|
return ERROR_NONE;
|
||||||
|
}
|
||||||
|
static error_t set_mirror_x(Device* device, bool value) {
|
||||||
|
static_cast<St77922TouchInternal*>(device_get_driver_data(device))->mirror_x = value;
|
||||||
|
return ERROR_NONE;
|
||||||
|
}
|
||||||
|
static error_t get_mirror_x(Device* device, bool* value) {
|
||||||
|
*value = static_cast<St77922TouchInternal*>(device_get_driver_data(device))->mirror_x;
|
||||||
|
return ERROR_NONE;
|
||||||
|
}
|
||||||
|
static error_t set_mirror_y(Device* device, bool value) {
|
||||||
|
static_cast<St77922TouchInternal*>(device_get_driver_data(device))->mirror_y = value;
|
||||||
|
return ERROR_NONE;
|
||||||
|
}
|
||||||
|
static error_t get_mirror_y(Device* device, bool* value) {
|
||||||
|
*value = static_cast<St77922TouchInternal*>(device_get_driver_data(device))->mirror_y;
|
||||||
|
return ERROR_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static const PointerApi pointer_api = {
|
||||||
|
.enter_sleep = enter_sleep,
|
||||||
|
.exit_sleep = exit_sleep,
|
||||||
|
.read_data = read_data,
|
||||||
|
.get_touched_points = get_touched_points,
|
||||||
|
.set_swap_xy = set_swap_xy,
|
||||||
|
.get_swap_xy = get_swap_xy,
|
||||||
|
.set_mirror_x = set_mirror_x,
|
||||||
|
.get_mirror_x = get_mirror_x,
|
||||||
|
.set_mirror_y = set_mirror_y,
|
||||||
|
.get_mirror_y = get_mirror_y,
|
||||||
|
};
|
||||||
|
|
||||||
|
Driver st77922_touch_driver = {
|
||||||
|
.name = "st77922-touch",
|
||||||
|
.compatible = (const char*[]) { "sitronix,st77922-touch", nullptr },
|
||||||
|
.start_device = start,
|
||||||
|
.stop_device = stop,
|
||||||
|
.api = &pointer_api,
|
||||||
|
.device_type = &POINTER_TYPE,
|
||||||
|
.owner = &st77922_module,
|
||||||
|
.internal = nullptr
|
||||||
|
};
|
||||||
@@ -32,8 +32,10 @@ constexpr size_t APP_INSTANCE_ID_THREAD_SLOT_INDEX = 1;
|
|||||||
// Matches TactilityKernel's Thread wrapper's THREAD_PRIORITY_NORMAL.
|
// Matches TactilityKernel's Thread wrapper's THREAD_PRIORITY_NORMAL.
|
||||||
constexpr UBaseType_t APP_TASK_PRIORITY = 4;
|
constexpr UBaseType_t APP_TASK_PRIORITY = 4;
|
||||||
|
|
||||||
// Used when an app's manifest doesn't request a specific stack depth (0). 8192 bytes' worth.
|
// Used when an app's manifest doesn't request a specific stack depth (0). 12288 bytes' worth.
|
||||||
constexpr size_t APP_DEFAULT_STACK_DEPTH = 8192 / sizeof(StackType_t);
|
// Existing window-manager app manifests request at least 2400 words (9600 bytes); use a
|
||||||
|
// conservative default above that baseline so a zero-depth app task cannot exhaust its stack.
|
||||||
|
constexpr size_t APP_DEFAULT_STACK_DEPTH = 12288 / sizeof(StackType_t);
|
||||||
|
|
||||||
// Task control blocks must stay in internal RAM; only the stack itself may live in external memory.
|
// Task control blocks must stay in internal RAM; only the stack itself may live in external memory.
|
||||||
constexpr MemoryPolicy APP_TASK_TCB_POLICY = { MEMORY_CAPABILITY_INTERNAL, 0, 0 };
|
constexpr MemoryPolicy APP_TASK_TCB_POLICY = { MEMORY_CAPABILITY_INTERNAL, 0, 0 };
|
||||||
|
|||||||
@@ -14,6 +14,15 @@ enum LvglFontSize {
|
|||||||
FONT_SIZE_LARGE,
|
FONT_SIZE_LARGE,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum LvglFontScale {
|
||||||
|
FONT_SCALE_SMALL,
|
||||||
|
FONT_SCALE_DEFAULT,
|
||||||
|
FONT_SCALE_LARGE,
|
||||||
|
};
|
||||||
|
|
||||||
|
void lvgl_set_text_font_scale(enum LvglFontScale font_scale);
|
||||||
|
enum LvglFontScale lvgl_get_text_font_scale(void);
|
||||||
|
|
||||||
const lv_font_t* lvgl_get_shared_icon_font(void);
|
const lv_font_t* lvgl_get_shared_icon_font(void);
|
||||||
uint32_t lvgl_get_shared_icon_font_height(void);
|
uint32_t lvgl_get_shared_icon_font_height(void);
|
||||||
|
|
||||||
|
|||||||
@@ -13,8 +13,30 @@ extern const lv_font_t TT_LVGL_LAUNCHER_FONT_ICON_SYMBOL;
|
|||||||
extern const lv_font_t TT_LVGL_STATUSBAR_FONT_ICON_SYMBOL;
|
extern const lv_font_t TT_LVGL_STATUSBAR_FONT_ICON_SYMBOL;
|
||||||
extern const lv_font_t TT_LVGL_SHARED_FONT_ICON_SYMBOL;
|
extern const lv_font_t TT_LVGL_SHARED_FONT_ICON_SYMBOL;
|
||||||
|
|
||||||
|
static enum LvglFontScale text_font_scale = FONT_SCALE_DEFAULT;
|
||||||
|
|
||||||
|
void lvgl_set_text_font_scale(enum LvglFontScale font_scale) {
|
||||||
|
check(font_scale >= FONT_SCALE_SMALL && font_scale <= FONT_SCALE_LARGE);
|
||||||
|
text_font_scale = font_scale;
|
||||||
|
}
|
||||||
|
|
||||||
|
enum LvglFontScale lvgl_get_text_font_scale(void) {
|
||||||
|
return text_font_scale;
|
||||||
|
}
|
||||||
|
|
||||||
|
static enum LvglFontSize resolve_text_font_size(enum LvglFontSize font_size) {
|
||||||
|
int resolved = (int)font_size + (int)text_font_scale - (int)FONT_SCALE_DEFAULT;
|
||||||
|
if (resolved < FONT_SIZE_SMALL) {
|
||||||
|
return FONT_SIZE_SMALL;
|
||||||
|
}
|
||||||
|
if (resolved > FONT_SIZE_LARGE) {
|
||||||
|
return FONT_SIZE_LARGE;
|
||||||
|
}
|
||||||
|
return (enum LvglFontSize)resolved;
|
||||||
|
}
|
||||||
|
|
||||||
uint32_t lvgl_get_text_font_height(enum LvglFontSize font_size) {
|
uint32_t lvgl_get_text_font_height(enum LvglFontSize font_size) {
|
||||||
switch (font_size) {
|
switch (resolve_text_font_size(font_size)) {
|
||||||
case FONT_SIZE_SMALL: return TT_LVGL_TEXT_FONT_SMALL_SIZE;
|
case FONT_SIZE_SMALL: return TT_LVGL_TEXT_FONT_SMALL_SIZE;
|
||||||
case FONT_SIZE_DEFAULT: return TT_LVGL_TEXT_FONT_DEFAULT_SIZE;
|
case FONT_SIZE_DEFAULT: return TT_LVGL_TEXT_FONT_DEFAULT_SIZE;
|
||||||
case FONT_SIZE_LARGE: return TT_LVGL_TEXT_FONT_LARGE_SIZE;
|
case FONT_SIZE_LARGE: return TT_LVGL_TEXT_FONT_LARGE_SIZE;
|
||||||
@@ -22,7 +44,7 @@ uint32_t lvgl_get_text_font_height(enum LvglFontSize font_size) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
const lv_font_t* lvgl_get_text_font(enum LvglFontSize font_size) {
|
const lv_font_t* lvgl_get_text_font(enum LvglFontSize font_size) {
|
||||||
switch (font_size) {
|
switch (resolve_text_font_size(font_size)) {
|
||||||
case FONT_SIZE_SMALL: return &TT_LVGL_TEXT_FONT_SMALL_SYMBOL;
|
case FONT_SIZE_SMALL: return &TT_LVGL_TEXT_FONT_SMALL_SYMBOL;
|
||||||
case FONT_SIZE_DEFAULT: return &TT_LVGL_TEXT_FONT_DEFAULT_SYMBOL;
|
case FONT_SIZE_DEFAULT: return &TT_LVGL_TEXT_FONT_DEFAULT_SYMBOL;
|
||||||
case FONT_SIZE_LARGE: return &TT_LVGL_TEXT_FONT_LARGE_SYMBOL;
|
case FONT_SIZE_LARGE: return &TT_LVGL_TEXT_FONT_LARGE_SYMBOL;
|
||||||
|
|||||||
@@ -26,6 +26,8 @@ const struct ModuleSymbol lvgl_module_symbols[] = {
|
|||||||
DEFINE_MODULE_SYMBOL(lvgl_module),
|
DEFINE_MODULE_SYMBOL(lvgl_module),
|
||||||
DEFINE_MODULE_SYMBOL(lvgl_module_configure),
|
DEFINE_MODULE_SYMBOL(lvgl_module_configure),
|
||||||
// lvgl_fonts
|
// lvgl_fonts
|
||||||
|
DEFINE_MODULE_SYMBOL(lvgl_set_text_font_scale),
|
||||||
|
DEFINE_MODULE_SYMBOL(lvgl_get_text_font_scale),
|
||||||
DEFINE_MODULE_SYMBOL(lvgl_get_shared_icon_font),
|
DEFINE_MODULE_SYMBOL(lvgl_get_shared_icon_font),
|
||||||
DEFINE_MODULE_SYMBOL(lvgl_get_shared_icon_font_height),
|
DEFINE_MODULE_SYMBOL(lvgl_get_shared_icon_font_height),
|
||||||
DEFINE_MODULE_SYMBOL(lvgl_get_text_font),
|
DEFINE_MODULE_SYMBOL(lvgl_get_text_font),
|
||||||
@@ -494,6 +496,12 @@ const struct ModuleSymbol lvgl_module_symbols[] = {
|
|||||||
// lv_image
|
// lv_image
|
||||||
DEFINE_MODULE_SYMBOL(lv_image_create),
|
DEFINE_MODULE_SYMBOL(lv_image_create),
|
||||||
DEFINE_MODULE_SYMBOL(lv_image_set_src),
|
DEFINE_MODULE_SYMBOL(lv_image_set_src),
|
||||||
|
DEFINE_MODULE_SYMBOL(lv_image_set_scale),
|
||||||
|
DEFINE_MODULE_SYMBOL(lv_image_set_scale_x),
|
||||||
|
DEFINE_MODULE_SYMBOL(lv_image_set_scale_y),
|
||||||
|
DEFINE_MODULE_SYMBOL(lv_image_get_scale),
|
||||||
|
DEFINE_MODULE_SYMBOL(lv_image_get_scale_x),
|
||||||
|
DEFINE_MODULE_SYMBOL(lv_image_get_scale_y),
|
||||||
// lv_anim
|
// lv_anim
|
||||||
DEFINE_MODULE_SYMBOL(lv_anim_init),
|
DEFINE_MODULE_SYMBOL(lv_anim_init),
|
||||||
DEFINE_MODULE_SYMBOL(lv_anim_set_duration),
|
DEFINE_MODULE_SYMBOL(lv_anim_set_duration),
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
namespace tt::settings::display {
|
||||||
|
enum class FontSize;
|
||||||
|
}
|
||||||
|
|
||||||
namespace tt::lvgl {
|
namespace tt::lvgl {
|
||||||
|
|
||||||
#ifdef ESP_PLATFORM
|
#ifdef ESP_PLATFORM
|
||||||
@@ -12,6 +16,9 @@ static constexpr auto* PATH_PREFIX = "A:/";
|
|||||||
|
|
||||||
bool isStarted();
|
bool isStarted();
|
||||||
|
|
||||||
|
/** Applies the selected semantic text size to the LVGL theme and future widgets. */
|
||||||
|
void applyFontSize(settings::display::FontSize fontSize);
|
||||||
|
|
||||||
void start();
|
void start();
|
||||||
|
|
||||||
void stop();
|
void stop();
|
||||||
|
|||||||
@@ -18,16 +18,34 @@ enum class ScreensaverType {
|
|||||||
Mystify,
|
Mystify,
|
||||||
MatrixRain,
|
MatrixRain,
|
||||||
StackChan,
|
StackChan,
|
||||||
|
McpScreen,
|
||||||
|
BibleVerse, // Launch the Bible Verse app (if installed)
|
||||||
Count // Sentinel for bounds checking - must be last
|
Count // Sentinel for bounds checking - must be last
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum class FontSize {
|
||||||
|
Small,
|
||||||
|
Default,
|
||||||
|
Large,
|
||||||
|
Count
|
||||||
|
};
|
||||||
|
|
||||||
struct DisplaySettings {
|
struct DisplaySettings {
|
||||||
Orientation orientation;
|
Orientation orientation;
|
||||||
|
FontSize fontSize = FontSize::Default;
|
||||||
uint8_t gammaCurve;
|
uint8_t gammaCurve;
|
||||||
uint8_t backlightDuty;
|
uint8_t backlightDuty;
|
||||||
bool backlightTimeoutEnabled;
|
bool backlightTimeoutEnabled;
|
||||||
uint32_t backlightTimeoutMs; // 0 = Never
|
uint32_t backlightTimeoutMs; // 0 = Never
|
||||||
ScreensaverType screensaverType = ScreensaverType::BouncingBalls;
|
ScreensaverType screensaverType = ScreensaverType::BouncingBalls;
|
||||||
|
// Night dim: when enabled and the local hour falls inside
|
||||||
|
// [nightDimStartHour, nightDimEndHour), the screensaver runs at
|
||||||
|
// nightDimDuty instead of backlightDuty. A start == end window
|
||||||
|
// means the whole day.
|
||||||
|
bool nightDimEnabled = false;
|
||||||
|
uint8_t nightDimStartHour = 22;
|
||||||
|
uint8_t nightDimEndHour = 7;
|
||||||
|
uint8_t nightDimDuty = 20;
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Compares default settings with the function parameter to return the difference */
|
/** Compares default settings with the function parameter to return the difference */
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace tt::settings::mcp {
|
||||||
|
|
||||||
|
struct McpSettings {
|
||||||
|
bool mcpEnabled = false; // Enable MCP server endpoints on system web server
|
||||||
|
};
|
||||||
|
|
||||||
|
bool load(McpSettings& settings);
|
||||||
|
McpSettings getDefault();
|
||||||
|
McpSettings loadOrGetDefault();
|
||||||
|
bool save(const McpSettings& settings);
|
||||||
|
|
||||||
|
} // namespace tt::settings::mcp
|
||||||
@@ -6,7 +6,7 @@ namespace tt::settings {
|
|||||||
|
|
||||||
struct SystemSettings {
|
struct SystemSettings {
|
||||||
Language language = Language::en_US;
|
Language language = Language::en_US;
|
||||||
bool timeFormat24h = true;
|
bool timeFormat24h = false;
|
||||||
std::string dateFormat = std::string("DD/MM/YYYY"); // MM/DD/YYYY, DD/MM/YYYY, YYYY-MM-DD, YYYY/MM/DD
|
std::string dateFormat = std::string("DD/MM/YYYY"); // MM/DD/YYYY, DD/MM/YYYY, YYYY-MM-DD, YYYY/MM/DD
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -7,5 +7,6 @@ namespace tt::app::files {
|
|||||||
bool isSupportedAppFile(const std::string& filename);
|
bool isSupportedAppFile(const std::string& filename);
|
||||||
bool isSupportedImageFile(const std::string& filename);
|
bool isSupportedImageFile(const std::string& filename);
|
||||||
bool isSupportedTextFile(const std::string& filename);
|
bool isSupportedTextFile(const std::string& filename);
|
||||||
|
bool isSupportedAudioFile(const std::string& filename);
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
@@ -0,0 +1,77 @@
|
|||||||
|
#pragma once
|
||||||
|
#ifdef ESP_PLATFORM
|
||||||
|
|
||||||
|
#include <lvgl.h>
|
||||||
|
#include <mutex>
|
||||||
|
#include <string>
|
||||||
|
#include <vector>
|
||||||
|
#include <tactility/device.h>
|
||||||
|
#include <tactility/drivers/audio_stream.h>
|
||||||
|
|
||||||
|
namespace tt::mcp {
|
||||||
|
|
||||||
|
struct McpSystemState {
|
||||||
|
std::mutex mutex;
|
||||||
|
bool overrideActive = false;
|
||||||
|
|
||||||
|
// UI elements when McpOverrideApp is active
|
||||||
|
lv_obj_t* drawArea = nullptr;
|
||||||
|
uint16_t* framebuffer = nullptr;
|
||||||
|
size_t framebufferSize = 0;
|
||||||
|
uint16_t displayWidth = 320;
|
||||||
|
uint16_t displayHeight = 240;
|
||||||
|
uint16_t drawWidth = 320;
|
||||||
|
uint16_t drawHeight = 240;
|
||||||
|
int drawColor = 1; // 0 = white, 1 = black
|
||||||
|
|
||||||
|
// Audio device status
|
||||||
|
Device* i2sDevice = nullptr;
|
||||||
|
Device* audioStreamDevice = nullptr;
|
||||||
|
AudioStreamHandle audioHandle = nullptr;
|
||||||
|
volatile bool audioBusy = false;
|
||||||
|
volatile bool audioRunning = false; // Used to abort play/record loop
|
||||||
|
|
||||||
|
// Video streaming state
|
||||||
|
volatile bool streamRunning = false;
|
||||||
|
void* streamTaskHandle = nullptr; // use void* to avoid freertos header inclusion dependency
|
||||||
|
uint32_t framesDrawn = 0;
|
||||||
|
uint32_t tcpBytesReceived = 0;
|
||||||
|
uint32_t lastDrawMs = 0;
|
||||||
|
double lastFps = 0.0;
|
||||||
|
};
|
||||||
|
|
||||||
|
McpSystemState& getState();
|
||||||
|
|
||||||
|
bool clearScreen(int color);
|
||||||
|
bool drawText(const std::string& text, int x, int y, int size);
|
||||||
|
bool drawRgb565(const uint8_t* data, size_t size, int x, int y, int w, int h);
|
||||||
|
bool drawBmp(const uint8_t* data, size_t size, int x, int y);
|
||||||
|
bool drawPbm(const uint8_t* data, size_t size, int x, int y);
|
||||||
|
std::string getScreenshotPbmBase64();
|
||||||
|
|
||||||
|
bool playTone(int frequency, int durationMs, int volume, std::string& error);
|
||||||
|
bool recordVoice(int durationSec, const std::string& filename, size_t& recordedBytes, std::string& error);
|
||||||
|
bool playAudioFile(const std::string& filename, int volume, std::string& error);
|
||||||
|
bool playWavMemory(const uint8_t* data, size_t size, int volume, std::string& error);
|
||||||
|
bool playMp3File(const std::string& filename, int volume, std::string& error);
|
||||||
|
bool playMp3Memory(const uint8_t* data, size_t size, int volume, std::string& error);
|
||||||
|
|
||||||
|
bool getBatteryStatus(double& voltage_v, int& percentage_pct, std::string& error);
|
||||||
|
bool setLedColor(int r, int g, int b, const std::string& mode, std::string& error);
|
||||||
|
bool getSensors(double& temp_c, double& hum_pct, std::string& imu_json, std::string& error);
|
||||||
|
bool scanBleDevices(int duration_ms, std::string& devices_json, std::string& error);
|
||||||
|
bool writeSdFile(const std::string& filename, const std::string& content, std::string& error);
|
||||||
|
bool readSdFile(const std::string& filename, std::string& content, std::string& error);
|
||||||
|
bool downloadSdFile(const std::string& url, const std::string& filename, std::string& error);
|
||||||
|
|
||||||
|
bool startVideoStreamServer();
|
||||||
|
void stopVideoStreamServer();
|
||||||
|
bool getVideoStreamStats(std::string& stats_json);
|
||||||
|
|
||||||
|
bool listApps(std::string& apps_json, std::string& error);
|
||||||
|
bool runApp(const std::string& appId, std::string& error);
|
||||||
|
bool listSdFiles(const std::string& directory, std::string& files_json, std::string& error);
|
||||||
|
|
||||||
|
} // namespace tt::mcp
|
||||||
|
|
||||||
|
#endif
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -5,6 +5,8 @@
|
|||||||
#include <Tactility/settings/DisplaySettings.h>
|
#include <Tactility/settings/DisplaySettings.h>
|
||||||
#include <Tactility/Timer.h>
|
#include <Tactility/Timer.h>
|
||||||
|
|
||||||
|
#include <app/instance.h>
|
||||||
|
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
@@ -29,9 +31,15 @@ class DisplayIdleService final : public Service {
|
|||||||
// Active screensaver instance
|
// Active screensaver instance
|
||||||
std::unique_ptr<Screensaver> screensaver;
|
std::unique_ptr<Screensaver> screensaver;
|
||||||
|
|
||||||
// Screensaver auto-off: turn off backlight after 5 minutes of screensaver
|
// App launched as screensaver (Bible Verse): instance id, 0 when none.
|
||||||
|
// A separate flag (not just the id) tracks intent, so a user-closed app
|
||||||
|
// doesn't look like an active screensaver and vice versa.
|
||||||
|
AppInstanceId screensaverAppInstanceId = 0;
|
||||||
|
bool screensaverAppActive = false;
|
||||||
|
|
||||||
|
// Screensaver auto-off: turn off backlight after 30 minutes of screensaver
|
||||||
static constexpr uint32_t TICK_INTERVAL_MS = 50;
|
static constexpr uint32_t TICK_INTERVAL_MS = 50;
|
||||||
static constexpr uint32_t SCREENSAVER_AUTO_OFF_MS = 5 * 60 * 1000; // 5 minutes
|
static constexpr uint32_t SCREENSAVER_AUTO_OFF_MS = 30 * 60 * 1000; // 30 minutes
|
||||||
static constexpr int SCREENSAVER_AUTO_OFF_TICKS = SCREENSAVER_AUTO_OFF_MS / TICK_INTERVAL_MS;
|
static constexpr int SCREENSAVER_AUTO_OFF_TICKS = SCREENSAVER_AUTO_OFF_MS / TICK_INTERVAL_MS;
|
||||||
int screensaverActiveCounter = 0;
|
int screensaverActiveCounter = 0;
|
||||||
bool backlightOff = false;
|
bool backlightOff = false;
|
||||||
@@ -63,6 +71,7 @@ public:
|
|||||||
* arbitrary threads while the timer is running.
|
* arbitrary threads while the timer is running.
|
||||||
*/
|
*/
|
||||||
void stopScreensaver();
|
void stopScreensaver();
|
||||||
|
void startMcpScreensaver();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if the screensaver is currently active.
|
* Check if the screensaver is currently active.
|
||||||
|
|||||||
@@ -81,6 +81,12 @@ private:
|
|||||||
static error_t handleApiAppsInstall(struct HttpServerRequest* request, void* user_ctx);
|
static error_t handleApiAppsInstall(struct HttpServerRequest* request, void* user_ctx);
|
||||||
static error_t handleApiWifi(struct HttpServerRequest* request, void* user_ctx);
|
static error_t handleApiWifi(struct HttpServerRequest* request, void* user_ctx);
|
||||||
static error_t handleApiScreenshot(struct HttpServerRequest* request, void* user_ctx);
|
static error_t handleApiScreenshot(struct HttpServerRequest* request, void* user_ctx);
|
||||||
|
static error_t handleApiSimTouch(struct HttpServerRequest* request, void* user_ctx);
|
||||||
|
static error_t handleSimViewer(struct HttpServerRequest* request, void* user_ctx);
|
||||||
|
#ifdef ESP_PLATFORM
|
||||||
|
static error_t handleApiMcp(struct HttpServerRequest* request, void* user_ctx);
|
||||||
|
static error_t handleApiScreenRaw(struct HttpServerRequest* request, void* user_ctx);
|
||||||
|
#endif
|
||||||
|
|
||||||
// Dynamic asset serving
|
// Dynamic asset serving
|
||||||
static error_t handleAssets(struct HttpServerRequest* request, void* user_ctx);
|
static error_t handleAssets(struct HttpServerRequest* request, void* user_ctx);
|
||||||
|
|||||||
@@ -40,6 +40,7 @@
|
|||||||
#include <Tactility/file/File.h>
|
#include <Tactility/file/File.h>
|
||||||
#include <Tactility/hal/SdCard.h>
|
#include <Tactility/hal/SdCard.h>
|
||||||
#include <Tactility/lvgl/KeyboardDeviceListener.h>
|
#include <Tactility/lvgl/KeyboardDeviceListener.h>
|
||||||
|
#include <Tactility/lvgl/Lvgl.h>
|
||||||
#include <Tactility/lvgl/Statusbar.h>
|
#include <Tactility/lvgl/Statusbar.h>
|
||||||
#include <Tactility/lvgl/TrackballInit.h>
|
#include <Tactility/lvgl/TrackballInit.h>
|
||||||
#include <Tactility/lvgl/UsbHidInput.h>
|
#include <Tactility/lvgl/UsbHidInput.h>
|
||||||
@@ -189,6 +190,7 @@ namespace app {
|
|||||||
#ifdef ESP_PLATFORM
|
#ifdef ESP_PLATFORM
|
||||||
namespace apwebserver { extern const ::AppManifest manifest; }
|
namespace apwebserver { extern const ::AppManifest manifest; }
|
||||||
namespace crashdiagnostics { extern const ::AppManifest manifest; }
|
namespace crashdiagnostics { extern const ::AppManifest manifest; }
|
||||||
|
namespace mcpsettings { extern const ::AppManifest manifest; }
|
||||||
#if CONFIG_TT_TDECK_WORKAROUND == 1
|
#if CONFIG_TT_TDECK_WORKAROUND == 1
|
||||||
namespace keyboardsettings { extern const ::AppManifest manifest; } // T-Deck only for now
|
namespace keyboardsettings { extern const ::AppManifest manifest; } // T-Deck only for now
|
||||||
#endif
|
#endif
|
||||||
@@ -252,6 +254,7 @@ static void registerInternalApps() {
|
|||||||
#ifdef ESP_PLATFORM
|
#ifdef ESP_PLATFORM
|
||||||
app_manager_add(&app::apwebserver::manifest);
|
app_manager_add(&app::apwebserver::manifest);
|
||||||
app_manager_add(&app::crashdiagnostics::manifest);
|
app_manager_add(&app::crashdiagnostics::manifest);
|
||||||
|
app_manager_add(&app::mcpsettings::manifest);
|
||||||
#if defined(CONFIG_TT_TDECK_WORKAROUND)
|
#if defined(CONFIG_TT_TDECK_WORKAROUND)
|
||||||
app_manager_add(&app::keyboardsettings::manifest);
|
app_manager_add(&app::keyboardsettings::manifest);
|
||||||
#endif
|
#endif
|
||||||
@@ -433,6 +436,7 @@ static void onLvglStarted() {
|
|||||||
if (auto* display = lv_display_get_default(); display != nullptr) {
|
if (auto* display = lv_display_get_default(); display != nullptr) {
|
||||||
auto displaySettings = settings::display::loadOrGetDefault();
|
auto displaySettings = settings::display::loadOrGetDefault();
|
||||||
lv_display_set_rotation(display, settings::display::toLvglDisplayRotation(displaySettings.orientation));
|
lv_display_set_rotation(display, settings::display::toLvglDisplayRotation(displaySettings.orientation));
|
||||||
|
lvgl::applyFontSize(displaySettings.fontSize);
|
||||||
}
|
}
|
||||||
lvgl_unlock();
|
lvgl_unlock();
|
||||||
|
|
||||||
|
|||||||
@@ -107,6 +107,9 @@ void showNoInternet(Context* ctx) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void showApps(Context* ctx) {
|
void showApps(Context* ctx) {
|
||||||
|
if (ctx->contentWrapper == nullptr) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
// Refresh rebuilds the list from scratch (cached copy, then again once the network fetch
|
// Refresh rebuilds the list from scratch (cached copy, then again once the network fetch
|
||||||
// lands), which would otherwise reset the user's scroll position each time.
|
// lands), which would otherwise reset the user's scroll position each time.
|
||||||
int32_t scrollY;
|
int32_t scrollY;
|
||||||
@@ -266,7 +269,9 @@ void createWidgets(lv_obj_t* parent, void* userData) {
|
|||||||
|
|
||||||
void destroyWidgets(void* userData) {
|
void destroyWidgets(void* userData) {
|
||||||
auto* ctx = static_cast<Context*>(userData);
|
auto* ctx = static_cast<Context*>(userData);
|
||||||
ctx->scrollY = lv_obj_get_scroll_y(ctx->contentWrapper);
|
if (ctx->contentWrapper != nullptr) {
|
||||||
|
ctx->scrollY = lv_obj_get_scroll_y(ctx->contentWrapper);
|
||||||
|
}
|
||||||
ctx->contentWrapper = nullptr;
|
ctx->contentWrapper = nullptr;
|
||||||
ctx->refreshButton = nullptr;
|
ctx->refreshButton = nullptr;
|
||||||
}
|
}
|
||||||
@@ -334,7 +339,8 @@ extern const ::AppManifest manifest = {
|
|||||||
.id = "tactility.apphub",
|
.id = "tactility.apphub",
|
||||||
.name = "App Hub",
|
.name = "App Hub",
|
||||||
.category = APP_CATEGORY_SYSTEM,
|
.category = APP_CATEGORY_SYSTEM,
|
||||||
.location = {APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain)}
|
.location = {APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain)},
|
||||||
|
.flags = APP_MANIFEST_FLAG_HIDDEN
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace tt::app::apphub
|
} // namespace tt::app::apphub
|
||||||
|
|||||||
@@ -121,7 +121,7 @@ extern const ::AppManifest manifest = {
|
|||||||
.category = APP_CATEGORY_SYSTEM,
|
.category = APP_CATEGORY_SYSTEM,
|
||||||
.location = { .type = APP_LOCATION_MEMORY, .location = reinterpret_cast<void*>(appMain) },
|
.location = { .type = APP_LOCATION_MEMORY, .location = reinterpret_cast<void*>(appMain) },
|
||||||
.flags = APP_MANIFEST_FLAG_HIDDEN,
|
.flags = APP_MANIFEST_FLAG_HIDDEN,
|
||||||
.stack = { .depth = 2400, .desired_memory_capability = 0 },
|
.stack = { .depth = 3072, .desired_memory_capability = 0 },
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
@@ -245,7 +245,8 @@ extern const ::AppManifest manifest = {
|
|||||||
.id = "tactility.btmanage",
|
.id = "tactility.btmanage",
|
||||||
.name = "Bluetooth",
|
.name = "Bluetooth",
|
||||||
.category = APP_CATEGORY_SETTINGS,
|
.category = APP_CATEGORY_SETTINGS,
|
||||||
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) }
|
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) },
|
||||||
|
.flags = APP_MANIFEST_FLAG_HIDDEN
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace tt::app::btmanage
|
} // namespace tt::app::btmanage
|
||||||
|
|||||||
@@ -228,7 +228,8 @@ extern const ::AppManifest manifest = {
|
|||||||
.id = "tactility.chat",
|
.id = "tactility.chat",
|
||||||
.name = "Chat",
|
.name = "Chat",
|
||||||
.category = APP_CATEGORY_USER,
|
.category = APP_CATEGORY_USER,
|
||||||
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) }
|
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) },
|
||||||
|
.flags = APP_MANIFEST_FLAG_HIDDEN
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace tt::app::chat
|
} // namespace tt::app::chat
|
||||||
|
|||||||
@@ -230,7 +230,8 @@ extern const ::AppManifest manifest = {
|
|||||||
.id = "tactility.development",
|
.id = "tactility.development",
|
||||||
.name = "Development",
|
.name = "Development",
|
||||||
.category = APP_CATEGORY_SETTINGS,
|
.category = APP_CATEGORY_SETTINGS,
|
||||||
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) }
|
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) },
|
||||||
|
.flags = APP_MANIFEST_FLAG_HIDDEN
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
#ifdef ESP_PLATFORM
|
#ifdef ESP_PLATFORM
|
||||||
#include <Tactility/service/displayidle/DisplayIdleService.h>
|
#include <Tactility/service/displayidle/DisplayIdleService.h>
|
||||||
#endif
|
#endif
|
||||||
|
#include <Tactility/lvgl/Lvgl.h>
|
||||||
#include <Tactility/settings/DisplaySettings.h>
|
#include <Tactility/settings/DisplaySettings.h>
|
||||||
|
|
||||||
#include <app/event.h>
|
#include <app/event.h>
|
||||||
@@ -41,6 +42,10 @@ struct Context {
|
|||||||
lv_obj_t* timeoutSwitch = nullptr;
|
lv_obj_t* timeoutSwitch = nullptr;
|
||||||
lv_obj_t* timeoutDropdown = nullptr;
|
lv_obj_t* timeoutDropdown = nullptr;
|
||||||
lv_obj_t* screensaverDropdown = nullptr;
|
lv_obj_t* screensaverDropdown = nullptr;
|
||||||
|
lv_obj_t* nightDimSwitch = nullptr;
|
||||||
|
lv_obj_t* nightDimStartDropdown = nullptr;
|
||||||
|
lv_obj_t* nightDimEndDropdown = nullptr;
|
||||||
|
lv_obj_t* nightDimDutySlider = nullptr;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@@ -90,6 +95,21 @@ void onOrientationSet(lv_event_t* event) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void onFontSizeChanged(lv_event_t* event) {
|
||||||
|
auto* ctx = static_cast<Context*>(lv_event_get_user_data(event));
|
||||||
|
auto* dropdown = static_cast<lv_obj_t*>(lv_event_get_target(event));
|
||||||
|
uint32_t selected_index = lv_dropdown_get_selected(dropdown);
|
||||||
|
if (selected_index >= static_cast<uint32_t>(settings::display::FontSize::Count)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
auto selected_size = static_cast<settings::display::FontSize>(selected_index);
|
||||||
|
if (selected_size != ctx->displaySettings.fontSize) {
|
||||||
|
ctx->displaySettings.fontSize = selected_size;
|
||||||
|
ctx->displaySettingsUpdated = true;
|
||||||
|
lvgl::applyFontSize(selected_size);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void onTimeoutSwitch(lv_event_t* event) {
|
void onTimeoutSwitch(lv_event_t* event) {
|
||||||
auto* ctx = static_cast<Context*>(lv_event_get_user_data(event));
|
auto* ctx = static_cast<Context*>(lv_event_get_user_data(event));
|
||||||
auto* sw = static_cast<lv_obj_t*>(lv_event_get_target(event));
|
auto* sw = static_cast<lv_obj_t*>(lv_event_get_target(event));
|
||||||
@@ -115,8 +135,8 @@ void onTimeoutChanged(lv_event_t* event) {
|
|||||||
auto* ctx = static_cast<Context*>(lv_event_get_user_data(event));
|
auto* ctx = static_cast<Context*>(lv_event_get_user_data(event));
|
||||||
auto* dropdown = static_cast<lv_obj_t*>(lv_event_get_target(event));
|
auto* dropdown = static_cast<lv_obj_t*>(lv_event_get_target(event));
|
||||||
uint32_t idx = lv_dropdown_get_selected(dropdown);
|
uint32_t idx = lv_dropdown_get_selected(dropdown);
|
||||||
// Map dropdown index to ms: 0=15s,1=30s,2=1m,3=2m,4=5m,5=Never
|
// Map dropdown index to ms: 0=15s,1=30s,2=1m,3=2m,4=5m,5=15m,6=30m,7=Never
|
||||||
static const uint32_t values_ms[] = {15000, 30000, 60000, 120000, 300000, 0};
|
static const uint32_t values_ms[] = {15000, 30000, 60000, 120000, 300000, 900000, 1800000, 0};
|
||||||
if (idx < (sizeof(values_ms)/sizeof(values_ms[0]))) {
|
if (idx < (sizeof(values_ms)/sizeof(values_ms[0]))) {
|
||||||
ctx->displaySettings.backlightTimeoutMs = values_ms[idx];
|
ctx->displaySettings.backlightTimeoutMs = values_ms[idx];
|
||||||
ctx->displaySettingsUpdated = true;
|
ctx->displaySettingsUpdated = true;
|
||||||
@@ -138,6 +158,82 @@ void onScreensaverChanged(lv_event_t* event) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void setNightDimControlsEnabled(Context* ctx, bool enabled) {
|
||||||
|
if (ctx->nightDimStartDropdown != nullptr) {
|
||||||
|
if (enabled) {
|
||||||
|
lv_obj_clear_state(ctx->nightDimStartDropdown, LV_STATE_DISABLED);
|
||||||
|
} else {
|
||||||
|
lv_obj_add_state(ctx->nightDimStartDropdown, LV_STATE_DISABLED);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (ctx->nightDimEndDropdown != nullptr) {
|
||||||
|
if (enabled) {
|
||||||
|
lv_obj_clear_state(ctx->nightDimEndDropdown, LV_STATE_DISABLED);
|
||||||
|
} else {
|
||||||
|
lv_obj_add_state(ctx->nightDimEndDropdown, LV_STATE_DISABLED);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (ctx->nightDimDutySlider != nullptr) {
|
||||||
|
if (enabled) {
|
||||||
|
lv_obj_clear_state(ctx->nightDimDutySlider, LV_STATE_DISABLED);
|
||||||
|
} else {
|
||||||
|
lv_obj_add_state(ctx->nightDimDutySlider, LV_STATE_DISABLED);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static const char* hourOptions() {
|
||||||
|
// 00..23, one per line
|
||||||
|
static const char* options =
|
||||||
|
"00\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n"
|
||||||
|
"12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23";
|
||||||
|
return options;
|
||||||
|
}
|
||||||
|
|
||||||
|
void onNightDimSwitch(lv_event_t* event) {
|
||||||
|
auto* ctx = static_cast<Context*>(lv_event_get_user_data(event));
|
||||||
|
auto* sw = static_cast<lv_obj_t*>(lv_event_get_target(event));
|
||||||
|
bool enabled = lv_obj_has_state(sw, LV_STATE_CHECKED);
|
||||||
|
ctx->displaySettings.nightDimEnabled = enabled;
|
||||||
|
ctx->displaySettingsUpdated = true;
|
||||||
|
setNightDimControlsEnabled(ctx, enabled);
|
||||||
|
}
|
||||||
|
|
||||||
|
void onNightDimStartChanged(lv_event_t* event) {
|
||||||
|
auto* ctx = static_cast<Context*>(lv_event_get_user_data(event));
|
||||||
|
auto* dropdown = static_cast<lv_obj_t*>(lv_event_get_target(event));
|
||||||
|
uint32_t idx = lv_dropdown_get_selected(dropdown);
|
||||||
|
if (idx > 23) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
ctx->displaySettings.nightDimStartHour = static_cast<uint8_t>(idx);
|
||||||
|
ctx->displaySettingsUpdated = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void onNightDimEndChanged(lv_event_t* event) {
|
||||||
|
auto* ctx = static_cast<Context*>(lv_event_get_user_data(event));
|
||||||
|
auto* dropdown = static_cast<lv_obj_t*>(lv_event_get_target(event));
|
||||||
|
uint32_t idx = lv_dropdown_get_selected(dropdown);
|
||||||
|
if (idx > 23) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
ctx->displaySettings.nightDimEndHour = static_cast<uint8_t>(idx);
|
||||||
|
ctx->displaySettingsUpdated = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void onNightDimDutyChanged(lv_event_t* event) {
|
||||||
|
auto* ctx = static_cast<Context*>(lv_event_get_user_data(event));
|
||||||
|
auto* slider = static_cast<lv_obj_t*>(lv_event_get_target(event));
|
||||||
|
int32_t value = lv_slider_get_value(slider);
|
||||||
|
if (value < 0) {
|
||||||
|
value = 0;
|
||||||
|
} else if (value > 255) {
|
||||||
|
value = 255;
|
||||||
|
}
|
||||||
|
ctx->displaySettings.nightDimDuty = static_cast<uint8_t>(value);
|
||||||
|
ctx->displaySettingsUpdated = true;
|
||||||
|
}
|
||||||
|
|
||||||
void createWidgets(lv_obj_t* parent, void* userData) {
|
void createWidgets(lv_obj_t* parent, void* userData) {
|
||||||
auto* ctx = static_cast<Context*>(userData);
|
auto* ctx = static_cast<Context*>(userData);
|
||||||
|
|
||||||
@@ -208,6 +304,23 @@ void createWidgets(lv_obj_t* parent, void* userData) {
|
|||||||
// Set the dropdown to match current orientation enum
|
// Set the dropdown to match current orientation enum
|
||||||
lv_dropdown_set_selected(orientation_dropdown, static_cast<uint16_t>(ctx->displaySettings.orientation));
|
lv_dropdown_set_selected(orientation_dropdown, static_cast<uint16_t>(ctx->displaySettings.orientation));
|
||||||
|
|
||||||
|
// Font size
|
||||||
|
|
||||||
|
auto* font_size_wrapper = lv_obj_create(main_wrapper);
|
||||||
|
lv_obj_set_size(font_size_wrapper, LV_PCT(100), LV_SIZE_CONTENT);
|
||||||
|
lv_obj_set_style_pad_all(font_size_wrapper, 0, LV_STATE_DEFAULT);
|
||||||
|
lv_obj_set_style_border_width(font_size_wrapper, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
|
auto* font_size_label = lv_label_create(font_size_wrapper);
|
||||||
|
lv_label_set_text(font_size_label, "Font size");
|
||||||
|
lv_obj_align(font_size_label, LV_ALIGN_LEFT_MID, 0, 0);
|
||||||
|
|
||||||
|
auto* font_size_dropdown = lv_dropdown_create(font_size_wrapper);
|
||||||
|
lv_dropdown_set_options(font_size_dropdown, "Small\nDefault\nLarge");
|
||||||
|
lv_obj_align(font_size_dropdown, LV_ALIGN_RIGHT_MID, 0, 0);
|
||||||
|
lv_obj_add_event_cb(font_size_dropdown, onFontSizeChanged, LV_EVENT_VALUE_CHANGED, ctx);
|
||||||
|
lv_dropdown_set_selected(font_size_dropdown, static_cast<uint16_t>(ctx->displaySettings.fontSize));
|
||||||
|
|
||||||
// Screen timeout
|
// Screen timeout
|
||||||
// Note: DisplayIdleService doesn't act on these settings for kernel-driver displays yet
|
// Note: DisplayIdleService doesn't act on these settings for kernel-driver displays yet
|
||||||
// (it only looks up the deprecated tt::hal::display::DisplayDevice), so these currently
|
// (it only looks up the deprecated tt::hal::display::DisplayDevice), so these currently
|
||||||
@@ -240,7 +353,7 @@ void createWidgets(lv_obj_t* parent, void* userData) {
|
|||||||
lv_obj_align(timeout_value_label, LV_ALIGN_LEFT_MID, 0, 0);
|
lv_obj_align(timeout_value_label, LV_ALIGN_LEFT_MID, 0, 0);
|
||||||
|
|
||||||
ctx->timeoutDropdown = lv_dropdown_create(timeout_select_wrapper);
|
ctx->timeoutDropdown = lv_dropdown_create(timeout_select_wrapper);
|
||||||
lv_dropdown_set_options(ctx->timeoutDropdown, "15 seconds\n30 seconds\n1 minute\n2 minutes\n5 minutes\nNever");
|
lv_dropdown_set_options(ctx->timeoutDropdown, "15 seconds\n30 seconds\n1 minute\n2 minutes\n5 minutes\n15 minutes\n30 minutes\nNever");
|
||||||
lv_obj_align(ctx->timeoutDropdown, LV_ALIGN_RIGHT_MID, 0, 0);
|
lv_obj_align(ctx->timeoutDropdown, LV_ALIGN_RIGHT_MID, 0, 0);
|
||||||
lv_obj_add_event_cb(ctx->timeoutDropdown, onTimeoutChanged, LV_EVENT_VALUE_CHANGED, ctx);
|
lv_obj_add_event_cb(ctx->timeoutDropdown, onTimeoutChanged, LV_EVENT_VALUE_CHANGED, ctx);
|
||||||
// Initialize dropdown selection from settings
|
// Initialize dropdown selection from settings
|
||||||
@@ -255,8 +368,12 @@ void createWidgets(lv_obj_t* parent, void* userData) {
|
|||||||
idx = 3;
|
idx = 3;
|
||||||
else if (ms == 300000)
|
else if (ms == 300000)
|
||||||
idx = 4;
|
idx = 4;
|
||||||
else if (ms == 0)
|
else if (ms == 900000)
|
||||||
idx = 5;
|
idx = 5;
|
||||||
|
else if (ms == 1800000)
|
||||||
|
idx = 6;
|
||||||
|
else if (ms == 0)
|
||||||
|
idx = 7;
|
||||||
lv_dropdown_set_selected(ctx->timeoutDropdown, idx);
|
lv_dropdown_set_selected(ctx->timeoutDropdown, idx);
|
||||||
if (!ctx->displaySettings.backlightTimeoutEnabled) {
|
if (!ctx->displaySettings.backlightTimeoutEnabled) {
|
||||||
lv_obj_add_state(ctx->timeoutDropdown, LV_STATE_DISABLED);
|
lv_obj_add_state(ctx->timeoutDropdown, LV_STATE_DISABLED);
|
||||||
@@ -274,13 +391,78 @@ void createWidgets(lv_obj_t* parent, void* userData) {
|
|||||||
|
|
||||||
ctx->screensaverDropdown = lv_dropdown_create(screensaver_wrapper);
|
ctx->screensaverDropdown = lv_dropdown_create(screensaver_wrapper);
|
||||||
// Note: order correlates with settings::display::ScreensaverType enum order
|
// Note: order correlates with settings::display::ScreensaverType enum order
|
||||||
lv_dropdown_set_options(ctx->screensaverDropdown, "None\nBouncing Balls\nMystify\nMatrix Rain\nStackChan");
|
lv_dropdown_set_options(ctx->screensaverDropdown, "None\nBouncing Balls\nMystify\nMatrix Rain\nStackChan\nMCP Screen\nBible Verse");
|
||||||
lv_obj_align(ctx->screensaverDropdown, LV_ALIGN_RIGHT_MID, 0, 0);
|
lv_obj_align(ctx->screensaverDropdown, LV_ALIGN_RIGHT_MID, 0, 0);
|
||||||
lv_obj_add_event_cb(ctx->screensaverDropdown, onScreensaverChanged, LV_EVENT_VALUE_CHANGED, ctx);
|
lv_obj_add_event_cb(ctx->screensaverDropdown, onScreensaverChanged, LV_EVENT_VALUE_CHANGED, ctx);
|
||||||
lv_dropdown_set_selected(ctx->screensaverDropdown, static_cast<uint16_t>(ctx->displaySettings.screensaverType));
|
lv_dropdown_set_selected(ctx->screensaverDropdown, static_cast<uint16_t>(ctx->displaySettings.screensaverType));
|
||||||
if (!ctx->displaySettings.backlightTimeoutEnabled) {
|
if (!ctx->displaySettings.backlightTimeoutEnabled) {
|
||||||
lv_obj_add_state(ctx->screensaverDropdown, LV_STATE_DISABLED);
|
lv_obj_add_state(ctx->screensaverDropdown, LV_STATE_DISABLED);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Night dim: dim the backlight while the screensaver is up, during a time window
|
||||||
|
auto* night_dim_wrapper = lv_obj_create(main_wrapper);
|
||||||
|
lv_obj_set_size(night_dim_wrapper, LV_PCT(100), LV_SIZE_CONTENT);
|
||||||
|
lv_obj_set_style_pad_all(night_dim_wrapper, 0, LV_STATE_DEFAULT);
|
||||||
|
lv_obj_set_style_border_width(night_dim_wrapper, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
|
auto* night_dim_label = lv_label_create(night_dim_wrapper);
|
||||||
|
lv_label_set_text(night_dim_label, "Night dim");
|
||||||
|
lv_obj_align(night_dim_label, LV_ALIGN_LEFT_MID, 0, 0);
|
||||||
|
|
||||||
|
ctx->nightDimSwitch = lv_switch_create(night_dim_wrapper);
|
||||||
|
if (ctx->displaySettings.nightDimEnabled) {
|
||||||
|
lv_obj_add_state(ctx->nightDimSwitch, LV_STATE_CHECKED);
|
||||||
|
}
|
||||||
|
lv_obj_align(ctx->nightDimSwitch, LV_ALIGN_RIGHT_MID, 0, 0);
|
||||||
|
lv_obj_add_event_cb(ctx->nightDimSwitch, onNightDimSwitch, LV_EVENT_VALUE_CHANGED, ctx);
|
||||||
|
|
||||||
|
auto* night_dim_start_wrapper = lv_obj_create(main_wrapper);
|
||||||
|
lv_obj_set_size(night_dim_start_wrapper, LV_PCT(100), LV_SIZE_CONTENT);
|
||||||
|
lv_obj_set_style_pad_all(night_dim_start_wrapper, 0, LV_STATE_DEFAULT);
|
||||||
|
lv_obj_set_style_border_width(night_dim_start_wrapper, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
|
auto* night_dim_start_label = lv_label_create(night_dim_start_wrapper);
|
||||||
|
lv_label_set_text(night_dim_start_label, "Dim from");
|
||||||
|
lv_obj_align(night_dim_start_label, LV_ALIGN_LEFT_MID, 0, 0);
|
||||||
|
|
||||||
|
ctx->nightDimStartDropdown = lv_dropdown_create(night_dim_start_wrapper);
|
||||||
|
lv_dropdown_set_options(ctx->nightDimStartDropdown, hourOptions());
|
||||||
|
lv_obj_align(ctx->nightDimStartDropdown, LV_ALIGN_RIGHT_MID, 0, 0);
|
||||||
|
lv_obj_add_event_cb(ctx->nightDimStartDropdown, onNightDimStartChanged, LV_EVENT_VALUE_CHANGED, ctx);
|
||||||
|
lv_dropdown_set_selected(ctx->nightDimStartDropdown, ctx->displaySettings.nightDimStartHour > 23 ? 0 : ctx->displaySettings.nightDimStartHour);
|
||||||
|
|
||||||
|
auto* night_dim_end_wrapper = lv_obj_create(main_wrapper);
|
||||||
|
lv_obj_set_size(night_dim_end_wrapper, LV_PCT(100), LV_SIZE_CONTENT);
|
||||||
|
lv_obj_set_style_pad_all(night_dim_end_wrapper, 0, LV_STATE_DEFAULT);
|
||||||
|
lv_obj_set_style_border_width(night_dim_end_wrapper, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
|
auto* night_dim_end_label = lv_label_create(night_dim_end_wrapper);
|
||||||
|
lv_label_set_text(night_dim_end_label, "Dim until");
|
||||||
|
lv_obj_align(night_dim_end_label, LV_ALIGN_LEFT_MID, 0, 0);
|
||||||
|
|
||||||
|
ctx->nightDimEndDropdown = lv_dropdown_create(night_dim_end_wrapper);
|
||||||
|
lv_dropdown_set_options(ctx->nightDimEndDropdown, hourOptions());
|
||||||
|
lv_obj_align(ctx->nightDimEndDropdown, LV_ALIGN_RIGHT_MID, 0, 0);
|
||||||
|
lv_obj_add_event_cb(ctx->nightDimEndDropdown, onNightDimEndChanged, LV_EVENT_VALUE_CHANGED, ctx);
|
||||||
|
lv_dropdown_set_selected(ctx->nightDimEndDropdown, ctx->displaySettings.nightDimEndHour > 23 ? 0 : ctx->displaySettings.nightDimEndHour);
|
||||||
|
|
||||||
|
auto* night_dim_duty_wrapper = lv_obj_create(main_wrapper);
|
||||||
|
lv_obj_set_size(night_dim_duty_wrapper, LV_PCT(100), LV_SIZE_CONTENT);
|
||||||
|
lv_obj_set_style_pad_all(night_dim_duty_wrapper, 0, LV_STATE_DEFAULT);
|
||||||
|
lv_obj_set_style_border_width(night_dim_duty_wrapper, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
|
auto* night_dim_duty_label = lv_label_create(night_dim_duty_wrapper);
|
||||||
|
lv_label_set_text(night_dim_duty_label, "Dim brightness");
|
||||||
|
lv_obj_align(night_dim_duty_label, LV_ALIGN_LEFT_MID, 0, 0);
|
||||||
|
|
||||||
|
ctx->nightDimDutySlider = lv_slider_create(night_dim_duty_wrapper);
|
||||||
|
lv_obj_set_width(ctx->nightDimDutySlider, LV_PCT(50));
|
||||||
|
lv_obj_align(ctx->nightDimDutySlider, LV_ALIGN_RIGHT_MID, 0, 0);
|
||||||
|
lv_slider_set_range(ctx->nightDimDutySlider, 0, 255);
|
||||||
|
lv_slider_set_value(ctx->nightDimDutySlider, ctx->displaySettings.nightDimDuty, LV_ANIM_OFF);
|
||||||
|
lv_obj_add_event_cb(ctx->nightDimDutySlider, onNightDimDutyChanged, LV_EVENT_VALUE_CHANGED, ctx);
|
||||||
|
|
||||||
|
setNightDimControlsEnabled(ctx, ctx->displaySettings.nightDimEnabled);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -26,4 +26,12 @@ bool isSupportedTextFile(const std::string& filename) {
|
|||||||
filename_lower.ends_with(".properties");
|
filename_lower.ends_with(".properties");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool isSupportedAudioFile(const std::string& filename) {
|
||||||
|
std::string filename_lower = string::lowercase(filename);
|
||||||
|
return filename_lower.ends_with(".mp3") ||
|
||||||
|
filename_lower.ends_with(".wav") ||
|
||||||
|
filename_lower.ends_with(".ogg") ||
|
||||||
|
filename_lower.ends_with(".flac");
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace tt::app::filebrowser
|
} // namespace tt::app::filebrowser
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#include <app/event.h>
|
#include <app/event.h>
|
||||||
#include <app/execute.h>
|
#include <app/execute.h>
|
||||||
#include <app/install.h>
|
#include <app/install.h>
|
||||||
|
#include <app/start.h>
|
||||||
#include <app/stream.h>
|
#include <app/stream.h>
|
||||||
|
|
||||||
#include <lvgl/lvgl.h>
|
#include <lvgl/lvgl.h>
|
||||||
@@ -204,6 +205,15 @@ void View::viewFile(const std::string& path, const std::string& filename) {
|
|||||||
// Remove forward slash, because we need a relative path
|
// Remove forward slash, because we need a relative path
|
||||||
notes::start(file_path.substr(1));
|
notes::start(file_path.substr(1));
|
||||||
}
|
}
|
||||||
|
} else if (isSupportedAudioFile(filename)) {
|
||||||
|
// External MP3 player reads argv as key=value pairs (see
|
||||||
|
// CurrentAppCompat tt_app_start_with_bundle): file=<path>
|
||||||
|
std::string file_arg = "file=" + file_path;
|
||||||
|
const char* argv[] = { file_arg.c_str() };
|
||||||
|
uint32_t instance_id = 0;
|
||||||
|
if (app_start("one.tactility.mp3player", 1, argv, &instance_id) != ERROR_NONE) {
|
||||||
|
LOG_W(TAG, "Failed to start MP3 player for %s", file_path.c_str());
|
||||||
|
}
|
||||||
} else if (isExecutablePath(file_path)) {
|
} else if (isExecutablePath(file_path)) {
|
||||||
runFile(file_path);
|
runFile(file_path);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -426,7 +426,8 @@ extern const ::AppManifest manifest = {
|
|||||||
.id = "tactility.i2cscanner",
|
.id = "tactility.i2cscanner",
|
||||||
.name = "I2C Scanner",
|
.name = "I2C Scanner",
|
||||||
.category = APP_CATEGORY_SYSTEM,
|
.category = APP_CATEGORY_SYSTEM,
|
||||||
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) }
|
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) },
|
||||||
|
.flags = APP_MANIFEST_FLAG_HIDDEN
|
||||||
};
|
};
|
||||||
|
|
||||||
uint32_t start() {
|
uint32_t start() {
|
||||||
|
|||||||
@@ -4,11 +4,26 @@
|
|||||||
#include <app/scheduler.h>
|
#include <app/scheduler.h>
|
||||||
#include <app/start.h>
|
#include <app/start.h>
|
||||||
|
|
||||||
|
#include <Tactility/DeprecatedPaths.h>
|
||||||
|
#include <Tactility/MountPoints.h>
|
||||||
|
#include <Tactility/Tactility.h>
|
||||||
|
#include <Tactility/app/setup/Setup.h>
|
||||||
|
#include <Tactility/file/File.h>
|
||||||
|
#include <Tactility/lvgl/Lvgl.h>
|
||||||
|
#include <Tactility/service/wifi/Wifi.h>
|
||||||
|
#include <Tactility/settings/BootSettings.h>
|
||||||
|
#include <Tactility/settings/Time.h>
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
|
#include <cstdio>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
#include <ctime>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
#include <lvgl.h>
|
#include <lvgl.h>
|
||||||
#include <lvgl/icons/launcher.h>
|
|
||||||
#include <lvgl/fonts.h>
|
#include <lvgl/fonts.h>
|
||||||
|
#include <lvgl/icons/launcher.h>
|
||||||
|
#include <lvgl/icons/statusbar.h>
|
||||||
#include <lvgl/lvgl.h>
|
#include <lvgl/lvgl.h>
|
||||||
|
|
||||||
#include <lvgl_window_manager/window_manager.h>
|
#include <lvgl_window_manager/window_manager.h>
|
||||||
@@ -20,64 +35,29 @@
|
|||||||
#include <tactility/log.h>
|
#include <tactility/log.h>
|
||||||
#include <tactility/memory.h>
|
#include <tactility/memory.h>
|
||||||
|
|
||||||
#include <Tactility/app/setup/Setup.h>
|
|
||||||
#include <Tactility/settings/BootSettings.h>
|
|
||||||
#include <Tactility/Tactility.h>
|
|
||||||
|
|
||||||
namespace tt::app::launcher {
|
namespace tt::app::launcher {
|
||||||
|
|
||||||
constexpr auto* TAG = "Launcher";
|
constexpr auto* TAG = "Launcher";
|
||||||
|
constexpr auto* BACKGROUND_ASSET = "color-field.png";
|
||||||
|
constexpr auto* CUSTOM_BACKGROUND_PATH = "tactility/launcher/background.bin";
|
||||||
|
constexpr lv_color_t TEXT_COLOR = LV_COLOR_MAKE(0xF8, 0xF5, 0xF2);
|
||||||
|
constexpr lv_color_t MUTED_TEXT_COLOR = LV_COLOR_MAKE(0xDF, 0xD6, 0xD3);
|
||||||
|
constexpr lv_color_t ACCENT_COLOR = LV_COLOR_MAKE(0xEC, 0x75, 0x69);
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
uint32_t getButtonPadding(UiDensity density, uint32_t buttonSize) {
|
struct LauncherWidgets {
|
||||||
if (density == LVGL_UI_DENSITY_COMPACT) {
|
lv_obj_t* timeLabel = nullptr;
|
||||||
return 0;
|
lv_obj_t* dateLabel = nullptr;
|
||||||
} else {
|
lv_obj_t* dataLabel = nullptr;
|
||||||
return buttonSize / 8;
|
lv_obj_t* statusLabel = nullptr;
|
||||||
}
|
lv_timer_t* updateTimer = nullptr;
|
||||||
}
|
};
|
||||||
|
|
||||||
int32_t computeButtonMargin(int32_t available_span, int32_t total_button_size) {
|
void onAppPressed(lv_event_t* event) {
|
||||||
const int32_t usable = std::max<int32_t>(0, available_span - (3 * total_button_size));
|
const auto* app_id = static_cast<const char*>(lv_event_get_user_data(event));
|
||||||
return std::min<int32_t>(usable / 16, total_button_size / 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
void onAppPressed(lv_event_t* e) {
|
|
||||||
auto* appId = static_cast<const char*>(lv_event_get_user_data(e));
|
|
||||||
uint32_t instance_id = 0;
|
uint32_t instance_id = 0;
|
||||||
app_start(appId, 0, nullptr, &instance_id);
|
app_start(app_id, 0, nullptr, &instance_id);
|
||||||
}
|
|
||||||
|
|
||||||
lv_obj_t* createAppButton(lv_obj_t* parent, UiDensity uiDensity, const char* imageFile, const char* appId, int32_t itemMargin, bool isLandscape) {
|
|
||||||
const auto button_size = lvgl_get_launcher_icon_font_height();
|
|
||||||
const auto button_padding = getButtonPadding(uiDensity, button_size);
|
|
||||||
auto* apps_button = lv_button_create(parent);
|
|
||||||
|
|
||||||
lv_obj_set_style_pad_all(apps_button, static_cast<int32_t>(button_padding), LV_STATE_DEFAULT);
|
|
||||||
if (isLandscape) {
|
|
||||||
lv_obj_set_style_margin_hor(apps_button, itemMargin, LV_STATE_DEFAULT);
|
|
||||||
} else {
|
|
||||||
lv_obj_set_style_margin_ver(apps_button, itemMargin, LV_STATE_DEFAULT);
|
|
||||||
}
|
|
||||||
|
|
||||||
lv_obj_set_style_shadow_width(apps_button, 0, LV_STATE_DEFAULT);
|
|
||||||
lv_obj_set_style_bg_opa(apps_button, 0, LV_STATE_DEFAULT);
|
|
||||||
|
|
||||||
// create the image first
|
|
||||||
auto* button_image = lv_image_create(apps_button);
|
|
||||||
lv_obj_set_style_text_font(button_image, lvgl_get_launcher_icon_font(), LV_STATE_DEFAULT);
|
|
||||||
lv_image_set_src(button_image, imageFile);
|
|
||||||
lv_obj_set_style_text_color(button_image, lv_theme_get_color_primary(button_image), LV_STATE_DEFAULT);
|
|
||||||
lv_obj_set_style_image_recolor(button_image, lv_theme_get_color_primary(parent), LV_STATE_DEFAULT);
|
|
||||||
lv_obj_set_style_image_recolor_opa(button_image, LV_OPA_COVER, LV_STATE_DEFAULT);
|
|
||||||
|
|
||||||
// Ensure it's square (Material Symbols are slightly wider than tall)
|
|
||||||
lv_obj_set_size(button_image, button_size, button_size);
|
|
||||||
|
|
||||||
lv_obj_add_event_cb(apps_button, onAppPressed, LV_EVENT_SHORT_CLICKED, (void*)appId);
|
|
||||||
|
|
||||||
return apps_button;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool shouldShowPowerButton() {
|
bool shouldShowPowerButton() {
|
||||||
@@ -85,180 +65,288 @@ bool shouldShowPowerButton() {
|
|||||||
device_for_each_of_type(&POWER_SUPPLY_TYPE, &show_power_button, [](Device* device, void* context) {
|
device_for_each_of_type(&POWER_SUPPLY_TYPE, &show_power_button, [](Device* device, void* context) {
|
||||||
if (device_is_ready(device) && power_supply_supports_power_off(device)) {
|
if (device_is_ready(device) && power_supply_supports_power_off(device)) {
|
||||||
*static_cast<bool*>(context) = true;
|
*static_cast<bool*>(context) = true;
|
||||||
return false; // stop iterating
|
return false;
|
||||||
} else {
|
|
||||||
return true; // continue iterating
|
|
||||||
}
|
}
|
||||||
|
return true;
|
||||||
});
|
});
|
||||||
return show_power_button;
|
return show_power_button;
|
||||||
}
|
}
|
||||||
|
|
||||||
void onButtonsWrapperResized(lv_event_t* e);
|
int getBatteryPercentage() {
|
||||||
|
Device* power = nullptr;
|
||||||
|
device_for_each_of_type(&POWER_SUPPLY_TYPE, &power, [](Device* device, void* context) {
|
||||||
|
if (device_is_ready(device) && power_supply_supports_property(device, POWER_SUPPLY_PROP_CAPACITY)) {
|
||||||
|
*static_cast<Device**>(context) = device;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
if (power == nullptr) return -1;
|
||||||
|
|
||||||
// The screen object outlives this window's own widgets (lvgl-window-manager deletes and
|
PowerSupplyPropertyValue charge_level;
|
||||||
// recreates only the topmost window's widget on every app switch, not the screen itself), so
|
if (power_supply_get_property(power, POWER_SUPPLY_PROP_CAPACITY, &charge_level) != ERROR_NONE) return -1;
|
||||||
// the LV_EVENT_SIZE_CHANGED callback registered on it must be removed once buttons_wrapper is
|
return std::clamp(charge_level.int_value, 0, 100);
|
||||||
// destroyed, to avoid a dangling user-data pointer the next time the display rotates while a
|
|
||||||
// different window is topmost.
|
|
||||||
void onButtonsWrapperDeleted(lv_event_t* e) {
|
|
||||||
auto* buttons_wrapper = lv_event_get_target_obj(e);
|
|
||||||
auto* screen = lv_obj_get_screen(buttons_wrapper);
|
|
||||||
lv_obj_remove_event_cb_with_user_data(screen, onButtonsWrapperResized, buttons_wrapper);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Re-applies the flex direction and per-button margins when the display orientation changes
|
const char* getWifiStatusIcon(service::wifi::RadioState state) {
|
||||||
// while the launcher is the visible window (these are decided once at createWidgets() based on
|
using enum service::wifi::RadioState;
|
||||||
// the resolution at that time, so a later rotation needs this to catch up).
|
switch (state) {
|
||||||
void onButtonsWrapperResized(lv_event_t* e) {
|
case ConnectionActive: return LVGL_ICON_STATUSBAR_SIGNAL_WIFI_4_BAR;
|
||||||
auto* buttons_wrapper = static_cast<lv_obj_t*>(lv_event_get_user_data(e));
|
case Off:
|
||||||
const auto* display = lv_obj_get_display(buttons_wrapper);
|
case OffPending: return LVGL_ICON_STATUSBAR_SIGNAL_WIFI_OFF;
|
||||||
|
default: return LVGL_ICON_STATUSBAR_SIGNAL_WIFI_0_BAR;
|
||||||
const auto button_size = lvgl_get_launcher_icon_font_height();
|
|
||||||
const auto button_padding = getButtonPadding(lvgl_get_ui_density(), button_size);
|
|
||||||
const auto total_button_size = button_size + (button_padding * 2);
|
|
||||||
|
|
||||||
const auto horizontal_px = lv_display_get_horizontal_resolution(display);
|
|
||||||
const auto vertical_px = lv_display_get_vertical_resolution(display);
|
|
||||||
const bool is_landscape_display = horizontal_px >= vertical_px;
|
|
||||||
const auto current_flow = lv_obj_get_style_flex_flow(buttons_wrapper, LV_PART_MAIN);
|
|
||||||
const bool was_landscape = current_flow == LV_FLEX_FLOW_ROW;
|
|
||||||
if (is_landscape_display == was_landscape) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
lv_obj_set_flex_flow(buttons_wrapper, is_landscape_display ? LV_FLEX_FLOW_ROW : LV_FLEX_FLOW_COLUMN);
|
|
||||||
|
|
||||||
const int32_t margin = is_landscape_display
|
|
||||||
? computeButtonMargin(horizontal_px, total_button_size)
|
|
||||||
: computeButtonMargin(vertical_px, total_button_size);
|
|
||||||
|
|
||||||
const uint32_t child_count = lv_obj_get_child_count(buttons_wrapper);
|
|
||||||
for (uint32_t i = 0; i < child_count; i++) {
|
|
||||||
auto* button = lv_obj_get_child(buttons_wrapper, i);
|
|
||||||
lv_obj_set_style_margin_hor(button, is_landscape_display ? margin : 0, LV_STATE_DEFAULT);
|
|
||||||
lv_obj_set_style_margin_ver(button, is_landscape_display ? 0 : margin, LV_STATE_DEFAULT);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void createWidgets(lv_obj_t* parent, void*) {
|
const char* getBatteryStatusIcon(int percentage) {
|
||||||
auto* buttons_wrapper = lv_obj_create(parent);
|
if (percentage < 0) return "";
|
||||||
|
if (percentage >= 95) return LVGL_ICON_STATUSBAR_BATTERY_ANDROID_FRAME_FULL;
|
||||||
|
if (percentage >= 64) return LVGL_ICON_STATUSBAR_BATTERY_ANDROID_FRAME_5;
|
||||||
|
if (percentage >= 32) return LVGL_ICON_STATUSBAR_BATTERY_ANDROID_FRAME_3;
|
||||||
|
return LVGL_ICON_STATUSBAR_BATTERY_ANDROID_FRAME_1;
|
||||||
|
}
|
||||||
|
|
||||||
auto ui_density = lvgl_get_ui_density();
|
lv_obj_t* createAppButton(lv_obj_t* parent, const char* icon, const char* app_id, bool emphasized) {
|
||||||
const auto button_size = lvgl_get_launcher_icon_font_height();
|
auto* button = lv_button_create(parent);
|
||||||
const auto button_padding = getButtonPadding(ui_density, button_size);
|
lv_obj_set_size(button, 52, 52);
|
||||||
const auto total_button_size = button_size + (button_padding * 2);
|
lv_obj_set_style_radius(button, 15, LV_PART_MAIN);
|
||||||
|
lv_obj_set_style_shadow_width(button, 0, LV_PART_MAIN);
|
||||||
|
lv_obj_set_style_border_width(button, emphasized ? 2 : 1, LV_PART_MAIN);
|
||||||
|
lv_obj_set_style_border_color(button, emphasized ? ACCENT_COLOR : lv_color_hex(0x746568), LV_PART_MAIN);
|
||||||
|
lv_obj_set_style_border_opa(button, emphasized ? LV_OPA_COVER : LV_OPA_60, LV_PART_MAIN);
|
||||||
|
lv_obj_set_style_bg_color(button, lv_color_hex(0x211B20), LV_PART_MAIN);
|
||||||
|
lv_obj_set_style_bg_opa(button, emphasized ? LV_OPA_80 : LV_OPA_70, LV_PART_MAIN);
|
||||||
|
lv_obj_set_style_bg_color(button, lv_color_hex(0x392C32), LV_STATE_PRESSED);
|
||||||
|
lv_obj_set_style_transform_scale(button, 238, LV_STATE_PRESSED);
|
||||||
|
lv_obj_set_style_outline_color(button, ACCENT_COLOR, LV_STATE_FOCUSED);
|
||||||
|
lv_obj_set_style_outline_width(button, 2, LV_STATE_FOCUSED);
|
||||||
|
lv_obj_set_style_outline_pad(button, 2, LV_STATE_FOCUSED);
|
||||||
|
|
||||||
lv_obj_align(buttons_wrapper, LV_ALIGN_CENTER, 0, 0);
|
auto* image = lv_image_create(button);
|
||||||
lv_obj_set_size(buttons_wrapper, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
|
lv_obj_set_size(image, 36, 36);
|
||||||
lv_obj_set_style_border_width(buttons_wrapper, 0, LV_STATE_DEFAULT);
|
lv_obj_center(image);
|
||||||
lv_obj_set_flex_grow(buttons_wrapper, 1);
|
lv_obj_set_style_text_font(image, lvgl_get_launcher_icon_font(), LV_STATE_DEFAULT);
|
||||||
|
lv_image_set_src(image, icon);
|
||||||
|
lv_obj_set_style_image_recolor(image, TEXT_COLOR, LV_STATE_DEFAULT);
|
||||||
|
lv_obj_set_style_image_recolor_opa(image, LV_OPA_COVER, LV_STATE_DEFAULT);
|
||||||
|
lv_obj_add_event_cb(button, onAppPressed, LV_EVENT_SHORT_CLICKED, const_cast<char*>(app_id));
|
||||||
|
return button;
|
||||||
|
}
|
||||||
|
|
||||||
// Fix for button selection
|
void updateInformation(LauncherWidgets& widgets) {
|
||||||
lv_obj_set_style_pad_all(buttons_wrapper, 6, LV_STATE_DEFAULT);
|
const std::time_t now = std::time(nullptr);
|
||||||
|
std::tm local_time {};
|
||||||
const auto* display = lv_obj_get_display(parent);
|
localtime_r(&now, &local_time);
|
||||||
const auto horizontal_px = lv_display_get_horizontal_resolution(display);
|
char time_buffer[12];
|
||||||
const auto vertical_px = lv_display_get_vertical_resolution(display);
|
char date_buffer[40];
|
||||||
const bool is_landscape_display = horizontal_px >= vertical_px;
|
if (local_time.tm_year >= 125) {
|
||||||
if (is_landscape_display) {
|
if (settings::isTimeFormat24Hour()) {
|
||||||
lv_obj_set_flex_flow(buttons_wrapper, LV_FLEX_FLOW_ROW);
|
std::strftime(time_buffer, sizeof(time_buffer), "%H:%M", &local_time);
|
||||||
|
} else {
|
||||||
|
std::strftime(time_buffer, sizeof(time_buffer), "%I:%M", &local_time);
|
||||||
|
if (time_buffer[0] == '0') std::memmove(time_buffer, time_buffer + 1, std::strlen(time_buffer));
|
||||||
|
}
|
||||||
|
std::strftime(date_buffer, sizeof(date_buffer), "%A, %B %e", &local_time);
|
||||||
} else {
|
} else {
|
||||||
lv_obj_set_flex_flow(buttons_wrapper, LV_FLEX_FLOW_COLUMN);
|
std::strcpy(time_buffer, "--:--");
|
||||||
|
std::strcpy(date_buffer, "Set date and time");
|
||||||
|
}
|
||||||
|
lv_label_set_text(widgets.timeLabel, time_buffer);
|
||||||
|
lv_label_set_text(widgets.dateLabel, date_buffer);
|
||||||
|
|
||||||
|
const auto wifi_state = service::wifi::getRadioState();
|
||||||
|
std::string sd_card_path;
|
||||||
|
const bool sd_ready = findFirstMountedSdCardPath(sd_card_path);
|
||||||
|
const int battery_percentage = getBatteryPercentage();
|
||||||
|
char data_buffer[80];
|
||||||
|
if (battery_percentage >= 0) {
|
||||||
|
std::snprintf(data_buffer, sizeof(data_buffer), "%s • %s • %d%%",
|
||||||
|
wifi_state == service::wifi::RadioState::ConnectionActive ? "Wi-Fi connected" : "Wi-Fi offline",
|
||||||
|
sd_ready ? "SD ready" : "No SD", battery_percentage);
|
||||||
|
} else {
|
||||||
|
std::snprintf(data_buffer, sizeof(data_buffer), "%s • %s",
|
||||||
|
wifi_state == service::wifi::RadioState::ConnectionActive ? "Wi-Fi connected" : "Wi-Fi offline",
|
||||||
|
sd_ready ? "SD ready" : "No SD");
|
||||||
|
}
|
||||||
|
lv_label_set_text(widgets.dataLabel, data_buffer);
|
||||||
|
|
||||||
|
char status_buffer[24];
|
||||||
|
std::snprintf(status_buffer, sizeof(status_buffer), "%s%s", getWifiStatusIcon(wifi_state), getBatteryStatusIcon(battery_percentage));
|
||||||
|
lv_label_set_text(widgets.statusLabel, status_buffer);
|
||||||
|
}
|
||||||
|
|
||||||
|
void onUpdateTimer(lv_timer_t* timer) {
|
||||||
|
updateInformation(*static_cast<LauncherWidgets*>(lv_timer_get_user_data(timer)));
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string getDefaultBackgroundPath() {
|
||||||
|
return std::string(file::MOUNT_POINT_SYSTEM) + "/app/Launcher/assets/" + BACKGROUND_ASSET;
|
||||||
|
}
|
||||||
|
|
||||||
|
void createWidgets(lv_obj_t* parent, void* user_data) {
|
||||||
|
auto& widgets = *static_cast<LauncherWidgets*>(user_data);
|
||||||
|
lv_obj_set_style_bg_color(parent, lv_color_hex(0x211A20), LV_PART_MAIN);
|
||||||
|
lv_obj_set_style_bg_opa(parent, LV_OPA_COVER, LV_PART_MAIN);
|
||||||
|
lv_obj_set_style_pad_all(parent, 0, LV_PART_MAIN);
|
||||||
|
lv_obj_clear_flag(parent, LV_OBJ_FLAG_SCROLLABLE);
|
||||||
|
|
||||||
|
auto* display = lv_obj_get_display(parent);
|
||||||
|
const auto display_width = lv_display_get_horizontal_resolution(display);
|
||||||
|
const auto display_height = lv_display_get_vertical_resolution(display);
|
||||||
|
const bool is_portrait = display_height > display_width;
|
||||||
|
|
||||||
|
auto background_path = lvgl::PATH_PREFIX + getDefaultBackgroundPath();
|
||||||
|
std::string sd_card_path;
|
||||||
|
if (findFirstMountedSdCardPath(sd_card_path)) {
|
||||||
|
const auto custom_background_path = file::getChildPath(sd_card_path, CUSTOM_BACKGROUND_PATH);
|
||||||
|
if (file::isFile(custom_background_path)) {
|
||||||
|
const auto lvgl_custom_background_path = lvgl::PATH_PREFIX + custom_background_path;
|
||||||
|
lv_image_header_t header {};
|
||||||
|
if (lv_image_decoder_get_info(lvgl_custom_background_path.c_str(), &header) == LV_RESULT_OK) {
|
||||||
|
if (header.w >= display_width && header.h >= display_height) {
|
||||||
|
background_path = lvgl_custom_background_path;
|
||||||
|
LOG_I(TAG, "Using SD background %s (%ux%u, format 0x%02x)",
|
||||||
|
custom_background_path.c_str(), header.w, header.h, header.cf);
|
||||||
|
} else {
|
||||||
|
LOG_W(TAG, "Ignoring undersized SD background %s (%ux%u for %dx%d display)",
|
||||||
|
custom_background_path.c_str(), header.w, header.h, display_width, display_height);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
LOG_W(TAG, "Ignoring invalid SD background %s", custom_background_path.c_str());
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const int32_t margin = is_landscape_display
|
auto* background = lv_image_create(parent);
|
||||||
? computeButtonMargin(lv_display_get_horizontal_resolution(display), total_button_size)
|
lv_image_set_src(background, background_path.c_str());
|
||||||
: computeButtonMargin(lv_display_get_vertical_resolution(display), total_button_size);
|
lv_obj_align(background, LV_ALIGN_CENTER, 0, 0);
|
||||||
|
lv_obj_add_flag(background, LV_OBJ_FLAG_IGNORE_LAYOUT);
|
||||||
|
|
||||||
auto* app_list_button = createAppButton(buttons_wrapper, ui_density, LVGL_ICON_LAUNCHER_APPS, "tactility.applist", margin, is_landscape_display);
|
widgets.timeLabel = lv_label_create(parent);
|
||||||
createAppButton(buttons_wrapper, ui_density, LVGL_ICON_LAUNCHER_FOLDER, "tactility.files", margin, is_landscape_display);
|
lv_label_set_text(widgets.timeLabel, "--:--");
|
||||||
createAppButton(buttons_wrapper, ui_density, LVGL_ICON_LAUNCHER_SETTINGS, "tactility.settings", margin, is_landscape_display);
|
lv_obj_set_style_text_color(widgets.timeLabel, TEXT_COLOR, LV_PART_MAIN);
|
||||||
|
#if LV_FONT_MONTSERRAT_48
|
||||||
|
lv_obj_set_style_text_font(widgets.timeLabel, &lv_font_montserrat_48, LV_PART_MAIN);
|
||||||
|
#else
|
||||||
|
lv_obj_set_style_text_font(widgets.timeLabel, lvgl_get_text_font(FONT_SIZE_LARGE), LV_PART_MAIN);
|
||||||
|
#endif
|
||||||
|
lv_obj_align(widgets.timeLabel, LV_ALIGN_TOP_LEFT, 18, 58);
|
||||||
|
|
||||||
// The launcher's container is several levels below the screen, and LVGL only sends
|
widgets.dateLabel = lv_label_create(parent);
|
||||||
// LV_EVENT_SIZE_CHANGED to the screen object itself on a resolution change - so the
|
lv_obj_set_style_text_font(widgets.dateLabel, lvgl_get_text_font(FONT_SIZE_LARGE), LV_PART_MAIN);
|
||||||
// handler is attached there, with buttons_wrapper passed through as user data.
|
lv_obj_set_style_text_color(widgets.dateLabel, TEXT_COLOR, LV_PART_MAIN);
|
||||||
lv_obj_add_event_cb(lv_obj_get_screen(parent), onButtonsWrapperResized, LV_EVENT_SIZE_CHANGED, buttons_wrapper);
|
lv_obj_align(widgets.dateLabel, LV_ALIGN_TOP_LEFT, 20, 118);
|
||||||
lv_obj_add_event_cb(buttons_wrapper, onButtonsWrapperDeleted, LV_EVENT_DELETE, nullptr);
|
|
||||||
|
widgets.dataLabel = lv_label_create(parent);
|
||||||
|
lv_obj_set_width(widgets.dataLabel, is_portrait ? display_width - 40 : 225);
|
||||||
|
lv_label_set_long_mode(widgets.dataLabel, LV_LABEL_LONG_MODE_WRAP);
|
||||||
|
lv_obj_set_style_text_font(widgets.dataLabel, lvgl_get_text_font(FONT_SIZE_SMALL), LV_PART_MAIN);
|
||||||
|
lv_obj_set_style_text_color(widgets.dataLabel, MUTED_TEXT_COLOR, LV_PART_MAIN);
|
||||||
|
lv_obj_align(widgets.dataLabel, LV_ALIGN_TOP_LEFT, 20, 148);
|
||||||
|
|
||||||
|
widgets.statusLabel = lv_label_create(parent);
|
||||||
|
lv_obj_set_style_text_font(widgets.statusLabel, lvgl_get_statusbar_icon_font(), LV_PART_MAIN);
|
||||||
|
lv_obj_set_style_text_color(widgets.statusLabel, TEXT_COLOR, LV_PART_MAIN);
|
||||||
|
lv_obj_align(widgets.statusLabel, LV_ALIGN_TOP_RIGHT, -15, 8);
|
||||||
|
|
||||||
|
auto* button_rail = lv_obj_create(parent);
|
||||||
|
if (is_portrait) {
|
||||||
|
lv_obj_set_size(button_rail, 184, 60);
|
||||||
|
lv_obj_align(button_rail, LV_ALIGN_BOTTOM_MID, 0, -7);
|
||||||
|
lv_obj_set_flex_flow(button_rail, LV_FLEX_FLOW_ROW);
|
||||||
|
} else {
|
||||||
|
lv_obj_set_size(button_rail, 60, 184);
|
||||||
|
lv_obj_align(button_rail, LV_ALIGN_RIGHT_MID, -7, 8);
|
||||||
|
lv_obj_set_flex_flow(button_rail, LV_FLEX_FLOW_COLUMN);
|
||||||
|
}
|
||||||
|
lv_obj_set_flex_align(button_rail, LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER);
|
||||||
|
lv_obj_set_style_pad_all(button_rail, 0, LV_PART_MAIN);
|
||||||
|
lv_obj_set_style_border_width(button_rail, 0, LV_PART_MAIN);
|
||||||
|
lv_obj_set_style_bg_opa(button_rail, LV_OPA_TRANSP, LV_PART_MAIN);
|
||||||
|
lv_obj_clear_flag(button_rail, LV_OBJ_FLAG_SCROLLABLE);
|
||||||
|
|
||||||
|
auto* app_list_button = createAppButton(button_rail, LVGL_ICON_LAUNCHER_APPS, "tactility.applist", true);
|
||||||
|
createAppButton(button_rail, LVGL_ICON_LAUNCHER_FOLDER, "tactility.files", false);
|
||||||
|
createAppButton(button_rail, LVGL_ICON_LAUNCHER_SETTINGS, "tactility.settings", false);
|
||||||
|
|
||||||
// Some devices (e.g. T-Lora Pager) have no other way to power off, so the
|
|
||||||
// button stays in the launcher; the confirmation flow lives in the PowerOff app.
|
|
||||||
if (shouldShowPowerButton()) {
|
if (shouldShowPowerButton()) {
|
||||||
auto* power_button = lv_button_create(parent);
|
auto* power_button = lv_button_create(parent);
|
||||||
lv_obj_set_style_pad_all(power_button, 8, 0);
|
lv_obj_set_size(power_button, 36, 36);
|
||||||
lv_obj_align(power_button, LV_ALIGN_BOTTOM_MID, 0, -10);
|
lv_obj_align(power_button, LV_ALIGN_BOTTOM_LEFT, 16, -12);
|
||||||
lv_obj_add_event_cb(power_button, onAppPressed, LV_EVENT_SHORT_CLICKED, (void*)"tactility.poweroff");
|
lv_obj_set_style_radius(power_button, LV_RADIUS_CIRCLE, LV_PART_MAIN);
|
||||||
lv_obj_set_style_shadow_width(power_button, 0, LV_STATE_DEFAULT);
|
lv_obj_set_style_shadow_width(power_button, 0, LV_PART_MAIN);
|
||||||
lv_obj_set_style_bg_opa(power_button, 0, LV_PART_MAIN);
|
lv_obj_set_style_bg_color(power_button, lv_color_hex(0x211B20), LV_PART_MAIN);
|
||||||
|
lv_obj_set_style_bg_opa(power_button, LV_OPA_70, LV_PART_MAIN);
|
||||||
|
lv_obj_add_event_cb(power_button, onAppPressed, LV_EVENT_SHORT_CLICKED, const_cast<char*>("tactility.poweroff"));
|
||||||
auto* power_label = lv_label_create(power_button);
|
auto* power_label = lv_label_create(power_button);
|
||||||
lv_label_set_text(power_label, LV_SYMBOL_POWER);
|
lv_label_set_text(power_label, LV_SYMBOL_POWER);
|
||||||
lv_obj_set_style_text_color(power_label, lv_theme_get_color_primary(parent), LV_STATE_DEFAULT);
|
lv_obj_set_style_text_color(power_label, TEXT_COLOR, LV_PART_MAIN);
|
||||||
|
lv_obj_center(power_label);
|
||||||
}
|
}
|
||||||
|
|
||||||
// If we don't have a touch device, we assume there's some other kind of input like a keyboard, an encoder or button control
|
|
||||||
// In that scenario we want to automatically have the app list button selected so the user doesn't have to press the widget selection
|
|
||||||
// an extra time.
|
|
||||||
if (!device_has_active_by_type(&POINTER_TYPE)) {
|
if (!device_has_active_by_type(&POINTER_TYPE)) {
|
||||||
// lv_obj_update_layout(parent); // Resolve flex layout first, so focus/state invalidate against final coords
|
|
||||||
lv_group_focus_obj(app_list_button);
|
lv_group_focus_obj(app_list_button);
|
||||||
lv_obj_add_state(app_list_button, LV_STATE_FOCUS_KEY);
|
lv_obj_add_state(app_list_button, LV_STATE_FOCUS_KEY);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
updateInformation(widgets);
|
||||||
|
widgets.updateTimer = lv_timer_create(onUpdateTimer, 1000, &widgets);
|
||||||
|
}
|
||||||
|
|
||||||
|
void destroyWidgets(void* user_data) {
|
||||||
|
auto& widgets = *static_cast<LauncherWidgets*>(user_data);
|
||||||
|
if (widgets.updateTimer != nullptr) {
|
||||||
|
lv_timer_delete(widgets.updateTimer);
|
||||||
|
widgets.updateTimer = nullptr;
|
||||||
|
}
|
||||||
|
widgets.timeLabel = nullptr;
|
||||||
|
widgets.dateLabel = nullptr;
|
||||||
|
widgets.dataLabel = nullptr;
|
||||||
|
widgets.statusLabel = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
void runAutoStart() {
|
void runAutoStart() {
|
||||||
settings::BootSettings boot_properties;
|
settings::BootSettings boot_properties;
|
||||||
AppManifest manifest;
|
AppManifest manifest;
|
||||||
if (
|
if (strcmp(CONFIG_TT_AUTO_START_APP_ID, "") != 0 &&
|
||||||
// Auto-start due to built-in requirement
|
app_manager_find_manifest(CONFIG_TT_AUTO_START_APP_ID, &manifest) == ERROR_NONE) {
|
||||||
strcmp(CONFIG_TT_AUTO_START_APP_ID, "") != 0 &&
|
|
||||||
app_manager_find_manifest(CONFIG_TT_AUTO_START_APP_ID, &manifest) == ERROR_NONE
|
|
||||||
) {
|
|
||||||
LOG_I(TAG, "Starting %s", CONFIG_TT_AUTO_START_APP_ID);
|
LOG_I(TAG, "Starting %s", CONFIG_TT_AUTO_START_APP_ID);
|
||||||
uint32_t app_launch_id;
|
uint32_t app_launch_id;
|
||||||
app_start(CONFIG_TT_AUTO_START_APP_ID, 0, nullptr, &app_launch_id);
|
app_start(CONFIG_TT_AUTO_START_APP_ID, 0, nullptr, &app_launch_id);
|
||||||
} else if (
|
} else if (settings::loadBootSettings(boot_properties) &&
|
||||||
// Auto-start due to user configuration
|
!boot_properties.autoStartAppId.empty() &&
|
||||||
settings::loadBootSettings(boot_properties) &&
|
app_manager_find_manifest(boot_properties.autoStartAppId.c_str(), &manifest) == ERROR_NONE) {
|
||||||
!boot_properties.autoStartAppId.empty() &&
|
|
||||||
app_manager_find_manifest(boot_properties.autoStartAppId.c_str(), &manifest) == ERROR_NONE
|
|
||||||
) {
|
|
||||||
LOG_I(TAG, "Starting %s", boot_properties.autoStartAppId.c_str());
|
LOG_I(TAG, "Starting %s", boot_properties.autoStartAppId.c_str());
|
||||||
uint32_t app_launch_id;
|
uint32_t app_launch_id;
|
||||||
app_start(boot_properties.autoStartAppId.c_str(), 0, nullptr, &app_launch_id);
|
app_start(boot_properties.autoStartAppId.c_str(), 0, nullptr, &app_launch_id);
|
||||||
} else {
|
} else if (!setup::isCompleted()) {
|
||||||
// No auto-start, consider running system setup
|
setup::start();
|
||||||
if (!setup::isCompleted()) {
|
|
||||||
setup::start();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t appMain(int argc, char* argv[]) {
|
int32_t appMain(int argc, char* argv[]) {
|
||||||
uint32_t appInstanceId = app_scheduler_current_app_id();
|
uint32_t app_instance_id = app_scheduler_current_app_id();
|
||||||
runAutoStart();
|
runAutoStart();
|
||||||
|
|
||||||
|
LauncherWidgets widgets;
|
||||||
|
WindowId window = window_manager_create_ext(app_instance_id, createWidgets, destroyWidgets, &widgets);
|
||||||
|
|
||||||
TaskEventGroup event_group {};
|
TaskEventGroup event_group {};
|
||||||
task_event_group_construct(&event_group);
|
task_event_group_construct(&event_group);
|
||||||
|
|
||||||
AppEventSubscription sub {};
|
AppEventSubscription sub {};
|
||||||
check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
|
check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
|
||||||
|
|
||||||
WindowId window = window_manager_create(appInstanceId, createWidgets, nullptr);
|
|
||||||
|
|
||||||
// The launcher is meant to stay resident (it's the home screen) - it only gives up its
|
|
||||||
// thread when app-module's scheduler asks it to (e.g. another new-model app is started).
|
|
||||||
while (true) {
|
while (true) {
|
||||||
task_event_group_wait_any(&event_group, nullptr, portMAX_DELAY);
|
task_event_group_wait_any(&event_group, nullptr, portMAX_DELAY);
|
||||||
|
bool should_close = false;
|
||||||
bool shouldClose = false;
|
|
||||||
AppEvent event {};
|
AppEvent event {};
|
||||||
while (app_event_poll(&sub, &event) == ERROR_NONE) {
|
while (app_event_poll(&sub, &event) == ERROR_NONE) {
|
||||||
if (event.type == APP_EVENT_CLOSE) {
|
if (event.type == APP_EVENT_CLOSE) {
|
||||||
shouldClose = true;
|
should_close = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (shouldClose) break;
|
if (should_close) break;
|
||||||
}
|
}
|
||||||
|
|
||||||
window_manager_remove(window);
|
window_manager_remove(window);
|
||||||
@@ -275,16 +363,13 @@ extern const ::AppManifest manifest = {
|
|||||||
.category = APP_CATEGORY_SYSTEM,
|
.category = APP_CATEGORY_SYSTEM,
|
||||||
.location = { .type = APP_LOCATION_MEMORY, .location = reinterpret_cast<void*>(appMain) },
|
.location = { .type = APP_LOCATION_MEMORY, .location = reinterpret_cast<void*>(appMain) },
|
||||||
.flags = APP_MANIFEST_FLAG_HIDDEN,
|
.flags = APP_MANIFEST_FLAG_HIDDEN,
|
||||||
// No file IO, so callstack can be in external RAM
|
.stack = { .depth = 3072, .desired_memory_capability = MEMORY_CAPABILITY_EXTERNAL }
|
||||||
.stack = { .depth = 3072 , .desired_memory_capability = MEMORY_CAPABILITY_EXTERNAL }
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// Kept for Tactility/Private/Tactility/app/launcher/Launcher.h's existing declaration (still
|
|
||||||
// used by the old, unconverted CrashDiagnostics app to return to the launcher after a crash).
|
|
||||||
uint32_t start() {
|
uint32_t start() {
|
||||||
uint32_t instance_id = 0;
|
uint32_t instance_id = 0;
|
||||||
app_start(manifest.id, 0, nullptr, &instance_id);
|
app_start(manifest.id, 0, nullptr, &instance_id);
|
||||||
return instance_id;
|
return instance_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace tt::app::launcher
|
||||||
|
|||||||
@@ -182,7 +182,8 @@ extern const ::AppManifest manifest = {
|
|||||||
.id = "tactility.localesettings",
|
.id = "tactility.localesettings",
|
||||||
.name = "Region & Language",
|
.name = "Region & Language",
|
||||||
.category = APP_CATEGORY_SETTINGS,
|
.category = APP_CATEGORY_SETTINGS,
|
||||||
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) }
|
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) },
|
||||||
|
.flags = APP_MANIFEST_FLAG_HIDDEN
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace tt::app::localesettings
|
} // namespace tt::app::localesettings
|
||||||
|
|||||||
@@ -0,0 +1,97 @@
|
|||||||
|
#ifdef ESP_PLATFORM
|
||||||
|
#include <Tactility/Tactility.h>
|
||||||
|
#include <Tactility/lvgl/Lvgl.h>
|
||||||
|
#include <Tactility/settings/McpSettings.h>
|
||||||
|
#include <Tactility/settings/WebServerSettings.h>
|
||||||
|
#include <Tactility/service/webserver/WebServerService.h>
|
||||||
|
#include <app/event.h>
|
||||||
|
#include <app/manifest.h>
|
||||||
|
#include <app/scheduler.h>
|
||||||
|
#include <lvgl_window_manager/window_manager.h>
|
||||||
|
#include <lvgl/widgets/toolbar.h>
|
||||||
|
#include <lvgl/lvgl.h>
|
||||||
|
#include <tactility/check.h>
|
||||||
|
#include <tactility/log.h>
|
||||||
|
#include <esp_netif.h>
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
namespace tt::app::mcpsettings {
|
||||||
|
constexpr auto* TAG = "McpSettingsApp";
|
||||||
|
extern const ::AppManifest manifest;
|
||||||
|
namespace {
|
||||||
|
struct Context {
|
||||||
|
uint32_t appInstanceId;
|
||||||
|
settings::mcp::McpSettings mcpSettings;
|
||||||
|
settings::webserver::WebServerSettings wsSettings;
|
||||||
|
lv_obj_t* switchMcpEnabled = nullptr;
|
||||||
|
lv_obj_t* labelUrlValue = nullptr;
|
||||||
|
};
|
||||||
|
|
||||||
|
void updateUrlDisplay(Context* ctx) {
|
||||||
|
if (ctx->labelUrlValue == nullptr) return;
|
||||||
|
if (!ctx->mcpSettings.mcpEnabled) { lv_label_set_text(ctx->labelUrlValue, "Disabled"); return; }
|
||||||
|
std::string url = "http://";
|
||||||
|
bool ipAdded = false;
|
||||||
|
for (const char* key : {"WIFI_STA_DEF", "WIFI_AP_DEF"}) {
|
||||||
|
auto* netif = esp_netif_get_handle_from_ifkey(key);
|
||||||
|
if (netif != nullptr) {
|
||||||
|
esp_netif_ip_info_t info;
|
||||||
|
if (esp_netif_get_ip_info(netif, &info) == ESP_OK && info.ip.addr != 0) {
|
||||||
|
char ip[16]; snprintf(ip, sizeof(ip), IPSTR, IP2STR(&info.ip));
|
||||||
|
url += ip; ipAdded = true; break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!ipAdded) url += ctx->wsSettings.wifiMode == settings::webserver::WiFiMode::AccessPoint ? "192.168.4.1" : "Connecting...";
|
||||||
|
if (url.starts_with("http://") && ctx->wsSettings.webServerPort != 80) url += ":" + std::to_string(ctx->wsSettings.webServerPort);
|
||||||
|
url += "/api/mcp";
|
||||||
|
lv_label_set_text(ctx->labelUrlValue, url.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
void onBackPressed(lv_event_t* event) {
|
||||||
|
auto* ctx = static_cast<Context*>(lv_event_get_user_data(event));
|
||||||
|
app_event_emit_close(ctx->appInstanceId);
|
||||||
|
}
|
||||||
|
|
||||||
|
void onMcpEnabledSwitch(lv_event_t* event) {
|
||||||
|
auto* ctx = static_cast<Context*>(lv_event_get_user_data(event));
|
||||||
|
const bool enabled = lv_obj_has_state(ctx->switchMcpEnabled, LV_STATE_CHECKED);
|
||||||
|
getMainDispatcher().dispatch([ctx, enabled] {
|
||||||
|
ctx->mcpSettings.mcpEnabled = enabled;
|
||||||
|
lvgl_lock(); updateUrlDisplay(ctx); lvgl_unlock();
|
||||||
|
if (!settings::mcp::save(ctx->mcpSettings)) LOG_W(TAG, "Failed to persist MCP settings");
|
||||||
|
service::webserver::getPubsub()->publish(service::webserver::WebServerEvent::WebServerSettingsChanged);
|
||||||
|
service::webserver::setWebServerEnabled(enabled);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
void createWidgets(lv_obj_t* parent, void* userData) {
|
||||||
|
auto* ctx = static_cast<Context*>(userData);
|
||||||
|
ctx->wsSettings = settings::webserver::loadOrGetDefault();
|
||||||
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
|
auto* toolbar = lvgl_toolbar_create(parent, "MCP Settings");
|
||||||
|
lvgl_toolbar_set_nav_action(toolbar, LV_SYMBOL_CLOSE, onBackPressed, ctx);
|
||||||
|
ctx->switchMcpEnabled = lvgl_toolbar_add_switch_action(toolbar);
|
||||||
|
if (ctx->mcpSettings.mcpEnabled) lv_obj_add_state(ctx->switchMcpEnabled, LV_STATE_CHECKED);
|
||||||
|
lv_obj_add_event_cb(ctx->switchMcpEnabled, onMcpEnabledSwitch, LV_EVENT_VALUE_CHANGED, ctx);
|
||||||
|
auto* main = lv_obj_create(parent); lv_obj_set_flex_flow(main, LV_FLEX_FLOW_COLUMN); lv_obj_set_width(main, LV_PCT(100)); lv_obj_set_flex_grow(main, 1);
|
||||||
|
auto* wrapper = lv_obj_create(main); lv_obj_set_size(wrapper, LV_PCT(100), LV_SIZE_CONTENT); lv_obj_set_style_pad_all(wrapper, 10, LV_STATE_DEFAULT); lv_obj_set_style_border_width(wrapper, 1, LV_STATE_DEFAULT); lv_obj_set_flex_flow(wrapper, LV_FLEX_FLOW_COLUMN); lv_obj_set_style_flex_cross_place(wrapper, LV_FLEX_ALIGN_START, 0);
|
||||||
|
auto* title = lv_label_create(wrapper); lv_label_set_text(title, "MCP Endpoint URL:");
|
||||||
|
ctx->labelUrlValue = lv_label_create(wrapper); updateUrlDisplay(ctx);
|
||||||
|
auto* info = lv_label_create(main); lv_label_set_long_mode(info, LV_LABEL_LONG_WRAP); lv_obj_set_width(info, LV_PCT(95));
|
||||||
|
lv_label_set_text(info, "MCP (Model Context Protocol) Screen service allows LLMs to interact with the device screen, audio, and tools directly.\n\nEndpoints:\n- POST /api/mcp (JSON-RPC tools)\n- POST /api/screen/raw (big-endian RGB565 writes)\n\nTo show the LLM canvas, select 'MCP Screen' in Settings -> Display -> Screensaver. The canvas also pops up automatically when an LLM sends a draw command.");
|
||||||
|
}
|
||||||
|
|
||||||
|
int32_t appMain(int, char**) {
|
||||||
|
Context ctx{}; ctx.appInstanceId = app_scheduler_current_app_id(); ctx.mcpSettings = settings::mcp::loadOrGetDefault();
|
||||||
|
TaskEventGroup group{}; task_event_group_construct(&group); AppEventSubscription sub{}; check(app_event_subscribe(&sub, &group) == ERROR_NONE);
|
||||||
|
auto window = window_manager_create(ctx.appInstanceId, createWidgets, &ctx); bool close = false;
|
||||||
|
while (!close) { task_event_group_wait_any(&group, nullptr, portMAX_DELAY); AppEvent event{}; while (app_event_poll(&sub, &event) == ERROR_NONE) if (event.type == APP_EVENT_CLOSE) { close = true; break; } }
|
||||||
|
window_manager_remove(window); check(app_event_unsubscribe(&sub) == ERROR_NONE); task_event_group_destruct(&group); return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
extern const ::AppManifest manifest = { .id = "McpSettings", .name = "MCP Screen", .category = APP_CATEGORY_SETTINGS, .location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) }, .flags = APP_MANIFEST_FLAG_HIDDEN, .stack = { .depth = 8192, .desired_memory_capability = 0 } };
|
||||||
|
}
|
||||||
|
#endif
|
||||||
@@ -276,7 +276,8 @@ extern const ::AppManifest manifest = {
|
|||||||
.id = "tactility.notes",
|
.id = "tactility.notes",
|
||||||
.name = "Notes",
|
.name = "Notes",
|
||||||
.category = APP_CATEGORY_USER,
|
.category = APP_CATEGORY_USER,
|
||||||
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) }
|
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) },
|
||||||
|
.flags = APP_MANIFEST_FLAG_HIDDEN
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace tt::app::notes
|
} // namespace tt::app::notes
|
||||||
|
|||||||
@@ -278,7 +278,8 @@ extern const ::AppManifest manifest = {
|
|||||||
.id = "tactility.power",
|
.id = "tactility.power",
|
||||||
.name = "Power",
|
.name = "Power",
|
||||||
.category = APP_CATEGORY_SETTINGS,
|
.category = APP_CATEGORY_SETTINGS,
|
||||||
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) }
|
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) },
|
||||||
|
.flags = APP_MANIFEST_FLAG_HIDDEN
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
@@ -290,7 +290,8 @@ extern const ::AppManifest manifest = {
|
|||||||
.id = "tactility.screenshot",
|
.id = "tactility.screenshot",
|
||||||
.name = "Screenshot",
|
.name = "Screenshot",
|
||||||
.category = APP_CATEGORY_SYSTEM,
|
.category = APP_CATEGORY_SYSTEM,
|
||||||
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) }
|
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) },
|
||||||
|
.flags = APP_MANIFEST_FLAG_HIDDEN
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ extern const ::AppManifest manifest = {
|
|||||||
.category = APP_CATEGORY_SYSTEM,
|
.category = APP_CATEGORY_SYSTEM,
|
||||||
.location = { .type = APP_LOCATION_MEMORY, .location = reinterpret_cast<void*>(appMain) },
|
.location = { .type = APP_LOCATION_MEMORY, .location = reinterpret_cast<void*>(appMain) },
|
||||||
.flags = APP_MANIFEST_FLAG_HIDDEN,
|
.flags = APP_MANIFEST_FLAG_HIDDEN,
|
||||||
.stack = { .depth = 2400, .desired_memory_capability = 0 },
|
.stack = { .depth = 3072, .desired_memory_capability = 0 },
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
@@ -457,7 +457,8 @@ extern const ::AppManifest manifest = {
|
|||||||
.id = "tactility.systeminfo",
|
.id = "tactility.systeminfo",
|
||||||
.name = "System Info",
|
.name = "System Info",
|
||||||
.category = APP_CATEGORY_SYSTEM,
|
.category = APP_CATEGORY_SYSTEM,
|
||||||
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) }
|
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) },
|
||||||
|
.flags = APP_MANIFEST_FLAG_HIDDEN
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
@@ -215,7 +215,8 @@ extern const ::AppManifest manifest = {
|
|||||||
.id = "tactility.timedatesettings",
|
.id = "tactility.timedatesettings",
|
||||||
.name = "Time & Date",
|
.name = "Time & Date",
|
||||||
.category = APP_CATEGORY_SETTINGS,
|
.category = APP_CATEGORY_SETTINGS,
|
||||||
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) }
|
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) },
|
||||||
|
.flags = APP_MANIFEST_FLAG_HIDDEN
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace tt::app::timedatesettings
|
} // namespace tt::app::timedatesettings
|
||||||
|
|||||||
@@ -424,7 +424,8 @@ extern const ::AppManifest manifest = {
|
|||||||
.id = "tactility.webserversettings",
|
.id = "tactility.webserversettings",
|
||||||
.name = "Web Server",
|
.name = "Web Server",
|
||||||
.category = APP_CATEGORY_SYSTEM,
|
.category = APP_CATEGORY_SYSTEM,
|
||||||
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) }
|
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) },
|
||||||
|
.flags = APP_MANIFEST_FLAG_HIDDEN
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,52 @@
|
|||||||
|
#include <Tactility/lvgl/Lvgl.h>
|
||||||
|
#include <Tactility/settings/DisplaySettings.h>
|
||||||
|
|
||||||
|
#include <lvgl/fonts.h>
|
||||||
|
#include <lvgl/lvgl.h>
|
||||||
|
|
||||||
|
namespace tt::lvgl {
|
||||||
|
|
||||||
|
void applyFontSize(settings::display::FontSize fontSize) {
|
||||||
|
LvglFontScale scale;
|
||||||
|
switch (fontSize) {
|
||||||
|
using enum settings::display::FontSize;
|
||||||
|
case Small:
|
||||||
|
scale = FONT_SCALE_SMALL;
|
||||||
|
break;
|
||||||
|
case Large:
|
||||||
|
scale = FONT_SCALE_LARGE;
|
||||||
|
break;
|
||||||
|
case Default:
|
||||||
|
default:
|
||||||
|
scale = FONT_SCALE_DEFAULT;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
lvgl_set_text_font_scale(scale);
|
||||||
|
const lv_font_t* font = lvgl_get_text_font(FONT_SIZE_DEFAULT);
|
||||||
|
|
||||||
|
for (lv_display_t* display = lv_display_get_next(nullptr);
|
||||||
|
display != nullptr;
|
||||||
|
display = lv_display_get_next(display)) {
|
||||||
|
#if LV_USE_THEME_DEFAULT
|
||||||
|
if (lv_display_get_theme(display) == lv_theme_default_get()) {
|
||||||
|
lv_obj_t* screen = lv_display_get_screen_active(display);
|
||||||
|
lv_theme_default_init(
|
||||||
|
display,
|
||||||
|
lv_theme_get_color_primary(screen),
|
||||||
|
lv_theme_get_color_secondary(screen),
|
||||||
|
LV_THEME_DEFAULT_DARK,
|
||||||
|
font
|
||||||
|
);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
// The display layers are independent inheritance roots. Updating all of them makes
|
||||||
|
// the new size visible immediately in regular screens, overlays, and the status bar.
|
||||||
|
lv_obj_set_style_text_font(lv_display_get_screen_active(display), font, LV_PART_MAIN);
|
||||||
|
lv_obj_set_style_text_font(lv_display_get_layer_top(display), font, LV_PART_MAIN);
|
||||||
|
lv_obj_set_style_text_font(lv_display_get_layer_sys(display), font, LV_PART_MAIN);
|
||||||
|
lv_obj_set_style_text_font(lv_display_get_layer_bottom(display), font, LV_PART_MAIN);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace tt::lvgl
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -3,10 +3,15 @@
|
|||||||
#include <Tactility/service/displayidle/DisplayIdleService.h>
|
#include <Tactility/service/displayidle/DisplayIdleService.h>
|
||||||
#include <Tactility/service/ServiceManifest.h>
|
#include <Tactility/service/ServiceManifest.h>
|
||||||
#include <Tactility/service/ServiceRegistration.h>
|
#include <Tactility/service/ServiceRegistration.h>
|
||||||
|
#include <Tactility/mcp/McpSystem.h>
|
||||||
|
|
||||||
|
#include <app/manager.h>
|
||||||
|
#include <app/start.h>
|
||||||
|
|
||||||
#include "BouncingBallsScreensaver.h"
|
#include "BouncingBallsScreensaver.h"
|
||||||
#include "MatrixRainScreensaver.h"
|
#include "MatrixRainScreensaver.h"
|
||||||
#include "MystifyScreensaver.h"
|
#include "MystifyScreensaver.h"
|
||||||
|
#include "McpScreensaver.h"
|
||||||
#include "Screensaver.h"
|
#include "Screensaver.h"
|
||||||
#include "StackChanScreensaver.h"
|
#include "StackChanScreensaver.h"
|
||||||
|
|
||||||
@@ -59,6 +64,34 @@ static bool hasDisplayWithBacklight() {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Effective backlight duty for the screensaver: the dimmed night level when
|
||||||
|
* night dim is enabled and the local hour is inside the configured window,
|
||||||
|
* otherwise the regular duty. A start == end window covers the whole day.
|
||||||
|
*/
|
||||||
|
static uint8_t screensaverBacklightDuty(const settings::display::DisplaySettings& displaySettings) {
|
||||||
|
if (!displaySettings.nightDimEnabled) {
|
||||||
|
return displaySettings.backlightDuty;
|
||||||
|
}
|
||||||
|
const std::time_t now = std::time(nullptr);
|
||||||
|
std::tm local_time {};
|
||||||
|
if (localtime_r(&now, &local_time) == nullptr || local_time.tm_year < 125) {
|
||||||
|
return displaySettings.backlightDuty;
|
||||||
|
}
|
||||||
|
const uint8_t hour = static_cast<uint8_t>(local_time.tm_hour);
|
||||||
|
const uint8_t start = displaySettings.nightDimStartHour;
|
||||||
|
const uint8_t end = displaySettings.nightDimEndHour;
|
||||||
|
bool in_window;
|
||||||
|
if (start == end) {
|
||||||
|
in_window = true;
|
||||||
|
} else if (start < end) {
|
||||||
|
in_window = hour >= start && hour < end;
|
||||||
|
} else {
|
||||||
|
in_window = hour >= start || hour < end;
|
||||||
|
}
|
||||||
|
return in_window ? displaySettings.nightDimDuty : displaySettings.backlightDuty;
|
||||||
|
}
|
||||||
|
|
||||||
void DisplayIdleService::stopScreensaver() {
|
void DisplayIdleService::stopScreensaver() {
|
||||||
if (!lvgl_try_lock(100)) {
|
if (!lvgl_try_lock(100)) {
|
||||||
// Lock failed - keep flag set to retry on next tick
|
// Lock failed - keep flag set to retry on next tick
|
||||||
@@ -77,6 +110,17 @@ void DisplayIdleService::stopScreensaver() {
|
|||||||
screensaverOverlay = nullptr;
|
screensaverOverlay = nullptr;
|
||||||
}
|
}
|
||||||
lvgl_unlock();
|
lvgl_unlock();
|
||||||
|
|
||||||
|
// Stop an app launched as screensaver (e.g. Bible Verse): on wake the
|
||||||
|
// device returns to the launcher. Stopping is safe when the user already
|
||||||
|
// closed it (unknown ids report STOPPED / stop is a no-op for them).
|
||||||
|
if (screensaverAppActive) {
|
||||||
|
screensaverAppActive = false;
|
||||||
|
if (screensaverAppInstanceId != 0) {
|
||||||
|
app_manager_stop(screensaverAppInstanceId);
|
||||||
|
screensaverAppInstanceId = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
stopScreensaverRequested.store(false, std::memory_order_relaxed);
|
stopScreensaverRequested.store(false, std::memory_order_relaxed);
|
||||||
|
|
||||||
// Reset auto-off state
|
// Reset auto-off state
|
||||||
@@ -92,14 +136,31 @@ void DisplayIdleService::stopScreensaver() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void DisplayIdleService::activateScreensaver() {
|
void DisplayIdleService::activateScreensaver() {
|
||||||
lv_obj_t* top = lv_layer_top();
|
|
||||||
|
|
||||||
if (screensaverOverlay != nullptr) return;
|
|
||||||
|
|
||||||
// Reset auto-off counter when starting screensaver
|
// Reset auto-off counter when starting screensaver
|
||||||
screensaverActiveCounter = 0;
|
screensaverActiveCounter = 0;
|
||||||
backlightOff = false;
|
backlightOff = false;
|
||||||
|
|
||||||
|
// Bible Verse screensaver: launch the app instead of drawing an overlay.
|
||||||
|
// Falls back to a plain black overlay when the app is not installed.
|
||||||
|
if (cachedDisplaySettings.screensaverType == settings::display::ScreensaverType::BibleVerse) {
|
||||||
|
constexpr auto* BIBLE_VERSE_APP_ID = "one.tactility.bibleverse";
|
||||||
|
AppManifest manifest {};
|
||||||
|
AppInstanceId instance_id = 0;
|
||||||
|
if (app_manager_find_manifest(BIBLE_VERSE_APP_ID, &manifest) == ERROR_NONE
|
||||||
|
&& app_start(BIBLE_VERSE_APP_ID, 0, nullptr, &instance_id) == ERROR_NONE) {
|
||||||
|
LOG_I(TAG, "Bible Verse screensaver: launched instance %u", (unsigned)instance_id);
|
||||||
|
screensaverAppInstanceId = instance_id;
|
||||||
|
screensaverAppActive = true;
|
||||||
|
setBacklightBrightness(screensaverBacklightDuty(cachedDisplaySettings));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
LOG_W(TAG, "Bible Verse app not installed, falling back to black screen");
|
||||||
|
}
|
||||||
|
|
||||||
|
lv_obj_t* top = lv_layer_top();
|
||||||
|
|
||||||
|
if (screensaverOverlay != nullptr) return;
|
||||||
|
|
||||||
lv_coord_t screenW = lv_display_get_horizontal_resolution(nullptr);
|
lv_coord_t screenW = lv_display_get_horizontal_resolution(nullptr);
|
||||||
lv_coord_t screenH = lv_display_get_vertical_resolution(nullptr);
|
lv_coord_t screenH = lv_display_get_vertical_resolution(nullptr);
|
||||||
|
|
||||||
@@ -127,6 +188,9 @@ void DisplayIdleService::activateScreensaver() {
|
|||||||
case settings::display::ScreensaverType::StackChan:
|
case settings::display::ScreensaverType::StackChan:
|
||||||
screensaver = std::make_unique<StackChanScreensaver>();
|
screensaver = std::make_unique<StackChanScreensaver>();
|
||||||
break;
|
break;
|
||||||
|
case settings::display::ScreensaverType::McpScreen:
|
||||||
|
screensaver = std::make_unique<McpScreensaver>();
|
||||||
|
break;
|
||||||
case settings::display::ScreensaverType::None:
|
case settings::display::ScreensaverType::None:
|
||||||
default:
|
default:
|
||||||
// Just black screen, no animated screensaver
|
// Just black screen, no animated screensaver
|
||||||
@@ -137,6 +201,8 @@ void DisplayIdleService::activateScreensaver() {
|
|||||||
if (screensaver) {
|
if (screensaver) {
|
||||||
screensaver->start(screensaverOverlay, screenW, screenH);
|
screensaver->start(screensaverOverlay, screenW, screenH);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setBacklightBrightness(screensaverBacklightDuty(cachedDisplaySettings));
|
||||||
}
|
}
|
||||||
|
|
||||||
void DisplayIdleService::updateScreensaver() {
|
void DisplayIdleService::updateScreensaver() {
|
||||||
@@ -166,8 +232,8 @@ void DisplayIdleService::tick() {
|
|||||||
inactive_ms = lv_display_get_inactive_time(nullptr);
|
inactive_ms = lv_display_get_inactive_time(nullptr);
|
||||||
|
|
||||||
// Only update if not stopping (prevents lag on touch)
|
// Only update if not stopping (prevents lag on touch)
|
||||||
if (displayDimmed && screensaverOverlay && !stopScreensaverRequested.load(std::memory_order_acquire)) {
|
if (displayDimmed && (screensaverOverlay || screensaverAppActive) && !stopScreensaverRequested.load(std::memory_order_acquire)) {
|
||||||
// Check if screensaver should auto-off after 5 minutes
|
// Check if screensaver should auto-off after 30 minutes
|
||||||
if (!backlightOff) {
|
if (!backlightOff) {
|
||||||
screensaverActiveCounter++;
|
screensaverActiveCounter++;
|
||||||
if (screensaverActiveCounter >= SCREENSAVER_AUTO_OFF_TICKS) {
|
if (screensaverActiveCounter >= SCREENSAVER_AUTO_OFF_TICKS) {
|
||||||
@@ -176,6 +242,13 @@ void DisplayIdleService::tick() {
|
|||||||
screensaver->stop();
|
screensaver->stop();
|
||||||
screensaver.reset();
|
screensaver.reset();
|
||||||
}
|
}
|
||||||
|
if (screensaverAppActive) {
|
||||||
|
screensaverAppActive = false;
|
||||||
|
if (screensaverAppInstanceId != 0) {
|
||||||
|
app_manager_stop(screensaverAppInstanceId);
|
||||||
|
screensaverAppInstanceId = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
setBacklightBrightness(0);
|
setBacklightBrightness(0);
|
||||||
backlightOff = true;
|
backlightOff = true;
|
||||||
} else {
|
} else {
|
||||||
@@ -211,6 +284,10 @@ void DisplayIdleService::tick() {
|
|||||||
}
|
}
|
||||||
displayDimmed = true;
|
displayDimmed = true;
|
||||||
} else if (displayDimmed && (inactive_ms < kWakeActivityThresholdMs)) {
|
} else if (displayDimmed && (inactive_ms < kWakeActivityThresholdMs)) {
|
||||||
|
// The Bible Verse app keeps LVGL timers running (minute-advance),
|
||||||
|
// so plain inactivity never drops while it is up. Taps still
|
||||||
|
// register as activity: stop the verse app to return to launcher.
|
||||||
|
// If the user already closed it, stopScreensaver() is a safe no-op.
|
||||||
stopScreensaver();
|
stopScreensaver();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -247,6 +324,13 @@ void DisplayIdleService::onStop(ServiceContext& service) {
|
|||||||
LOG_W(TAG, "Failed to stop screensaver during shutdown - potential resource leak");
|
LOG_W(TAG, "Failed to stop screensaver during shutdown - potential resource leak");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (screensaverAppActive) {
|
||||||
|
screensaverAppActive = false;
|
||||||
|
if (screensaverAppInstanceId != 0) {
|
||||||
|
app_manager_stop(screensaverAppInstanceId);
|
||||||
|
screensaverAppInstanceId = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
screensaver.reset();
|
screensaver.reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -259,8 +343,19 @@ void DisplayIdleService::startScreensaver() {
|
|||||||
// Note: This is safe because we hold the LVGL lock which serializes with tick()
|
// Note: This is safe because we hold the LVGL lock which serializes with tick()
|
||||||
cachedDisplaySettings = settings::display::loadOrGetDefault();
|
cachedDisplaySettings = settings::display::loadOrGetDefault();
|
||||||
|
|
||||||
|
// The Bible Verse path launches an app task (not an overlay), which must
|
||||||
|
// not run under the LVGL lock: drop it before activating.
|
||||||
|
const bool launches_app =
|
||||||
|
cachedDisplaySettings.screensaverType == settings::display::ScreensaverType::BibleVerse;
|
||||||
|
if (launches_app) {
|
||||||
|
lvgl_unlock();
|
||||||
|
}
|
||||||
|
|
||||||
activateScreensaver();
|
activateScreensaver();
|
||||||
lvgl_unlock();
|
|
||||||
|
if (!launches_app) {
|
||||||
|
lvgl_unlock();
|
||||||
|
}
|
||||||
|
|
||||||
// Turn off backlight for "None" screensaver
|
// Turn off backlight for "None" screensaver
|
||||||
if (hasDisplayWithBacklight() && cachedDisplaySettings.screensaverType == settings::display::ScreensaverType::None) {
|
if (hasDisplayWithBacklight() && cachedDisplaySettings.screensaverType == settings::display::ScreensaverType::None) {
|
||||||
@@ -270,7 +365,50 @@ void DisplayIdleService::startScreensaver() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool DisplayIdleService::isScreensaverActive() const {
|
bool DisplayIdleService::isScreensaverActive() const {
|
||||||
return screensaverOverlay != nullptr;
|
return screensaverOverlay != nullptr || screensaverAppActive;
|
||||||
|
}
|
||||||
|
|
||||||
|
void DisplayIdleService::startMcpScreensaver() {
|
||||||
|
if (!lvgl_try_lock(200)) {
|
||||||
|
LOG_W(TAG, "startMcpScreensaver: failed to acquire LVGL lock");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (screensaverOverlay != nullptr) {
|
||||||
|
const auto& mcpState = mcp::getState();
|
||||||
|
if (mcpState.drawArea != nullptr) {
|
||||||
|
lvgl_unlock();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (screensaver) {
|
||||||
|
screensaver->stop();
|
||||||
|
screensaver.reset();
|
||||||
|
}
|
||||||
|
lv_obj_delete(screensaverOverlay);
|
||||||
|
screensaverOverlay = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
screensaverActiveCounter = 0;
|
||||||
|
backlightOff = false;
|
||||||
|
setBacklightBrightness(cachedDisplaySettings.backlightDuty == 0
|
||||||
|
? 255 : screensaverBacklightDuty(cachedDisplaySettings));
|
||||||
|
|
||||||
|
lv_coord_t screenW = lv_display_get_horizontal_resolution(nullptr);
|
||||||
|
lv_coord_t screenH = lv_display_get_vertical_resolution(nullptr);
|
||||||
|
screensaverOverlay = lv_obj_create(lv_layer_top());
|
||||||
|
lv_obj_remove_style_all(screensaverOverlay);
|
||||||
|
lv_obj_set_size(screensaverOverlay, LV_PCT(100), LV_PCT(100));
|
||||||
|
lv_obj_set_pos(screensaverOverlay, 0, 0);
|
||||||
|
lv_obj_set_style_bg_color(screensaverOverlay, lv_color_black(), 0);
|
||||||
|
lv_obj_set_style_bg_opa(screensaverOverlay, LV_OPA_COVER, 0);
|
||||||
|
lv_obj_add_flag(screensaverOverlay, LV_OBJ_FLAG_CLICKABLE);
|
||||||
|
lv_obj_add_event_cb(screensaverOverlay, stopScreensaverCb, LV_EVENT_CLICKED, this);
|
||||||
|
|
||||||
|
screensaver = std::make_unique<McpScreensaver>();
|
||||||
|
screensaver->start(screensaverOverlay, screenW, screenH);
|
||||||
|
lvgl_unlock();
|
||||||
|
displayDimmed = true;
|
||||||
|
LOG_I(TAG, "MCP screensaver activated");
|
||||||
}
|
}
|
||||||
|
|
||||||
void DisplayIdleService::reloadSettings() {
|
void DisplayIdleService::reloadSettings() {
|
||||||
|
|||||||
@@ -0,0 +1,100 @@
|
|||||||
|
#ifdef ESP_PLATFORM
|
||||||
|
|
||||||
|
#include "McpScreensaver.h"
|
||||||
|
#include <Tactility/mcp/McpSystem.h>
|
||||||
|
#include <tactility/log.h>
|
||||||
|
|
||||||
|
constexpr auto* TAG = "McpScreensaver";
|
||||||
|
#include <esp_heap_caps.h>
|
||||||
|
|
||||||
|
namespace tt::service::displayidle {
|
||||||
|
|
||||||
|
|
||||||
|
void McpScreensaver::start(lv_obj_t* overlay, lv_coord_t screenW, lv_coord_t screenH) {
|
||||||
|
auto& state = mcp::getState();
|
||||||
|
|
||||||
|
// Full-screen canvas on the overlay
|
||||||
|
lv_obj_t* canvas = lv_canvas_create(overlay);
|
||||||
|
lv_obj_set_size(canvas, screenW, screenH);
|
||||||
|
lv_obj_set_pos(canvas, 0, 0);
|
||||||
|
lv_obj_set_style_radius(canvas, 0, LV_PART_MAIN);
|
||||||
|
lv_obj_set_style_border_width(canvas, 0, LV_PART_MAIN);
|
||||||
|
lv_obj_set_style_pad_all(canvas, 0, LV_PART_MAIN);
|
||||||
|
lv_obj_remove_flag(canvas, LV_OBJ_FLAG_SCROLLABLE);
|
||||||
|
|
||||||
|
// Allocate framebuffer (prefer SPIRAM)
|
||||||
|
size_t requiredSize = (size_t)screenW * screenH * sizeof(uint16_t);
|
||||||
|
framebuffer = (uint16_t*)heap_caps_malloc(requiredSize, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT);
|
||||||
|
if (framebuffer == nullptr) {
|
||||||
|
framebuffer = (uint16_t*)heap_caps_malloc(requiredSize, MALLOC_CAP_8BIT);
|
||||||
|
}
|
||||||
|
framebufferSize = (framebuffer != nullptr) ? requiredSize : 0;
|
||||||
|
|
||||||
|
if (framebuffer == nullptr) {
|
||||||
|
LOG_E(TAG, "Failed to allocate %uB framebuffer", (unsigned)requiredSize);
|
||||||
|
lv_obj_t* err = lv_label_create(canvas);
|
||||||
|
lv_label_set_text(err, "Framebuffer alloc failed");
|
||||||
|
lv_obj_center(err);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fill with a dark slate background (inverted for display path)
|
||||||
|
size_t pixelCount = (size_t)screenW * screenH;
|
||||||
|
for (size_t i = 0; i < pixelCount; ++i) {
|
||||||
|
framebuffer[i] = ~0x18E3; // dark blue-grey
|
||||||
|
}
|
||||||
|
|
||||||
|
lv_canvas_set_buffer(canvas, framebuffer, screenW, screenH, LV_COLOR_FORMAT_RGB565);
|
||||||
|
|
||||||
|
// Waiting label (removed on first MCP draw via lv_obj_clean)
|
||||||
|
lv_obj_t* waitLabel = lv_label_create(canvas);
|
||||||
|
lv_label_set_text(waitLabel, "Waiting for LLM...");
|
||||||
|
lv_obj_set_style_text_color(waitLabel, lv_color_black(), LV_PART_MAIN); // white on screen (inverted)
|
||||||
|
lv_obj_align(waitLabel, LV_ALIGN_CENTER, 0, -20);
|
||||||
|
|
||||||
|
lv_obj_t* resLabel = lv_label_create(canvas);
|
||||||
|
lv_label_set_text_fmt(resLabel, "Display: %dx%d", (int)screenW, (int)screenH);
|
||||||
|
lv_color_t resColor = lv_palette_lighten(LV_PALETTE_BLUE, 3);
|
||||||
|
lv_obj_set_style_text_color(resLabel, lv_color_make(~resColor.red, ~resColor.green, ~resColor.blue), LV_PART_MAIN);
|
||||||
|
lv_obj_align(resLabel, LV_ALIGN_CENTER, 0, 10);
|
||||||
|
|
||||||
|
// Register with McpSystemState
|
||||||
|
std::lock_guard<std::mutex> lock(state.mutex);
|
||||||
|
state.drawArea = canvas;
|
||||||
|
state.framebuffer = framebuffer;
|
||||||
|
state.framebufferSize = framebufferSize;
|
||||||
|
state.displayWidth = (uint16_t)screenW;
|
||||||
|
state.displayHeight = (uint16_t)screenH;
|
||||||
|
state.drawWidth = (uint16_t)screenW;
|
||||||
|
state.drawHeight = (uint16_t)screenH;
|
||||||
|
// Don't reset overrideActive — if the LLM already drew, we keep the content
|
||||||
|
|
||||||
|
LOG_I(TAG, "McpScreensaver started (%dx%d)", (int)screenW, (int)screenH);
|
||||||
|
}
|
||||||
|
|
||||||
|
void McpScreensaver::stop() {
|
||||||
|
auto& state = mcp::getState();
|
||||||
|
{
|
||||||
|
std::lock_guard<std::mutex> lock(state.mutex);
|
||||||
|
state.drawArea = nullptr;
|
||||||
|
state.framebuffer = nullptr;
|
||||||
|
state.framebufferSize = 0;
|
||||||
|
state.overrideActive = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (framebuffer != nullptr) {
|
||||||
|
heap_caps_free(framebuffer);
|
||||||
|
framebuffer = nullptr;
|
||||||
|
framebufferSize = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
LOG_I(TAG, "McpScreensaver stopped");
|
||||||
|
}
|
||||||
|
|
||||||
|
void McpScreensaver::update(lv_coord_t /*screenW*/, lv_coord_t /*screenH*/) {
|
||||||
|
// MCP draws on demand via HTTP — no per-frame animation needed
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace tt::service::displayidle
|
||||||
|
|
||||||
|
#endif // ESP_PLATFORM
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
#pragma once
|
||||||
|
#ifdef ESP_PLATFORM
|
||||||
|
|
||||||
|
#include "Screensaver.h"
|
||||||
|
#include <cstdint>
|
||||||
|
|
||||||
|
namespace tt::service::displayidle {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* MCP Screen screensaver.
|
||||||
|
* Creates a full-screen LVGL canvas on the overlay and registers it in
|
||||||
|
* McpSystemState so that MCP HTTP draw commands can paint to it.
|
||||||
|
* Dismissed by a touch event (handled by the parent DisplayIdle overlay).
|
||||||
|
*/
|
||||||
|
class McpScreensaver final : public Screensaver {
|
||||||
|
uint16_t* framebuffer = nullptr;
|
||||||
|
size_t framebufferSize = 0;
|
||||||
|
|
||||||
|
public:
|
||||||
|
McpScreensaver() = default;
|
||||||
|
~McpScreensaver() override = default;
|
||||||
|
|
||||||
|
void start(lv_obj_t* overlay, lv_coord_t screenW, lv_coord_t screenH) override;
|
||||||
|
void stop() override;
|
||||||
|
void update(lv_coord_t screenW, lv_coord_t screenH) override;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace tt::service::displayidle
|
||||||
|
|
||||||
|
#endif // ESP_PLATFORM
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -26,12 +26,26 @@
|
|||||||
|
|
||||||
#if TT_FEATURE_SCREENSHOT_ENABLED
|
#if TT_FEATURE_SCREENSHOT_ENABLED
|
||||||
#include <lv_screenshot.h>
|
#include <lv_screenshot.h>
|
||||||
|
// lodepng.h enables its C++ overloads (std::vector/std::string) when compiled
|
||||||
|
// as C++; save_png.c compiles it as C. WebServerService.cpp is C++, so opt out
|
||||||
|
// of the C++ wrapper to get the same C API save_png.c uses.
|
||||||
|
#define LODEPNG_NO_COMPILE_CPP
|
||||||
|
#include "src/libs/lodepng/lodepng.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "app/install.h"
|
#include "app/install.h"
|
||||||
#include "app/manager.h"
|
#include "app/manager.h"
|
||||||
|
|
||||||
|
#ifndef ESP_PLATFORM
|
||||||
|
// Simulator touch injection backend (Devices/simulator sdl-pointer driver).
|
||||||
|
// Declared extern "C" here instead of including the device header: Tactility
|
||||||
|
// must not depend upward on a device implementation.
|
||||||
|
extern "C" void sdl_input_set_touch_override(int32_t x, int32_t y, bool pressed);
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef ESP_PLATFORM
|
#ifdef ESP_PLATFORM
|
||||||
|
#include <Tactility/mcp/McpSystem.h>
|
||||||
|
#include <Tactility/settings/McpSettings.h>
|
||||||
#include <esp_chip_info.h>
|
#include <esp_chip_info.h>
|
||||||
#include <esp_flash.h>
|
#include <esp_flash.h>
|
||||||
#include <esp_heap_caps.h>
|
#include <esp_heap_caps.h>
|
||||||
@@ -213,7 +227,11 @@ bool WebServerService::onStart(ServiceContext& service) {
|
|||||||
lock.lock();
|
lock.lock();
|
||||||
g_cachedSettings = settings::webserver::loadOrGetDefault();
|
g_cachedSettings = settings::webserver::loadOrGetDefault();
|
||||||
g_settingsCached = true;
|
g_settingsCached = true;
|
||||||
|
#ifdef ESP_PLATFORM
|
||||||
|
serverEnabled = g_cachedSettings.webServerEnabled || settings::mcp::loadOrGetDefault().mcpEnabled;
|
||||||
|
#else
|
||||||
serverEnabled = g_cachedSettings.webServerEnabled;
|
serverEnabled = g_cachedSettings.webServerEnabled;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
// Subscribe to settings change events to refresh cache
|
// Subscribe to settings change events to refresh cache
|
||||||
settingsEventSubscription = pubsub->subscribe([](WebServerEvent event) {
|
settingsEventSubscription = pubsub->subscribe([](WebServerEvent event) {
|
||||||
@@ -222,6 +240,14 @@ bool WebServerService::onStart(ServiceContext& service) {
|
|||||||
lock.lock();
|
lock.lock();
|
||||||
g_cachedSettings = settings::webserver::loadOrGetDefault();
|
g_cachedSettings = settings::webserver::loadOrGetDefault();
|
||||||
g_settingsCached = true;
|
g_settingsCached = true;
|
||||||
|
#ifdef ESP_PLATFORM
|
||||||
|
const bool enabled = g_cachedSettings.webServerEnabled || settings::mcp::loadOrGetDefault().mcpEnabled;
|
||||||
|
#else
|
||||||
|
const bool enabled = g_cachedSettings.webServerEnabled;
|
||||||
|
#endif
|
||||||
|
if (g_webServerInstance.load() != nullptr) {
|
||||||
|
g_webServerInstance.load()->setEnabled(enabled);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -481,6 +507,21 @@ bool WebServerService::startServer() {
|
|||||||
.callback = handleAdminPost,
|
.callback = handleAdminPost,
|
||||||
.user_ctx = ctx
|
.user_ctx = ctx
|
||||||
},
|
},
|
||||||
|
#ifdef ESP_PLATFORM
|
||||||
|
// MCP is LAN-local and is enabled whenever the web server is enabled.
|
||||||
|
{
|
||||||
|
.uri = "/api/mcp",
|
||||||
|
.method = HTTP_METHOD_POST,
|
||||||
|
.callback = handleApiMcp,
|
||||||
|
.user_ctx = ctx
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.uri = "/api/screen/raw",
|
||||||
|
.method = HTTP_METHOD_POST,
|
||||||
|
.callback = handleApiScreenRaw,
|
||||||
|
.user_ctx = ctx
|
||||||
|
},
|
||||||
|
#endif
|
||||||
// API endpoints for system info, apps, wifi, etc
|
// API endpoints for system info, apps, wifi, etc
|
||||||
{
|
{
|
||||||
.uri = "/api/*",
|
.uri = "/api/*",
|
||||||
@@ -500,6 +541,23 @@ bool WebServerService::startServer() {
|
|||||||
.callback = handleApiPut,
|
.callback = handleApiPut,
|
||||||
.user_ctx = ctx
|
.user_ctx = ctx
|
||||||
},
|
},
|
||||||
|
#ifndef ESP_PLATFORM
|
||||||
|
// Simulator viewer aliases: the /sim page resolves api/ against its
|
||||||
|
// own directory (/sim/api/...), so mirror the viewer-needed handlers
|
||||||
|
// here. Same callbacks, auth enforced inside each handler.
|
||||||
|
{
|
||||||
|
.uri = "/sim/api/*",
|
||||||
|
.method = HTTP_METHOD_GET,
|
||||||
|
.callback = handleApiGet,
|
||||||
|
.user_ctx = ctx
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.uri = "/sim/api/*",
|
||||||
|
.method = HTTP_METHOD_POST,
|
||||||
|
.callback = handleApiPost,
|
||||||
|
.user_ctx = ctx
|
||||||
|
},
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
.uri = "/*", // Catch-all for dynamic assets
|
.uri = "/*", // Catch-all for dynamic assets
|
||||||
.method = HTTP_METHOD_GET,
|
.method = HTTP_METHOD_GET,
|
||||||
@@ -528,6 +586,12 @@ bool WebServerService::startServer() {
|
|||||||
LOG_I(TAG, "HTTP server started successfully on port %u", (unsigned)settings.webServerPort);
|
LOG_I(TAG, "HTTP server started successfully on port %u", (unsigned)settings.webServerPort);
|
||||||
publish_event(this, WebServerEvent::WebServerStarted);
|
publish_event(this, WebServerEvent::WebServerStarted);
|
||||||
|
|
||||||
|
#ifdef ESP_PLATFORM
|
||||||
|
if (settings::mcp::loadOrGetDefault().mcpEnabled) {
|
||||||
|
mcp::startVideoStreamServer();
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
// Show statusbar icon
|
// Show statusbar icon
|
||||||
if (statusbarIconId >= 0) {
|
if (statusbarIconId >= 0) {
|
||||||
lvgl::statusbar_icon_set_image(statusbarIconId, LVGL_ICON_STATUSBAR_CLOUD);
|
lvgl::statusbar_icon_set_image(statusbarIconId, LVGL_ICON_STATUSBAR_CLOUD);
|
||||||
@@ -544,6 +608,9 @@ void WebServerService::stopServer() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef ESP_PLATFORM
|
||||||
|
mcp::stopVideoStreamServer();
|
||||||
|
#endif
|
||||||
http_server_free(httpServer);
|
http_server_free(httpServer);
|
||||||
httpServer = nullptr;
|
httpServer = nullptr;
|
||||||
|
|
||||||
@@ -1008,9 +1075,17 @@ error_t WebServerService::handleAdminPost(HttpServerRequest* request, void* user
|
|||||||
|
|
||||||
// API GET dispatcher - returns JSON system information
|
// API GET dispatcher - returns JSON system information
|
||||||
// Note: /api/sysinfo is intentionally public for monitoring use cases
|
// Note: /api/sysinfo is intentionally public for monitoring use cases
|
||||||
|
// The /sim/api/* alias routes (sim viewer page) strip the /sim prefix here
|
||||||
|
// so both /api/... and /sim/api/... share one dispatch table.
|
||||||
|
static const char* api_path_suffix(HttpServerRequest* request, char* uri, size_t uri_size) {
|
||||||
|
http_server_request_get_uri(request, uri, uri_size);
|
||||||
|
if (strncmp(uri, "/sim/api/", 9) == 0) return uri + 4; // -> /api/...
|
||||||
|
return uri;
|
||||||
|
}
|
||||||
|
|
||||||
error_t WebServerService::handleApiGet(HttpServerRequest* request, void* user_ctx) {
|
error_t WebServerService::handleApiGet(HttpServerRequest* request, void* user_ctx) {
|
||||||
char uri[256];
|
char uri_buf[256];
|
||||||
http_server_request_get_uri(request, uri, sizeof(uri));
|
const char* uri = api_path_suffix(request, uri_buf, sizeof(uri_buf));
|
||||||
|
|
||||||
// Public endpoint: sysinfo (basic device info for monitoring)
|
// Public endpoint: sysinfo (basic device info for monitoring)
|
||||||
if (strncmp(uri, "/api/sysinfo", 12) == 0) {
|
if (strncmp(uri, "/api/sysinfo", 12) == 0) {
|
||||||
@@ -1028,6 +1103,9 @@ error_t WebServerService::handleApiGet(HttpServerRequest* request, void* user_ct
|
|||||||
if (strncmp(uri, "/api/apps", 9) == 0) {
|
if (strncmp(uri, "/api/apps", 9) == 0) {
|
||||||
return handleApiApps(request, user_ctx);
|
return handleApiApps(request, user_ctx);
|
||||||
}
|
}
|
||||||
|
if (strncmp(uri, "/api/sim/touch", 14) == 0) {
|
||||||
|
return handleApiSimTouch(request, user_ctx);
|
||||||
|
}
|
||||||
if (strncmp(uri, "/api/wifi", 9) == 0) {
|
if (strncmp(uri, "/api/wifi", 9) == 0) {
|
||||||
return handleApiWifi(request, user_ctx);
|
return handleApiWifi(request, user_ctx);
|
||||||
}
|
}
|
||||||
@@ -1048,11 +1126,14 @@ error_t WebServerService::handleApiPost(HttpServerRequest* request, void* user_c
|
|||||||
return authResult;
|
return authResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
char uri[256];
|
char uri_buf[256];
|
||||||
http_server_request_get_uri(request, uri, sizeof(uri));
|
const char* uri = api_path_suffix(request, uri_buf, sizeof(uri_buf));
|
||||||
if (strncmp(uri, "/api/apps/run", 13) == 0) {
|
if (strncmp(uri, "/api/apps/run", 13) == 0) {
|
||||||
return handleApiAppsRun(request, user_ctx);
|
return handleApiAppsRun(request, user_ctx);
|
||||||
}
|
}
|
||||||
|
if (strncmp(uri, "/api/sim/touch", 14) == 0) {
|
||||||
|
return handleApiSimTouch(request, user_ctx);
|
||||||
|
}
|
||||||
if (strncmp(uri, "/api/apps/uninstall", 19) == 0) {
|
if (strncmp(uri, "/api/apps/uninstall", 19) == 0) {
|
||||||
return handleApiAppsUninstall(request, user_ctx);
|
return handleApiAppsUninstall(request, user_ctx);
|
||||||
}
|
}
|
||||||
@@ -1488,11 +1569,76 @@ error_t WebServerService::handleApiWifi(HttpServerRequest* request, void*) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// GET /api/screenshot - Capture and return screenshot as PNG
|
// GET /api/screenshot - Capture and return screenshot as PNG
|
||||||
// Screenshots are saved to SD card root (if available) or /data with incrementing numbers
|
// Fast path (no query or ?fast=1): snapshot LVGL to a memory buffer, PNG-encode
|
||||||
|
// to memory with lodepng, stream directly. No filesystem touch, no slot scan.
|
||||||
|
// Legacy path (?fast=0): previous save-to-webscreenshotN.png behavior.
|
||||||
error_t WebServerService::handleApiScreenshot(HttpServerRequest* request, void*) {
|
error_t WebServerService::handleApiScreenshot(HttpServerRequest* request, void*) {
|
||||||
LOG_I(TAG, "GET /api/screenshot");
|
LOG_I(TAG, "GET /api/screenshot");
|
||||||
|
|
||||||
#if TT_FEATURE_SCREENSHOT_ENABLED
|
#if TT_FEATURE_SCREENSHOT_ENABLED
|
||||||
|
std::string sfast;
|
||||||
|
bool fast = true;
|
||||||
|
if (getQueryParam(request, "fast", sfast)) fast = (sfast != "0");
|
||||||
|
|
||||||
|
if (fast) {
|
||||||
|
// Hold the LVGL lock across snapshot + encode: both must see a stable
|
||||||
|
// framebuffer. lv_snapshot_take renders synchronously under the lock.
|
||||||
|
if (!lvgl_try_lock(pdMS_TO_TICKS(500))) {
|
||||||
|
LOG_E(TAG, "Could not acquire LVGL lock within 500ms");
|
||||||
|
http_server_request_send_error(request, 500, "could not acquire LVGL lock");
|
||||||
|
return ERROR_UNDEFINED;
|
||||||
|
}
|
||||||
|
lv_draw_buf_t* snapshot = lv_snapshot_take(lv_scr_act(), LV_COLOR_FORMAT_RGB888);
|
||||||
|
if (snapshot == nullptr) {
|
||||||
|
lvgl_unlock();
|
||||||
|
LOG_E(TAG, "lv_snapshot_take failed");
|
||||||
|
http_server_request_send_error(request, 500, "snapshot failed");
|
||||||
|
return ERROR_UNDEFINED;
|
||||||
|
}
|
||||||
|
// lodepng wants RGB triplets; snapshot is RGB888 = 3 bytes/px already,
|
||||||
|
// but in BGR order on little-endian — swap R and B in place.
|
||||||
|
uint32_t px_count = snapshot->header.w * snapshot->header.h;
|
||||||
|
uint8_t* px = snapshot->data;
|
||||||
|
for (uint32_t i = 0; i < px_count; i++) {
|
||||||
|
uint8_t tmp = px[0];
|
||||||
|
px[0] = px[2];
|
||||||
|
px[2] = tmp;
|
||||||
|
px += 3;
|
||||||
|
}
|
||||||
|
unsigned char* png = nullptr;
|
||||||
|
size_t png_size = 0;
|
||||||
|
unsigned enc_err = lodepng_encode24(&png, &png_size, snapshot->data,
|
||||||
|
snapshot->header.w, snapshot->header.h);
|
||||||
|
uint32_t w = snapshot->header.w, h = snapshot->header.h;
|
||||||
|
lv_draw_buf_destroy(snapshot);
|
||||||
|
lvgl_unlock();
|
||||||
|
if (enc_err != 0 || png == nullptr) {
|
||||||
|
LOG_E(TAG, "lodepng_encode24 failed: %u", enc_err);
|
||||||
|
http_server_request_send_error(request, 500, "png encode failed");
|
||||||
|
return ERROR_UNDEFINED;
|
||||||
|
}
|
||||||
|
LOG_I(TAG, "Screenshot %lux%lu %d bytes (memory path)", (unsigned long)w, (unsigned long)h, (int)png_size);
|
||||||
|
http_server_request_set_content_type(request, "image/png");
|
||||||
|
error_t result = ERROR_NONE;
|
||||||
|
if (http_server_request_send_chunk_start(request) != ERROR_NONE) {
|
||||||
|
result = ERROR_UNDEFINED;
|
||||||
|
} else {
|
||||||
|
size_t sent = 0;
|
||||||
|
while (sent < png_size) {
|
||||||
|
size_t n = png_size - sent > 8192 ? 8192 : png_size - sent;
|
||||||
|
if (http_server_request_send_chunk(request, png + sent, n) != ERROR_NONE) {
|
||||||
|
result = ERROR_UNDEFINED;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
sent += n;
|
||||||
|
}
|
||||||
|
http_server_request_send_chunk_end(request);
|
||||||
|
}
|
||||||
|
free(png);
|
||||||
|
LOG_I(TAG, "[200] /api/screenshot fast %d bytes", (int)png_size);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
// Determine save location: prefer SD card root if mounted, otherwise /data
|
// Determine save location: prefer SD card root if mounted, otherwise /data
|
||||||
std::string save_path = getDataPath();
|
std::string save_path = getDataPath();
|
||||||
|
|
||||||
@@ -1734,6 +1880,83 @@ error_t WebServerService::handleReboot(HttpServerRequest* request, void*) {
|
|||||||
return ERROR_NONE; // Unreachable on ESP_PLATFORM, but satisfies function signature
|
return ERROR_NONE; // Unreachable on ESP_PLATFORM, but satisfies function signature
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// POST /api/sim/touch?x=123&y=456[&down=0|1] - inject touch into simulator.
|
||||||
|
// Simulator-only: on ESP32 there is no sdl-pointer backend, so this 404s.
|
||||||
|
// x/y are LVGL logical pixels (see viewer footer for current WxH).
|
||||||
|
// down=1 (default) presses and auto-releases after ~1.5s (long enough for LVGL
|
||||||
|
// indev polls to register a click); down=0 releases immediately.
|
||||||
|
error_t WebServerService::handleApiSimTouch(HttpServerRequest* request, void*) {
|
||||||
|
#ifdef ESP_PLATFORM
|
||||||
|
http_server_request_send_error(request, 404, "simulator only");
|
||||||
|
return ERROR_UNDEFINED;
|
||||||
|
#else
|
||||||
|
std::string sx, sy, sdown;
|
||||||
|
int x = -1, y = -1;
|
||||||
|
if (getQueryParam(request, "x", sx)) x = atoi(sx.c_str());
|
||||||
|
if (getQueryParam(request, "y", sy)) y = atoi(sy.c_str());
|
||||||
|
bool down = true;
|
||||||
|
if (getQueryParam(request, "down", sdown)) down = (sdown != "0");
|
||||||
|
if (x < 0 || y < 0 || x > 4096 || y > 4096) {
|
||||||
|
http_server_request_send_error(request, 400, "x and y params required (0..4096)");
|
||||||
|
return ERROR_UNDEFINED;
|
||||||
|
}
|
||||||
|
sdl_input_set_touch_override((int32_t)x, (int32_t)y, down);
|
||||||
|
LOG_I(TAG, "[200] /api/sim/touch x=%d y=%d down=%d", x, y, (int)down);
|
||||||
|
http_server_request_send_string(request, "ok");
|
||||||
|
return ERROR_NONE;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
// GET /sim - live simulator viewer: MJPEG-style screenshot refresh + click-to-touch.
|
||||||
|
error_t WebServerService::handleSimViewer(HttpServerRequest* request, void*) {
|
||||||
|
bool authPassed = false;
|
||||||
|
error_t authResult = validateRequestAuth(request, authPassed);
|
||||||
|
if (!authPassed) {
|
||||||
|
return authResult;
|
||||||
|
}
|
||||||
|
http_server_request_set_content_type(request, "text/html");
|
||||||
|
// NOTE: the page resolves api/ against its own directory (new URL(u,base)).
|
||||||
|
// Locally that is /sim -> /sim/api/...; behind tailscale
|
||||||
|
// (--set-path=/simagent -> /) it is /simagent/sim -> /simagent/api/...
|
||||||
|
// Both need handler aliases, registered in startServer() below:
|
||||||
|
// /sim/api/* mirrors /api/* (screenshot, sim/touch). The page itself must
|
||||||
|
// therefore be served with a trailing-slash-insensitive /sim match so the
|
||||||
|
// browser treats /sim as a directory (see handleAssets /sim route).
|
||||||
|
static const char* page =
|
||||||
|
"<!doctype html><html><head><meta charset=utf-8><meta name=viewport "
|
||||||
|
"content='width=device-width,initial-scale=1'>"
|
||||||
|
"<title>Tactility Sim</title><style>"
|
||||||
|
"body{margin:0;background:#111;color:#eee;font-family:sans-serif;"
|
||||||
|
"display:flex;flex-direction:column;align-items:center;gap:8px;padding:12px}"
|
||||||
|
"img{width:min(96vw,720px);image-rendering:pixelated;border:1px solid #333;"
|
||||||
|
"border-radius:8px;touch-action:none;cursor:crosshair;background:#000}"
|
||||||
|
".bar{display:flex;gap:8px;align-items:center;font-size:13px;color:#aaa}"
|
||||||
|
"button{background:#313244;color:#fff;border:0;border-radius:8px;padding:6px 12px}"
|
||||||
|
"</style></head><body>"
|
||||||
|
"<div class=bar><b>Tactility Sim</b><span id=st>live</span>"
|
||||||
|
"<button onclick='snap()'>refresh</button></div>"
|
||||||
|
"<img id=scr alt='sim screen'>"
|
||||||
|
"<div class=bar>click/tap the screen to touch · <span id=res></span> logical</div>"
|
||||||
|
"<script>"
|
||||||
|
"const img=document.getElementById('scr'),st=document.getElementById('st'),"
|
||||||
|
"res=document.getElementById('res');"
|
||||||
|
"const base=new URL('.',location.href).href;"
|
||||||
|
"const api=u=>new URL(u,base).href;"
|
||||||
|
"function snap(){img.src=api('api/screenshot?fast=1')+'&ts='+Date.now();}"
|
||||||
|
"setInterval(snap,500);snap();"
|
||||||
|
"img.addEventListener('error',()=>{st.textContent='reconnecting…';});"
|
||||||
|
"img.addEventListener('load',()=>{st.textContent='live';"
|
||||||
|
"res.textContent=img.naturalWidth+'x'+img.naturalHeight;});"
|
||||||
|
"img.addEventListener('pointerdown',e=>{"
|
||||||
|
"const r=img.getBoundingClientRect();"
|
||||||
|
"const x=Math.round((e.clientX-r.left)/r.width*img.naturalWidth);"
|
||||||
|
"const y=Math.round((e.clientY-r.top)/r.height*img.naturalHeight);"
|
||||||
|
"fetch(api('api/sim/touch')+'?x='+x+'&y='+y,{method:'POST'});});"
|
||||||
|
"</script></body></html>";
|
||||||
|
http_server_request_send_string(request, page);
|
||||||
|
return ERROR_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
error_t WebServerService::handleAssets(HttpServerRequest* request, void*) {
|
error_t WebServerService::handleAssets(HttpServerRequest* request, void*) {
|
||||||
// Auth check for UI access control
|
// Auth check for UI access control
|
||||||
bool authPassed = false;
|
bool authPassed = false;
|
||||||
@@ -1746,6 +1969,32 @@ error_t WebServerService::handleAssets(HttpServerRequest* request, void*) {
|
|||||||
http_server_request_get_uri(request, uri, sizeof(uri));
|
http_server_request_get_uri(request, uri, sizeof(uri));
|
||||||
LOG_I(TAG, "GET %s", uri);
|
LOG_I(TAG, "GET %s", uri);
|
||||||
|
|
||||||
|
// Simulator live viewer (no auth bypass: checked inside handler).
|
||||||
|
// Served with redirect-to-slash so relative api/ URLs resolve under /sim/
|
||||||
|
// (browsers treat /sim as a file, /sim/ as a directory for URL purposes).
|
||||||
|
// NOTE: /sim/api/* does NOT need special-casing here: the /sim/api/*
|
||||||
|
// handler aliases registered in startServer() route straight into
|
||||||
|
// handleApiGet/handleApiPost, which strip the /sim prefix via
|
||||||
|
// api_path_suffix(). This block only serves the viewer page itself.
|
||||||
|
if (strncmp(uri, "/sim", 4) == 0 && (uri[4] == '\0' || uri[4] == '?' || uri[4] == '/')) {
|
||||||
|
// Redirect bare /sim -> /sim/ so relative api/ resolves correctly.
|
||||||
|
if (uri[4] == '\0' || uri[4] == '?') {
|
||||||
|
std::string loc = "/sim/";
|
||||||
|
const char* q = strchr(uri, '?');
|
||||||
|
if (q != nullptr) { loc += q; }
|
||||||
|
http_server_request_set_header(request, "Location", loc.c_str());
|
||||||
|
http_server_request_send_error(request, 301, "see /sim/");
|
||||||
|
return ERROR_NONE;
|
||||||
|
}
|
||||||
|
if (strncmp(uri, "/sim/api/", 9) == 0) {
|
||||||
|
// Should have matched the /sim/api/* alias in startServer(); if we
|
||||||
|
// get here the method has no alias (e.g. PUT) — 404 it.
|
||||||
|
http_server_request_send_error(request, 404, "not found");
|
||||||
|
return ERROR_UNDEFINED;
|
||||||
|
}
|
||||||
|
return handleSimViewer(request, nullptr);
|
||||||
|
}
|
||||||
|
|
||||||
// Special case: serve favicon from system assets
|
// Special case: serve favicon from system assets
|
||||||
if (strcmp(uri, "/favicon.ico") == 0) {
|
if (strcmp(uri, "/favicon.ico") == 0) {
|
||||||
std::string faviconPathStr = std::string(file::MOUNT_POINT_SYSTEM) + "/spinner.png";
|
std::string faviconPathStr = std::string(file::MOUNT_POINT_SYSTEM) + "/spinner.png";
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ bool save(const AudioSettings& settings) {
|
|||||||
map[SETTINGS_KEY_OUTPUT_VOLUME] = toString(settings.outputVolume);
|
map[SETTINGS_KEY_OUTPUT_VOLUME] = toString(settings.outputVolume);
|
||||||
|
|
||||||
std::string settings_path;
|
std::string settings_path;
|
||||||
if (getSettingsFilePath(settings_path)) {
|
if (!getSettingsFilePath(settings_path)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,11 +20,16 @@ static std::string getSettingsFilePath() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
constexpr auto* SETTINGS_KEY_ORIENTATION = "orientation";
|
constexpr auto* SETTINGS_KEY_ORIENTATION = "orientation";
|
||||||
|
constexpr auto* SETTINGS_KEY_FONT_SIZE = "fontSize";
|
||||||
constexpr auto* SETTINGS_KEY_GAMMA_CURVE = "gammaCurve";
|
constexpr auto* SETTINGS_KEY_GAMMA_CURVE = "gammaCurve";
|
||||||
constexpr auto* SETTINGS_KEY_BACKLIGHT_DUTY = "backlightDuty";
|
constexpr auto* SETTINGS_KEY_BACKLIGHT_DUTY = "backlightDuty";
|
||||||
constexpr auto* SETTINGS_KEY_TIMEOUT_ENABLED = "backlightTimeoutEnabled";
|
constexpr auto* SETTINGS_KEY_TIMEOUT_ENABLED = "backlightTimeoutEnabled";
|
||||||
constexpr auto* SETTINGS_KEY_TIMEOUT_MS = "backlightTimeoutMs";
|
constexpr auto* SETTINGS_KEY_TIMEOUT_MS = "backlightTimeoutMs";
|
||||||
constexpr auto* SETTINGS_KEY_SCREENSAVER_TYPE = "screensaverType";
|
constexpr auto* SETTINGS_KEY_SCREENSAVER_TYPE = "screensaverType";
|
||||||
|
constexpr auto* SETTINGS_KEY_NIGHT_DIM_ENABLED = "nightDimEnabled";
|
||||||
|
constexpr auto* SETTINGS_KEY_NIGHT_DIM_START_HOUR = "nightDimStartHour";
|
||||||
|
constexpr auto* SETTINGS_KEY_NIGHT_DIM_END_HOUR = "nightDimEndHour";
|
||||||
|
constexpr auto* SETTINGS_KEY_NIGHT_DIM_DUTY = "nightDimDuty";
|
||||||
|
|
||||||
static Orientation getDefaultOrientation() {
|
static Orientation getDefaultOrientation() {
|
||||||
auto* display = lv_display_get_default();
|
auto* display = lv_display_get_default();
|
||||||
@@ -73,6 +78,34 @@ static bool fromString(const std::string& str, Orientation& orientation) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static std::string toString(FontSize font_size) {
|
||||||
|
switch (font_size) {
|
||||||
|
using enum FontSize;
|
||||||
|
case Small:
|
||||||
|
return "Small";
|
||||||
|
case Default:
|
||||||
|
return "Default";
|
||||||
|
case Large:
|
||||||
|
return "Large";
|
||||||
|
default:
|
||||||
|
std::unreachable();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool fromString(const std::string& str, FontSize& font_size) {
|
||||||
|
if (str == "Small") {
|
||||||
|
font_size = FontSize::Small;
|
||||||
|
return true;
|
||||||
|
} else if (str == "Default") {
|
||||||
|
font_size = FontSize::Default;
|
||||||
|
return true;
|
||||||
|
} else if (str == "Large") {
|
||||||
|
font_size = FontSize::Large;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
static std::string toString(ScreensaverType type) {
|
static std::string toString(ScreensaverType type) {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
using enum ScreensaverType;
|
using enum ScreensaverType;
|
||||||
@@ -86,6 +119,10 @@ static std::string toString(ScreensaverType type) {
|
|||||||
return "MatrixRain";
|
return "MatrixRain";
|
||||||
case StackChan:
|
case StackChan:
|
||||||
return "StackChan";
|
return "StackChan";
|
||||||
|
case McpScreen:
|
||||||
|
return "McpScreen";
|
||||||
|
case BibleVerse:
|
||||||
|
return "BibleVerse";
|
||||||
default:
|
default:
|
||||||
std::unreachable();
|
std::unreachable();
|
||||||
}
|
}
|
||||||
@@ -107,6 +144,12 @@ static bool fromString(const std::string& str, ScreensaverType& type) {
|
|||||||
} else if (str == "StackChan") {
|
} else if (str == "StackChan") {
|
||||||
type = ScreensaverType::StackChan;
|
type = ScreensaverType::StackChan;
|
||||||
return true;
|
return true;
|
||||||
|
} else if (str == "McpScreen") {
|
||||||
|
type = ScreensaverType::McpScreen;
|
||||||
|
return true;
|
||||||
|
} else if (str == "BibleVerse") {
|
||||||
|
type = ScreensaverType::BibleVerse;
|
||||||
|
return true;
|
||||||
} else {
|
} else {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -129,6 +172,12 @@ bool load(DisplaySettings& settings) {
|
|||||||
orientation = getDefaultOrientation();
|
orientation = getDefaultOrientation();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
auto font_size_entry = map.find(SETTINGS_KEY_FONT_SIZE);
|
||||||
|
FontSize font_size = FontSize::Default;
|
||||||
|
if (font_size_entry != map.end()) {
|
||||||
|
fromString(font_size_entry->second, font_size);
|
||||||
|
}
|
||||||
|
|
||||||
auto gamma_entry = map.find(SETTINGS_KEY_GAMMA_CURVE);
|
auto gamma_entry = map.find(SETTINGS_KEY_GAMMA_CURVE);
|
||||||
int gamma_curve = 0;
|
int gamma_curve = 0;
|
||||||
if (gamma_entry != map.end()) {
|
if (gamma_entry != map.end()) {
|
||||||
@@ -162,12 +211,41 @@ bool load(DisplaySettings& settings) {
|
|||||||
fromString(screensaver_entry->second, screensaver_type);
|
fromString(screensaver_entry->second, screensaver_type);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
auto night_dim_enabled_entry = map.find(SETTINGS_KEY_NIGHT_DIM_ENABLED);
|
||||||
|
bool night_dim_enabled = false;
|
||||||
|
if (night_dim_enabled_entry != map.end()) {
|
||||||
|
night_dim_enabled = (night_dim_enabled_entry->second == "1" || night_dim_enabled_entry->second == "true" || night_dim_enabled_entry->second == "True");
|
||||||
|
}
|
||||||
|
|
||||||
|
auto night_dim_start_entry = map.find(SETTINGS_KEY_NIGHT_DIM_START_HOUR);
|
||||||
|
int night_dim_start_hour = 22;
|
||||||
|
if (night_dim_start_entry != map.end()) {
|
||||||
|
night_dim_start_hour = atoi(night_dim_start_entry->second.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
auto night_dim_end_entry = map.find(SETTINGS_KEY_NIGHT_DIM_END_HOUR);
|
||||||
|
int night_dim_end_hour = 7;
|
||||||
|
if (night_dim_end_entry != map.end()) {
|
||||||
|
night_dim_end_hour = atoi(night_dim_end_entry->second.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
auto night_dim_duty_entry = map.find(SETTINGS_KEY_NIGHT_DIM_DUTY);
|
||||||
|
int night_dim_duty = 20;
|
||||||
|
if (night_dim_duty_entry != map.end()) {
|
||||||
|
night_dim_duty = atoi(night_dim_duty_entry->second.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
settings.orientation = orientation;
|
settings.orientation = orientation;
|
||||||
|
settings.fontSize = font_size;
|
||||||
settings.gammaCurve = gamma_curve;
|
settings.gammaCurve = gamma_curve;
|
||||||
settings.backlightDuty = backlight_duty;
|
settings.backlightDuty = backlight_duty;
|
||||||
settings.backlightTimeoutEnabled = timeout_enabled;
|
settings.backlightTimeoutEnabled = timeout_enabled;
|
||||||
settings.backlightTimeoutMs = timeout_ms;
|
settings.backlightTimeoutMs = timeout_ms;
|
||||||
settings.screensaverType = screensaver_type;
|
settings.screensaverType = screensaver_type;
|
||||||
|
settings.nightDimEnabled = night_dim_enabled;
|
||||||
|
settings.nightDimStartHour = static_cast<uint8_t>(night_dim_start_hour < 0 ? 0 : (night_dim_start_hour > 23 ? 23 : night_dim_start_hour));
|
||||||
|
settings.nightDimEndHour = static_cast<uint8_t>(night_dim_end_hour < 0 ? 0 : (night_dim_end_hour > 23 ? 23 : night_dim_end_hour));
|
||||||
|
settings.nightDimDuty = static_cast<uint8_t>(night_dim_duty < 0 ? 0 : (night_dim_duty > 255 ? 255 : night_dim_duty));
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -175,11 +253,16 @@ bool load(DisplaySettings& settings) {
|
|||||||
DisplaySettings getDefault() {
|
DisplaySettings getDefault() {
|
||||||
return DisplaySettings {
|
return DisplaySettings {
|
||||||
.orientation = getDefaultOrientation(),
|
.orientation = getDefaultOrientation(),
|
||||||
|
.fontSize = FontSize::Default,
|
||||||
.gammaCurve = 1,
|
.gammaCurve = 1,
|
||||||
.backlightDuty = 200,
|
.backlightDuty = 200,
|
||||||
.backlightTimeoutEnabled = false,
|
.backlightTimeoutEnabled = false,
|
||||||
.backlightTimeoutMs = 60000,
|
.backlightTimeoutMs = 60000,
|
||||||
.screensaverType = ScreensaverType::BouncingBalls
|
.screensaverType = ScreensaverType::BouncingBalls,
|
||||||
|
.nightDimEnabled = false,
|
||||||
|
.nightDimStartHour = 22,
|
||||||
|
.nightDimEndHour = 7,
|
||||||
|
.nightDimDuty = 20
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -196,9 +279,14 @@ bool save(const DisplaySettings& settings) {
|
|||||||
map[SETTINGS_KEY_BACKLIGHT_DUTY] = std::to_string(settings.backlightDuty);
|
map[SETTINGS_KEY_BACKLIGHT_DUTY] = std::to_string(settings.backlightDuty);
|
||||||
map[SETTINGS_KEY_GAMMA_CURVE] = std::to_string(settings.gammaCurve);
|
map[SETTINGS_KEY_GAMMA_CURVE] = std::to_string(settings.gammaCurve);
|
||||||
map[SETTINGS_KEY_ORIENTATION] = toString(settings.orientation);
|
map[SETTINGS_KEY_ORIENTATION] = toString(settings.orientation);
|
||||||
|
map[SETTINGS_KEY_FONT_SIZE] = toString(settings.fontSize);
|
||||||
map[SETTINGS_KEY_TIMEOUT_ENABLED] = settings.backlightTimeoutEnabled ? "1" : "0";
|
map[SETTINGS_KEY_TIMEOUT_ENABLED] = settings.backlightTimeoutEnabled ? "1" : "0";
|
||||||
map[SETTINGS_KEY_TIMEOUT_MS] = std::to_string(settings.backlightTimeoutMs);
|
map[SETTINGS_KEY_TIMEOUT_MS] = std::to_string(settings.backlightTimeoutMs);
|
||||||
map[SETTINGS_KEY_SCREENSAVER_TYPE] = toString(settings.screensaverType);
|
map[SETTINGS_KEY_SCREENSAVER_TYPE] = toString(settings.screensaverType);
|
||||||
|
map[SETTINGS_KEY_NIGHT_DIM_ENABLED] = settings.nightDimEnabled ? "1" : "0";
|
||||||
|
map[SETTINGS_KEY_NIGHT_DIM_START_HOUR] = std::to_string(settings.nightDimStartHour);
|
||||||
|
map[SETTINGS_KEY_NIGHT_DIM_END_HOUR] = std::to_string(settings.nightDimEndHour);
|
||||||
|
map[SETTINGS_KEY_NIGHT_DIM_DUTY] = std::to_string(settings.nightDimDuty);
|
||||||
auto settings_path = getSettingsFilePath();
|
auto settings_path = getSettingsFilePath();
|
||||||
if (!file::findOrCreateParentDirectory(settings_path, 0755)) {
|
if (!file::findOrCreateParentDirectory(settings_path, 0755)) {
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -0,0 +1,76 @@
|
|||||||
|
#include <Tactility/settings/McpSettings.h>
|
||||||
|
#include <Tactility/file/PropertiesFile.h>
|
||||||
|
#include <Tactility/file/File.h>
|
||||||
|
#include <tactility/log.h>
|
||||||
|
#include <app/paths.h>
|
||||||
|
|
||||||
|
constexpr auto* TAG = "McpSettings";
|
||||||
|
#include <map>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
namespace tt::settings::mcp {
|
||||||
|
|
||||||
|
|
||||||
|
static std::string getSettingsFilePath() {
|
||||||
|
char path[256];
|
||||||
|
if (app_paths_get_user_data_path("tactility.mcpsettings", "mcp.properties", path, sizeof(path)) != ERROR_NONE) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
|
constexpr auto* KEY_MCP_ENABLED = "mcpEnabled";
|
||||||
|
|
||||||
|
bool load(McpSettings& settings) {
|
||||||
|
auto settings_path = getSettingsFilePath();
|
||||||
|
if (!file::isFile(settings_path)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
std::map<std::string, std::string> map;
|
||||||
|
if (!file::loadPropertiesFile(settings_path, map)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto mcp_enabled = map.find(KEY_MCP_ENABLED);
|
||||||
|
settings.mcpEnabled = (mcp_enabled != map.end())
|
||||||
|
? (mcp_enabled->second == "1" || mcp_enabled->second == "true")
|
||||||
|
: true;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
McpSettings getDefault() {
|
||||||
|
return McpSettings{
|
||||||
|
.mcpEnabled = true
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
McpSettings loadOrGetDefault() {
|
||||||
|
McpSettings settings;
|
||||||
|
if (!load(settings)) {
|
||||||
|
settings = getDefault();
|
||||||
|
if (!save(settings)) {
|
||||||
|
LOG_W(TAG, "Failed to save default MCP settings");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return settings;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool save(const McpSettings& settings) {
|
||||||
|
std::map<std::string, std::string> map;
|
||||||
|
map[KEY_MCP_ENABLED] = settings.mcpEnabled ? "true" : "false";
|
||||||
|
|
||||||
|
auto settings_path = getSettingsFilePath();
|
||||||
|
if (!file::findOrCreateParentDirectory(settings_path, 0755)) {
|
||||||
|
LOG_E(TAG, "Failed to create parent dir for %s", settings_path.c_str());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!file::savePropertiesFile(settings_path, map)) {
|
||||||
|
LOG_E(TAG, "Failed to save MCP settings to %s", settings_path.c_str());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace
|
||||||
@@ -44,7 +44,7 @@ static bool loadSystemSettingsFromFile(SystemSettings& properties) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
auto time_format_entry = map.find("timeFormat24h");
|
auto time_format_entry = map.find("timeFormat24h");
|
||||||
bool time_format_24h = time_format_entry == map.end() ? true : (time_format_entry->second == "true");
|
bool time_format_24h = time_format_entry == map.end() ? false : (time_format_entry->second == "true");
|
||||||
properties.timeFormat24h = time_format_24h;
|
properties.timeFormat24h = time_format_24h;
|
||||||
|
|
||||||
// Load date format
|
// Load date format
|
||||||
|
|||||||
@@ -164,7 +164,7 @@ bool load(WebServerSettings& settings) {
|
|||||||
// Web server settings
|
// Web server settings
|
||||||
settings.webServerEnabled = (webserver_enabled != map.end())
|
settings.webServerEnabled = (webserver_enabled != map.end())
|
||||||
? (webserver_enabled->second == "1" || webserver_enabled->second == "true")
|
? (webserver_enabled->second == "1" || webserver_enabled->second == "true")
|
||||||
: false;
|
: true;
|
||||||
|
|
||||||
settings.webServerPort = (webserver_port != map.end())
|
settings.webServerPort = (webserver_port != map.end())
|
||||||
? static_cast<uint16_t>(parseInt(webserver_port->second, 1, 65535, 80))
|
? static_cast<uint16_t>(parseInt(webserver_port->second, 1, 65535, 80))
|
||||||
@@ -206,7 +206,7 @@ WebServerSettings getDefault() {
|
|||||||
.apPassword = "", // Empty - will be auto-generated on first use (unless apOpenNetwork)
|
.apPassword = "", // Empty - will be auto-generated on first use (unless apOpenNetwork)
|
||||||
.apOpenNetwork = false, // Default to secured network
|
.apOpenNetwork = false, // Default to secured network
|
||||||
.apChannel = 1,
|
.apChannel = 1,
|
||||||
.webServerEnabled = false, // Default WebServer OFF for security
|
.webServerEnabled = true, // Default WebServer ON (simplified family UI: no toggle exposed)
|
||||||
.webServerPort = 80,
|
.webServerPort = 80,
|
||||||
.webServerAuthEnabled = false, // Auth disabled by default
|
.webServerAuthEnabled = false, // Auth disabled by default
|
||||||
.webServerUsername = "", // Empty - will be generated if auth is enabled
|
.webServerUsername = "", // Empty - will be generated if auth is enabled
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ std::string getTimeZoneName() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return "Europe/Amsterdam";
|
return "America/New_York";
|
||||||
}
|
}
|
||||||
|
|
||||||
bool hasTimeZone() {
|
bool hasTimeZone() {
|
||||||
@@ -105,13 +105,13 @@ std::string getTimeZoneCode() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return "CET-1CEST,M3.5.0,M10.5.0/3"; // Default: Europe/Amsterdam
|
return "EST5EDT,M3.2.0,M11.1.0"; // Default: America/New_York
|
||||||
}
|
}
|
||||||
|
|
||||||
bool isTimeFormat24Hour() {
|
bool isTimeFormat24Hour() {
|
||||||
SystemSettings properties;
|
SystemSettings properties;
|
||||||
if (!loadSystemSettings(properties)) {
|
if (!loadSystemSettings(properties)) {
|
||||||
return true;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
return properties.timeFormat24h;
|
return properties.timeFormat24h;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,6 +43,10 @@ dependencies:
|
|||||||
version: "1.3.4"
|
version: "1.3.4"
|
||||||
rules:
|
rules:
|
||||||
- if: "target in [esp32, esp32s3]"
|
- if: "target in [esp32, esp32s3]"
|
||||||
|
espressif/esp_lcd_st77922:
|
||||||
|
version: "1.0.3"
|
||||||
|
rules:
|
||||||
|
- if: "target in [esp32s3]"
|
||||||
espressif/esp_lcd_gc9a01: "2.0.3"
|
espressif/esp_lcd_gc9a01: "2.0.3"
|
||||||
espressif/esp_lcd_jd9165:
|
espressif/esp_lcd_jd9165:
|
||||||
version: "1.0.3"
|
version: "1.0.3"
|
||||||
@@ -95,4 +99,3 @@ dependencies:
|
|||||||
rules:
|
rules:
|
||||||
- if: "target in [esp32, esp32s3, esp32p4]"
|
- if: "target in [esp32, esp32s3, esp32p4]"
|
||||||
idf: '5.5.2'
|
idf: '5.5.2'
|
||||||
|
|
||||||
|
|||||||
Executable
+77
@@ -0,0 +1,77 @@
|
|||||||
|
#!/bin/zsh
|
||||||
|
# Build and flash LCDWIKI ES3C28P / ES3C35P firmware.
|
||||||
|
#
|
||||||
|
# Usage:
|
||||||
|
# ./flash-es3c.sh 35p [port] [--build-only]
|
||||||
|
# ./flash-es3c.sh 28p [port] [--build-only]
|
||||||
|
#
|
||||||
|
# If port is omitted, the single /dev/cu.usbmodem* device is used.
|
||||||
|
# Each board keeps its own build dir (build-es3c28p / build-es3c35p),
|
||||||
|
# so switching boards only rewrites sdkconfig via device.py.
|
||||||
|
set -eu -o pipefail
|
||||||
|
|
||||||
|
FIRMWARE_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||||
|
cd "$FIRMWARE_DIR"
|
||||||
|
SCRIPT_NAME="$(basename "$0")"
|
||||||
|
|
||||||
|
usage() {
|
||||||
|
echo "Usage: ${SCRIPT_NAME} <28p|35p> [port] [--build-only]"
|
||||||
|
echo " port defaults to the single /dev/cu.usbmodem* device"
|
||||||
|
}
|
||||||
|
|
||||||
|
if (( $# == 0 )); then
|
||||||
|
usage
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
28p|es3c28p) DEVICE_ID="es3c28p" ;;
|
||||||
|
35p|es3c35p) DEVICE_ID="es3c35p" ;;
|
||||||
|
-h|--help|help) usage; exit 0 ;;
|
||||||
|
*) echo "Unknown device '$1' (expected 28p or 35p)"; usage; exit 1 ;;
|
||||||
|
esac
|
||||||
|
shift
|
||||||
|
|
||||||
|
PORT=""
|
||||||
|
BUILD_ONLY=0
|
||||||
|
for arg in "$@"; do
|
||||||
|
case "$arg" in
|
||||||
|
--build-only) BUILD_ONLY=1 ;;
|
||||||
|
*) PORT="$arg" ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
if (( ! BUILD_ONLY )) && [[ -z "$PORT" ]]; then
|
||||||
|
candidates=(/dev/cu.usbmodem*(N))
|
||||||
|
if (( ${#candidates} == 0 )); then
|
||||||
|
echo "No /dev/cu.usbmodem* device found. Connect the board or pass the port explicitly."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if (( ${#candidates} > 1 )); then
|
||||||
|
echo "Multiple USB modem devices found:"
|
||||||
|
printf ' %s\n' "${candidates[@]}"
|
||||||
|
echo "Unplug one board or pass the port explicitly."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
PORT="${candidates[1]}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# IDF 5.5 environment (host venvs corrupt IDF tooling, so pin the IDF python env)
|
||||||
|
unset VIRTUAL_ENV PYTHONPATH PYTHONHOME
|
||||||
|
export IDF_PYTHON_ENV_PATH=/Users/adolforeyna/.espressif/python_env/idf5.5_py3.9_env
|
||||||
|
source /Users/adolforeyna/esp/esp-idf/export.sh
|
||||||
|
|
||||||
|
BUILD_DIR="build-${DEVICE_ID}"
|
||||||
|
"$IDF_PYTHON_ENV_PATH/bin/python" device.py "$DEVICE_ID"
|
||||||
|
idf.py -B "$BUILD_DIR" reconfigure build
|
||||||
|
|
||||||
|
if (( BUILD_ONLY )); then
|
||||||
|
echo "Build done (${BUILD_DIR}/Tactility.bin). Skipping flash (--build-only)."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "=== Confirming board on ${PORT} ==="
|
||||||
|
"$IDF_PYTHON_ENV_PATH/bin/python" -m esptool --chip esp32s3 -p "$PORT" chip_id | grep -E "Chip is|MAC:"
|
||||||
|
|
||||||
|
idf.py -B "$BUILD_DIR" -p "$PORT" -b 460800 flash
|
||||||
|
echo "Flashed ${DEVICE_ID} on ${PORT}."
|
||||||
@@ -3,4 +3,4 @@
|
|||||||
nvs, data, nvs, 0x9000, 0x6000,
|
nvs, data, nvs, 0x9000, 0x6000,
|
||||||
phy_init, data, phy, 0xf000, 0x1000,
|
phy_init, data, phy, 0xf000, 0x1000,
|
||||||
factory, app, factory, 0x10000, 4M,
|
factory, app, factory, 0x10000, 4M,
|
||||||
system, data, fat, , 128k,
|
system, data, fat, , 512k,
|
||||||
|
|||||||
|
Reference in New Issue
Block a user