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

Prepends all HAL functions with HAL_ (#146)

Browse Source
This commit is contained in:
Thad House
2016-07-09 00:24:26 -07:00
committed by Peter Johnson
parent 5ad28d58ec
commit b637b9ee4c
162 changed files with 2855 additions and 2747 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
wpilibc/athena/src/Counter.cpp
View File

@@ -27,12 +27,12 @@
*/
Counter::Counter(Mode mode) {
int32_t status = 0;
m_counter = initializeCounter(mode, &m_index, &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status));
m_counter = HAL_InitializeCounter((HAL_Counter_Mode)mode, &m_index, &status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
SetMaxPeriod(.5);
HALReport(HALUsageReporting::kResourceType_Counter, m_index, mode);
HAL_Report(HALUsageReporting::kResourceType_Counter, m_index, mode);
}
/**
@@ -97,7 +97,7 @@ Counter::Counter(int32_t channel) : Counter(kTwoPulse) {
*/
DEPRECATED("Use pass-by-reference instead.")
Counter::Counter(AnalogTrigger* trigger) : Counter(kTwoPulse) {
SetUpSource(trigger->CreateOutput(kState));
SetUpSource(trigger->CreateOutput(AnalogTriggerType::kState));
ClearDownSource();
}
@@ -112,7 +112,7 @@ Counter::Counter(AnalogTrigger* trigger) : Counter(kTwoPulse) {
* @param trigger The reference to the existing AnalogTrigger object.
*/
Counter::Counter(const AnalogTrigger& trigger) : Counter(kTwoPulse) {
SetUpSource(trigger.CreateOutput(kState));
SetUpSource(trigger.CreateOutput(AnalogTriggerType::kState));
ClearDownSource();
}
@@ -162,13 +162,13 @@ Counter::Counter(EncodingType encodingType,
if (encodingType == k1X) {
SetUpSourceEdge(true, false);
setCounterAverageSize(m_counter, 1, &status);
HAL_SetCounterAverageSize(m_counter, 1, &status);
} else {
SetUpSourceEdge(true, true);
setCounterAverageSize(m_counter, 2, &status);
HAL_SetCounterAverageSize(m_counter, 2, &status);
}
wpi_setErrorWithContext(status, getHALErrorMessage(status));
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
SetDownSourceEdge(inverted, true);
}
@@ -179,9 +179,9 @@ Counter::~Counter() {
SetUpdateWhenEmpty(true);
int32_t status = 0;
freeCounter(m_counter, &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status));
m_counter = HAL_INVALID_HANDLE;
HAL_FreeCounter(m_counter, &status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
m_counter = HAL_kInvalidHandle;
}
/**
@@ -234,9 +234,11 @@ void Counter::SetUpSource(std::shared_ptr<DigitalSource> source) {
CloneError(*m_upSource);
} else {
int32_t status = 0;
setCounterUpSource(m_counter, source->GetPortHandleForRouting(),
source->GetAnalogTriggerTypeForRouting(), &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status));
HAL_SetCounterUpSource(
m_counter, source->GetPortHandleForRouting(),
(HAL_AnalogTriggerType)source->GetAnalogTriggerTypeForRouting(),
&status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
}
}
@@ -273,8 +275,8 @@ void Counter::SetUpSourceEdge(bool risingEdge, bool fallingEdge) {
"Must set non-nullptr UpSource before setting UpSourceEdge");
}
int32_t status = 0;
setCounterUpSourceEdge(m_counter, risingEdge, fallingEdge, &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status));
HAL_SetCounterUpSourceEdge(m_counter, risingEdge, fallingEdge, &status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
}
/**
@@ -284,8 +286,8 @@ void Counter::ClearUpSource() {
if (StatusIsFatal()) return;
m_upSource.reset();
int32_t status = 0;
clearCounterUpSource(m_counter, &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status));
HAL_ClearCounterUpSource(m_counter, &status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
}
/**
@@ -340,9 +342,11 @@ void Counter::SetDownSource(std::shared_ptr<DigitalSource> source) {
CloneError(*m_downSource);
} else {
int32_t status = 0;
setCounterDownSource(m_counter, source->GetPortHandleForRouting(),
source->GetAnalogTriggerTypeForRouting(), &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status));
HAL_SetCounterDownSource(
m_counter, source->GetPortHandleForRouting(),
(HAL_AnalogTriggerType)source->GetAnalogTriggerTypeForRouting(),
&status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
}
}
@@ -379,8 +383,8 @@ void Counter::SetDownSourceEdge(bool risingEdge, bool fallingEdge) {
"Must set non-nullptr DownSource before setting DownSourceEdge");
}
int32_t status = 0;
setCounterDownSourceEdge(m_counter, risingEdge, fallingEdge, &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status));
HAL_SetCounterDownSourceEdge(m_counter, risingEdge, fallingEdge, &status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
}
/**
@@ -390,8 +394,8 @@ void Counter::ClearDownSource() {
if (StatusIsFatal()) return;
m_downSource.reset();
int32_t status = 0;
clearCounterDownSource(m_counter, &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status));
HAL_ClearCounterDownSource(m_counter, &status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
}
/**
@@ -402,8 +406,8 @@ void Counter::ClearDownSource() {
void Counter::SetUpDownCounterMode() {
if (StatusIsFatal()) return;
int32_t status = 0;
setCounterUpDownMode(m_counter, &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status));
HAL_SetCounterUpDownMode(m_counter, &status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
}
/**
@@ -415,8 +419,8 @@ void Counter::SetUpDownCounterMode() {
void Counter::SetExternalDirectionMode() {
if (StatusIsFatal()) return;
int32_t status = 0;
setCounterExternalDirectionMode(m_counter, &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status));
HAL_SetCounterExternalDirectionMode(m_counter, &status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
}
/**
@@ -427,8 +431,8 @@ void Counter::SetExternalDirectionMode() {
void Counter::SetSemiPeriodMode(bool highSemiPeriod) {
if (StatusIsFatal()) return;
int32_t status = 0;
setCounterSemiPeriodMode(m_counter, highSemiPeriod, &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status));
HAL_SetCounterSemiPeriodMode(m_counter, highSemiPeriod, &status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
}
/**
@@ -443,8 +447,8 @@ void Counter::SetSemiPeriodMode(bool highSemiPeriod) {
void Counter::SetPulseLengthMode(float threshold) {
if (StatusIsFatal()) return;
int32_t status = 0;
setCounterPulseLengthMode(m_counter, threshold, &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status));
HAL_SetCounterPulseLengthMode(m_counter, threshold, &status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
}
/**
@@ -458,8 +462,8 @@ void Counter::SetPulseLengthMode(float threshold) {
*/
int Counter::GetSamplesToAverage() const {
int32_t status = 0;
int32_t samples = getCounterSamplesToAverage(m_counter, &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status));
int32_t samples = HAL_GetCounterSamplesToAverage(m_counter, &status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
return samples;
}
@@ -477,8 +481,8 @@ void Counter::SetSamplesToAverage(int samplesToAverage) {
"Average counter values must be between 1 and 127");
}
int32_t status = 0;
setCounterSamplesToAverage(m_counter, samplesToAverage, &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status));
HAL_SetCounterSamplesToAverage(m_counter, samplesToAverage, &status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
}
/**
@@ -490,8 +494,8 @@ void Counter::SetSamplesToAverage(int samplesToAverage) {
int32_t Counter::Get() const {
if (StatusIsFatal()) return 0;
int32_t status = 0;
int32_t value = getCounter(m_counter, &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status));
int32_t value = HAL_GetCounter(m_counter, &status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
return value;
}
@@ -504,8 +508,8 @@ int32_t Counter::Get() const {
void Counter::Reset() {
if (StatusIsFatal()) return;
int32_t status = 0;
resetCounter(m_counter, &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status));
HAL_ResetCounter(m_counter, &status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
}
/**
@@ -519,8 +523,8 @@ void Counter::Reset() {
double Counter::GetPeriod() const {
if (StatusIsFatal()) return 0.0;
int32_t status = 0;
double value = getCounterPeriod(m_counter, &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status));
double value = HAL_GetCounterPeriod(m_counter, &status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
return value;
}
@@ -537,8 +541,8 @@ double Counter::GetPeriod() const {
void Counter::SetMaxPeriod(double maxPeriod) {
if (StatusIsFatal()) return;
int32_t status = 0;
setCounterMaxPeriod(m_counter, maxPeriod, &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status));
HAL_SetCounterMaxPeriod(m_counter, maxPeriod, &status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
}
/**
@@ -561,8 +565,8 @@ void Counter::SetMaxPeriod(double maxPeriod) {
void Counter::SetUpdateWhenEmpty(bool enabled) {
if (StatusIsFatal()) return;
int32_t status = 0;
setCounterUpdateWhenEmpty(m_counter, enabled, &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status));
HAL_SetCounterUpdateWhenEmpty(m_counter, enabled, &status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
}
/**
@@ -578,8 +582,8 @@ void Counter::SetUpdateWhenEmpty(bool enabled) {
bool Counter::GetStopped() const {
if (StatusIsFatal()) return false;
int32_t status = 0;
bool value = getCounterStopped(m_counter, &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status));
bool value = HAL_GetCounterStopped(m_counter, &status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
return value;
}
@@ -591,8 +595,8 @@ bool Counter::GetStopped() const {
bool Counter::GetDirection() const {
if (StatusIsFatal()) return false;
int32_t status = 0;
bool value = getCounterDirection(m_counter, &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status));
bool value = HAL_GetCounterDirection(m_counter, &status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
return value;
}
@@ -607,8 +611,8 @@ bool Counter::GetDirection() const {
void Counter::SetReverseDirection(bool reverseDirection) {
if (StatusIsFatal()) return;
int32_t status = 0;
setCounterReverseDirection(m_counter, reverseDirection, &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status));
HAL_SetCounterReverseDirection(m_counter, reverseDirection, &status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
}
void Counter::UpdateTable() {