Skip to content

Commit de3f28d

Browse files
author
Roberts Kalnins
committed
Separate angle above camera positions
1 parent 90c1aff commit de3f28d

File tree

1 file changed

+18
-4
lines changed

1 file changed

+18
-4
lines changed

src/main/java/frc/team2767/deepspace/command/biscuit/BiscuitPositionAboveCameraCommand.java

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import edu.wpi.first.wpilibj.command.Command;
44
import frc.team2767.deepspace.Robot;
5+
import frc.team2767.deepspace.subsystem.Action;
56
import frc.team2767.deepspace.subsystem.BiscuitSubsystem;
67
import frc.team2767.deepspace.subsystem.FieldDirection;
78
import frc.team2767.deepspace.subsystem.VisionSubsystem;
@@ -10,8 +11,10 @@ public class BiscuitPositionAboveCameraCommand extends Command {
1011
private static final BiscuitSubsystem BISCUIT = Robot.BISCUIT;
1112
private static final VisionSubsystem VISION = Robot.VISION;
1213

13-
private static final double ANGLE_RIGHT = 65.0;
14-
private static final double ANGLE_LEFT = -55.0;
14+
private static final double PLACE_RIGHT = 55.0;
15+
private static final double PLACE_LEFT = -55.0;
16+
private static final double PICKUP_RIGHT = 65.0;
17+
private static final double PICKUP_LEFT = -65.0;
1518

1619
public BiscuitPositionAboveCameraCommand() {
1720
requires(BISCUIT);
@@ -20,8 +23,19 @@ public BiscuitPositionAboveCameraCommand() {
2023
@Override
2124
protected void initialize() {
2225
BISCUIT.setMotionMagicAccel(BiscuitSubsystem.kSlowAccel);
23-
if (VISION.direction == FieldDirection.RIGHT) BISCUIT.setPosition(ANGLE_RIGHT);
24-
else BISCUIT.setPosition(ANGLE_LEFT);
26+
if (VISION.action == Action.PLACE) {
27+
if (VISION.direction == FieldDirection.RIGHT) {
28+
BISCUIT.setPosition(PLACE_RIGHT);
29+
} else {
30+
BISCUIT.setPosition(PLACE_LEFT);
31+
}
32+
} else if (VISION.action == Action.PICKUP) {
33+
if (VISION.direction == FieldDirection.RIGHT) {
34+
BISCUIT.setPosition(PICKUP_RIGHT);
35+
} else {
36+
BISCUIT.setPosition(PICKUP_LEFT);
37+
}
38+
}
2539
}
2640

2741
@Override

0 commit comments

Comments
 (0)