Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +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

14
hal/src/main/native/include/wpi/hal/Encoder.h
View File

@@ -18,19 +18,19 @@
* The type of index pulse for the encoder.
*/
HAL_ENUM(HAL_EncoderIndexingType) {
HAL_kResetWhileHigh,
HAL_kResetWhileLow,
HAL_kResetOnFallingEdge,
HAL_kResetOnRisingEdge
HAL_ENCODER_INDEX_RESET_WHILE_HIGH,
HAL_ENCODER_INDEX_RESET_WHILE_LOW,
HAL_ENCODER_INDEX_RESET_ON_FALLING_EDGE,
HAL_ENCODER_INDEX_RESET_ON_RISING_EDGE
};
/**
* The encoding scaling of the encoder.
*/
HAL_ENUM(HAL_EncoderEncodingType) {
HAL_Encoder_k1X,
HAL_Encoder_k2X,
HAL_Encoder_k4X
HAL_ENCODER_1X_ENCODING,
HAL_ENCODER_2X_ENCODING,
HAL_ENCODER_4X_ENCODING
};
#ifdef __cplusplus

18
hal/src/main/native/sim/Encoder.cpp
View File

@@ -72,7 +72,7 @@ HAL_EncoderHandle HAL_InitializeEncoder(int32_t aChannel, int32_t bChannel,
int32_t* status) {
wpi::hal::init::CheckInit();
HAL_Handle nativeHandle = HAL_kInvalidHandle;
if (encodingType == HAL_EncoderEncodingType::HAL_Encoder_k4X) {
if (encodingType == HAL_EncoderEncodingType::HAL_ENCODER_4X_ENCODING) {
// k4x, allocate encoder
nativeHandle = fpgaEncoderHandles->Allocate();
} else {
@@ -104,7 +104,7 @@ HAL_EncoderHandle HAL_InitializeEncoder(int32_t aChannel, int32_t bChannel,
encoder->nativeHandle = nativeHandle;
encoder->encodingType = encodingType;
encoder->distancePerPulse = 1.0;
if (encodingType == HAL_EncoderEncodingType::HAL_Encoder_k4X) {
if (encodingType == HAL_EncoderEncodingType::HAL_ENCODER_4X_ENCODING) {
encoder->fpgaHandle = nativeHandle;
encoder->counterHandle = HAL_kInvalidHandle;
} else {
@@ -139,11 +139,11 @@ void HAL_SetEncoderSimDevice(HAL_EncoderHandle handle,
static inline int EncodingScaleFactor(Encoder* encoder) {
switch (encoder->encodingType) {
case HAL_Encoder_k1X:
case HAL_ENCODER_1X_ENCODING:
return 1;
case HAL_Encoder_k2X:
case HAL_ENCODER_2X_ENCODING:
return 2;
case HAL_Encoder_k4X:
case HAL_ENCODER_4X_ENCODING:
return 4;
default:
return 0;
@@ -152,11 +152,11 @@ static inline int EncodingScaleFactor(Encoder* encoder) {
static inline double DecodingScaleFactor(Encoder* encoder) {
switch (encoder->encodingType) {
case HAL_Encoder_k1X:
case HAL_ENCODER_1X_ENCODING:
return 1.0;
case HAL_Encoder_k2X:
case HAL_ENCODER_2X_ENCODING:
return 0.5;
case HAL_Encoder_k4X:
case HAL_ENCODER_4X_ENCODING:
return 0.25;
default:
return 0.0;
@@ -365,7 +365,7 @@ HAL_EncoderEncodingType HAL_GetEncoderEncodingType(
auto encoder = encoderHandles->Get(encoderHandle);
if (encoder == nullptr) {
*status = HAL_HANDLE_ERROR;
return HAL_Encoder_k4X; // default to k4x
return HAL_ENCODER_4X_ENCODING; // default to k4x
}
return encoder->encodingType;

2
hal/src/main/native/systemcore/Encoder.cpp
View File

@@ -131,7 +131,7 @@ double HAL_GetEncoderDistancePerPulse(HAL_EncoderHandle encoderHandle,
HAL_EncoderEncodingType HAL_GetEncoderEncodingType(
HAL_EncoderHandle encoderHandle, int32_t* status) {
*status = HAL_HANDLE_ERROR;
return HAL_Encoder_k4X;
return HAL_ENCODER_4X_ENCODING;
}
int32_t HAL_GetEncoderFPGAIndex(HAL_EncoderHandle encoderHandle,