Skip to content

Commit 3c9d3d1

Browse files
committed
Add auto scoring
1 parent 0544b9b commit 3c9d3d1

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/main/java/frc/robot/HeadHoncho.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ public void initialize() {
267267

268268
@Override
269269
public SystemState nextState() {
270-
if (LIFT_SUBSYSTEM.isLiftReady() && s_scoreButton.getAsBoolean()) return SCORE;
270+
if (LIFT_SUBSYSTEM.isLiftReady() && s_scoreButton.getAsBoolean() && DRIVE_SUBSYSTEM.isAligned()) return SCORE;
271271

272272
if (s_L1Button.getAsBoolean()) return L1;
273273
if (s_L2Button.getAsBoolean()) return L2;
@@ -290,7 +290,7 @@ public void initialize() {
290290

291291
@Override
292292
public SystemState nextState() {
293-
if (LIFT_SUBSYSTEM.isLiftReady() && s_scoreButton.getAsBoolean()) return SCORE_REVERSE;
293+
if (LIFT_SUBSYSTEM.isLiftReady() && s_scoreButton.getAsBoolean() && DRIVE_SUBSYSTEM.isAligned()) return SCORE_REVERSE;
294294

295295
if (s_L1Button.getAsBoolean()) return L1;
296296
if (s_L2Button.getAsBoolean()) return L2;
@@ -313,7 +313,7 @@ public void initialize() {
313313

314314
@Override
315315
public SystemState nextState() {
316-
if (LIFT_SUBSYSTEM.isLiftReady() && s_scoreButton.getAsBoolean()) return SCORE_REVERSE;
316+
if (LIFT_SUBSYSTEM.isLiftReady() && s_scoreButton.getAsBoolean() && DRIVE_SUBSYSTEM.isAligned()) return SCORE_REVERSE;
317317

318318
if (s_L1Button.getAsBoolean()) return L1;
319319
if (s_L2Button.getAsBoolean()) return L2;

0 commit comments

Comments
 (0)