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

artf4107: Removed most "Init" functions from classes

Browse Source 
They were either replaced with delegating constructors or merged into the only constructor in the class.

Change-Id: I3d35139f6ab23c719433a9f76942b02a3b07ddac
This commit is contained in:
Tyler Veness
2015-06-29 02:43:44 -07:00
parent e4a8aacc51
commit 1ab3ea670d
62 changed files with 258 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
wpilibc/wpilibC++Devices/src/Counter.cpp
View File

@@ -13,14 +13,18 @@
#include "WPIErrors.h"
/**
* Create an instance of a counter object.
* Create an instance of a counter where no sources are selected.
* They all must be selected by calling functions to specify the upsource and
* the downsource
* independently.
*
* This creates a ChipObject counter and initializes status variables
* appropriately
* appropriately.
*
* The counter will start counting immediately.
* @param mode The counter mode
*/
void Counter::InitCounter(Mode mode) {
Counter::Counter(Mode mode) {
int32_t status = 0;
m_counter = initializeCounter(mode, &m_index, &status);
wpi_setErrorWithContext(status, getHALErrorMessage(status));
@@ -30,18 +34,6 @@ void Counter::InitCounter(Mode mode) {
HALReport(HALUsageReporting::kResourceType_Counter, m_index, mode);
}
/**
* Create an instance of a counter where no sources are selected.
* They all must be selected by calling functions to specify the upsource and
* the downsource
* independently.
*
* The counter will start counting immediately.
*/
Counter::Counter() {
InitCounter();
}
/**
* Create an instance of a counter from a Digital Source (such as a Digital
* Input).
@@ -54,8 +46,7 @@ Counter::Counter() {
* @param source A pointer to the existing DigitalSource object. It will be set
* as the Up Source.
*/
Counter::Counter(DigitalSource *source) {
InitCounter();
Counter::Counter(DigitalSource *source) : Counter() {
SetUpSource(source);
ClearDownSource();
}
@@ -72,8 +63,7 @@ Counter::Counter(DigitalSource *source) {
* @param source A reference to the existing DigitalSource object. It will be
* set as the Up Source.
*/
Counter::Counter(DigitalSource &source) {
InitCounter();
Counter::Counter(DigitalSource &source) : Counter() {
SetUpSource(&source);
ClearDownSource();
}
@@ -86,8 +76,7 @@ Counter::Counter(DigitalSource &source) {
* @param channel The DIO channel to use as the up source. 0-9 are on-board,
* 10-25 are on the MXP
*/
Counter::Counter(int32_t channel) {
InitCounter();
Counter::Counter(int32_t channel) : Counter() {
SetUpSource(channel);
ClearDownSource();
}
@@ -100,8 +89,7 @@ Counter::Counter(int32_t channel) {
* The counter will start counting immediately.
* @param trigger The pointer to the existing AnalogTrigger object.
*/
Counter::Counter(AnalogTrigger *trigger) {
InitCounter();
Counter::Counter(AnalogTrigger *trigger) : Counter() {
SetUpSource(trigger->CreateOutput(kState));
ClearDownSource();
m_allocatedUpSource = true;
@@ -115,8 +103,7 @@ Counter::Counter(AnalogTrigger *trigger) {
* The counter will start counting immediately.
* @param trigger The reference to the existing AnalogTrigger object.
*/
Counter::Counter(AnalogTrigger &trigger) {
InitCounter();
Counter::Counter(AnalogTrigger &trigger) : Counter() {
SetUpSource(trigger.CreateOutput(kState));
ClearDownSource();
m_allocatedUpSource = true;
@@ -132,14 +119,14 @@ Counter::Counter(AnalogTrigger &trigger) {
*/
Counter::Counter(EncodingType encodingType, DigitalSource *upSource,
DigitalSource *downSource, bool inverted) {
DigitalSource *downSource, bool inverted)
: Counter(kExternalDirection) {
if (encodingType != k1X && encodingType != k2X) {
wpi_setWPIErrorWithContext(
ParameterOutOfRange,
"Counter only supports 1X and 2X quadrature decoding.");
return;
}
InitCounter(kExternalDirection);
SetUpSource(upSource);
SetDownSource(downSource);
int32_t status = 0;