16750 Horizontal slides testing - what is currently on the bot - Maggie

technototes · Nov 3, 2024 · 7637a7b · 7637a7b
1 parent 83f2608
commit 7637a7b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/.../main/java/org/firstinspires/ftc/sixteen750/commands/slides/HorizontalSlidesCommands.java b/.../main/java/org/firstinspires/ftc/sixteen750/commands/slides/HorizontalSlidesCommands.java
@@ -44,7 +44,7 @@ public static SequentialCommandGroup transferring(Robot r) {
                 r.horizontalSlidesSubsystem::ClawWristServoTransfer,
                 r.horizontalSlidesSubsystem
             ),
-            Command.create(r.horizontalSlidesSubsystem::slidesin, r.horizontalSlidesSubsystem)
+            horizontalRetract(r)
             // commands for vertical slide bucket transfer position first, then wrist transferring
         );
     }
@@ -76,7 +76,7 @@ public static SequentialCommandGroup intake(Robot r) {
                 r.horizontalSlidesSubsystem::ClawWristServoTransfer,
                 r.horizontalSlidesSubsystem
             ),
-            Command.create(r.horizontalSlidesSubsystem::slidesout, r.horizontalSlidesSubsystem),
+            horizontalExtend(r),
             new WaitCommand(1),
             Command.create(
                 r.horizontalSlidesSubsystem::ClawWristServoPickup,

diff --git a/Sixteen750/src/main/java/org/firstinspires/ftc/sixteen750/controls/OperatorController.java b/Sixteen750/src/main/java/org/firstinspires/ftc/sixteen750/controls/OperatorController.java
@@ -32,12 +32,12 @@ public OperatorController(CommandGamepad g, Robot r) {
     }
 
     private void AssignNamedControllerButton() {
-        openClaw = gamepad.rightBumper;
-        closeClaw = gamepad.leftBumper;
-        //wristTransfer = gamepad.ps_triangle;
-        //wristPickup = gamepad.ps_square;
-        //wristIncrement = gamepad.dpadRight;
-        //wristDecrement = gamepad.dpadLeft;
+        openClaw = gamepad.leftBumper;
+        closeClaw = gamepad.rightBumper;
+        wristTransfer = gamepad.ps_circle;
+        wristPickup = gamepad.ps_square;
+        wristIncrement = gamepad.dpadRight;
+        wristDecrement = gamepad.dpadLeft;
         horislidesLeftStick = gamepad.leftStick;
         horislidesExtend = gamepad.ps_triangle;
         horislidesRetract = gamepad.ps_cross;
@@ -47,17 +47,17 @@ private void BindButtons() {
         // Remember to only bind buttons for attached subsystems
         if (Setup.Connected.HORIZONTALSLIDESUBSYSTEM) {
             bindHorizontalSlidesControls();
-            //bindHorizontalAnalogControls(); // not yet tested
+            bindHorizontalAnalogControls();
         }
     }
 
     private void bindHorizontalSlidesControls() {
         openClaw.whenPressed(HorizontalSlidesCommands.clawOpen(robot));
         closeClaw.whenPressed(HorizontalSlidesCommands.clawChomp(robot));
-        //wristPickup.whenPressed(HorizontalSlidesCommands.wristPickup(robot));
-        //wristTransfer.whenPressed(HorizontalSlidesCommands.wristTransfer(robot));
-        //wristIncrement.whenPressed(HorizontalSlidesCommands.wristIncrement(robot));
-        //wristDecrement.whenPressed(HorizontalSlidesCommands.wristDecrement(robot));
+        wristPickup.whenPressed(HorizontalSlidesCommands.wristPickup(robot));
+        wristTransfer.whenPressed(HorizontalSlidesCommands.wristTransfer(robot));
+        wristIncrement.whenPressed(HorizontalSlidesCommands.wristIncrement(robot));
+        wristDecrement.whenPressed(HorizontalSlidesCommands.wristDecrement(robot));
         horislidesExtend.whenPressed(HorizontalSlidesCommands.intake(robot));
         horislidesRetract.whenPressed(HorizontalSlidesCommands.transferring(robot));
     }

diff --git a/.../src/main/java/org/firstinspires/ftc/sixteen750/subsystems/HorizontalSlidesSubsystem.java b/.../src/main/java/org/firstinspires/ftc/sixteen750/subsystems/HorizontalSlidesSubsystem.java
@@ -30,7 +30,7 @@ public class HorizontalSlidesSubsystem implements Subsystem, Loggable {
     public static double ClawServoOpen = 0.8;
     public static double WristServoTransfer = 0.3;
     public static double WristServoPickup = 1;
-    public static double WristServoIncrement = 0.555;
+    public static double WristServoIncrement = 0.2;
 
     @Log(name = "wristTarget")
     public double wristTargetPos;