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

10
hal/src/main/native/cpp/jni/CANAPIJNI.cpp
View File

@@ -173,7 +173,7 @@ Java_org_wpilib_hardware_hal_CANAPIJNI_writeCANPacketNoThrow
{
HAL_CANMessage message;
if (!PackCANMessage(env, data, dataLength, flags, &message)) {
return PARAMETER_OUT_OF_RANGE;
return HAL_PARAMETER_OUT_OF_RANGE;
}
int32_t status = 0;
@@ -194,7 +194,7 @@ Java_org_wpilib_hardware_hal_CANAPIJNI_writeCANPacketRepeatingNoThrow
{
HAL_CANMessage message;
if (!PackCANMessage(env, data, dataLength, flags, &message)) {
return PARAMETER_OUT_OF_RANGE;
return HAL_PARAMETER_OUT_OF_RANGE;
}
int32_t status = 0;
@@ -219,18 +219,18 @@ Java_org_wpilib_hardware_hal_CANAPIJNI_writeCANRTRFrameNoThrow
// We will allow RTR frames to have a null data array
if ((flags & HAL_CAN_FD_DATALENGTH) && dataLength > 64) {
ThrowIllegalArgumentException(env, "FD frame has max length of 64 bytes");
return PARAMETER_OUT_OF_RANGE;
return HAL_PARAMETER_OUT_OF_RANGE;
} else if (!(flags & HAL_CAN_FD_DATALENGTH) && dataLength > 8) {
ThrowIllegalArgumentException(env,
"Non FD frame has max length of 8 bytes");
return PARAMETER_OUT_OF_RANGE;
return HAL_PARAMETER_OUT_OF_RANGE;
}
std::memset(&message, 0, sizeof(message));
message.flags = flags;
message.dataSize = dataLength;
} else if (!PackCANMessage(env, data, dataLength, flags, &message)) {
return PARAMETER_OUT_OF_RANGE;
return HAL_PARAMETER_OUT_OF_RANGE;
}
int32_t status = 0;

4
hal/src/main/native/cpp/jni/CANJNI.cpp
View File

@@ -59,7 +59,7 @@ Java_org_wpilib_hardware_hal_can_CANJNI_sendMessage
{
HAL_CANMessage message;
if (!PackCANMessage(env, data, dataLength, flags, &message)) {
return PARAMETER_OUT_OF_RANGE;
return HAL_PARAMETER_OUT_OF_RANGE;
}
int32_t status = 0;
@@ -220,7 +220,7 @@ Java_org_wpilib_hardware_hal_can_CANJNI_readCANStreamSession
if (javaLen < msg->message.message.dataSize) {
ThrowIllegalArgumentException(
env, "Message buffer not long enough for message");
return PARAMETER_OUT_OF_RANGE;
return HAL_PARAMETER_OUT_OF_RANGE;
}
env->SetByteArrayRegion(
toSetArray, 0, msg->message.message.dataSize,

5
hal/src/main/native/cpp/jni/HALUtil.cpp
View File

@@ -124,8 +124,9 @@ void ThrowError(JNIEnv* env, int32_t status, int32_t minRange, int32_t maxRange,
return;
}
const char* lastError = HAL_GetLastError(&status);
if (status == NO_AVAILABLE_RESOURCES || status == RESOURCE_IS_ALLOCATED ||
status == RESOURCE_OUT_OF_RANGE) {
if (status == HAL_NO_AVAILABLE_RESOURCES ||
status == HAL_RESOURCE_IS_ALLOCATED ||
status == HAL_RESOURCE_OUT_OF_RANGE) {
ThrowAllocationException(env, lastError, status);
return;
}