Skip to content

Commit e54992c

Browse files
testing
1 parent 3f03f17 commit e54992c

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

src/main/java/org/carlmontrobotics/RobotContainer.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,9 @@ private void setBindingsManipulator() {
213213
new SequentialCommandGroup(new AimArmSpeaker(arm, limelight),
214214
new PassToOuttake(intakeShooter)));
215215

216+
// axisTrigger(manipulatorController, Manipulator.SHOOTER_BUTTON).whileTrue(
217+
// new PassToOuttake(intakeShooter));
218+
216219
new JoystickButton(manipulatorController, RAMP_OUTTAKE)
217220
.whileTrue(new RampMaxRPM(intakeShooter));
218221
new JoystickButton(manipulatorController, OPPOSITE_EJECT)

src/main/java/org/carlmontrobotics/subsystems/Limelight.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,12 @@ public Limelight(Drivetrain drivetrain) {
3636
shooterMap = new InterpolatingDoubleTreeMap(); // add values after testing
3737
// key is distance (meters), value is angle (rads)
3838
// ASSUMING SHOOTING AT 4000 RPM
39-
shooterMap.put(2.0, .005);
40-
shooterMap.put(3.05, 0.275);
39+
shooterMap.put(2.06, .01);
40+
shooterMap.put(3.05, 0.26);
41+
shooterMap.put(2.5, 0.23);
42+
shooterMap.put(1.39, -0.18);
43+
shooterMap.put(3.45, 0.3);
44+
shooterMap.put(3.1, 0.3);
4145
}
4246

4347
@Override

0 commit comments

Comments
 (0)