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

Update headers and .sos to v15 image + most API changes

Browse Source 
Java still does not work

Change-Id: I172ac401a07b6703909068f82b7b6cc67e6075c0
This commit is contained in:
Thomas Clark
2014-10-05 17:17:59 -04:00
parent 6089722c4f
commit 7e9f183cf9
87 changed files with 2812 additions and 2667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
hal/lib/Athena/Digital.cpp
View File

@@ -683,14 +683,11 @@ void setCounterUpSourceEdge(void* counter_pointer, bool risingEdge, bool falling
*/
void clearCounterUpSource(void* counter_pointer, int32_t *status) {
Counter* counter = (Counter*) counter_pointer;
bool state = counter->counter->readConfig_Enable(status);
counter->counter->writeConfig_Enable(false, status);
counter->counter->writeConfig_UpFallingEdge(false, status);
counter->counter->writeConfig_UpRisingEdge(false, status);
// Index 0 of digital is always 0.
counter->counter->writeConfig_UpSource_Channel(0, status);
counter->counter->writeConfig_UpSource_AnalogTrigger(false, status);
counter->counter->writeConfig_Enable(state, status);
}
/**
@@ -738,14 +735,11 @@ void setCounterDownSourceEdge(void* counter_pointer, bool risingEdge, bool falli
*/
void clearCounterDownSource(void* counter_pointer, int32_t *status) {
Counter* counter = (Counter*) counter_pointer;
bool state = counter->counter->readConfig_Enable(status);
counter->counter->writeConfig_Enable(false, status);
counter->counter->writeConfig_DownFallingEdge(false, status);
counter->counter->writeConfig_DownRisingEdge(false, status);
// Index 0 of digital is always 0.
counter->counter->writeConfig_DownSource_Channel(0, status);
counter->counter->writeConfig_DownSource_AnalogTrigger(false, status);
counter->counter->writeConfig_Enable(state, status);
}
/**
@@ -814,25 +808,6 @@ void setCounterSamplesToAverage(void* counter_pointer, int samplesToAverage, int
counter->counter->writeTimerConfig_AverageSize(samplesToAverage, status);
}
/**
* Start the Counter counting.
* This enables the counter and it starts accumulating counts from the associated
* input channel. The counter value is not reset on starting, and still has the previous value.
*/
void startCounter(void* counter_pointer, int32_t *status) {
Counter* counter = (Counter*) counter_pointer;
counter->counter->writeConfig_Enable(1, status);
}
/**
* Stop the Counter.
* Stops the counting but doesn't effect the current value.
*/
void stopCounter(void* counter_pointer, int32_t *status) {
Counter* counter = (Counter*) counter_pointer;
counter->counter->writeConfig_Enable(0, status);
}
/**
* Reset the Counter to zero.
* Set the counter value to zero. This doesn't effect the running state of the counter, just sets
@@ -993,23 +968,6 @@ void freeEncoder(void* encoder_pointer, int32_t *status) {
delete encoder->encoder;
}
/**
* Start the Encoder.
* Starts counting pulses on the Encoder device.
*/
void startEncoder(void* encoder_pointer, int32_t *status) {
Encoder* encoder = (Encoder*) encoder_pointer;
encoder->encoder->writeConfig_Enable(1, status);
}
/**
* Stops counting pulses on the Encoder device. The value is not changed.
*/
void stopEncoder(void* encoder_pointer, int32_t *status) {
Encoder* encoder = (Encoder*) encoder_pointer;
encoder->encoder->writeConfig_Enable(0, status);
}
/**
* Reset the Encoder distance to zero.
* Resets the current count to zero on the encoder.