Skip to content

Commit 11bf416

Browse files
authored
Merge pull request #266 from thedropbears/disable_coral_in_auto
2 parents 11c6252 + 395de37 commit 11bf416

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

autonomous/auto_base.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
from components.injector import InjectorComponent
1414
from components.shooter import ShooterComponent
1515
from controllers.algae_shooter import AlgaeShooter
16-
from controllers.coral_placer import CoralPlacer
1716
from controllers.reef_intake import ReefIntake
1817
from utilities import game
1918

@@ -29,7 +28,6 @@
2928

3029
class AutoBase(AutonomousStateMachine):
3130
algae_shooter: AlgaeShooter
32-
coral_placer: CoralPlacer
3331
reef_intake: ReefIntake
3432

3533
shooter_component: ShooterComponent
@@ -100,14 +98,7 @@ def tracking_trajectory(self, initial_call, state_tm) -> None:
10098
distance = current_pose.translation().distance(final_pose.translation())
10199
angle_error = (final_pose.rotation() - current_pose.rotation()).radians()
102100

103-
if self.current_leg == 0:
104-
self.coral_placer.lift()
105-
106-
if (
107-
self.current_leg > 0
108-
and not self.injector_component.has_algae()
109-
and not self.coral_placer.is_executing
110-
):
101+
if self.current_leg > 0 and not self.injector_component.has_algae():
111102
self.reef_intake.intake()
112103

113104
if distance < self.DISTANCE_TOLERANCE and math.isclose(

0 commit comments

Comments
 (0)