Skip to content

Commit 5dbf25e

Browse files
committed
Update at 'Sat Apr 11 12:54:56 EDT 2026'
1 parent 9a4f787 commit 5dbf25e

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

  • src/main/kotlin/com/team4099/robot2026/subsystems/superstructure/shooter

src/main/kotlin/com/team4099/robot2026/subsystems/superstructure/shooter/Shooter.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -505,8 +505,12 @@ class Shooter(private val io: ShooterIO) : ControlledByStateMachine() {
505505
distanceToShooterMap.put(3.0.meters, 40.rotations.perSecond)
506506
distanceToShooterMap.put(3.48.meters, 45.5.rotations.perSecond)
507507
distanceToShooterMap.put(3.94.meters, 49.5.rotations.perSecond)
508+
distanceToShooterMap.put(4.07.meters, 50.rotations.perSecond)
508509
distanceToShooterMap.put(4.34.meters, 50.25.rotations.perSecond)
510+
distanceToShooterMap.put(4.58.meters, 52.rotations.perSecond)
509511
distanceToShooterMap.put(4.85.meters, 52.5.rotations.perSecond)
512+
distanceToShooterMap.put(5.45.meters, 57.rotations.perSecond)
513+
distanceToShooterMap.put(5.95.meters, 62.5.rotations.perSecond)
510514

511515
passingShooterMap.put(2.meters, 27.75.rotations.perSecond)
512516
passingShooterMap.put(2.5.meters, 32.5.rotations.perSecond)
@@ -516,13 +520,13 @@ class Shooter(private val io: ShooterIO) : ControlledByStateMachine() {
516520
}
517521

518522
fun distanceToShooterRPM(distanceToTarget: Length): AngularVelocity {
519-
if (1.95.meters <= distanceToTarget && distanceToTarget <= 4.9.meters) {
523+
if (1.78.meters <= distanceToTarget && distanceToTarget <= 5.9.meters) {
520524
return distanceToShooterMap.get(distanceToTarget)
521525
}
522526
return max(
523527
ShooterConstants.VELOCITIES.MINIMUM_LAUNCH_VELOCITY,
524528
min(
525-
(8.999075 * distanceToTarget.inMeters + 11.44).rotations.perSecond,
529+
(8.42104 * distanceToTarget.inMeters + 13.25).rotations.perSecond,
526530
ShooterConstants.VELOCITIES.MAXIMUM_LAUNCH_VELOCITY))
527531
}
528532

0 commit comments

Comments
 (0)