bstein/lesavka
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(sync): propagate uvc codec into uvc env

Browse Source
This commit is contained in:
Brad Stein 2026-04-27 14:34:50 -03:00
parent ab00babf99
commit ff528bad1c
6 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@ -1642,7 +1642,7 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
[[package]] [[package]]
name = "lesavka_client" name = "lesavka_client"
version = "0.14.20" version = "0.14.21"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-stream", "async-stream",
@ -1676,7 +1676,7 @@ dependencies = [
[[package]] [[package]]
name = "lesavka_common" name = "lesavka_common"
version = "0.14.20" version = "0.14.21"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64", "base64",
@ -1688,7 +1688,7 @@ dependencies = [
[[package]] [[package]]
name = "lesavka_server" name = "lesavka_server"
version = "0.14.20" version = "0.14.21"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64", "base64",

2
client/Cargo.toml
View File

@ -4,7 +4,7 @@ path = "src/main.rs"
[package] [package]
name = "lesavka_client" name = "lesavka_client"
version = "0.14.20" version = "0.14.21"
edition = "2024" edition = "2024"
[dependencies] [dependencies]

2
common/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "lesavka_common" name = "lesavka_common"
version = "0.14.20" version = "0.14.21"
edition = "2024" edition = "2024"
build = "build.rs" build = "build.rs"

15
scripts/install/server.sh
View File

@ -502,6 +502,21 @@ fi
printf 'LESAVKA_UVC_CODEC=%s\n' "${LESAVKA_UVC_CODEC:-mjpeg}" printf 'LESAVKA_UVC_CODEC=%s\n' "${LESAVKA_UVC_CODEC:-mjpeg}"
} | sudo tee /etc/lesavka/server.env >/dev/null } | sudo tee /etc/lesavka/server.env >/dev/null
{
echo "# generated by lesavka/scripts/install/server.sh"
echo "# Edit only for local UVC hardware overrides; rerunning the installer refreshes defaults."
printf 'LESAVKA_UVC_DEBUG=%s\n' "${LESAVKA_UVC_DEBUG:-1}"
printf 'LESAVKA_UVC_MAXPACKET=%s\n' "${LESAVKA_UVC_MAXPACKET:-256}"
printf 'LESAVKA_UVC_LIMIT_PCT=%s\n' "${LESAVKA_UVC_LIMIT_PCT:-100}"
printf 'LESAVKA_UVC_FPS=%s\n' "${LESAVKA_UVC_FPS:-20}"
printf 'LESAVKA_UVC_INTERVAL=%s\n' "${LESAVKA_UVC_INTERVAL:-500000}"
printf 'LESAVKA_UVC_WIDTH=%s\n' "${LESAVKA_UVC_WIDTH:-640}"
printf 'LESAVKA_UVC_HEIGHT=%s\n' "${LESAVKA_UVC_HEIGHT:-480}"
printf 'LESAVKA_UVC_CODEC=%s\n' "${LESAVKA_UVC_CODEC:-mjpeg}"
printf 'LESAVKA_UVC_BLOCKING=%s\n' "${LESAVKA_UVC_BLOCKING:-1}"
printf 'LESAVKA_UVC_MAXBURST=%s\n' "${LESAVKA_UVC_MAXBURST:-0}"
} | sudo tee /etc/lesavka/uvc.env >/dev/null
echo "==> 6a. Systemd units - lesavka-core" echo "==> 6a. Systemd units - lesavka-core"
cat <<'UNIT' | sudo tee /etc/systemd/system/lesavka-core.service >/dev/null cat <<'UNIT' | sudo tee /etc/systemd/system/lesavka-core.service >/dev/null
[Unit] [Unit]

2
server/Cargo.toml
View File

@ -10,7 +10,7 @@ bench = false
[package] [package]
name = "lesavka_server" name = "lesavka_server"
version = "0.14.20" version = "0.14.21"
edition = "2024" edition = "2024"
autobins = false autobins = false

11
testing/tests/server_install_script_contract.rs
View File

@ -23,6 +23,12 @@ fn server_install_pins_hdmi_camera_and_display_defaults() {
"LESAVKA_UPSTREAM_VIDEO_PLAYOUT_OFFSET_US=%s", "LESAVKA_UPSTREAM_VIDEO_PLAYOUT_OFFSET_US=%s",
"LESAVKA_UPSTREAM_PAIR_SLACK_US=%s", "LESAVKA_UPSTREAM_PAIR_SLACK_US=%s",
"LESAVKA_UPSTREAM_STALE_DROP_MS=%s", "LESAVKA_UPSTREAM_STALE_DROP_MS=%s",
"/etc/lesavka/uvc.env",
"LESAVKA_UVC_MAXPACKET=%s",
"LESAVKA_UVC_INTERVAL=%s",
"LESAVKA_UVC_WIDTH=%s",
"LESAVKA_UVC_HEIGHT=%s",
"LESAVKA_UVC_CODEC=%s",
] { ] {
assert!( assert!(
SERVER_INSTALL.contains(expected), SERVER_INSTALL.contains(expected),
@ -38,6 +44,11 @@ fn server_install_pins_hdmi_camera_and_display_defaults() {
assert!(SERVER_INSTALL.contains("${LESAVKA_UPSTREAM_PLAYOUT_DELAY_MS:-1000}")); assert!(SERVER_INSTALL.contains("${LESAVKA_UPSTREAM_PLAYOUT_DELAY_MS:-1000}"));
assert!(SERVER_INSTALL.contains("${LESAVKA_UPSTREAM_PAIR_SLACK_US:-20000}")); assert!(SERVER_INSTALL.contains("${LESAVKA_UPSTREAM_PAIR_SLACK_US:-20000}"));
assert!(SERVER_INSTALL.contains("${LESAVKA_UPSTREAM_STALE_DROP_MS:-80}")); assert!(SERVER_INSTALL.contains("${LESAVKA_UPSTREAM_STALE_DROP_MS:-80}"));
assert!(SERVER_INSTALL.contains("${LESAVKA_UVC_MAXPACKET:-256}"));
assert!(SERVER_INSTALL.contains("${LESAVKA_UVC_INTERVAL:-500000}"));
assert!(SERVER_INSTALL.contains("${LESAVKA_UVC_WIDTH:-640}"));
assert!(SERVER_INSTALL.contains("${LESAVKA_UVC_HEIGHT:-480}"));
assert!(SERVER_INSTALL.contains("${LESAVKA_UVC_CODEC:-mjpeg}"));
} }
#[test] #[test]