Remove dead (camera aiming) code.

3 files changed, 1 insertions, 20 deletions

diff --git a/src/org/usfirst/frc/team4272/robot2017/Control.java b/src/org/usfirst/frc/team4272/robot2017/Control.java
index 791cc65..c8561c0 100644
--- a/src/org/usfirst/frc/team4272/robot2017/Control.java
+++ b/src/org/usfirst/frc/team4272/robot2017/Control.java
@@ -4,8 +4,6 @@ package org.usfirst.frc.team4272.robot2017;
 public class Control {
 	double lDrive = 0,
 	       rDrive = 0,
-	       camRotate = 0,
-	       camTilt = 0,
 	       climber = 0;
 	boolean highGear = false,
 		gedOut = false;
diff --git a/src/org/usfirst/frc/team4272/robot2017/HwRobot.java b/src/org/usfirst/frc/team4272/robot2017/HwRobot.java
index 23d98b3..7752bd8 100644
--- a/src/org/usfirst/frc/team4272/robot2017/HwRobot.java
+++ b/src/org/usfirst/frc/team4272/robot2017/HwRobot.java
@@ -68,9 +68,7 @@ public class HwRobot {
 	private final PIDOutput
 	    rDriveM = new Talon(/*PWM*/0), /* PDP 2, 3 */
 	    lDriveM = new Talon(/*PWM*/1), /* PDP 12, 13 */
-	    climber = new Talon(/*PWM*/3), /* PDP 4 */
-	    camRotate = new PIDServo(8),
-	    camTilt = new PIDServo(9);
+	    climber = new Talon(/*PWM*/3); /* PDP 4 */
 	public final Encoder   lDriveE = new Encoder(/*DIO*/0,/*DIO*/1, /*reverse*/false);
 	public final Encoder   rDriveE = new Encoder(/*DIO*/2,/*DIO*/3, /*reverse*/true);
 	public final PIDSource lRate, rRate;
@@ -102,8 +100,6 @@ public class HwRobot {
 		lDriveM.pidWrite(c.lDrive);
 		rDriveM.pidWrite(-c.rDrive);
 		climber.pidWrite(c.climber);
-		camRotate.pidWrite(c.camRotate);
-		camTilt.pidWrite(c.camTilt);
 
 		shifter.set(c.highGear ? DoubleSolenoid.Value.kReverse : DoubleSolenoid.Value.kForward);
 		ged.set(c.gedOut ? DoubleSolenoid.Value.kReverse : DoubleSolenoid.Value.kForward);
diff --git a/src/org/usfirst/frc/team4272/robot2017/Teleop.java b/src/org/usfirst/frc/team4272/robot2017/Teleop.java
index 0b9d11f..48c1c54 100644
--- a/src/org/usfirst/frc/team4272/robot2017/Teleop.java
+++ b/src/org/usfirst/frc/team4272/robot2017/Teleop.java
@@ -111,19 +111,6 @@ public class Teleop {
 		/* 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) {
-			control.camRotate = -1;
-		} else {
-			control.camRotate = 0;
-		}
-		control.camTilt = oi.xbox.getX(Hand.kRight);
-		*/
 		return control;
 	}
 }