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] 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;
}

14
hal/src/main/native/include/wpi/hal/SimDevice.hpp
View File

@@ -54,7 +54,7 @@ class SimValue {
*
* @return False if handle is empty, true if handle is valid.
*/
explicit operator bool() const { return m_handle != HAL_kInvalidHandle; }
explicit operator bool() const { return m_handle != HAL_INVALID_HANDLE; }
/**
* Get the internal device handle.
@@ -78,7 +78,7 @@ class SimValue {
void SetValue(const HAL_Value& value) { HAL_SetSimValue(m_handle, value); }
protected:
HAL_SimValueHandle m_handle = HAL_kInvalidHandle;
HAL_SimValueHandle m_handle = HAL_INVALID_HANDLE;
};
/**
@@ -350,7 +350,7 @@ class SimDevice {
SimDevice(const char* name, int index, int channel);
~SimDevice() {
if (m_handle != HAL_kInvalidHandle) {
if (m_handle != HAL_INVALID_HANDLE) {
HAL_FreeSimDevice(m_handle);
}
}
@@ -359,12 +359,12 @@ class SimDevice {
SimDevice& operator=(const SimDevice&) = delete;
SimDevice(SimDevice&& rhs) : m_handle(rhs.m_handle) {
rhs.m_handle = HAL_kInvalidHandle;
rhs.m_handle = HAL_INVALID_HANDLE;
}
SimDevice& operator=(SimDevice&& rhs) {
m_handle = rhs.m_handle;
rhs.m_handle = HAL_kInvalidHandle;
rhs.m_handle = HAL_INVALID_HANDLE;
return *this;
}
@@ -374,7 +374,7 @@ class SimDevice {
*
* @return False if handle is empty, true if handle is valid.
*/
explicit operator bool() const { return m_handle != HAL_kInvalidHandle; }
explicit operator bool() const { return m_handle != HAL_INVALID_HANDLE; }
/**
* Get the internal device handle.
@@ -580,7 +580,7 @@ class SimDevice {
}
protected:
HAL_SimDeviceHandle m_handle = HAL_kInvalidHandle;
HAL_SimDeviceHandle m_handle = HAL_INVALID_HANDLE;
};
} // namespace wpi::hal

2
hal/src/main/native/include/wpi/hal/Types.h
View File

@@ -12,7 +12,7 @@
* @{
*/
#define HAL_kInvalidHandle 0
#define HAL_INVALID_HANDLE 0
typedef int32_t HAL_Handle;

2
hal/src/main/native/include/wpi/hal/Types.hpp
View File

@@ -12,7 +12,7 @@ namespace wpi::hal {
* Will free the handle if FreeFunction is provided
*/
template <typename CType, void (*FreeFunction)(CType) = nullptr,
int32_t CInvalid = HAL_kInvalidHandle>
int32_t CInvalid = HAL_INVALID_HANDLE>
class Handle {
public:
Handle() = default;

4
hal/src/main/native/include/wpi/hal/handles/DigitalHandleResource.hpp
View File

@@ -57,14 +57,14 @@ DigitalHandleResource<THandle, TStruct, size>::Allocate(
int16_t index, HAL_HandleEnum enumValue, THandle* handle, int32_t* status) {
// don't acquire the lock if we can fail early.
if (index < 0 || index >= size) {
*handle = HAL_kInvalidHandle;
*handle = HAL_INVALID_HANDLE;
*status = RESOURCE_OUT_OF_RANGE;
return nullptr;
}
std::scoped_lock lock(m_handleMutexes[index]);
// check for allocation, otherwise allocate and return a valid handle
if (m_structures[index] != nullptr) {
*handle = HAL_kInvalidHandle;
*handle = HAL_INVALID_HANDLE;
*status = RESOURCE_IS_ALLOCATED;
return m_structures[index];
}

4
hal/src/main/native/include/wpi/hal/handles/IndexedClassedHandleResource.hpp
View File

@@ -62,13 +62,13 @@ IndexedClassedHandleResource<THandle, TStruct, size, enumValue>::Allocate(
// don't acquire the lock if we can fail early.
if (index < 0 || index >= size) {
*status = RESOURCE_OUT_OF_RANGE;
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
std::scoped_lock lock(m_handleMutexes[index]);
// check for allocation, otherwise allocate and return a valid handle
if (m_structures[index] != nullptr) {
*status = RESOURCE_IS_ALLOCATED;
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
m_structures[index] = toSet;
return static_cast<THandle>(

4
hal/src/main/native/include/wpi/hal/handles/IndexedHandleResource.hpp
View File

@@ -60,14 +60,14 @@ IndexedHandleResource<THandle, TStruct, size, enumValue>::Allocate(
// don't acquire the lock if we can fail early.
if (index < 0 || index >= size) {
*status = RESOURCE_OUT_OF_RANGE;
*handle = HAL_kInvalidHandle;
*handle = HAL_INVALID_HANDLE;
return nullptr;
}
std::scoped_lock lock(m_handleMutexes[index]);
// check for allocation, otherwise allocate and return a valid handle
if (m_structures[index] != nullptr) {
*status = RESOURCE_IS_ALLOCATED;
*handle = HAL_kInvalidHandle;
*handle = HAL_INVALID_HANDLE;
return m_structures[index];
}
m_structures[index] = std::make_shared<TStruct>();

2
hal/src/main/native/include/wpi/hal/handles/LimitedClassedHandleResource.hpp
View File

@@ -67,7 +67,7 @@ LimitedClassedHandleResource<THandle, TStruct, size, enumValue>::Allocate(
return static_cast<THandle>(createHandle(i, enumValue, m_version));
}
}
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
template <typename THandle, typename TStruct, int16_t size,

2
hal/src/main/native/include/wpi/hal/handles/LimitedHandleResource.hpp
View File

@@ -63,7 +63,7 @@ THandle LimitedHandleResource<THandle, TStruct, size, enumValue>::Allocate() {
return static_cast<THandle>(createHandle(i, enumValue, m_version));
}
}
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
template <typename THandle, typename TStruct, int16_t size,

2
hal/src/main/native/include/wpi/hal/handles/UnlimitedHandleResource.hpp
View File

@@ -71,7 +71,7 @@ THandle UnlimitedHandleResource<THandle, TStruct, enumValue>::Allocate(
}
}
if (i >= INT16_MAX) {
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
m_structures.push_back(structure);

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

@@ -30,7 +30,7 @@ HAL_AddressableLEDHandle HAL_InitializeAddressableLED(
wpi::hal::SetLastErrorIndexOutOfRange(status,
"Invalid Index for AddressableLED", 0,
kNumAddressableLEDs, channel);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
HAL_DigitalHandle handle;
@@ -47,7 +47,7 @@ HAL_AddressableLEDHandle HAL_InitializeAddressableLED(
"Invalid Index for AddressableLED",
0, kNumAddressableLEDs, channel);
}
return HAL_kInvalidHandle; // failed to allocate. Pass error back.
return HAL_INVALID_HANDLE; // failed to allocate. Pass error back.
}
port->channel = static_cast<uint8_t>(channel);

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

@@ -52,9 +52,9 @@ HAL_AlertHandle HAL_CreateAlert(const WPI_String* group, const WPI_String* text,
std::shared_ptr<Alert> alert = std::make_shared<Alert>(
wpi::util::to_string_view(group), wpi::util::to_string_view(text), level);
HAL_AlertHandle handle = alertHandles->Allocate(alert);
if (handle == HAL_kInvalidHandle) {
if (handle == HAL_INVALID_HANDLE) {
*status = HAL_HANDLE_ERROR;
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
return handle;
}

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

@@ -24,7 +24,7 @@ HAL_AnalogInputHandle HAL_InitializeAnalogInputPort(
*status = RESOURCE_OUT_OF_RANGE;
wpi::hal::SetLastErrorIndexOutOfRange(
status, "Invalid Index for Analog Input", 0, kNumAnalogInputs, channel);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
HAL_AnalogInputHandle handle;
@@ -39,7 +39,7 @@ HAL_AnalogInputHandle HAL_InitializeAnalogInputPort(
"Invalid Index for Analog Input", 0,
kNumAnalogInputs, channel);
}
return HAL_kInvalidHandle; // failed to allocate. Pass error back.
return HAL_INVALID_HANDLE; // failed to allocate. Pass error back.
}
analog_port->channel = static_cast<uint8_t>(channel);

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

@@ -72,16 +72,16 @@ HAL_CANHandle HAL_InitializeCAN(int32_t busId, HAL_CANManufacturer manufacturer,
if (busId < 0 || busId > wpi::hal::kNumCanBuses) {
*status = PARAMETER_OUT_OF_RANGE;
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
auto can = std::make_shared<CANStorage>();
auto handle = canHandles->Allocate(can);
if (handle == HAL_kInvalidHandle) {
if (handle == HAL_INVALID_HANDLE) {
*status = NO_AVAILABLE_RESOURCES;
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
can->busId = busId;

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

@@ -52,7 +52,7 @@ HAL_CTREPCMHandle HAL_InitializeCTREPCM(int32_t busId, int32_t module,
"Invalid Index for CTRE PCM", 0,
kNumCTREPCMModules - 1, module);
}
return HAL_kInvalidHandle; // failed to allocate. Pass error back.
return HAL_INVALID_HANDLE; // failed to allocate. Pass error back.
}
pcm->previousAllocation = allocationLocation ? allocationLocation : "";

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

@@ -40,7 +40,7 @@ HAL_DigitalHandle HAL_InitializeDIOPort(int32_t channel, HAL_Bool input,
*status = RESOURCE_OUT_OF_RANGE;
wpi::hal::SetLastErrorIndexOutOfRange(status, "Invalid Index for DIO", 0,
kNumDigitalChannels, channel);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
HAL_DigitalHandle handle;
@@ -56,7 +56,7 @@ HAL_DigitalHandle HAL_InitializeDIOPort(int32_t channel, HAL_Bool input,
wpi::hal::SetLastErrorIndexOutOfRange(status, "Invalid Index for DIO", 0,
kNumDigitalChannels, channel);
}
return HAL_kInvalidHandle; // failed to allocate. Pass error back.
return HAL_INVALID_HANDLE; // failed to allocate. Pass error back.
}
port->channel = static_cast<uint8_t>(channel);
@@ -94,15 +94,15 @@ void HAL_SetDIOSimDevice(HAL_DigitalHandle handle, HAL_SimDeviceHandle device) {
HAL_DigitalPWMHandle HAL_AllocateDigitalPWM(int32_t* status) {
auto handle = digitalPWMHandles->Allocate();
if (handle == HAL_kInvalidHandle) {
if (handle == HAL_INVALID_HANDLE) {
*status = NO_AVAILABLE_RESOURCES;
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
auto id = digitalPWMHandles->Get(handle);
if (id == nullptr) { // would only occur on thread issue.
*status = HAL_HANDLE_ERROR;
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
*id = static_cast<uint8_t>(getHandleIndex(handle));

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

@@ -42,7 +42,7 @@ HAL_DutyCycleHandle HAL_InitializeDutyCycle(int32_t channel,
int32_t* status) {
wpi::hal::init::CheckInit();
HAL_DutyCycleHandle handle = HAL_kInvalidHandle;
HAL_DutyCycleHandle handle = HAL_INVALID_HANDLE;
auto dutyCycle = dutyCycleHandles->Allocate(channel, &handle, status);
if (*status != 0) {
@@ -53,7 +53,7 @@ HAL_DutyCycleHandle HAL_InitializeDutyCycle(int32_t channel,
wpi::hal::SetLastErrorIndexOutOfRange(
status, "Invalid Index for Duty Cycle", 0, kNumDutyCycles, channel);
}
return HAL_kInvalidHandle; // failed to allocate. Pass error back.
return HAL_INVALID_HANDLE; // failed to allocate. Pass error back.
}
int16_t index = getHandleIndex(handle);

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

@@ -71,7 +71,7 @@ HAL_EncoderHandle HAL_InitializeEncoder(int32_t aChannel, int32_t bChannel,
HAL_EncoderEncodingType encodingType,
int32_t* status) {
wpi::hal::init::CheckInit();
HAL_Handle nativeHandle = HAL_kInvalidHandle;
HAL_Handle nativeHandle = HAL_INVALID_HANDLE;
if (encodingType == HAL_EncoderEncodingType::HAL_ENCODER_4X_ENCODING) {
// k4x, allocate encoder
nativeHandle = fpgaEncoderHandles->Allocate();
@@ -79,19 +79,19 @@ HAL_EncoderHandle HAL_InitializeEncoder(int32_t aChannel, int32_t bChannel,
// k2x or k1x, allocate counter
nativeHandle = counterHandles->Allocate();
}
if (nativeHandle == HAL_kInvalidHandle) {
if (nativeHandle == HAL_INVALID_HANDLE) {
*status = NO_AVAILABLE_RESOURCES;
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
auto handle = encoderHandles->Allocate();
if (handle == HAL_kInvalidHandle) {
if (handle == HAL_INVALID_HANDLE) {
*status = NO_AVAILABLE_RESOURCES;
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
auto encoder = encoderHandles->Get(handle);
if (encoder == nullptr) { // would only occur on thread issue
*status = HAL_HANDLE_ERROR;
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
int16_t index = getHandleIndex(handle);
SimEncoderData[index].digitalChannelA = aChannel;
@@ -106,9 +106,9 @@ HAL_EncoderHandle HAL_InitializeEncoder(int32_t aChannel, int32_t bChannel,
encoder->distancePerPulse = 1.0;
if (encodingType == HAL_EncoderEncodingType::HAL_ENCODER_4X_ENCODING) {
encoder->fpgaHandle = nativeHandle;
encoder->counterHandle = HAL_kInvalidHandle;
encoder->counterHandle = HAL_INVALID_HANDLE;
} else {
encoder->fpgaHandle = HAL_kInvalidHandle;
encoder->fpgaHandle = HAL_INVALID_HANDLE;
encoder->counterHandle = nativeHandle;
}
return handle;

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

@@ -216,9 +216,9 @@ HAL_NotifierHandle HAL_CreateNotifier(int32_t* status) {
std::shared_ptr<Notifier> notifier = std::make_shared<Notifier>();
HAL_NotifierHandle handle =
notifierInstance->owner.GetThread()->m_handles.Allocate(notifier);
if (handle == HAL_kInvalidHandle) {
if (handle == HAL_INVALID_HANDLE) {
*status = HAL_HANDLE_ERROR;
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
wpi::util::CreateSignalObject(handle);
return handle;

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

@@ -30,7 +30,7 @@ HAL_DigitalHandle HAL_InitializePWMPort(int32_t channel,
*status = RESOURCE_OUT_OF_RANGE;
wpi::hal::SetLastErrorIndexOutOfRange(status, "Invalid Index for PWM", 0,
kNumPWMChannels, channel);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
uint8_t origChannel = static_cast<uint8_t>(channel);
@@ -54,7 +54,7 @@ HAL_DigitalHandle HAL_InitializePWMPort(int32_t channel,
wpi::hal::SetLastErrorIndexOutOfRange(status, "Invalid Index for PWM", 0,
kNumPWMChannels, channel);
}
return HAL_kInvalidHandle; // failed to allocate. Pass error back.
return HAL_INVALID_HANDLE; // failed to allocate. Pass error back.
}
port->channel = origChannel;

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

@@ -35,7 +35,7 @@ HAL_PowerDistributionHandle HAL_InitializePowerDistribution(
*status = PARAMETER_OUT_OF_RANGE;
wpi::hal::SetLastError(
status, "Automatic PowerDistributionType must have default module");
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
// TODO Make this not matter
@@ -53,7 +53,7 @@ HAL_PowerDistributionHandle HAL_InitializePowerDistribution(
wpi::hal::SetLastErrorIndexOutOfRange(status, "Invalid Index for REV PDH",
1, kNumREVPDHModules, module);
}
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
wpi::hal::init::CheckInit();
SimPowerDistributionData[module].initialized = true;
@@ -62,7 +62,7 @@ HAL_PowerDistributionHandle HAL_InitializePowerDistribution(
if (*status != 0) {
HAL_CleanCAN(handle);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
return handle;

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

@@ -44,7 +44,7 @@ HAL_REVPHHandle HAL_InitializeREVPH(int32_t busId, int32_t module,
*status = RESOURCE_OUT_OF_RANGE;
wpi::hal::SetLastErrorIndexOutOfRange(status, "Invalid Index for REV PH", 1,
kNumREVPHModules, module);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
HAL_REVPHHandle handle;
@@ -59,7 +59,7 @@ HAL_REVPHHandle HAL_InitializeREVPH(int32_t busId, int32_t module,
wpi::hal::SetLastErrorIndexOutOfRange(status, "Invalid Index for REV PH",
1, kNumREVPHModules, module);
}
return HAL_kInvalidHandle; // failed to allocate. Pass error back.
return HAL_INVALID_HANDLE; // failed to allocate. Pass error back.
}
pcm->previousAllocation = allocationLocation ? allocationLocation : "";

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

@@ -14,14 +14,14 @@ extern "C" {
HAL_SerialPortHandle HAL_InitializeSerialPort(HAL_SerialPort port,
int32_t* status) {
wpi::hal::init::CheckInit();
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
HAL_SerialPortHandle HAL_InitializeSerialPortDirect(HAL_SerialPort port,
const char* portName,
int32_t* status) {
wpi::hal::init::CheckInit();
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
int HAL_GetSerialFD(HAL_SerialPortHandle handle, int32_t* status) {

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

@@ -92,7 +92,7 @@ HAL_AddressableLEDHandle HAL_InitializeAddressableLED(
*status = RESOURCE_OUT_OF_RANGE;
wpi::hal::SetLastErrorIndexOutOfRange(
status, "Invalid Index for AddressableLED", 0, kNumSmartIo, channel);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
HAL_DigitalHandle handle;
@@ -108,7 +108,7 @@ HAL_AddressableLEDHandle HAL_InitializeAddressableLED(
wpi::hal::SetLastErrorIndexOutOfRange(
status, "Invalid Index for AddressableLED", 0, kNumSmartIo, channel);
}
return HAL_kInvalidHandle; // failed to allocate. Pass error back.
return HAL_INVALID_HANDLE; // failed to allocate. Pass error back.
}
port->channel = channel;
@@ -116,7 +116,7 @@ HAL_AddressableLEDHandle HAL_InitializeAddressableLED(
*status = port->InitializeMode(SmartIoMode::AddressableLED);
if (*status != 0) {
smartIoHandles->Free(handle, HAL_HandleEnum::ADDRESSABLE_LED);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
port->previousAllocation = allocationLocation ? allocationLocation : "";

4
hal/src/main/native/systemcore/Alert.cpp
View File

@@ -52,9 +52,9 @@ HAL_AlertHandle HAL_CreateAlert(const WPI_String* group, const WPI_String* text,
std::shared_ptr<Alert> alert = std::make_shared<Alert>(
wpi::util::to_string_view(group), wpi::util::to_string_view(text), level);
HAL_AlertHandle handle = alertHandles->Allocate(alert);
if (handle == HAL_kInvalidHandle) {
if (handle == HAL_INVALID_HANDLE) {
*status = HAL_HANDLE_ERROR;
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
return handle;
}

6
hal/src/main/native/systemcore/AnalogInput.cpp
View File

@@ -31,7 +31,7 @@ HAL_AnalogInputHandle HAL_InitializeAnalogInputPort(
*status = RESOURCE_OUT_OF_RANGE;
wpi::hal::SetLastErrorIndexOutOfRange(status, "Invalid Index for Analog", 0,
kNumSmartIo, channel);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
HAL_DigitalHandle handle;
@@ -47,7 +47,7 @@ HAL_AnalogInputHandle HAL_InitializeAnalogInputPort(
wpi::hal::SetLastErrorIndexOutOfRange(status, "Invalid Index for Analog",
0, kNumSmartIo, channel);
}
return HAL_kInvalidHandle; // failed to allocate. Pass error back.
return HAL_INVALID_HANDLE; // failed to allocate. Pass error back.
}
port->channel = channel;
@@ -55,7 +55,7 @@ HAL_AnalogInputHandle HAL_InitializeAnalogInputPort(
*status = port->InitializeMode(SmartIoMode::AnalogInput);
if (*status != 0) {
smartIoHandles->Free(handle, HAL_HandleEnum::ANALOG_INPUT);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
port->previousAllocation = allocationLocation ? allocationLocation : "";

6
hal/src/main/native/systemcore/CAN.cpp
View File

@@ -428,7 +428,7 @@ HAL_CANStreamHandle HAL_CAN_OpenStreamSession(int32_t busId, uint32_t messageId,
int32_t* status) {
if (busId < 0 || busId >= wpi::hal::kNumCanBuses) {
*status = PARAMETER_OUT_OF_RANGE;
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
auto can = std::make_shared<CANStreamStorage>(maxMessages, busId,
@@ -436,9 +436,9 @@ HAL_CANStreamHandle HAL_CAN_OpenStreamSession(int32_t busId, uint32_t messageId,
auto handle = canStreamHandles->Allocate(can);
if (handle == HAL_kInvalidHandle) {
if (handle == HAL_INVALID_HANDLE) {
*status = NO_AVAILABLE_RESOURCES;
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
std::scoped_lock lock{canState->readMutex[can->canBusId]};

6
hal/src/main/native/systemcore/CANAPI.cpp
View File

@@ -60,16 +60,16 @@ HAL_CANHandle HAL_InitializeCAN(int32_t busId, HAL_CANManufacturer manufacturer,
if (busId < 0 || busId > wpi::hal::kNumCanBuses) {
*status = PARAMETER_OUT_OF_RANGE;
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
auto can = std::make_shared<CANStorage>();
auto handle = canHandles->Allocate(can);
if (handle == HAL_kInvalidHandle) {
if (handle == HAL_INVALID_HANDLE) {
*status = NO_AVAILABLE_RESOURCES;
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
can->busId = busId;

6
hal/src/main/native/systemcore/CTREPCM.cpp
View File

@@ -192,14 +192,14 @@ HAL_CTREPCMHandle HAL_InitializeCTREPCM(int32_t busId, int32_t module,
"Invalid Index for CTRE PCM", 0,
kNumCTREPCMModules - 1, module);
}
return HAL_kInvalidHandle; // failed to allocate. Pass error back.
return HAL_INVALID_HANDLE; // failed to allocate. Pass error back.
}
pcm->canHandle =
HAL_InitializeCAN(busId, manufacturer, module, deviceType, status);
if (*status != 0) {
pcmHandles->Free(handle);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
std::memset(&pcm->oneShot, 0, sizeof(pcm->oneShot));
@@ -211,7 +211,7 @@ HAL_CTREPCMHandle HAL_InitializeCTREPCM(int32_t busId, int32_t module,
HAL_SetCTREPCMClosedLoopControl(handle, true, status);
if (*status != 0) {
HAL_FreeCTREPCM(handle);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
return handle;
}

6
hal/src/main/native/systemcore/CTREPDP.cpp
View File

@@ -136,7 +136,7 @@ HAL_PDPHandle HAL_InitializePDP(int32_t busId, int32_t module,
*status = RESOURCE_OUT_OF_RANGE;
wpi::hal::SetLastErrorIndexOutOfRange(status, "Invalid Index for CTRE PDP",
0, kNumCTREPDPModules - 1, module);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
HAL_PDPHandle handle;
@@ -151,14 +151,14 @@ HAL_PDPHandle HAL_InitializePDP(int32_t busId, int32_t module,
"Invalid Index for CTRE PDP", 0,
kNumCTREPDPModules - 1, module);
}
return HAL_kInvalidHandle; // failed to allocate. Pass error back.
return HAL_INVALID_HANDLE; // failed to allocate. Pass error back.
}
pdp->canHandle =
HAL_InitializeCAN(busId, manufacturer, module, deviceType, status);
if (*status != 0) {
pdpHandles->Free(handle);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
pdp->previousAllocation = allocationLocation ? allocationLocation : "";

6
hal/src/main/native/systemcore/Counter.cpp
View File

@@ -31,7 +31,7 @@ HAL_CounterHandle HAL_InitializeCounter(int channel, HAL_Bool risingEdge,
*status = RESOURCE_OUT_OF_RANGE;
wpi::hal::SetLastErrorIndexOutOfRange(status, "Invalid Index for Counter",
0, kNumSmartIo, channel);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
HAL_CounterHandle handle;
@@ -47,7 +47,7 @@ HAL_CounterHandle HAL_InitializeCounter(int channel, HAL_Bool risingEdge,
wpi::hal::SetLastErrorIndexOutOfRange(status, "Invalid Index for Counter",
0, kNumSmartIo, channel);
}
return HAL_kInvalidHandle; // failed to allocate. Pass error back.
return HAL_INVALID_HANDLE; // failed to allocate. Pass error back.
}
port->channel = channel;
@@ -57,7 +57,7 @@ HAL_CounterHandle HAL_InitializeCounter(int channel, HAL_Bool risingEdge,
: SmartIoMode::SingleCounterFalling);
if (*status != 0) {
smartIoHandles->Free(handle, HAL_HandleEnum::COUNTER);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
port->previousAllocation = allocationLocation ? allocationLocation : "";

8
hal/src/main/native/systemcore/DIO.cpp
View File

@@ -33,7 +33,7 @@ HAL_DigitalHandle HAL_InitializeDIOPort(int32_t channel, HAL_Bool input,
*status = RESOURCE_OUT_OF_RANGE;
wpi::hal::SetLastErrorIndexOutOfRange(status, "Invalid Index for DIO", 0,
kNumSmartIo, channel);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
HAL_DigitalHandle handle;
@@ -49,7 +49,7 @@ HAL_DigitalHandle HAL_InitializeDIOPort(int32_t channel, HAL_Bool input,
wpi::hal::SetLastErrorIndexOutOfRange(status, "Invalid Index for DIO", 0,
kNumSmartIo, channel);
}
return HAL_kInvalidHandle; // failed to allocate. Pass error back.
return HAL_INVALID_HANDLE; // failed to allocate. Pass error back.
}
port->channel = channel;
@@ -58,7 +58,7 @@ HAL_DigitalHandle HAL_InitializeDIOPort(int32_t channel, HAL_Bool input,
: SmartIoMode::DigitalOutput);
if (*status != 0) {
smartIoHandles->Free(handle, HAL_HandleEnum::DIO);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
port->previousAllocation = allocationLocation ? allocationLocation : "";
@@ -96,7 +96,7 @@ void HAL_SetDIOSimDevice(HAL_DigitalHandle handle, HAL_SimDeviceHandle device) {
HAL_DigitalPWMHandle HAL_AllocateDigitalPWM(int32_t* status) {
*status = HAL_HANDLE_ERROR;
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
void HAL_FreeDigitalPWM(HAL_DigitalPWMHandle pwmGenerator) {}

6
hal/src/main/native/systemcore/DutyCycle.cpp
View File

@@ -31,7 +31,7 @@ HAL_DutyCycleHandle HAL_InitializeDutyCycle(int32_t channel,
*status = RESOURCE_OUT_OF_RANGE;
wpi::hal::SetLastErrorIndexOutOfRange(status, "Invalid Index for DutyCycle",
0, kNumSmartIo, channel);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
HAL_DigitalHandle handle;
@@ -47,7 +47,7 @@ HAL_DutyCycleHandle HAL_InitializeDutyCycle(int32_t channel,
wpi::hal::SetLastErrorIndexOutOfRange(
status, "Invalid Index for DutyCycle", 0, kNumSmartIo, channel);
}
return HAL_kInvalidHandle; // failed to allocate. Pass error back.
return HAL_INVALID_HANDLE; // failed to allocate. Pass error back.
}
port->channel = channel;
@@ -55,7 +55,7 @@ HAL_DutyCycleHandle HAL_InitializeDutyCycle(int32_t channel,
*status = port->InitializeMode(SmartIoMode::PwmInput);
if (*status != 0) {
smartIoHandles->Free(handle, HAL_HandleEnum::DUTY_CYCLE);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
port->previousAllocation = allocationLocation ? allocationLocation : "";

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

@@ -22,7 +22,7 @@ HAL_EncoderHandle HAL_InitializeEncoder(int32_t aChannel, int32_t bChannel,
int32_t* status) {
wpi::hal::init::CheckInit();
*status = HAL_HANDLE_ERROR;
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
void HAL_FreeEncoder(HAL_EncoderHandle encoderHandle) {}

4
hal/src/main/native/systemcore/Notifier.cpp
View File

@@ -142,9 +142,9 @@ HAL_NotifierHandle HAL_CreateNotifier(int32_t* status) {
std::shared_ptr<Notifier> notifier = std::make_shared<Notifier>();
HAL_NotifierHandle handle =
notifierInstance->owner.GetThread()->m_handles.Allocate(notifier);
if (handle == HAL_kInvalidHandle) {
if (handle == HAL_INVALID_HANDLE) {
*status = HAL_HANDLE_ERROR;
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
wpi::util::CreateSignalObject(handle);
return handle;

8
hal/src/main/native/systemcore/PWM.cpp
View File

@@ -35,7 +35,7 @@ HAL_DigitalHandle HAL_InitializePWMPort(int32_t channel,
*status = RESOURCE_OUT_OF_RANGE;
wpi::hal::SetLastErrorIndexOutOfRange(status, "Invalid Index for PWM", 0,
kNumSmartIo, channel);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
HAL_DigitalHandle handle;
@@ -51,7 +51,7 @@ HAL_DigitalHandle HAL_InitializePWMPort(int32_t channel,
wpi::hal::SetLastErrorIndexOutOfRange(status, "Invalid Index for PWM", 0,
kNumSmartIo, channel);
}
return HAL_kInvalidHandle; // failed to allocate. Pass error back.
return HAL_INVALID_HANDLE; // failed to allocate. Pass error back.
}
port->channel = channel;
@@ -59,14 +59,14 @@ HAL_DigitalHandle HAL_InitializePWMPort(int32_t channel,
*status = port->InitializeMode(SmartIoMode::PwmOutput);
if (*status != 0) {
smartIoHandles->Free(handle, HAL_HandleEnum::PWM);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
// Disable the PWM output.
HAL_SetPWMPulseTimeMicroseconds(handle, 0, status);
if (*status != 0) {
smartIoHandles->Free(handle, HAL_HandleEnum::PWM);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
port->previousAllocation = allocationLocation ? allocationLocation : "";

4
hal/src/main/native/systemcore/PowerDistribution.cpp
View File

@@ -27,7 +27,7 @@ HAL_PowerDistributionHandle HAL_InitializePowerDistribution(
*status = PARAMETER_OUT_OF_RANGE;
wpi::hal::SetLastError(
status, "Automatic PowerDistributionType must have default module");
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
uint64_t waitTime = wpi::hal::GetDSInitializeTime() + 400000;
@@ -44,7 +44,7 @@ HAL_PowerDistributionHandle HAL_InitializePowerDistribution(
// Try PDP first
auto pdpHandle = HAL_InitializePDP(busId, 0, allocationLocation, status);
if (pdpHandle != HAL_kInvalidHandle) {
if (pdpHandle != HAL_INVALID_HANDLE) {
*status = 0;
HAL_GetPDPVoltage(pdpHandle, status);
if (*status == 0 || *status == HAL_CAN_TIMEOUT) {

6
hal/src/main/native/systemcore/REVPDH.cpp
View File

@@ -196,7 +196,7 @@ HAL_REVPDHHandle HAL_InitializeREVPDH(int32_t busId, int32_t module,
*status = RESOURCE_OUT_OF_RANGE;
wpi::hal::SetLastErrorIndexOutOfRange(status, "Invalid Index for REV PDH",
1, kNumREVPDHModules, module);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
HAL_REVPDHHandle handle;
@@ -210,7 +210,7 @@ HAL_REVPDHHandle HAL_InitializeREVPDH(int32_t busId, int32_t module,
wpi::hal::SetLastErrorIndexOutOfRange(status, "Invalid Index for REV PDH",
1, kNumREVPDHModules, module);
}
return HAL_kInvalidHandle; // failed to allocate. Pass error back.
return HAL_INVALID_HANDLE; // failed to allocate. Pass error back.
}
HAL_CANHandle hcan =
@@ -218,7 +218,7 @@ HAL_REVPDHHandle HAL_InitializeREVPDH(int32_t busId, int32_t module,
if (*status != 0) {
REVPDHHandles->Free(handle);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
hpdh->previousAllocation = allocationLocation ? allocationLocation : "";

6
hal/src/main/native/systemcore/REVPH.cpp
View File

@@ -199,7 +199,7 @@ HAL_REVPHHandle HAL_InitializeREVPH(int32_t busId, int32_t module,
*status = RESOURCE_OUT_OF_RANGE;
wpi::hal::SetLastErrorIndexOutOfRange(status, "Invalid Index for REV PH", 1,
kNumREVPHModules, module);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
HAL_REVPHHandle handle;
@@ -213,7 +213,7 @@ HAL_REVPHHandle HAL_InitializeREVPH(int32_t busId, int32_t module,
wpi::hal::SetLastErrorIndexOutOfRange(status, "Invalid Index for REV PH",
1, kNumREVPHModules, module);
}
return HAL_kInvalidHandle; // failed to allocate. Pass error back.
return HAL_INVALID_HANDLE; // failed to allocate. Pass error back.
}
HAL_CANHandle hcan =
@@ -221,7 +221,7 @@ HAL_REVPHHandle HAL_InitializeREVPH(int32_t busId, int32_t module,
if (*status != 0) {
REVPHHandles->Free(handle);
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
hph->previousAllocation = allocationLocation ? allocationLocation : "";

4
hal/src/main/native/systemcore/SerialPort.cpp
View File

@@ -34,13 +34,13 @@ HAL_SerialPortHandle HAL_InitializeSerialPort(HAL_SerialPort port,
// wpi::hal::init::CheckInit();
*status = HAL_HANDLE_ERROR;
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
HAL_SerialPortHandle HAL_InitializeSerialPortDirect(HAL_SerialPort port,
const char* portName,
int32_t* status) {
*status = HAL_HANDLE_ERROR;
return HAL_kInvalidHandle;
return HAL_INVALID_HANDLE;
}
void HAL_CloseSerial(HAL_SerialPortHandle handle) {}

2
hal/src/test/native/cpp/can/CANTest.cpp
View File

@@ -20,7 +20,7 @@ struct CANTestStore {
}
~CANTestStore() {
if (handle != HAL_kInvalidHandle) {
if (handle != HAL_INVALID_HANDLE) {
HAL_CleanCAN(handle);
}
}

8
hal/src/test/native/cpp/mockdata/AnalogInDataTest.cpp
View File

@@ -41,7 +41,7 @@ TEST(AnalogInSimTest, AnalogInInitialization) {
channel = 8000;
gTestAnalogInCallbackName = "Unset";
analogInHandle = HAL_InitializeAnalogInputPort(channel, nullptr, &status);
EXPECT_EQ(HAL_kInvalidHandle, analogInHandle);
EXPECT_EQ(HAL_INVALID_HANDLE, analogInHandle);
EXPECT_EQ(HAL_USE_LAST_ERROR, status);
HAL_GetLastError(&status);
EXPECT_EQ(RESOURCE_OUT_OF_RANGE, status);
@@ -52,7 +52,7 @@ TEST(AnalogInSimTest, AnalogInInitialization) {
channel = INDEX_TO_TEST;
gTestAnalogInCallbackName = "Unset";
analogInHandle = HAL_InitializeAnalogInputPort(channel, nullptr, &status);
EXPECT_TRUE(HAL_kInvalidHandle != analogInHandle);
EXPECT_TRUE(HAL_INVALID_HANDLE != analogInHandle);
EXPECT_EQ(0, status);
EXPECT_STREQ("Initialized", gTestAnalogInCallbackName.c_str());
@@ -61,7 +61,7 @@ TEST(AnalogInSimTest, AnalogInInitialization) {
channel = INDEX_TO_TEST;
gTestAnalogInCallbackName = "Unset";
analogInHandle = HAL_InitializeAnalogInputPort(channel, nullptr, &status);
EXPECT_EQ(HAL_kInvalidHandle, analogInHandle);
EXPECT_EQ(HAL_INVALID_HANDLE, analogInHandle);
EXPECT_EQ(HAL_USE_LAST_ERROR, status);
HAL_GetLastError(&status);
EXPECT_EQ(RESOURCE_IS_ALLOCATED, status);
@@ -78,7 +78,7 @@ TEST(AnalogInSimTest, AnalogInInitialization) {
channel = INDEX_TO_TEST;
gTestAnalogInCallbackName = "Unset";
analogInHandle = HAL_InitializeAnalogInputPort(channel, nullptr, &status);
EXPECT_TRUE(HAL_kInvalidHandle != analogInHandle);
EXPECT_TRUE(HAL_INVALID_HANDLE != analogInHandle);
EXPECT_EQ(0, status);
EXPECT_STREQ("Initialized", gTestAnalogInCallbackName.c_str());
HALSIM_CancelAnalogInInitializedCallback(INDEX_TO_TEST, callbackId);

8
hal/src/test/native/cpp/mockdata/DIODataTest.cpp
View File

@@ -41,7 +41,7 @@ TEST(DigitalIoSimTest, DigitalIoInitialization) {
channel = 8000;
gTestDigitalIoCallbackName = "Unset";
digitalIoHandle = HAL_InitializeDIOPort(channel, true, nullptr, &status);
EXPECT_EQ(HAL_kInvalidHandle, digitalIoHandle);
EXPECT_EQ(HAL_INVALID_HANDLE, digitalIoHandle);
EXPECT_EQ(HAL_USE_LAST_ERROR, status);
HAL_GetLastError(&status);
EXPECT_EQ(RESOURCE_OUT_OF_RANGE, status);
@@ -52,7 +52,7 @@ TEST(DigitalIoSimTest, DigitalIoInitialization) {
channel = INDEX_TO_TEST;
gTestDigitalIoCallbackName = "Unset";
digitalIoHandle = HAL_InitializeDIOPort(channel, true, nullptr, &status);
EXPECT_TRUE(HAL_kInvalidHandle != digitalIoHandle);
EXPECT_TRUE(HAL_INVALID_HANDLE != digitalIoHandle);
EXPECT_EQ(0, status);
EXPECT_STREQ("Initialized", gTestDigitalIoCallbackName.c_str());
@@ -61,7 +61,7 @@ TEST(DigitalIoSimTest, DigitalIoInitialization) {
channel = INDEX_TO_TEST;
gTestDigitalIoCallbackName = "Unset";
digitalIoHandle = HAL_InitializeDIOPort(channel, true, nullptr, &status);
EXPECT_EQ(HAL_kInvalidHandle, digitalIoHandle);
EXPECT_EQ(HAL_INVALID_HANDLE, digitalIoHandle);
EXPECT_EQ(HAL_USE_LAST_ERROR, status);
HAL_GetLastError(&status);
EXPECT_EQ(RESOURCE_IS_ALLOCATED, status);
@@ -78,7 +78,7 @@ TEST(DigitalIoSimTest, DigitalIoInitialization) {
channel = INDEX_TO_TEST;
gTestDigitalIoCallbackName = "Unset";
digitalIoHandle = HAL_InitializeDIOPort(channel, true, nullptr, &status);
EXPECT_TRUE(HAL_kInvalidHandle != digitalIoHandle);
EXPECT_TRUE(HAL_INVALID_HANDLE != digitalIoHandle);
EXPECT_EQ(0, status);
EXPECT_STREQ("Initialized", gTestDigitalIoCallbackName.c_str());
HALSIM_CancelDIOInitializedCallback(INDEX_TO_TEST, callbackId);

8
hal/src/test/native/cpp/mockdata/PCMDataTest.cpp
View File

@@ -40,7 +40,7 @@ TEST(PCMDataTest, PCMInitialization) {
module = 8000;
gTestSolenoidCallbackName = "Unset";
pcmHandle = HAL_InitializeCTREPCM(0, module, nullptr, &status);
EXPECT_EQ(HAL_kInvalidHandle, pcmHandle);
EXPECT_EQ(HAL_INVALID_HANDLE, pcmHandle);
EXPECT_EQ(HAL_USE_LAST_ERROR, status);
HAL_GetLastError(&status);
EXPECT_EQ(RESOURCE_OUT_OF_RANGE, status);
@@ -51,7 +51,7 @@ TEST(PCMDataTest, PCMInitialization) {
module = MODULE_TO_TEST;
gTestSolenoidCallbackName = "Unset";
pcmHandle = HAL_InitializeCTREPCM(0, module, nullptr, &status);
EXPECT_TRUE(HAL_kInvalidHandle != pcmHandle);
EXPECT_TRUE(HAL_INVALID_HANDLE != pcmHandle);
EXPECT_EQ(0, status);
EXPECT_STREQ("Initialized", gTestSolenoidCallbackName.c_str());
@@ -60,7 +60,7 @@ TEST(PCMDataTest, PCMInitialization) {
module = MODULE_TO_TEST;
gTestSolenoidCallbackName = "Unset";
pcmHandle = HAL_InitializeCTREPCM(0, module, nullptr, &status);
EXPECT_EQ(HAL_kInvalidHandle, pcmHandle);
EXPECT_EQ(HAL_INVALID_HANDLE, pcmHandle);
EXPECT_EQ(HAL_USE_LAST_ERROR, status);
HAL_GetLastError(&status);
EXPECT_EQ(RESOURCE_IS_ALLOCATED, status);
@@ -78,7 +78,7 @@ TEST(PCMDataTest, PCMInitialization) {
module = MODULE_TO_TEST;
gTestSolenoidCallbackName = "Unset";
pcmHandle = HAL_InitializeCTREPCM(0, module, nullptr, &status);
EXPECT_TRUE(HAL_kInvalidHandle != pcmHandle);
EXPECT_TRUE(HAL_INVALID_HANDLE != pcmHandle);
EXPECT_EQ(0, status);
EXPECT_STREQ("Initialized", gTestSolenoidCallbackName.c_str());
}

8
hal/src/test/native/cpp/mockdata/PWMDataTest.cpp
View File

@@ -40,7 +40,7 @@ TEST(PWMSimTest, PwmInitialization) {
channel = 8000;
gTestPwmCallbackName = "Unset";
pwmHandle = HAL_InitializePWMPort(channel, nullptr, &status);
EXPECT_EQ(HAL_kInvalidHandle, pwmHandle);
EXPECT_EQ(HAL_INVALID_HANDLE, pwmHandle);
EXPECT_EQ(HAL_USE_LAST_ERROR, status);
HAL_GetLastError(&status);
EXPECT_EQ(RESOURCE_OUT_OF_RANGE, status);
@@ -51,7 +51,7 @@ TEST(PWMSimTest, PwmInitialization) {
channel = INDEX_TO_TEST;
gTestPwmCallbackName = "Unset";
pwmHandle = HAL_InitializePWMPort(channel, nullptr, &status);
EXPECT_TRUE(HAL_kInvalidHandle != pwmHandle);
EXPECT_TRUE(HAL_INVALID_HANDLE != pwmHandle);
EXPECT_EQ(0, status);
EXPECT_STREQ("Initialized", gTestPwmCallbackName.c_str());
@@ -60,7 +60,7 @@ TEST(PWMSimTest, PwmInitialization) {
channel = INDEX_TO_TEST;
gTestPwmCallbackName = "Unset";
pwmHandle = HAL_InitializePWMPort(channel, nullptr, &status);
EXPECT_EQ(HAL_kInvalidHandle, pwmHandle);
EXPECT_EQ(HAL_INVALID_HANDLE, pwmHandle);
EXPECT_EQ(HAL_USE_LAST_ERROR, status);
HAL_GetLastError(&status);
EXPECT_EQ(RESOURCE_IS_ALLOCATED, status);
@@ -76,7 +76,7 @@ TEST(PWMSimTest, PwmInitialization) {
channel = INDEX_TO_TEST;
gTestPwmCallbackName = "Unset";
pwmHandle = HAL_InitializePWMPort(channel, nullptr, &status);
EXPECT_TRUE(HAL_kInvalidHandle != pwmHandle);
EXPECT_TRUE(HAL_INVALID_HANDLE != pwmHandle);
EXPECT_EQ(0, status);
EXPECT_STREQ("Initialized", gTestPwmCallbackName.c_str());
HALSIM_CancelPWMInitializedCallback(INDEX_TO_TEST, callbackId);

4
wpilibc/src/main/native/cpp/framework/TimedRobot.cpp
View File

@@ -71,7 +71,7 @@ void TimedRobot::StartCompetition() {
void TimedRobot::EndCompetition() {
HAL_DestroyNotifier(m_notifier);
m_notifier = HAL_kInvalidHandle;
m_notifier = HAL_INVALID_HANDLE;
}
TimedRobot::TimedRobot(wpi::units::second_t period)
@@ -91,7 +91,7 @@ TimedRobot::TimedRobot(wpi::units::hertz_t frequency)
: TimedRobot{1 / frequency} {}
TimedRobot::~TimedRobot() {
if (m_notifier != HAL_kInvalidHandle) {
if (m_notifier != HAL_INVALID_HANDLE) {
HAL_DestroyNotifier(m_notifier);
}
}

12
wpilibc/src/main/native/cpp/hardware/discrete/DigitalOutput.cpp
View File

@@ -17,7 +17,7 @@
using namespace wpi;
DigitalOutput::DigitalOutput(int channel) {
m_pwmGenerator = HAL_kInvalidHandle;
m_pwmGenerator = HAL_INVALID_HANDLE;
if (!SensorUtil::CheckDigitalChannel(channel)) {
throw WPILIB_MakeError(err::ChannelIndexOutOfRange, "Channel {}", channel);
}
@@ -33,7 +33,7 @@ DigitalOutput::DigitalOutput(int channel) {
}
DigitalOutput::~DigitalOutput() {
if (m_handle != HAL_kInvalidHandle) {
if (m_handle != HAL_INVALID_HANDLE) {
// Disable the PWM in case it was running.
try {
DisablePWM();
@@ -80,7 +80,7 @@ void DigitalOutput::SetPWMRate(double rate) {
}
void DigitalOutput::EnablePPS(double dutyCycle) {
if (m_pwmGenerator != HAL_kInvalidHandle) {
if (m_pwmGenerator != HAL_INVALID_HANDLE) {
return;
}
@@ -97,7 +97,7 @@ void DigitalOutput::EnablePPS(double dutyCycle) {
}
void DigitalOutput::EnablePWM(double initialDutyCycle) {
if (m_pwmGenerator != HAL_kInvalidHandle) {
if (m_pwmGenerator != HAL_INVALID_HANDLE) {
return;
}
@@ -114,7 +114,7 @@ void DigitalOutput::EnablePWM(double initialDutyCycle) {
}
void DigitalOutput::DisablePWM() {
if (m_pwmGenerator == HAL_kInvalidHandle) {
if (m_pwmGenerator == HAL_INVALID_HANDLE) {
return;
}
@@ -127,7 +127,7 @@ void DigitalOutput::DisablePWM() {
HAL_FreeDigitalPWM(m_pwmGenerator);
m_pwmGenerator = HAL_kInvalidHandle;
m_pwmGenerator = HAL_INVALID_HANDLE;
}
void DigitalOutput::UpdateDutyCycle(double dutyCycle) {

2
wpilibc/src/main/native/cpp/hardware/discrete/PWM.cpp
View File

@@ -35,7 +35,7 @@ PWM::PWM(int channel, bool registerSendable) {
}
PWM::~PWM() {
if (m_handle != HAL_kInvalidHandle) {
if (m_handle != HAL_INVALID_HANDLE) {
SetDisabled();
}
}

2
wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticHub.cpp
View File

@@ -91,7 +91,7 @@ class PneumaticHub::DataStore {
uint32_t m_reservedMask{0};
bool m_compressorReserved{false};
wpi::util::mutex m_reservedLock;
PneumaticHub m_moduleObject{0, HAL_kInvalidHandle, 0};
PneumaticHub m_moduleObject{0, HAL_INVALID_HANDLE, 0};
std::array<wpi::units::millisecond_t, 16> m_oneShotDurMs{0_ms};
};

2
wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticsControlModule.cpp
View File

@@ -64,7 +64,7 @@ class PneumaticsControlModule::DataStore {
uint32_t m_reservedMask{0};
bool m_compressorReserved{false};
wpi::util::mutex m_reservedLock;
PneumaticsControlModule m_moduleObject{0, HAL_kInvalidHandle, 0};
PneumaticsControlModule m_moduleObject{0, HAL_INVALID_HANDLE, 0};
};
PneumaticsControlModule::PneumaticsControlModule(int busId)

4
wpilibc/src/main/native/cpp/opmode/PeriodicOpMode.cpp
View File

@@ -30,7 +30,7 @@ PeriodicOpMode::Callback::Callback(std::function<void()> func,
period * period) {}
PeriodicOpMode::~PeriodicOpMode() {
if (m_notifier != HAL_kInvalidHandle) {
if (m_notifier != HAL_INVALID_HANDLE) {
HAL_DestroyNotifier(m_notifier);
}
}
@@ -147,7 +147,7 @@ void PeriodicOpMode::OpModeRun(int64_t opModeId) {
void PeriodicOpMode::OpModeStop() {
HAL_DestroyNotifier(m_notifier);
m_notifier = HAL_kInvalidHandle;
m_notifier = HAL_INVALID_HANDLE;
}
void PeriodicOpMode::PrintLoopOverrunMessage() {

4
wpilibc/src/main/native/cpp/system/Notifier.cpp
View File

@@ -120,13 +120,13 @@ Notifier::Notifier(Notifier&& rhs)
: m_thread(std::move(rhs.m_thread)),
m_notifier(rhs.m_notifier.load()),
m_callback(std::move(rhs.m_callback)) {
rhs.m_notifier = HAL_kInvalidHandle;
rhs.m_notifier = HAL_INVALID_HANDLE;
}
Notifier& Notifier::operator=(Notifier&& rhs) {
m_thread = std::move(rhs.m_thread);
m_notifier = rhs.m_notifier.load();
rhs.m_notifier = HAL_kInvalidHandle;
rhs.m_notifier = HAL_INVALID_HANDLE;
m_callback = std::move(rhs.m_callback);
return *this;
}

4
wpilibc/src/main/python/wpilib/src/rpy/Notifier.cpp
View File

@@ -106,13 +106,13 @@ PyNotifier::PyNotifier(PyNotifier &&rhs)
: m_thread(std::move(rhs.m_thread)),
m_notifier(rhs.m_notifier.load()),
m_handler(std::move(rhs.m_handler)) {
rhs.m_notifier = HAL_kInvalidHandle;
rhs.m_notifier = HAL_INVALID_HANDLE;
}
PyNotifier &PyNotifier::operator=(PyNotifier &&rhs) {
m_thread = std::move(rhs.m_thread);
m_notifier = rhs.m_notifier.load();
rhs.m_notifier = HAL_kInvalidHandle;
rhs.m_notifier = HAL_INVALID_HANDLE;
m_handler = std::move(rhs.m_handler);
return *this;
}