diff --git a/wpilibcExamples/build.gradle b/wpilibcExamples/build.gradle index 67aefdd6ff..a9c9250058 100644 --- a/wpilibcExamples/build.gradle +++ b/wpilibcExamples/build.gradle @@ -3,6 +3,7 @@ import org.gradle.language.base.internal.ProjectLayout apply plugin: 'cpp' apply plugin: 'visual-studio' apply plugin: 'edu.wpi.first.NativeUtils' +apply plugin: ExtraTasks apply from: '../shared/config.gradle' @@ -59,9 +60,13 @@ model { sources { cpp { source { - srcDirs 'src/main/cpp/examples/' + "${key}" + srcDirs 'src/main/cpp/examples/' + "${key}" + "/cpp" include '**/*.cpp' } + exportedHeaders { + srcDirs 'src/main/cpp/examples/' + "${key}" + "/include" + include '**/*.h' + } } } } @@ -91,9 +96,13 @@ model { sources { cpp { source { - srcDirs 'src/main/cpp/templates/' + "${key}" + srcDirs 'src/main/cpp/templates/' + "${key}" + "/cpp" include '**/*.cpp' } + exportedHeaders { + srcDirs 'src/main/cpp/templates/' + "${key}" + "/include" + include '**/*.h' + } } } } diff --git a/wpilibcExamples/src/main/cpp/examples/ArcadeDrive/src/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/ArcadeDrive/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/ArcadeDrive/src/Robot.cpp rename to wpilibcExamples/src/main/cpp/examples/ArcadeDrive/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/AxisCameraSample/src/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/AxisCameraSample/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/AxisCameraSample/src/Robot.cpp rename to wpilibcExamples/src/main/cpp/examples/AxisCameraSample/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/CANPDP/src/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/CANPDP/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/CANPDP/src/Robot.cpp rename to wpilibcExamples/src/main/cpp/examples/CANPDP/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/Encoder/src/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/Encoder/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/Encoder/src/Robot.cpp rename to wpilibcExamples/src/main/cpp/examples/Encoder/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/Autonomous.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/Autonomous.cpp similarity index 78% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/Autonomous.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/Autonomous.cpp index eba8555a8b..54369da3ad 100644 --- a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/Autonomous.cpp +++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/Autonomous.cpp @@ -5,15 +5,15 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "Autonomous.h" +#include "Commands/Autonomous.h" -#include "CloseClaw.h" -#include "DriveStraight.h" -#include "Pickup.h" -#include "Place.h" -#include "PrepareToPickup.h" -#include "SetDistanceToBox.h" -#include "SetWristSetpoint.h" +#include "Commands/CloseClaw.h" +#include "Commands/DriveStraight.h" +#include "Commands/Pickup.h" +#include "Commands/Place.h" +#include "Commands/PrepareToPickup.h" +#include "Commands/SetDistanceToBox.h" +#include "Commands/SetWristSetpoint.h" Autonomous::Autonomous() : frc::CommandGroup("Autonomous") { AddSequential(new PrepareToPickup()); diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/CloseClaw.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/CloseClaw.cpp similarity index 95% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/CloseClaw.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/CloseClaw.cpp index 32f9dc956b..01ed78c941 100644 --- a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/CloseClaw.cpp +++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/CloseClaw.cpp @@ -5,9 +5,9 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "CloseClaw.h" +#include "Commands/CloseClaw.h" -#include "../Robot.h" +#include "Robot.h" CloseClaw::CloseClaw() : frc::Command("CloseClaw") { Requires(&Robot::claw); } diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/DriveStraight.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/DriveStraight.cpp similarity index 96% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/DriveStraight.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/DriveStraight.cpp index fb93c3237c..51b8326c03 100644 --- a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/DriveStraight.cpp +++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/DriveStraight.cpp @@ -5,9 +5,9 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "DriveStraight.h" +#include "Commands/DriveStraight.h" -#include "../Robot.h" +#include "Robot.h" DriveStraight::DriveStraight(double distance) { Requires(&Robot::drivetrain); diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/OpenClaw.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/OpenClaw.cpp similarity index 94% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/OpenClaw.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/OpenClaw.cpp index 788f24f807..b382eddf82 100644 --- a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/OpenClaw.cpp +++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/OpenClaw.cpp @@ -5,9 +5,9 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "OpenClaw.h" +#include "Commands/OpenClaw.h" -#include "../Robot.h" +#include "Robot.h" OpenClaw::OpenClaw() : frc::Command("OpenClaw") { Requires(&Robot::claw); diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/Pickup.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/Pickup.cpp similarity index 82% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/Pickup.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/Pickup.cpp index 252cd08071..42433d9a0d 100644 --- a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/Pickup.cpp +++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/Pickup.cpp @@ -5,11 +5,11 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "Pickup.h" +#include "Commands/Pickup.h" -#include "CloseClaw.h" -#include "SetElevatorSetpoint.h" -#include "SetWristSetpoint.h" +#include "Commands/CloseClaw.h" +#include "Commands/SetElevatorSetpoint.h" +#include "Commands/SetWristSetpoint.h" Pickup::Pickup() : frc::CommandGroup("Pickup") { AddSequential(new CloseClaw()); diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/Place.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/Place.cpp similarity index 82% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/Place.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/Place.cpp index 3ae443bbd2..026056bf90 100644 --- a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/Place.cpp +++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/Place.cpp @@ -5,11 +5,11 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "Place.h" +#include "Commands/Place.h" -#include "OpenClaw.h" -#include "SetElevatorSetpoint.h" -#include "SetWristSetpoint.h" +#include "Commands/OpenClaw.h" +#include "Commands/SetElevatorSetpoint.h" +#include "Commands/SetWristSetpoint.h" Place::Place() : frc::CommandGroup("Place") { AddSequential(new SetElevatorSetpoint(0.25)); diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/PrepareToPickup.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/PrepareToPickup.cpp similarity index 81% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/PrepareToPickup.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/PrepareToPickup.cpp index edd081eaef..94d575659e 100644 --- a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/PrepareToPickup.cpp +++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/PrepareToPickup.cpp @@ -5,11 +5,11 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "PrepareToPickup.h" +#include "Commands/PrepareToPickup.h" -#include "OpenClaw.h" -#include "SetElevatorSetpoint.h" -#include "SetWristSetpoint.h" +#include "Commands/OpenClaw.h" +#include "Commands/SetElevatorSetpoint.h" +#include "Commands/SetWristSetpoint.h" PrepareToPickup::PrepareToPickup() : frc::CommandGroup("PrepareToPickup") { AddParallel(new OpenClaw()); diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/SetDistanceToBox.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/SetDistanceToBox.cpp similarity index 96% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/SetDistanceToBox.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/SetDistanceToBox.cpp index ec608f2def..1e723a19dc 100644 --- a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/SetDistanceToBox.cpp +++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/SetDistanceToBox.cpp @@ -5,11 +5,11 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "SetDistanceToBox.h" +#include "Commands/SetDistanceToBox.h" #include -#include "../Robot.h" +#include "Robot.h" SetDistanceToBox::SetDistanceToBox(double distance) { Requires(&Robot::drivetrain); diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/SetElevatorSetpoint.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/SetElevatorSetpoint.cpp similarity index 94% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/SetElevatorSetpoint.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/SetElevatorSetpoint.cpp index 0d09cfdc22..28c799a008 100644 --- a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/SetElevatorSetpoint.cpp +++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/SetElevatorSetpoint.cpp @@ -5,11 +5,11 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "SetElevatorSetpoint.h" +#include "Commands/SetElevatorSetpoint.h" #include -#include "../Robot.h" +#include "Robot.h" SetElevatorSetpoint::SetElevatorSetpoint(double setpoint) : frc::Command("SetElevatorSetpoint") { diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/SetWristSetpoint.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/SetWristSetpoint.cpp similarity index 94% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/SetWristSetpoint.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/SetWristSetpoint.cpp index 7e33268667..d59497a8da 100644 --- a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/SetWristSetpoint.cpp +++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/SetWristSetpoint.cpp @@ -5,9 +5,9 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "SetWristSetpoint.h" +#include "Commands/SetWristSetpoint.h" -#include "../Robot.h" +#include "Robot.h" SetWristSetpoint::SetWristSetpoint(double setpoint) : frc::Command("SetWristSetpoint") { diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/TankDriveWithJoystick.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/TankDriveWithJoystick.cpp similarity index 94% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/TankDriveWithJoystick.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/TankDriveWithJoystick.cpp index b31181aa5e..ca47e4c36e 100644 --- a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/TankDriveWithJoystick.cpp +++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Commands/TankDriveWithJoystick.cpp @@ -5,9 +5,9 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "TankDriveWithJoystick.h" +#include "Commands/TankDriveWithJoystick.h" -#include "../Robot.h" +#include "Robot.h" TankDriveWithJoystick::TankDriveWithJoystick() : frc::Command("TankDriveWithJoystick") { diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/OI.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/OI.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/OI.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/OI.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Robot.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Subsystems/Claw.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/Claw.cpp similarity index 96% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Subsystems/Claw.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/Claw.cpp index e5bc8d0e5b..7ff5e88e33 100644 --- a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Subsystems/Claw.cpp +++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/Claw.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "Claw.h" +#include "Subsystems/Claw.h" Claw::Claw() : frc::Subsystem("Claw") { // Let's show everything on the LiveWindow diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Subsystems/DriveTrain.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/DriveTrain.cpp similarity index 97% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Subsystems/DriveTrain.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/DriveTrain.cpp index 8968d692b7..d888499322 100644 --- a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Subsystems/DriveTrain.cpp +++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/DriveTrain.cpp @@ -5,12 +5,12 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "DriveTrain.h" +#include "Subsystems/DriveTrain.h" #include #include -#include "../Commands/TankDriveWithJoystick.h" +#include "Commands/TankDriveWithJoystick.h" DriveTrain::DriveTrain() : frc::Subsystem("DriveTrain") { // Encoders may measure differently in the real world and in diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Subsystems/Elevator.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/Elevator.cpp similarity index 97% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Subsystems/Elevator.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/Elevator.cpp index c0b09c65cd..4b87fc1dc1 100644 --- a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Subsystems/Elevator.cpp +++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/Elevator.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "Elevator.h" +#include "Subsystems/Elevator.h" #include #include diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Subsystems/Wrist.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/Wrist.cpp similarity index 97% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Subsystems/Wrist.cpp rename to wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/Wrist.cpp index a364bc2220..3b64e30bce 100644 --- a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Subsystems/Wrist.cpp +++ b/wpilibcExamples/src/main/cpp/examples/GearsBot/cpp/Subsystems/Wrist.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "Wrist.h" +#include "Subsystems/Wrist.h" #include diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/Autonomous.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/Autonomous.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/Autonomous.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/Autonomous.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/CloseClaw.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/CloseClaw.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/CloseClaw.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/CloseClaw.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/DriveStraight.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/DriveStraight.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/DriveStraight.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/DriveStraight.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/OpenClaw.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/OpenClaw.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/OpenClaw.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/OpenClaw.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/Pickup.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/Pickup.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/Pickup.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/Pickup.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/Place.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/Place.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/Place.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/Place.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/PrepareToPickup.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/PrepareToPickup.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/PrepareToPickup.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/PrepareToPickup.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/SetDistanceToBox.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/SetDistanceToBox.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/SetDistanceToBox.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/SetDistanceToBox.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/SetElevatorSetpoint.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/SetElevatorSetpoint.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/SetElevatorSetpoint.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/SetElevatorSetpoint.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/SetWristSetpoint.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/SetWristSetpoint.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/SetWristSetpoint.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/SetWristSetpoint.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/TankDriveWithJoystick.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/TankDriveWithJoystick.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Commands/TankDriveWithJoystick.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/Commands/TankDriveWithJoystick.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/OI.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/OI.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/OI.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/OI.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Robot.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Robot.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Robot.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/Robot.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Subsystems/Claw.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Subsystems/Claw.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Subsystems/Claw.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/Subsystems/Claw.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Subsystems/DriveTrain.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Subsystems/DriveTrain.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Subsystems/DriveTrain.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/Subsystems/DriveTrain.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Subsystems/Elevator.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Subsystems/Elevator.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Subsystems/Elevator.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/Subsystems/Elevator.h diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBot/src/Subsystems/Wrist.h b/wpilibcExamples/src/main/cpp/examples/GearsBot/include/Subsystems/Wrist.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GearsBot/src/Subsystems/Wrist.h rename to wpilibcExamples/src/main/cpp/examples/GearsBot/include/Subsystems/Wrist.h diff --git a/wpilibcExamples/src/main/cpp/examples/GettingStarted/src/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/GettingStarted/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GettingStarted/src/Robot.cpp rename to wpilibcExamples/src/main/cpp/examples/GettingStarted/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/Gyro/src/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/Gyro/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/Gyro/src/Robot.cpp rename to wpilibcExamples/src/main/cpp/examples/Gyro/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/GyroMecanum/src/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/GyroMecanum/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/GyroMecanum/src/Robot.cpp rename to wpilibcExamples/src/main/cpp/examples/GyroMecanum/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/IntermediateVision/src/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/IntermediateVision/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/IntermediateVision/src/Robot.cpp rename to wpilibcExamples/src/main/cpp/examples/IntermediateVision/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/MecanumDrive/src/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/MecanumDrive/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/MecanumDrive/src/Robot.cpp rename to wpilibcExamples/src/main/cpp/examples/MecanumDrive/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/MotorControl/src/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/MotorControl/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/MotorControl/src/Robot.cpp rename to wpilibcExamples/src/main/cpp/examples/MotorControl/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/CheckForHotGoal.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/CheckForHotGoal.cpp similarity index 92% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/CheckForHotGoal.cpp rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/CheckForHotGoal.cpp index d23a66f0c0..1a04de46b3 100644 --- a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/CheckForHotGoal.cpp +++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/CheckForHotGoal.cpp @@ -5,9 +5,9 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "CheckForHotGoal.h" +#include "Commands/CheckForHotGoal.h" -#include "../Robot.h" +#include "Robot.h" CheckForHotGoal::CheckForHotGoal(double time) { SetTimeout(time); } diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/CloseClaw.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/CloseClaw.cpp similarity index 92% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/CloseClaw.cpp rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/CloseClaw.cpp index 256e3273d8..63b925530f 100644 --- a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/CloseClaw.cpp +++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/CloseClaw.cpp @@ -5,9 +5,9 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "CloseClaw.h" +#include "Commands/CloseClaw.h" -#include "../Robot.h" +#include "Robot.h" CloseClaw::CloseClaw() { Requires(&Robot::collector); } diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/Collect.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/Collect.cpp similarity index 78% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/Collect.cpp rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/Collect.cpp index a8db134cd7..506eee0352 100644 --- a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/Collect.cpp +++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/Collect.cpp @@ -5,13 +5,13 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "Collect.h" +#include "Commands/Collect.h" -#include "../Robot.h" -#include "CloseClaw.h" -#include "SetCollectionSpeed.h" -#include "SetPivotSetpoint.h" -#include "WaitForBall.h" +#include "Commands/CloseClaw.h" +#include "Commands/SetCollectionSpeed.h" +#include "Commands/SetPivotSetpoint.h" +#include "Commands/WaitForBall.h" +#include "Robot.h" Collect::Collect() { AddSequential(new SetCollectionSpeed(Collector::kForward)); diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/DriveAndShootAutonomous.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/DriveAndShootAutonomous.cpp similarity index 75% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/DriveAndShootAutonomous.cpp rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/DriveAndShootAutonomous.cpp index 15edb0d983..512f6c5d2d 100644 --- a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/DriveAndShootAutonomous.cpp +++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/DriveAndShootAutonomous.cpp @@ -5,15 +5,15 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "DriveAndShootAutonomous.h" +#include "Commands/DriveAndShootAutonomous.h" -#include "../Robot.h" -#include "CheckForHotGoal.h" -#include "CloseClaw.h" -#include "DriveForward.h" -#include "SetPivotSetpoint.h" -#include "Shoot.h" -#include "WaitForPressure.h" +#include "Commands/CheckForHotGoal.h" +#include "Commands/CloseClaw.h" +#include "Commands/DriveForward.h" +#include "Commands/SetPivotSetpoint.h" +#include "Commands/Shoot.h" +#include "Commands/WaitForPressure.h" +#include "Robot.h" DriveAndShootAutonomous::DriveAndShootAutonomous() { AddSequential(new CloseClaw()); diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/DriveForward.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/DriveForward.cpp similarity index 96% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/DriveForward.cpp rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/DriveForward.cpp index fbd520b618..3c3a11656a 100644 --- a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/DriveForward.cpp +++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/DriveForward.cpp @@ -5,11 +5,11 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "DriveForward.h" +#include "Commands/DriveForward.h" #include -#include "../Robot.h" +#include "Robot.h" void DriveForward::init(double dist, double maxSpeed) { Requires(&Robot::drivetrain); diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/DriveWithJoystick.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/DriveWithJoystick.cpp similarity index 94% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/DriveWithJoystick.cpp rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/DriveWithJoystick.cpp index e0eb67182d..d262a97204 100644 --- a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/DriveWithJoystick.cpp +++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/DriveWithJoystick.cpp @@ -5,9 +5,9 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "DriveWithJoystick.h" +#include "Commands/DriveWithJoystick.h" -#include "../Robot.h" +#include "Robot.h" DriveWithJoystick::DriveWithJoystick() { Requires(&Robot::drivetrain); } diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/ExtendShooter.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/ExtendShooter.cpp similarity index 93% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/ExtendShooter.cpp rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/ExtendShooter.cpp index 7b105f85bd..f28cc5e9a5 100644 --- a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/ExtendShooter.cpp +++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/ExtendShooter.cpp @@ -5,9 +5,9 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "ExtendShooter.h" +#include "Commands/ExtendShooter.h" -#include "../Robot.h" +#include "Robot.h" ExtendShooter::ExtendShooter() : frc::TimedCommand(1.0) { Requires(&Robot::shooter); diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/LowGoal.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/LowGoal.cpp similarity index 80% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/LowGoal.cpp rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/LowGoal.cpp index 4106730e43..25c9103135 100644 --- a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/LowGoal.cpp +++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/LowGoal.cpp @@ -5,12 +5,12 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "LowGoal.h" +#include "Commands/LowGoal.h" -#include "../Robot.h" -#include "ExtendShooter.h" -#include "SetCollectionSpeed.h" -#include "SetPivotSetpoint.h" +#include "Commands/ExtendShooter.h" +#include "Commands/SetCollectionSpeed.h" +#include "Commands/SetPivotSetpoint.h" +#include "Robot.h" LowGoal::LowGoal() { AddSequential(new SetPivotSetpoint(Pivot::kLowGoal)); diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/OpenClaw.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/OpenClaw.cpp similarity index 94% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/OpenClaw.cpp rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/OpenClaw.cpp index 316b9cae9c..c6f51ccb0c 100644 --- a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/OpenClaw.cpp +++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/OpenClaw.cpp @@ -5,9 +5,9 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "OpenClaw.h" +#include "Commands/OpenClaw.h" -#include "../Robot.h" +#include "Robot.h" OpenClaw::OpenClaw() { Requires(&Robot::collector); } diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/SetCollectionSpeed.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/SetCollectionSpeed.cpp similarity index 92% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/SetCollectionSpeed.cpp rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/SetCollectionSpeed.cpp index 620bf05eb8..77c06f0cd2 100644 --- a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/SetCollectionSpeed.cpp +++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/SetCollectionSpeed.cpp @@ -5,9 +5,9 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "SetCollectionSpeed.h" +#include "Commands/SetCollectionSpeed.h" -#include "../Robot.h" +#include "Robot.h" SetCollectionSpeed::SetCollectionSpeed(double speed) { Requires(&Robot::collector); diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/SetPivotSetpoint.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/SetPivotSetpoint.cpp similarity index 93% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/SetPivotSetpoint.cpp rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/SetPivotSetpoint.cpp index e365d06894..566b69a75c 100644 --- a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/SetPivotSetpoint.cpp +++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/SetPivotSetpoint.cpp @@ -5,9 +5,9 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "SetPivotSetpoint.h" +#include "Commands/SetPivotSetpoint.h" -#include "../Robot.h" +#include "Robot.h" SetPivotSetpoint::SetPivotSetpoint(double setpoint) { m_setpoint = setpoint; diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/Shoot.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/Shoot.cpp similarity index 77% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/Shoot.cpp rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/Shoot.cpp index 41e0ad940c..da7c67aa96 100644 --- a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/Shoot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/Shoot.cpp @@ -5,13 +5,13 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "Shoot.h" +#include "Commands/Shoot.h" -#include "../Robot.h" -#include "ExtendShooter.h" -#include "OpenClaw.h" -#include "SetCollectionSpeed.h" -#include "WaitForPressure.h" +#include "Commands/ExtendShooter.h" +#include "Commands/OpenClaw.h" +#include "Commands/SetCollectionSpeed.h" +#include "Commands/WaitForPressure.h" +#include "Robot.h" Shoot::Shoot() { AddSequential(new WaitForPressure()); diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/WaitForBall.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/WaitForBall.cpp similarity index 92% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/WaitForBall.cpp rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/WaitForBall.cpp index adf4e04658..00167167ce 100644 --- a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/WaitForBall.cpp +++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/WaitForBall.cpp @@ -5,9 +5,9 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "WaitForBall.h" +#include "Commands/WaitForBall.h" -#include "../Robot.h" +#include "Robot.h" WaitForBall::WaitForBall() { Requires(&Robot::collector); } diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/WaitForPressure.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/WaitForPressure.cpp similarity index 92% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/WaitForPressure.cpp rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/WaitForPressure.cpp index 106327f06a..1da43831a7 100644 --- a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/WaitForPressure.cpp +++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Commands/WaitForPressure.cpp @@ -5,9 +5,9 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "WaitForPressure.h" +#include "Commands/WaitForPressure.h" -#include "../Robot.h" +#include "Robot.h" WaitForPressure::WaitForPressure() { Requires(&Robot::pneumatics); } diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/OI.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/OI.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/OI.cpp rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/OI.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Robot.cpp rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/Collector.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Collector.cpp similarity index 97% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/Collector.cpp rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Collector.cpp index 1b36b26e17..a619c902ac 100644 --- a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/Collector.cpp +++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Collector.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "Collector.h" +#include "Subsystems/Collector.h" #include diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/DriveTrain.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/DriveTrain.cpp similarity index 96% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/DriveTrain.cpp rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/DriveTrain.cpp index 48fe7ceab3..19c370862d 100644 --- a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/DriveTrain.cpp +++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/DriveTrain.cpp @@ -5,13 +5,13 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "DriveTrain.h" +#include "Subsystems/DriveTrain.h" #include #include -#include "../Commands/DriveWithJoystick.h" +#include "Commands/DriveWithJoystick.h" DriveTrain::DriveTrain() : frc::Subsystem("DriveTrain") { // AddChild("Front Left CIM", m_frontLeftCIM); diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/Pivot.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Pivot.cpp similarity index 98% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/Pivot.cpp rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Pivot.cpp index f8d5028f23..f59619e935 100644 --- a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/Pivot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Pivot.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "Pivot.h" +#include "Subsystems/Pivot.h" Pivot::Pivot() : frc::PIDSubsystem("Pivot", 7.0, 0.0, 8.0) { SetAbsoluteTolerance(0.005); diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/Pneumatics.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Pneumatics.cpp similarity index 97% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/Pneumatics.cpp rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Pneumatics.cpp index c541a4da1c..c5f99d7089 100644 --- a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/Pneumatics.cpp +++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Pneumatics.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "Pneumatics.h" +#include "Subsystems/Pneumatics.h" #include diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/Shooter.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Shooter.cpp similarity index 98% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/Shooter.cpp rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Shooter.cpp index d06b3e690d..69133b3927 100644 --- a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/Shooter.cpp +++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Subsystems/Shooter.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "Shooter.h" +#include "Subsystems/Shooter.h" Shooter::Shooter() : Subsystem("Shooter") { // Put everything to the LiveWindow for testing. diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Triggers/DoubleButton.cpp b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Triggers/DoubleButton.cpp similarity index 95% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Triggers/DoubleButton.cpp rename to wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Triggers/DoubleButton.cpp index 4f53497531..3ef9d3a2fc 100644 --- a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Triggers/DoubleButton.cpp +++ b/wpilibcExamples/src/main/cpp/examples/PacGoat/cpp/Triggers/DoubleButton.cpp @@ -5,7 +5,7 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "DoubleButton.h" +#include "Triggers/DoubleButton.h" #include diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/CheckForHotGoal.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/CheckForHotGoal.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/CheckForHotGoal.h rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/CheckForHotGoal.h diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/CloseClaw.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/CloseClaw.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/CloseClaw.h rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/CloseClaw.h diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/Collect.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/Collect.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/Collect.h rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/Collect.h diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/DriveAndShootAutonomous.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/DriveAndShootAutonomous.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/DriveAndShootAutonomous.h rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/DriveAndShootAutonomous.h diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/DriveForward.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/DriveForward.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/DriveForward.h rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/DriveForward.h diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/DriveWithJoystick.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/DriveWithJoystick.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/DriveWithJoystick.h rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/DriveWithJoystick.h diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/ExtendShooter.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/ExtendShooter.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/ExtendShooter.h rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/ExtendShooter.h diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/LowGoal.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/LowGoal.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/LowGoal.h rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/LowGoal.h diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/OpenClaw.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/OpenClaw.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/OpenClaw.h rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/OpenClaw.h diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/SetCollectionSpeed.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/SetCollectionSpeed.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/SetCollectionSpeed.h rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/SetCollectionSpeed.h diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/SetPivotSetpoint.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/SetPivotSetpoint.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/SetPivotSetpoint.h rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/SetPivotSetpoint.h diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/Shoot.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/Shoot.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/Shoot.h rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/Shoot.h diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/WaitForBall.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/WaitForBall.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/WaitForBall.h rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/WaitForBall.h diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/WaitForPressure.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/WaitForPressure.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Commands/WaitForPressure.h rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/Commands/WaitForPressure.h diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/OI.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/OI.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/OI.h rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/OI.h diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Robot.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Robot.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Robot.h rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/Robot.h diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/Collector.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/Collector.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/Collector.h rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/Collector.h diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/DriveTrain.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/DriveTrain.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/DriveTrain.h rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/DriveTrain.h diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/Pivot.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/Pivot.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/Pivot.h rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/Pivot.h diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/Pneumatics.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/Pneumatics.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/Pneumatics.h rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/Pneumatics.h diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/Shooter.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/Shooter.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Subsystems/Shooter.h rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/Subsystems/Shooter.h diff --git a/wpilibcExamples/src/main/cpp/examples/PacGoat/src/Triggers/DoubleButton.h b/wpilibcExamples/src/main/cpp/examples/PacGoat/include/Triggers/DoubleButton.h similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PacGoat/src/Triggers/DoubleButton.h rename to wpilibcExamples/src/main/cpp/examples/PacGoat/include/Triggers/DoubleButton.h diff --git a/wpilibcExamples/src/main/cpp/examples/PotentiometerPID/src/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/PotentiometerPID/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/PotentiometerPID/src/Robot.cpp rename to wpilibcExamples/src/main/cpp/examples/PotentiometerPID/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/QuickVision/src/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/QuickVision/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/QuickVision/src/Robot.cpp rename to wpilibcExamples/src/main/cpp/examples/QuickVision/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/Relay/src/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/Relay/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/Relay/src/Robot.cpp rename to wpilibcExamples/src/main/cpp/examples/Relay/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/Solenoid/src/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/Solenoid/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/Solenoid/src/Robot.cpp rename to wpilibcExamples/src/main/cpp/examples/Solenoid/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/Ultrasonic/src/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/Ultrasonic/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/Ultrasonic/src/Robot.cpp rename to wpilibcExamples/src/main/cpp/examples/Ultrasonic/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/examples/UltrasonicPID/src/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/UltrasonicPID/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/examples/UltrasonicPID/src/Robot.cpp rename to wpilibcExamples/src/main/cpp/examples/UltrasonicPID/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/Commands/ExampleCommand.cpp b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Commands/ExampleCommand.cpp similarity index 95% rename from wpilibcExamples/src/main/cpp/templates/commandbased/Commands/ExampleCommand.cpp rename to wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Commands/ExampleCommand.cpp index 0986d1f4c1..0b476bfd22 100644 --- a/wpilibcExamples/src/main/cpp/templates/commandbased/Commands/ExampleCommand.cpp +++ b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Commands/ExampleCommand.cpp @@ -5,9 +5,9 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "ExampleCommand.h" +#include "Commands/ExampleCommand.h" -#include "../Robot.h" +#include "Robot.h" ExampleCommand::ExampleCommand() { // Use Requires() here to declare subsystem dependencies diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/Commands/MyAutoCommand.cpp b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Commands/MyAutoCommand.cpp similarity index 95% rename from wpilibcExamples/src/main/cpp/templates/commandbased/Commands/MyAutoCommand.cpp rename to wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Commands/MyAutoCommand.cpp index 1d03e7493b..1624875090 100644 --- a/wpilibcExamples/src/main/cpp/templates/commandbased/Commands/MyAutoCommand.cpp +++ b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Commands/MyAutoCommand.cpp @@ -5,9 +5,9 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "MyAutoCommand.h" +#include "Commands/MyAutoCommand.h" -#include "../Robot.h" +#include "Robot.h" MyAutoCommand::MyAutoCommand() { // Use Requires() here to declare subsystem dependencies diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/OI.cpp b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/OI.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/commandbased/OI.cpp rename to wpilibcExamples/src/main/cpp/templates/commandbased/cpp/OI.cpp diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/Robot.cpp b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/commandbased/Robot.cpp rename to wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/Subsystems/ExampleSubsystem.cpp b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Subsystems/ExampleSubsystem.cpp similarity index 92% rename from wpilibcExamples/src/main/cpp/templates/commandbased/Subsystems/ExampleSubsystem.cpp rename to wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Subsystems/ExampleSubsystem.cpp index 7a12258638..beda5724a1 100644 --- a/wpilibcExamples/src/main/cpp/templates/commandbased/Subsystems/ExampleSubsystem.cpp +++ b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Subsystems/ExampleSubsystem.cpp @@ -5,9 +5,9 @@ /* the project. */ /*----------------------------------------------------------------------------*/ -#include "ExampleSubsystem.h" +#include "Subsystems/ExampleSubsystem.h" -#include "../RobotMap.h" +#include "RobotMap.h" ExampleSubsystem::ExampleSubsystem() : frc::Subsystem("ExampleSubsystem") {} diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/Commands/ExampleCommand.h b/wpilibcExamples/src/main/cpp/templates/commandbased/include/Commands/ExampleCommand.h similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/commandbased/Commands/ExampleCommand.h rename to wpilibcExamples/src/main/cpp/templates/commandbased/include/Commands/ExampleCommand.h diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/Commands/MyAutoCommand.h b/wpilibcExamples/src/main/cpp/templates/commandbased/include/Commands/MyAutoCommand.h similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/commandbased/Commands/MyAutoCommand.h rename to wpilibcExamples/src/main/cpp/templates/commandbased/include/Commands/MyAutoCommand.h diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/OI.h b/wpilibcExamples/src/main/cpp/templates/commandbased/include/OI.h similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/commandbased/OI.h rename to wpilibcExamples/src/main/cpp/templates/commandbased/include/OI.h diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/Robot.h b/wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.h similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/commandbased/Robot.h rename to wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.h diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/RobotMap.h b/wpilibcExamples/src/main/cpp/templates/commandbased/include/RobotMap.h similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/commandbased/RobotMap.h rename to wpilibcExamples/src/main/cpp/templates/commandbased/include/RobotMap.h diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/Subsystems/ExampleSubsystem.h b/wpilibcExamples/src/main/cpp/templates/commandbased/include/Subsystems/ExampleSubsystem.h similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/commandbased/Subsystems/ExampleSubsystem.h rename to wpilibcExamples/src/main/cpp/templates/commandbased/include/Subsystems/ExampleSubsystem.h diff --git a/wpilibcExamples/src/main/cpp/templates/iterative/Robot.cpp b/wpilibcExamples/src/main/cpp/templates/iterative/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/iterative/Robot.cpp rename to wpilibcExamples/src/main/cpp/templates/iterative/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/templates/iterative/Robot.h b/wpilibcExamples/src/main/cpp/templates/iterative/include/Robot.h similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/iterative/Robot.h rename to wpilibcExamples/src/main/cpp/templates/iterative/include/Robot.h diff --git a/wpilibcExamples/src/main/cpp/templates/sample/Robot.cpp b/wpilibcExamples/src/main/cpp/templates/sample/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/sample/Robot.cpp rename to wpilibcExamples/src/main/cpp/templates/sample/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/templates/sample/Robot.h b/wpilibcExamples/src/main/cpp/templates/sample/include/Robot.h similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/sample/Robot.h rename to wpilibcExamples/src/main/cpp/templates/sample/include/Robot.h diff --git a/wpilibcExamples/src/main/cpp/templates/timed/Robot.cpp b/wpilibcExamples/src/main/cpp/templates/timed/cpp/Robot.cpp similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/timed/Robot.cpp rename to wpilibcExamples/src/main/cpp/templates/timed/cpp/Robot.cpp diff --git a/wpilibcExamples/src/main/cpp/templates/timed/Robot.h b/wpilibcExamples/src/main/cpp/templates/timed/include/Robot.h similarity index 100% rename from wpilibcExamples/src/main/cpp/templates/timed/Robot.h rename to wpilibcExamples/src/main/cpp/templates/timed/include/Robot.h