Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/tgc3

master
Michael Murtaugh 8 years ago
commit f2542fc264

@ -52,8 +52,8 @@ try:
frame = frame.array frame = frame.array
gray = cv2.cvtColor(frame, cv2.COLOR_BGR2GRAY) gray = cv2.cvtColor(frame, cv2.COLOR_BGR2GRAY)
ret, t= cv2.threshold(gray, 127, 255, cv2.THRESH_BINARY) # ret, t= cv2.threshold(gray, 127, 255, cv2.THRESH_BINARY)
frame = cv2.cvtColor(t, cv2.COLOR_GRAY2BGR) frame = cv2.cvtColor(gray, cv2.COLOR_GRAY2BGR)
# flow = cv2.calcOpticalFlowFarneback(prevgray, gray, 0.5, 3, 15, 3, 5, 1.2, 0) # flow = cv2.calcOpticalFlowFarneback(prevgray, gray, 0.5, 3, 15, 3, 5, 1.2, 0)
# prevgray = gray # prevgray = gray

@ -16,7 +16,7 @@ sleep 1
espeak "Position yourself 2 to 3 meters away from me." -v en-gb -s 150 espeak "Position yourself 2 to 3 meters away from me." -v en-gb -s 150
sleep 2 sleep 2
espeak "Walk towards me in a straight line ." -v en-gb -s 150 espeak "Walk towards me in a straight line after the bip ." -v en-gb -s 150
sleep 0.1 sleep 0.1
mpv sweep_up.wav mpv sweep_up.wav

Loading…
Cancel
Save