6 Commits

Author SHA1 Message Date
lenn
69bd3d1d8e Optimize realtime charts for tablet 2026-05-12 18:38:22 +08:00
lenn
360b57e3e2 Add Android USB serial bridge docs 2026-05-11 22:30:45 +08:00
lenn
c5f4f854bf perf: optimize mobile line chart performance and remove window controls
- Remove drop-shadow filters on SVG paths on mobile (SignalChart, SummaryCurve)
- Hide scan-haze overlay (mix-blend-mode: screen) on mobile
- Remove feTurbulence noise filter on mobile (biggest perf win)
- Simplify backgrounds and box-shadows on mobile
- Remove blur transition on inactive panels
- Hide window control buttons (minimize/maximize/close) on mobile
- Configure Android release build to sign with debug keystore
- Update README with changelog and Android build instructions
2026-05-11 22:11:40 +08:00
lenn
551022215c feat: add Android USB serial port support via USB Host API
- Add USB Host permissions and device filter to AndroidManifest.xml
- Create UsbSerialPlugin Kotlin plugin for USB Host API (enumerate, permission, open devices)
- Add serial_connect_fd command for Android to accept USB file descriptors
- Create RawFdStream wrapper for async I/O on raw file descriptors
- Make run_serial_with_poll generic over AsyncRead+AsyncWrite
- Register UsbSerialPlugin in MainActivity
2026-05-11 20:31:46 +08:00
lenn
7323021aec chore: add Android debug keystore for APK signing 2026-05-11 19:49:28 +08:00
lenn
a85ce0b4a2 feat: add Android ARMv8 (aarch64) build support
- Initialize Tauri Android project structure (gen/android)
- Fix desktop_dir() unavailability on Android in file_explorer.rs and serial.rs
- Fix minimize/maximize/unmaximize unavailability on Android in window.rs
- Remove updater:default permission from default capabilities (not available on Android)
- Update .gitignore for Android build artifacts
- Successfully builds APK for aarch64-linux-android target
2026-05-11 19:38:01 +08:00
75 changed files with 4183 additions and 683 deletions

View File

@@ -1,10 +1,11 @@
# Tauri Demo (SvelteKit + TypeScript) # JE-Skin (SvelteKit + Tauri)
## 环境要求 ## 环境要求
- Node.js 18+(建议 LTS - Node.js 18+(建议 LTS
- Rust stable`rustup` + `cargo` - Rust stable`rustup` + `cargo`
- Windows 下请确保已安装 WebView2 Runtime 和 MSVC C++ 构建工具 - Windows 下请确保已安装 WebView2 Runtime 和 MSVC C++ 构建工具
- Android 构建需要 Android SDK + NDK
## 安装依赖 ## 安装依赖
@@ -42,12 +43,61 @@ npm run build
npm run tauri build npm run tauri build
``` ```
构建 Android APK / AAB
```sh
npx tauri android build
```
产物路径:
- APK: `src-tauri/gen/android/app/build/outputs/apk/universal/release/app-universal-release.apk`
- AAB: `src-tauri/gen/android/app/build/outputs/bundle/universalRelease/app-universal-release.aab`
Release APK 默认使用 debug keystore 签名(`src-tauri/gen/android/app/je-skin-debug.keystore`),可直接 `adb install` 到设备。
## 代码检查 ## 代码检查
```sh ```sh
npm run check npm run check
``` ```
## v0.5.0 修改记录
### Android USB 串口接入
- **Tauri 插件注册**Android 端通过 Rust builder 注册 `usb-serial` 插件,移除 `MainActivity` 中的手动加载逻辑
- **USB 设备枚举**:使用 `usb-serial-for-android``UsbSerialProber` 识别串口设备,并返回设备名、厂商 ID、产品 ID、权限状态等信息
- **USB 权限申请**:完善 Android USB 授权回调支持按设备名、vendorId/productId 解析设备并处理授权后的打开流程
- **串口数据桥接**Kotlin 端打开 USB serial port 后通过 Unix socketpair 将 fd 交给 RustRust 端继续复用 `serial_connect_fd` 数据采集链路
- **资源释放**:关闭连接时同步释放桥接 fd、USB serial port 和 `UsbDeviceConnection`,避免重复打开后的资源残留
### Tauri 权限与构建
- 新增 `src-tauri/permissions/usb-serial/default.toml`,声明 Android USB serial 插件命令和前端所需本地命令权限
- `default.json` 增加 USB serial 与本地命令权限,兼容 snake_case / camelCase 插件命令名
- Android Gradle 仓库加入 JitPack用于解析 USB serial 驱动依赖
- ProGuard 增加 Tauri 插件注解、`UsbSerialPlugin``com.hoho.android.usbserial` 保留规则,避免 release 包混淆后插件命令失效
- Android 构建下 `serial_enum` 返回空列表,并仅保留 fd 连接入口,避免桌面串口枚举依赖进入 Android 编译路径
## v0.4.0 修改记录
### 移动端性能优化
- **SignalChart / SummaryCurve**:在 `@media (max-width: 900px)` 下移除 SVG 路径上的 `filter: drop-shadow()`,避免移动端 GPU 软件回流导致卡顿
- **SignalChart**:隐藏 `.scan-haze``mix-blend-mode: screen` 合成开销大),简化面板 `background` / `box-shadow`
- **SummaryCurve**:移动端移除 `.summary-line``.summary-dot` 的 drop-shadow 滤镜
- **页面级**:移动端隐藏 `.hud-noise``feTurbulence` SVG 滤镜是最大性能杀手),降低 `.hud-vignette` 透明度,简化 `.hud-gradient`
- 移除 inactive 面板的 `filter: blur()` 过渡动画
- 移除 transition 中的 `filter` 属性,添加 `will-change: d` 优化路径更新
### 移动端 UI 调整
- **隐藏三大金刚**`@media (max-width: 900px)` 下隐藏标题栏右侧的最小化/最大化/关闭按钮Android 系统自带窗口管理)
### Android 打包
- Release 构建配置使用 debug keystore 签名,输出签名 APK 而非 unsigned
## 推荐 IDE 插件 ## 推荐 IDE 插件
[VS Code](https://code.visualstudio.com/) + [Svelte](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode) + [Tauri](https://marketplace.visualstudio.com/items?itemName=tauri-apps.tauri-vscode) + [rust-analyzer](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer) [VS Code](https://code.visualstudio.com/) + [Svelte](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode) + [Tauri](https://marketplace.visualstudio.com/items?itemName=tauri-apps.tauri-vscode) + [rust-analyzer](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer)

Submodule eskin-finger-sdk deleted from 705375085f

54
package-lock.json generated
View File

@@ -625,9 +625,6 @@
"arm" "arm"
], ],
"dev": true, "dev": true,
"libc": [
"glibc"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -642,9 +639,6 @@
"arm" "arm"
], ],
"dev": true, "dev": true,
"libc": [
"musl"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -659,9 +653,6 @@
"arm64" "arm64"
], ],
"dev": true, "dev": true,
"libc": [
"glibc"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -676,9 +667,6 @@
"arm64" "arm64"
], ],
"dev": true, "dev": true,
"libc": [
"musl"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -693,9 +681,6 @@
"loong64" "loong64"
], ],
"dev": true, "dev": true,
"libc": [
"glibc"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -710,9 +695,6 @@
"loong64" "loong64"
], ],
"dev": true, "dev": true,
"libc": [
"musl"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -727,9 +709,6 @@
"ppc64" "ppc64"
], ],
"dev": true, "dev": true,
"libc": [
"glibc"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -744,9 +723,6 @@
"ppc64" "ppc64"
], ],
"dev": true, "dev": true,
"libc": [
"musl"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -761,9 +737,6 @@
"riscv64" "riscv64"
], ],
"dev": true, "dev": true,
"libc": [
"glibc"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -778,9 +751,6 @@
"riscv64" "riscv64"
], ],
"dev": true, "dev": true,
"libc": [
"musl"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -795,9 +765,6 @@
"s390x" "s390x"
], ],
"dev": true, "dev": true,
"libc": [
"glibc"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -812,9 +779,6 @@
"x64" "x64"
], ],
"dev": true, "dev": true,
"libc": [
"glibc"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -829,9 +793,6 @@
"x64" "x64"
], ],
"dev": true, "dev": true,
"libc": [
"musl"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -1130,9 +1091,6 @@
"arm64" "arm64"
], ],
"dev": true, "dev": true,
"libc": [
"glibc"
],
"license": "Apache-2.0 OR MIT", "license": "Apache-2.0 OR MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -1150,9 +1108,6 @@
"arm64" "arm64"
], ],
"dev": true, "dev": true,
"libc": [
"musl"
],
"license": "Apache-2.0 OR MIT", "license": "Apache-2.0 OR MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -1170,9 +1125,6 @@
"riscv64" "riscv64"
], ],
"dev": true, "dev": true,
"libc": [
"glibc"
],
"license": "Apache-2.0 OR MIT", "license": "Apache-2.0 OR MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -1190,9 +1142,6 @@
"x64" "x64"
], ],
"dev": true, "dev": true,
"libc": [
"glibc"
],
"license": "Apache-2.0 OR MIT", "license": "Apache-2.0 OR MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -1210,9 +1159,6 @@
"x64" "x64"
], ],
"dev": true, "dev": true,
"libc": [
"musl"
],
"license": "Apache-2.0 OR MIT", "license": "Apache-2.0 OR MIT",
"optional": true, "optional": true,
"os": [ "os": [

11
src-tauri/.gitignore vendored
View File

@@ -7,3 +7,14 @@
# will have schema files for capabilities auto-completion # will have schema files for capabilities auto-completion
/gen/schemas /gen/schemas
*log* *log*
# Android build artifacts
/gen/android/app/build/
/gen/android/build/
/gen/android/.gradle/
/gen/android/.tauri/
/gen/android/local.properties
/gen/android/key.properties
/gen/android/keystore.properties
/gen/android/tauri.settings.gradle
/gen/android/app/src/main/jniLibs/

99
src-tauri/Cargo.lock generated
View File

@@ -8,14 +8,18 @@ version = "0.4.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-stream", "async-stream",
"async-trait",
"axum 0.8.9", "axum 0.8.9",
"chrono",
"crc",
"csv", "csv",
"dirs", "dirs",
"eskin-finger-sdk",
"fern", "fern",
"futures-util", "futures-util",
"humantime", "humantime",
"libc",
"log", "log",
"ndarray",
"prost", "prost",
"prost-types", "prost-types",
"protoc-bin-vendored", "protoc-bin-vendored",
@@ -1149,23 +1153,6 @@ dependencies = [
"windows-sys 0.61.2", "windows-sys 0.61.2",
] ]
[[package]]
name = "eskin-finger-sdk"
version = "0.1.0"
dependencies = [
"chrono",
"crc",
"crossbeam-channel",
"fern",
"libc",
"log",
"serde",
"serde_json",
"serialport",
"thiserror 2.0.18",
"uuid",
]
[[package]] [[package]]
name = "event-listener" name = "event-listener"
version = "5.4.1" version = "5.4.1"
@@ -2328,9 +2315,9 @@ dependencies = [
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.186" version = "0.2.183"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
[[package]] [[package]]
name = "libloading" name = "libloading"
@@ -2354,26 +2341,6 @@ dependencies = [
"redox_syscall 0.7.4", "redox_syscall 0.7.4",
] ]
[[package]]
name = "libudev"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78b324152da65df7bb95acfcaab55e3097ceaab02fb19b228a9eb74d55f135e0"
dependencies = [
"libc",
"libudev-sys",
]
[[package]]
name = "libudev-sys"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324"
dependencies = [
"libc",
"pkg-config",
]
[[package]] [[package]]
name = "linux-raw-sys" name = "linux-raw-sys"
version = "0.12.1" version = "0.12.1"
@@ -2476,6 +2443,16 @@ version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
[[package]]
name = "matrixmultiply"
version = "0.3.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a06de3016e9fae57a36fd14dba131fccf49f74b40b7fbdb472f96e361ec71a08"
dependencies = [
"autocfg",
"rawpointer",
]
[[package]] [[package]]
name = "memchr" name = "memchr"
version = "2.8.0" version = "2.8.0"
@@ -2565,6 +2542,19 @@ version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084" checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
[[package]]
name = "ndarray"
version = "0.15.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32"
dependencies = [
"matrixmultiply",
"num-complex",
"num-integer",
"num-traits",
"rawpointer",
]
[[package]] [[package]]
name = "ndk" name = "ndk"
version = "0.9.0" version = "0.9.0"
@@ -2630,12 +2620,30 @@ version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
[[package]]
name = "num-complex"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
dependencies = [
"num-traits",
]
[[package]] [[package]]
name = "num-conv" name = "num-conv"
version = "0.2.0" version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050" checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
[[package]]
name = "num-integer"
version = "0.1.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
dependencies = [
"num-traits",
]
[[package]] [[package]]
name = "num-traits" name = "num-traits"
version = "0.2.19" version = "0.2.19"
@@ -3640,6 +3648,12 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
[[package]]
name = "rawpointer"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
[[package]] [[package]]
name = "redox_syscall" name = "redox_syscall"
version = "0.5.18" version = "0.5.18"
@@ -4250,7 +4264,6 @@ dependencies = [
"core-foundation", "core-foundation",
"core-foundation-sys", "core-foundation-sys",
"io-kit-sys", "io-kit-sys",
"libudev",
"mach2", "mach2",
"nix 0.26.4", "nix 0.26.4",
"scopeguard", "scopeguard",
@@ -5553,9 +5566,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
[[package]] [[package]]
name = "uuid" name = "uuid"
version = "1.23.1" version = "1.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76" checksum = "a68d3c8f01c0cfa54a75291d83601161799e4a89a39e0929f4b0354d88757a37"
dependencies = [ dependencies = [
"getrandom 0.4.2", "getrandom 0.4.2",
"js-sys", "js-sys",

View File

@@ -17,6 +17,7 @@ crate-type = ["staticlib", "cdylib", "rlib"]
[features] [features]
default = [] default = []
devkit = ["dep:tonic", "dep:prost", "dep:prost-types", "dep:async-stream", "dep:dirs"] devkit = ["dep:tonic", "dep:prost", "dep:prost-types", "dep:async-stream", "dep:dirs"]
multi-dim = ["dep:ndarray"]
[build-dependencies] [build-dependencies]
tauri-build = { version = "2", features = [] } tauri-build = { version = "2", features = [] }
@@ -36,19 +37,24 @@ async-stream = { version = "0.3", optional = true }
dirs = { version = "6", optional = true } dirs = { version = "6", optional = true }
tokio-serial = { version = "5.4.5" } tokio-serial = { version = "5.4.5" }
tokio = { version = "1.50.0", features = ["full"] } tokio = { version = "1.50.0", features = ["full"] }
async-trait = "0.1.89"
tokio-util = "0.7.18" tokio-util = "0.7.18"
serde_json = "1" serde_json = "1"
fern = { version = "0.7.1", features = ["colored", "date-based"] } fern = { version = "0.7.1", features = ["colored", "date-based"] }
log = "0.4.29" log = "0.4.29"
humantime = "2.3.0" humantime = "2.3.0"
csv = "1.4.0" csv = "1.4.0"
chrono = "0.4.44"
crc = "3.4.0"
axum = { version = "0.8", features = ["ws"] } axum = { version = "0.8", features = ["ws"] }
tower-http = { version = "0.6", features = ["cors"] } tower-http = { version = "0.6", features = ["cors"] }
futures-util = "0.3" futures-util = "0.3"
uuid = { version = "1", features = ["v4", "serde"] } uuid = { version = "1", features = ["v4", "serde"] }
rand = "0.8" rand = "0.8"
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] } reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
eskin-finger-sdk = { path = "../eskin-finger-sdk" } ndarray = { version = "0.15", optional = true }
[target.'cfg(target_os = "android")'.dependencies]
libc = "0.2"
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies] [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
tauri-plugin-updater = "2" tauri-plugin-updater = "2"

View File

@@ -12,6 +12,12 @@
"core:window:allow-start-dragging", "core:window:allow-start-dragging",
"opener:default", "opener:default",
"process:default", "process:default",
"updater:default" "allow-usb-serial-list",
"allow-usb-serial-open",
"allow-usb-serial-close",
"allow-usb-serial-list-camel",
"allow-usb-serial-open-camel",
"allow-usb-serial-close-camel",
"allow-local-commands"
] ]
} }

View File

@@ -0,0 +1,12 @@
# EditorConfig is awesome: https://EditorConfig.org
# top-most EditorConfig file
root = true
[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = false
insert_final_newline = false

20
src-tauri/gen/android/.gitignore vendored Normal file
View File

@@ -0,0 +1,20 @@
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store
build
/captures
.externalNativeBuild
.cxx
local.properties
key.properties
keystore.properties
/.tauri
/tauri.settings.gradle

6
src-tauri/gen/android/app/.gitignore vendored Normal file
View File

@@ -0,0 +1,6 @@
/src/main/**/generated
/src/main/jniLibs/**/*.so
/src/main/assets/tauri.conf.json
/tauri.build.gradle.kts
/proguard-tauri.pro
/tauri.properties

View File

@@ -0,0 +1,73 @@
import java.util.Properties
plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("rust")
}
val tauriProperties = Properties().apply {
val propFile = file("tauri.properties")
if (propFile.exists()) {
propFile.inputStream().use { load(it) }
}
}
android {
compileSdk = 36
namespace = "com.lenn.tauri_serial"
defaultConfig {
manifestPlaceholders["usesCleartextTraffic"] = "false"
applicationId = "com.lenn.tauri_serial"
minSdk = 24
targetSdk = 36
versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")
}
buildTypes {
getByName("debug") {
manifestPlaceholders["usesCleartextTraffic"] = "true"
isDebuggable = true
isJniDebuggable = true
isMinifyEnabled = false
packaging { jniLibs.keepDebugSymbols.add("*/arm64-v8a/*.so")
jniLibs.keepDebugSymbols.add("*/armeabi-v7a/*.so")
jniLibs.keepDebugSymbols.add("*/x86/*.so")
jniLibs.keepDebugSymbols.add("*/x86_64/*.so")
}
}
getByName("release") {
isMinifyEnabled = true
proguardFiles(
*fileTree(".") { include("**/*.pro") }
.plus(getDefaultProguardFile("proguard-android-optimize.txt"))
.toList().toTypedArray()
)
signingConfig = signingConfigs.getByName("debug")
}
}
kotlinOptions {
jvmTarget = "1.8"
}
buildFeatures {
buildConfig = true
}
}
rust {
rootDirRel = "../../../"
}
dependencies {
implementation("androidx.webkit:webkit:1.14.0")
implementation("androidx.appcompat:appcompat:1.7.1")
implementation("androidx.activity:activity-ktx:1.10.1")
implementation("com.google.android.material:material:1.12.0")
implementation("androidx.lifecycle:lifecycle-process:2.10.0")
implementation("com.github.mik3y:usb-serial-for-android:3.9.0")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.4")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.0")
}
apply(from = "tauri.build.gradle.kts")

Binary file not shown.

View File

@@ -0,0 +1,34 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
-keepattributes RuntimeVisibleAnnotations,RuntimeInvisibleAnnotations,*Annotation*,Signature,InnerClasses,EnclosingMethod
-keep class app.tauri.annotation.** { *; }
-keep class app.tauri.plugin.** { *; }
-keep class com.lenn.tauri_serial.MainActivity { *; }
-keep class com.lenn.tauri_serial.UsbSerialPlugin { *; }
-keepclassmembers class com.lenn.tauri_serial.UsbSerialPlugin {
public *;
}
-keep class com.hoho.android.usbserial.** { *; }

View File

@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET" />
<!-- USB Host support for serial devices -->
<uses-feature android:name="android.hardware.usb.host" android:required="true" />
<!-- AndroidTV support -->
<uses-feature android:name="android.software.leanback" android:required="false" />
<application
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:theme="@style/Theme.je_skin"
android:usesCleartextTraffic="${usesCleartextTraffic}">
<activity
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
android:launchMode="singleTask"
android:label="@string/main_activity_title"
android:name=".MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<!-- AndroidTV support -->
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
</intent-filter>
<!-- Auto-launch when USB device is attached -->
<intent-filter>
<action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
</intent-filter>
<meta-data
android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
android:resource="@xml/usb_device_filter" />
</activity>
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
</provider>
</application>
</manifest>

View File

@@ -0,0 +1,11 @@
package com.lenn.tauri_serial
import android.os.Bundle
import androidx.activity.enableEdgeToEdge
class MainActivity : TauriActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
enableEdgeToEdge()
super.onCreate(savedInstanceState)
}
}

View File

