mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-27 02:01:42 +00:00
Major formatting changes (breaks diffs). No code changes.
The changes made in this commit do not affect any actual code,
they are purely aesthetic. I ran clang-format with google style
over all .h/.cpp files in wpilibc that weren't in wpilibC++Sim
or gtest, and the eclipse formatter over all of the Java files
using the Google eclipse formatting configuration.
Change-Id: I9627bca0bc103c398ecc1c5ba17467193291ae63
This commit is contained in:
@@ -5,50 +5,64 @@
|
||||
/**
|
||||
* Common initialization code called by all constructors.
|
||||
*/
|
||||
void AnalogPotentiometer::initPot(AnalogInput *input, double fullRange, double offset) {
|
||||
m_fullRange = fullRange;
|
||||
m_offset = offset;
|
||||
m_analog_input = input;
|
||||
void AnalogPotentiometer::initPot(AnalogInput *input, double fullRange,
|
||||
double offset) {
|
||||
m_fullRange = fullRange;
|
||||
m_offset = offset;
|
||||
m_analog_input = input;
|
||||
}
|
||||
|
||||
/**
|
||||
* Construct an Analog Potentiometer object from a channel number.
|
||||
* @param channel The channel number on the roboRIO to represent. 0-3 are on-board 4-7 are on the MXP port.
|
||||
* @param fullRange The angular value (in desired units) representing the full 0-5V range of the input.
|
||||
* @param offset The angular value (in desired units) representing the angular output at 0V.
|
||||
* @param channel The channel number on the roboRIO to represent. 0-3 are
|
||||
* on-board 4-7 are on the MXP port.
|
||||
* @param fullRange The angular value (in desired units) representing the full
|
||||
* 0-5V range of the input.
|
||||
* @param offset The angular value (in desired units) representing the angular
|
||||
* output at 0V.
|
||||
*/
|
||||
AnalogPotentiometer::AnalogPotentiometer(int channel, double fullRange, double offset) {
|
||||
m_init_analog_input = true;
|
||||
initPot(new AnalogInput(channel), fullRange, offset);
|
||||
AnalogPotentiometer::AnalogPotentiometer(int channel, double fullRange,
|
||||
double offset) {
|
||||
m_init_analog_input = true;
|
||||
initPot(new AnalogInput(channel), fullRange, offset);
|
||||
}
|
||||
|
||||
/**
|
||||
* Construct an Analog Potentiometer object from an existing Analog Input pointer.
|
||||
* @param channel The existing Analog Input pointer
|
||||
* @param fullRange The angular value (in desired units) representing the full 0-5V range of the input.
|
||||
* @param offset The angular value (in desired units) representing the angular output at 0V.
|
||||
* Construct an Analog Potentiometer object from an existing Analog Input
|
||||
* pointer.
|
||||
* @param channel The existing Analog Input pointer
|
||||
* @param fullRange The angular value (in desired units) representing the full
|
||||
* 0-5V range of the input.
|
||||
* @param offset The angular value (in desired units) representing the angular
|
||||
* output at 0V.
|
||||
*/
|
||||
AnalogPotentiometer::AnalogPotentiometer(AnalogInput *input, double fullRange, double offset) {
|
||||
m_init_analog_input = false;
|
||||
initPot(input, fullRange, offset);
|
||||
AnalogPotentiometer::AnalogPotentiometer(AnalogInput *input, double fullRange,
|
||||
double offset) {
|
||||
m_init_analog_input = false;
|
||||
initPot(input, fullRange, offset);
|
||||
}
|
||||
|
||||
/**
|
||||
* Construct an Analog Potentiometer object from an existing Analog Input reference.
|
||||
* @param channel The existing Analog Input reference
|
||||
* @param fullRange The angular value (in desired units) representing the full 0-5V range of the input.
|
||||
* @param offset The angular value (in desired units) representing the angular output at 0V.
|
||||
* Construct an Analog Potentiometer object from an existing Analog Input
|
||||
* reference.
|
||||
* @param channel The existing Analog Input reference
|
||||
* @param fullRange The angular value (in desired units) representing the full
|
||||
* 0-5V range of the input.
|
||||
* @param offset The angular value (in desired units) representing the angular
|
||||
* output at 0V.
|
||||
*/
|
||||
AnalogPotentiometer::AnalogPotentiometer(AnalogInput &input, double fullRange, double offset) {
|
||||
m_init_analog_input = false;
|
||||
initPot(&input, fullRange, offset);
|
||||
AnalogPotentiometer::AnalogPotentiometer(AnalogInput &input, double fullRange,
|
||||
double offset) {
|
||||
m_init_analog_input = false;
|
||||
initPot(&input, fullRange, offset);
|
||||
}
|
||||
|
||||
/**
|
||||
* Destructor. Releases the Analog Input resource if it was allocated by this object
|
||||
* Destructor. Releases the Analog Input resource if it was allocated by this
|
||||
* object
|
||||
*/
|
||||
AnalogPotentiometer::~AnalogPotentiometer() {
|
||||
if(m_init_analog_input){
|
||||
if (m_init_analog_input) {
|
||||
delete m_analog_input;
|
||||
m_init_analog_input = false;
|
||||
}
|
||||
@@ -57,10 +71,13 @@ AnalogPotentiometer::~AnalogPotentiometer() {
|
||||
/**
|
||||
* Get the current reading of the potentiometer.
|
||||
*
|
||||
* @return The current position of the potentiometer (in the units used for fullRaneg and offset).
|
||||
* @return The current position of the potentiometer (in the units used for
|
||||
* fullRaneg and offset).
|
||||
*/
|
||||
double AnalogPotentiometer::Get() const {
|
||||
return (m_analog_input->GetVoltage() / ControllerPower::GetVoltage5V()) * m_fullRange + m_offset;
|
||||
return (m_analog_input->GetVoltage() / ControllerPower::GetVoltage5V()) *
|
||||
m_fullRange +
|
||||
m_offset;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -68,32 +85,27 @@ double AnalogPotentiometer::Get() const {
|
||||
*
|
||||
* @return The current reading.
|
||||
*/
|
||||
double AnalogPotentiometer::PIDGet() const {
|
||||
return Get();
|
||||
}
|
||||
|
||||
double AnalogPotentiometer::PIDGet() const { return Get(); }
|
||||
|
||||
/**
|
||||
* @return the Smart Dashboard Type
|
||||
*/
|
||||
std::string AnalogPotentiometer::GetSmartDashboardType() const {
|
||||
return "Analog Input";
|
||||
return "Analog Input";
|
||||
}
|
||||
|
||||
/**
|
||||
* Live Window code, only does anything if live window is activated.
|
||||
*/
|
||||
void AnalogPotentiometer::InitTable(ITable *subtable) {
|
||||
m_table = subtable;
|
||||
UpdateTable();
|
||||
m_table = subtable;
|
||||
UpdateTable();
|
||||
}
|
||||
|
||||
void AnalogPotentiometer::UpdateTable() {
|
||||
if (m_table != NULL) {
|
||||
m_table->PutNumber("Value", Get());
|
||||
}
|
||||
if (m_table != NULL) {
|
||||
m_table->PutNumber("Value", Get());
|
||||
}
|
||||
}
|
||||
|
||||
ITable* AnalogPotentiometer::GetTable() const {
|
||||
return m_table;
|
||||
}
|
||||
ITable *AnalogPotentiometer::GetTable() const { return m_table; }
|
||||
|
||||
Reference in New Issue
Block a user