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

[hal] Prefix all error #defines with HAL_ (#8780)

Browse Source
This commit is contained in:
Peter Johnson
2026-04-19 16:12:18 -07:00
committed by GitHub
parent b7df267687
commit 14d14e4ebc
40 changed files with 197 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hal/src/main/native/sim/AddressableLED.cpp
View File

@@ -26,7 +26,7 @@ HAL_AddressableLEDHandle HAL_InitializeAddressableLED(
wpi::hal::init::CheckInit();
if (channel < 0 || channel >= kNumAddressableLEDs) {
*status = MakeErrorIndexOutOfRange(RESOURCE_OUT_OF_RANGE,
*status = MakeErrorIndexOutOfRange(HAL_RESOURCE_OUT_OF_RANGE,
"Invalid Index for AddressableLED", 0,
kNumAddressableLEDs, channel);
return HAL_INVALID_HANDLE;
@@ -72,7 +72,7 @@ void HAL_SetAddressableLEDStart(HAL_AddressableLEDHandle handle, int32_t start,
}
if (start > HAL_ADDRESSABLE_LED_MAX_LEN || start < 0) {
*status = MakeError(
PARAMETER_OUT_OF_RANGE,
HAL_PARAMETER_OUT_OF_RANGE,
fmt::format(
"LED start must be less than or equal to {}. {} was requested",
HAL_ADDRESSABLE_LED_MAX_LEN, start));
@@ -91,7 +91,7 @@ void HAL_SetAddressableLEDLength(HAL_AddressableLEDHandle handle,
}
if (length > HAL_ADDRESSABLE_LED_MAX_LEN || length < 0) {
*status = MakeError(
PARAMETER_OUT_OF_RANGE,
HAL_PARAMETER_OUT_OF_RANGE,
fmt::format(
"LED length must be less than or equal to {}. {} was requested",
HAL_ADDRESSABLE_LED_MAX_LEN, length));

2
hal/src/main/native/sim/AnalogInput.cpp
View File

@@ -21,7 +21,7 @@ HAL_AnalogInputHandle HAL_InitializeAnalogInputPort(
int32_t channel, const char* allocationLocation, int32_t* status) {
wpi::hal::init::CheckInit();
if (channel < 0 || channel >= kNumAnalogInputs) {
*status = MakeErrorIndexOutOfRange(RESOURCE_OUT_OF_RANGE,
*status = MakeErrorIndexOutOfRange(HAL_RESOURCE_OUT_OF_RANGE,
"Invalid Index for Analog Input", 0,
kNumAnalogInputs, channel);
return HAL_INVALID_HANDLE;

4
hal/src/main/native/sim/CANAPI.cpp
View File

@@ -71,7 +71,7 @@ HAL_CANHandle HAL_InitializeCAN(int32_t busId, HAL_CANManufacturer manufacturer,
wpi::hal::init::CheckInit();
if (busId < 0 || busId > wpi::hal::kNumCanBuses) {
*status = PARAMETER_OUT_OF_RANGE;
*status = HAL_PARAMETER_OUT_OF_RANGE;
return HAL_INVALID_HANDLE;
}
@@ -80,7 +80,7 @@ HAL_CANHandle HAL_InitializeCAN(int32_t busId, HAL_CANManufacturer manufacturer,
auto handle = canHandles->Allocate(can);
if (handle == HAL_INVALID_HANDLE) {
*status = NO_AVAILABLE_RESOURCES;
*status = HAL_NO_AVAILABLE_RESOURCES;
return HAL_INVALID_HANDLE;
}

10
hal/src/main/native/sim/DIO.cpp
View File

@@ -38,9 +38,9 @@ HAL_DigitalHandle HAL_InitializeDIOPort(int32_t channel, HAL_Bool input,
wpi::hal::init::CheckInit();
if (channel < 0 || channel >= kNumDigitalChannels) {
*status =
MakeErrorIndexOutOfRange(RESOURCE_OUT_OF_RANGE, "Invalid Index for DIO",
0, kNumDigitalChannels, channel);
*status = MakeErrorIndexOutOfRange(HAL_RESOURCE_OUT_OF_RANGE,
"Invalid Index for DIO", 0,
kNumDigitalChannels, channel);
return HAL_INVALID_HANDLE;
}
@@ -89,7 +89,7 @@ void HAL_SetDIOSimDevice(HAL_DigitalHandle handle, HAL_SimDeviceHandle device) {
HAL_DigitalPWMHandle HAL_AllocateDigitalPWM(int32_t* status) {
auto handle = digitalPWMHandles->Allocate();
if (handle == HAL_INVALID_HANDLE) {
*status = NO_AVAILABLE_RESOURCES;
*status = HAL_NO_AVAILABLE_RESOURCES;
return HAL_INVALID_HANDLE;
}
@@ -183,7 +183,7 @@ void HAL_SetDIO(HAL_DigitalHandle dioPortHandle, HAL_Bool value,
}
}
if (SimDIOData[port->channel].isInput) {
*status = MakeError(PARAMETER_OUT_OF_RANGE,
*status = MakeError(HAL_PARAMETER_OUT_OF_RANGE,
"Cannot set output of an input channel");
return;
}

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

@@ -81,7 +81,7 @@ void JoystickDataCache::Update() {
#define CHECK_JOYSTICK_NUMBER(stickNum) \
if ((stickNum) < 0 || (stickNum) >= HAL_MAX_JOYSTICKS) \
return PARAMETER_OUT_OF_RANGE
return HAL_PARAMETER_OUT_OF_RANGE;
static HAL_ControlWord newestControlWord;
static JoystickDataCache caches[3];
@@ -221,7 +221,7 @@ int32_t HAL_SendConsoleLine(const char* line) {
int32_t HAL_GetControlWord(HAL_ControlWord* controlWord) {
if (gShutdown) {
controlWord->value = 0;
return INCOMPATIBLE_STATE;
return HAL_INCOMPATIBLE_STATE;
}
std::scoped_lock lock{driverStation->cacheMutex};
*controlWord = newestControlWord;
@@ -231,7 +231,7 @@ int32_t HAL_GetControlWord(HAL_ControlWord* controlWord) {
int32_t HAL_GetUncachedControlWord(HAL_ControlWord* controlWord) {
if (gShutdown) {
controlWord->value = 0;
return INCOMPATIBLE_STATE;
return HAL_INCOMPATIBLE_STATE;
}
bool dsAttached = SimDriverStationData->dsAttached;
if (dsAttached) {
@@ -251,7 +251,7 @@ int32_t HAL_SetOpModeOptions(const struct HAL_OpModeOption* options,
return 0;
}
if (count < 0 || count > 1000 || (count != 0 && !options)) {
return PARAMETER_OUT_OF_RANGE;
return HAL_PARAMETER_OUT_OF_RANGE;
}
SimDriverStationData->SetOpModeOptions({options, options + count});
return 0;
@@ -267,7 +267,7 @@ HAL_AllianceStationID HAL_GetAllianceStation(int32_t* status) {
int32_t HAL_GetJoystickAxes(int32_t joystickNum, HAL_JoystickAxes* axes) {
if (gShutdown) {
return INCOMPATIBLE_STATE;
return HAL_INCOMPATIBLE_STATE;
}
CHECK_JOYSTICK_NUMBER(joystickNum);
std::scoped_lock lock{driverStation->cacheMutex};
@@ -277,7 +277,7 @@ int32_t HAL_GetJoystickAxes(int32_t joystickNum, HAL_JoystickAxes* axes) {
int32_t HAL_GetJoystickPOVs(int32_t joystickNum, HAL_JoystickPOVs* povs) {
if (gShutdown) {
return INCOMPATIBLE_STATE;
return HAL_INCOMPATIBLE_STATE;
}
CHECK_JOYSTICK_NUMBER(joystickNum);
std::scoped_lock lock{driverStation->cacheMutex};
@@ -288,7 +288,7 @@ int32_t HAL_GetJoystickPOVs(int32_t joystickNum, HAL_JoystickPOVs* povs) {
int32_t HAL_GetJoystickButtons(int32_t joystickNum,
HAL_JoystickButtons* buttons) {
if (gShutdown) {
return INCOMPATIBLE_STATE;
return HAL_INCOMPATIBLE_STATE;
}
CHECK_JOYSTICK_NUMBER(joystickNum);
std::scoped_lock lock{driverStation->cacheMutex};
@@ -299,7 +299,7 @@ int32_t HAL_GetJoystickButtons(int32_t joystickNum,
int32_t HAL_GetJoystickTouchpads(int32_t joystickNum,
HAL_JoystickTouchpads* touchpads) {
if (gShutdown) {
return INCOMPATIBLE_STATE;
return HAL_INCOMPATIBLE_STATE;
}
CHECK_JOYSTICK_NUMBER(joystickNum);
std::scoped_lock lock{driverStation->cacheMutex};
@@ -349,7 +349,7 @@ int32_t HAL_GetJoystickGamepadType(int32_t joystickNum) {
int32_t HAL_GetGameData(HAL_GameData* gameData) {
if (gShutdown) {
return INCOMPATIBLE_STATE;
return HAL_INCOMPATIBLE_STATE;
}
std::scoped_lock lock{driverStation->cacheMutex};
*gameData = currentRead->gameData;

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

@@ -80,12 +80,12 @@ HAL_EncoderHandle HAL_InitializeEncoder(int32_t aChannel, int32_t bChannel,
nativeHandle = counterHandles->Allocate();
}
if (nativeHandle == HAL_INVALID_HANDLE) {
*status = NO_AVAILABLE_RESOURCES;
*status = HAL_NO_AVAILABLE_RESOURCES;
return HAL_INVALID_HANDLE;
}
auto handle = encoderHandles->Allocate();
if (handle == HAL_INVALID_HANDLE) {
*status = NO_AVAILABLE_RESOURCES;
*status = HAL_NO_AVAILABLE_RESOURCES;
return HAL_INVALID_HANDLE;
}
auto encoder = encoderHandles->Get(handle);
@@ -271,7 +271,7 @@ void HAL_SetEncoderMinRate(HAL_EncoderHandle encoderHandle, double minRate,
}
if (minRate == 0.0) {
*status = MakeError(PARAMETER_OUT_OF_RANGE, "minRate must not be 0");
*status = MakeError(HAL_PARAMETER_OUT_OF_RANGE, "minRate must not be 0");
return;
}
@@ -288,7 +288,7 @@ void HAL_SetEncoderDistancePerPulse(HAL_EncoderHandle encoderHandle,
if (distancePerPulse == 0.0) {
*status =
MakeError(PARAMETER_OUT_OF_RANGE, "distancePerPulse must not be 0");
MakeError(HAL_PARAMETER_OUT_OF_RANGE, "distancePerPulse must not be 0");
return;
}
encoder->distancePerPulse = distancePerPulse;

38
hal/src/main/native/sim/HAL.cpp
View File

@@ -115,34 +115,34 @@ const char* HAL_GetErrorMessage(int32_t code) {
switch (code) {
case 0:
return "";
case VOLTAGE_OUT_OF_RANGE:
return VOLTAGE_OUT_OF_RANGE_MESSAGE;
case INCOMPATIBLE_STATE:
return INCOMPATIBLE_STATE_MESSAGE;
case NO_AVAILABLE_RESOURCES:
return NO_AVAILABLE_RESOURCES_MESSAGE;
case RESOURCE_IS_ALLOCATED:
return RESOURCE_IS_ALLOCATED_MESSAGE;
case RESOURCE_OUT_OF_RANGE:
return RESOURCE_OUT_OF_RANGE_MESSAGE;
case HAL_VOLTAGE_OUT_OF_RANGE:
return HAL_VOLTAGE_OUT_OF_RANGE_MESSAGE;
case HAL_INCOMPATIBLE_STATE:
return HAL_INCOMPATIBLE_STATE_MESSAGE;
case HAL_NO_AVAILABLE_RESOURCES:
return HAL_NO_AVAILABLE_RESOURCES_MESSAGE;
case HAL_RESOURCE_IS_ALLOCATED:
return HAL_RESOURCE_IS_ALLOCATED_MESSAGE;
case HAL_RESOURCE_OUT_OF_RANGE:
return HAL_RESOURCE_OUT_OF_RANGE_MESSAGE;
case HAL_HANDLE_ERROR:
return HAL_HANDLE_ERROR_MESSAGE;
case NULL_PARAMETER:
return NULL_PARAMETER_MESSAGE;
case PARAMETER_OUT_OF_RANGE:
return PARAMETER_OUT_OF_RANGE_MESSAGE;
case HAL_NULL_PARAMETER:
return HAL_NULL_PARAMETER_MESSAGE;
case HAL_PARAMETER_OUT_OF_RANGE:
return HAL_PARAMETER_OUT_OF_RANGE_MESSAGE;
case HAL_COUNTER_NOT_SUPPORTED:
return HAL_COUNTER_NOT_SUPPORTED_MESSAGE;
case HAL_ERR_CANSessionMux_InvalidBuffer:
return ERR_CANSessionMux_InvalidBuffer_MESSAGE;
return HAL_ERR_CANSessionMux_InvalidBuffer_MESSAGE;
case HAL_ERR_CANSessionMux_MessageNotFound:
return ERR_CANSessionMux_MessageNotFound_MESSAGE;
return HAL_ERR_CANSessionMux_MessageNotFound_MESSAGE;
case HAL_WARN_CANSessionMux_NoToken:
return WARN_CANSessionMux_NoToken_MESSAGE;
return HAL_WARN_CANSessionMux_NoToken_MESSAGE;
case HAL_ERR_CANSessionMux_NotAllowed:
return ERR_CANSessionMux_NotAllowed_MESSAGE;
return HAL_ERR_CANSessionMux_NotAllowed_MESSAGE;
case HAL_ERR_CANSessionMux_NotInitialized:
return ERR_CANSessionMux_NotInitialized_MESSAGE;
return HAL_ERR_CANSessionMux_NotInitialized_MESSAGE;
case HAL_CAN_TIMEOUT:
return HAL_CAN_TIMEOUT_MESSAGE;
case HAL_SIM_NOT_SUPPORTED:

6
hal/src/main/native/sim/PWM.cpp
View File

@@ -25,9 +25,9 @@ HAL_DigitalHandle HAL_InitializePWMPort(int32_t channel,
wpi::hal::init::CheckInit();
if (channel < 0 || channel >= kNumPWMChannels) {
*status =
MakeErrorIndexOutOfRange(RESOURCE_OUT_OF_RANGE, "Invalid Index for PWM",
0, kNumPWMChannels, channel);
*status = MakeErrorIndexOutOfRange(HAL_RESOURCE_OUT_OF_RANGE,
"Invalid Index for PWM", 0,
kNumPWMChannels, channel);
return HAL_INVALID_HANDLE;
}

6
hal/src/main/native/sim/PowerDistribution.cpp
View File

@@ -33,7 +33,7 @@ HAL_PowerDistributionHandle HAL_InitializePowerDistribution(
if (type == HAL_POWER_DISTRIBUTION_AUTOMATIC) {
if (module != HAL_DEFAULT_POWER_DISTRIBUTION_MODULE) {
*status =
MakeError(PARAMETER_OUT_OF_RANGE,
MakeError(HAL_PARAMETER_OUT_OF_RANGE,
"Automatic PowerDistributionType must have default module");
return HAL_INVALID_HANDLE;
}
@@ -45,11 +45,11 @@ HAL_PowerDistributionHandle HAL_InitializePowerDistribution(
if (!HAL_CheckPowerDistributionModule(module, type)) {
if (type == HAL_PowerDistributionType::HAL_POWER_DISTRIBUTION_CTRE) {
*status = MakeErrorIndexOutOfRange(RESOURCE_OUT_OF_RANGE,
*status = MakeErrorIndexOutOfRange(HAL_RESOURCE_OUT_OF_RANGE,
"Invalid Index for CTRE PDP", 0,
kNumCTREPDPModules - 1, module);
} else {
*status = MakeErrorIndexOutOfRange(RESOURCE_OUT_OF_RANGE,
*status = MakeErrorIndexOutOfRange(HAL_RESOURCE_OUT_OF_RANGE,
"Invalid Index for REV PDH", 1,
kNumREVPDHModules, module);
}

2
hal/src/main/native/sim/REVPH.cpp
View File

@@ -41,7 +41,7 @@ HAL_REVPHHandle HAL_InitializeREVPH(int32_t busId, int32_t module,
wpi::hal::init::CheckInit();
if (!HAL_CheckREVPHModuleNumber(module)) {
*status = MakeErrorIndexOutOfRange(RESOURCE_OUT_OF_RANGE,
*status = MakeErrorIndexOutOfRange(HAL_RESOURCE_OUT_OF_RANGE,
"Invalid Index for REV PH", 1,
kNumREVPHModules, module);
return HAL_INVALID_HANDLE;