From 8f8c9006cb66afaf37a1d0da62f6f74460672691 Mon Sep 17 00:00:00 2001
From: paukstelis <paukstel@umd.edu>
Date: Wed, 28 Sep 2022 19:57:00 -0400
Subject: [PATCH] remove timeout on dmesg

---
 octoprint_deploy.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/octoprint_deploy.sh b/octoprint_deploy.sh
index 00f2b9f..c3c738f 100755
--- a/octoprint_deploy.sh
+++ b/octoprint_deploy.sh
@@ -383,13 +383,15 @@ add_camera() {
     echo "Plug your camera in via USB now (detection time-out in 1 min)"
     counter=0
     while [[ -z "$CAM" ]] && [[ $counter -lt 30 ]]; do
-        CAM=$(timeout 1s dmesg -w | sed -n -e 's/^.*SerialNumber: //p')
-        TEMPUSBCAM=$(timeout 1s dmesg -w | sed -n -e 's|^.*input:.*/\(.*\)/input/input.*|\1|p')
+        CAM=$(dmesg -w | sed -n -e 's/^.*SerialNumber: //p')
+        TEMPUSBCAM=$(dmesg -w | sed -n -e 's|^.*input:.*/\(.*\)/input/input.*|\1|p')
         counter=$(( $counter + 1 ))
         if [[ -n "$TEMPUSBCAM" ]] && [[ -z "$CAM" ]]; then
             break
         fi
+        sleep 2
     done
+    dmesg -C
     #Failed state. Nothing detected
     if [ -z "$CAM" ] && [ -z "$TEMPUSBCAM" ] ; then
         echo
@@ -462,17 +464,16 @@ detect_printer() {
     echo "Plug your printer in via USB now (detection time-out in 1 min)"
     counter=0
     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')
-        UDEV=$(timeout 1s dmesg -w | sed -n -e 's/^.*SerialNumber: //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=$(dmesg -w | sed -n -e 's/^.*SerialNumber: //p')
         counter=$(( $counter + 1 ))
         #No need to complete timeout in this case
         if [[ -n "$TEMPUSB" ]] && [[ -z "$UDEV" ]]; then
             break
         fi
-    #run this one more time just to catch the USB position,even if we have a serial number
+        sleep 2
     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() {