diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/Robot.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/RobotContainer.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/RobotContainer.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/RobotContainer.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/RobotContainer.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/commands/Autonomous.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/Autonomous.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/commands/Autonomous.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/Autonomous.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/commands/CloseClaw.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/CloseClaw.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/commands/CloseClaw.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/CloseClaw.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/commands/DriveStraight.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/DriveStraight.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/commands/DriveStraight.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/DriveStraight.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/commands/OpenClaw.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/OpenClaw.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/commands/OpenClaw.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/OpenClaw.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/commands/Pickup.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/Pickup.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/commands/Pickup.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/Pickup.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/commands/Place.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/Place.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/commands/Place.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/Place.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/commands/PrepareToPickup.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/PrepareToPickup.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/commands/PrepareToPickup.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/PrepareToPickup.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/commands/SetDistanceToBox.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/SetDistanceToBox.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/commands/SetDistanceToBox.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/SetDistanceToBox.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/commands/SetElevatorSetpoint.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/SetElevatorSetpoint.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/commands/SetElevatorSetpoint.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/SetElevatorSetpoint.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/commands/SetWristSetpoint.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/SetWristSetpoint.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/commands/SetWristSetpoint.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/SetWristSetpoint.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/commands/TankDrive.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/TankDrive.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/commands/TankDrive.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/commands/TankDrive.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/subsystems/Claw.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/subsystems/Claw.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/subsystems/Claw.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/subsystems/Claw.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/subsystems/DriveTrain.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/subsystems/DriveTrain.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/subsystems/DriveTrain.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/subsystems/DriveTrain.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/subsystems/Elevator.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/subsystems/Elevator.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/subsystems/Elevator.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/subsystems/Elevator.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/subsystems/Wrist.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/subsystems/Wrist.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/subsystems/Wrist.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/subsystems/Wrist.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Robot.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/Robot.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/Robot.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/RobotContainer.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/RobotContainer.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/RobotContainer.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/RobotContainer.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/commands/Autonomous.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/Autonomous.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/commands/Autonomous.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/Autonomous.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/commands/CloseClaw.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/CloseClaw.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/commands/CloseClaw.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/CloseClaw.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/commands/DriveStraight.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/DriveStraight.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/commands/DriveStraight.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/DriveStraight.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/commands/OpenClaw.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/OpenClaw.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/commands/OpenClaw.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/OpenClaw.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/commands/Pickup.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/Pickup.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/commands/Pickup.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/Pickup.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/commands/Place.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/Place.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/commands/Place.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/Place.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/commands/PrepareToPickup.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/PrepareToPickup.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/commands/PrepareToPickup.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/PrepareToPickup.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/commands/SetDistanceToBox.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/SetDistanceToBox.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/commands/SetDistanceToBox.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/SetDistanceToBox.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/commands/SetElevatorSetpoint.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/SetElevatorSetpoint.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/commands/SetElevatorSetpoint.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/SetElevatorSetpoint.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/commands/SetWristSetpoint.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/SetWristSetpoint.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/commands/SetWristSetpoint.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/SetWristSetpoint.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/commands/TankDrive.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/TankDrive.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/commands/TankDrive.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/commands/TankDrive.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/Claw.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/Claw.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/Claw.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/Claw.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/DriveTrain.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/DriveTrain.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/DriveTrain.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/DriveTrain.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/Elevator.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/Elevator.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/Elevator.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/Elevator.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/Wrist.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/Wrist.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/Wrist.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/Wrist.h diff --git a/wpilibcExamples/src/main/cpp/examples/examples.json b/wpilibcExamples/src/main/cpp/examples/examples.json index 569bc0e39e..4e1bb834ce 100644 --- a/wpilibcExamples/src/main/cpp/examples/examples.json +++ b/wpilibcExamples/src/main/cpp/examples/examples.json @@ -231,13 +231,13 @@ "gradlebase": "cpp" }, { - "name": "GearsBotNew", + "name": "GearsBot", "description": "A fully functional example CommandBased program for WPIs GearsBot robot, using the new command-based framework. This code can run on your computer if it supports simulation.", "tags": [ "CommandBased Robot", "Complete List" ], - "foldername": "GearsBotNew", + "foldername": "GearsBot", "gradlebase": "cpp" }, { diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json index 31ce843881..c062fd9967 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json @@ -221,12 +221,12 @@ ,"mainclass": "Main" }, { - "name": "GearsBot (New)", + "name": "GearsBot", "description": "A fully functional example CommandBased program for WPIs GearsBot robot, ported to the new CommandBased library. This code can run on your computer if it supports simulation.", "tags": [ "Complete Robot" ], - "foldername": "gearsbotnew", + "foldername": "gearsbot", "gradlebase": "java", "mainclass": "Main" }, diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/Main.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/Main.java similarity index 95% rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/Main.java rename to wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/Main.java index 1a65eb1663..60aea5083d 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/Main.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/Main.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.examples.gearsbotnew; +package edu.wpi.first.wpilibj.examples.gearsbot; import edu.wpi.first.wpilibj.RobotBase; diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/Robot.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/Robot.java similarity index 98% rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/Robot.java rename to wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/Robot.java index f0f960f6de..ea26e289fc 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/Robot.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/Robot.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.examples.gearsbotnew; +package edu.wpi.first.wpilibj.examples.gearsbot; import edu.wpi.first.wpilibj.TimedRobot; import edu.wpi.first.wpilibj2.command.Command; diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/RobotContainer.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/RobotContainer.java similarity index 83% rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/RobotContainer.java rename to wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/RobotContainer.java index f8095df92c..adfb6c3d32 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/RobotContainer.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/RobotContainer.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.examples.gearsbotnew; +package edu.wpi.first.wpilibj.examples.gearsbot; import edu.wpi.first.wpilibj.GenericHID; import edu.wpi.first.wpilibj.GenericHID.Hand; @@ -16,19 +16,19 @@ import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.CommandBase; import edu.wpi.first.wpilibj2.command.button.JoystickButton; -import edu.wpi.first.wpilibj.examples.gearsbotnew.commands.Autonomous; -import edu.wpi.first.wpilibj.examples.gearsbotnew.commands.CloseClaw; -import edu.wpi.first.wpilibj.examples.gearsbotnew.commands.OpenClaw; -import edu.wpi.first.wpilibj.examples.gearsbotnew.commands.Pickup; -import edu.wpi.first.wpilibj.examples.gearsbotnew.commands.Place; -import edu.wpi.first.wpilibj.examples.gearsbotnew.commands.PrepareToPickup; -import edu.wpi.first.wpilibj.examples.gearsbotnew.commands.SetElevatorSetpoint; -import edu.wpi.first.wpilibj.examples.gearsbotnew.commands.SetWristSetpoint; -import edu.wpi.first.wpilibj.examples.gearsbotnew.commands.TankDrive; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.Claw; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.DriveTrain; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.Elevator; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.Wrist; +import edu.wpi.first.wpilibj.examples.gearsbot.commands.Autonomous; +import edu.wpi.first.wpilibj.examples.gearsbot.commands.CloseClaw; +import edu.wpi.first.wpilibj.examples.gearsbot.commands.OpenClaw; +import edu.wpi.first.wpilibj.examples.gearsbot.commands.Pickup; +import edu.wpi.first.wpilibj.examples.gearsbot.commands.Place; +import edu.wpi.first.wpilibj.examples.gearsbot.commands.PrepareToPickup; +import edu.wpi.first.wpilibj.examples.gearsbot.commands.SetElevatorSetpoint; +import edu.wpi.first.wpilibj.examples.gearsbot.commands.SetWristSetpoint; +import edu.wpi.first.wpilibj.examples.gearsbot.commands.TankDrive; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.Claw; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.DriveTrain; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.Elevator; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.Wrist; /** * This class is where the bulk of the robot should be declared. Since Command-based is a diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/Autonomous.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/Autonomous.java similarity index 79% rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/Autonomous.java rename to wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/Autonomous.java index 152bea5135..0f0db70593 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/Autonomous.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/Autonomous.java @@ -5,14 +5,14 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.examples.gearsbotnew.commands; +package edu.wpi.first.wpilibj.examples.gearsbot.commands; import edu.wpi.first.wpilibj2.command.SequentialCommandGroup; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.Claw; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.DriveTrain; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.Elevator; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.Wrist; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.Claw; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.DriveTrain; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.Elevator; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.Wrist; /** * The main autonomous command to pickup and deliver the soda to the box. diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/CloseClaw.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/CloseClaw.java similarity index 88% rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/CloseClaw.java rename to wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/CloseClaw.java index be21881aa8..0ebce9a34b 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/CloseClaw.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/CloseClaw.java @@ -5,12 +5,12 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.examples.gearsbotnew.commands; +package edu.wpi.first.wpilibj.examples.gearsbot.commands; import edu.wpi.first.wpilibj2.command.CommandBase; -import edu.wpi.first.wpilibj.examples.gearsbotnew.Robot; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.Claw; +import edu.wpi.first.wpilibj.examples.gearsbot.Robot; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.Claw; /** * Closes the claw for one second. Real robots should use sensors, stalling motors is BAD! diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/DriveStraight.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/DriveStraight.java similarity index 92% rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/DriveStraight.java rename to wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/DriveStraight.java index 58389252c7..1914dba043 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/DriveStraight.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/DriveStraight.java @@ -5,12 +5,12 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.examples.gearsbotnew.commands; +package edu.wpi.first.wpilibj.examples.gearsbot.commands; import edu.wpi.first.wpilibj.controller.PIDController; import edu.wpi.first.wpilibj2.command.PIDCommand; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.DriveTrain; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.DriveTrain; /** * Drive the given distance straight (negative values go backwards). Uses a diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/OpenClaw.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/OpenClaw.java similarity index 90% rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/OpenClaw.java rename to wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/OpenClaw.java index d25b78ca14..9d944b4290 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/OpenClaw.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/OpenClaw.java @@ -5,11 +5,11 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.examples.gearsbotnew.commands; +package edu.wpi.first.wpilibj.examples.gearsbot.commands; import edu.wpi.first.wpilibj2.command.WaitCommand; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.Claw; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.Claw; /** * Opens the claw for one second. Real robots should use sensors, stalling motors is BAD! diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/Pickup.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/Pickup.java similarity index 81% rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/Pickup.java rename to wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/Pickup.java index a13d42f907..b51d106a79 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/Pickup.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/Pickup.java @@ -5,14 +5,14 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.examples.gearsbotnew.commands; +package edu.wpi.first.wpilibj.examples.gearsbot.commands; import edu.wpi.first.wpilibj2.command.SequentialCommandGroup; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.Claw; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.Elevator; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.Wrist; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.Claw; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.Elevator; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.Wrist; /** * Pickup a soda can (if one is between the open claws) and get it in a safe state to drive around. diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/Place.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/Place.java similarity index 79% rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/Place.java rename to wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/Place.java index 49168287c9..c57ffe223a 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/Place.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/Place.java @@ -5,14 +5,14 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.examples.gearsbotnew.commands; +package edu.wpi.first.wpilibj.examples.gearsbot.commands; import edu.wpi.first.wpilibj2.command.SequentialCommandGroup; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.Claw; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.Elevator; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.Wrist; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.Claw; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.Elevator; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.Wrist; /** * Place a held soda can onto the platform. diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/PrepareToPickup.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/PrepareToPickup.java similarity index 80% rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/PrepareToPickup.java rename to wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/PrepareToPickup.java index 27e3b11421..620c184e5a 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/PrepareToPickup.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/PrepareToPickup.java @@ -5,13 +5,13 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.examples.gearsbotnew.commands; +package edu.wpi.first.wpilibj.examples.gearsbot.commands; import edu.wpi.first.wpilibj2.command.SequentialCommandGroup; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.Claw; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.Elevator; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.Wrist; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.Claw; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.Elevator; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.Wrist; /** * Make sure the robot is in a state to pickup soda cans. diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/SetDistanceToBox.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/SetDistanceToBox.java similarity index 92% rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/SetDistanceToBox.java rename to wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/SetDistanceToBox.java index ed69814eab..3a1a3e6005 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/SetDistanceToBox.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/SetDistanceToBox.java @@ -5,12 +5,12 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.examples.gearsbotnew.commands; +package edu.wpi.first.wpilibj.examples.gearsbot.commands; import edu.wpi.first.wpilibj.controller.PIDController; import edu.wpi.first.wpilibj2.command.PIDCommand; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.DriveTrain; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.DriveTrain; /** diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/SetElevatorSetpoint.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/SetElevatorSetpoint.java similarity index 92% rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/SetElevatorSetpoint.java rename to wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/SetElevatorSetpoint.java index 0f9e86489b..44c6677d4f 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/SetElevatorSetpoint.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/SetElevatorSetpoint.java @@ -5,11 +5,11 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.examples.gearsbotnew.commands; +package edu.wpi.first.wpilibj.examples.gearsbot.commands; import edu.wpi.first.wpilibj2.command.CommandBase; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.Elevator; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.Elevator; /** diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/SetWristSetpoint.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/SetWristSetpoint.java similarity index 92% rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/SetWristSetpoint.java rename to wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/SetWristSetpoint.java index 2459dffbae..d03211a2a9 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/SetWristSetpoint.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/SetWristSetpoint.java @@ -5,11 +5,11 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.examples.gearsbotnew.commands; +package edu.wpi.first.wpilibj.examples.gearsbot.commands; import edu.wpi.first.wpilibj2.command.CommandBase; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.Wrist; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.Wrist; /** diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/TankDrive.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/TankDrive.java similarity index 92% rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/TankDrive.java rename to wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/TankDrive.java index 8af7b81f2f..04ce9a08c9 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/commands/TankDrive.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/commands/TankDrive.java @@ -5,14 +5,14 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.examples.gearsbotnew.commands; +package edu.wpi.first.wpilibj.examples.gearsbot.commands; import java.util.function.DoubleSupplier; import edu.wpi.first.wpilibj2.command.CommandBase; -import edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems.DriveTrain; +import edu.wpi.first.wpilibj.examples.gearsbot.subsystems.DriveTrain; /** * Have the robot drive tank style. diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/subsystems/Claw.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/subsystems/Claw.java similarity index 96% rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/subsystems/Claw.java rename to wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/subsystems/Claw.java index 56de53e764..b0d2515fdc 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/subsystems/Claw.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/subsystems/Claw.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems; +package edu.wpi.first.wpilibj.examples.gearsbot.subsystems; import edu.wpi.first.wpilibj.DigitalInput; import edu.wpi.first.wpilibj.Victor; diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/subsystems/DriveTrain.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/subsystems/DriveTrain.java similarity index 97% rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/subsystems/DriveTrain.java rename to wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/subsystems/DriveTrain.java index 8e3ee090e0..a0aaa32e4a 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/subsystems/DriveTrain.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/subsystems/DriveTrain.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems; +package edu.wpi.first.wpilibj.examples.gearsbot.subsystems; import edu.wpi.first.wpilibj.AnalogGyro; import edu.wpi.first.wpilibj.AnalogInput; @@ -17,7 +17,7 @@ import edu.wpi.first.wpilibj.drive.DifferentialDrive; import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; import edu.wpi.first.wpilibj2.command.SubsystemBase; -import edu.wpi.first.wpilibj.examples.gearsbotnew.Robot; +import edu.wpi.first.wpilibj.examples.gearsbot.Robot; public class DriveTrain extends SubsystemBase { /** diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/subsystems/Elevator.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/subsystems/Elevator.java similarity index 96% rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/subsystems/Elevator.java rename to wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/subsystems/Elevator.java index f3b7dc2cd1..356e111fe8 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/subsystems/Elevator.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/subsystems/Elevator.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems; +package edu.wpi.first.wpilibj.examples.gearsbot.subsystems; import edu.wpi.first.wpilibj.AnalogPotentiometer; import edu.wpi.first.wpilibj.Victor; @@ -13,7 +13,7 @@ import edu.wpi.first.wpilibj.controller.PIDController; import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; import edu.wpi.first.wpilibj2.command.PIDSubsystem; -import edu.wpi.first.wpilibj.examples.gearsbotnew.Robot; +import edu.wpi.first.wpilibj.examples.gearsbot.Robot; /** * The elevator subsystem uses PID to go to a given height. Unfortunately, in it's current state PID diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/subsystems/Wrist.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/subsystems/Wrist.java similarity index 95% rename from wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/subsystems/Wrist.java rename to wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/subsystems/Wrist.java index 457e96f0a0..4502639575 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbotnew/subsystems/Wrist.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/subsystems/Wrist.java @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -package edu.wpi.first.wpilibj.examples.gearsbotnew.subsystems; +package edu.wpi.first.wpilibj.examples.gearsbot.subsystems; import edu.wpi.first.wpilibj.AnalogPotentiometer; import edu.wpi.first.wpilibj.Victor; @@ -13,7 +13,7 @@ import edu.wpi.first.wpilibj.controller.PIDController; import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; import edu.wpi.first.wpilibj2.command.PIDSubsystem; -import edu.wpi.first.wpilibj.examples.gearsbotnew.Robot; +import edu.wpi.first.wpilibj.examples.gearsbot.Robot; /** * The wrist subsystem is like the elevator, but with a rotational joint instead of a linear joint.