yes this is the most updated

This commit is contained in:
aarav18
2022-03-24 16:58:29 -06:00
parent 58125a62de
commit 306901b451
4 changed files with 30 additions and 21 deletions
+3 -3
View File
@@ -44,7 +44,7 @@ public class Robot extends TimedRobot {
private RobotTime m_robotTime = RobotTime.getInstance(); private RobotTime m_robotTime = RobotTime.getInstance();
private RobotContainer m_robotContainer; private RobotContainer m_robotContainer;
private SendableChooser<Command> autoChooser = new SendableChooser<Command>(); // private SendableChooser<Command> autoChooser = new SendableChooser<Command>();
// private double current; // private double current;
@@ -124,7 +124,7 @@ public class Robot extends TimedRobot {
}); });
// desmosServer.start(); // desmosServer.start();
m_robotContainer.m_robotVisionOdometry.setLEDs(false); m_robotContainer.m_robotVisionOdometry.setLEDs(true);
// DesmosServer.putTable("table", "x1", new double[] {44}, "y1", new double[] {0}); // DesmosServer.putTable("table", "x1", new double[] {44}, "y1", new double[] {0});
} }
@@ -186,7 +186,7 @@ public class Robot extends TimedRobot {
LOGGER.log(Level.SEVERE, "Unable to record path to {0}", outputFile.getPath()); LOGGER.log(Level.SEVERE, "Unable to record path to {0}", outputFile.getPath());
} }
m_robotContainer.m_robotVisionOdometry.setLEDs(false); m_robotContainer.m_robotVisionOdometry.setLEDs(true);
} }
@Override @Override
+25 -15
View File
@@ -103,8 +103,7 @@ public class RobotContainer {
private enum ClimberMode { MANUAL, AUTONOMOUS }; private enum ClimberMode { MANUAL, AUTONOMOUS };
private ClimberMode currentClimberMode = ClimberMode.MANUAL; private ClimberMode currentClimberMode = ClimberMode.MANUAL;
private Map<String, SequentialCommandGroup> autoChoices; private SendableChooser<SequentialCommandGroup> quickAutoChooser = new SendableChooser<>();
private SendableChooser<String> quickAutoChooser = new SendableChooser<>();
/** /**
* SmartDash * SmartDash
@@ -130,8 +129,6 @@ public class RobotContainer {
*/ */
public RobotContainer() { public RobotContainer() {
double turretDistanceFromFront = 10.0; // * distance of turret from the front of the robot in inches. might need to be somewhat accurate. double turretDistanceFromFront = 10.0; // * distance of turret from the front of the robot in inches. might need to be somewhat accurate.
double distancePerSecond = 134.0; // * assuming emulated joystick input magnitude is 1.0 double distancePerSecond = 134.0; // * assuming emulated joystick input magnitude is 1.0
@@ -200,14 +197,12 @@ public class RobotContainer {
))); )));
autoChoices = Map.of( quickAutoChooser.setDefaultOption("justShoot", justShoot);
"justShoot", justShoot, quickAutoChooser.addOption("offTheLine", offTheLine);
"offTheLine", offTheLine, quickAutoChooser.addOption("twoBall", twoBall);
"twoBall", twoBall, quickAutoChooser.addOption("threeBall", threeBall);
"threeBall", threeBall
);
SmartDashboard.putData(quickAutoChooser); SmartDashboard.putData("__QUICK AUTO CHOOSE__", quickAutoChooser);
@@ -466,10 +461,25 @@ public class RobotContainer {
// ! 0.75 input, 1 second: 48 inches // ! 0.75 input, 1 second: 48 inches
// ? positive leftY went left, negative leftY went right? // ? positive leftY went left, negative leftY went right?
// TODO: if line 372 is true, switch joystick inputs accordingly // TODO: if line 372 is true, switch joystick inputs accordingly
String selection = quickAutoChooser.getSelected();
if (selection == null) return Objects.requireNonNullElseGet(quickAutoChooser.getSelected(), () -> new PrintCommand("---------- NO AUTO SELECTED --------------"));
return new PrintCommand("---------- NO AUTO SELECTED --------------");
return autoChoices.get(quickAutoChooser.getSelected()); // double turretDistanceFromFront = 10.0; // * distance of turret from the front of the robot in inches. might need to be somewhat accurate.
// double distancePerSecond = 134.0; // * assuming emulated joystick input magnitude is 1.0
// double offset = 10.0; // * distance (in inches) from ball that we actually want to stop
// Vector2D firstBallPosition = new Vector2D(15.56 - (82.83 / 2.00), 11.21 - 162.00); // * position of first ball, relative to hub.
// Vector2D secondBallPosition = new Vector2D(-(40.44 * (Math.sqrt(2.00) / 2.00)) - ((82.83 - 7.58) * (Math.sqrt(2.00) / 2.00)) - (82.83 / 2.00), -(40.44 * (Math.sqrt(2.00) / 2.00)) + ((82.83 - 7.58) * (Math.sqrt(2.00) / 2.00)) - (219.25 / 2.00)); // * position of second ball, relative to hub.
// Vector2D firstToSecond = Vector2D.subtract(secondBallPosition, firstBallPosition); // * vector from first ball to second ball, used to calculate emulated joystick inputs.
// return new SequentialCommandGroup( new RunCommandForTime(new RunCommand(() -> m_robotTurret.runShooterRotatePID(-Math.atan2((219.25 / 2.00) - turretDistanceFromFront, (82.83 / 2.00) - 15.56)), m_robotTurret), 1.0, true), // * aim with turret to target
// makeTheWeirdGroup(), // * shoot
// new InstantCommand(() -> m_robotStorage.runStorage(0.0), m_robotStorage), // * stop running storage
// new SequentialCommandGroup( new InstantCommand(() -> m_robotSwerveDrive.resetGyro(), m_robotSwerveDrive), // * reset gyro before moving
// new DriveWithInputForTime(m_robotSwerveDrive, new double[] {0.0, 1.0, 0.0, 0.0}, 0.25))); // * drive off line
} }
@@ -111,7 +111,7 @@ public class TrackTarget extends CommandBase {
double regressedDistance = getDistance(average.y); double regressedDistance = getDistance(average.y);
// ! no longer a +30 lol -aarav // ! no longer a +30 lol -aarav
double distAdj = SmartDashboard.getNumber("Distance Adjust", 20); double distAdj = SmartDashboard.getNumber("Distance Adjust", -35);
velocity = m_boomBoom.getVelocity(regressedDistance + distAdj); velocity = m_boomBoom.getVelocity(regressedDistance + distAdj);
hoodPosition = m_boomBoom.getHood(regressedDistance + distAdj); hoodPosition = m_boomBoom.getHood(regressedDistance + distAdj);
@@ -190,7 +190,6 @@ public class TrackTarget extends CommandBase {
@Override @Override
public void end(boolean interrupted) { public void end(boolean interrupted) {
m_visionOdometry.setLEDs(false); m_visionOdometry.setLEDs(false);
m_visionOdometry.setDriverMode(true);
} }
// Returns true when the command should end. // Returns true when the command should end.
@@ -49,7 +49,7 @@ public class VisionOdometry extends SubsystemBase {
m_shooter = shooter; m_shooter = shooter;
setLEDs(false); setLEDs(false);
setDriverMode(true); setDriverMode(false);
} }
/** Gets the vision points from the limelight /** Gets the vision points from the limelight