Skip to content

Commit 5d57258

Browse files
committed
fix: replace setDrivePowersFF with setDrivePowers in FollowTrajectory and Turn classes
Signed-off-by: Zach Harel <zach@zharel.me> add: define abstract setDrivePowers method in NextFTCMecanumDrive Signed-off-by: Zach Harel <zach@zharel.me>
1 parent b022b58 commit 5d57258

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

roadrunner/src/main/kotlin/dev/nextftc/extensions/roadrunner/FollowTrajectory.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ class FollowTrajectory(private val mecanumDrive: NextFTCMecanumDrive, private va
4242
}
4343

4444
override fun stop(interrupted: Boolean) {
45-
mecanumDrive.setDrivePowersFF(PoseVelocity2d(Vector2d(0.0, 0.0), 0.0))
45+
mecanumDrive.setDrivePowers(PoseVelocity2d(Vector2d(0.0, 0.0), 0.0))
4646
}
4747
}

roadrunner/src/main/kotlin/dev/nextftc/extensions/roadrunner/NextFTCMecanumDrive.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ abstract class NextFTCMecanumDrive {
1919
open fun setDrivePowersFF(powers: PoseVelocity2d) =
2020
setDrivePowersFF(PoseVelocity2dDual.constant(powers, 1))
2121

22+
abstract fun setDrivePowers(powers: PoseVelocity2d)
23+
2224
abstract fun updatePoseEstimate(): PoseVelocity2d
2325

2426
abstract fun commandBuilder(beginPose: Pose2d): TrajectoryCommandBuilder

roadrunner/src/main/kotlin/dev/nextftc/extensions/roadrunner/Turn.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ class Turn(private val mecanumDrive: NextFTCMecanumDrive, private val turn: Time
3434
}
3535

3636
override fun stop(interrupted: Boolean) {
37-
mecanumDrive.setDrivePowersFF(PoseVelocity2d(Vector2d(0.0, 0.0), 0.0))
37+
mecanumDrive.setDrivePowers(PoseVelocity2d(Vector2d(0.0, 0.0), 0.0))
3838
}
3939
}

0 commit comments

Comments
 (0)