Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +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
wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/pacgoat/Robot.java
View File

@@ -62,8 +62,8 @@ public class Robot extends IterativeRobot {
// instantiate the command used for the autonomous period
m_autoChooser = new SendableChooser<Command>();
m_autoChooser.addDefault("Drive and Shoot", new DriveAndShootAutonomous());
m_autoChooser.addObject("Drive Forward", new DriveForward());
m_autoChooser.setDefaultOption("Drive and Shoot", new DriveAndShootAutonomous());
m_autoChooser.addOption("Drive Forward", new DriveForward());
SmartDashboard.putData("Auto Mode", m_autoChooser);
}

4
wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbased/Robot.java
View File

@@ -36,8 +36,8 @@ public class Robot extends TimedRobot {
@Override
public void robotInit() {
m_oi = new OI();
m_chooser.addDefault("Default Auto", new ExampleCommand());
// chooser.addObject("My Auto", new MyAutoCommand());
m_chooser.setDefaultOption("Default Auto", new ExampleCommand());
// chooser.addOption("My Auto", new MyAutoCommand());
SmartDashboard.putData("Auto mode", m_chooser);
}

4
wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/iterative/Robot.java
View File

@@ -30,8 +30,8 @@ public class Robot extends IterativeRobot {
*/
@Override
public void robotInit() {
m_chooser.addDefault("Default Auto", kDefaultAuto);
m_chooser.addObject("My Auto", kCustomAuto);
m_chooser.setDefaultOption("Default Auto", kDefaultAuto);
m_chooser.addOption("My Auto", kCustomAuto);
SmartDashboard.putData("Auto choices", m_chooser);
}

4
wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/sample/Robot.java
View File

@@ -47,8 +47,8 @@ public class Robot extends SampleRobot {
@Override
public void robotInit() {
m_chooser.addDefault("Default Auto", kDefaultAuto);
m_chooser.addObject("My Auto", kCustomAuto);
m_chooser.setDefaultOption("Default Auto", kDefaultAuto);
m_chooser.addOption("My Auto", kCustomAuto);
SmartDashboard.putData("Auto modes", m_chooser);
}

4
wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/timed/Robot.java
View File

@@ -30,8 +30,8 @@ public class Robot extends TimedRobot {
*/
@Override
public void robotInit() {
m_chooser.addDefault("Default Auto", kDefaultAuto);
m_chooser.addObject("My Auto", kCustomAuto);
m_chooser.setDefaultOption("Default Auto", kDefaultAuto);
m_chooser.addOption("My Auto", kCustomAuto);
SmartDashboard.putData("Auto choices", m_chooser);
}