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

Commit 0c8fea6

Browse files
committed
small fix and typo
1 parent acfed3e commit 0c8fea6

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public QueuerSubsystem(TalonFX motor, DigitalInput sensor) {
2424
motor.getConfigurator().apply(RobotConfig.get().queuer().motorConfig());
2525
}
2626

27-
public void seState(QueuerState newState) {
27+
public void setState(QueuerState newState) {
2828
setStateFromRequest(newState);
2929
}
3030

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ protected RobotState getNextState(RobotState currentState) {
6060
CLIMBING_2_HANGING ->
6161
currentState;
6262
case SPEAKER_SCORING, AMP_SCORING, FEEDING_SHOOTING, PASS_SHOOTING ->
63-
!queuer.hasNote() ? RobotState.IDLE_NO_GP : currentState;
63+
queuer.hasNote() ? currentState : RobotState.IDLE_NO_GP;
6464

6565
case SPEAKER_PREPARE_TO_SCORE ->
6666
shooter.atGoal() && arm.atGoal() ? RobotState.SPEAKER_SCORING : currentState;
@@ -75,7 +75,7 @@ protected RobotState getNextState(RobotState currentState) {
7575
case UNJAM -> currentState;
7676
case INTAKING -> queuer.hasNote() ? RobotState.IDLE_WITH_GP : currentState;
7777
case OUTTAKING ->
78-
!queuer.hasNote() || !intake.hasNote() ? RobotState.IDLE_NO_GP : currentState;
78+
queuer.hasNote() || intake.hasNote() ? currentState : RobotState.IDLE_NO_GP;
7979
};
8080
}
8181

@@ -86,91 +86,91 @@ protected void afterTransition(RobotState newState) {
8686
arm.setState(ArmState.SPEAKER_SHOT);
8787
shooter.setState(ShooterState.SPEAKER_SHOT);
8888
intake.setState(IntakeState.IDLE);
89-
queuer.seState(QueuerState.IDLE_WITH_GP);
89+
queuer.setState(QueuerState.IDLE_WITH_GP);
9090
}
9191
case SPEAKER_SCORING -> {
9292
arm.setState(ArmState.SPEAKER_SHOT);
9393
shooter.setState(ShooterState.SPEAKER_SHOT);
9494
intake.setState(IntakeState.IDLE);
95-
queuer.seState(QueuerState.SHOOTING);
95+
queuer.setState(QueuerState.SHOOTING);
9696
}
9797
case AMP_PREPARE_TO_SCORE, AMP_WAITING -> {
9898
arm.setState(ArmState.AMP);
9999
shooter.setState(ShooterState.AMP);
100100
intake.setState(IntakeState.IDLE);
101-
queuer.seState(QueuerState.IDLE_WITH_GP);
101+
queuer.setState(QueuerState.IDLE_WITH_GP);
102102
}
103103
case AMP_SCORING -> {
104104
arm.setState(ArmState.AMP);
105105
shooter.setState(ShooterState.AMP);
106106
intake.setState(IntakeState.IDLE);
107-
queuer.seState(QueuerState.SHOOTING);
107+
queuer.setState(QueuerState.SHOOTING);
108108
}
109109
case FEEDING_PREPARE_TO_SHOOT, FEEDING_WAITING -> {
110110
arm.setState(ArmState.FEEDING);
111111
shooter.setState(ShooterState.FEEDING);
112112
intake.setState(IntakeState.IDLE);
113-
queuer.seState(QueuerState.IDLE_WITH_GP);
113+
queuer.setState(QueuerState.IDLE_WITH_GP);
114114
}
115115
case FEEDING_SHOOTING -> {
116116
arm.setState(ArmState.FEEDING);
117117
shooter.setState(ShooterState.FEEDING);
118118
intake.setState(IntakeState.IDLE);
119-
queuer.seState(QueuerState.SHOOTING);
119+
queuer.setState(QueuerState.SHOOTING);
120120
}
121121
case PASS_PREPARE_TO_SHOOT, PASS_WAITING -> {
122122
arm.setState(ArmState.PASS);
123123
shooter.setState(ShooterState.PASS);
124124
intake.setState(IntakeState.IDLE);
125-
queuer.seState(QueuerState.IDLE_WITH_GP);
125+
queuer.setState(QueuerState.IDLE_WITH_GP);
126126
}
127127
case PASS_SHOOTING -> {
128128
arm.setState(ArmState.PASS);
129129
shooter.setState(ShooterState.PASS);
130130
intake.setState(IntakeState.IDLE);
131-
queuer.seState(QueuerState.SHOOTING);
131+
queuer.setState(QueuerState.SHOOTING);
132132
}
133133
case UNJAM -> {
134134
arm.setState(ArmState.AMP);
135135
shooter.setState(ShooterState.PASS);
136136
intake.setState(IntakeState.OUTTAKING);
137-
queuer.seState(QueuerState.OUTTAKING);
137+
queuer.setState(QueuerState.OUTTAKING);
138138
}
139139
case INTAKING -> {
140140
arm.setState(ArmState.IDLE);
141141
shooter.setState(ShooterState.IDLE_STOPPED);
142142
intake.setState(IntakeState.INTAKING);
143-
queuer.seState(QueuerState.INTAKING);
143+
queuer.setState(QueuerState.INTAKING);
144144
}
145145
case OUTTAKING -> {
146146
arm.setState(ArmState.IDLE);
147147
shooter.setState(ShooterState.IDLE_STOPPED);
148148
intake.setState(IntakeState.OUTTAKING);
149-
queuer.seState(QueuerState.OUTTAKING);
149+
queuer.setState(QueuerState.OUTTAKING);
150150
}
151151
case CLIMBING_1_LINEUP -> {
152152
arm.setState(ArmState.CLIMBING_1_LINEUP);
153153
shooter.setState(ShooterState.IDLE_STOPPED);
154154
intake.setState(IntakeState.IDLE);
155-
queuer.seState(QueuerState.IDLE_NO_GP);
155+
queuer.setState(QueuerState.IDLE_NO_GP);
156156
}
157157
case CLIMBING_2_HANGING -> {
158158
arm.setState(ArmState.CLIMBING_2_HANGING);
159159
shooter.setState(ShooterState.IDLE_STOPPED);
160160
intake.setState(IntakeState.IDLE);
161-
queuer.seState(QueuerState.IDLE_NO_GP);
161+
queuer.setState(QueuerState.IDLE_NO_GP);
162162
}
163163
case IDLE_NO_GP -> {
164164
arm.setState(ArmState.IDLE);
165165
shooter.setState(ShooterState.IDLE_STOPPED);
166166
intake.setState(IntakeState.IDLE);
167-
queuer.seState(QueuerState.IDLE_NO_GP);
167+
queuer.setState(QueuerState.IDLE_NO_GP);
168168
}
169169
case IDLE_WITH_GP -> {
170170
arm.setState(ArmState.IDLE);
171171
shooter.setState(ShooterState.IDLE_WARMUP);
172172
intake.setState(IntakeState.IDLE);
173-
queuer.seState(QueuerState.IDLE_WITH_GP);
173+
queuer.setState(QueuerState.IDLE_WITH_GP);
174174
}
175175
}
176176
}

0 commit comments

Comments
 (0)