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

SendableChooser: Rename addDefault and addObject for clarity (#1239)

Browse Source 
Rename addDefault to setDefaultOption and addObject to addOption.

The old names are still available but are marked as deprecated.
This commit is contained in:
Peter Johnson
2018-08-19 01:51:17 -07:00
committed by GitHub
parent fa78f30e30
commit b44f27ddfa
13 changed files with 66 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Robot.cpp
View File

@@ -29,8 +29,8 @@ void Robot::RobotInit() {
frc::SmartDashboard::PutData(&pneumatics);
// instantiate the command used for the autonomous period
m_autoChooser.AddDefault("Drive and Shoot", &m_driveAndShootAuto);
m_autoChooser.AddObject("Drive Forward", &m_driveForwardAuto);
m_autoChooser.SetDefaultOption("Drive and Shoot", &m_driveAndShootAuto);
m_autoChooser.AddOption("Drive Forward", &m_driveForwardAuto);
frc::SmartDashboard::PutData("Auto Mode", &m_autoChooser);
pneumatics.Start(); // Pressurize the pneumatics.

4
wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Robot.cpp
View File

@@ -14,8 +14,8 @@ ExampleSubsystem Robot::m_subsystem;
OI Robot::m_oi;
void Robot::RobotInit() {
m_chooser.AddDefault("Default Auto", &m_defaultAuto);
m_chooser.AddObject("My Auto", &m_myAuto);
m_chooser.SetDefaultOption("Default Auto", &m_defaultAuto);
m_chooser.AddOption("My Auto", &m_myAuto);
frc::SmartDashboard::PutData("Auto Modes", &m_chooser);
}

4
wpilibcExamples/src/main/cpp/templates/iterative/cpp/Robot.cpp
View File

@@ -12,8 +12,8 @@
#include <frc/smartdashboard/SmartDashboard.h>
void Robot::RobotInit() {
m_chooser.AddDefault(kAutoNameDefault, kAutoNameDefault);
m_chooser.AddObject(kAutoNameCustom, kAutoNameCustom);
m_chooser.SetDefaultOption(kAutoNameDefault, kAutoNameDefault);
m_chooser.AddOption(kAutoNameCustom, kAutoNameCustom);
frc::SmartDashboard::PutData("Auto Modes", &m_chooser);
}

4
wpilibcExamples/src/main/cpp/templates/sample/cpp/Robot.cpp
View File

@@ -19,8 +19,8 @@ Robot::Robot() {
}
void Robot::RobotInit() {
m_chooser.AddDefault(kAutoNameDefault, kAutoNameDefault);
m_chooser.AddObject(kAutoNameCustom, kAutoNameCustom);
m_chooser.SetDefaultOption(kAutoNameDefault, kAutoNameDefault);
m_chooser.AddOption(kAutoNameCustom, kAutoNameCustom);
frc::SmartDashboard::PutData("Auto Modes", &m_chooser);
}

4
wpilibcExamples/src/main/cpp/templates/timed/cpp/Robot.cpp
View File

@@ -12,8 +12,8 @@
#include <frc/smartdashboard/SmartDashboard.h>
void Robot::RobotInit() {
m_chooser.AddDefault(kAutoNameDefault, kAutoNameDefault);
m_chooser.AddObject(kAutoNameCustom, kAutoNameCustom);
m_chooser.SetDefaultOption(kAutoNameDefault, kAutoNameDefault);
m_chooser.AddOption(kAutoNameCustom, kAutoNameCustom);
frc::SmartDashboard::PutData("Auto Modes", &m_chooser);
}