From c2b7d3ead2b5ce29daefcc10d4d941d3e81b4fcc Mon Sep 17 00:00:00 2001 From: Saraansh Wadkar Date: Sun, 26 Feb 2023 03:11:31 -0500 Subject: [PATCH] fix velocity ff --- build.gradle | 2 +- src/main/kotlin/org/team4099/lib/units/MechanismUnits.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 8110ecc..45970b3 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ publishing { release(MavenPublication) { groupId = 'org.team4099' artifactId = 'falconutils' - version = '1.1.14' + version = '1.1.15' from(components["kotlin"]) } diff --git a/src/main/kotlin/org/team4099/lib/units/MechanismUnits.kt b/src/main/kotlin/org/team4099/lib/units/MechanismUnits.kt index c1e9018..8ef0af9 100644 --- a/src/main/kotlin/org/team4099/lib/units/MechanismUnits.kt +++ b/src/main/kotlin/org/team4099/lib/units/MechanismUnits.kt @@ -69,7 +69,7 @@ interface MechanismSensor { derivativeGain: DerivativeGain, Volt>, ): Double - fun velocityFeedforwardToRawUnits(velocityFeedforward: VelocityFeedforward, Volt>): Double + fun velocityFeedforwardToRawUnits(velocityFeedforward: VelocityFeedforward): Double } class LinearMechanismSensor( @@ -157,7 +157,7 @@ class LinearMechanismSensor( } override inline fun velocityFeedforwardToRawUnits( - velocityFeedforward: VelocityFeedforward, Volt> + velocityFeedforward: VelocityFeedforward ): Double { return velocityFeedforward.value * velocityToRawUnits(1.0.meters.perSecond) / compensationVoltage.inVolts * fullPowerThrottle @@ -246,7 +246,7 @@ class AngularMechanismSensor( } override inline fun velocityFeedforwardToRawUnits( - velocityFeedforward: VelocityFeedforward, Volt> + velocityFeedforward: VelocityFeedforward ): Double { return velocityFeedforward.value * velocityToRawUnits(1.0.radians.perSecond) / compensationVoltage.inVolts * fullPowerThrottle