X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=research%2FTCS%2Fpressure%2Fget_pressure.sh;h=f7aa8b5843ab3db303ebbdef951df3be2533915f;hb=4e99fb6758f056a338cb499f22c7827b2d14e2b8;hp=55e7c9c2c1b8ecb0caf902937e782db05bacb568;hpb=f87b5b1f15c9372c224b86c997446569949d0214;p=matches%2Fhonours.git

diff --git a/research/TCS/pressure/get_pressure.sh b/research/TCS/pressure/get_pressure.sh
index 55e7c9c2..f7aa8b58 100755
--- a/research/TCS/pressure/get_pressure.sh
+++ b/research/TCS/pressure/get_pressure.sh
@@ -7,7 +7,9 @@ process_digits=/home/sam/Documents/University/honours/research/TCS/pressure/proc
 
 mkdir -p $imgdir 2>/dev/null
 name=$(date +%F-%H%M%S.jpg)
-fswebcam --device /dev/video1 -r 640x480 --jpeg 85 $imgdir/$name 2>/dev/null
+fswebcam --device /dev/video0 -r 640x480 --jpeg 85 $imgdir/$name 2>/dev/null # NOTE: Need to make sure we use the right /dev/videoX
+										# Otherwise images may come from the laptop's shitty inbuilt webcam
+
 $get_digits $imgdir/$name $imgdir/$name 2>/dev/null
 
 if [ "$1" != "" ]; then
@@ -16,9 +18,15 @@ fi
 
 out=$($process_digits $imgdir/$name)
 
+count=0
 while [ "$out" == "?" ]; do
 	sleep 1
 	out=$($process_digits $imgdir/$name)
+	count=$(( $count + 1 ))
+	if [ "$count" == "5" ]; then
+		echo "#?"
+		exit 0
+	fi
 done
 rm -f $imgdir/$name
 echo $out