Skip to content

Commit

Permalink
update oi
Browse files Browse the repository at this point in the history
  • Loading branch information
e-bauman committed May 29, 2024
1 parent 788e7f6 commit ad0ca1f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
24 changes: 12 additions & 12 deletions oi/OI.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,19 @@ def map_controls():
command.DriveSwerveCustom(Robot.drivetrain)
)

Keymap.Climb.LOCK_STAGE_SOURCE\
.whileTrue(
command.DriveSwerveAim(Robot.drivetrain, Field.calculations, command.DriveSwerveAim.Target.stage_source)
).onFalse(
command.DriveSwerveCustom(Robot.drivetrain)
)
# Keymap.Climb.LOCK_STAGE_SOURCE\
# .whileTrue(
# command.DriveSwerveAim(Robot.drivetrain, Field.calculations, command.DriveSwerveAim.Target.stage_source)
# ).onFalse(
# command.DriveSwerveCustom(Robot.drivetrain)
# )

Keymap.Climb.LOCK_STAGE_AMP\
.whileTrue(
command.DriveSwerveAim(Robot.drivetrain, Field.calculations, command.DriveSwerveAim.Target.stage_amp)
).onFalse(
command.DriveSwerveCustom(Robot.drivetrain)
)
# Keymap.Climb.LOCK_STAGE_AMP\
# .whileTrue(
# command.DriveSwerveAim(Robot.drivetrain, Field.calculations, command.DriveSwerveAim.Target.stage_amp)
# ).onFalse(
# command.DriveSwerveCustom(Robot.drivetrain)
# )

Keymap.Shooter.AIM.and_(lambda: Robot.wrist.detect_note_second())\
.and_(lambda: not states.flywheel_state == states.FlywheelState.amping)\
Expand Down
12 changes: 6 additions & 6 deletions oi/keymap.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,11 @@ class Climb:
lambda: Controllers.OPERATOR_CONTROLLER.getPOV() == 180
)

LOCK_STAGE_SOURCE = commands2.button.JoystickButton(
Joysticks.joysticks[Controllers.DRIVER], controllerDRIVER.X
)
# LOCK_STAGE_SOURCE = commands2.button.JoystickButton(
# Joysticks.joysticks[Controllers.DRIVER], controllerDRIVER.X
# )

LOCK_STAGE_AMP = commands2.button.JoystickButton(
Joysticks.joysticks[Controllers.DRIVER], controllerDRIVER.Y
)
# LOCK_STAGE_AMP = commands2.button.JoystickButton(
# Joysticks.joysticks[Controllers.DRIVER], controllerDRIVER.Y
# )

0 comments on commit ad0ca1f

Please sign in to comment.