mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-28 02:11:43 +00:00
[hal] Rename HAL_kInvalidHandle to HAL_INVALID_HANDLE (#8698)
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -35,7 +35,7 @@ PWM::PWM(int channel, bool registerSendable) {
|
||||
}
|
||||
|
||||
PWM::~PWM() {
|
||||
if (m_handle != HAL_kInvalidHandle) {
|
||||
if (m_handle != HAL_INVALID_HANDLE) {
|
||||
SetDisabled();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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};
|
||||
};
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user