Skip to content

Commit

Permalink
Auto stash before checking out "origin/drive-auto-testing"
Browse files Browse the repository at this point in the history
  • Loading branch information
Ronan-B committed Jan 18, 2025
1 parent 12420fc commit a19fe72
Show file tree
Hide file tree
Showing 3 changed files with 101 additions and 12 deletions.
14 changes: 7 additions & 7 deletions src/main/deploy/pathplanner/paths/DriveForward.path
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
},
"prevControl": null,
"nextControl": {
"x": 2.425937499999999,
"x": 1.6759375,
"y": 6.0
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 1.6,
"x": 4.648,
"y": 5.9878289473684205
},
"prevControl": {
"x": 2.1227384868421053,
"y": 5.99391447368421
"x": 4.398,
"y": 5.9878289473684205
},
"nextControl": null,
"isLocked": false,
Expand All @@ -33,8 +33,8 @@
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxVelocity": 5.5,
"maxAcceleration": 6.7,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
Expand All @@ -50,5 +50,5 @@
"velocity": 0,
"rotation": 0.0
},
"useDefaultConstraints": true
"useDefaultConstraints": false
}
86 changes: 86 additions & 0 deletions src/main/deploy/pathplanner/paths/New Path.path
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
{
"version": "2025.0",
"waypoints": [
{
"anchor": {
"x": 1.884630681818182,
"y": 6.921747159090909
},
"prevControl": null,
"nextControl": {
"x": 2.134630681818182,
"y": 6.921747159090909
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 4.029,
"y": 6.922
},
"prevControl": {
"x": 3.779,
"y": 6.922
},
"nextControl": {
"x": 4.279,
"y": 6.922
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 4.029,
"y": 5.645383522727273
},
"prevControl": {
"x": 3.779,
"y": 5.645383522727273
},
"nextControl": {
"x": 4.279,
"y": 5.645383522727273
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 1.884630681818182,
"y": 5.645383522727273
},
"prevControl": {
"x": 1.6346306818181817,
"y": 5.645383522727273
},
"nextControl": null,
"isLocked": false,
"linkedName": null
}
],
"rotationTargets": [],
"constraintZones": [],
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
"unlimited": false
},
"goalEndState": {
"velocity": 0,
"rotation": 0.0
},
"reversed": false,
"folder": null,
"idealStartingState": {
"velocity": 0,
"rotation": 0.0
},
"useDefaultConstraints": true
}
13 changes: 8 additions & 5 deletions src/main/java/frc/robot/RobotContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@

import com.ctre.phoenix6.SignalLogger;
import com.ctre.phoenix6.swerve.SwerveRequest;
import com.pathplanner.lib.auto.AutoBuilder;
import com.pathplanner.lib.commands.FollowPathCommand;
import com.pathplanner.lib.path.PathPlannerPath;

import edu.wpi.first.wpilibj.DriverStation;
import edu.wpi.first.wpilibj.Joystick;
import edu.wpi.first.wpilibj.smartdashboard.SendableChooser;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
Expand Down Expand Up @@ -95,10 +100,9 @@ private void initializeSubSystems() {
}

private void initAutoChooser() {
SmartDashboard.putData("Auto Chooser", m_chooser);

m_chooser.addOption("Do Nothing", new WaitCommand(0));

SmartDashboard.putData("Auto Mode", m_chooser);
m_chooser.setDefaultOption("Do Nothing", new WaitCommand(0));

m_chooser.addOption("DriveForward", new DriveForward(m_swerveDrive));
}

Expand Down Expand Up @@ -177,7 +181,6 @@ private void configureBindings() {
m_driverController.x().whileTrue(new RunAlgaeIntake(m_algaeIntake, 0.5)); // outtake
m_driverController.y().whileTrue(new RunAlgaeIntake(m_algaeIntake, -0.5)); // intake
}

/**
* Use this to pass the autonomous command to the main {@link Robot} class.
*
Expand Down

0 comments on commit a19fe72

Please sign in to comment.