Skip to content

Commit 88cfdf7

Browse files
feat: RoadRunner Extension 1.0.1 (#4)
* add: support for roadrunner * setup gradle for roadrunner extension * refactor: update unit test to use JUnit 5 assertions * add: implement FollowTrajectoryCommand and FollowTurnCommand classes * define RoadRunner version in gradle.properties and use it in roadrunn… * refactor: rename FollowTrajectoryCommand and FollowTurnCommand classe… * add: initialize Turn class with name based on angle * add: NextFTC Pedro Extension (#1) * refactor: remove unit and instrumented tests from pedro module * chore: change group id to dev.nextftc.extensions * feat: add PedroComponent * chore: remove unused import in build.gradle.kts * feat: add FollowPath * feat: add PedroComponent.gyro * feat: add PedroDriverControlled * feat: add Turn and TurnTo * fix: move files from src/main to src/main/kotlin * feat: add descriptive name to Turn and TurnTo - name of Turn is Turn(angle) - name of TurnTo is TurnTo(angle) * refactor: change PedroComponent to an object * fix: make PedroComponent a class again * fix(pedro): fix gradle - make displayName and description correct - use versions.pedro property for version * refactor: rename Turn to TurnBy * fix: rename Turn to TurnBy in the command name --------- Co-authored-by: Zach Harel <zach@zharel.me> * fix: correct naming in Turn class initialization Signed-off-by: Zach Harel <zach@zharel.me> * fix: use proper allowSync property name Signed-off-by: Zach Harel <zach@zharel.me> * add: include license information in build.gradle.kts Signed-off-by: Zach Harel <zach@zharel.me> * fix: update NextFTC version to 1.0.0 Signed-off-by: Zach Harel <zach@zharel.me> * 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> * fix: update roadrunner version to 1.0.1 in gradle.properties Signed-off-by: Zach Harel <zach@zharel.me> --------- Signed-off-by: Zach Harel <zach@zharel.me> Co-authored-by: Davis Luxenberg <74377508+BeepBot99@users.noreply.github.com>
1 parent 6fde9f7 commit 88cfdf7

5 files changed

Lines changed: 6 additions & 4 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ dev.nextftc.publishing.automaticMavenCentralSync=true
66

77
android.useAndroidX=true
88

9-
versions.roadrunner=1.0.0
9+
versions.roadrunner=1.0.1
1010
versions.pedro=1.0.0

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
kotlin = "2.0.0"
33
android = "8.7.3"
4-
nextftc = "1.0.0-beta.2"
4+
nextftc = "1.0.0"
55
kotest = "5.9.1"
66
ftc = "10.3.0"
77
pedro = "2.0.0"

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)