File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 2828import org .littletonrobotics .junction .Logger ;
2929
3030public class Orchestrator {
31- private static final TunableNumber testRPM =
32- new TunableNumber ("Shooter/TestRPM " , CLOSE_HUB_SHOOTER_RPM );
31+ private static final TunableNumber testRadPerSec =
32+ new TunableNumber ("Shooter/TestRadPerSec " , CLOSE_HUB_SHOOTER_RPM );
3333
3434 private final double FRONT_HUB_OFFSET = Units .inchesToMeters (40.0 );
3535 private final Drive drive ;
@@ -161,7 +161,11 @@ public Command feedUp() {
161161 }
162162
163163 public Command spinUpShooterTest () {
164+ <<<<<<< HEAD
164165 return shooter .setTargetVelocityRadians (() -> testRPM .get ()).withName ("spinUpShooterTest" );
166+ =======
167+ return shooter .setTargetVelocityRadians (testRadPerSec ).withName ("spinUpShooterTest" );
168+ >>>>>>> refs /remotes /origin /regression
165169 }
166170
167171 public Command spinUpShooterDistance (DoubleSupplier targetDistance ) {
You can’t perform that action at this time.
0 commit comments