Before q77

Team841 · Nov 10, 2024 · b0557ec · b0557ec
1 parent a1b4567
commit b0557ec
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/src/main/java/com/team841/calliope/RobotContainer.java b/src/main/java/com/team841/calliope/RobotContainer.java
@@ -138,7 +138,9 @@ public RobotContainer() {
                 () -> -sticksPS5[0].getLeftY() * Swerve.MaxSpeed,
                 () -> -sticksPS5[0].getLeftX() * Swerve.MaxSpeed,
                 () -> -sticksPS5[0].getRightX() * Swerve.MaxAngularRate,
-                () -> sticksPS5[0].L2().getAsBoolean());
+                () -> sticksPS5[0].L2().getAsBoolean(),
+                () -> sticksXbox[0].rightBumper().getAsBoolean(),
+                () -> -sticksXbox[0].getRightX() * 2 * Math.PI);
 
 
 
@@ -285,7 +287,7 @@ private void configureDuoStick() {
                                 () -> shooter.isShooting()))
                 .onFalse(new InstantCommand(indexer::stopIndexer));
         sticksXbox[0]
-                .rightBumper()
+                .start()
                 .onTrue(
                         new SequentialCommandGroup(
                                 new InstantCommand(indexer::stopIndexer),

diff --git a/src/main/java/com/team841/calliope/drive/BioDrive.java b/src/main/java/com/team841/calliope/drive/BioDrive.java
@@ -24,6 +24,15 @@ public class BioDrive extends Command {
 
      */
 
+    public BioDrive(Drivetrain drivetrain, DoubleSupplier velocityXGetter, DoubleSupplier velocityYGetter, DoubleSupplier velocityOmegaGetter, BooleanSupplier faceSpeakerGetter, BooleanSupplier overRideTurn, DoubleSupplier overrideVelocity) {
+
+        this(drivetrain, velocityXGetter, velocityYGetter, velocityOmegaGetter, faceSpeakerGetter);
+
+        this.Override = overRideTurn;
+        this.vOverride = overrideVelocity;
+
+    }
+
 
     public BioDrive(Drivetrain drivetrain, DoubleSupplier velocityXGetter, DoubleSupplier velocityYGetter, DoubleSupplier velocityOmegaGetter, BooleanSupplier faceSpeakerGetter) {
 
@@ -46,14 +55,16 @@ public BioDrive(Drivetrain drivetrain, DoubleSupplier velocityXGetter, DoubleSup
 
     private Command shootCommand;
 
-    private DoubleSupplier mVelocityX, mVelocityY, mVelocityOmega;
-    private BooleanSupplier mFaceSpeaker, mAutoShoot;
+    private DoubleSupplier mVelocityX, mVelocityY, mVelocityOmega, vOverride;
+    private BooleanSupplier mFaceSpeaker, mAutoShoot, Override;
 
     private boolean faceSpeaker = false;
     private double velocity_y = 0.0;
     private double velocity_x = 0.0;
     private double velocity_omega = 0.0;
     private boolean autoShoot = false;
+    private boolean overRide = false;
+    private double overrideVelocity = 0.0;
 
     private Drivetrain drivetrain;
 
@@ -81,6 +92,8 @@ public void execute() {
         this.velocity_y = mVelocityY.getAsDouble();
         this.velocity_omega = mVelocityOmega.getAsDouble();
         //this.autoShoot = mAutoShoot.getAsBoolean();
+        this.overRide = Override.getAsBoolean();
+        this.overrideVelocity = vOverride.getAsDouble();
 
         Logger.recordOutput("BioDrive/FaceSpeaker", this.faceSpeaker);
         Logger.recordOutput("BioDrive/velocityX", this.velocity_x);
@@ -97,6 +110,8 @@ public void execute() {
             this.drivetrain.setControl(fieldCentricFacingAngle.withVelocityX(-this.velocity_x).withVelocityY(-this.velocity_y).withTargetDirection(angle));
 
              */
+        } else if (overRide) {
+            this.drivetrain.setControl(fieldCentricDrive.withVelocityX(-this.velocity_x).withVelocityY(-this.velocity_y).withRotationalRate(this.overrideVelocity));
         } else {
             this.drivetrain.setControl(fieldCentricDrive.withVelocityX(-this.velocity_x).withVelocityY(-this.velocity_y).withRotationalRate(this.velocity_omega));
         }