From 50c9e89774df74273a5033db151a48e756a10295 Mon Sep 17 00:00:00 2001 From: Seb-TheDropBears Date: Sun, 21 Jan 2024 11:09:31 +1100 Subject: [PATCH] fixed failed tests --- components/shooter.py | 4 ++-- controllers/shooter.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/shooter.py b/components/shooter.py index 674ea80f..2a45d530 100644 --- a/components/shooter.py +++ b/components/shooter.py @@ -59,7 +59,7 @@ def start_injection(self) -> None: self.should_inject = True def stop_injection(self) -> None: - self.should_inject = True + self.should_inject = False def set_flywheel_target(self, target_speed: float) -> None: self.flywheel_target_speed = target_speed @@ -79,7 +79,7 @@ def inclination_angle(self) -> float: @feedback def is_flywheel_at_speed(self) -> bool: return ( - abs(self.flywheel_target_speed - self.flywheel.get_velocity()) + abs(self.flywheel_target_speed - self.flywheel.get_velocity().value) < self.FLYWHEEL_TOLERANCE ) diff --git a/controllers/shooter.py b/controllers/shooter.py index 2bc413de..b14dcfaa 100644 --- a/controllers/shooter.py +++ b/controllers/shooter.py @@ -65,7 +65,7 @@ def ranging(self) -> None: def shooting(self) -> None: self.shooter_component.start_injection() - @state(first=True) + @state def resetting(self) -> None: self.shooter_component.stop_injection() self.done()