From e902a98601891b694e18f6b76c1634a5ec7a107c Mon Sep 17 00:00:00 2001 From: sciencewhiz Date: Sat, 29 Nov 2025 20:46:32 -0800 Subject: [PATCH] [examples] Reorganize templates to use CommandsV2 (#8432) Change Commandbased to Commandv2 Run example check on templates --- shared/examplecheck.gradle | 46 ++++++++++--------- wpilibcExamples/example_projects.bzl | 4 +- .../src/main/cpp/examples/examples.json | 30 ++++++------ .../{commandbased => commandv2}/cpp/Robot.cpp | 0 .../cpp/RobotContainer.cpp | 0 .../cpp/commands/Autos.cpp | 0 .../cpp/commands/ExampleCommand.cpp | 0 .../cpp/subsystems/ExampleSubsystem.cpp | 0 .../include/Constants.hpp | 0 .../include/Robot.hpp | 0 .../include/RobotContainer.hpp | 0 .../include/commands/Autos.hpp | 0 .../include/commands/ExampleCommand.hpp | 0 .../include/subsystems/ExampleSubsystem.hpp | 0 .../cpp/Robot.cpp | 0 .../cpp/RobotContainer.cpp | 0 .../include/Robot.hpp | 0 .../include/RobotContainer.hpp | 0 .../src/main/cpp/templates/templates.json | 24 +++++----- wpilibjExamples/example_projects.bzl | 8 ++-- .../java/org/wpilib/examples/examples.json | 30 ++++++------ .../Constants.java | 2 +- .../{commandbased => commandv2}/Main.java | 2 +- .../{commandbased => commandv2}/Robot.java | 2 +- .../RobotContainer.java | 10 ++-- .../commands/Autos.java | 4 +- .../commands/ExampleCommand.java | 4 +- .../subsystems/ExampleSubsystem.java | 2 +- .../Main.java | 2 +- .../Robot.java | 2 +- .../RobotContainer.java | 2 +- .../Constants.java | 2 +- .../Main.java | 2 +- .../Robot.java | 2 +- .../RobotContainer.java | 6 +-- .../commands/ExampleCommand.java | 4 +- .../subsystems/RomiDrivetrain.java | 2 +- .../java/org/wpilib/templates/templates.json | 24 +++++----- .../Constants.java | 2 +- .../Main.java | 2 +- .../Robot.java | 2 +- .../RobotContainer.java | 6 +-- .../commands/ExampleCommand.java | 4 +- .../subsystems/XRPDrivetrain.java | 2 +- 44 files changed, 119 insertions(+), 115 deletions(-) rename wpilibcExamples/src/main/cpp/templates/{commandbased => commandv2}/cpp/Robot.cpp (100%) rename wpilibcExamples/src/main/cpp/templates/{commandbased => commandv2}/cpp/RobotContainer.cpp (100%) rename wpilibcExamples/src/main/cpp/templates/{commandbased => commandv2}/cpp/commands/Autos.cpp (100%) rename wpilibcExamples/src/main/cpp/templates/{commandbased => commandv2}/cpp/commands/ExampleCommand.cpp (100%) rename wpilibcExamples/src/main/cpp/templates/{commandbased => commandv2}/cpp/subsystems/ExampleSubsystem.cpp (100%) rename wpilibcExamples/src/main/cpp/templates/{commandbased => commandv2}/include/Constants.hpp (100%) rename wpilibcExamples/src/main/cpp/templates/{commandbased => commandv2}/include/Robot.hpp (100%) rename wpilibcExamples/src/main/cpp/templates/{commandbased => commandv2}/include/RobotContainer.hpp (100%) rename wpilibcExamples/src/main/cpp/templates/{commandbased => commandv2}/include/commands/Autos.hpp (100%) rename wpilibcExamples/src/main/cpp/templates/{commandbased => commandv2}/include/commands/ExampleCommand.hpp (100%) rename wpilibcExamples/src/main/cpp/templates/{commandbased => commandv2}/include/subsystems/ExampleSubsystem.hpp (100%) rename wpilibcExamples/src/main/cpp/templates/{commandbasedskeleton => commandv2skeleton}/cpp/Robot.cpp (100%) rename wpilibcExamples/src/main/cpp/templates/{commandbasedskeleton => commandv2skeleton}/cpp/RobotContainer.cpp (100%) rename wpilibcExamples/src/main/cpp/templates/{commandbasedskeleton => commandv2skeleton}/include/Robot.hpp (100%) rename wpilibcExamples/src/main/cpp/templates/{commandbasedskeleton => commandv2skeleton}/include/RobotContainer.hpp (100%) rename wpilibjExamples/src/main/java/org/wpilib/templates/{commandbased => commandv2}/Constants.java (94%) rename wpilibjExamples/src/main/java/org/wpilib/templates/{commandbased => commandv2}/Main.java (94%) rename wpilibjExamples/src/main/java/org/wpilib/templates/{commandbased => commandv2}/Robot.java (98%) rename wpilibjExamples/src/main/java/org/wpilib/templates/{commandbased => commandv2}/RobotContainer.java (89%) rename wpilibjExamples/src/main/java/org/wpilib/templates/{commandbased => commandv2}/commands/Autos.java (83%) rename wpilibjExamples/src/main/java/org/wpilib/templates/{commandbased => commandv2}/commands/ExampleCommand.java (90%) rename wpilibjExamples/src/main/java/org/wpilib/templates/{commandbased => commandv2}/subsystems/ExampleSubsystem.java (95%) rename wpilibjExamples/src/main/java/org/wpilib/templates/{commandbasedskeleton => commandv2skeleton}/Main.java (88%) rename wpilibjExamples/src/main/java/org/wpilib/templates/{commandbasedskeleton => commandv2skeleton}/Robot.java (96%) rename wpilibjExamples/src/main/java/org/wpilib/templates/{commandbasedskeleton => commandv2skeleton}/RobotContainer.java (90%) rename wpilibjExamples/src/main/java/org/wpilib/templates/{xrpcommandbased => romicommandv2}/Constants.java (93%) rename wpilibjExamples/src/main/java/org/wpilib/templates/{xrpcommandbased => romicommandv2}/Main.java (94%) rename wpilibjExamples/src/main/java/org/wpilib/templates/{xrpcommandbased => romicommandv2}/Robot.java (98%) rename wpilibjExamples/src/main/java/org/wpilib/templates/{romicommandbased => romicommandv2}/RobotContainer.java (90%) rename wpilibjExamples/src/main/java/org/wpilib/templates/{romicommandbased => romicommandv2}/commands/ExampleCommand.java (90%) rename wpilibjExamples/src/main/java/org/wpilib/templates/{romicommandbased => romicommandv2}/subsystems/RomiDrivetrain.java (97%) rename wpilibjExamples/src/main/java/org/wpilib/templates/{romicommandbased => xrpcommandv2}/Constants.java (93%) rename wpilibjExamples/src/main/java/org/wpilib/templates/{romicommandbased => xrpcommandv2}/Main.java (94%) rename wpilibjExamples/src/main/java/org/wpilib/templates/{romicommandbased => xrpcommandv2}/Robot.java (98%) rename wpilibjExamples/src/main/java/org/wpilib/templates/{xrpcommandbased => xrpcommandv2}/RobotContainer.java (90%) rename wpilibjExamples/src/main/java/org/wpilib/templates/{xrpcommandbased => xrpcommandv2}/commands/ExampleCommand.java (90%) rename wpilibjExamples/src/main/java/org/wpilib/templates/{xrpcommandbased => xrpcommandv2}/subsystems/XRPDrivetrain.java (97%) diff --git a/shared/examplecheck.gradle b/shared/examplecheck.gradle index 006e4194d8..b9dee932e7 100644 --- a/shared/examplecheck.gradle +++ b/shared/examplecheck.gradle @@ -24,30 +24,12 @@ def fileCheck = { parsedJson, folder -> } } -task checkTemplates(type: Task) { - doLast { - def parsedJson = new groovy.json.JsonSlurper().parseText(templateFile.text) - fileCheck(parsedJson, templateDirectory) - parsedJson.each { - assert it.name != null - assert it.description != null - assert it.tags != null - assert it.foldername != null - assert it.gradlebase != null - assert it.commandversion != null - if (it.gradlebase == 'java') { - assert it.mainclass != null - } - } - } -} - def tagList = [ /* --- Categories --- */ // On-RIO image processing - "Vision", + "Vision", "AprilTags", // Command-based - "Command-based", + "Commandv2", "Commandv3", // Romi "Romi", // XRP @@ -79,11 +61,33 @@ def tagList = [ /* --- HID --- */ "XboxController", "PS4Controller", "PS5Controller", "Joystick", + /* --- RobotBase --- */ + "Timed", "Timeslice", "RobotBase", "Educational", + /* --- Misc --- */ /* (try to keep this section minimal) */ - "EventLoop", "AprilTags", "Mechanism2d", "Preferences", + "EventLoop", "Mechanism2d", "Preferences", "Skeleton" ] +task checkTemplates(type: Task) { + doLast { + def parsedJson = new groovy.json.JsonSlurper().parseText(templateFile.text) + fileCheck(parsedJson, templateDirectory) + parsedJson.each { + assert it.name != null + assert it.description != null + assert it.tags != null + assert it.tags.findAll { !tagList.contains(it) }.empty + assert it.foldername != null + assert it.gradlebase != null + assert it.commandversion != null + if (it.gradlebase == 'java') { + assert it.mainclass != null + } + } + } +} + task checkExamples(type: Task) { doLast { def parsedJson = new groovy.json.JsonSlurper().parseText(exampleFile.text) diff --git a/wpilibcExamples/example_projects.bzl b/wpilibcExamples/example_projects.bzl index 2fd8199cb5..7b6e9099f3 100644 --- a/wpilibcExamples/example_projects.bzl +++ b/wpilibcExamples/example_projects.bzl @@ -84,8 +84,8 @@ SNIPPETS_FOLDERS = [ ] TEMPLATES_FOLDERS = [ - "commandbased", - "commandbasedskeleton", + "commandv2", + "commandv2skeleton", "robotbaseskeleton", "timed", "timedskeleton", diff --git a/wpilibcExamples/src/main/cpp/examples/examples.json b/wpilibcExamples/src/main/cpp/examples/examples.json index 48f816a73d..0560d95ca1 100644 --- a/wpilibcExamples/src/main/cpp/examples/examples.json +++ b/wpilibcExamples/src/main/cpp/examples/examples.json @@ -296,10 +296,10 @@ }, { "name": "'Traditional' Hatchbot", - "description": "A fully-functional command-based hatchbot for the 2019 game, written in the 'traditional' style, i.e. commands are given their own classes.", + "description": "A fully-functional Commandv2 hatchbot for the 2019 game, written in the 'traditional' style, i.e. commands are given their own classes.", "tags": [ "Complete Robot", - "Command-based", + "Commandv2", "Differential Drive", "Encoder", "Sendable", @@ -313,10 +313,10 @@ }, { "name": "'Inlined' Hatchbot", - "description": "A fully-functional command-based hatchbot for the 2019 game, written in the 'inlined' style, i.e. many commands are defined inline with lambdas.", + "description": "A fully-functional Commandv2 hatchbot for the 2019 game, written in the 'inlined' style, i.e. many commands are defined inline with lambdas.", "tags": [ "Complete Robot", - "Command-based", + "Commandv2", "Differential Drive", "Encoder", "Sendable", @@ -330,10 +330,10 @@ }, { "name": "Rapid React Command Bot", - "description": "A fully-functional command-based fender bot for the 2022 game, written in the 'inlined' style, i.e. many commands are defined inline with lambdas.", + "description": "A fully-functional Commandv2 fender bot for the 2022 game, written in the 'inlined' style, i.e. many commands are defined inline with lambdas.", "tags": [ "Complete Robot", - "Command-based", + "Commandv2", "Differential Drive", "Intake", "Flywheel", @@ -353,7 +353,7 @@ "name": "Select Command Example", "description": "Use SelectCommand to select an autonomous routine.", "tags": [ - "Command-based" + "Commandv2" ], "foldername": "SelectCommand", "gradlebase": "cpp", @@ -466,7 +466,7 @@ "name": "DriveDistanceOffboard", "description": "Drive a differential drivetrain a set distance using TrapezoidProfile and smart motor controller PID.", "tags": [ - "Command-based", + "Commandv2", "Differential Drive", "Trapezoid Profile", "Smart Motor Controller", @@ -478,10 +478,10 @@ }, { "name": "RomiReference", - "description": "An example command-based robot program that can be used with the Romi reference robot design.", + "description": "An example Commandv2 robot program that can be used with the Romi reference robot design.", "tags": [ "Romi", - "Command-based", + "Commandv2", "Differential Drive", "Digital Input", "Joystick" @@ -495,10 +495,10 @@ }, { "name": "XRP Reference", - "description": "An example command-based robot program that can be used with the XRP reference robot design.", + "description": "An example Commandv2 robot program that can be used with the XRP reference robot design.", "tags": [ "XRP", - "Command-based", + "Commandv2", "Differential Drive", "Digital Input", "Joystick" @@ -662,7 +662,7 @@ }, { "name": "SimpleDifferentialDriveSimulation", - "description": "Simulate a differential drivetrain and follow trajectories with LTVUnicycleController (non-command-based).", + "description": "Simulate a differential drivetrain and follow trajectories with LTVUnicycleController (non-Commandv2).", "tags": [ "Differential Drive", "State-Space", @@ -706,10 +706,10 @@ }, { "name": "SysIdRoutine", - "description": "A sample command-based robot demonstrating use of the SysIdRoutine command factory", + "description": "A sample Commandv2 robot demonstrating use of the SysIdRoutine command factory", "tags": [ "SysId", - "Command-based", + "Commandv2", "DataLog" ], "foldername": "SysIdRoutine", diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/templates/commandv2/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Robot.cpp rename to wpilibcExamples/src/main/cpp/templates/commandv2/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/RobotContainer.cpp b/wpilibcExamples/src/main/cpp/templates/commandv2/cpp/RobotContainer.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/commandbased/cpp/RobotContainer.cpp rename to wpilibcExamples/src/main/cpp/templates/commandv2/cpp/RobotContainer.cpp diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/commands/Autos.cpp b/wpilibcExamples/src/main/cpp/templates/commandv2/cpp/commands/Autos.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/commandbased/cpp/commands/Autos.cpp rename to wpilibcExamples/src/main/cpp/templates/commandv2/cpp/commands/Autos.cpp diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/commands/ExampleCommand.cpp b/wpilibcExamples/src/main/cpp/templates/commandv2/cpp/commands/ExampleCommand.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/commandbased/cpp/commands/ExampleCommand.cpp rename to wpilibcExamples/src/main/cpp/templates/commandv2/cpp/commands/ExampleCommand.cpp diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/subsystems/ExampleSubsystem.cpp b/wpilibcExamples/src/main/cpp/templates/commandv2/cpp/subsystems/ExampleSubsystem.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/commandbased/cpp/subsystems/ExampleSubsystem.cpp rename to wpilibcExamples/src/main/cpp/templates/commandv2/cpp/subsystems/ExampleSubsystem.cpp diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/include/Constants.hpp b/wpilibcExamples/src/main/cpp/templates/commandv2/include/Constants.hpp similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/commandbased/include/Constants.hpp rename to wpilibcExamples/src/main/cpp/templates/commandv2/include/Constants.hpp diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.hpp b/wpilibcExamples/src/main/cpp/templates/commandv2/include/Robot.hpp similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.hpp rename to wpilibcExamples/src/main/cpp/templates/commandv2/include/Robot.hpp diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/include/RobotContainer.hpp b/wpilibcExamples/src/main/cpp/templates/commandv2/include/RobotContainer.hpp similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/commandbased/include/RobotContainer.hpp rename to wpilibcExamples/src/main/cpp/templates/commandv2/include/RobotContainer.hpp diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/Autos.hpp b/wpilibcExamples/src/main/cpp/templates/commandv2/include/commands/Autos.hpp similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/Autos.hpp rename to wpilibcExamples/src/main/cpp/templates/commandv2/include/commands/Autos.hpp diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/ExampleCommand.hpp b/wpilibcExamples/src/main/cpp/templates/commandv2/include/commands/ExampleCommand.hpp similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/ExampleCommand.hpp rename to wpilibcExamples/src/main/cpp/templates/commandv2/include/commands/ExampleCommand.hpp diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/include/subsystems/ExampleSubsystem.hpp b/wpilibcExamples/src/main/cpp/templates/commandv2/include/subsystems/ExampleSubsystem.hpp similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/commandbased/include/subsystems/ExampleSubsystem.hpp rename to wpilibcExamples/src/main/cpp/templates/commandv2/include/subsystems/ExampleSubsystem.hpp diff --git a/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/templates/commandv2skeleton/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/cpp/Robot.cpp rename to wpilibcExamples/src/main/cpp/templates/commandv2skeleton/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/cpp/RobotContainer.cpp b/wpilibcExamples/src/main/cpp/templates/commandv2skeleton/cpp/RobotContainer.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/cpp/RobotContainer.cpp rename to wpilibcExamples/src/main/cpp/templates/commandv2skeleton/cpp/RobotContainer.cpp diff --git a/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/Robot.hpp b/wpilibcExamples/src/main/cpp/templates/commandv2skeleton/include/Robot.hpp similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/Robot.hpp rename to wpilibcExamples/src/main/cpp/templates/commandv2skeleton/include/Robot.hpp diff --git a/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/RobotContainer.hpp b/wpilibcExamples/src/main/cpp/templates/commandv2skeleton/include/RobotContainer.hpp similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/RobotContainer.hpp rename to wpilibcExamples/src/main/cpp/templates/commandv2skeleton/include/RobotContainer.hpp diff --git a/wpilibcExamples/src/main/cpp/templates/templates.json b/wpilibcExamples/src/main/cpp/templates/templates.json index 5109361cd9..559dd70c52 100644 --- a/wpilibcExamples/src/main/cpp/templates/templates.json +++ b/wpilibcExamples/src/main/cpp/templates/templates.json @@ -1,22 +1,22 @@ [ { - "name": "Command Robot", - "description": "Command-based, with explanatory comments and example code.", + "name": "Command v2 Robot", + "description": "Command v2, with explanatory comments and example code.", "tags": [ - "Command" + "Commandv2" ], - "foldername": "commandbased", + "foldername": "commandv2", "gradlebase": "cpp", "commandversion": 2 }, { - "name": "Command Robot Skeleton (Advanced)", - "description": "Skeleton (stub) code for Command-based, without explanatory comments and example code.", + "name": "Command v2 Robot Skeleton (Advanced)", + "description": "Skeleton (stub) code for Command v2, without explanatory comments and example code.", "tags": [ - "Command", + "Commandv2", "Skeleton" ], - "foldername": "commandbasedskeleton", + "foldername": "commandv2skeleton", "gradlebase": "cpp", "commandversion": 2 }, @@ -77,10 +77,10 @@ "name": "Romi - Command Robot", "description": "Romi - Command style", "tags": [ - "Command", + "Commandv2", "Romi" ], - "foldername": "commandbased", + "foldername": "commandv2", "gradlebase": "cppromi", "commandversion": 2, "extravendordeps": [ @@ -105,10 +105,10 @@ "name": "XRP - Command Robot", "description": "XRP - Command style", "tags": [ - "Command", + "Commandv2", "XRP" ], - "foldername": "commandbased", + "foldername": "commandv2", "gradlebase": "cppxrp", "commandversion": 2, "extravendordeps": [ diff --git a/wpilibjExamples/example_projects.bzl b/wpilibjExamples/example_projects.bzl index 546a2ef706..ba3971e388 100644 --- a/wpilibjExamples/example_projects.bzl +++ b/wpilibjExamples/example_projects.bzl @@ -83,18 +83,18 @@ SNIPPETS_FOLDERS = [ ] TEMPLATES_FOLDERS = [ - "commandbased", - "commandbasedskeleton", + "commandv2", + "commandv2skeleton", "educational", "robotbaseskeleton", - "romicommandbased", + "romicommandv2", "romieducational", "romitimed", "timed", "timedskeleton", "timeslice", "timesliceskeleton", - "xrpcommandbased", + "xrpcommandv2", "xrpeducational", "xrptimed", ] diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/examples.json b/wpilibjExamples/src/main/java/org/wpilib/examples/examples.json index 740d4aa64e..5987765a7f 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/examples.json +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/examples.json @@ -282,10 +282,10 @@ }, { "name": "'Traditional' Hatchbot", - "description": "A fully-functional command-based hatchbot for the 2019 game, written in the 'traditional' style, i.e. commands are given their own classes.", + "description": "A fully-functional Commandv2 hatchbot for the 2019 game, written in the 'traditional' style, i.e. commands are given their own classes.", "tags": [ "Complete Robot", - "Command-based", + "Commandv2", "Differential Drive", "Encoder", "Pneumatics", @@ -300,10 +300,10 @@ }, { "name": "'Inlined' Hatchbot", - "description": "A fully-functional command-based hatchbot for the 2019 game, written in the 'inlined' style, i.e. many commands are defined inline with lambdas.", + "description": "A fully-functional Commandv2 hatchbot for the 2019 game, written in the 'inlined' style, i.e. many commands are defined inline with lambdas.", "tags": [ "Complete Robot", - "Command-based", + "Commandv2", "Differential Drive", "Encoder", "Pneumatics", @@ -318,10 +318,10 @@ }, { "name": "Rapid React Command Bot", - "description": "A fully-functional command-based fender bot for the 2022 game, written in the 'inlined' style, i.e. many commands are defined inline with lambdas.", + "description": "A fully-functional Commandv2 fender bot for the 2022 game, written in the 'inlined' style, i.e. many commands are defined inline with lambdas.", "tags": [ "Complete Robot", - "Command-based", + "Commandv2", "Differential Drive", "Intake", "Flywheel", @@ -342,7 +342,7 @@ "name": "Select Command Example", "description": "Use SelectCommand to select an autonomous routine.", "tags": [ - "Command-based" + "Commandv2" ], "foldername": "selectcommand", "gradlebase": "java", @@ -464,7 +464,7 @@ "name": "DriveDistanceOffboard", "description": "Drive a differential drivetrain a set distance using TrapezoidProfile and smart motor controller PID.", "tags": [ - "Command-based", + "Commandv2", "Differential Drive", "Trapezoid Profile", "Smart Motor Controller", @@ -542,7 +542,7 @@ }, { "name": "SimpleDifferentialDriveSimulation", - "description": "Simulate a differential drivetrain and follow trajectories with LTVUnicycleController (non-command-based).", + "description": "Simulate a differential drivetrain and follow trajectories with LTVUnicycleController (non-Commandv2).", "tags": [ "Differential Drive", "State-Space", @@ -672,10 +672,10 @@ }, { "name": "RomiReference", - "description": "An example command-based robot program that can be used with the Romi reference robot design.", + "description": "An example Commandv2 robot program that can be used with the Romi reference robot design.", "tags": [ "Romi", - "Command-based", + "Commandv2", "Differential Drive", "Digital Input", "Joystick" @@ -690,10 +690,10 @@ }, { "name": "XRP Reference", - "description": "An example command-based robot program that can be used with the XRP reference robot design.", + "description": "An example Commandv2 robot program that can be used with the XRP reference robot design.", "tags": [ "XRP", - "Command-based", + "Commandv2", "Differential Drive", "Digital Input", "Joystick" @@ -747,10 +747,10 @@ }, { "name": "SysIdRoutine", - "description": "A sample command-based robot demonstrating use of the SysIdRoutine command factory", + "description": "A sample Commandv2 robot demonstrating use of the SysIdRoutine command factory", "tags": [ "SysId", - "Command-based", + "Commandv2", "DataLog" ], "foldername": "sysidroutine", diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandv2/Constants.java similarity index 94% rename from wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Constants.java rename to wpilibjExamples/src/main/java/org/wpilib/templates/commandv2/Constants.java index f0a5e72b89..02208d3b7a 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Constants.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandv2/Constants.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.templates.commandbased; +package org.wpilib.templates.commandv2; /** * The Constants class provides a convenient place for teams to hold robot-wide numerical or boolean diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandv2/Main.java similarity index 94% rename from wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Main.java rename to wpilibjExamples/src/main/java/org/wpilib/templates/commandv2/Main.java index cf6ed4f6c6..ef12656266 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandv2/Main.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.templates.commandbased; +package org.wpilib.templates.commandv2; import org.wpilib.framework.RobotBase; diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandv2/Robot.java similarity index 98% rename from wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Robot.java rename to wpilibjExamples/src/main/java/org/wpilib/templates/commandv2/Robot.java index c1c507215f..073a1d17fd 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandv2/Robot.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.templates.commandbased; +package org.wpilib.templates.commandv2; import org.wpilib.command2.Command; import org.wpilib.command2.CommandScheduler; diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandv2/RobotContainer.java similarity index 89% rename from wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/RobotContainer.java rename to wpilibjExamples/src/main/java/org/wpilib/templates/commandv2/RobotContainer.java index e7222af031..ba03fcf497 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/RobotContainer.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandv2/RobotContainer.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.templates.commandbased; +package org.wpilib.templates.commandv2; import org.wpilib.command2.Command; import org.wpilib.command2.button.CommandXboxController; import org.wpilib.command2.button.Trigger; -import org.wpilib.templates.commandbased.Constants.OperatorConstants; -import org.wpilib.templates.commandbased.commands.Autos; -import org.wpilib.templates.commandbased.commands.ExampleCommand; -import org.wpilib.templates.commandbased.subsystems.ExampleSubsystem; +import org.wpilib.templates.commandv2.Constants.OperatorConstants; +import org.wpilib.templates.commandv2.commands.Autos; +import org.wpilib.templates.commandv2.commands.ExampleCommand; +import org.wpilib.templates.commandv2.subsystems.ExampleSubsystem; /** * This class is where the bulk of the robot should be declared. Since Command-based is a diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/commands/Autos.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandv2/commands/Autos.java similarity index 83% rename from wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/commands/Autos.java rename to wpilibjExamples/src/main/java/org/wpilib/templates/commandv2/commands/Autos.java index a2a9784044..ba946ab6e2 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/commands/Autos.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandv2/commands/Autos.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.templates.commandbased.commands; +package org.wpilib.templates.commandv2.commands; import org.wpilib.command2.Command; import org.wpilib.command2.Commands; -import org.wpilib.templates.commandbased.subsystems.ExampleSubsystem; +import org.wpilib.templates.commandv2.subsystems.ExampleSubsystem; public final class Autos { /** Example static factory for an autonomous command. */ diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/commands/ExampleCommand.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandv2/commands/ExampleCommand.java similarity index 90% rename from wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/commands/ExampleCommand.java rename to wpilibjExamples/src/main/java/org/wpilib/templates/commandv2/commands/ExampleCommand.java index 32302c2137..800a188906 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/commands/ExampleCommand.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandv2/commands/ExampleCommand.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.templates.commandbased.commands; +package org.wpilib.templates.commandv2.commands; import org.wpilib.command2.Command; -import org.wpilib.templates.commandbased.subsystems.ExampleSubsystem; +import org.wpilib.templates.commandv2.subsystems.ExampleSubsystem; /** An example command that uses an example subsystem. */ public class ExampleCommand extends Command { diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/subsystems/ExampleSubsystem.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandv2/subsystems/ExampleSubsystem.java similarity index 95% rename from wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/subsystems/ExampleSubsystem.java rename to wpilibjExamples/src/main/java/org/wpilib/templates/commandv2/subsystems/ExampleSubsystem.java index ccfe59b523..0160a64f60 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/subsystems/ExampleSubsystem.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandv2/subsystems/ExampleSubsystem.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.templates.commandbased.subsystems; +package org.wpilib.templates.commandv2.subsystems; import org.wpilib.command2.Command; import org.wpilib.command2.SubsystemBase; diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandv2skeleton/Main.java similarity index 88% rename from wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/Main.java rename to wpilibjExamples/src/main/java/org/wpilib/templates/commandv2skeleton/Main.java index 46206467ed..fcba8ec175 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandv2skeleton/Main.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.templates.commandbasedskeleton; +package org.wpilib.templates.commandv2skeleton; import org.wpilib.framework.RobotBase; diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandv2skeleton/Robot.java similarity index 96% rename from wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/Robot.java rename to wpilibjExamples/src/main/java/org/wpilib/templates/commandv2skeleton/Robot.java index dcf7b05da0..72bef51a34 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandv2skeleton/Robot.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.templates.commandbasedskeleton; +package org.wpilib.templates.commandv2skeleton; import org.wpilib.command2.Command; import org.wpilib.command2.CommandScheduler; diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandv2skeleton/RobotContainer.java similarity index 90% rename from wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/RobotContainer.java rename to wpilibjExamples/src/main/java/org/wpilib/templates/commandv2skeleton/RobotContainer.java index 1b785388c2..991733964c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/RobotContainer.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandv2skeleton/RobotContainer.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.templates.commandbasedskeleton; +package org.wpilib.templates.commandv2skeleton; import org.wpilib.command2.Command; import org.wpilib.command2.Commands; diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandv2/Constants.java similarity index 93% rename from wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Constants.java rename to wpilibjExamples/src/main/java/org/wpilib/templates/romicommandv2/Constants.java index a43a8ab35c..cc5b0ec961 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Constants.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandv2/Constants.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.templates.xrpcommandbased; +package org.wpilib.templates.romicommandv2; /** * The Constants class provides a convenient place for teams to hold robot-wide numerical or boolean diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandv2/Main.java similarity index 94% rename from wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Main.java rename to wpilibjExamples/src/main/java/org/wpilib/templates/romicommandv2/Main.java index 36d2995621..996af74c15 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandv2/Main.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.templates.xrpcommandbased; +package org.wpilib.templates.romicommandv2; import org.wpilib.framework.RobotBase; diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandv2/Robot.java similarity index 98% rename from wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Robot.java rename to wpilibjExamples/src/main/java/org/wpilib/templates/romicommandv2/Robot.java index 16a2b40904..d7066d97bc 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandv2/Robot.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.templates.xrpcommandbased; +package org.wpilib.templates.romicommandv2; import org.wpilib.command2.Command; import org.wpilib.command2.CommandScheduler; diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandv2/RobotContainer.java similarity index 90% rename from wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/RobotContainer.java rename to wpilibjExamples/src/main/java/org/wpilib/templates/romicommandv2/RobotContainer.java index 8cd9285f60..3276d9c038 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/RobotContainer.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandv2/RobotContainer.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.templates.romicommandbased; +package org.wpilib.templates.romicommandv2; import org.wpilib.command2.Command; import org.wpilib.driverstation.XboxController; -import org.wpilib.templates.romicommandbased.commands.ExampleCommand; -import org.wpilib.templates.romicommandbased.subsystems.RomiDrivetrain; +import org.wpilib.templates.romicommandv2.commands.ExampleCommand; +import org.wpilib.templates.romicommandv2.subsystems.RomiDrivetrain; /** * This class is where the bulk of the robot should be declared. Since Command-based is a diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/commands/ExampleCommand.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandv2/commands/ExampleCommand.java similarity index 90% rename from wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/commands/ExampleCommand.java rename to wpilibjExamples/src/main/java/org/wpilib/templates/romicommandv2/commands/ExampleCommand.java index ab89f85576..f21a9aee0d 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/commands/ExampleCommand.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandv2/commands/ExampleCommand.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.templates.romicommandbased.commands; +package org.wpilib.templates.romicommandv2.commands; import org.wpilib.command2.Command; -import org.wpilib.templates.romicommandbased.subsystems.RomiDrivetrain; +import org.wpilib.templates.romicommandv2.subsystems.RomiDrivetrain; /** An example command that uses an example subsystem. */ public class ExampleCommand extends Command { diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/subsystems/RomiDrivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandv2/subsystems/RomiDrivetrain.java similarity index 97% rename from wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/subsystems/RomiDrivetrain.java rename to wpilibjExamples/src/main/java/org/wpilib/templates/romicommandv2/subsystems/RomiDrivetrain.java index b887ab8dbf..f34703eb83 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/subsystems/RomiDrivetrain.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandv2/subsystems/RomiDrivetrain.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.templates.romicommandbased.subsystems; +package org.wpilib.templates.romicommandv2.subsystems; import org.wpilib.command2.SubsystemBase; import org.wpilib.drive.DifferentialDrive; diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/templates.json b/wpilibjExamples/src/main/java/org/wpilib/templates/templates.json index c01dc170f6..d8aa483399 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/templates.json +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/templates.json @@ -1,23 +1,23 @@ [ { - "name": "Command Robot", - "description": "Command-based, with explanatory comments and example code.", + "name": "Command v2 Robot", + "description": "Command v2, with explanatory comments and example code.", "tags": [ - "Command" + "Commandv2" ], - "foldername": "commandbased", + "foldername": "commandv2", "gradlebase": "java", "mainclass": "Main", "commandversion": 2 }, { - "name": "Command Robot Skeleton (Advanced)", - "description": "Skeleton (stub) code for Command-based, without explanatory comments and example code.", + "name": "Command v2 Robot Skeleton (Advanced)", + "description": "Skeleton (stub) code for Command v2, without explanatory comments and example code.", "tags": [ - "Command", + "Commandv2", "Skeleton" ], - "foldername": "commandbasedskeleton", + "foldername": "commandv2skeleton", "gradlebase": "java", "mainclass": "Main", "commandversion": 2 @@ -84,10 +84,10 @@ "name": "Romi - Command Robot", "description": "Romi - Command style", "tags": [ - "Command", + "Commandv2", "Romi" ], - "foldername": "romicommandbased", + "foldername": "romicommandv2", "gradlebase": "javaromi", "mainclass": "Main", "commandversion": 2, @@ -114,10 +114,10 @@ "name": "XRP - Command Robot", "description": "XRP - Command style", "tags": [ - "Command", + "Commandv2", "XRP" ], - "foldername": "xrpcommandbased", + "foldername": "xrpcommandv2", "gradlebase": "javaxrp", "mainclass": "Main", "commandversion": 2, diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandv2/Constants.java similarity index 93% rename from wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Constants.java rename to wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandv2/Constants.java index 9565d0cc25..64a70d68f0 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Constants.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandv2/Constants.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.templates.romicommandbased; +package org.wpilib.templates.xrpcommandv2; /** * The Constants class provides a convenient place for teams to hold robot-wide numerical or boolean diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandv2/Main.java similarity index 94% rename from wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Main.java rename to wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandv2/Main.java index b06da91ccf..6089c70914 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandv2/Main.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.templates.romicommandbased; +package org.wpilib.templates.xrpcommandv2; import org.wpilib.framework.RobotBase; diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandv2/Robot.java similarity index 98% rename from wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Robot.java rename to wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandv2/Robot.java index 8feb90af3c..db3eeb210c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandv2/Robot.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.templates.romicommandbased; +package org.wpilib.templates.xrpcommandv2; import org.wpilib.command2.Command; import org.wpilib.command2.CommandScheduler; diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandv2/RobotContainer.java similarity index 90% rename from wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/RobotContainer.java rename to wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandv2/RobotContainer.java index 14fdf19ff4..f3a52b2ca8 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/RobotContainer.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandv2/RobotContainer.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.templates.xrpcommandbased; +package org.wpilib.templates.xrpcommandv2; import org.wpilib.command2.Command; import org.wpilib.driverstation.XboxController; -import org.wpilib.templates.xrpcommandbased.commands.ExampleCommand; -import org.wpilib.templates.xrpcommandbased.subsystems.XRPDrivetrain; +import org.wpilib.templates.xrpcommandv2.commands.ExampleCommand; +import org.wpilib.templates.xrpcommandv2.subsystems.XRPDrivetrain; /** * This class is where the bulk of the robot should be declared. Since Command-based is a diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/commands/ExampleCommand.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandv2/commands/ExampleCommand.java similarity index 90% rename from wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/commands/ExampleCommand.java rename to wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandv2/commands/ExampleCommand.java index 3748415b01..f44d6c017c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/commands/ExampleCommand.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandv2/commands/ExampleCommand.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.templates.xrpcommandbased.commands; +package org.wpilib.templates.xrpcommandv2.commands; import org.wpilib.command2.Command; -import org.wpilib.templates.xrpcommandbased.subsystems.XRPDrivetrain; +import org.wpilib.templates.xrpcommandv2.subsystems.XRPDrivetrain; /** An example command that uses an example subsystem. */ public class ExampleCommand extends Command { diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/subsystems/XRPDrivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandv2/subsystems/XRPDrivetrain.java similarity index 97% rename from wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/subsystems/XRPDrivetrain.java rename to wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandv2/subsystems/XRPDrivetrain.java index f6b72541e3..e112d2bc31 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/subsystems/XRPDrivetrain.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandv2/subsystems/XRPDrivetrain.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.templates.xrpcommandbased.subsystems; +package org.wpilib.templates.xrpcommandv2.subsystems; import org.wpilib.command2.SubsystemBase; import org.wpilib.drive.DifferentialDrive;