Merge pull request #90 from rh-robotics/teo-teleop-fixes

Make manual control for intake gamepad2, woops.
rh-robotics · Feb 17, 2024 · 1d06245 · 1d06245
2 parents 1213cde + a926175
commit 1d06245
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystems/HWC.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystems/HWC.java
@@ -33,7 +33,7 @@ public class HWC {
     public static double passoverDeliveryPos = 0.2;
     public static double passoverIntakePos = 0.8;
     public static double wristDeliveryPos = 0.2;
-    public static double wristIntakePos = 0.5;
+    public static double wristIntakePos = 0.6;
     // ------ Declare Motors ------ //
     public DcMotorEx leftFront, rightFront, leftRear, rightRear, rightPulley, leftPulley, intakeMotor;
     // ------ Declare Servos ------ //

diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/SingleDriverTeleOp.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/SingleDriverTeleOp.java
@@ -197,7 +197,7 @@ public void loop() {
         }
 
         // ------ (GAMEPAD 2) MANUAL Intake Controls ------ //
-        robot.intakeMotor.setPower(robot.currentGamepad1.right_stick_x);
+        robot.intakeMotor.setPower(robot.currentGamepad2.right_stick_x);
 
         // ------ Run Motors ------ //
         robot.leftFront.setPower(leftFPower);
@@ -213,13 +213,13 @@ public void loop() {
         // -------- Check Intake State & Run Intake ------ //
         switch(intakeState) {
             case INTAKE:
-                robot.intakeMotor.setPower(1);
+                robot.intakeMotor.setPower(-1);
                 break;
             case OFF:
                 robot.intakeMotor.setPower(0);
                 break;
             case OUTTAKE:
-                robot.intakeMotor.setPower(-1);
+                robot.intakeMotor.setPower(1);
                 break;
         }