diff --git a/gradle.properties b/gradle.properties index a048aa9..11645b2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,5 +6,5 @@ dev.nextftc.publishing.automaticMavenCentralSync=true android.useAndroidX=true -versions.roadrunner=1.0.0 +versions.roadrunner=1.0.1 versions.pedro=1.0.0 \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 07ba9dd..f07b088 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin = "2.0.0" android = "8.7.3" -nextftc = "1.0.0-beta.2" +nextftc = "1.0.0" kotest = "5.9.1" ftc = "10.3.0" pedro = "2.0.0" diff --git a/roadrunner/src/main/kotlin/dev/nextftc/extensions/roadrunner/FollowTrajectory.kt b/roadrunner/src/main/kotlin/dev/nextftc/extensions/roadrunner/FollowTrajectory.kt index 6214e30..de3b260 100644 --- a/roadrunner/src/main/kotlin/dev/nextftc/extensions/roadrunner/FollowTrajectory.kt +++ b/roadrunner/src/main/kotlin/dev/nextftc/extensions/roadrunner/FollowTrajectory.kt @@ -42,6 +42,6 @@ class FollowTrajectory(private val mecanumDrive: NextFTCMecanumDrive, private va } override fun stop(interrupted: Boolean) { - mecanumDrive.setDrivePowersFF(PoseVelocity2d(Vector2d(0.0, 0.0), 0.0)) + mecanumDrive.setDrivePowers(PoseVelocity2d(Vector2d(0.0, 0.0), 0.0)) } } \ No newline at end of file diff --git a/roadrunner/src/main/kotlin/dev/nextftc/extensions/roadrunner/NextFTCMecanumDrive.kt b/roadrunner/src/main/kotlin/dev/nextftc/extensions/roadrunner/NextFTCMecanumDrive.kt index e26ef69..5915ec2 100644 --- a/roadrunner/src/main/kotlin/dev/nextftc/extensions/roadrunner/NextFTCMecanumDrive.kt +++ b/roadrunner/src/main/kotlin/dev/nextftc/extensions/roadrunner/NextFTCMecanumDrive.kt @@ -19,6 +19,8 @@ abstract class NextFTCMecanumDrive { open fun setDrivePowersFF(powers: PoseVelocity2d) = setDrivePowersFF(PoseVelocity2dDual.constant(powers, 1)) + abstract fun setDrivePowers(powers: PoseVelocity2d) + abstract fun updatePoseEstimate(): PoseVelocity2d abstract fun commandBuilder(beginPose: Pose2d): TrajectoryCommandBuilder diff --git a/roadrunner/src/main/kotlin/dev/nextftc/extensions/roadrunner/Turn.kt b/roadrunner/src/main/kotlin/dev/nextftc/extensions/roadrunner/Turn.kt index 74afa49..9163a3e 100644 --- a/roadrunner/src/main/kotlin/dev/nextftc/extensions/roadrunner/Turn.kt +++ b/roadrunner/src/main/kotlin/dev/nextftc/extensions/roadrunner/Turn.kt @@ -34,6 +34,6 @@ class Turn(private val mecanumDrive: NextFTCMecanumDrive, private val turn: Time } override fun stop(interrupted: Boolean) { - mecanumDrive.setDrivePowersFF(PoseVelocity2d(Vector2d(0.0, 0.0), 0.0)) + mecanumDrive.setDrivePowers(PoseVelocity2d(Vector2d(0.0, 0.0), 0.0)) } } \ No newline at end of file