Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-22 01:11:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[hal,wpilib] Rename Encoder constants to all caps

Browse Source
This commit is contained in:
Peter Johnson
2026-03-14 11:12:57 -07:00
parent f6fdae3212
commit b68fbb1adc
14 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wpilibj/src/main/java/org/wpilib/hardware/discrete/CounterBase.java
View File

@@ -16,11 +16,11 @@ public interface CounterBase {
/** The number of edges for the CounterBase to increment or decrement on. */
enum EncodingType {
/** Count only the rising edge. */
k1X(0),
X1(0),
/** Count both the rising and falling edge. */
k2X(1),
X2(1),
/** Count rising and falling on both channels. */
k4X(2);
X4(2);
/** EncodingType value. */
public final int value;

16
wpilibj/src/main/java/org/wpilib/hardware/rotation/Encoder.java
View File

@@ -48,9 +48,9 @@ public class Encoder implements CounterBase, Sendable, AutoCloseable {
String typeStr =
switch (type) {
case k1X -> "Encoder:1x";
case k2X -> "Encoder:2x";
case k4X -> "Encoder:4x";
case X1 -> "Encoder:1x";
case X2 -> "Encoder:2x";
case X4 -> "Encoder:4x";
default -> "Encoder";
};
HAL.reportUsage("IO[" + aChannel + "," + bChannel + "]", typeStr);
@@ -70,7 +70,7 @@ public class Encoder implements CounterBase, Sendable, AutoCloseable {
* if necessary so forward represents positive values.
*/
public Encoder(final int channelA, final int channelB, boolean reverseDirection) {
this(channelA, channelB, reverseDirection, EncodingType.k4X);
this(channelA, channelB, reverseDirection, EncodingType.X4);
}
/**
@@ -337,15 +337,15 @@ public class Encoder implements CounterBase, Sendable, AutoCloseable {
*/
public double getDecodingScaleFactor() {
return switch (m_encodingType) {
case k1X -> 1.0;
case k2X -> 0.5;
case k4X -> 0.25;
case X1 -> 1.0;
case X2 -> 0.5;
case X4 -> 0.25;
};
}
@Override
public void initSendable(SendableBuilder builder) {
if (EncoderJNI.getEncoderEncodingType(m_encoder) == EncodingType.k4X.value) {
if (EncoderJNI.getEncoderEncodingType(m_encoder) == EncodingType.X4.value) {
builder.setSmartDashboardType("Quadrature Encoder");
} else {
builder.setSmartDashboardType("Encoder");