AnnaLaura wants the GED on the trigger.

1 files changed, 7 insertions, 9 deletions

diff --git a/src/org/usfirst/frc/team4272/robot2017/Teleop.java b/src/org/usfirst/frc/team4272/robot2017/Teleop.java
index 226ef6c..bc09f8a 100644
--- a/src/org/usfirst/frc/team4272/robot2017/Teleop.java
+++ b/src/org/usfirst/frc/team4272/robot2017/Teleop.java
@@ -117,15 +117,13 @@ public class Teleop {
 			control.climber = 0;
 		}
 
-		/* gear place */
-		if (oi.xbox.getAButton()) {
-			control.gedOut = true;
-		}
-		if (oi.xbox.getBButton()) {
-			control.gedOut = false;
-		}
-		
+		/* GED */
+		control.gedOut = oi.xbox.getTriggerAxis(Hand.kRight) > 0.5;
+
 		/* camera */
+		// AnnaLaura wants the GED on the trigger, so we'll
+		// have to find somewhere else for the camera.
+		/*
 		if (oi.xbox.getTriggerAxis(Hand.kRight) > 0) {
 			control.camRotate = 1;
 		} else if (oi.xbox.getTriggerAxis(Hand.kLeft) > 0) {
@@ -134,7 +132,7 @@ public class Teleop {
 			control.camRotate = 0;
 		}
 		control.camTilt = oi.xbox.getX(Hand.kRight);
-
+		*/
 		return control;
 	}
 }