From cdfea5dd142f3cbf52fb9a6df3420192a132e3ef Mon Sep 17 00:00:00 2001
From: Brad Stein <brad.stein@gmail.com>
Date: Mon, 23 Jun 2025 19:44:03 -0500
Subject: [PATCH] core tweak

---
 scripts/install-server.sh                  | 7 ++-----
 scripts/{navka-core.sh => lesavka-core.sh} | 5 +++++
 server/Cargo.toml                          | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)
 rename scripts/{navka-core.sh => lesavka-core.sh} (94%)

diff --git a/scripts/install-server.sh b/scripts/install-server.sh
index d4ff9a0..b443757 100755
--- a/scripts/install-server.sh
+++ b/scripts/install-server.sh
@@ -17,18 +17,15 @@ cat <<'EOF' | sudo tee /etc/modprobe.d/gc311-stream.conf >/dev/null
 options uvcvideo quirks=0x200 timeout=10000
 EOF
 
-sudo /usr/bin/modprobe -r uvcvideo || true
-sudo /usr/bin/modprobe uvcvideo
-
 echo "==> 2b. Predictable /dev names for each capture card"
 sudo tee /etc/udev/rules.d/85-gc311.rules >/dev/null <<'RULES'
-# Serial 5313… – RIGHT eye  (video index 0)
+# RIGHT eye  (video index 0)
 SUBSYSTEM=="video4linux", ATTRS{idVendor}=="07ca", ATTRS{idProduct}=="3311", \
   ATTRS{serial}=="5313550401897", ATTR{index}=="0", \
   ATTRS{bInterfaceNumber}=="00", \
   SYMLINK+="lesavka_r_eye"
 
-# Serial 1200… – LEFT eye  (video index 0)
+# LEFT eye  (video index 0)
 SUBSYSTEM=="video4linux", ATTRS{idVendor}=="07ca", ATTRS{idProduct}=="3311", \
   ATTRS{serial}=="1200655409098", ATTR{index}=="0", \
   ATTRS{bInterfaceNumber}=="00", \
diff --git a/scripts/navka-core.sh b/scripts/lesavka-core.sh
similarity index 94%
rename from scripts/navka-core.sh
rename to scripts/lesavka-core.sh
index 2c36535..c892da3 100644
--- a/scripts/navka-core.sh
+++ b/scripts/lesavka-core.sh
@@ -13,6 +13,11 @@ grep -q 'dtoverlay=dwc2,dr_mode=peripheral' "$CFG" || echo 'dtoverlay=dwc2,dr_mo
 # 2) Load kernel modules (idempotent)
 modprobe dwc2 || { echo "dwc2 not in kernel; abort" >&2; exit 1; }
 modprobe libcomposite || { echo "libcomposite not in kernel; abort" >&2; exit 1; }
+modprobe -r uvcvideo || true
+modprobe uvcvideo || { echo "uvcvideo not in kernel; abort" >&2; exit 1; }
+udevadm control --reload
+udevadm trigger --subsystem-match=video4linux
+udevadm settle
 
 # 3) Mount configfs once
 mountpoint -q /sys/kernel/config || mount -t configfs none /sys/kernel/config
diff --git a/server/Cargo.toml b/server/Cargo.toml
index bfbe4d5..8294aee 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -20,4 +20,4 @@ futures-util            = "0.3"
 gstreamer               = { version = "0.23", features = ["v1_22"] }
 gstreamer-app           = "0.23"
 gstreamer-video         = "0.23"
-udev                    = "0.8"
\ No newline at end of file
+udev                    = "0.8"