mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-27 02:01:42 +00:00
534ea134a4
This deals with the majority of the user-facing code in wpilibC++Devices and a substantial portion of it in wpilibC++. wpilibC++Sim and wpilibC++IntegrationTests are untouched except where it is necessary to make them work with the rest of the libraries. There is still a lot to do in the following areas: -The HAL (which we may not want to touch at all). -The I2C, Serial, and SPI interfaces in wpilibC++Devices, which I haven't gotten around to doing yet. -Most wpilibC++Devices classes have void* pointers for interacting with the HAL. -InterruptableSensorBase passes a void *params for the interrupt handler. -I haven't converted all the const char* to std::strings. -There are plenty of other cases of raw pointers still existing. -This doesn't fall directly under raw pointer stuff, but move syntax and rvalue references could be introduced in many places. -I haven't touched vision code. -The Resource classes conflict (one is in the hal, the other in wpilibC++). Someone should figure out a more permanent fix (eg, just renaming them), then doing what I did (making a new namespace for one of them, essentially the same as renaming it). A few other things: -I created a NullDeleter class which is marked as deprecated. What this does is it can be passed as the deleter to a std::shared_ptr so that when you are converting raw pointers to shared_ptrs the shared_ptr doesn't do any deletion if someone else owns the raw pointer. This should only be used in making old raw pointer UIs. -I had to alter the build.gradle so that it did not emit errors when deprecated functions called deprecated functions. Unfortunately, gradle doesn't appear to be actually printing out gcc warnigns for some reason. The best way I have found to fix this is to patch the toolchains (https://bitbucket.org/byteit101/toolchain-builder/pull-request/5/make-gcc-not-throw-warnings-for-nested/diff) so that a deprecated function calling a deprecated function is fine but a non-deprecated function calling a deprecated function will throw a warning (which we then elevate with -Werror). I believe that clang deals with this properly, although I have not tried it myself. Change-Id: Ib8090c66893576fe73654f4e9d268f9d37be06a2
93 lines
2.4 KiB
C++
93 lines
2.4 KiB
C++
/*----------------------------------------------------------------------------*/
|
|
/* Copyright (c) FIRST 2008. All Rights Reserved. */
|
|
/* Open Source Software - may be modified and shared by FRC teams. The code */
|
|
/* must be accompanied by the FIRST BSD license file in $(WIND_BASE)/WPILib. */
|
|
/*----------------------------------------------------------------------------*/
|
|
|
|
#include "AnalogInput.h"
|
|
#include "WPIErrors.h"
|
|
#include "LiveWindow/LiveWindow.h"
|
|
|
|
/**
|
|
* Construct an analog input.
|
|
*
|
|
* @param channel The channel number to represent.
|
|
*/
|
|
AnalogInput::AnalogInput(uint32_t channel)
|
|
{
|
|
m_channel = channel;
|
|
char buffer[50];
|
|
int n = sprintf(buffer, "analog/%d", channel);
|
|
m_impl = new SimFloatInput(buffer);
|
|
|
|
LiveWindow::GetInstance().AddSensor("AnalogInput", channel, this);
|
|
}
|
|
|
|
/**
|
|
* Get a scaled sample straight from this channel.
|
|
* The value is scaled to units of Volts using the calibrated scaling data from GetLSBWeight() and GetOffset().
|
|
* @return A scaled sample straight from this channel.
|
|
*/
|
|
float AnalogInput::GetVoltage() const
|
|
{
|
|
return m_impl->Get();
|
|
}
|
|
|
|
/**
|
|
* Get a scaled sample from the output of the oversample and average engine for this channel.
|
|
* The value is scaled to units of Volts using the calibrated scaling data from GetLSBWeight() and GetOffset().
|
|
* Using oversampling will cause this value to be higher resolution, but it will update more slowly.
|
|
* Using averaging will cause this value to be more stable, but it will update more slowly.
|
|
* @return A scaled sample from the output of the oversample and average engine for this channel.
|
|
*/
|
|
float AnalogInput::GetAverageVoltage() const
|
|
{
|
|
return m_impl->Get();
|
|
}
|
|
|
|
/**
|
|
* Get the channel number.
|
|
* @return The channel number.
|
|
*/
|
|
uint32_t AnalogInput::GetChannel() const
|
|
{
|
|
return m_channel;
|
|
}
|
|
|
|
/**
|
|
* Get the Average value for the PID Source base object.
|
|
*
|
|
* @return The average voltage.
|
|
*/
|
|
double AnalogInput::PIDGet() const
|
|
{
|
|
return GetAverageVoltage();
|
|
}
|
|
|
|
void AnalogInput::UpdateTable() {
|
|
if (m_table != nullptr) {
|
|
m_table->PutNumber("Value", GetAverageVoltage());
|
|
}
|
|
}
|
|
|
|
void AnalogInput::StartLiveWindowMode() {
|
|
|
|
}
|
|
|
|
void AnalogInput::StopLiveWindowMode() {
|
|
|
|
}
|
|
|
|
std::string AnalogInput::GetSmartDashboardType() const {
|
|
return "Analog Input";
|
|
}
|
|
|
|
void AnalogInput::InitTable(::std::shared_ptr<ITable> subTable) {
|
|
m_table = subTable;
|
|
UpdateTable();
|
|
}
|
|
|
|
::std::shared_ptr<ITable> AnalogInput::GetTable() const {
|
|
return m_table;
|
|
}
|