Skip to content

Commit

Permalink
fix status frame implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
MatthewChoulas committed Dec 6, 2023
1 parent 6029b75 commit b330d4f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ publishing {
release(MavenPublication) {
groupId = 'org.team4099'
artifactId = 'falconutils'
version = '1.1.25'
version = '1.1.26'

from(components["kotlin"])
}
Expand Down
14 changes: 10 additions & 4 deletions src/main/kotlin/org/team4099/lib/units/MechanismUnits.kt
Original file line number Diff line number Diff line change
Expand Up @@ -310,14 +310,17 @@ fun ctreLinearMechanismSensor(
diameter: Length,
compensationVoltage: ElectricalPotential
): LinearMechanismSensor {
val velocitySignal = controller.velocity
val positionSignal = controller.velocity

return LinearMechanismSensor(
diameter,
ratio,
Timescale.PHOENIX_PRO,
1.0,
compensationVoltage,
{ controller.velocity.value },
{ controller.position.value },
{ velocitySignal.value },
{ positionSignal.value },
)
}

Expand All @@ -326,13 +329,16 @@ fun ctreAngularMechanismSensor(
ratio: Double,
compensationVoltage: ElectricalPotential
): AngularMechanismSensor {
val velocitySignal = controller.velocity
val positionSignal = controller.velocity

return AngularMechanismSensor(
ratio,
Timescale.PHOENIX_PRO,
1.0,
compensationVoltage,
{ controller.velocity.value },
{ controller.position.value },
{ velocitySignal.value },
{ positionSignal.value },
)
}

Expand Down

0 comments on commit b330d4f

Please sign in to comment.