add claw toggle and winch tensioning

[3501/3501-spark-go] / src / org / usfirst / frc / team3501 / robot / OI.java

diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java
index d6344b77755b6bce6dce38f54d3b44462bb45c93..f573281d6b4a7bb86328cfec799991cfa8826734 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -3,7 +3,7 @@ package org.usfirst.frc.team3501.robot;
 import org.usfirst.frc.team3501.robot.commands.*;
 
 public class OI {
-    public Joystick left, right;
+    private Joystick left, right;
 
     public OI() {
         left  = new Joystick(RobotMap.LEFT_JOYSTICK_PORT);
@@ -11,13 +11,33 @@ public class OI {
 
         right.whenPressed(1, new CloseClaw());
         right.whenReleased(1, new OpenClaw());
+
+        right.whenPressed(2, new ToggleClaw());
+
+        right.whenPressed(11, new TurnOffCompressor());
+        right.whenPressed(12, new TurnOffCompressor());
+
+        right.whenPressed(7, new TurnOnCompressor());
+        right.whenPressed(8, new TurnOnCompressor());
+
+        // potential bug point: this should "Just Work" because as soon as
+        // command stops running, left stick pos at 0 should take over...
+        // if that is not the case, arm will continue indefinitely.
+        left.whileHeld(7,  new TensionLeftWinch(RobotMap.ARM_ADJUST_SPEED));
+        left.whileHeld(6,  new TensionLeftWinch(-RobotMap.ARM_ADJUST_SPEED));
+        left.whileHeld(11, new TensionRightWinch(RobotMap.ARM_ADJUST_SPEED));
+        left.whileHeld(10, new TensionRightWinch(-RobotMap.ARM_ADJUST_SPEED));
+    }
+
+    public double getForwardL() {
+        return left.getY();
     }
 
-    public double getForwardSpeed() {
+    public double getForwardR() {
         return right.getY();
     }
 
-    public double getTwistSpeed() {
+    public double getTwistR() {
         return right.getTwist();
     }
 }