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

Merge "getAnalogAverageValue should use a 32-bit int"

Browse Source
This commit is contained in:
Jonathan Leitschuh (WPI)
2014-08-04 13:17:07 -07:00
committed by Gerrit Code Review
parent 065e1c24eb c49ea255b9
commit 14f201cd36
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hal/lib/Athena/Analog.cpp
View File

@@ -288,7 +288,7 @@ int16_t getAnalogValue(void* analog_port_pointer, int32_t *status) {
*/
int32_t getAnalogAverageValue(void* analog_port_pointer, int32_t *status) {
AnalogPort* port = (AnalogPort*) analog_port_pointer;
int16_t value;
int32_t value;
checkAnalogInputChannel(port->port.pin);
tAI::tReadSelect readSelect;
@@ -299,7 +299,7 @@ int32_t getAnalogAverageValue(void* analog_port_pointer, int32_t *status) {
Synchronized sync(analogRegisterWindowSemaphore);
analogInputSystem->writeReadSelect(readSelect, status);
analogInputSystem->strobeLatchOutput(status);
value = (int16_t) analogInputSystem->readOutput(status);
value = (int32_t) analogInputSystem->readOutput(status);
}
return value;