Fixed C++ side of artf2604 in FRCSim - synchronized C++ codebases, updated examples.

Change-Id: I2fdc9deb4c8e249448dcbda4214fd900c2bc4ea8
This commit is contained in:
Colby Skeggs
2014-06-24 10:37:02 -07:00
parent 02e19a0147
commit ff597e6ac4
72 changed files with 763 additions and 861 deletions

View File

@@ -1,43 +1,66 @@
#include "AnalogPotentiometer.h"
void AnalogPotentiometer::initPot(int slot, int channel, double scale, double offset) {
char buffer[50];
int n = sprintf(buffer, "analog/%d/%d", slot, channel);
impl = new SimFloatInput(buffer);
this->module = slot;
this->channel = channel;
}
AnalogPotentiometer::AnalogPotentiometer(int slot, int channel, double scale, double offset) {
initPot(slot, channel, scale, offset);
/**
* Common initialization code called by all constructors.
*/
void AnalogPotentiometer::initPot(AnalogInput *input, double scale, double offset) {
m_scale = scale;
m_offset = offset;
m_analog_input = input;
}
AnalogPotentiometer::AnalogPotentiometer(int channel, double scale, double offset) {
initPot(1, channel, scale, offset);
m_init_analog_input = true;
initPot(new AnalogInput(channel), scale, offset);
}
AnalogPotentiometer::AnalogPotentiometer(int channel, double scale) {
initPot(1, channel, scale, 0);
AnalogPotentiometer::AnalogPotentiometer(AnalogInput *input, double scale, double offset) {
m_init_analog_input = false;
initPot(input, scale, offset);
}
AnalogPotentiometer::AnalogPotentiometer(int channel) {
initPot(1, channel, 1, 0);
AnalogPotentiometer::AnalogPotentiometer(AnalogInput &input, double scale, double offset) {
m_init_analog_input = false;
initPot(&input, scale, offset);
}
AnalogPotentiometer::~AnalogPotentiometer() {
if(m_init_analog_input){
delete m_analog_input;
m_init_analog_input = false;
}
}
/**
* Get the current reading of the potentiomere.
*
* @return The current position of the potentiometer.
*/
double AnalogPotentiometer::Get() {
return impl->Get();
return m_analog_input->GetVoltage() * m_scale + m_offset;
}
/**
* Implement the PIDSource interface.
*
* @return The current reading.
*/
double AnalogPotentiometer::PIDGet() {
return Get();
}
/**
* @return the Smart Dashboard Type
*/
std::string AnalogPotentiometer::GetSmartDashboardType() {
return "Analog Input";
}
/**
* Live Window code, only does anything if live window is activated.
*/
void AnalogPotentiometer::InitTable(ITable *subtable) {
m_table = subtable;
UpdateTable();