@@ -0,0 +1,388 @@
package com.lenn.tauri_serial
import android.app.Activity
import android.app.PendingIntent
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import android.hardware.usb.UsbDevice
import android.hardware.usb.UsbDeviceConnection
import android.hardware.usb.UsbManager
import android.os.Build
import android.os.ParcelFileDescriptor
import android.system.Os
import android.system.OsConstants
import app.tauri.annotation.Command
import app.tauri.annotation.TauriPlugin
import app.tauri.plugin.Invoke
import app.tauri.plugin.JSObject
import app.tauri.plugin.Plugin
import com.hoho.android.usbserial.driver.UsbSerialDriver
import com.hoho.android.usbserial.driver.UsbSerialPort
import com.hoho.android.usbserial.driver.UsbSerialProber
import java.io.FileDescriptor
import java.io.FileInputStream
import java.io.FileOutputStream
import java.io.IOException
import java.util.concurrent.atomic.AtomicBoolean
import org.json.JSONArray
@TauriPlugin
class UsbSerialPlugin(private val activity: Activity) : Plugin(activity) {
companion object {
private const val ACTION_USB_PERMISSION = "com.lenn.tauri_serial.USB_PERMISSION"
private const val BAUD_RATE = 921600
private const val READ_TIMEOUT_MS = 100
private const val WRITE_TIMEOUT_MS = 100
}
private var pendingConnectInvoke: Invoke? = null
private var pendingConnectDeviceName: String? = null
private var activeBridge: SerialBridge? = null
private val usbPermissionReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
if (ACTION_USB_PERMISSION != intent.action) return
synchronized(this@UsbSerialPlugin) {
val device = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
intent.getParcelableExtra(UsbManager.EXTRA_DEVICE, UsbDevice::class.java)
} else {
@Suppress("DEPRECATION")
intent.getParcelableExtra(UsbManager.EXTRA_DEVICE)
}
val granted = intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)
val invoke = pendingConnectInvoke
val targetDeviceName = pendingConnectDeviceName
pendingConnectInvoke = null
pendingConnectDeviceName = null
if (invoke == null || device == null) return
if (!granted) {
invoke.reject("USB permission denied")
return
}
if (targetDeviceName != null && device.deviceName == targetDeviceName) {
openAndReturn(invoke, device.deviceName)
} else {
invoke.reject("USB device mismatch")
}
}
}
}
override fun load(webView: android.webkit.WebView) {
super.load(webView)
val filter = IntentFilter(ACTION_USB_PERMISSION)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
activity.applicationContext.registerReceiver(
usbPermissionReceiver,
filter,
Context.RECEIVER_NOT_EXPORTED
)
} else {
activity.applicationContext.registerReceiver(usbPermissionReceiver, filter)
}
}
override fun onDestroy() {
super.onDestroy()
activeBridge?.close()
activeBridge = null
try {
activity.applicationContext.unregisterReceiver(usbPermissionReceiver)
} catch (_: Exception) {
}
}
@Command
fun usb_serial_list(invoke: Invoke) {
listDevices(invoke)
}
@Command
fun usbSerialList(invoke: Invoke) {
listDevices(invoke)
}
private fun listDevices(invoke: Invoke) {
val usbManager = activity.getSystemService(Context.USB_SERVICE) as? UsbManager
if (usbManager == null) {
invoke.reject("USB service not available")
return
}
val result = JSObject()
val serialDevices = JSONArray()
for (driver in UsbSerialProber.getDefaultProber().findAllDrivers(usbManager)) {
val device = driver.device
val obj = JSObject()
obj.put("name", device.deviceName)
obj.put("vendorId", device.vendorId)
obj.put("productId", device.productId)
obj.put("manufacturer", safeDeviceString { device.manufacturerName })
obj.put("product", safeDeviceString { device.productName })
obj.put("serial", safeDeviceString { device.serialNumber })
obj.put("hasPermission", usbManager.hasPermission(device))
serialDevices.put(obj)
}
result.put("devices", serialDevices)
invoke.resolve(result)
}
@Command
fun usb_serial_open(invoke: Invoke) {
openDevice(invoke)
}
@Command
fun usbSerialOpen(invoke: Invoke) {
openDevice(invoke)
}
private fun openDevice(invoke: Invoke) {
val args = invoke.parseArgs(JSObject::class.java)
val deviceName = args.optString("name", "")
val vendorId = if (args.has("vendorId")) args.optInt("vendorId") else null
val productId = if (args.has("productId")) args.optInt("productId") else null
val usbManager = activity.getSystemService(Context.USB_SERVICE) as? UsbManager
if (usbManager == null) {
invoke.reject("USB service not available")
return
}
val device = resolveDevice(usbManager, deviceName, vendorId, productId)
if (device == null) {
val available = usbManager.deviceList.values.joinToString(", ") { it.deviceName }
invoke.reject("USB device not found: $deviceName; available: $available")
return
}
if (!usbManager.hasPermission(device)) {
synchronized(this) {
pendingConnectInvoke = invoke
pendingConnectDeviceName = device.deviceName
}
val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
} else {
PendingIntent.FLAG_UPDATE_CURRENT
}
val permissionRequest = Intent(ACTION_USB_PERMISSION).setPackage(activity.packageName)
val permissionIntent = PendingIntent.getBroadcast(
activity,
0,
permissionRequest,
flags
)
usbManager.requestPermission(device, permissionIntent)
return
}
openAndReturn(invoke, device.deviceName)
}
@Command
fun usb_serial_close(invoke: Invoke) {
closeBridge()
invoke.resolve(JSObject())
}
@Command
fun usbSerialClose(invoke: Invoke) {
closeBridge()
invoke.resolve(JSObject())
}
private fun closeBridge() {
activeBridge?.close()
activeBridge = null
}
private fun openAndReturn(invoke: Invoke, deviceName: String) {
val usbManager = activity.getSystemService(Context.USB_SERVICE) as? UsbManager
if (usbManager == null) {
invoke.reject("USB service not available")
return
}
val driver = findDriver(usbManager, deviceName)
if (driver == null) {
invoke.reject("USB serial driver not found: $deviceName")
return
}
val connection = usbManager.openDevice(driver.device)
if (connection == null) {
invoke.reject("Failed to open USB device")
return
}
val port = driver.ports.firstOrNull()
if (port == null) {
connection.close()
invoke.reject("No serial port found on USB device")
return
}
try {
port.open(connection)
port.setParameters(
BAUD_RATE,
UsbSerialPort.DATABITS_8,
UsbSerialPort.STOPBITS_1,
UsbSerialPort.PARITY_NONE
)
val rustSide = FileDescriptor()
val bridgeSide = FileDescriptor()
Os.socketpair(OsConstants.AF_UNIX, OsConstants.SOCK_STREAM, 0, rustSide, bridgeSide)
val rustFd = ParcelFileDescriptor.dup(rustSide).detachFd()
Os.close(rustSide)
activeBridge?.close()
activeBridge = SerialBridge(bridgeSide, port, connection).also { it.start() }
val result = JSObject()
result.put("fd", rustFd)
result.put("name", driver.device.deviceName)
result.put("vendorId", driver.device.vendorId)
result.put("productId", driver.device.productId)
invoke.resolve(result)
} catch (error: Exception) {
try {
port.close()
} catch (_: Exception) {
}
connection.close()
invoke.reject(error.message ?: "Failed to open USB serial port")
}
}
private fun findDriver(usbManager: UsbManager, deviceName: String): UsbSerialDriver? {
return UsbSerialProber.getDefaultProber()
.findAllDrivers(usbManager)
.firstOrNull { it.device.deviceName == deviceName || it.device.deviceName.equals(deviceName, ignoreCase = true) }
}
private fun resolveDevice(
usbManager: UsbManager,
deviceName: String,
vendorId: Int?,
productId: Int?
): UsbDevice? {
usbManager.deviceList[deviceName]?.let { return it }
val devices = usbManager.deviceList.values.toList()
devices.firstOrNull { it.deviceName.equals(deviceName, ignoreCase = true) }?.let { return it }
if (vendorId != null && productId != null) {
devices.firstOrNull { it.vendorId == vendorId && it.productId == productId }?.let { return it }
}
val drivers = UsbSerialProber.getDefaultProber().findAllDrivers(usbManager)
drivers.firstOrNull {
it.device.deviceName == deviceName || it.device.deviceName.equals(deviceName, ignoreCase = true)
}?.device?.let { return it }
if (drivers.size == 1) {
return drivers.first().device
}
if (devices.size == 1) {
return devices.first()
}
return null
}
private fun safeDeviceString(read: () -> String?): String {
return try {
read() ?: ""
} catch (_: SecurityException) {
""
}
}
private class SerialBridge(
private val bridgeFd: FileDescriptor,
private val port: UsbSerialPort,
private val connection: UsbDeviceConnection
) {
private val running = AtomicBoolean(false)
private lateinit var serialToRustThread: Thread
private lateinit var rustToSerialThread: Thread
fun start() {
running.set(true)
serialToRustThread = Thread(::copySerialToRust, "JE-Skin-usb-serial-rx")
rustToSerialThread = Thread(::copyRustToSerial, "JE-Skin-usb-serial-tx")
serialToRustThread.start()
rustToSerialThread.start()
}
fun close() {
if (!running.getAndSet(false)) return
try {
Os.close(bridgeFd)
} catch (_: Exception) {
}
try {
port.close()
} catch (_: Exception) {
}
connection.close()
}
private fun copySerialToRust() {
val output = FileOutputStream(bridgeFd)
val buffer = ByteArray(4096)
while (running.get()) {
try {
val count = port.read(buffer, READ_TIMEOUT_MS)
if (count > 0) {
output.write(buffer, 0, count)
output.flush()
}
} catch (_: IOException) {
close()
} catch (_: Exception) {
close()
}
}
}
private fun copyRustToSerial() {
val input = FileInputStream(bridgeFd)
val buffer = ByteArray(4096)
while (running.get()) {
try {
val count = input.read(buffer)
if (count < 0) {
close()
return
}
if (count > 0) {
port.write(buffer.copyOf(count), WRITE_TIMEOUT_MS)
}
} catch (_: IOException) {
close()
} catch (_: Exception) {
close()
}
}
}
}
}

View File

@@ -0,0 +1,30 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="85.84757"
android:endY="92.4963"
android:startX="42.9492"
android:startY="49.59793"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>

View File

@@ -0,0 +1,170 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillColor="#3DDC84"
android:pathData="M0,0h108v108h-108z" />
<path
android:fillColor="#00000000"
android:pathData="M9,0L9,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,0L19,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,0L29,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,0L39,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,0L49,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,0L59,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,0L69,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,0L79,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M89,0L89,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M99,0L99,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,9L108,9"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,19L108,19"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,29L108,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,39L108,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,49L108,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,59L108,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,69L108,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,79L108,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,89L108,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,99L108,99"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,29L89,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,39L89,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,49L89,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,59L89,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,69L89,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,79L89,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,19L29,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,19L39,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,19L49,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,19L59,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,19L69,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,19L79,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
</vector>

View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Hello World!"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View File

@@ -0,0 +1,6 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Theme.je_skin" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Customize your theme here. -->
</style>
</resources>

View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="purple_200">#FFBB86FC</color>
<color name="purple_500">#FF6200EE</color>
<color name="purple_700">#FF3700B3</color>
<color name="teal_200">#FF03DAC5</color>
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
</resources>

View File

@@ -0,0 +1,4 @@
<resources>
<string name="app_name">JE-Skin</string>
<string name="main_activity_title">JE-Skin</string>
</resources>

View File

@@ -0,0 +1,6 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Theme.je_skin" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Customize your theme here. -->
</style>
</resources>

View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<paths xmlns:android="http://schemas.android.com/apk/res/android">
<external-path name="my_images" path="." />
<cache-path name="my_cache_images" path="." />
</paths>

View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- CH340 / CH341 USB-Serial -->
<usb-device vendor-id="1a86" product-id="7523" />
<!-- CP2102 / CP2104 -->
<usb-device vendor-id="10c4" product-id="ea60" />
<usb-device vendor-id="10c4" product-id="ea70" />
<!-- FTDI FT232R / FT232H -->
<usb-device vendor-id="0403" product-id="6001" />
<usb-device vendor-id="0403" product-id="6014" />
<!-- PL2303 -->
<usb-device vendor-id="067b" product-id="2303" />
<usb-device vendor-id="067b" product-id="23a3" />
<!-- CDC ACM (generic USB serial) -->
<usb-device vendor-id="2341" product-id="0001" />
<usb-device vendor-id="2341" product-id="0043" />
<usb-device vendor-id="2341" product-id="0042" />
<!-- Allow any USB device (catch-all) -->
<usb-device />
</resources>

View File

@@ -0,0 +1,22 @@
buildscript {
repositories {
google()
mavenCentral()
}
dependencies {
classpath("com.android.tools.build:gradle:8.11.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25")
}
}
allprojects {
repositories {
google()
mavenCentral()
maven(url = "https://jitpack.io")
}
}
tasks.register("clean").configure {
delete("build")
}

View File

@@ -0,0 +1,23 @@
plugins {
`kotlin-dsl`
}
gradlePlugin {
plugins {
create("pluginsForCoolKids") {
id = "rust"
implementationClass = "RustPlugin"
}
}
}
repositories {
google()
mavenCentral()
}
dependencies {
compileOnly(gradleApi())
implementation("com.android.tools.build:gradle:8.11.0")
}

View File

@@ -0,0 +1,68 @@
import java.io.File
import org.apache.tools.ant.taskdefs.condition.Os
import org.gradle.api.DefaultTask
import org.gradle.api.GradleException
import org.gradle.api.logging.LogLevel
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.TaskAction
open class BuildTask : DefaultTask() {
@Input
var rootDirRel: String? = null
@Input
var target: String? = null
@Input
var release: Boolean? = null
@TaskAction
fun assemble() {
val executable = """cargo""";
try {
runTauriCli(executable)
} catch (e: Exception) {
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
// Try different Windows-specific extensions
val fallbacks = listOf(
"$executable.exe",
"$executable.cmd",
"$executable.bat",
)
var lastException: Exception = e
for (fallback in fallbacks) {
try {
runTauriCli(fallback)
return
} catch (fallbackException: Exception) {
lastException = fallbackException
}
}
throw lastException
} else {
throw e;
}
}
}
fun runTauriCli(executable: String) {
val rootDirRel = rootDirRel ?: throw GradleException("rootDirRel cannot be null")
val target = target ?: throw GradleException("target cannot be null")
val release = release ?: throw GradleException("release cannot be null")
val args = listOf("tauri", "android", "android-studio-script");
project.exec {
workingDir(File(project.projectDir, rootDirRel))
executable(executable)
args(args)
if (project.logger.isEnabled(LogLevel.DEBUG)) {
args("-vv")
} else if (project.logger.isEnabled(LogLevel.INFO)) {
args("-v")
}
if (release) {
args("--release")
}
args(listOf("--target", target))
}.assertNormalExitValue()
}
}

View File

@@ -0,0 +1,85 @@
import com.android.build.api.dsl.ApplicationExtension
import org.gradle.api.DefaultTask
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.get
const val TASK_GROUP = "rust"
open class Config {
lateinit var rootDirRel: String
}
open class RustPlugin : Plugin<Project> {
private lateinit var config: Config
override fun apply(project: Project) = with(project) {
config = extensions.create("rust", Config::class.java)
val defaultAbiList = listOf("arm64-v8a", "armeabi-v7a", "x86", "x86_64");
val abiList = (findProperty("abiList") as? String)?.split(',') ?: defaultAbiList
val defaultArchList = listOf("arm64", "arm", "x86", "x86_64");
val archList = (findProperty("archList") as? String)?.split(',') ?: defaultArchList
val targetsList = (findProperty("targetList") as? String)?.split(',') ?: listOf("aarch64", "armv7", "i686", "x86_64")
extensions.configure<ApplicationExtension> {
@Suppress("UnstableApiUsage")
flavorDimensions.add("abi")
productFlavors {
create("universal") {
dimension = "abi"
ndk {
abiFilters += abiList
}
}
defaultArchList.forEachIndexed { index, arch ->
create(arch) {
dimension = "abi"
ndk {
abiFilters.add(defaultAbiList[index])
}
}
}
}
}
afterEvaluate {
for (profile in listOf("debug", "release")) {
val profileCapitalized = profile.replaceFirstChar { it.uppercase() }
val buildTask = tasks.maybeCreate(
"rustBuildUniversal$profileCapitalized",
DefaultTask::class.java
).apply {
group = TASK_GROUP
description = "Build dynamic library in $profile mode for all targets"
}
tasks["mergeUniversal${profileCapitalized}JniLibFolders"].dependsOn(buildTask)
for (targetPair in targetsList.withIndex()) {
val targetName = targetPair.value
val targetArch = archList[targetPair.index]
val targetArchCapitalized = targetArch.replaceFirstChar { it.uppercase() }
val targetBuildTask = project.tasks.maybeCreate(
"rustBuild$targetArchCapitalized$profileCapitalized",
BuildTask::class.java
).apply {
group = TASK_GROUP
description = "Build dynamic library in $profile mode for $targetArch"
rootDirRel = config.rootDirRel
target = targetName
release = profile == "release"
}
buildTask.dependsOn(targetBuildTask)
tasks["merge$targetArchCapitalized${profileCapitalized}JniLibFolders"].dependsOn(
targetBuildTask
)
}
}
}
}
}

View File

@@ -0,0 +1,24 @@
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app"s APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
# Enables namespacing of each library's R class so that its R class includes only the
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
android.nonFinalResIds=false

Binary file not shown.

View File

@@ -0,0 +1,6 @@
#Tue May 10 19:22:52 CST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

185
src-tauri/gen/android/gradlew vendored Executable file
View File

@@ -0,0 +1,185 @@
#!/usr/bin/env sh
#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn () {
echo "$*"
}
die () {
echo
echo "$*"
echo
exit 1
}
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=`expr $i + 1`
done
case $i in
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
exec "$JAVACMD" "$@"

89
src-tauri/gen/android/gradlew.bat vendored Normal file
View File

@@ -0,0 +1,89 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

View File

@@ -0,0 +1,3 @@
include ':app'
apply from: 'tauri.settings.gradle'

View File

@@ -0,0 +1,66 @@
[default]
description = "Allows Android USB serial plugin commands."
permissions = [
"allow-usb-serial-list",
"allow-usb-serial-open",
"allow-usb-serial-close",
"allow-usb-serial-list-camel",
"allow-usb-serial-open-camel",
"allow-usb-serial-close-camel",
"allow-local-commands"
]
[[permission]]
identifier = "allow-usb-serial-list"
description = "Allows listing Android USB serial devices."
commands.allow = ["plugin:usb-serial|usb_serial_list"]
[[permission]]
identifier = "allow-usb-serial-open"
description = "Allows opening Android USB serial devices."
commands.allow = ["plugin:usb-serial|usb_serial_open"]
[[permission]]
identifier = "allow-usb-serial-close"
description = "Allows closing Android USB serial devices."
commands.allow = ["plugin:usb-serial|usb_serial_close"]
[[permission]]
identifier = "allow-usb-serial-list-camel"
description = "Allows listing Android USB serial devices via camelCase command."
commands.allow = ["plugin:usb-serial|usbSerialList"]
[[permission]]
identifier = "allow-usb-serial-open-camel"
description = "Allows opening Android USB serial devices via camelCase command."
commands.allow = ["plugin:usb-serial|usbSerialOpen"]
[[permission]]
identifier = "allow-usb-serial-close-camel"
description = "Allows closing Android USB serial devices via camelCase command."
commands.allow = ["plugin:usb-serial|usbSerialClose"]
[[permission]]
identifier = "allow-local-commands"
description = "Allows application commands used by the Android frontend."
commands.allow = [
"file_explorer_list",
"serial_enum",
"serial_connect",
"serial_connect_fd",
"serial_disconnect",
"serial_export_csv",
"serial_has_record_data",
"serial_export_csv_to_path",
"serial_import_csv",
"serial_import_csv_from_path",
"win_minimize",
"win_toggle_maximize",
"win_close",
"devkit_status",
"devkit_start",
"devkit_stop",
"devkit_get_config",
"devkit_set_config",
"devkit_process_export"
]

View File

@@ -0,0 +1,9 @@
{
"plugins": {
"usb-serial": {
"android": {
"package": "com.lenn.tauri_serial.UsbSerialPlugin"
}
}
}
}

View File

@@ -141,6 +141,7 @@ fn resolve_start_path(app: &AppHandle, raw_path: Option<String>) -> Result<PathB
} }
fn resolve_default_path(app: &AppHandle) -> Result<PathBuf, String> { fn resolve_default_path(app: &AppHandle) -> Result<PathBuf, String> {
#[cfg(not(target_os = "android"))]
if let Ok(path) = app.path().desktop_dir() { if let Ok(path) = app.path().desktop_dir() {
return Ok(path); return Ok(path);
} }
@@ -175,6 +176,7 @@ fn collect_roots(app: &AppHandle) -> Vec<FileExplorerRoot> {
} }
}; };
#[cfg(not(target_os = "android"))]
if let Ok(path) = app.path().desktop_dir() { if let Ok(path) = app.path().desktop_dir() {
push_root("Desktop", path); push_root("Desktop", path);
} }

View File

