voltron/octodocker_deploy
1
0
Fork 0
Code Issues Pull Requests Releases Activity

remove timeout on dmesg

Browse Source
This commit is contained in:
paukstelis
2022-09-28 19:57:00 -04:00
parent 82eedca7ec
commit 8f8c9006cb
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
octoprint_deploy.sh
View File

@@ -383,13 +383,15 @@ add_camera() {
echo "Plug your camera in via USB now (detection time-out in 1 min)" echo "Plug your camera in via USB now (detection time-out in 1 min)"
counter=0 counter=0
while [[ -z "$CAM" ]] && [[ $counter -lt 30 ]]; do while [[ -z "$CAM" ]] && [[ $counter -lt 30 ]]; do
CAM=$(timeout 1s dmesg -w | sed -n -e 's/^.*SerialNumber: //p') CAM=$(dmesg -w | sed -n -e 's/^.*SerialNumber: //p')
TEMPUSBCAM=$(timeout 1s dmesg -w | sed -n -e 's|^.*input:.*/\(.*\)/input/input.*|\1|p') TEMPUSBCAM=$(dmesg -w | sed -n -e 's|^.*input:.*/\(.*\)/input/input.*|\1|p')
counter=$(( $counter + 1 )) counter=$(( $counter + 1 ))
if [[ -n "$TEMPUSBCAM" ]] && [[ -z "$CAM" ]]; then if [[ -n "$TEMPUSBCAM" ]] && [[ -z "$CAM" ]]; then
break break
fi fi
sleep 2
done done
dmesg -C
#Failed state. Nothing detected #Failed state. Nothing detected
if [ -z "$CAM" ] && [ -z "$TEMPUSBCAM" ] ; then if [ -z "$CAM" ] && [ -z "$TEMPUSBCAM" ] ; then
echo echo
@@ -462,17 +464,16 @@ detect_printer() {
echo "Plug your printer in via USB now (detection time-out in 1 min)" echo "Plug your printer in via USB now (detection time-out in 1 min)"
counter=0 counter=0
while [[ -z "$UDEV" ]] && [[ $counter -lt 30 ]]; do while [[ -z "$UDEV" ]] && [[ $counter -lt 30 ]]; do
TEMPUSB=$(timeout 1s dmesg -w | sed -n -e 's/^.*\(cdc_acm\|ftdi_sio\|ch341\|cp210x\) \([0-9].*[0-9]\): \(tty.*\|FTD.*\|ch341-uart.*\|cp210x\).*/\2/p') TEMPUSB=$(dmesg -w | sed -n -e 's/^.*\(cdc_acm\|ftdi_sio\|ch341\|cp210x\) \([0-9].*[0-9]\): \(tty.*\|FTD.*\|ch341-uart.*\|cp210x\).*/\2/p')
UDEV=$(timeout 1s dmesg -w | sed -n -e 's/^.*SerialNumber: //p') UDEV=$(dmesg -w | sed -n -e 's/^.*SerialNumber: //p')
counter=$(( $counter + 1 )) counter=$(( $counter + 1 ))
#No need to complete timeout in this case #No need to complete timeout in this case
if [[ -n "$TEMPUSB" ]] && [[ -z "$UDEV" ]]; then if [[ -n "$TEMPUSB" ]] && [[ -z "$UDEV" ]]; then
break break
fi fi
#run this one more time just to catch the USB position,even if we have a serial number sleep 2
done done
TEMPUSB=$(dmesg | sed -n -e 's/^.*\(cdc_acm\|ftdi_sio\|ch341\|cp210x\) \([0-9].*[0-9]\): \(tty.*\|FTD.*\|ch341-uart.*\|cp210x\).*/\2/p') dmesg -C
} }
remove_instance() { remove_instance() {