Skip to content

Commit e38ea5d

Browse files
author
Roberts Kalnins
committed
Merge branch 'master' into rabsamu/climb-optimization
2 parents 4221986 + 71bc278 commit e38ea5d

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

.github/main.workflow

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ action "gradle build" {
1010

1111
workflow "process pull request" {
1212
on = "pull_request"
13-
resolves = ["post gif on fail", "branch cleanup"]
13+
resolves = ["branch cleanup"]
1414
}
1515

1616
action "post gif on fail" {

src/main/java/frc/team2767/deepspace/subsystem/safety/SafetySubsystem.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ private IntakePosition intakeLimit(
117117
case BISCUIT_120R_180R:
118118
case BISCUIT_180L:
119119
case BISCUIT_180R:
120+
case BISCUIT_360:
120121
intakeLimit = INTAKE_STOW;
121122
break;
122123
}
@@ -137,6 +138,7 @@ private IntakePosition intakeLimit(
137138
case BISCUIT_120R_180R:
138139
case BISCUIT_180L:
139140
case BISCUIT_180R:
141+
case BISCUIT_360:
140142
intakeLimit = INTAKE_STOW;
141143
break;
142144
}
@@ -172,6 +174,7 @@ private ElevatorPosition elevatorLimit(
172174
case BISCUIT_120R:
173175
case BISCUIT_120L_180L:
174176
case BISCUIT_120R_180R:
177+
case BISCUIT_360:
175178
elevatorPosition = ELEVATOR_21;
176179
break;
177180
}
@@ -195,6 +198,7 @@ private ElevatorPosition elevatorLimit(
195198
case BISCUIT_120R_180R:
196199
case BISCUIT_120L:
197200
case BISCUIT_120R:
201+
case BISCUIT_360:
198202
elevatorPosition = ELEVATOR_21;
199203
break;
200204
}

0 commit comments

Comments
 (0)