Skip to content

Commit 8735741

Browse files
committed
uncomment elevator (untested)
1 parent a87b6e6 commit 8735741

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

src/main/java/frc/robot/commands/auton/DriveAutonServoCommand.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public void initialize() {
169169
public void execute() {
170170
if (elevatorSubsystem.getState() == ElevatorStates.ZEROED && !hasStaged) {
171171
hasStaged = true;
172-
// robotStateSubsystem.toAutonPrestage();
172+
robotStateSubsystem.toAutonPrestage();
173173
}
174174
if (isTherePath) {
175175
if (!isServoing) {
@@ -178,7 +178,7 @@ public void execute() {
178178

179179
if (shouldTransitionToServoing()) {
180180
isServoing = true;
181-
// robotStateSubsystem.toPrepCoral();
181+
robotStateSubsystem.toPrepCoral();
182182
tagAlignSubsystem.startAuto(
183183
mirrorTrajectory ? Alliance.Red : Alliance.Blue,
184184
mirrorToProcessor ? !scoreLeft : scoreLeft,
@@ -201,8 +201,8 @@ public boolean isFinished() {
201201
return true;
202202
}
203203
return ((timer.hasElapsed(trajectory.getTotalTime() + AutonConstants.kAutoTimeout)
204-
|| tagAlignSubsystem.getState() == TagAlignStates.DONE && isServoing))
205-
/* && elevatorSubsystem.isFinished()*/ ;
204+
|| tagAlignSubsystem.getState() == TagAlignStates.DONE && isServoing))
205+
&& elevatorSubsystem.isFinished();
206206
// || (FastMath.sqrt(
207207
// FastMath.pow(driveSubsystem.getPoseMeters().getX() - finalPose.getX(), 2)
208208
// + FastMath.pow(

src/main/java/frc/robot/commands/auton/ProcessorShallowAutonCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public ProcessorShallowAutonCommand(
7070
new SequentialCommandGroup(
7171
new SetGyroOffsetCommand(driveSubsystem, Rotation2d.fromDegrees(180)),
7272
startPath,
73-
// new PlaceCoralAutonCommand(robotStateSubsystem, coralSubsystem)
73+
new PlaceCoralAutonCommand(robotStateSubsystem, coralSubsystem),
7474

7575
// new ParallelCommandGroup(
7676
// new ZeroElevatorCommand(elevatorSubsystem),

src/main/java/frc/robot/subsystems/pathHandler/PathHandler.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ private void drivePath() {
211211
false);
212212
driveSubsystem.setAutoDebugMsg("Servo Start");
213213
curState = PathStates.DRIVE_PLACE_SERVO;
214-
// robotStateSubsystem.toPrepCoral();
214+
robotStateSubsystem.toPrepCoral();
215215
isServoing = true;
216216
}
217217
}
@@ -225,7 +225,7 @@ private void drivePathServo() {
225225
runningPath = false;
226226
pathTimer.stop();
227227
pathTimer.reset();
228-
// robotStateSubsystem.toPlaceCoralAuto();
228+
robotStateSubsystem.toPlaceCoralAuto();
229229
curState = PathStates.PLACE;
230230
driveSubsystem.stopDriving();
231231
waitingTimer.start();
@@ -381,13 +381,12 @@ public void periodic() {
381381
}
382382
}
383383
case PLACE -> {
384-
curState = PathStates.DRIVE_FETCH;
385-
// if (!robotStateSubsystem.hasCoral()) {
386-
// // waitingTimer.hasElapsed(PathHandlerConstants.kWaitingTime)
387-
// // proceedToNext) {
388-
// // robotStateSubsystem.toFunnelLoad();
389-
// curState = PathStates.DRIVE_FETCH;
390-
// }
384+
if (!robotStateSubsystem.hasCoral()) {
385+
// waitingTimer.hasElapsed(PathHandlerConstants.kWaitingTime)
386+
// proceedToNext) {
387+
robotStateSubsystem.toFunnelLoad();
388+
curState = PathStates.DRIVE_FETCH;
389+
}
391390
}
392391
case DONE -> isHandling = false;
393392
default -> {}

0 commit comments

Comments
 (0)