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

Replaced const variables with constexpr (#731)

Browse Source
This commit is contained in:
Tyler Veness
2017-11-19 19:04:28 -08:00
committed by Peter Johnson
parent 259461aee9
commit 5af0c9c101
16 changed files with 26 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wpilibc/src/main/native/cpp/ADXL345_I2C.cpp
View File

@@ -14,12 +14,6 @@
using namespace frc;
const int ADXL345_I2C::kAddress;
const int ADXL345_I2C::kPowerCtlRegister;
const int ADXL345_I2C::kDataFormatRegister;
const int ADXL345_I2C::kDataRegister;
constexpr double ADXL345_I2C::kGsPerLSB;
/**
* Constructs the ADXL345 Accelerometer over I2C.
*

5
wpilibc/src/main/native/cpp/ADXL345_SPI.cpp
View File

@@ -15,11 +15,6 @@
using namespace frc;
const int ADXL345_SPI::kPowerCtlRegister;
const int ADXL345_SPI::kDataFormatRegister;
const int ADXL345_SPI::kDataRegister;
constexpr double ADXL345_SPI::kGsPerLSB;
/**
* Constructor.
*

6
wpilibc/src/main/native/cpp/AnalogGyro.cpp
View File

@@ -20,12 +20,6 @@
using namespace frc;
const int AnalogGyro::kOversampleBits;
const int AnalogGyro::kAverageBits;
constexpr double AnalogGyro::kSamplesPerSecond;
constexpr double AnalogGyro::kCalibrationSampleTime;
constexpr double AnalogGyro::kDefaultVoltsPerDegreePerSecond;
/**
* Gyro constructor using the Analog Input channel number.
*

4
wpilibc/src/main/native/cpp/AnalogInput.cpp
View File

@@ -20,10 +20,6 @@
using namespace frc;
const int AnalogInput::kAccumulatorModuleNumber;
const int AnalogInput::kAccumulatorNumChannels;
const int AnalogInput::kAccumulatorChannels[] = {0, 1};
/**
* Construct an analog input.
*

8
wpilibc/src/main/native/cpp/DriverStation.cpp
View File

@@ -32,9 +32,7 @@ struct MatchInfoData {
using namespace frc;
const double JOYSTICK_UNPLUGGED_MESSAGE_INTERVAL = 1.0;
const int DriverStation::kJoystickPorts;
static constexpr double kJoystickUnpluggedMessageInterval = 1.0;
DriverStation::~DriverStation() {
m_isRunning = false;
@@ -721,7 +719,7 @@ void DriverStation::ReportJoystickUnpluggedError(llvm::StringRef message) {
double currentTime = Timer::GetFPGATimestamp();
if (currentTime > m_nextMessageTime) {
ReportError(message);
m_nextMessageTime = currentTime + JOYSTICK_UNPLUGGED_MESSAGE_INTERVAL;
m_nextMessageTime = currentTime + kJoystickUnpluggedMessageInterval;
}
}
@@ -734,7 +732,7 @@ void DriverStation::ReportJoystickUnpluggedWarning(llvm::StringRef message) {
double currentTime = Timer::GetFPGATimestamp();
if (currentTime > m_nextMessageTime) {
ReportWarning(message);
m_nextMessageTime = currentTime + JOYSTICK_UNPLUGGED_MESSAGE_INTERVAL;
m_nextMessageTime = currentTime + kJoystickUnpluggedMessageInterval;
}
}

2
wpilibc/src/main/native/cpp/RobotDrive.cpp
View File

@@ -20,8 +20,6 @@
using namespace frc;
const int RobotDrive::kMaxNumberOfMotors;
static std::shared_ptr<SpeedController> make_shared_nodelete(
SpeedController* ptr) {
return std::shared_ptr<SpeedController>(ptr, NullDeleter<SpeedController>());

12
wpilibc/src/main/native/cpp/Ultrasonic.cpp
View File

@@ -19,17 +19,7 @@
using namespace frc;
// Time (sec) for the ping trigger pulse.
constexpr double Ultrasonic::kPingTime;
// Priority that the ultrasonic round robin task runs.
const int Ultrasonic::kPriority;
// Max time (ms) between readings.
constexpr double Ultrasonic::kMaxUltrasonicTime;
constexpr double Ultrasonic::kSpeedOfSoundInchesPerSec;
// Automatic round robin mode.
// Automatic round robin mode
std::atomic<bool> Ultrasonic::m_automaticEnabled{false};
std::set<Ultrasonic*> Ultrasonic::m_sensors;