@@ -1,18 +1,28 @@
use crate::serial_core::codecs::tactile_a::{
export_recording_csv, TactileACodec, TactileACsvImporter, TactileAHandler,
};
use crate::serial_core::error::SerialError; use crate::serial_core::error::SerialError;
use crate::serial_core::record::{self, FingerRecording}; use crate::serial_core::record::CsvImporter;
use crate::serial_core::serial; use crate::serial_core::serial::{PollMode, TactileAPollRequester};
use eskin_finger_sdk::device::EskinDevice; use crate::serial_core::{serial, TactileARecording};
use log::info; use log::info;
use serde::Serialize; use serde::Serialize;
use std::fs::File;
use std::io::Cursor; use std::io::Cursor;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use std::time::{SystemTime, UNIX_EPOCH}; use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
use tauri::{async_runtime::JoinHandle, AppHandle, Manager, State}; use tauri::{async_runtime::JoinHandle, AppHandle, Manager, State};
use tokio_serial::available_ports; #[cfg(not(target_os = "android"))]
use tokio_serial::{available_ports, SerialPortBuilderExt};
use tokio_util::sync::CancellationToken; use tokio_util::sync::CancellationToken;
type SharedRecording = Arc<Mutex<FingerRecording>>; const DEFAULT_TACTILE_COLS: usize = 7;
const DEFAULT_TACTILE_ROWS: usize = 12;
const DEFAULT_TACTILE_POLL_INTERVAL_MS: u64 = 10;
const DEFAULT_TACTILE_REPLY_TIMEOUT_MS: u64 = 140;
type SharedTactileRecording = Arc<Mutex<TactileARecording>>;
#[derive(Serialize)] #[derive(Serialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
@@ -58,18 +68,18 @@ struct SerialSession {
port: String, port: String,
cancel: CancellationToken, cancel: CancellationToken,
task: JoinHandle<()>, task: JoinHandle<()>,
current_record: SharedRecording, current_record: SharedTactileRecording,
} }
#[derive(Default)] #[derive(Default)]
pub struct SerialConnectionState { pub struct SerialConnectionState {
session: Mutex<Option<SerialSession>>, session: Mutex<Option<SerialSession>>,
last_record: Mutex<Option<SharedRecording>>, last_record: Mutex<Option<SharedTactileRecording>>,
} }
pub async fn shutdown_active_session( pub async fn shutdown_active_session(
state: &SerialConnectionState, state: &SerialConnectionState,
) -> Result<Option<(String, SharedRecording)>, SerialError> { ) -> Result<Option<(String, SharedTactileRecording)>, SerialError> {
let session = { let session = {
let mut guard = state.session.lock().map_err(|_| SerialError::StateError)?; let mut guard = state.session.lock().map_err(|_| SerialError::StateError)?;
guard.take() guard.take()
@@ -104,22 +114,31 @@ pub async fn shutdown_active_session(
#[tauri::command] #[tauri::command]
pub fn serial_enum() -> Result<Vec<String>, SerialError> { pub fn serial_enum() -> Result<Vec<String>, SerialError> {
let ports = available_ports() #[cfg(target_os = "android")]
.map_err(|_| SerialError::ScanError)? {
.into_iter() Ok(Vec::new())
.filter_map(|p| { }
let name = p.port_name;
#[cfg(unix)]
if !name.contains("USB") {
return None;
}
Some(name)
})
.collect();
Ok(ports) #[cfg(not(target_os = "android"))]
{
let ports = available_ports()
.map_err(|_| SerialError::ScanError)?
.into_iter()
.filter_map(|p| {
let name = p.port_name;
#[cfg(unix)]
if !name.contains("USB") {
return None;
}
Some(name)
})
.collect();
Ok(ports)
}
} }
#[cfg(not(target_os = "android"))]
#[tauri::command] #[tauri::command]
pub async fn serial_connect( pub async fn serial_connect(
app: AppHandle, app: AppHandle,
@@ -139,41 +158,62 @@ pub async fn serial_connect(
} }
let cancel = CancellationToken::new(); let cancel = CancellationToken::new();
let current_record = Arc::new(Mutex::new(FingerRecording::new())); let current_record = Arc::new(Mutex::new(TactileARecording::new()));
let task_record = current_record.clone(); let task_record = current_record.clone();
let task_cancel = cancel.clone(); let task_cancel = cancel.clone();
let task_app = app.clone(); let task_app = app.clone();
let task_port_name = port_name.clone(); let task_port_name = port_name.clone();
let port = tokio_serial::new(&port_name, 921600)
.open_native_async()
.map_err(|_| SerialError::OpenError)?;
let session_started_at = Instant::now();
let task = tauri::async_runtime::spawn(async move { let task = tauri::async_runtime::spawn(async move {
// Open device using SDK let codec = TactileACodec::new(DEFAULT_TACTILE_COLS, DEFAULT_TACTILE_ROWS);
let session = match serial::open_device(&task_port_name) { let handler = TactileAHandler;
Ok(s) => s, let poll_mode = PollMode::Enabled(Box::new(TactileAPollRequester::new(
Err(e) => { Duration::from_millis(DEFAULT_TACTILE_POLL_INTERVAL_MS),
eprintln!("Failed to open device: {e}"); DEFAULT_TACTILE_COLS,
cleanup_session(&task_app, &task_port_name, task_record).await; DEFAULT_TACTILE_ROWS,
return; Duration::from_millis(DEFAULT_TACTILE_REPLY_TIMEOUT_MS),
} )));
};
let mut device = session.device; if let Err(error) = serial::run_serial_with_poll(
// Run stream with recording
if let Err(error) = serial::run_stream_with_record(
task_app.clone(), task_app.clone(),
&mut device, port,
task_cancel, codec,
handler,
session_started_at,
task_record.clone(), task_record.clone(),
task_cancel,
poll_mode,
) )
.await .await
{ {
eprintln!("serial task exited with error: {error}"); eprintln!("serial task exited with error: {error}");
} }
// Close device let manager = task_app.state::<SerialConnectionState>();
let _ = device.close(); if let Ok(mut last_record) = manager.last_record.lock() {
*last_record = Some(task_record);
}
cleanup_session(&task_app, &task_port_name, task_record).await; let mut session = match manager.session.lock() {
Ok(session) => session,
Err(_) => return,
};
{
let should_clear = session
.as_ref()
.map(|current| current.port.as_str() == task_port_name.as_str())
.unwrap_or(false);
if should_clear {
session.take();
}
}
}); });
let mut session = state.session.lock().map_err(|_| SerialError::StateError)?; let mut session = state.session.lock().map_err(|_| SerialError::StateError)?;
@@ -197,31 +237,6 @@ pub async fn serial_connect(
}) })
} }
async fn cleanup_session(
app: &AppHandle,
port_name: &str,
record: SharedRecording,
) {
let manager = app.state::<SerialConnectionState>();
if let Ok(mut last_record) = manager.last_record.lock() {
*last_record = Some(record);
}
let mut session = match manager.session.lock() {
Ok(session) => session,
Err(_) => return,
};
let should_clear = session
.as_ref()
.map(|current| current.port.as_str() == port_name)
.unwrap_or(false);
if should_clear {
session.take();
}
}
#[tauri::command] #[tauri::command]
pub async fn serial_disconnect( pub async fn serial_disconnect(
state: State<'_, SerialConnectionState>, state: State<'_, SerialConnectionState>,
@@ -241,15 +256,122 @@ pub async fn serial_disconnect(
}) })
} }
#[cfg(target_os = "android")]
#[tauri::command]
pub async fn serial_connect_fd(
app: AppHandle,
fd: i32,
device_name: String,
state: State<'_, SerialConnectionState>,
) -> Result<SerialConnectResponse, SerialError> {
if fd < 0 {
return Err(SerialError::InvalidConfig);
}
{
let session = state.session.lock().map_err(|_| SerialError::StateError)?;
if session.is_some() {
return Err(SerialError::AlreadyConnected);
}
}
let cancel = CancellationToken::new();
let current_record = Arc::new(Mutex::new(TactileARecording::new()));
let task_record = current_record.clone();
let task_cancel = cancel.clone();
let task_app = app.clone();
let task_port_name = device_name.clone();
let port = crate::serial_core::raw_fd_stream::RawFdStream::new(fd)
.map_err(|_| SerialError::OpenError)?;
let session_started_at = Instant::now();
let task = tauri::async_runtime::spawn(async move {
let codec = TactileACodec::new(DEFAULT_TACTILE_COLS, DEFAULT_TACTILE_ROWS);
let handler = TactileAHandler;
let poll_mode = PollMode::Enabled(Box::new(TactileAPollRequester::new(
Duration::from_millis(DEFAULT_TACTILE_POLL_INTERVAL_MS),
DEFAULT_TACTILE_COLS,
DEFAULT_TACTILE_ROWS,
Duration::from_millis(DEFAULT_TACTILE_REPLY_TIMEOUT_MS),
)));
if let Err(error) = serial::run_serial_with_poll(
task_app.clone(),
port,
codec,
handler,
session_started_at,
task_record.clone(),
task_cancel,
poll_mode,
)
.await
{
eprintln!("serial task exited with error: {error}");
}
let manager = task_app.state::<SerialConnectionState>();
if let Ok(mut last_record) = manager.last_record.lock() {
*last_record = Some(task_record);
}
let mut session = match manager.session.lock() {
Ok(session) => session,
Err(_) => return,
};
{
let should_clear = session
.as_ref()
.map(|current| current.port.as_str() == task_port_name.as_str())
.unwrap_or(false);
if should_clear {
session.take();
}
}
});
let mut session = state.session.lock().map_err(|_| SerialError::StateError)?;
if session.is_some() {
cancel.cancel();
task.abort();
return Err(SerialError::AlreadyConnected);
}
*session = Some(SerialSession {
port: device_name.clone(),
cancel,
task,
current_record,
});
Ok(SerialConnectResponse {
port: device_name,
connected: true,
message: "connected".to_string(),
})
}
#[tauri::command] #[tauri::command]
pub fn serial_export_csv( pub fn serial_export_csv(
app: AppHandle, app: AppHandle,
state: State<'_, SerialConnectionState>, state: State<'_, SerialConnectionState>,
) -> Result<SerialExportResponse, SerialError> { ) -> Result<SerialExportResponse, SerialError> {
#[cfg(not(target_os = "android"))]
let mut output_dir = match app.path().desktop_dir() { let mut output_dir = match app.path().desktop_dir() {
Ok(path) => path, Ok(path) => path,
Err(_) => std::env::current_dir().map_err(|_| SerialError::ExportError)?, Err(_) => std::env::current_dir().map_err(|_| SerialError::ExportError)?,
}; };
#[cfg(target_os = "android")]
let mut output_dir = match app.path().download_dir() {
Ok(path) => path,
Err(_) => app.path().document_dir()
.or_else(|_| app.path().home_dir())
.or_else(|_| std::env::current_dir())
.map_err(|_| SerialError::ExportError)?,
};
let timestamp = SystemTime::now() let timestamp = SystemTime::now()
.duration_since(UNIX_EPOCH) .duration_since(UNIX_EPOCH)
@@ -288,8 +410,8 @@ pub fn serial_export_csv_to_path(
state: State<'_, SerialConnectionState>, state: State<'_, SerialConnectionState>,
) -> Result<SerialExportResponse, SerialError> { ) -> Result<SerialExportResponse, SerialError> {
let output_path = resolve_export_path(file_path)?; let output_path = resolve_export_path(file_path)?;
let rec = resolve_record_for_export(&state)?; let record = resolve_record_for_export(&state)?;
let frame_count = write_record_to_csv(rec, &output_path)?; let frame_count = write_record_to_csv(record, &output_path)?;
let path = output_path.display().to_string(); let path = output_path.display().to_string();
info!("csv exported to {path}, frame_count={frame_count}"); info!("csv exported to {path}, frame_count={frame_count}");
@@ -306,20 +428,22 @@ pub fn serial_import_csv(
file_name: String, file_name: String,
csv_content: String, csv_content: String,
) -> Result<SerialImportResponse, SerialError> { ) -> Result<SerialImportResponse, SerialError> {
let packets = record::import_csv(Cursor::new(csv_content.into_bytes())) let mut importer = TactileACsvImporter::new(file_name.as_str());
let packets = importer
.load(Cursor::new(csv_content.into_bytes()))
.map_err(|_| SerialError::ImportError)?; .map_err(|_| SerialError::ImportError)?;
if packets.is_empty() { if packets.is_empty() {
return Err(SerialError::NoRecordedData); return Err(SerialError::NoRecordedData);
} }
let channel_count = 1; // fz is a single value per sample let channel_count = packets.first().map(|item| item.data.len()).unwrap_or(0);
let frame_count = packets.len(); let frame_count = packets.len();
let frames = packets let frames = packets
.into_iter() .into_iter()
.map(|packet| SerialImportFrame { .map(|packet| SerialImportFrame {
data: vec![packet.fz as i32], data: packet.data,
dts_ms: packet.timestamp_us / 1000, dts_ms: packet.dts_ms,
}) })
.collect(); .collect();
@@ -348,7 +472,7 @@ pub fn serial_import_csv_from_path(file_path: String) -> Result<SerialImportResp
fn resolve_record_for_export( fn resolve_record_for_export(
state: &State<'_, SerialConnectionState>, state: &State<'_, SerialConnectionState>,
) -> Result<SharedRecording, SerialError> { ) -> Result<SharedTactileRecording, SerialError> {
let current_record = { let current_record = {
let session = state.session.lock().map_err(|_| SerialError::StateError)?; let session = state.session.lock().map_err(|_| SerialError::StateError)?;
session session
@@ -399,7 +523,7 @@ fn snapshot_record_frame_count(
} }
fn write_record_to_csv( fn write_record_to_csv(
record: SharedRecording, record: SharedTactileRecording,
output_path: &Path, output_path: &Path,
) -> Result<usize, SerialError> { ) -> Result<usize, SerialError> {
if let Some(parent) = output_path.parent() { if let Some(parent) = output_path.parent() {
@@ -408,14 +532,14 @@ fn write_record_to_csv(
} }
} }
let file = std::fs::File::create(output_path).map_err(|_| SerialError::ExportError)?; let mut file = File::create(output_path).map_err(|_| SerialError::ExportError)?;
let frame_count = { let frame_count = {
let recording = record.lock().map_err(|_| SerialError::StateError)?; let recording = record.lock().map_err(|_| SerialError::StateError)?;
if recording.frames.is_empty() { if recording.frames.is_empty() {
return Err(SerialError::NoRecordedData); return Err(SerialError::NoRecordedData);
} }
record::export_recording_csv(&recording, file).map_err(|_| SerialError::ExportError)?; export_recording_csv(&recording, &mut file).map_err(|_| SerialError::ExportError)?;
recording.frames.len() recording.frames.len()
}; };
@@ -461,4 +585,4 @@ fn resolve_absolute_path(raw_path: &str) -> std::io::Result<PathBuf> {
} else { } else {
Ok(std::env::current_dir()?.join(path)) Ok(std::env::current_dir()?.join(path))
} }
} }

View File

@@ -9,20 +9,36 @@ fn main_window(app: &AppHandle) -> Result<WebviewWindow, String> {
#[tauri::command] #[tauri::command]
pub fn win_minimize(app: AppHandle) -> Result<(), String> { pub fn win_minimize(app: AppHandle) -> Result<(), String> {
main_window(&app)? #[cfg(not(target_os = "android"))]
.minimize() {
.map_err(|error| error.to_string()) main_window(&app)?
.minimize()
.map_err(|error| error.to_string())
}
#[cfg(target_os = "android")]
{
let _ = app;
Ok(())
}
} }
#[tauri::command] #[tauri::command]
pub fn win_toggle_maximize(app: AppHandle) -> Result<(), String> { pub fn win_toggle_maximize(app: AppHandle) -> Result<(), String> {
let window = main_window(&app)?; #[cfg(not(target_os = "android"))]
let is_maximized = window.is_maximized().map_err(|error| error.to_string())?; {
let window = main_window(&app)?;
let is_maximized = window.is_maximized().map_err(|error| error.to_string())?;
if is_maximized { if is_maximized {
window.unmaximize().map_err(|error| error.to_string()) window.unmaximize().map_err(|error| error.to_string())
} else { } else {
window.maximize().map_err(|error| error.to_string()) window.maximize().map_err(|error| error.to_string())
}
}
#[cfg(target_os = "android")]
{
let _ = app;
Ok(())
} }
} }

View File

@@ -10,6 +10,16 @@ use commands::serial::SerialConnectionState;
#[cfg(feature = "devkit")] #[cfg(feature = "devkit")]
use tauri::Manager; use tauri::Manager;
#[cfg(target_os = "android")]
fn usb_serial_plugin<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
tauri::plugin::Builder::new("usb-serial")
.setup(|_app, api| {
api.register_android_plugin("com.lenn.tauri_serial", "UsbSerialPlugin")?;
Ok(())
})
.build()
}
#[cfg(feature = "devkit")] #[cfg(feature = "devkit")]
fn start_server_exe(exe_path: &std::path::Path) { fn start_server_exe(exe_path: &std::path::Path) {
let mut command = std::process::Command::new(exe_path); let mut command = std::process::Command::new(exe_path);
@@ -66,6 +76,9 @@ pub fn run() {
.manage(SerialConnectionState::default()) .manage(SerialConnectionState::default())
.plugin(tauri_plugin_opener::init()); .plugin(tauri_plugin_opener::init());
#[cfg(target_os = "android")]
let builder = builder.plugin(usb_serial_plugin());
#[cfg(not(any(target_os = "android", target_os = "ios")))] #[cfg(not(any(target_os = "android", target_os = "ios")))]
let builder = builder.plugin(tauri_plugin_updater::Builder::new().build()); let builder = builder.plugin(tauri_plugin_updater::Builder::new().build());
@@ -135,7 +148,7 @@ pub fn run() {
Ok(()) Ok(())
}); });
#[cfg(feature = "devkit")] #[cfg(all(feature = "devkit", not(target_os = "android")))]
let builder = builder.invoke_handler(tauri::generate_handler![ let builder = builder.invoke_handler(tauri::generate_handler![
commands::file_explorer::file_explorer_list, commands::file_explorer::file_explorer_list,
commands::serial::serial_enum, commands::serial::serial_enum,
@@ -157,7 +170,7 @@ pub fn run() {
commands::devkit::devkit_process_export commands::devkit::devkit_process_export
]); ]);
#[cfg(not(feature = "devkit"))] #[cfg(all(not(feature = "devkit"), not(target_os = "android")))]
let builder = builder.invoke_handler(tauri::generate_handler![ let builder = builder.invoke_handler(tauri::generate_handler![
commands::file_explorer::file_explorer_list, commands::file_explorer::file_explorer_list,
commands::serial::serial_enum, commands::serial::serial_enum,
@@ -173,6 +186,44 @@ pub fn run() {
commands::window::win_close commands::window::win_close
]); ]);
#[cfg(all(feature = "devkit", target_os = "android"))]
let builder = builder.invoke_handler(tauri::generate_handler![
commands::file_explorer::file_explorer_list,
commands::serial::serial_enum,
commands::serial::serial_connect_fd,
commands::serial::serial_disconnect,
commands::serial::serial_export_csv,
commands::serial::serial_has_record_data,
commands::serial::serial_export_csv_to_path,
commands::serial::serial_import_csv,
commands::serial::serial_import_csv_from_path,
commands::window::win_minimize,
commands::window::win_toggle_maximize,
commands::window::win_close,
commands::devkit::devkit_status,
commands::devkit::devkit_start,
commands::devkit::devkit_stop,
commands::devkit::devkit_get_config,
commands::devkit::devkit_set_config,
commands::devkit::devkit_process_export
]);
#[cfg(all(not(feature = "devkit"), target_os = "android"))]
let builder = builder.invoke_handler(tauri::generate_handler![
commands::file_explorer::file_explorer_list,
commands::serial::serial_enum,
commands::serial::serial_connect_fd,
commands::serial::serial_disconnect,
commands::serial::serial_export_csv,
commands::serial::serial_has_record_data,
commands::serial::serial_export_csv_to_path,
commands::serial::serial_import_csv,
commands::serial::serial_import_csv_from_path,
commands::window::win_minimize,
commands::window::win_toggle_maximize,
commands::window::win_close
]);
builder builder
.run(tauri::generate_context!()) .run(tauri::generate_context!())
.expect("error while running tauri application"); .expect("error while running tauri application");

View File

@@ -0,0 +1,6 @@
use crate::serial_core::error::CodecError;
use std::time::Instant;
pub trait Codec<F> {
fn decode(&mut self, input: &[u8], session_started_at: Instant) -> Result<Vec<F>, CodecError>;
fn encode(&self, frame: &F) -> Result<Vec<u8>, CodecError>;
}

View File

@@ -0,0 +1,5 @@
use crate::serial_core::{frame::TestFrame, record::Recording};
pub mod test;
pub mod tactile_a;
pub type TestRecording = Recording<TestFrame>;

View File

@@ -0,0 +1,382 @@
use crate::serial_core::error::CodecError;
use crate::serial_core::frame::{
FrameHandler, TactileAFrameMetaData, TactileARepFrame, TactileAReqFrame,
};
use crate::serial_core::record::{write_csv, CsvExporter, CsvImporter, RecordedFrame, Recording};
use crate::serial_core::utils::{calc_crc8_itu, elapsed_millis};
use crate::serial_core::{
codec::Codec,
frame::{TactileAFrame, TactileAFrameStatusCode},
};
use async_trait::async_trait;
use csv::StringRecord;
use anyhow::anyhow;
use std::io::Read;
use log::debug;
const FRAME_BUFFER_MIN_LENGTH: usize = 15;
pub struct TactileACodec {
buffer: Vec<u8>,
expected_data_len: usize,
}
pub struct TactileACsvExporter {
channels: usize,
}
pub struct TactileACsvImporter {
channels: usize,
data_row: usize,
packets: Vec<TactileADataPacket>,
}
pub struct TactileAHandler;
#[derive(Clone)]
pub struct TactileADataPacket {
pub data: Vec<i32>,
pub dts_ms: u64,
}
impl From<u8> for TactileAFrameStatusCode {
fn from(value: u8) -> Self {
match value {
0 => TactileAFrameStatusCode::Success,
_ => TactileAFrameStatusCode::Failure,
}
}
}
impl TryFrom<&TactileARepFrame> for TactileADataPacket {
type Error = CodecError;
fn try_from(value: &TactileARepFrame) -> Result<TactileADataPacket, Self::Error> {
let data = TactileACodec::parse_data_frame(&value.payload)?;
let dts_ms = value.dts_ms;
Ok(TactileADataPacket {
data: data,
dts_ms: dts_ms,
})
}
}
impl TactileACodec {
pub fn new(cols: usize, rows: usize) -> TactileACodec {
Self {
buffer: Vec::new(),
expected_data_len: cols * rows * 2,
}
}
pub fn parse_data_frame(data: &[u8]) -> Result<Vec<i32>, CodecError> {
if data.len() % 2 != 0 {
return Err(CodecError::InvalidLength);
}
let vals: Vec<i32> = data
.chunks_exact(2)
.map(|chunk| {
let raw = u16::from_le_bytes([chunk[0], chunk[1]]) as i32;
if raw < 15 {
0
} else {
raw
}
})
.collect::<Vec<i32>>();
Ok(vals)
}
pub fn build_req_frame(cols: usize, rows: usize) -> anyhow::Result<TactileAFrame> {
let header = [0x55, 0xAA];
let payload_len: usize = 9;
let device_addr: u8 = 0x34;
let extend_code: u8 = 0x00;
let func_code: u8 = 0xFB;
let start_addr: u32 = 7168;
let except_data_len: usize = cols * rows * 2;
let checksum: u8 = 0;
Ok(TactileAFrame::Req(TactileAReqFrame {
meta: TactileAFrameMetaData {
header,
payload_len,
device_addr,
extend_code,
func_code,
start_addr,
except_data_len,
checksum,
},
}))
}
}
impl Codec<TactileAFrame> for TactileACodec {
fn decode(
&mut self,
input: &[u8],
session_started_at: std::time::Instant,
) -> Result<Vec<TactileAFrame>, CodecError> {
self.buffer.extend_from_slice(input);
let mut frames: Vec<TactileAFrame> = Vec::new();
loop {
if self.buffer.len() < FRAME_BUFFER_MIN_LENGTH {
break;
}
let header_pos = self.buffer.windows(2).position(|w| w == [0xAA, 0x55]);
let Some(pos) = header_pos else {
self.buffer.clear();
break;
};
if pos > 0 {
self.buffer.drain(0..pos);
}
if self.buffer.len() < FRAME_BUFFER_MIN_LENGTH {
break;
}
let header = [self.buffer[0], self.buffer[1]];
let payload_len = u16::from_le_bytes([self.buffer[2], self.buffer[3]]) as usize;
let device_addr = self.buffer[4];
let extend_code = self.buffer[5];
let func_code = self.buffer[6];
let start_addr = u32::from_le_bytes([
self.buffer[7],
self.buffer[8],
self.buffer[9],
self.buffer[10],
]);
let except_data_len = u16::from_le_bytes([self.buffer[11], self.buffer[12]]) as usize;
let status = TactileAFrameStatusCode::from(self.buffer[13]);
if except_data_len != self.expected_data_len {
debug!(
"unexpected payload length: expected {}, got {}, buffer_len={}",
self.expected_data_len,
except_data_len,
self.buffer.len()
);
self.buffer.drain(0..1);
continue;
}
let frame_length = except_data_len + FRAME_BUFFER_MIN_LENGTH;
if self.buffer.len() < frame_length {
break;
}
let need_check_data = self.buffer[0..14 + except_data_len].to_vec();
let payload = self.buffer[14..14 + except_data_len].to_vec();
let crc8_itu_alg = crc::Crc::<u8>::new(&crc::CRC_8_I_432_1);
let checksum = crc8_itu_alg.checksum(&need_check_data.as_slice());
if self.buffer[frame_length - 1] != checksum {
debug!(
"checksum mismatch: expected {:02X}, got {:02X}, frame_len={}",
checksum,
self.buffer[frame_length - 1],
frame_length
);
self.buffer.drain(0..1);
continue;
}
let dts_ms = elapsed_millis(session_started_at);
let meta: TactileAFrameMetaData = TactileAFrameMetaData {
header,
payload_len,
device_addr,
extend_code,
func_code,
start_addr,
except_data_len,
checksum,
};
frames.push(TactileAFrame::Rep({
TactileARepFrame {
meta,
status,
payload,
dts_ms,
}
}));
self.buffer.drain(0..frame_length);
}
Ok(frames)
}
fn encode(
&self,
frame: &TactileAFrame,
) -> Result<Vec<u8>, crate::serial_core::error::CodecError> {
match frame {
TactileAFrame::Req(f) => {
let mut req_bytes: Vec<u8> = Vec::new();
req_bytes.extend_from_slice(f.meta.header.as_slice());
req_bytes.extend_from_slice((f.meta.payload_len as u16).to_le_bytes().as_slice());
req_bytes.push(f.meta.device_addr);
req_bytes.push(f.meta.extend_code);
req_bytes.push(f.meta.func_code);
req_bytes.extend_from_slice(f.meta.start_addr.to_le_bytes().as_slice());
req_bytes.extend_from_slice((f.meta.except_data_len as u16).to_le_bytes().as_slice());
let checksum = calc_crc8_itu(req_bytes.as_slice());
req_bytes.push(checksum);
Ok(req_bytes)
}
_ => {
Err(CodecError::InvalidFrameType)
}
}
}
}
#[async_trait]
impl FrameHandler<TactileAFrame, i32> for TactileAHandler {
async fn on_frame(&mut self, frame: &TactileAFrame) -> anyhow::Result<Option<Vec<i32>>> {
match frame {
TactileAFrame::Rep(rep) => {
let vals = TactileACodec::parse_data_frame(&rep.payload)?;
Ok(Some(vals))
}
_ => Ok(None),
}
}
}
impl TactileACsvExporter {
fn new(channels: usize) -> Self {
TactileACsvExporter { channels }
}
}
impl CsvExporter<TactileARepFrame> for TactileACsvExporter {
type Error = CodecError;
fn csv_header(&self, _recording: &Recording<TactileARepFrame>) -> Vec<String> {
let mut header: Vec<String> = Vec::new();
for i in 0..self.channels {
header.push(format!("channel{}", i + 1));
}
header.push("dts".to_string());
header.push("summary".to_string());
header
}
fn csv_row(
&self,
item: &RecordedFrame<TactileARepFrame>,
) -> anyhow::Result<Vec<String>> {
let packet = TactileADataPacket::try_from(&item.frame)?;
let summary: i32 = packet.data.iter().sum();
let mut row: Vec<String> = packet.data.iter().map(|x| x.to_string()).collect();
row.push(packet.dts_ms.to_string());
row.push(summary.to_string());
Ok(row)
}
}
impl CsvExporter<TactileAFrame> for TactileACsvExporter {
type Error = CodecError;
fn csv_header(&self, _recording: &Recording<TactileAFrame>) -> Vec<String> {
let mut header: Vec<String> = Vec::new();
for i in 0..self.channels {
header.push(format!("channel{}", i + 1));
}
header.push("dts".to_string());
header
}
fn csv_row(
&self,
item: &RecordedFrame<TactileAFrame>,
) -> anyhow::Result<Vec<String>> {
let rep = match &item.frame {
TactileAFrame::Rep(rep) => rep,
TactileAFrame::Req(_) => return Err(anyhow!("request frame cannot be exported to csv row")),
};
let packet = TactileADataPacket::try_from(rep)?;
let mut row: Vec<String> = packet.data.iter().map(|x| x.to_string()).collect();
row.push(packet.dts_ms.to_string());
Ok(row)
}
}
impl TactileACsvImporter {
pub fn new(_path: &str) -> TactileACsvImporter {
Self {
channels: 0,
data_row: 0,
packets: Vec::new(),
}
}
fn parse_record(&mut self, record: StringRecord) -> anyhow::Result<TactileADataPacket> {
if self.channels == 0 {
return Err(anyhow!("csv header is missing channel columns"));
}
if record.len() < self.channels + 1 {
return Err(anyhow!("csv row has insufficient columns"));
}
let mut data = Vec::with_capacity(self.channels);
for index in 0..self.channels {
let cell = record.get(index).ok_or_else(|| anyhow!("missing channel cell"))?;
data.push(cell.parse::<i32>()?);
}
let dts_cell = record
.get(self.channels)
.ok_or_else(|| anyhow!("missing dts cell"))?;
let dts_ms = dts_cell.parse::<u64>()?;
Ok(TactileADataPacket {
data: data,
dts_ms: dts_ms,
})
}
}
impl CsvImporter<TactileADataPacket> for TactileACsvImporter {
fn load<R: Read>(&mut self, reader: R) -> anyhow::Result<Vec<TactileADataPacket>> {
let mut rdr = csv::Reader::from_reader(reader);
let headers = rdr.headers()?.clone();
self.channels = headers.len().saturating_sub(1);
self.data_row = 0;
self.packets.clear();
for record in rdr.records() {
let record = record?;
let packet = self.parse_record(record)?;
self.packets.push(packet);
self.data_row += 1;
}
Ok(self.packets.clone())
}
}
pub fn export_recording_csv<W>(recording: &Recording<TactileAFrame>, writer: W) -> anyhow::Result<()>
where
W: std::io::Write,
{
let channel_nb = recording
.frames
.iter()
.find_map(|frame| match &frame.frame {
TactileAFrame::Rep(rep) => Some(rep.payload.len() / 2),
TactileAFrame::Req(_) => None,
})
.unwrap_or(0);
let exporter = TactileACsvExporter::new(channel_nb);
write_csv(recording, &exporter, writer)
}

View File

@@ -0,0 +1,256 @@
use std::io::Read;
use std::time::Instant;
use crate::serial_core::frame::{FrameHandler};
use crate::serial_core::{codec::Codec, error::CodecError, frame::TestFrame};
use anyhow::anyhow;
use async_trait::async_trait;
use csv::StringRecord;
use crate::serial_core::record::{write_csv, CsvExporter, CsvImporter, RecordedFrame, Recording};
use crate::serial_core::utils::{
elapsed_millis,
usize_to_u16_be_bytes
};
pub struct TestCodec {
buffer: Vec<u8>,
}
pub struct TestHandler;
impl TestCodec {
pub fn new() -> TestCodec {
Self { buffer: Vec::new() }
}
}
impl Codec<TestFrame> for TestCodec {
fn decode(&mut self, input: &[u8], session_started_at: Instant) -> Result<Vec<TestFrame>, CodecError> {
self.buffer.extend_from_slice(input);
let mut frames = Vec::new();
loop {
if self.buffer.len() < 6 {
break;
}
let header_pos = self.buffer.windows(2).position(|w| w == [0xAA, 0x55]);
let Some(pos) = header_pos else {
self.buffer.clear();
break;
};
if pos > 0 {
self.buffer.drain(0..pos);
}
if self.buffer.len() < 6 {
break;
}
let cmd = self.buffer[2];
let length_bytes = [self.buffer[3], self.buffer[4]];
let length = u16::from_be_bytes(length_bytes) as usize;
let frame_length = (length + 6) as usize;
if self.buffer.len() < frame_length {
break;
}
let payload = self.buffer[5..5 + length].to_vec();
// let checksum = crc8(payload.as_slice());
let crc8_alg = crc::Crc::<u8>::new(&crc::CRC_8_SMBUS);
let checksum = crc8_alg.checksum(payload.as_slice());
if self.buffer[frame_length - 1] != checksum {
self.buffer.drain(0..1);
continue;
}
let dts = elapsed_millis(session_started_at);
println!("dts_ms: {dts}");
frames.push(TestFrame {
header: [0xAA, 0x55],
cmd: cmd,
length: length,
payload: payload,
checksum: checksum,
dts_ms: dts,
});
self.buffer.drain(0..frame_length);
}
Ok(frames)
}
fn encode(&self, frame: &TestFrame) -> Result<Vec<u8>, CodecError> {
let _ = u16::try_from(frame.payload.len()).map_err(|_| CodecError::PayloadTooLarge)?;
let mut out = Vec::with_capacity(6 + frame.length);
out.extend_from_slice(&frame.header);
out.push(frame.cmd);
out.extend_from_slice(&usize_to_u16_be_bytes(frame.length));
out.extend_from_slice(&frame.payload);
out.push(frame.checksum);
Ok(out)
}
}
#[async_trait]
impl FrameHandler<TestFrame, i32> for TestHandler {
async fn on_frame(&mut self, frame: &TestFrame) -> anyhow::Result<Option<Vec<i32>>> {
match frame.cmd {
0x01 => {
let vals = parse_data_frame(&frame.payload)?;
Ok(Some(vals))
}
_ => Ok(None),
}
}
}
fn parse_data_frame(data: &[u8]) -> Result<Vec<i32>, CodecError> {
if data.len() % 2 != 0 {
return Err(CodecError::InvalidLength);
}
let vals: Vec<i32> = data
.chunks_exact(2)
.map(|chunk| u16::from_be_bytes([chunk[0], chunk[1]]) as i32)
.collect::<Vec<i32>>();
Ok(vals)
}
pub struct TestCsvExporter;
pub struct TestCsvImporter {
channels: usize,
data_row: usize,
packets: Vec<TestDataPacket>,
}
#[derive(Clone)]
pub struct TestDataPacket {
pub data: Vec<i32>,
pub dts_ms: u64
}
impl TryFrom<&TestFrame> for TestDataPacket {
type Error = CodecError;
fn try_from(frame: &TestFrame) -> Result<TestDataPacket, Self::Error> {
let data = parse_data_frame(&frame.payload)?;
let dts = frame.dts_ms;
Ok(TestDataPacket { data: data, dts_ms: dts })
}
}
// impl From<TestFrame> for TestDataPacket {
// fn from(frame: TestFrame) -> Self {
// let data = parse_data_frame(&frame.payload)?;
// let dts = frame.dts_ms;
// TestDataPacket { data: data, dts_ms: dts }
// }
// }
impl CsvExporter<TestFrame> for TestCsvExporter {
type Error = CodecError;
fn csv_header(&self, recording: &Recording<TestFrame>) -> Vec<String> {
let channel_nb = recording
.frames
.iter()
.find_map(|frame| parse_data_frame(&frame.frame.payload).ok().map(|vals| vals.len()))
.unwrap_or(0);
let mut header: Vec<String> = Vec::new();
for i in 0..channel_nb {
header.push(format!("channel{}", i + 1));
}
header.push("dts".to_string());
header
}
fn csv_row(&self, item: &RecordedFrame<TestFrame>) -> anyhow::Result<Vec<String>> {
let packet: TestDataPacket = TestDataPacket::try_from(&item.frame)?;
let mut row: Vec<String> = packet.data.iter().map(|&x| x.to_string()).collect();
row.push(packet.dts_ms.to_string());
Ok(row)
}
}
impl TestCsvImporter {
pub fn new(_path: &str) -> TestCsvImporter {
Self {
channels: 0,
data_row: 0,
packets: Vec::new(),
}
}
fn parse_record(&mut self, record: StringRecord) -> anyhow::Result<TestDataPacket>{
if self.channels == 0 {
return Err(anyhow!("csv header is missing channel columns"));
}
if record.len() < self.channels + 1 {
return Err(anyhow!("csv row has insufficient columns"));
}
let mut data = Vec::with_capacity(self.channels);
for index in 0..self.channels {
let cell = record.get(index).ok_or_else(|| anyhow!("missing channel cell"))?;
data.push(cell.parse::<i32>()?);
}
let dts_cell = record
.get(self.channels)
.ok_or_else(|| anyhow!("missing dts cell"))?;
let dts_ms = dts_cell.parse::<u64>()?;
Ok(TestDataPacket {
data: data,
dts_ms: dts_ms,
})
}
}
impl CsvImporter<TestDataPacket> for TestCsvImporter {
fn load<R: Read>(&mut self, reader: R) -> anyhow::Result<Vec<TestDataPacket>> {
let mut rdr = csv::Reader::from_reader(reader);
let headers = rdr.headers()?.clone();
self.channels = headers.len().saturating_sub(1);
self.data_row = 0;
self.packets.clear();
for record in rdr.records() {
let record = record?;
let packet = self.parse_record(record)?;
self.packets.push(packet);
self.data_row += 1;
}
Ok(self.packets.clone())
}
}
pub fn export_recording_csv<W>(recording: &Recording<TestFrame>, writer: W) -> anyhow::Result<()>
where
W: std::io::Write,
{
write_csv(recording, &TestCsvExporter, writer)
}
#[cfg(test)]
mod tests {
use super::*;
use csv::Reader;
use std::io::Cursor;
#[test]
fn test_read_csv_basic() -> anyhow::Result<()> {
let mut rdr = Reader::from_path("recording_20260329_125238.csv")?;
let headers = rdr.headers()?;
println!("headers: {:?}", headers);
for result in rdr.records() {
let record = result?;
println!("record: {:?}", record);
}
Ok(())
}
}

View File

@@ -0,0 +1,57 @@
use anyhow::Result;
use async_trait::async_trait;
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct TestFrame {
pub header: [u8; 2],
pub cmd: u8,
pub length: usize,
pub payload: Vec<u8>,
pub checksum: u8,
pub dts_ms: u64
}
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct TactileAFrameMetaData {
pub header: [u8; 2],
pub payload_len: usize,
pub device_addr: u8,
pub extend_code: u8,
pub func_code: u8,
pub start_addr: u32,
pub except_data_len: usize,
// pub status: u8,
// pub payload_data: Vec<u8>,
pub checksum: u8,
// pub dts_ms: u64,
}
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct TactileAReqFrame {
pub meta: TactileAFrameMetaData,
}
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct TactileARepFrame {
pub meta: TactileAFrameMetaData,
pub status: TactileAFrameStatusCode,
pub payload: Vec<u8>,
pub dts_ms: u64
}
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum TactileAFrameStatusCode {
Success,
Failure
}
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum TactileAFrame {
Req(TactileAReqFrame),
Rep(TactileARepFrame)
}
#[async_trait]
pub trait FrameHandler<F, T>: Send {
async fn on_frame(&mut self, frame: &F) -> Result<Option<Vec<T>>>;
}

View File

@@ -1,4 +1,36 @@
use crate::serial_core::{
frame::{TactileAFrame, TestFrame},
record::Recording,
};
pub mod codec;
pub mod codecs;
pub mod error; pub mod error;
pub mod frame;
pub mod model; pub mod model;
pub mod serial; pub mod serial;
pub mod record; pub mod record;
pub mod utils;
#[cfg(target_os = "android")]
pub mod raw_fd_stream;
#[cfg(feature = "multi-dim")]
pub mod multi_dim_force;
pub type TestRecording = Recording<TestFrame>;
pub type TactileARecording = Recording<TactileAFrame>;
pub struct SerialConnection {
pub port: String,
}
pub fn connect(port: &str) -> Result<SerialConnection, String> {
let port = port.trim();
if port.is_empty() {
return Err("Serial port is required".to_string());
}
Ok(SerialConnection {
port: port.to_string(),
})
}

View File

@@ -1,6 +1,8 @@
use crate::serial_core::frame::TestFrame;
use std::collections::HashMap; use std::collections::HashMap;
use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH}; use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
const MAX_POINTS: usize = 28;
const MAX_SUMMARY_POINTS: usize = 42; const MAX_SUMMARY_POINTS: usize = 42;
const PANEL_STALE_AFTER: Duration = Duration::from_millis(2400); const PANEL_STALE_AFTER: Duration = Duration::from_millis(2400);
@@ -72,6 +74,16 @@ pub struct HudSignalIcon {
pub tone: HudTone, pub tone: HudTone,
} }
struct HudPanelUpdate {
source_id: String,
values: Vec<f32>,
}
struct PanelEntry {
panel: HudSignalPanel,
last_seen: Instant,
}
pub struct HudChartState { pub struct HudChartState {
panels: HashMap<String, PanelEntry>, panels: HashMap<String, PanelEntry>,
order: Vec<String>, order: Vec<String>,
@@ -80,11 +92,6 @@ pub struct HudChartState {
last_frame_seen: Option<Instant>, last_frame_seen: Option<Instant>,
} }
struct PanelEntry {
panel: HudSignalPanel,
last_seen: Instant,
}
impl HudChartState { impl HudChartState {
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
@@ -98,21 +105,76 @@ impl HudChartState {
pub fn record_summary(&mut self, value: f32) { pub fn record_summary(&mut self, value: f32) {
push_summary_point(&mut self.summary_points, value); push_summary_point(&mut self.summary_points, value);
self.last_frame_seen = Some(Instant::now());
} }
pub fn record_pressure_matrix(&mut self, values: &[f32]) { pub fn record_pressure_matrix(&mut self, values: &[i32]) {
if values.is_empty() { if values.is_empty() {
return; return;
} }
self.pressure_matrix = Some(values.to_vec());
self.pressure_matrix = Some(values.iter().map(|value| *value as f32).collect());
}
pub fn apply_frame(&mut self, frame: &TestFrame, decoded_values: Option<&[i32]>) -> HudPacket {
let now = Instant::now();
self.last_frame_seen = Some(now);
for update in expand_frame_updates(frame, decoded_values) {
self.apply_update(update, now);
}
self.prune_stale_at(now);
self.snapshot()
} }
pub fn prune_stale(&mut self) -> Option<HudPacket> { pub fn prune_stale(&mut self) -> Option<HudPacket> {
let now = Instant::now();
let before = self.panels.len(); let before = self.panels.len();
let summary_before = self.summary_points.len(); let summary_points_before = self.summary_points.len();
self.prune_stale_at(Instant::now());
if before == self.panels.len() && summary_points_before == self.summary_points.len() {
return None;
}
Some(self.snapshot())
}
fn apply_update(&mut self, update: HudPanelUpdate, now: Instant) {
if update.values.is_empty() {
return;
}
if !self.panels.contains_key(&update.source_id) {
let next_side = side_for_index(self.order.len());
self.order.push(update.source_id.clone());
self.panels.insert(
update.source_id.clone(),
PanelEntry {
panel: build_panel(&update.source_id, next_side, update.values.len()),
last_seen: now,
},
);
}
let entry = self
.panels
.get_mut(&update.source_id)
.expect("panel entry should exist after insertion");
entry.last_seen = now;
entry.panel.active = true;
ensure_panel_channels(&mut entry.panel, update.values.len());
for (index, value) in update.values.into_iter().enumerate() {
if let Some(series) = entry.panel.series.get_mut(index) {
push_point(&mut series.points, value);
}
}
refresh_panel_stats(&mut entry.panel);
}
fn prune_stale_at(&mut self, now: Instant) {
self.panels self.panels
.retain(|_, entry| now.duration_since(entry.last_seen) <= PANEL_STALE_AFTER); .retain(|_, entry| now.duration_since(entry.last_seen) <= PANEL_STALE_AFTER);
self.order.retain(|id| self.panels.contains_key(id)); self.order.retain(|id| self.panels.contains_key(id));
@@ -127,16 +189,6 @@ impl HudChartState {
self.pressure_matrix = None; self.pressure_matrix = None;
self.last_frame_seen = None; self.last_frame_seen = None;
} }
if before == self.panels.len() && summary_before == self.summary_points.len() {
return None;
}
Some(self.snapshot())
}
pub fn build_snapshot(&mut self) -> HudPacket {
self.snapshot()
} }
fn snapshot(&mut self) -> HudPacket { fn snapshot(&mut self) -> HudPacket {
@@ -171,6 +223,106 @@ impl Default for HudChartState {
} }
} }
fn build_panel(source_id: &str, side: HudPanelSide, channel_count: usize) -> HudSignalPanel {
HudSignalPanel {
id: format!("panel-{source_id}"),
code: source_id.to_string(),
title: format!("Source {source_id}"),
side,
active: true,
series: build_panel_series(source_id, channel_count, &[]),
icons: build_panel_icons(source_id, channel_count),
latest: None,
min: None,
max: None,
}
}
fn expand_frame_updates(frame: &TestFrame, decoded_values: Option<&[i32]>) -> Vec<HudPanelUpdate> {
if let Some(values) = decoded_values {
if values.is_empty() {
return Vec::new();
}
return vec![HudPanelUpdate {
source_id: format_source_id(frame.cmd),
values: values.iter().map(|value| *value as f32).collect(),
}];
}
let chunks = frame.payload.chunks_exact(4);
if !frame.payload.is_empty() && chunks.remainder().is_empty() {
return chunks.map(build_update_from_chunk).collect();
}
vec![HudPanelUpdate {
source_id: format_source_id(frame.cmd),
values: fallback_values(frame),
}]
}
fn build_update_from_chunk(chunk: &[u8]) -> HudPanelUpdate {
HudPanelUpdate {
source_id: format_source_id(chunk[0]),
values: chunk[1..]
.iter()
.enumerate()
.map(|(index, byte)| normalize_value(*byte, tone_for_index(index)))
.collect(),
}
}
fn fallback_values(frame: &TestFrame) -> Vec<f32> {
let mut bytes = frame.payload.clone();
if bytes.is_empty() {
bytes.extend([
frame.cmd,
frame.length as u8,
frame.checksum,
frame.cmd.wrapping_add(frame.checksum),
]);
}
while bytes.len() < 3 {
let previous = *bytes.last().unwrap_or(&frame.cmd);
bytes.push(
previous
.wrapping_add(frame.cmd)
.wrapping_add(bytes.len() as u8),
);
}
bytes
.into_iter()
.enumerate()
.map(|(index, byte)| normalize_value(byte, tone_for_index(index)))
.collect()
}
fn normalize_value(byte: u8, tone: HudTone) -> f32 {
let base = (byte as f32 / 255.0) * 100.0;
let offset = match tone {
HudTone::Cyan => 6.0,
HudTone::Lime => 0.0,
HudTone::Orange => -6.0,
HudTone::Violet => 10.0,
HudTone::Gold => -10.0,
HudTone::Rose => 3.0,
};
(base + offset).clamp(0.0, 100.0)
}
fn format_source_id(byte: u8) -> String {
if byte.is_ascii_alphanumeric() {
(byte as char).to_ascii_uppercase().to_string()
} else {
format!("CH{:02X}", byte)
}
}
fn side_for_index(index: usize) -> HudPanelSide { fn side_for_index(index: usize) -> HudPanelSide {
if index % 2 == 0 { if index % 2 == 0 {
HudPanelSide::Left HudPanelSide::Left
@@ -179,6 +331,91 @@ fn side_for_index(index: usize) -> HudPanelSide {
} }
} }
fn push_point(points: &mut Vec<f32>, value: f32) {
if points.len() >= MAX_POINTS {
points.remove(0);
}
points.push((value * 10.0).round() / 10.0);
}
fn build_panel_series(
source_id: &str,
channel_count: usize,
previous: &[HudSignalSeries],
) -> Vec<HudSignalSeries> {
(0..channel_count)
.map(|index| HudSignalSeries {
id: format!("{source_id}-series-{}", index + 1),
tone: tone_for_index(index),
points: previous
.get(index)
.map(|series| series.points.clone())
.unwrap_or_default(),
})
.collect()
}
fn build_panel_icons(source_id: &str, channel_count: usize) -> Vec<HudSignalIcon> {
(0..channel_count)
.map(|index| HudSignalIcon {
id: format!("{source_id}-icon-{}", index + 1),
label: if channel_count == 1 {
"TOTAL".to_string()
} else {
format!("{source_id}-{}", index + 1)
},
tone: tone_for_index(index),
})
.collect()
}
fn ensure_panel_channels(panel: &mut HudSignalPanel, channel_count: usize) {
if panel.series.len() == channel_count && panel.icons.len() == channel_count {
return;
}
panel.series = build_panel_series(&panel.code, channel_count, &panel.series);
panel.icons = build_panel_icons(&panel.code, channel_count);
}
fn refresh_panel_stats(panel: &mut HudSignalPanel) {
let latest_values: Vec<f32> = panel
.series
.iter()
.filter_map(|series| series.points.last().copied())
.collect();
panel.latest = if latest_values.is_empty() {
None
} else {
Some(latest_values.iter().sum::<f32>() / latest_values.len() as f32)
};
panel.min = panel
.series
.iter()
.flat_map(|series| series.points.iter().copied())
.reduce(f32::min);
panel.max = panel
.series
.iter()
.flat_map(|series| series.points.iter().copied())
.reduce(f32::max);
}
fn tone_for_index(index: usize) -> HudTone {
match index % 6 {
0 => HudTone::Cyan,
1 => HudTone::Lime,
2 => HudTone::Orange,
3 => HudTone::Violet,
4 => HudTone::Gold,
_ => HudTone::Rose,
}
}
fn push_summary_point(points: &mut Vec<f32>, value: f32) { fn push_summary_point(points: &mut Vec<f32>, value: f32) {
if points.len() >= MAX_SUMMARY_POINTS { if points.len() >= MAX_SUMMARY_POINTS {
points.remove(0); points.remove(0);
@@ -202,4 +439,62 @@ fn now_millis() -> u64 {
.duration_since(UNIX_EPOCH) .duration_since(UNIX_EPOCH)
.map(|duration| duration.as_millis() as u64) .map(|duration| duration.as_millis() as u64)
.unwrap_or_default() .unwrap_or_default()
} }
// #[cfg(test)]
// mod tests {
// use super::*;
//
// fn sample_frame() -> TestFrame {
// TestFrame {
// header: [0xAA, 0x55],
// cmd: 0x01,
// length: 4,
// payload: vec![0x00, 0x0A, 0x00, 0x14],
// checksum: 0,
//
// }
// }
//
// #[test]
// fn prune_stale_clears_panels_and_summary_after_timeout() {
// let mut state = HudChartState::new();
// let frame = sample_frame();
//
// state.record_summary(30.0);
// let _ = state.apply_frame(&frame, Some(&[10, 20]));
//
// let stale_now = Instant::now();
// let stale_seen = stale_now - PANEL_STALE_AFTER - Duration::from_millis(1);
//
// state.last_frame_seen = Some(stale_seen);
//
// for entry in state.panels.values_mut() {
// entry.last_seen = stale_seen;
// }
//
// let packet = state
// .prune_stale()
// .expect("stale data should emit an update");
//
// assert!(packet.panels.is_empty());
// assert!(packet.summary.points.is_empty());
// assert!(state.panels.is_empty());
// assert!(state.summary_points.is_empty());
// }
//
// #[test]
// fn prune_stale_keeps_recent_summary_points() {
// let mut state = HudChartState::new();
// let frame = sample_frame();
//
// state.record_summary(30.0);
// let _ = state.apply_frame(&frame, Some(&[10, 20]));
//
// state.last_frame_seen = Some(Instant::now());
//
// assert!(state.prune_stale().is_none());
// assert_eq!(state.summary_points, vec![30.0]);
// assert_eq!(state.panels.len(), 1);
// }
// }

View File

@@ -0,0 +1,122 @@
use ndarray::Array2;
const TOTAL_PRESSURE_LOW_THRESHOLD: usize = 500;
const COP_STABILITY_FRAMES_REQUIRED: usize = 5;
const SENSOR_ROWS: usize = 12;
const SENSOR_COLS: usize = 7;
pub struct PztProcessor {
first_frame: Option<Vec<f32>>,
first_contact_cop_x: Option<f32>,
first_contact_cop_y: Option<f32>,
contact_initialized: bool,
total_pressure_low_counter: usize,
}
impl PztProcessor {
pub fn new() -> Self {
Self {
first_frame: None,
first_contact_cop_x: None,
first_contact_cop_y: None,
contact_initialized: false,
total_pressure_low_counter: 0,
}
}
fn subtract_baseline(&mut self, current_frame: &[f32]) -> Vec<f32> {
if self.first_frame.is_none() {
self.first_frame = Some(current_frame.to_vec());
}
let baseline = self.first_frame.as_ref().unwrap();
current_frame
.iter()
.zip(baseline.iter())
.map(|(c, b)| (c - b).max(0.0))
.collect()
}
fn reset_cop_state(&mut self) {
self.first_contact_cop_x = None;
self.first_contact_cop_y = None;
self.contact_initialized = false;
self.total_pressure_low_counter = 0;
}
fn compute_pressure_direction(&mut self, frame: &[f32]) -> (f32, f32) {
let frame2d = Array2::from_shape_vec((SENSOR_ROWS, SENSOR_COLS), frame.to_vec()).unwrap();
let total_pressure: f32 = frame2d.sum();
if total_pressure < TOTAL_PRESSURE_LOW_THRESHOLD as f32 {
self.total_pressure_low_counter += 1;
} else {
self.total_pressure_low_counter = 0;
}
if self.total_pressure_low_counter >= COP_STABILITY_FRAMES_REQUIRED {
self.reset_cop_state();
return (0.0, 0.0);
}
if total_pressure == 0.0 {
return (0.0, 0.0);
}
let mut sum_x = 0.0;
let mut sum_y = 0.0;
for r in 0..SENSOR_ROWS {
for c in 0..SENSOR_COLS {
let val = frame2d[(r, c)];
sum_x += val * c as f32;
sum_y += val * r as f32;
}
}
let cop_x = sum_x / total_pressure;
let cop_y = sum_y / total_pressure;
if !self.contact_initialized {
self.first_contact_cop_x = Some(cop_x);
self.first_contact_cop_y = Some(cop_y);
self.contact_initialized = true;
return (0.0, 0.0);
}
let dx = cop_x - self.first_contact_cop_x.unwrap();
let dy = cop_y - self.first_contact_cop_y.unwrap();
(dx, dy)
}
fn compute_vector_angle(x: f32, y: f32) -> (f32, f32) {
let epsilon = 1e-8;
let mag = (x * x + y * y).sqrt();
let mut angle = (y).atan2(x + epsilon).to_degrees();
if angle < 0.0 {
angle += 360.0;
}
(angle, mag)
}
fn compute_pzt_angle(px: f32, py: f32) -> (f32, f32) {
Self::compute_vector_angle(px, -py)
}
pub fn get_pzt_angle(&mut self, adc_data: &[f32]) -> Result<f32, &'static str> {
if adc_data.len() != 84 {
return Err("ADC data length must be 84");
}
let baseline = self.subtract_baseline(adc_data);
let (dx, dy) = self.compute_pressure_direction(&baseline);
let (angle, _) = Self::compute_pzt_angle(dx, dy);
Ok(angle)
}
pub fn reset_baseline(&mut self) {
self.first_frame = None;
self.reset_cop_state();
}
}

View File

@@ -0,0 +1,127 @@
use std::io;
use std::os::unix::io::RawFd;
use tokio::io::unix::AsyncFd;
use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
/// A wrapper around a raw file descriptor that implements AsyncRead + AsyncWrite.
/// Uses tokio's AsyncFd to properly integrate with the async reactor.
/// Used on Android to wrap USB device file descriptors obtained from the USB Host API.
pub struct RawFdStream {
inner: AsyncFd<RawFd>,
}
impl RawFdStream {
pub fn new(fd: RawFd) -> io::Result<Self> {
if fd < 0 {
return Err(io::Error::new(io::ErrorKind::InvalidInput, "invalid fd"));
}
// Set non-blocking
unsafe {
let flags = libc::fcntl(fd, libc::F_GETFL);
if flags < 0 {
return Err(io::Error::last_os_error());
}
if libc::fcntl(fd, libc::F_SETFL, flags | libc::O_NONBLOCK) < 0 {
return Err(io::Error::last_os_error());
}
}
let inner = AsyncFd::new(fd)?;
Ok(Self { inner })
}
}
impl Drop for RawFdStream {
fn drop(&mut self) {
unsafe {
libc::close(*self.inner.get_ref());
}
}
}
impl AsyncRead for RawFdStream {
fn poll_read(
self: std::pin::Pin<&mut Self>,
cx: &mut std::task::Context<'_>,
buf: &mut ReadBuf<'_>,
) -> std::task::Poll<io::Result<()>> {
loop {
let mut guard = match self.inner.poll_read_ready(cx) {
std::task::Poll::Ready(Ok(guard)) => guard,
std::task::Poll::Ready(Err(e)) => return std::task::Poll::Ready(Err(e)),
std::task::Poll::Pending => return std::task::Poll::Pending,
};
let unfilled = buf.initialize_unfilled();
let result = unsafe {
libc::read(
*self.inner.get_ref(),
unfilled.as_mut_ptr() as *mut libc::c_void,
unfilled.len(),
)
};
if result < 0 {
let err = io::Error::last_os_error();
if err.kind() == io::ErrorKind::WouldBlock {
guard.clear_ready();
continue;
}
return std::task::Poll::Ready(Err(err));
}
buf.advance(result as usize);
return std::task::Poll::Ready(Ok(()));
}
}
}
impl AsyncWrite for RawFdStream {
fn poll_write(
self: std::pin::Pin<&mut Self>,
cx: &mut std::task::Context<'_>,
buf: &[u8],
) -> std::task::Poll<io::Result<usize>> {
loop {
let mut guard = match self.inner.poll_write_ready(cx) {
std::task::Poll::Ready(Ok(guard)) => guard,
std::task::Poll::Ready(Err(e)) => return std::task::Poll::Ready(Err(e)),
std::task::Poll::Pending => return std::task::Poll::Pending,
};
let result = unsafe {
libc::write(
*self.inner.get_ref(),
buf.as_ptr() as *const libc::c_void,
buf.len(),
)
};
if result < 0 {
let err = io::Error::last_os_error();
if err.kind() == io::ErrorKind::WouldBlock {
guard.clear_ready();
continue;
}
return std::task::Poll::Ready(Err(err));
}
return std::task::Poll::Ready(Ok(result as usize));
}
}
fn poll_flush(
self: std::pin::Pin<&mut Self>,
_cx: &mut std::task::Context<'_>,
) -> std::task::Poll<io::Result<()>> {
std::task::Poll::Ready(Ok(()))
}
fn poll_shutdown(
self: std::pin::Pin<&mut Self>,
_cx: &mut std::task::Context<'_>,
) -> std::task::Poll<io::Result<()>> {
std::task::Poll::Ready(Ok(()))
}
}

View File

@@ -1,5 +1,3 @@
use eskin_finger_sdk::types::FingerSample;
#[derive(Clone)] #[derive(Clone)]
pub struct FrameTiming { pub struct FrameTiming {
pub pts_ms: Option<u64>, pub pts_ms: Option<u64>,
@@ -9,82 +7,50 @@ pub struct FrameTiming {
#[derive(Clone)] #[derive(Clone)]
pub struct RecordedFrame<F> { pub struct RecordedFrame<F> {
pub timing: FrameTiming, pub timing: FrameTiming,
pub frame: F, pub frame: F
} }
#[derive(Clone, Default)] #[derive(Clone, Default)]
pub struct Recording<F> { pub struct Recording<F> {
pub frames: Vec<RecordedFrame<F>>, pub frames: Vec<RecordedFrame<F>>
} }
impl<F> Recording<F> { impl<F> Recording<F> {
pub fn new() -> Recording<F> { pub fn new() -> Recording<F> { Self { frames: Vec::new() } }
Self { pub fn push(&mut self, ite: RecordedFrame<F>) {
frames: Vec::new(), self.frames.push(ite);
}
}
pub fn push(&mut self, item: RecordedFrame<F>) {
self.frames.push(item);
} }
} }
pub type FingerRecording = Recording<FingerSample>; pub trait CsvExporter<F> {
type Error: std::error::Error + Send + Sync + 'static;
fn csv_header(&self, recording: &Recording<F>) -> Vec<String>;
fn csv_row(&self, item: &RecordedFrame<F>) -> anyhow::Result<Vec<String>>;
}
pub fn export_recording_csv<W>( // TODO: CsvImporter
recording: &Recording<FingerSample>, pub trait CsvImporter<P> {
mut writer: W, fn load<R: std::io::Read>(&mut self, reader: R) -> anyhow::Result<Vec<P>>;
}
pub fn write_csv<F, E, W>(
recording: &Recording<F>,
exporter: &E,
writer: W,
) -> anyhow::Result<()> ) -> anyhow::Result<()>
where where
E: CsvExporter<F>,
W: std::io::Write, W: std::io::Write,
{ {
// Infer channel count from the first sample's combined_forces (just fz) let header = exporter.csv_header(&recording);
// We write: timestamp_us, sequence, module, fx, fy, fz let mut wrt = csv::Writer::from_writer(writer);
let mut wrt = csv::Writer::from_writer(&mut writer); wrt.write_record(header)?;
wrt.write_record(["timestamp_us", "sequence", "module", "fx", "fy", "fz"])?; for f in &recording.frames {
let row = exporter.csv_row(f)?;
for frame in &recording.frames { wrt.write_record(&row)?;
let s = &frame.frame;
wrt.write_record(&[
s.timestamp_us.to_string(),
s.sequence.to_string(),
format!("{:?}", s.combined_forces.module),
s.combined_forces.force.fx.to_string(),
s.combined_forces.force.fy.to_string(),
s.combined_forces.force.fz.to_string(),
])?;
} }
wrt.flush()?; wrt.flush()?;
Ok(()) Ok(())
} }
pub struct FingerSampleCsvPacket {
pub timestamp_us: u64,
pub sequence: u32,
pub fz: u32,
}
pub fn import_csv<R: std::io::Read>(
reader: R,
) -> anyhow::Result<Vec<FingerSampleCsvPacket>> {
let mut rdr = csv::Reader::from_reader(reader);
let mut packets = Vec::new();
for result in rdr.records() {
let record = result?;
if record.len() < 6 {
continue;
}
let timestamp_us = record.get(0).unwrap_or("0").parse::<u64>().unwrap_or(0);
let sequence = record.get(1).unwrap_or("0").parse::<u32>().unwrap_or(0);
let fz = record.get(5).unwrap_or("0").parse::<u32>().unwrap_or(0);
packets.push(FingerSampleCsvPacket {
timestamp_us,
sequence,
fz,
});
}
Ok(packets)
}

View File

@@ -1,160 +1,433 @@
use crate::serial_core::model::HudChartState; use crate::serial_core::codec::Codec;
use crate::serial_core::codecs::tactile_a::TactileACodec;
use crate::serial_core::frame::{FrameHandler, TactileAFrame, TestFrame};
use crate::serial_core::model::{HudChartState, HudPacket};
#[cfg(feature = "multi-dim")]
use crate::serial_core::multi_dim_force::PztProcessor;
use crate::serial_core::record::Recording; use crate::serial_core::record::Recording;
use eskin_finger_sdk::channel::DeviceEvent; use crate::serial_core::record::{FrameTiming, RecordedFrame};
use eskin_finger_sdk::config::DeviceConfig; #[cfg(feature = "devkit")]
use eskin_finger_sdk::device::{EskinDevice, EskinDeviceInner}; use crate::devkit::{proto::SensorFrame, DevKitState};
use eskin_finger_sdk::transport::SerialPortTransport; use anyhow::Result;
use eskin_finger_sdk::types::FingerSample; use log::debug;
use std::future::pending;
#[cfg(feature = "devkit")]
use std::sync::atomic::Ordering;
use std::sync::{Arc, Mutex};
use std::time::Instant;
use tauri::{AppHandle, Emitter}; use tauri::{AppHandle, Emitter};
#[cfg(feature = "devkit")]
use tauri::Manager;
use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt};
use tokio::time::{self, Duration, MissedTickBehavior};
#[cfg(not(target_os = "android"))]
use tokio_serial::SerialStream;
use tokio_util::sync::CancellationToken; use tokio_util::sync::CancellationToken;
use super::model::HudPacket; const AUTO_SUB_INTERVAL: Duration = Duration::from_nanos(16_666_667);
pub struct SdkSession { pub enum PollMode<F> {
pub device: EskinDeviceInner, Disable,
Enabled(Box<dyn PollRequester<F>>),
} }
pub fn open_device(port: &str) -> Result<SdkSession, String> { struct PendingSubFrame<F> {
let port = port.trim(); frame: F,
if port.is_empty() { values: Vec<i32>,
return Err("Serial port is required".to_string()); }
pub trait SerialFrame: Clone + Send + 'static {
fn dts_ms(&self) -> u64;
fn to_hud_packet(
&self,
chart_state: &mut HudChartState,
display_values: Option<&[i32]>,
) -> Option<HudPacket>;
}
impl SerialFrame for TestFrame {
fn dts_ms(&self) -> u64 {
self.dts_ms
} }
let transport = SerialPortTransport::new(port, 921600); fn to_hud_packet(
let config = DeviceConfig::default(); &self,
let mut device = EskinDeviceInner::new(config, Box::new(transport)); chart_state: &mut HudChartState,
device.open().map_err(|e| e.to_string())?; display_values: Option<&[i32]>,
) -> Option<HudPacket> {
Ok(SdkSession { device }) Some(chart_state.apply_frame(self, display_values))
}
} }
pub async fn run_stream( impl SerialFrame for TactileAFrame {
fn dts_ms(&self) -> u64 {
match self {
TactileAFrame::Req(_) => 0,
TactileAFrame::Rep(rep) => rep.dts_ms,
}
}
fn to_hud_packet(
&self,
chart_state: &mut HudChartState,
display_values: Option<&[i32]>,
) -> Option<HudPacket> {
match self {
TactileAFrame::Req(_) => None,
TactileAFrame::Rep(rep) => {
let proxy = TestFrame {
header: rep.meta.header,
cmd: rep.meta.func_code,
length: rep.meta.except_data_len,
payload: rep.payload.clone(),
checksum: rep.meta.checksum,
dts_ms: rep.dts_ms,
};
Some(chart_state.apply_frame(&proxy, display_values))
}
}
}
}
pub trait PollRequester<F>: Send {
fn poll_interval(&self) -> Option<Duration> {
None
}
fn should_request(&mut self) -> bool {
true
}
fn next_request(&mut self) -> Result<Option<F>> {
Ok(None)
}
fn on_rx_frame(&mut self, _frame: &F) {}
}
#[derive(Default)]
pub struct NoopPollRequester;
impl<F> PollRequester<F> for NoopPollRequester {}
pub struct TactileAPollRequester {
period: Duration,
cols: usize,
rows: usize,
awaiting_reply: bool,
last_request_at: Option<Instant>,
reply_timeout: Duration,
}
impl TactileAPollRequester {
pub fn new(period: Duration, cols: usize, rows: usize, reply_timeout: Duration) -> Self {
Self {
period,
cols,
rows,
awaiting_reply: false,
last_request_at: None,
reply_timeout,
}
}
}
impl PollRequester<TactileAFrame> for TactileAPollRequester {
fn poll_interval(&self) -> Option<Duration> {
Some(self.period)
}
fn should_request(&mut self) -> bool {
if !self.awaiting_reply {
return true;
}
let timed_out = self
.last_request_at
.map(|t| t.elapsed() >= self.reply_timeout)
.unwrap_or(false);
if timed_out {
self.awaiting_reply = false;
self.last_request_at = None;
return true;
}
false
}
fn next_request(&mut self) -> Result<Option<TactileAFrame>> {
let req = TactileACodec::build_req_frame(self.cols, self.rows)?;
self.awaiting_reply = true;
self.last_request_at = Some(Instant::now());
Ok(Some(req))
}
fn on_rx_frame(&mut self, frame: &TactileAFrame) {
if matches!(frame, TactileAFrame::Rep(_)) {
self.awaiting_reply = false;
self.last_request_at = None
}
}
}
#[cfg(not(target_os = "android"))]
pub async fn run_serial<C, H, T, F>(
app: AppHandle, app: AppHandle,
device: &mut EskinDeviceInner, port: SerialStream,
codec: C,
handler: H,
session_started_at: Instant,
recording: Arc<Mutex<Recording<F>>>,
cancel: CancellationToken, cancel: CancellationToken,
) -> Result<(), String> { ) -> Result<()>
device where
.start_stream() F: SerialFrame,
.map_err(|e| format!("start_stream failed: {e}"))?; C: Codec<F> + Send + 'static,
H: FrameHandler<F, T> + Send + 'static,
T: Into<i32>,
{
run_serial_with_poll(
app,
port,
codec,
handler,
session_started_at,
recording,
cancel,
PollMode::Disable,
)
.await
}
let channels = device.channels(); pub async fn run_serial_with_poll<C, H, T, F>(
let mut chart_state = HudChartState::new(); app: AppHandle,
mut port: impl AsyncRead + AsyncWrite + Unpin,
let result = loop { mut codec: C,
tokio::select! { mut handler: H,
_ = cancel.cancelled() => { session_started_at: Instant,
break Ok(()); recording: Arc<Mutex<Recording<F>>>,
} cancel: CancellationToken,
_ = tokio::time::sleep(tokio::time::Duration::from_millis(1)) => {} poll_mode: PollMode<F>,
} ) -> Result<()>
where
// Try to receive a sample (non-blocking-ish via small timeout) F: SerialFrame,
match channels.recv_sample(5) { C: Codec<F> + Send + 'static,
Ok(sample) => { H: FrameHandler<F, T> + Send + 'static,
if let Some(packet) = build_hud_packet_from_sample(&sample, &mut chart_state) { T: Into<i32>,
let _ = app.emit("hud_stream", packet); {
} let mut requester = match poll_mode {
} PollMode::Disable => None,
Err(eskin_finger_sdk::error::SdkError::Timeout) => { PollMode::Enabled(r) => Some(r),
// No sample yet, check for events
}
Err(e) => {
break Err(format!("sample recv error: {e}"));
}
}
// Drain any events
if let Err(e) = drain_events(&channels) {
break Err(e);
}
}; };
let _ = device.stop_stream(); let mut poll_interval = requester.as_ref().and_then(|r| r.poll_interval()).map(|d| {
result let mut it = time::interval(d);
} it.set_missed_tick_behavior(MissedTickBehavior::Skip);
it
});
let mut poll_sub_interval = time::interval(AUTO_SUB_INTERVAL);
poll_sub_interval.set_missed_tick_behavior(MissedTickBehavior::Skip);
pub async fn run_stream_with_record(
app: AppHandle,
device: &mut EskinDeviceInner,
cancel: CancellationToken,
recording: std::sync::Arc<std::sync::Mutex<Recording<FingerSample>>>,
) -> Result<(), String> {
device
.start_stream()
.map_err(|e| format!("start_stream failed: {e}"))?;
let channels = device.channels();
let mut chart_state = HudChartState::new(); let mut chart_state = HudChartState::new();
let mut buffer = [0u8; 1024];
let mut prune_interval = time::interval(Duration::from_millis(450));
#[cfg(feature = "multi-dim")]
let mut pzt_processor = PztProcessor::new();
let mut pending_sub_frame: Option<PendingSubFrame<F>> = None;
prune_interval.set_missed_tick_behavior(MissedTickBehavior::Delay);
let result = loop { loop {
tokio::select! { tokio::select! {
_ = cancel.cancelled() => { _ = cancel.cancelled() => break,
break Ok(()); _ = async {
match poll_interval.as_mut() {
Some(it) => {
it.tick().await;
}
None => pending::<()>().await,
}
} => {
if let Some(r) = requester.as_mut() {
if r.should_request() {
if let Some(req) = r.next_request()? {
let bytes = codec.encode(&req)?;
port.write_all(&bytes).await?;
}
}
}
} }
_ = tokio::time::sleep(tokio::time::Duration::from_millis(1)) => {} _ = prune_interval.tick() => {
} if let Some(packet) = chart_state.prune_stale() {
app.emit("hud_stream", packet)?;
}
}
_ = poll_sub_interval.tick() => {
if let Some(pending) = pending_sub_frame.take() {
let display_values = build_display_values(
&mut chart_state,
pending.values.as_slice(),
);
if let Some(packet) = pending
.frame
.to_hud_packet(&mut chart_state, display_values.as_deref())
{
app.emit("hud_stream", packet)?;
}
}
}
read_result = port.read(&mut buffer) => {
let n = read_result?;
if n == 0 {
// Some serial drivers can resolve reads with 0 bytes repeatedly.
// Yield here so timer-driven poll requests are not starved by a busy loop.
tokio::task::yield_now().await;
continue;
}
let frames = codec.decode(&buffer[..n], session_started_at)?;
for frame in frames {
if let Some(r) = requester.as_mut() {
r.on_rx_frame(&frame);
}
let decode_res = handler
.on_frame(&frame)
.await?
.map(|vals| vals.into_iter().map(Into::into).collect::<Vec<i32>>());
match channels.recv_sample(5) {
Ok(sample) => {
// Record
{
let mut record = recording let mut record = recording
.lock() .lock()
.map_err(|_| "recording state poisoned".to_string())?; .map_err(|_| anyhow::anyhow!("recording state poisoned"))?;
record.push(crate::serial_core::record::RecordedFrame { record.push(RecordedFrame {
timing: crate::serial_core::record::FrameTiming { timing: FrameTiming {
pts_ms: None, pts_ms: None,
dts_ms: sample.timestamp_us / 1000, dts_ms: frame.dts_ms(),
}, },
frame: sample.clone(), frame: frame.clone(),
}); });
} drop(record);
if let Some(packet) = build_hud_packet_from_sample(&sample, &mut chart_state) { if let Some(vals) = decode_res {
let _ = app.emit("hud_stream", packet); #[cfg(feature = "multi-dim")]
{
let pzt_values = vals.iter().map(|value| *value as f32).collect::<Vec<f32>>();
if let Ok(angle) = pzt_processor.get_pzt_angle(&pzt_values) {
// debug!("pzt angle: {:.2}", angle);
}
}
#[cfg(feature = "devkit")]
{
let summary = vals.iter().copied().sum::<i32>();
let force = raw_to_g1(summary as u32);
push_devkit_frame(&app, vals.as_slice(), frame.dts_ms(), force);
}
pending_sub_frame = Some(PendingSubFrame {
frame: frame.clone(),
values: vals,
});
} else if let Some(packet) = frame.to_hud_packet(&mut chart_state, None) {
app.emit("hud_stream", packet)?;
}
} }
} }
Err(eskin_finger_sdk::error::SdkError::Timeout) => {}
Err(e) => {
break Err(format!("sample recv error: {e}"));
}
}
if let Err(e) = drain_events(&channels) {
break Err(e);
}
};
let _ = device.stop_stream();
result
}
fn drain_events(channels: &std::sync::Arc<eskin_finger_sdk::channel::ChannelManager>) -> Result<(), String> {
loop {
match channels.recv_event(0) {
Ok(DeviceEvent::IoError(msg)) => {
eprintln!("SDK stream io error: {msg}");
return Err(format!("stream io error: {msg}"));
}
Ok(_) => {}
Err(eskin_finger_sdk::error::SdkError::Timeout) => return Ok(()),
Err(eskin_finger_sdk::error::SdkError::ChannelClosed) => {
return Err("event channel closed".into());
}
Err(_) => return Ok(()),
} }
} }
Ok(())
} }
fn build_hud_packet_from_sample( fn build_display_values(chart_state: &mut HudChartState, values: &[i32]) -> Option<Vec<i32>> {
sample: &FingerSample, let summary = values.iter().copied().sum::<i32>();
chart_state: &mut HudChartState, let force = raw_to_g1(summary as u32);
) -> Option<HudPacket> { chart_state.record_summary(force as f32);
let fz = sample.combined_forces.force.fz as f32; chart_state.record_pressure_matrix(values);
chart_state.record_summary(fz); Some(vec![summary])
if !sample.raw_adcs.is_empty() { }
let pressure: Vec<f32> = sample.raw_adcs.iter().map(|&v| v as f32).collect();
chart_state.record_pressure_matrix(&pressure); #[cfg(feature = "devkit")]
} fn push_devkit_frame(app: &AppHandle, values: &[i32], dts_ms: u64, resultant_force: f64) {
Some(chart_state.build_snapshot()) let devkit_state = app.state::<DevKitState>();
if !devkit_state.running.load(Ordering::Relaxed) {
return;
}
let (rows, cols) = infer_matrix_shape(values.len());
let timestamp_ms = std::time::SystemTime::now()
.duration_since(std::time::UNIX_EPOCH)
.unwrap_or_default()
.as_millis() as u64;
let seq = timestamp_ms;
let matrix = values
.iter()
.map(|value| (*value).max(0) as u32)
.collect::<Vec<_>>();
devkit_state.push_frame(SensorFrame {
seq,
timestamp_ms,
rows,
cols,
matrix,
resultant_force,
dts_ms: dts_ms as u32,
});
}
#[cfg(feature = "devkit")]
fn infer_matrix_shape(len: usize) -> (u32, u32) {
if len == 84 {
return (12, 7);
}
if len == 0 {
return (0, 0);
}
let mut best = (len, 1);
let mut factor = 1usize;
while factor * factor <= len {
if len % factor == 0 {
best = (len / factor, factor);
}
factor += 1;
}
(best.0 as u32, best.1 as u32)
}
fn raw_to_g1(raw: u32) -> f64 {
const X: [u32; 12] = [
0, 84402, 117218, 140176, 159126, 175812, 191484, 208758, 224703, 252448, 302361, 352703,
];
const Y: [f64; 12] = [
0.0, 160.0, 260.0, 360.0, 460.0, 560.0, 660.0, 760.0, 860.0, 1060.0, 1560.0, 2060.0,
];
let n = X.len();
if raw <= X[0] {
return Y[0] / 100.0;
}
if raw >= X[n - 1] {
return Y[n - 1] / 100.0;
}
let mut left = 0;
let mut right = n - 1;
while left + 1 < right {
let mid = (left + right) / 2;
if raw < X[mid] {
right = mid;
} else {
left = mid;
}
}
let ratio = (raw - X[left]) as f64 / (X[right] - X[left]) as f64;
Y[left] / 100.0 + ratio * (Y[right] - Y[left]) / 100.0
} }

View File

@@ -0,0 +1,59 @@
use std::time::Instant;
pub fn usize_to_u16_be_bytes(n: usize) -> [u8; 2] {
(n as u16).to_be_bytes()
}
pub fn usize_to_u16_le_bytes(n: usize) -> [u8; 2] {
(n as u16).to_be_bytes()
}
pub fn u16_to_hex_be_bytes(n: u16) -> [u8; 2] {
(n as u16).to_be_bytes()
}
pub fn u16_to_hex_le_bytes(n: u16) -> [u8; 2] {
(n as u16).to_le_bytes()
}
pub fn calc_crc8_smbus(c: &[u8]) -> u8 {
let crc8_smbus = crc::Crc::<u8>::new(&crc::CRC_8_SMBUS);
let checksum = crc8_smbus.checksum(c);
return checksum;
}
pub fn calc_crc8_itu(c: &[u8]) -> u8 {
let crc8_itu_alg = crc::Crc::<u8>::new(&crc::CRC_8_I_432_1);
let checksum = crc8_itu_alg.checksum(c);
return checksum;
}
pub fn elapsed_millis(start_at: Instant) -> u64 {
start_at.elapsed().as_millis() as u64
}
#[cfg(test)]
mod test {
use anyhow::Ok;
use crate::serial_core::utils::{calc_crc8_itu, calc_crc8_smbus};
#[test]
fn test_crc8_itu() -> anyhow::Result<()> {
let req_vec = vec![0x55, 0xAA, 0x09, 0x00, 0x34, 0x00, 0xFB, 0x00, 0x1C, 0x00, 0x00, 0x18, 0x00];
let checksum = calc_crc8_itu(req_vec.as_slice());
assert_eq!(checksum, 0x7A);
Ok(())
}
#[test]
fn test_crc8_smbus() -> anyhow::Result<()> {
let req_vec = vec![0x55, 0xAA, 0x09, 0x00, 0x34, 0x00, 0xFB, 0x00, 0x1C, 0x00, 0x00, 0x18, 0x00];
let checksum = calc_crc8_smbus(req_vec.as_slice());
assert_eq!(checksum, 0x2F);
Ok(())
}
}

View File

@@ -45,15 +45,5 @@
"resources/je-skin-devkit-server.exe" "resources/je-skin-devkit-server.exe"
] ]
}, },
"plugins": { "plugins": {}
"updater": {
"windows": {
"installMode": "passive"
},
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDkwODM1QkFEODI2NkZENgpSV1RXYnliWXVqVUlDUVRxbjlseDNDNjhQTGpDYis4TEZMeUk2WVhiMEhTRWJhN3hGRnQ3TTJtcwo=",
"endpoints": [
"https://je-skin.cn-nb1.rains3.com/latest.json"
]
}
}
} }

View File

@@ -460,6 +460,12 @@
color: rgb(var(--hud-orange-rgb) / 0.96); color: rgb(var(--hud-orange-rgb) / 0.96);
} }
@media (max-width: 900px) {
.window-controls {
display: none;
}
}
.control-bar { .control-bar {
display: grid; display: grid;
gap: 0.45rem; gap: 0.45rem;

View File

@@ -461,6 +461,28 @@
const heightField = new Float32Array(instanceCount); const heightField = new Float32Array(instanceCount);
const compactField = new Uint16Array(instanceCount); const compactField = new Uint16Array(instanceCount);
let lastFrameAt = performance.now(); let lastFrameAt = performance.now();
let lastStatsCurrent: number | null = null;
let lastStatsMax: number | null = null;
let lastStatsMin: number | null = null;
const syncStats = () => {
const nextCurrent = summary?.latest ?? null;
const nextMax = summary?.max ?? null;
const nextMin = summary?.min ?? null;
if (nextCurrent === lastStatsCurrent && nextMax === lastStatsMax && nextMin === lastStatsMin) {
return;
}
lastStatsCurrent = nextCurrent;
lastStatsMax = nextMax;
lastStatsMin = nextMin;
stats = {
current: nextCurrent,
max: nextMax,
min: nextMin
};
};
const drawOverlay = () => { const drawOverlay = () => {
if (!viewerEl || !overlayEl) { if (!viewerEl || !overlayEl) {
@@ -623,12 +645,7 @@
renderer.render(scene, camera); renderer.render(scene, camera);
drawOverlay(); drawOverlay();
syncStats();
stats = {
current: summary?.latest ?? null,
max: summary?.max ?? null,
min: summary?.min ?? null
};
}); });
return () => { return () => {

View File

@@ -182,8 +182,7 @@
transition: transition:
opacity var(--fade-ms) cubic-bezier(0.18, 0.88, 0.3, 1), opacity var(--fade-ms) cubic-bezier(0.18, 0.88, 0.3, 1),
transform var(--enter-ms) cubic-bezier(0.2, 0.9, 0.28, 1), transform var(--enter-ms) cubic-bezier(0.2, 0.9, 0.28, 1),
border-color 460ms ease, border-color 460ms ease;
filter 760ms ease;
transition-delay: calc(var(--panel-index) * 140ms); transition-delay: calc(var(--panel-index) * 140ms);
} }
@@ -200,7 +199,6 @@
border-color: transparent; border-color: transparent;
opacity: 0; opacity: 0;
transform: translateX(var(--offset-x)) scale(0.98) rotate(-0.6deg); transform: translateX(var(--offset-x)) scale(0.98) rotate(-0.6deg);
filter: blur(1.3px);
pointer-events: none; pointer-events: none;
transition-delay: 0ms; transition-delay: 0ms;
} }
@@ -301,7 +299,6 @@
stroke-width: 1.3; stroke-width: 1.3;
stroke-linecap: round; stroke-linecap: round;
stroke-linejoin: round; stroke-linejoin: round;
filter: drop-shadow(0 0 2px rgb(0 0 0 / 0.42));
} }
.series-line.tone-cyan { .series-line.tone-cyan {
@@ -397,6 +394,10 @@
aspect-ratio: 1.5 / 1; aspect-ratio: 1.5 / 1;
min-block-size: 10.1rem; min-block-size: 10.1rem;
} }
.chart-stage {
block-size: clamp(5.7rem, 7.6vw, 6.9rem);
}
} }
@media (max-height: 900px) { @media (max-height: 900px) {
@@ -452,6 +453,17 @@
inline-size: 100%; inline-size: 100%;
aspect-ratio: 1.7 / 1; aspect-ratio: 1.7 / 1;
min-block-size: 0; min-block-size: 0;
background: linear-gradient(160deg, rgb(var(--hud-surface-alt-rgb) / 0.86) 0%, rgb(var(--hud-surface-deep-rgb) / 0.9) 100%);
box-shadow: inset 0 0 0 1px rgb(var(--hud-border-strong-rgb) / 0.08), 0 0 8px rgb(var(--hud-glow-rgb) / 0.1);
}
.scan-haze {
display: none;
}
.chart-stage {
background: linear-gradient(180deg, rgb(var(--hud-surface-alt-rgb) / 0.78), rgb(var(--hud-surface-deep-rgb) / 0.88));
box-shadow: none;
} }
} }
</style> </style>

