Skip to content
This repository was archived by the owner on Jan 10, 2025. It is now read-only.

Commit e5b4de2

Browse files
committed
Applied new queuer idle state in robot manager
1 parent 6a81d81 commit e5b4de2

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/main/java/frc/robot/queuer/QueuerSubsystem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class QueuerSubsystem extends StateMachine<QueuerState> {
1616
private final Debouncer debouncer = RobotConfig.get().queuer().debouncer();
1717

1818
public QueuerSubsystem(TalonFX motor, DigitalInput sensor) {
19-
super(SubsystemPriority.QUEUER, QueuerState.IDLE_NO_GP);
19+
super(SubsystemPriority.QUEUER, queuer.setState(QueuerState.IDLE));
2020

2121
this.sensor = sensor;
2222
this.motor = motor;

src/main/java/frc/robot/robot_manager/RobotManager.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ protected void afterTransition(RobotState newState) {
8787
arm.setState(ArmState.SUBWOOFER_SHOT);
8888
shooter.setState(ShooterState.SUBWOOFER_SHOT);
8989
intake.setState(IntakeState.IDLE);
90-
queuer.setState(QueuerState.IDLE_WITH_GP);
90+
queuer.setState(QueuerState.IDLE);
9191
}
9292
case SUBWOOFER_SCORING -> {
9393
arm.setState(ArmState.SUBWOOFER_SHOT);
@@ -99,7 +99,7 @@ protected void afterTransition(RobotState newState) {
9999
arm.setState(ArmState.SPEAKER_SHOT);
100100
shooter.setState(ShooterState.SPEAKER_SHOT);
101101
intake.setState(IntakeState.IDLE);
102-
queuer.setState(QueuerState.IDLE_WITH_GP);
102+
queuer.setState(QueuerState.IDLE);
103103
}
104104
case SPEAKER_SCORING -> {
105105
arm.setState(ArmState.SPEAKER_SHOT);
@@ -111,7 +111,7 @@ protected void afterTransition(RobotState newState) {
111111
arm.setState(ArmState.AMP);
112112
shooter.setState(ShooterState.AMP);
113113
intake.setState(IntakeState.IDLE);
114-
queuer.setState(QueuerState.IDLE_WITH_GP);
114+
queuer.setState(QueuerState.IDLE);
115115
}
116116
case AMP_SCORING -> {
117117
arm.setState(ArmState.AMP);
@@ -123,7 +123,7 @@ protected void afterTransition(RobotState newState) {
123123
arm.setState(ArmState.FEEDING);
124124
shooter.setState(ShooterState.FEEDING);
125125
intake.setState(IntakeState.IDLE);
126-
queuer.setState(QueuerState.IDLE_WITH_GP);
126+
queuer.setState(QueuerState.IDLE);
127127
}
128128
case FEEDING_SHOOTING -> {
129129
arm.setState(ArmState.FEEDING);
@@ -135,7 +135,7 @@ protected void afterTransition(RobotState newState) {
135135
arm.setState(ArmState.PASS);
136136
shooter.setState(ShooterState.PASS);
137137
intake.setState(IntakeState.IDLE);
138-
queuer.setState(QueuerState.IDLE_WITH_GP);
138+
queuer.setState(QueuerState.IDLE);
139139
}
140140
case PASS_SHOOTING -> {
141141
arm.setState(ArmState.PASS);
@@ -165,25 +165,25 @@ protected void afterTransition(RobotState newState) {
165165
arm.setState(ArmState.CLIMBING_1_LINEUP);
166166
shooter.setState(ShooterState.IDLE_STOPPED);
167167
intake.setState(IntakeState.IDLE);
168-
queuer.setState(QueuerState.IDLE_NO_GP);
168+
queuer.setState(queuer.setState(QueuerState.IDLE));
169169
}
170170
case CLIMBING_2_HANGING -> {
171171
arm.setState(ArmState.CLIMBING_2_HANGING);
172172
shooter.setState(ShooterState.IDLE_STOPPED);
173173
intake.setState(IntakeState.IDLE);
174-
queuer.setState(QueuerState.IDLE_NO_GP);
174+
queuer.setState(queuer.setState(QueuerState.IDLE));
175175
}
176176
case IDLE_NO_GP -> {
177177
arm.setState(ArmState.IDLE);
178178
shooter.setState(ShooterState.IDLE_STOPPED);
179179
intake.setState(IntakeState.IDLE);
180-
queuer.setState(QueuerState.IDLE_NO_GP);
180+
queuer.setState(queuer.setState(QueuerState.IDLE));
181181
}
182182
case IDLE_WITH_GP -> {
183183
arm.setState(ArmState.IDLE);
184184
shooter.setState(ShooterState.IDLE_WARMUP);
185185
intake.setState(IntakeState.IDLE);
186-
queuer.setState(QueuerState.IDLE_WITH_GP);
186+
queuer.setState(QueuerState.IDLE);
187187
}
188188
}
189189
}

0 commit comments

Comments
 (0)