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

Some general HAL cleanups (#153)

Browse Source
This commit is contained in:
Thad House
2016-07-09 17:38:18 -07:00
committed by Peter Johnson
parent aa9c2b2c92
commit ea6876e81f
7 changed files with 13 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
hal/lib/athena/AnalogInput.cpp
View File

@@ -236,23 +236,15 @@ int16_t HAL_GetAnalogValue(HAL_AnalogInputHandle analog_port_handle,
*status = HAL_HANDLE_ERROR;
return 0;
}
int16_t value;
if (!HAL_CheckAnalogInputChannel(port->pin)) {
return 0;
}
tAI::tReadSelect readSelect;
readSelect.Channel = port->pin;
readSelect.Averaged = false;
{
std::lock_guard<priority_recursive_mutex> sync(analogRegisterWindowMutex);
analogInputSystem->writeReadSelect(readSelect, status);
analogInputSystem->strobeLatchOutput(status);
value = (int16_t)analogInputSystem->readOutput(status);
}
return value;
std::lock_guard<priority_recursive_mutex> sync(analogRegisterWindowMutex);
analogInputSystem->writeReadSelect(readSelect, status);
analogInputSystem->strobeLatchOutput(status);
return static_cast<int16_t>(analogInputSystem->readOutput(status));
}
/**
@@ -276,23 +268,14 @@ int32_t HAL_GetAnalogAverageValue(HAL_AnalogInputHandle analog_port_handle,
*status = HAL_HANDLE_ERROR;
return 0;
}
int32_t value;
if (!HAL_CheckAnalogInputChannel(port->pin)) {
return 0;
}
tAI::tReadSelect readSelect;
readSelect.Channel = port->pin;
readSelect.Averaged = true;
{
std::lock_guard<priority_recursive_mutex> sync(analogRegisterWindowMutex);
analogInputSystem->writeReadSelect(readSelect, status);
analogInputSystem->strobeLatchOutput(status);
value = (int32_t)analogInputSystem->readOutput(status);
}
return value;
std::lock_guard<priority_recursive_mutex> sync(analogRegisterWindowMutex);
analogInputSystem->writeReadSelect(readSelect, status);
analogInputSystem->strobeLatchOutput(status);
return static_cast<int32_t>(analogInputSystem->readOutput(status));
}
/**