diff --git a/src/main/deploy/Robot Data - Distances.csv b/src/main/deploy/Robot Data - Distances.csv index a5df015..95b07ff 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.3,12000,1, -65.9,16.3,12000,1, -103,19.3,12000,1, -126.6,20.58,12000,1.5, -156.6,28.3,12000,1.5, -174,28.3,12000,1.5, -178,28.3,12000,1.3 -180,28.8,12000,1.3, -185.85,28.8,12000,1.3, -187,28.8,12000,1.3 -200,28.8,12000,1.3 -231,28.7,12000,1.8, -245,29.1,12000,1.8, -262,29.1,12000,1.8, -999,29.1,12000,1.8, \ No newline at end of file +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.5,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 diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java index 104b9cd..d27cacd 100644 --- a/src/main/java/frc4388/robot/RobotContainer.java +++ b/src/main/java/frc4388/robot/RobotContainer.java @@ -315,6 +315,11 @@ public class RobotContainer { //.whenReleased(new ManageStorage(m_robotStorage, StorageMode.RESET)) .whenReleased(new InstantCommand(() -> m_robotLime.limeOff())); + // new JoystickButton(getOperatorJoystick(), XboxController.LEFT_RIGHT_DPAD_AXIS) + // .whileHeld(new ShootPrepGroup(m_robotShooter, m_robotShooterAim, m_robotShooterHood, m_robotStorage), false) + // //.whenReleased(new ManageStorage(m_robotStorage, StorageMode.RESET)) + // .whenReleased(new InstantCommand(() -> m_robotLime.limeOff())); + //Run drum @@ -476,7 +481,7 @@ public class RobotContainer { }; m_fiveBallBottom = new FiveBallBottom(m_robotShooterHood, m_robotStorage, m_robotIntake, m_robotShooter, m_robotShooterAim, m_robotDrive, buildPaths(fiveBallBottomPaths)); */ - /* + String[] offTheLinePaths = new String[]{ "getOffLine1" }; diff --git a/src/main/java/frc4388/robot/commands/climber/RunLevelerWithJoystick.java b/src/main/java/frc4388/robot/commands/climber/RunLevelerWithJoystick.java index 2052ef4..6307910 100644 --- a/src/main/java/frc4388/robot/commands/climber/RunLevelerWithJoystick.java +++ b/src/main/java/frc4388/robot/commands/climber/RunLevelerWithJoystick.java @@ -36,8 +36,15 @@ public class RunLevelerWithJoystick extends CommandBase { // Called every time the scheduler runs while the command is scheduled. @Override public void execute() { - double input = m_controller.getRightXAxis(); - m_leveler.runLeveler(input); + double input = m_controller.getDpadAngle(); + if (input == 90) + { + m_leveler.runLeveler(0.5); + } + else if (input == 270) + { + m_leveler.runLeveler(-0.5); + } } // Called once the command ends or is interrupted.