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] Rename HAL_kInvalidHandle to HAL_INVALID_HANDLE (#8698)

Browse Source
This commit is contained in:
Peter Johnson
2026-03-21 00:34:46 -07:00
committed by GitHub
parent 4e4ad9c498
commit b7122f0fda
72 changed files with 160 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hal/src/main/native/cpp/handles/HandlesInternal.cpp
View File

@@ -52,11 +52,11 @@ void HandleBase::ResetGlobalHandles() {
HAL_Handle createHandle(int16_t index, HAL_HandleEnum handleType,
int16_t version) {
if (index < 0) {
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
uint8_t hType = static_cast<uint8_t>(handleType);
if (hType == 0 || hType > 127) {
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
// set last 8 bits, then shift to first 8 bits
HAL_Handle handle = hType;

2
hal/src/main/native/cpp/jni/AddressableLEDJNI.cpp
View File

@@ -53,7 +53,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_hardware_hal_AddressableLEDJNI_free
(JNIEnv* env, jclass, jint handle)
{
if (handle != HAL_kInvalidHandle) {
if (handle != HAL_INVALID_HANDLE) {
HAL_FreeAddressableLED(static_cast<HAL_AddressableLEDHandle>(handle));
}
}

2
hal/src/main/native/cpp/jni/AlertJNI.cpp
View File

@@ -51,7 +51,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_hardware_hal_AlertJNI_destroyAlert
(JNIEnv* env, jclass, jint alertHandle)
{
if (alertHandle != HAL_kInvalidHandle) {
if (alertHandle != HAL_INVALID_HANDLE) {
HAL_DestroyAlert((HAL_AlertHandle)alertHandle);
}
}

2
hal/src/main/native/cpp/jni/AnalogInputJNI.cpp
View File

@@ -42,7 +42,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_hardware_hal_AnalogInputJNI_freeAnalogInputPort
(JNIEnv* env, jclass, jint id)
{
if (id != HAL_kInvalidHandle) {
if (id != HAL_INVALID_HANDLE) {
HAL_FreeAnalogInputPort((HAL_AnalogInputHandle)id);
}
}

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

@@ -48,7 +48,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_hardware_hal_CANAPIJNI_cleanCAN
(JNIEnv* env, jclass, jint handle)
{
if (handle != HAL_kInvalidHandle) {
if (handle != HAL_INVALID_HANDLE) {
HAL_CleanCAN(static_cast<HAL_CANHandle>(handle));
}
}

2
hal/src/main/native/cpp/jni/CTREPCMJNI.cpp
View File

@@ -40,7 +40,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_hardware_hal_CTREPCMJNI_free
(JNIEnv* env, jclass, jint handle)
{
if (handle != HAL_kInvalidHandle) {
if (handle != HAL_INVALID_HANDLE) {
HAL_FreeCTREPCM(handle);
}
}

2
hal/src/main/native/cpp/jni/CounterJNI.cpp
View File

@@ -42,7 +42,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_hardware_hal_CounterJNI_freeCounter
(JNIEnv* env, jclass, jint id)
{
if (id != HAL_kInvalidHandle) {
if (id != HAL_INVALID_HANDLE) {
HAL_FreeCounter((HAL_CounterHandle)id);
}
}

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

@@ -56,7 +56,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_hardware_hal_DIOJNI_freeDIOPort
(JNIEnv* env, jclass, jint id)
{
if (id != HAL_kInvalidHandle) {
if (id != HAL_INVALID_HANDLE) {
HAL_FreeDIOPort((HAL_DigitalHandle)id);
}
}
@@ -213,7 +213,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_hardware_hal_DIOJNI_freeDigitalPWM
(JNIEnv* env, jclass, jint id)
{
if (id != HAL_kInvalidHandle) {
if (id != HAL_INVALID_HANDLE) {
HAL_FreeDigitalPWM((HAL_DigitalPWMHandle)id);
}
}

2
hal/src/main/native/cpp/jni/DutyCycleJNI.cpp
View File

@@ -37,7 +37,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_hardware_hal_DutyCycleJNI_free
(JNIEnv*, jclass, jint handle)
{
if (handle != HAL_kInvalidHandle) {
if (handle != HAL_INVALID_HANDLE) {
HAL_FreeDutyCycle(static_cast<HAL_DutyCycleHandle>(handle));
}
}

2
hal/src/main/native/cpp/jni/EncoderJNI.cpp
View File

@@ -42,7 +42,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_hardware_hal_EncoderJNI_freeEncoder
(JNIEnv* env, jclass, jint id)
{
if (id != HAL_kInvalidHandle) {
if (id != HAL_INVALID_HANDLE) {
HAL_FreeEncoder((HAL_EncoderHandle)id);
}
}

2
hal/src/main/native/cpp/jni/NotifierJNI.cpp
View File

@@ -74,7 +74,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_hardware_hal_NotifierJNI_destroyNotifier
(JNIEnv* env, jclass, jint notifierHandle)
{
if (notifierHandle != HAL_kInvalidHandle) {
if (notifierHandle != HAL_INVALID_HANDLE) {
HAL_DestroyNotifier((HAL_NotifierHandle)notifierHandle);
}
}

2
hal/src/main/native/cpp/jni/PWMJNI.cpp
View File

@@ -55,7 +55,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_hardware_hal_PWMJNI_freePWMPort
(JNIEnv* env, jclass, jint id)
{
if (id != HAL_kInvalidHandle) {
if (id != HAL_INVALID_HANDLE) {
HAL_FreePWMPort((HAL_DigitalHandle)id);
}
}

2
hal/src/main/native/cpp/jni/PowerDistributionJNI.cpp
View File

@@ -50,7 +50,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_hardware_hal_PowerDistributionJNI_free
(JNIEnv*, jclass, jint handle)
{
if (handle != HAL_kInvalidHandle) {
if (handle != HAL_INVALID_HANDLE) {
HAL_CleanPowerDistribution(handle);
}
}

2
hal/src/main/native/cpp/jni/SerialPortJNI.cpp
View File

@@ -305,7 +305,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_hardware_hal_SerialPortJNI_serialClose
(JNIEnv* env, jclass, jint handle)
{
if (handle != HAL_kInvalidHandle) {
if (handle != HAL_INVALID_HANDLE) {
HAL_CloseSerial(static_cast<HAL_SerialPortHandle>(handle));
}
}

2
hal/src/main/native/cpp/jni/SimDeviceJNI.cpp
View File

@@ -62,7 +62,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_hardware_hal_SimDeviceJNI_freeSimDevice
(JNIEnv*, jclass, jint handle)
{
if (handle != HAL_kInvalidHandle) {
if (handle != HAL_INVALID_HANDLE) {
HAL_FreeSimDevice(handle);
}
}

2
hal/src/main/native/cpp/jni/simulation/BufferCallbackStore.cpp
View File

@@ -91,7 +91,7 @@ SIM_JniHandle sim::AllocateBufferCallback(
auto handle = callbackHandles->Allocate(callbackStore);
if (handle == HAL_kInvalidHandle) {
if (handle == HAL_INVALID_HANDLE) {
return -1;
}

6
hal/src/main/native/cpp/jni/simulation/CallbackStore.cpp
View File

@@ -100,7 +100,7 @@ SIM_JniHandle sim::AllocateCallback(JNIEnv* env, jint index, jobject callback,
auto handle = callbackHandles->Allocate(callbackStore);
if (handle == HAL_kInvalidHandle) {
if (handle == HAL_INVALID_HANDLE) {
return -1;
}
@@ -142,7 +142,7 @@ SIM_JniHandle sim::AllocateChannelCallback(
auto handle = callbackHandles->Allocate(callbackStore);
if (handle == HAL_kInvalidHandle) {
if (handle == HAL_INVALID_HANDLE) {
return -1;
}
@@ -186,7 +186,7 @@ SIM_JniHandle sim::AllocateCallbackNoIndex(
auto handle = callbackHandles->Allocate(callbackStore);
if (handle == HAL_kInvalidHandle) {
if (handle == HAL_INVALID_HANDLE) {
return -1;
}

2
hal/src/main/native/cpp/jni/simulation/ConstBufferCallbackStore.cpp
View File

@@ -84,7 +84,7 @@ SIM_JniHandle sim::AllocateConstBufferCallback(
auto handle = callbackHandles->Allocate(callbackStore);
if (handle == HAL_kInvalidHandle) {
if (handle == HAL_INVALID_HANDLE) {
return -1;
}

2
hal/src/main/native/cpp/jni/simulation/OpModeOptionsCallbackStore.cpp
View File

@@ -81,7 +81,7 @@ SIM_JniHandle sim::AllocateOpModeOptionsCallback(
auto handle = callbackHandles->Allocate(callbackStore);
if (handle == HAL_kInvalidHandle) {
if (handle == HAL_INVALID_HANDLE) {
return -1;
}

4
hal/src/main/native/cpp/jni/simulation/SimDeviceDataJNI.cpp
View File

@@ -211,7 +211,7 @@ static SIM_JniHandle AllocateDeviceCallback(
auto handle = deviceCallbackHandles->Allocate(callbackStore);
if (handle == HAL_kInvalidHandle) {
if (handle == HAL_INVALID_HANDLE) {
return -1;
}
@@ -268,7 +268,7 @@ static SIM_JniHandle AllocateValueCallback(
auto handle = valueCallbackHandles->Allocate(callbackStore);
if (handle == HAL_kInvalidHandle) {
if (handle == HAL_INVALID_HANDLE) {
return -1;
}