Removed debugging print statement and added motor priming functionali…

…ty to the driver

TrainingDriver.py

@@ -7,8 +7,12 @@
 import socket
 import time
 import os
+import RPi.GPIO as GPIO
 import Adafruit_CharLCD as LCD
 
+motorPin = 17
+GPIO.setup(motorPin, GPIO.OUT)
+
 os.chdir('/home/pi/DomeTrainingRig/')
 
 while True:
@@ -29,7 +33,15 @@
 
 	# Wait for select to be pressed
 	while not lcd.is_pressed(LCD.SELECT):
-		pass
+		# If up is pressed
+		if lcd.is_pressed(LCD.UP):
+			while lcd.is_pressed(LCD.UP):
+				time.sleep(0.1)
+
+			# Send a 440 second pulse to prime lines
+			GPIO.output(motorPin, True)
+			time.sleep(440)
+			GPIO.output(motorPin, False)
 
 	# Wait for select to be released
 	while lcd.is_pressed(LCD.SELECT):

TrainingRig_UserInput.py

@@ -16,7 +16,6 @@
 # +- 20deg randomness
 
 import math
-import sys
 import csv
 import time
 import random
@@ -54,8 +53,6 @@
 # starts the motor and logs the event
 def buttonPress(ch):
 	try:
-		print('hi')
-		sys.stdout.flush()
 		global f, buttonFeedStart, buttonIsFeeding
 
 		# Only do stuff if we're not already pulsing
@@ -123,7 +120,7 @@ def readEncoderB(ch):
 # Attach interrupts
 GPIO.add_event_detect(encoderPinA, GPIO.BOTH, callback = readEncoderA)
 GPIO.add_event_detect(encoderPinB, GPIO.BOTH, callback = readEncoderB)
-GPIO.add_event_detect(buttonPin, GPIO.RISING, callback = buttonPress, bouncetime = 2000)
+GPIO.add_event_detect(buttonPin, GPIO.RISING, callback = buttonPress, bouncetime = 5000)
 
 # Converts encoder angle to degrees
 def toDeg(ang):
@@ -181,7 +178,7 @@ def toEnc(ang):
 lcd.show_cursor(False)
 
 # Duration of motor per feeding
-pulseDur = 2000 # ms
+pulseDur = 5000 # ms
 
 # Local base path to log folder
 logBase = 'logs/'