diff --git a/commands/set_amp_override.py b/commands/set_amp_override.py index d9df9fb..08ad17f 100644 --- a/commands/set_amp_override.py +++ b/commands/set_amp_override.py @@ -13,7 +13,9 @@ def __init__(self, amp: Amp, dir) -> None: def initialize(self) -> None: pass + def execute(self) -> None: + #Rate of change set to 0.25 from 0.1 if self.dir == 1: self.amp.height += 0.25 elif self.dir == -1: diff --git a/robot.py b/robot.py index 0246712..1b642ab 100644 --- a/robot.py +++ b/robot.py @@ -138,11 +138,11 @@ def configure_commander_controls(self): RBM.amp_lift_trap_c2) amp_set_height_amp.onTrue(SetAmpHeight(self.amp, self.amp.Height.TRAP)) - amp_override_up = JoystickButton(self.commander_joystick1, + amp_override_up = JoystickButton(self.commander_joystick2, RBM.amp_override_up_c2) amp_override_up.whileTrue(SetAmpOverride(self.amp, self.amp.dir_up)) - amp_override_down = JoystickButton(self.commander_joystick1, + amp_override_down = JoystickButton(self.commander_joystick2, RBM.amp_override_down_c2) amp_override_down.whileTrue(SetAmpOverride(self.amp, self.amp.dir_down)) @@ -179,6 +179,7 @@ def configure_commander_controls(self): shooter_spin.onFalse(InstantCommand(self.shooter.spin_down)) def robotPeriodic(self) -> None: + SmartDashboard.putNumber("Amp Height", self.amp.get_height()) if DriverStation.isDisabled(): self.leds.set_connect_status() diff --git a/subsystems/amp.py b/subsystems/amp.py index 8588b6d..8804e29 100644 --- a/subsystems/amp.py +++ b/subsystems/amp.py @@ -86,3 +86,4 @@ def periodic(self) -> None: limit_reverse_motion=True ).with_limit_reverse_motion(not self.limit_switch.get()) self.lift_motor.set_control(self.request.with_position(self.height)) + diff --git a/subsystems/leds.py b/subsystems/leds.py index 4b379f3..ae96238 100644 --- a/subsystems/leds.py +++ b/subsystems/leds.py @@ -101,7 +101,7 @@ def shooter_empty(self): pass def shooter_running(self): - self.set_color(RED, True) + self.set_color(CYAN, True) pass def shooter_up_to_speed(self):