From 777b823fb957a60f5241a84d750d80b5f5c82b09 Mon Sep 17 00:00:00 2001 From: mofeng-git Date: Sun, 15 Sep 2024 10:17:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E4=B8=BA=20/dev/video0=20/dev/ttyUSB0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/v2-hdmiusb-rpi4.override.yaml | 4 ++-- configs/kvmd/init.sh | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/build/v2-hdmiusb-rpi4.override.yaml b/build/v2-hdmiusb-rpi4.override.yaml index 2eceea6a..c23192c3 100644 --- a/build/v2-hdmiusb-rpi4.override.yaml +++ b/build/v2-hdmiusb-rpi4.override.yaml @@ -10,7 +10,7 @@ kvmd: hid: type: ch9329 - device: /dev/kvmd-hid + device: /dev/ttyUSB0 msd: type: disabled @@ -23,7 +23,7 @@ kvmd: default: 2000 cmd: - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" + - "--device=/dev/video0" - "--persistent" - "--format=mjpeg" - "--encoder=LIBX264-VIDEO" diff --git a/configs/kvmd/init.sh b/configs/kvmd/init.sh index 99bcc63b..d3c3df08 100755 --- a/configs/kvmd/init.sh +++ b/configs/kvmd/init.sh @@ -110,10 +110,14 @@ redirect_stderr=true EOF fi - #/dev/video0 设备优先级高于 /dev/kvmd-video - if [ -f /dev/video0 ]; then - echo -e "${GREEN}Found /dev/video0, use it as kvmd video device.${NC}" - sed -i "s/\/dev\/kvmd-video/\/dev\/video0/g" /etc/kvmd/override.yaml + #/dev/kvmd-video 设备优先级高于 /dev/video0,/dev/kvmd-hid 设备优先级高于 /dev/ttyUSB0 + if [ -f /dev/kvmd-video ]; then + echo -e "${GREEN}Found dev/kvmd-video, use it as kvmd video device.${NC}" + sed -i "s/\/dev\/video0/\/dev\/kvmd-video/g" /etc/kvmd/override.yaml + fi + if [ -f /dev/kvmd-hid ]; then + echo -e "${GREEN}Found /dev/kvmd-hid, use it as kvmd video device.${NC}" + sed -i "s/\/dev\/ttyUSB0/\/dev\/kvmd-hid/g" /etc/kvmd/override.yaml fi #设置用户账号密码