diff --git a/src/main/deploy/Robot Data - Distances.csv b/src/main/deploy/Robot Data - Distances.csv index 7f63722..5dcc108 100644 --- a/src/main/deploy/Robot Data - Distances.csv +++ b/src/main/deploy/Robot Data - Distances.csv @@ -1,16 +1,16 @@ Distance (in),Hood Ext. (u),Drum Velocity (u/ds),Center Displacment (deg) -0,16,12000,1, -65.9,16,12000,1, -103,19,12000,1, -126.6,20.28,12000,1.5, -156.6,28,12000,1.5, -174,28,12000,1.5, -178,28,12000,1.3 -180,28.5,12000,1.3, -185.85,28.5,12000,1.3, -187,28.5,12000,1.3 -200,28.4,12000,1.3 -231,28.4,12000,1.8, -245,28.8,12000,1.8, -262,28.8,12000,1.8, -999,28.8,12000,1.8, \ No newline at end of file +0,17,12000,1, +65.9,17,12000,1, +103,20,12000,1, +126.6,21.28,12000,1.5, +156.6,29,12000,1.5, +174,29,12000,1.5, +178,29,12000,1.3 +180,29.5,12000,1.3, +185.85,29.5,12000,1.3, +187,29.5,12000,1.3 +200,29.4,12000,1.3 +231,29.4,12000,1.8, +245,29.8,12000,1.8, +262,29.8,12000,1.8, +999,29.8,12000,1.8, \ No newline at end of file diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java index 0d07609..60ab631 100644 --- a/src/main/java/frc4388/robot/RobotContainer.java +++ b/src/main/java/frc4388/robot/RobotContainer.java @@ -518,7 +518,7 @@ public class RobotContainer { //At Home Challenges Autos //return m_slalom.andThen(()-> m_robotDrive.tankDriveVelocity(0, 0)); - return m_barrel.andThen(()-> m_robotDrive.tankDriveVelocity(0, 0)); + //return m_barrel.andThen(()-> m_robotDrive.tankDriveVelocity(0, 0)); //return m_barrelStart.andThen(()-> m_robotDrive.tankDriveVelocity(0, 0)); //return m_sequentialTest.andThen(() -> m_robotDrive.tankDriveVelocity(0,0)); //return m_galacticSearch.andThen(() -> m_robotDrive.tankDriveVelocity(0,0)); @@ -527,7 +527,7 @@ public class RobotContainer { //return m_sixBallTop.andThen(() -> m_robotDrive.tankDriveVelocity(0,0)); //return m_eightBallMid.andThen(() -> m_robotDrive.tankDriveVelocity(0,0)); //return m_fiveBallBottom.andThen(() -> m_robotDrive.tankDriveVelocity(0,0)); - //return m_offTheLine.andThen(() -> m_robotDrive.tankDriveVelocity(0,0)); + return m_offTheLine.andThen(() -> m_robotDrive.tankDriveVelocity(0,0)); /* diff --git a/src/main/java/frc4388/robot/commands/auto/OffTheLine.java b/src/main/java/frc4388/robot/commands/auto/OffTheLine.java index e3f5da4..04d04f5 100644 --- a/src/main/java/frc4388/robot/commands/auto/OffTheLine.java +++ b/src/main/java/frc4388/robot/commands/auto/OffTheLine.java @@ -30,14 +30,16 @@ public class OffTheLine extends SequentialCommandGroup { // Add your commands in the super() call, e.g. // super(new FooCommand(), new BarCommand()); addCommands( - paths[0], + paths[0] + //Shoot??? + /* new ParallelDeadlineGroup( new Wait(drive,5), new TrackTarget(shooterAim), new RunCommand(() -> shooterHood.runAngleAdjustPID(shooterHood.addFireAngle())) - ) + )*/ ); } }