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

Adds the Accumulator code to the AnalogJNI.cpp

Browse Source 
Disables the debug printlines from the AnalogJNI.cpp file

Change-Id: Iac962721fb3eeca8f208feb162c96d5ae9f342a2
This commit is contained in:
Jonathan Leitschuh
2014-05-20 15:38:41 -04:00
parent 6b83175b74
commit 6d8629a8b3
2 changed files with 98 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,8 +10,6 @@
#include "NetworkCommunication/AICalibration.h"
#include "NetworkCommunication/LoadOut.h"
#include <stdio.h> // TODO: remove printf for debugging
static const long kTimebase = 40000000; ///< 40 MHz clock
static const long kDefaultOversampleBits = 0;
static const long kDefaultAverageBits = 7;
@@ -540,7 +538,6 @@ uint32_t getAccumulatorCount(void* analog_port_pointer, int32_t *status) {
* @param count Pointer to the number of accumulation cycles.
*/
void getAccumulatorOutput(void* analog_port_pointer, int64_t *value, uint32_t *count, int32_t *status) {
printf("[HAL] getAccumulatorOutput()\n");
AnalogPort* port = (AnalogPort*) analog_port_pointer;
if (port->accumulator == NULL) {
*status = NULL_PARAMETER;
@@ -551,12 +548,8 @@ void getAccumulatorOutput(void* analog_port_pointer, int64_t *value, uint32_t *c
return;
}
printf("[HAL]\t Getting output...\n");
tAccumulator::tOutput output = port->accumulator->readOutput(status);
printf("[HAL]\t Status: %d, Value: %lld, Count: %d.\n", *status, output.Value, output.Count);
printf("[HAL]\t value: %d, value2: %d, value3: %d.\n", output.value, output.value2, output.value3);
printf("[HAL]\t Value: %lld, Count: %d.\n", port->accumulator->readOutput_Value(status), port->accumulator->readOutput_Count(status));
*value = output.Value;
*count = output.Count;
}