diff --git a/Cargo.lock b/Cargo.lock index c662bb1..dffcedd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1642,7 +1642,7 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" [[package]] name = "lesavka_client" -version = "0.14.20" +version = "0.14.21" dependencies = [ "anyhow", "async-stream", @@ -1676,7 +1676,7 @@ dependencies = [ [[package]] name = "lesavka_common" -version = "0.14.20" +version = "0.14.21" dependencies = [ "anyhow", "base64", @@ -1688,7 +1688,7 @@ dependencies = [ [[package]] name = "lesavka_server" -version = "0.14.20" +version = "0.14.21" dependencies = [ "anyhow", "base64", diff --git a/client/Cargo.toml b/client/Cargo.toml index c008314..0388d68 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -4,7 +4,7 @@ path = "src/main.rs" [package] name = "lesavka_client" -version = "0.14.20" +version = "0.14.21" edition = "2024" [dependencies] diff --git a/common/Cargo.toml b/common/Cargo.toml index ce2fa16..2907458 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lesavka_common" -version = "0.14.20" +version = "0.14.21" edition = "2024" build = "build.rs" diff --git a/scripts/install/server.sh b/scripts/install/server.sh index 133b5a6..b6a5c04 100755 --- a/scripts/install/server.sh +++ b/scripts/install/server.sh @@ -502,6 +502,21 @@ fi printf 'LESAVKA_UVC_CODEC=%s\n' "${LESAVKA_UVC_CODEC:-mjpeg}" } | 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" cat <<'UNIT' | sudo tee /etc/systemd/system/lesavka-core.service >/dev/null [Unit] diff --git a/server/Cargo.toml b/server/Cargo.toml index a3b326c..1d75723 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -10,7 +10,7 @@ bench = false [package] name = "lesavka_server" -version = "0.14.20" +version = "0.14.21" edition = "2024" autobins = false diff --git a/testing/tests/server_install_script_contract.rs b/testing/tests/server_install_script_contract.rs index 11bd809..09e42b5 100644 --- a/testing/tests/server_install_script_contract.rs +++ b/testing/tests/server_install_script_contract.rs @@ -23,6 +23,12 @@ fn server_install_pins_hdmi_camera_and_display_defaults() { "LESAVKA_UPSTREAM_VIDEO_PLAYOUT_OFFSET_US=%s", "LESAVKA_UPSTREAM_PAIR_SLACK_US=%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!( 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_PAIR_SLACK_US:-20000}")); 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]