Skip to content

Commit f47d1e7

Browse files
committed
add scaled measures to cancoder
1 parent db4b7bc commit f47d1e7

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ plugins {
1111
}
1212

1313
group = "org.strykeforce"
14-
version = "24.0.1"
14+
version = "24.0.2"
1515

1616
sourceCompatibility = JavaVersion.VERSION_17
1717
targetCompatibility = JavaVersion.VERSION_17

src/main/kotlin/org/strykeforce/telemetry/measurable/CancoderMeasureable.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@ package org.strykeforce.telemetry.measurable
33
import com.ctre.phoenix6.hardware.CANcoder
44
import org.strykeforce.telemetry.talon.HAS_RESET_OCCURRED
55
import org.strykeforce.telemetry.talon.IS_PRO_LIC
6+
import org.strykeforce.telemetry.talon.POS_SCALE
67

78
internal const val MAGNET_HEALTH = "MAGNET_HEALTH"
89
//internal const val POSITION = "POSITION"
10+
internal const val POSITION_SCALED = "POS_SCALED"
911
internal const val POSITION_SINCE_BOOT = "POSITION_SINCE_BOOT"
12+
internal const val POS_BOOT_SCALED = "POS_BOOT_SCALED"
1013
internal const val ABS_POSITION = "ABS_POSITION"
14+
internal const val ABS_POS_SCALED = "ABS_POS_SCALED"
1115
internal const val SUPPLY_VOLTAGE = "SUPPLY_VOLTAGE"
1216
internal const val UNFILTERED_VELOCITY = "UNFILTERED_VELOCITY"
1317
internal const val VELOCITY = "VELOCITY"
@@ -18,12 +22,16 @@ class CancoderMeasureable @JvmOverloads constructor(
1822
override val description: String = "Cancoder ${cancoder.deviceID}"
1923
): Measurable {
2024

25+
private val scaleFactor = 1000.0;
2126
override val deviceId = cancoder.deviceID
2227
override val measures = setOf(
2328
Measure(MAGNET_HEALTH, "Magnet Health") {cancoder.magnetHealth.valueAsDouble},
2429
Measure(POSITION, "Position") {cancoder.position.valueAsDouble},
30+
Measure(POS_SCALE, "Pos. Scaled") {cancoder.position.valueAsDouble * scaleFactor},
2531
Measure(POSITION_SINCE_BOOT, "Position Since Boot") {cancoder.positionSinceBoot.valueAsDouble},
32+
Measure(POS_BOOT_SCALED, "Pos. since Boot Scaled") {cancoder.positionSinceBoot.valueAsDouble * scaleFactor},
2633
Measure(ABS_POSITION, "Absolute Position") {cancoder.absolutePosition.valueAsDouble},
34+
Measure(ABS_POS_SCALED, "Absolute Pos. Scaled") {cancoder.absolutePosition.valueAsDouble * scaleFactor},
2735
Measure(SUPPLY_VOLTAGE, "Supply Voltage") {cancoder.supplyVoltage.valueAsDouble},
2836
Measure(UNFILTERED_VELOCITY, "Unfiltered Velocity") {cancoder.unfilteredVelocity.valueAsDouble},
2937
Measure(VELOCITY, "Velocity") {cancoder.velocity.valueAsDouble},

0 commit comments

Comments
 (0)