View File

@@ -11,22 +11,6 @@
export let sessionStartedAt: number = Date.now(); export let sessionStartedAt: number = Date.now();
export let isRealtime = false; export let isRealtime = false;
let currentTimeSeconds = 0;
let timerId: ReturnType<typeof setInterval> | null = null;
onMount(() => {
timerId = setInterval(() => {
currentTimeSeconds = Math.round((Date.now() - sessionStartedAt) / 100) / 10;
}, 200);
return () => {
if (timerId != null) clearInterval(timerId);
};
});
$: i18n = locale === "zh-CN"
? { now: "当前", min: "最小", max: "最大", waiting: "等待数据" }
: { now: "Now", min: "Min", max: "Max", waiting: "Waiting" };
const viewportWidth = 120; const viewportWidth = 120;
const viewportHeight = 48; const viewportHeight = 48;
const plotInsetLeft = 13; const plotInsetLeft = 13;
@@ -34,6 +18,8 @@
const plotInsetTop = 4; const plotInsetTop = 4;
const plotInsetBottom = 9; const plotInsetBottom = 9;
const fixedYBounds = { min: 0, max: 25 }; const fixedYBounds = { min: 0, max: 25 };
const maxCanvasDpr = 1.5;
const minDrawIntervalMs = 66;
interface CurveSample { interface CurveSample {
x: number; x: number;
@@ -45,23 +31,25 @@
y: number; y: number;
} }
interface AxisTick { let canvasEl: HTMLCanvasElement | undefined;
value: number; let chartStageEl: HTMLDivElement | undefined;
label: string; let currentTimeSeconds = 0;
plotX: number; let timerId: ReturnType<typeof setInterval> | null = null;
plotY: number; let resizeObserver: ResizeObserver | null = null;
} let drawRequestId: number | null = null;
let lastDrawAt = 0;
let mounted = false;
$: i18n = locale === "zh-CN"
? { now: "当前", min: "最小", max: "最大", waiting: "等待数据" }
: { now: "Now", min: "Min", max: "Max", waiting: "Waiting" };
function clamp(value: number, min: number, max: number): number { function clamp(value: number, min: number, max: number): number {
return Math.min(max, Math.max(min, value)); return Math.min(max, Math.max(min, value));
} }
function formatValue(value: number | null): string { function formatValue(value: number | null): string {
if (value === null) { return value === null ? "--" : value.toFixed(1);
return "--";
}
return value.toFixed(1);
} }
function formatAxisValue(value: number, axis: "x" | "y"): string { function formatAxisValue(value: number, axis: "x" | "y"): string {
@@ -73,6 +61,7 @@
if (value < 60) { if (value < 60) {
return `${value.toFixed(1)}s`; return `${value.toFixed(1)}s`;
} }
const mins = Math.floor(value / 60); const mins = Math.floor(value / 60);
const secs = value - mins * 60; const secs = value - mins * 60;
return `${mins}:${secs.toFixed(0).padStart(2, "0")}`; return `${mins}:${secs.toFixed(0).padStart(2, "0")}`;
@@ -81,17 +70,6 @@
return `${Math.round(value)} N`; return `${Math.round(value)} N`;
} }
function resolveDataBounds(values: number[]): { min: number; max: number } {
if (values.length === 0) {
return { min: 0, max: 1 };
}
return {
min: Math.min(...values),
max: Math.max(...values)
};
}
function resolveBounds(values: number[]): { min: number; max: number } { function resolveBounds(values: number[]): { min: number; max: number } {
if (values.length === 0) { if (values.length === 0) {
return { min: 0, max: 1 }; return { min: 0, max: 1 };
@@ -108,34 +86,23 @@
return { min, max }; return { min, max };
} }
function mapXToViewport(value: number, bounds: { min: number; max: number }): number { function buildSamples(rawYValues: number[], rawXValues: number[], currentSeconds: number): CurveSample[] {
const span = bounds.max - bounds.min;
const chartWidth = viewportWidth - plotInsetLeft - plotInsetRight;
const ratio = span <= 0 ? 0.5 : (value - bounds.min) / span;
const mappedX = plotInsetLeft + ratio * chartWidth;
return Math.round(clamp(mappedX, plotInsetLeft, viewportWidth - plotInsetRight) * 100) / 100;
}
function mapYToViewport(value: number, bounds: { min: number; max: number }): number {
const span = bounds.max - bounds.min;
const chartHeight = viewportHeight - plotInsetTop - plotInsetBottom;
const ratio = span <= 0 ? 0.5 : (value - bounds.min) / span;
const mappedY = viewportHeight - plotInsetBottom - ratio * chartHeight;
return Math.round(clamp(mappedY, plotInsetTop, viewportHeight - plotInsetBottom) * 100) / 100;
}
function buildSamples(rawYValues: number[], rawXValues: number[]): CurveSample[] {
if (!rawYValues.length) { if (!rawYValues.length) {
return []; return [];
} }
let previousX = 0; const hasUsableXValues = rawXValues.length === rawYValues.length;
const realtimeSpacing = isRealtime
? Math.max(currentSeconds / Math.max(rawYValues.length - 1, 1), 0.1)
: 1;
const realtimeStart = isRealtime ? Math.max(0, currentSeconds - realtimeSpacing * (rawYValues.length - 1)) : 0;
let previousX = realtimeStart;
return rawYValues.map((rawY, index) => { return rawYValues.map((rawY, index) => {
const x = rawXValues[index];
const y = Number.isFinite(rawY) ? Number(rawY) : 0; const y = Number.isFinite(rawY) ? Number(rawY) : 0;
const fallbackX = index === 0 ? 0 : previousX + 1; const rawX = rawXValues[index];
const resolvedX = Number.isFinite(x) ? Number(x) : fallbackX; const fallbackX = isRealtime ? realtimeStart + index * realtimeSpacing : index + 1;
const resolvedX = hasUsableXValues && Number.isFinite(rawX) ? Number(rawX) : fallbackX;
const normalizedX = index === 0 ? resolvedX : Math.max(resolvedX, previousX); const normalizedX = index === 0 ? resolvedX : Math.max(resolvedX, previousX);
previousX = normalizedX; previousX = normalizedX;
return { x: normalizedX, y }; return { x: normalizedX, y };
@@ -143,132 +110,274 @@
} }
function resolveXScaleBounds( function resolveXScaleBounds(
samples: CurveSample[], samplesValue: CurveSample[],
currentSeconds: number, currentSeconds: number,
realtime: boolean realtime: boolean
): { min: number; max: number } { ): { min: number; max: number } {
if (samples.length === 0) { if (samplesValue.length === 0) {
return { min: 0, max: 1 }; return { min: 0, max: 1 };
} }
const values = samples.map((sample) => sample.x);
const dataBounds = resolveBounds(values);
if (!realtime) { if (!realtime) {
return dataBounds; return resolveBounds(samplesValue.map((sample) => sample.x));
} }
const firstX = samples[0].x; const firstX = samplesValue[0].x;
const lastX = samples[samples.length - 1].x; const lastX = samplesValue[samplesValue.length - 1].x;
const axisMax = Math.max(lastX, currentSeconds); const axisMax = Math.max(lastX, currentSeconds);
const positiveDiffs = samples const dataSpan = Math.max(lastX - firstX, 1);
.slice(1) const axisMin = Math.max(0, axisMax - dataSpan);
.map((sample, index) => sample.x - samples[index].x)
.filter((diff) => diff > 0);
const averageSpacing =
positiveDiffs.length > 0 ? positiveDiffs.reduce((sum, diff) => sum + diff, 0) / positiveDiffs.length : 1;
const dataSpan = Math.max(lastX - firstX, 0);
const windowSpan = Math.max(dataSpan, averageSpacing * Math.max(samples.length - 1, 1), 1);
const axisMin = Math.max(0, axisMax - windowSpan);
return resolveBounds([axisMin, axisMax]); return resolveBounds([axisMin, axisMax]);
} }
function mapXToViewport(value: number, bounds: { min: number; max: number }): number {
const span = bounds.max - bounds.min;
const chartWidth = viewportWidth - plotInsetLeft - plotInsetRight;
const ratio = span <= 0 ? 0.5 : (value - bounds.min) / span;
return clamp(plotInsetLeft + ratio * chartWidth, plotInsetLeft, viewportWidth - plotInsetRight);
}
function mapYToViewport(value: number, bounds: { min: number; max: number }): number {
const span = bounds.max - bounds.min;
const chartHeight = viewportHeight - plotInsetTop - plotInsetBottom;
const ratio = span <= 0 ? 0.5 : (value - bounds.min) / span;
return clamp(viewportHeight - plotInsetBottom - ratio * chartHeight, plotInsetTop, viewportHeight - plotInsetBottom);
}
function convertPoints( function convertPoints(
samples: CurveSample[], samplesValue: CurveSample[],
xBounds: { min: number; max: number }, xBounds: { min: number; max: number },
yBounds: { min: number; max: number } yBounds: { min: number; max: number }
): PlotPoint[] { ): PlotPoint[] {
if (samples.length === 0) { if (samplesValue.length === 0) {
return []; return [];
} }
if (samples.length === 1) { if (samplesValue.length === 1) {
return [{ x: viewportWidth / 2, y: viewportHeight / 2 }]; return [{ x: viewportWidth / 2, y: viewportHeight / 2 }];
} }
return samples.map((sample) => { return samplesValue.map((sample) => ({
return { x: mapXToViewport(sample.x, xBounds),
x: mapXToViewport(sample.x, xBounds), y: mapYToViewport(sample.y, yBounds)
y: mapYToViewport(sample.y, yBounds) }));
};
});
} }
function buildYAxisTicks( function scaleCanvas(context: CanvasRenderingContext2D): { width: number; height: number; dpr: number } | null {
yScaleBounds: { min: number; max: number }, if (!canvasEl || !chartStageEl) {
_yDataBounds: { min: number; max: number } return null;
): AxisTick[] { }
const width = chartStageEl.clientWidth;
const height = chartStageEl.clientHeight;
const dpr = Math.min(window.devicePixelRatio || 1, maxCanvasDpr);
if (width <= 0 || height <= 0) {
return null;
}
const nextWidth = Math.round(width * dpr);
const nextHeight = Math.round(height * dpr);
if (canvasEl.width !== nextWidth || canvasEl.height !== nextHeight) {
canvasEl.width = nextWidth;
canvasEl.height = nextHeight;
canvasEl.style.width = `${width}px`;
canvasEl.style.height = `${height}px`;
}
context.setTransform((width * dpr) / viewportWidth, 0, 0, (height * dpr) / viewportHeight, 0, 0);
return { width, height, dpr };
}
function drawGrid(context: CanvasRenderingContext2D, yBounds: { min: number; max: number }): void {
const tickValues = [25, 20, 15, 10, 5, 0]; const tickValues = [25, 20, 15, 10, 5, 0];
return tickValues.map((value) => ({
value,
label: formatAxisValue(value, "y"),
plotX: plotInsetLeft - 1.8,
plotY: mapYToViewport(value, yScaleBounds)
}));
}
function buildXAxisTicks(xScaleBounds: { min: number; max: number }): AxisTick[] { context.save();
if (!Number.isFinite(xScaleBounds.min) || !Number.isFinite(xScaleBounds.max)) { context.lineWidth = 0.45;
return []; context.strokeStyle = "rgb(128 170 180 / 0.18)";
context.fillStyle = "rgb(190 216 220 / 0.78)";
context.font = "600 3.2px system-ui, sans-serif";
context.textBaseline = "middle";
for (const tick of tickValues) {
const y = mapYToViewport(tick, yBounds);
context.beginPath();
context.moveTo(plotInsetLeft, y);
context.lineTo(viewportWidth - plotInsetRight, y);
context.stroke();
context.textAlign = "right";
context.fillText(formatAxisValue(tick, "y"), plotInsetLeft - 1.8, y + 0.6);
} }
const first = xScaleBounds.min; context.restore();
const middle = xScaleBounds.min + (xScaleBounds.max - xScaleBounds.min) / 2;
const last = xScaleBounds.max;
const tickValues = [first, middle, last];
return tickValues.map((value) => ({
value,
label: formatAxisValue(value, "x"),
plotX: mapXToViewport(value, xScaleBounds),
plotY: viewportHeight - 0.9
}));
} }
function createLinePath(points: PlotPoint[]): string { function drawXAxis(context: CanvasRenderingContext2D, xBounds: { min: number; max: number }): void {
if (points.length === 0) { const first = xBounds.min;
return ""; const middle = xBounds.min + (xBounds.max - xBounds.min) / 2;
} const last = xBounds.max;
const ticks = [first, middle, last];
return points.map((point, index) => `${index === 0 ? "M" : "L"} ${point.x} ${point.y}`).join(" "); context.save();
context.fillStyle = "rgb(190 216 220 / 0.82)";
context.font = "600 3.2px system-ui, sans-serif";
context.textBaseline = "alphabetic";
ticks.forEach((tick, index) => {
const x = mapXToViewport(tick, xBounds);
context.textAlign = index === 0 ? "left" : index === ticks.length - 1 ? "right" : "center";
context.fillText(formatAxisValue(tick, "x"), x, viewportHeight - 0.9);
});
context.restore();
} }
function createAreaPath(points: PlotPoint[]): string { function drawArea(context: CanvasRenderingContext2D, points: PlotPoint[]): void {
if (points.length < 2) { if (points.length < 2) {
return ""; return;
} }
const linePath = createLinePath(points);
const firstPoint = points[0]; const firstPoint = points[0];
const lastPoint = points[points.length - 1]; const lastPoint = points[points.length - 1];
const gradient = context.createLinearGradient(0, plotInsetTop, 0, viewportHeight - plotInsetBottom);
gradient.addColorStop(0, "rgb(62 232 255 / 0.28)");
gradient.addColorStop(1, "rgb(62 232 255 / 0.02)");
return `${linePath} L ${lastPoint.x} ${viewportHeight - plotInsetBottom} L ${firstPoint.x} ${viewportHeight - plotInsetBottom} Z`; context.save();
context.beginPath();
context.moveTo(firstPoint.x, firstPoint.y);
for (let index = 1; index < points.length; index += 1) {
context.lineTo(points[index].x, points[index].y);
}
context.lineTo(lastPoint.x, viewportHeight - plotInsetBottom);
context.lineTo(firstPoint.x, viewportHeight - plotInsetBottom);
context.closePath();
context.fillStyle = gradient;
context.fill();
context.restore();
}
function drawLine(context: CanvasRenderingContext2D, points: PlotPoint[]): void {
if (!points.length) {
return;
}
context.save();
context.lineWidth = 1.35;
context.lineCap = "round";
context.lineJoin = "round";
context.strokeStyle = "rgb(62 232 255 / 0.96)";
context.beginPath();
context.moveTo(points[0].x, points[0].y);
for (let index = 1; index < points.length; index += 1) {
context.lineTo(points[index].x, points[index].y);
}
context.stroke();
const lastPoint = points[points.length - 1];
context.fillStyle = "rgb(133 255 68 / 0.98)";
context.beginPath();
context.arc(lastPoint.x, lastPoint.y, 1.7, 0, Math.PI * 2);
context.fill();
context.restore();
}
function drawCanvas(): void {
if (!canvasEl) {
return;
}
const context = canvasEl.getContext("2d", { alpha: true });
if (!context) {
return;
}
const scaled = scaleCanvas(context);
if (!scaled) {
return;
}
context.clearRect(0, 0, viewportWidth, viewportHeight);
if (sampleCount === 0) {
return;
}
drawGrid(context, yScaleBounds);
drawArea(context, plotPoints);
drawLine(context, plotPoints);
drawXAxis(context, xScaleBounds);
}
function scheduleDraw(): void {
if (!mounted || typeof window === "undefined") {
return;
}
if (drawRequestId != null) {
return;
}
drawRequestId = window.requestAnimationFrame((timestamp) => {
drawRequestId = null;
if (lastDrawAt > 0 && timestamp - lastDrawAt < minDrawIntervalMs) {
scheduleDraw();
return;
}
lastDrawAt = timestamp;
drawCanvas();
});
} }
$: sourceYValues = yValues && yValues.length ? yValues : summary.points; $: sourceYValues = yValues && yValues.length ? yValues : summary.points;
$: sourceXValues = xValues && xValues.length ? xValues : summary.xValues ?? []; $: sourceXValues = xValues && xValues.length ? xValues : summary.xValues ?? [];
$: samples = (() => { $: samples = buildSamples(sourceYValues, sourceXValues, currentTimeSeconds);
const base = buildSamples(sourceYValues, sourceXValues);
if (isRealtime && base.length > 0 && currentTimeSeconds > 0) {
const lastSample = base[base.length - 1];
base[base.length - 1] = { ...lastSample, x: Math.max(lastSample.x, currentTimeSeconds) };
}
return base;
})();
$: sampleCount = samples.length; $: sampleCount = samples.length;
$: xScaleBounds = resolveXScaleBounds(samples, currentTimeSeconds, isRealtime); $: xScaleBounds = resolveXScaleBounds(samples, currentTimeSeconds, isRealtime);
$: yScaleBounds = fixedYBounds; $: yScaleBounds = fixedYBounds;
$: xDataBounds = resolveDataBounds(samples.map((sample) => sample.x));
$: yDataBounds = resolveDataBounds(samples.map((sample) => sample.y));
$: plotPoints = convertPoints(samples, xScaleBounds, yScaleBounds); $: plotPoints = convertPoints(samples, xScaleBounds, yScaleBounds);
$: linePath = createLinePath(plotPoints);
$: areaPath = createAreaPath(plotPoints);
$: lastPoint = plotPoints.length > 0 ? plotPoints[plotPoints.length - 1] : null;
$: yAxisTicks = sampleCount > 0 ? buildYAxisTicks(yScaleBounds, yDataBounds) : [];
$: xAxisTicks = sampleCount > 0 ? buildXAxisTicks(xScaleBounds) : [];
$: latestValue = formatValue(summary.latest); $: latestValue = formatValue(summary.latest);
$: minValue = formatValue(summary.min); $: minValue = formatValue(summary.min);
$: maxValue = formatValue(summary.max); $: maxValue = formatValue(summary.max);
$: {
sampleCount;
plotPoints;
xScaleBounds;
locale;
scheduleDraw();
}
onMount(() => {
mounted = true;
currentTimeSeconds = Math.round((Date.now() - sessionStartedAt) / 100) / 10;
scheduleDraw();
timerId = setInterval(() => {
if (!isRealtime) {
return;
}
currentTimeSeconds = Math.round((Date.now() - sessionStartedAt) / 100) / 10;
}, 500);
if (chartStageEl) {
resizeObserver = new ResizeObserver(() => scheduleDraw());
resizeObserver.observe(chartStageEl);
}
return () => {
mounted = false;
if (timerId != null) clearInterval(timerId);
if (drawRequestId != null) window.cancelAnimationFrame(drawRequestId);
resizeObserver?.disconnect();
timerId = null;
drawRequestId = null;
resizeObserver = null;
};
});
</script> </script>
<article <article
@@ -290,52 +399,8 @@
</div> </div>
</header> </header>
<div class="chart-stage"> <div class="chart-stage" bind:this={chartStageEl}>
<svg viewBox="0 0 {viewportWidth} {viewportHeight}" preserveAspectRatio="none" role="img" aria-label={summary.label}> <canvas class="summary-canvas" bind:this={canvasEl} aria-label={summary.label}></canvas>
<defs>
<linearGradient id="summary-fill" x1="0%" y1="0%" x2="0%" y2="100%">
<stop offset="0%" stop-color="rgb(62 232 255 / 0.28)" />
<stop offset="100%" stop-color="rgb(62 232 255 / 0.02)" />
</linearGradient>
</defs>
<g class="grid-lines" aria-hidden="true">
{#each yAxisTicks as tick (`grid-${tick.value}`)}
<line x1={plotInsetLeft} y1={tick.plotY} x2={viewportWidth - plotInsetRight} y2={tick.plotY}></line>
{/each}
</g>
{#if areaPath}
<path d={areaPath} class="summary-area"></path>
{/if}
{#if linePath}
<path d={linePath} class="summary-line"></path>
{/if}
{#if lastPoint}
<circle cx={lastPoint.x} cy={lastPoint.y} r="1.7" class="summary-dot"></circle>
{/if}
<g class="axis-labels" aria-hidden="true">
{#each yAxisTicks as tick, index (`y-${index}`)}
<text class="axis-label y-axis-label" x={tick.plotX} y={tick.plotY + 1.1} text-anchor="end">
{tick.label}
</text>
{/each}
{#each xAxisTicks as tick, index (`x-${index}`)}
<text
class="axis-label x-axis-label"
x={tick.plotX}
y={tick.plotY}
text-anchor={index === 0 ? "start" : index === xAxisTicks.length - 1 ? "end" : "middle"}
>
{tick.label}
</text>
{/each}
</g>
</svg>
{#if sampleCount === 0} {#if sampleCount === 0}
<div class="empty-state"> <div class="empty-state">
@@ -389,8 +454,7 @@
transition: transition:
opacity var(--fade-ms) cubic-bezier(0.18, 0.88, 0.3, 1), opacity var(--fade-ms) cubic-bezier(0.18, 0.88, 0.3, 1),
transform var(--enter-ms) cubic-bezier(0.2, 0.9, 0.28, 1), transform var(--enter-ms) cubic-bezier(0.2, 0.9, 0.28, 1),
border-color 460ms ease, border-color 460ms ease;
filter 760ms ease;
transition-delay: calc(var(--panel-index) * 140ms); transition-delay: calc(var(--panel-index) * 140ms);
} }
@@ -480,53 +544,12 @@
radial-gradient(circle at 50% 0, rgb(var(--hud-glow-rgb) / 0.09), transparent 45%); radial-gradient(circle at 50% 0, rgb(var(--hud-glow-rgb) / 0.09), transparent 45%);
} }
svg { .summary-canvas {
display: block; display: block;
inline-size: 100%; inline-size: 100%;
block-size: 100%; block-size: 100%;
} }
.grid-lines line {
stroke: rgb(var(--hud-border-strong-rgb) / 0.16);
stroke-width: 0.45;
}
.summary-area {
fill: url(#summary-fill);
}
.summary-line {
fill: none;
stroke: rgb(var(--hud-cyan-rgb) / 0.96);
stroke-width: 1.35;
stroke-linecap: round;
stroke-linejoin: round;
filter: drop-shadow(0 0 4px rgb(var(--hud-cyan-rgb) / 0.22));
}
.summary-dot {
fill: rgb(var(--hud-lime-rgb) / 0.98);
filter: drop-shadow(0 0 6px rgb(var(--hud-lime-rgb) / 0.3));
}
.axis-label {
fill: rgb(var(--hud-text-main-rgb) / 0.88);
font-size: 3.2px;
font-weight: 600;
letter-spacing: 0.02em;
text-shadow:
0 1px 0 rgb(0 0 0 / 0.46),
0 0 4px rgb(0 0 0 / 0.3);
}
.y-axis-label {
fill: rgb(var(--hud-text-dim-rgb) / 0.84);
}
.x-axis-label {
fill: rgb(var(--hud-text-dim-rgb) / 0.9);
}
.empty-state { .empty-state {
position: absolute; position: absolute;
inset: 0; inset: 0;
@@ -637,6 +660,12 @@
@media (max-width: 900px) { @media (max-width: 900px) {
.signal-panel { .signal-panel {
inline-size: 100%; inline-size: 100%;
background: linear-gradient(160deg, rgb(var(--hud-surface-alt-rgb) / 0.86) 0%, rgb(var(--hud-surface-deep-rgb) / 0.9) 100%);
box-shadow: inset 0 0 0 1px rgb(var(--hud-border-strong-rgb) / 0.08), 0 0 8px rgb(var(--hud-glow-rgb) / 0.1);
}
.chart-stage {
background: linear-gradient(180deg, rgb(var(--hud-surface-alt-rgb) / 0.78), rgb(var(--hud-surface-deep-rgb) / 0.88));
} }
} }
</style> </style>

View File

@@ -44,6 +44,29 @@
dtsMs: number; dtsMs: number;
} }
interface AndroidUsbSerialDevice {
name: string;
vendorId: number;
productId: number;
manufacturer: string;
product: string;
serial: string;
hasPermission: boolean;
}
interface AndroidUsbSerialListResult {
devices: AndroidUsbSerialDevice[];
}
interface AndroidUsbSerialOpenResult {
fd: number;
name: string;
vendorId: number;
productId: number;
}
type AndroidUsbSerialCommand = "list" | "open" | "close";
const copyByLocale: Record<LocaleCode, HudCopy> = { const copyByLocale: Record<LocaleCode, HudCopy> = {
"zh-CN": { "zh-CN": {
appName: "JE-Skin", appName: "JE-Skin",
@@ -168,6 +191,7 @@
const pointsPerSeries = 28; const pointsPerSeries = 28;
const summaryPointsPerSeries = 42; const summaryPointsPerSeries = 42;
const signalRenderTickMs = 1200; const signalRenderTickMs = 1200;
const hudRealtimeRenderMs = 33;
const replayDefaultFrameMs = 40; const replayDefaultFrameMs = 40;
const showSignalPanels = false; const showSignalPanels = false;
const mockToneCycle: SignalTone[] = ["cyan", "lime", "orange", "violet", "gold", "rose"]; const mockToneCycle: SignalTone[] = ["cyan", "lime", "orange", "violet", "gold", "rose"];
@@ -203,6 +227,7 @@
let connectionState: ConnectionState = "offline"; let connectionState: ConnectionState = "offline";
let serialPortValue = "COM14"; let serialPortValue = "COM14";
let serialPortOptions = ["COM4", "COM9", "COM14", "COM16"]; let serialPortOptions = ["COM4", "COM9", "COM14", "COM16"];
let androidUsbSerialDevices: AndroidUsbSerialDevice[] = [];
let isRefreshingPorts = false; let isRefreshingPorts = false;
let connectionNotice = ""; let connectionNotice = "";
let connectionNoticeTone: HudNoticeTone = "info"; let connectionNoticeTone: HudNoticeTone = "info";
@@ -261,6 +286,9 @@
} | null = null; } | null = null;
let devkitStatusTimer: number | null = null; let devkitStatusTimer: number | null = null;
let sessionStartedAt: number = Date.now(); let sessionStartedAt: number = Date.now();
let pendingHudPacket: HudPacket | null = null;
let hudFrameRequestId: number | null = null;
let lastHudRenderAt = 0;
$: uiCopy = copyByLocale[locale]; $: uiCopy = copyByLocale[locale];
$: configLinks = buildConfigLinks( $: configLinks = buildConfigLinks(
@@ -287,6 +315,66 @@
return typeof window !== "undefined" && "__TAURI_INTERNALS__" in window; return typeof window !== "undefined" && "__TAURI_INTERNALS__" in window;
} }
function isAndroidRuntime(): boolean {
if (!isTauriRuntime() || typeof navigator === "undefined") {
return false;
}
return /Android/i.test(navigator.userAgent);
}
function formatAndroidUsbSerialLabel(device: AndroidUsbSerialDevice): string {
const product = device.product || device.manufacturer || "USB Serial";
const ids = `${device.vendorId.toString(16).padStart(4, "0")}:${device.productId
.toString(16)
.padStart(4, "0")}`;
return `${product} (${ids})`;
}
function findAndroidUsbSerialDevice(name: string): AndroidUsbSerialDevice | null {
return androidUsbSerialDevices.find((device) => device.name === name) ?? null;
}
function normalizeAndroidUsbSerialDevices(value: unknown): AndroidUsbSerialDevice[] {
if (Array.isArray(value)) {
return value.filter((device): device is AndroidUsbSerialDevice => {
return typeof device === "object" && device !== null && typeof (device as AndroidUsbSerialDevice).name === "string";
});
}
if (typeof value === "object" && value !== null) {
return Object.values(value).filter((device): device is AndroidUsbSerialDevice => {
return typeof device === "object" && device !== null && typeof (device as AndroidUsbSerialDevice).name === "string";
});
}
return [];
}
async function invokeAndroidUsbSerial<T>(
command: AndroidUsbSerialCommand,
args?: Record<string, unknown>
): Promise<T> {
const commandNames: Record<AndroidUsbSerialCommand, [string, string]> = {
list: ["usb_serial_list", "usbSerialList"],
open: ["usb_serial_open", "usbSerialOpen"],
close: ["usb_serial_close", "usbSerialClose"]
};
const [primary, fallback] = commandNames[command];
try {
return await invoke<T>(`plugin:usb-serial|${primary}`, args);
} catch (error) {
const message = String(error);
if (!message.includes("No command")) {
throw error;
}
return await invoke<T>(`plugin:usb-serial|${fallback}`, args);
}
}
function clamp(value: number, min: number, max: number): number { function clamp(value: number, min: number, max: number): number {
return Math.min(max, Math.max(min, value)); return Math.min(max, Math.max(min, value));
} }
@@ -726,12 +814,10 @@
const safeIndex = clamp(index, 0, replayFrames.length - 1); const safeIndex = clamp(index, 0, replayFrames.length - 1);
const startIndex = Math.max(0, safeIndex - summaryPointsPerSeries + 1); const startIndex = Math.max(0, safeIndex - summaryPointsPerSeries + 1);
const points: number[] = []; const points: number[] = [];
const xSeconds: number[] = [];
for (let cursor = startIndex; cursor <= safeIndex; cursor += 1) { for (let cursor = startIndex; cursor <= safeIndex; cursor += 1) {
points.push(replayFrameTotal(replayFrames[cursor])); points.push(replayFrameTotal(replayFrames[cursor]));
xSeconds.push(replayFrames[cursor].dtsMs / 1000);
} }
return buildSummary(points, xSeconds); return buildSummary(points);
} }
function applyReplayFrame(index: number): void { function applyReplayFrame(index: number): void {
@@ -744,7 +830,9 @@
replayHasDisplayedFrame = true; replayHasDisplayedFrame = true;
replayProgress = replayFrames.length > 1 ? safeIndex / (replayFrames.length - 1) : 1; replayProgress = replayFrames.length > 1 ? safeIndex / (replayFrames.length - 1) : 1;
pressureMatrix = frameValuesToMatrix(replayFrames[safeIndex].values); pressureMatrix = frameValuesToMatrix(replayFrames[safeIndex].values);
signalPanels = buildInactivePanels(); if (signalPanels.length > 0) {
signalPanels = buildInactivePanels();
}
summary = buildReplaySummaryAt(safeIndex); summary = buildReplaySummaryAt(safeIndex);
hasSignalData = true; hasSignalData = true;
} }
@@ -903,7 +991,6 @@
function buildEmptySummary(): HudSummary { function buildEmptySummary(): HudSummary {
return { return {
label: "Resultant Force", label: "Resultant Force",
xValues: [],
points: [], points: [],
latest: null, latest: null,
min: null, min: null,
@@ -923,19 +1010,13 @@
return shouldHideSummary(summaryValue.points) ? buildEmptySummary() : summaryValue; return shouldHideSummary(summaryValue.points) ? buildEmptySummary() : summaryValue;
} }
function buildSummary(points: number[], xValues: number[] = []): HudSummary { function buildSummary(points: number[]): HudSummary {
if (points.length === 0) { if (points.length === 0) {
return buildEmptySummary(); return buildEmptySummary();
} }
const resolvedXValues = points.map((_, index) => {
const x = xValues[index];
return Number.isFinite(x) ? Number(x) : index + 1;
});
return { return {
label: "Resultant Force", label: "Resultant Force",
xValues: resolvedXValues,
points, points,
latest: points[points.length - 1], latest: points[points.length - 1],
min: Math.min(...points), min: Math.min(...points),
@@ -960,21 +1041,13 @@
? summaryValue.points[summaryValue.points.length - 1] ? summaryValue.points[summaryValue.points.length - 1]
: randomBetween(280, 1600); : randomBetween(280, 1600);
const next = Math.round(clamp(previous + randomBetween(-160, 160), 120, 2400) * 10) / 10; const next = Math.round(clamp(previous + randomBetween(-160, 160), 120, 2400) * 10) / 10;
const nowSeconds = Math.round((Date.now() - sessionStartedAt) / 100) / 10;
const previousXValues =
summaryValue.xValues && summaryValue.xValues.length === summaryValue.points.length
? summaryValue.xValues
: summaryValue.points.map((_, index) => nowSeconds);
const points = const points =
summaryValue.points.length >= summaryPointsPerSeries summaryValue.points.length >= summaryPointsPerSeries
? summaryValue.points.slice(1) ? summaryValue.points.slice(1)
: summaryValue.points.slice(); : summaryValue.points.slice();
const xValues =
previousXValues.length >= summaryPointsPerSeries ? previousXValues.slice(1) : previousXValues.slice();
points.push(next); points.push(next);
xValues.push(nowSeconds); return buildSummary(points);
return buildSummary(points, xValues);
} }
function buildInactivePanels(): HudSignalPanel[] { function buildInactivePanels(): HudSignalPanel[] {
@@ -985,23 +1058,66 @@
if (replayHasData) { if (replayHasData) {
return; return;
} }
signalPanels = showSignalPanels ? packet.panels : buildInactivePanels(); if (showSignalPanels) {
if (packet.summary.points.length > 0) { signalPanels = packet.panels;
const nowSeconds = Math.round((Date.now() - sessionStartedAt) / 100) / 10; } else if (signalPanels.length > 0) {
const pointCount = packet.summary.points.length; signalPanels = buildInactivePanels();
const spacing =
pointCount > 1 ? Math.min(1.2, nowSeconds / Math.max(pointCount - 1, 1)) : 0;
const startX = Math.max(0, nowSeconds - spacing * Math.max(pointCount - 1, 0));
const xValues = packet.summary.points.map((_, index) => Math.round((startX + index * spacing) * 10) / 10);
summary = { ...packet.summary, xValues };
} else {
summary = packet.summary;
} }
summary = packet.summary;
pressureMatrix = packet.pressureMatrix; pressureMatrix = packet.pressureMatrix;
hasSignalData = signalPanels.length > 0 || packet.summary.points.length > 0; hasSignalData = signalPanels.length > 0 || packet.summary.points.length > 0;
} }
function getFrameClock(): number {
return typeof performance !== "undefined" ? performance.now() : Date.now();
}
function cancelPendingHudPacket(): void {
pendingHudPacket = null;
if (hudFrameRequestId != null && typeof window !== "undefined") {
window.cancelAnimationFrame(hudFrameRequestId);
hudFrameRequestId = null;
}
}
function scheduleHudPacketFlush(): void {
if (hudFrameRequestId != null || typeof window === "undefined") {
return;
}
hudFrameRequestId = window.requestAnimationFrame(flushPendingHudPacket);
}
function flushPendingHudPacket(timestamp: number = getFrameClock()): void {
hudFrameRequestId = null;
if (!pendingHudPacket) {
return;
}
const elapsed = timestamp - lastHudRenderAt;
if (lastHudRenderAt > 0 && elapsed < hudRealtimeRenderMs) {
scheduleHudPacketFlush();
return;
}
const packet = pendingHudPacket;
pendingHudPacket = null;
lastHudRenderAt = timestamp;
applyPacket(packet);
}
function enqueueHudPacket(packet: HudPacket): void {
if (replayHasData) {
return;
}
pendingHudPacket = packet;
scheduleHudPacketFlush();
}
function clearHudPanels(): void { function clearHudPanels(): void {
cancelPendingHudPacket();
hasSignalData = false; hasSignalData = false;
signalPanels = buildInactivePanels(); signalPanels = buildInactivePanels();
summary = buildEmptySummary(); summary = buildEmptySummary();
@@ -1221,6 +1337,10 @@
function handlePortChange(event: CustomEvent<string>): void { function handlePortChange(event: CustomEvent<string>): void {
serialPortValue = event.detail; serialPortValue = event.detail;
if (isAndroidRuntime()) {
const selectedDevice = findAndroidUsbSerialDevice(serialPortValue);
deviceValue = selectedDevice ? formatAndroidUsbSerialLabel(selectedDevice) : "Android USB Serial";
}
connectionState = "offline"; connectionState = "offline";
connectionNotice = ""; connectionNotice = "";
clearHudPanels(); clearHudPanels();
@@ -1256,7 +1376,7 @@
case "InvalidConfig": case "InvalidConfig":
return "当前串口配置无效,请重新选择端口。"; return "当前串口配置无效,请重新选择端口。";
default: default:
return "串口连接失败,请稍后重试。"; return `串口连接失败${errorCode}`;
} }
} }
@@ -1277,7 +1397,7 @@
case "InvalidConfig": case "InvalidConfig":
return "The selected serial port is invalid. Choose another port."; return "The selected serial port is invalid. Choose another port.";
default: default:
return "Connection failed. Please try again."; return `Connection failed: ${errorCode}`;
} }
} }
@@ -1288,14 +1408,16 @@
const errorCode = normalizeInvokeError(error); const errorCode = normalizeInvokeError(error);
if (locale === "zh-CN") { if (locale === "zh-CN") {
return errorCode === "ScanError" if (errorCode === "ScanError") {
? "串口列表刷新失败,请确认系统串口服务正常。" return "串口列表刷新失败,请确认系统串口服务正常。";
: "刷新串口列表失败,请稍后重试。"; }
return `刷新串口列表失败:${errorCode}`;
} }
return errorCode === "ScanError" return errorCode === "ScanError"
? "Refreshing serial ports failed. Check whether the OS serial service is available." ? "Refreshing serial ports failed. Check whether the OS serial service is available."
: "Refreshing serial ports failed. Please try again."; : `Refreshing serial ports failed: ${errorCode}`;
} }
function resolveExportNotice(error: unknown): string { function resolveExportNotice(error: unknown): string {
@@ -1350,6 +1472,33 @@
isRefreshingPorts = true; isRefreshingPorts = true;
try { try {
try {
const result = await invokeAndroidUsbSerial<AndroidUsbSerialListResult>("list");
androidUsbSerialDevices = normalizeAndroidUsbSerialDevices(result.devices);
serialPortOptions = androidUsbSerialDevices.map((device) => device.name);
if (serialPortOptions.includes(serialPortValue)) {
return;
}
serialPortValue = serialPortOptions[0] ?? "";
const selectedDevice = findAndroidUsbSerialDevice(serialPortValue);
deviceValue = selectedDevice ? formatAndroidUsbSerialLabel(selectedDevice) : "Android USB Serial";
if (!serialPortValue) {
connectionState = "offline";
clearHudPanels();
connectionNotice =
locale === "zh-CN" ? "未发现 USB 串口设备,请确认已通过 OTG 接入设备。" : "No USB serial device found.";
connectionNoticeTone = "warn";
}
return;
} catch (androidError) {
if (isAndroidRuntime()) {
throw androidError;
}
}
const ports = await invoke<string[]>("serial_enum"); const ports = await invoke<string[]>("serial_enum");
serialPortOptions = ports; serialPortOptions = ports;
@@ -1390,7 +1539,28 @@
connectionNotice = ""; connectionNotice = "";
try { try {
const result = await invoke<SerialConnectResult>("serial_connect", { port: event.detail }); let result: SerialConnectResult;
if (isAndroidRuntime()) {
const selectedDevice = findAndroidUsbSerialDevice(event.detail);
const opened = await invokeAndroidUsbSerial<AndroidUsbSerialOpenResult>("open", {
name: event.detail,
vendorId: selectedDevice?.vendorId,
productId: selectedDevice?.productId
});
result = await invoke<SerialConnectResult>("serial_connect_fd", {
fd: opened.fd,
deviceName: opened.name,
device_name: opened.name
});
const openedDevice = findAndroidUsbSerialDevice(opened.name) ?? selectedDevice;
deviceValue = openedDevice
? formatAndroidUsbSerialLabel(openedDevice)
: `USB Serial (${opened.vendorId.toString(16)}:${opened.productId.toString(16)})`;
} else {
result = await invoke<SerialConnectResult>("serial_connect", { port: event.detail });
}
connectionState = result.connected ? "online" : "offline"; connectionState = result.connected ? "online" : "offline";
serialPortValue = result.port; serialPortValue = result.port;
connectionNotice = ""; connectionNotice = "";
@@ -1398,6 +1568,13 @@
clearHudPanels(); clearHudPanels();
console.info("[serial] connect result:", result.message); console.info("[serial] connect result:", result.message);
} catch (error) { } catch (error) {
if (isAndroidRuntime()) {
try {
await invokeAndroidUsbSerial("close");
} catch (closeError) {
console.warn("USB serial close after failed connect failed:", closeError);
}
}
connectionState = "offline"; connectionState = "offline";
connectionNotice = resolveSerialNotice(error, "connect"); connectionNotice = resolveSerialNotice(error, "connect");
connectionNoticeTone = "warn"; connectionNoticeTone = "warn";
@@ -1409,6 +1586,9 @@
async function handleSerialDisconnect(): Promise<void> { async function handleSerialDisconnect(): Promise<void> {
try { try {
const result = await invoke<SerialConnectResult>("serial_disconnect"); const result = await invoke<SerialConnectResult>("serial_disconnect");
if (isAndroidRuntime()) {
await invokeAndroidUsbSerial("close");
}
connectionState = result.connected ? "online" : "offline"; connectionState = result.connected ? "online" : "offline";
connectionNotice = ""; connectionNotice = "";
connectionNoticeTone = "info"; connectionNoticeTone = "info";
@@ -1758,7 +1938,7 @@
void checkForAppUpdate(); void checkForAppUpdate();
void pollDevKitStatus(); void pollDevKitStatus();
devkitStatusTimer = window.setInterval(() => void pollDevKitStatus(), 3000); devkitStatusTimer = window.setInterval(() => void pollDevKitStatus(), 3000);
void startTauriHudStream(applyPacket) void startTauriHudStream(enqueueHudPacket)
.then((unlisten) => { .then((unlisten) => {
if (disposed) { if (disposed) {
unlisten(); unlisten();
@@ -1788,11 +1968,12 @@
console.error("Failed to listen for devkit_pzt_angle:", error); console.error("Failed to listen for devkit_pzt_angle:", error);
}); });
} else { } else {
stopMockFeed = startMockFeed(applyPacket); stopMockFeed = startMockFeed(enqueueHudPacket);
} }
return () => { return () => {
disposed = true; disposed = true;
cancelPendingHudPacket();
pauseReplayPlayback(); pauseReplayPlayback();
stopMockFeed?.(); stopMockFeed?.();
unlistenHudStream?.(); unlistenHudStream?.();
@@ -2014,6 +2195,27 @@
mix-blend-mode: soft-light; mix-blend-mode: soft-light;
} }
@media (max-width: 900px) {
.hud-noise {
display: none;
}
.hud-vignette {
opacity: 0.4;
}
.hud-gradient {
background:
linear-gradient(170deg, var(--hud-bg-20) 0%, var(--hud-bg-10) 56%, var(--hud-bg-30) 100%);
}
.hud-layout {
gap: clamp(0.3rem, 1vw, 0.6rem);
padding: clamp(0.4rem, 1.2vw, 0.8rem);
box-shadow: inset 0 -12px 24px rgb(0 0 0 / 0.24);
}
}
.hud-layout { .hud-layout {
position: relative; position: relative;
z-index: 1; z-index: 1;