From 509819d83fe47c58ec38af165994aee01ffd6bfa Mon Sep 17 00:00:00 2001 From: Thad House Date: Fri, 1 Nov 2019 21:58:54 -0700 Subject: [PATCH] Split the two command implementations into separate libraries (#2012) This will allow us at the user code side to determine to include old commands, new commands or both. --- myRobot/build.gradle | 6 ++ settings.gradle | 2 + wpilibNewCommands/build.gradle | 96 +++++++++++++++++++ .../wpi/first/wpilibj2/commands/DevMain.java | 27 ++++++ wpilibNewCommands/src/dev/native/cpp/main.cpp | 8 ++ .../wpi/first/wpilibj2/command/Command.java | 0 .../first/wpilibj2/command/CommandBase.java | 0 .../wpilibj2/command/CommandGroupBase.java | 0 .../wpilibj2/command/CommandScheduler.java | 0 .../first/wpilibj2/command/CommandState.java | 0 .../wpilibj2/command/ConditionalCommand.java | 0 .../wpilibj2/command/FunctionalCommand.java | 0 .../wpilibj2/command/InstantCommand.java | 0 .../wpilibj2/command/NotifierCommand.java | 0 .../first/wpilibj2/command/PIDCommand.java | 0 .../first/wpilibj2/command/PIDSubsystem.java | 0 .../command/ParallelCommandGroup.java | 0 .../command/ParallelDeadlineGroup.java | 0 .../wpilibj2/command/ParallelRaceGroup.java | 0 .../wpilibj2/command/PerpetualCommand.java | 0 .../first/wpilibj2/command/PrintCommand.java | 0 .../wpilibj2/command/ProfiledPIDCommand.java | 0 .../command/ProfiledPIDSubsystem.java | 0 .../command/ProxyScheduleCommand.java | 0 .../wpilibj2/command/RamseteCommand.java | 0 .../first/wpilibj2/command/RunCommand.java | 0 .../wpilibj2/command/ScheduleCommand.java | 0 .../first/wpilibj2/command/SelectCommand.java | 0 .../command/SequentialCommandGroup.java | 0 .../wpilibj2/command/StartEndCommand.java | 0 .../wpi/first/wpilibj2/command/Subsystem.java | 0 .../first/wpilibj2/command/SubsystemBase.java | 0 .../command/TrapezoidProfileCommand.java | 0 .../first/wpilibj2/command/WaitCommand.java | 0 .../wpilibj2/command/WaitUntilCommand.java | 0 .../first/wpilibj2/command/button/Button.java | 0 .../command/button/InternalButton.java | 0 .../command/button/JoystickButton.java | 0 .../wpilibj2/command/button/POVButton.java | 0 .../wpilibj2/command/button/Trigger.java | 0 .../main/native/cpp/frc2/command/Command.cpp | 0 .../native/cpp/frc2/command/CommandBase.cpp | 0 .../cpp/frc2/command/CommandGroupBase.cpp | 0 .../cpp/frc2/command/CommandScheduler.cpp | 1 - .../native/cpp/frc2/command/CommandState.cpp | 0 .../cpp/frc2/command/ConditionalCommand.cpp | 0 .../cpp/frc2/command/FunctionalCommand.cpp | 0 .../cpp/frc2/command/InstantCommand.cpp | 0 .../cpp/frc2/command/NotifierCommand.cpp | 0 .../native/cpp/frc2/command/PIDCommand.cpp | 0 .../native/cpp/frc2/command/PIDSubsystem.cpp | 0 .../cpp/frc2/command/ParallelCommandGroup.cpp | 0 .../frc2/command/ParallelDeadlineGroup.cpp | 0 .../cpp/frc2/command/ParallelRaceGroup.cpp | 0 .../cpp/frc2/command/PerpetualCommand.cpp | 0 .../native/cpp/frc2/command/PrintCommand.cpp | 0 .../cpp/frc2/command/ProfiledPIDCommand.cpp | 0 .../cpp/frc2/command/ProfiledPIDSubsystem.cpp | 0 .../cpp/frc2/command/ProxyScheduleCommand.cpp | 0 .../cpp/frc2/command/RamseteCommand.cpp | 0 .../native/cpp/frc2/command/RunCommand.cpp | 0 .../cpp/frc2/command/ScheduleCommand.cpp | 0 .../frc2/command/SequentialCommandGroup.cpp | 0 .../cpp/frc2/command/StartEndCommand.cpp | 0 .../native/cpp/frc2/command/Subsystem.cpp | 0 .../native/cpp/frc2/command/SubsystemBase.cpp | 0 .../frc2/command/TrapezoidProfileCommand.cpp | 0 .../native/cpp/frc2/command/WaitCommand.cpp | 0 .../cpp/frc2/command/WaitUntilCommand.cpp | 0 .../native/cpp/frc2/command/button/Button.cpp | 0 .../cpp/frc2/command/button/Trigger.cpp | 0 .../native/include/frc2/command/Command.h | 0 .../native/include/frc2/command/CommandBase.h | 0 .../include/frc2/command/CommandGroupBase.h | 0 .../include/frc2/command/CommandHelper.h | 0 .../include/frc2/command/CommandScheduler.h | 0 .../include/frc2/command/CommandState.h | 0 .../include/frc2/command/ConditionalCommand.h | 0 .../include/frc2/command/FunctionalCommand.h | 0 .../include/frc2/command/InstantCommand.h | 0 .../include/frc2/command/NotifierCommand.h | 0 .../native/include/frc2/command/PIDCommand.h | 0 .../include/frc2/command/PIDSubsystem.h | 0 .../frc2/command/ParallelCommandGroup.h | 0 .../frc2/command/ParallelDeadlineGroup.h | 0 .../include/frc2/command/ParallelRaceGroup.h | 0 .../include/frc2/command/PerpetualCommand.h | 0 .../include/frc2/command/PrintCommand.h | 0 .../include/frc2/command/ProfiledPIDCommand.h | 0 .../frc2/command/ProfiledPIDSubsystem.h | 0 .../frc2/command/ProxyScheduleCommand.h | 0 .../include/frc2/command/RamseteCommand.h | 0 .../native/include/frc2/command/RunCommand.h | 0 .../include/frc2/command/ScheduleCommand.h | 0 .../include/frc2/command/SelectCommand.h | 0 .../frc2/command/SequentialCommandGroup.h | 0 .../include/frc2/command/SetUtilities.h | 0 .../include/frc2/command/StartEndCommand.h | 0 .../native/include/frc2/command/Subsystem.h | 0 .../include/frc2/command/SubsystemBase.h | 0 .../frc2/command/TrapezoidProfileCommand.h | 0 .../native/include/frc2/command/WaitCommand.h | 0 .../include/frc2/command/WaitUntilCommand.h | 0 .../include/frc2/command/button/Button.h | 0 .../frc2/command/button/JoystickButton.h | 0 .../include/frc2/command/button/POVButton.h | 0 .../include/frc2/command/button/Trigger.h | 0 .../first/wpilibj2/MockHardwareExtension.java | 40 ++++++++ .../first/wpilibj2/command/ButtonTest.java | 0 .../command/CommandDecoratorTest.java | 0 .../command/CommandGroupErrorTest.java | 0 .../command/CommandRequirementsTest.java | 0 .../wpilibj2/command/CommandScheduleTest.java | 0 .../wpilibj2/command/CommandTestBase.java | 0 .../command/ConditionalCommandTest.java | 0 .../wpilibj2/command/DefaultCommandTest.java | 0 .../command/FunctionalCommandTest.java | 0 .../wpilibj2/command/InstantCommandTest.java | 0 .../wpilibj2/command/NotifierCommandTest.java | 0 .../command/ParallelCommandGroupTest.java | 0 .../command/ParallelDeadlineGroupTest.java | 0 .../command/ParallelRaceGroupTest.java | 0 .../command/PerpetualCommandTest.java | 0 .../wpilibj2/command/PrintCommandTest.java | 0 .../command/ProxyScheduleCommandTest.java | 0 .../command/RobotDisabledCommandTest.java | 0 .../wpilibj2/command/RunCommandTest.java | 0 .../wpilibj2/command/ScheduleCommandTest.java | 0 .../first/wpilibj2/command/SchedulerTest.java | 0 .../wpilibj2/command/SelectCommandTest.java | 0 .../command/SequentialCommandGroupTest.java | 0 .../wpilibj2/command/StartEndCommandTest.java | 0 .../wpilibj2/command/WaitCommandTest.java | 0 .../command/WaitUntilCommandTest.java | 0 .../native/cpp/frc2/command/ButtonTest.cpp | 0 .../cpp/frc2/command/CommandDecoratorTest.cpp | 0 .../frc2/command/CommandRequirementsTest.cpp | 0 .../cpp/frc2/command/CommandScheduleTest.cpp | 0 .../cpp/frc2/command/CommandTestBase.cpp | 0 .../native/cpp/frc2/command/CommandTestBase.h | 0 .../frc2/command/ConditionalCommandTest.cpp | 0 .../cpp/frc2/command/DefaultCommandTest.cpp | 0 .../cpp/frc2/command/ErrorConfirmer.cpp | 0 .../native/cpp/frc2/command/ErrorConfirmer.h | 0 .../frc2/command/FunctionalCommandTest.cpp | 0 .../cpp/frc2/command/InstantCommandTest.cpp | 0 .../cpp/frc2/command/NotifierCommandTest.cpp | 0 .../frc2/command/ParallelCommandGroupTest.cpp | 0 .../command/ParallelDeadlineGroupTest.cpp | 0 .../frc2/command/ParallelRaceGroupTest.cpp | 0 .../cpp/frc2/command/PerpetualCommandTest.cpp | 0 .../cpp/frc2/command/PrintCommandTest.cpp | 0 .../frc2/command/ProxyScheduleCommandTest.cpp | 0 .../frc2/command/RobotDisabledCommandTest.cpp | 0 .../cpp/frc2/command/RunCommandTest.cpp | 0 .../cpp/frc2/command/ScheduleCommandTest.cpp | 0 .../native/cpp/frc2/command/SchedulerTest.cpp | 0 .../cpp/frc2/command/SelectCommandTest.cpp | 0 .../command/SequentialCommandGroupTest.cpp | 0 .../cpp/frc2/command/StartEndCommandTest.cpp | 0 .../cpp/frc2/command/WaitCommandTest.cpp | 0 .../cpp/frc2/command/WaitUntilCommandTest.cpp | 0 .../native/cpp/frc2/command/make_vector.h | 0 .../src/test/native/cpp/main.cpp | 17 ++++ .../org.junit.jupiter.api.extension.Extension | 1 + wpilibOldCommands/build.gradle | 94 ++++++++++++++++++ .../wpi/first/wpilibj/commands/DevMain.java | 27 ++++++ wpilibOldCommands/src/dev/native/cpp/main.cpp | 8 ++ .../edu/wpi/first/wpilibj/buttons/Button.java | 2 +- .../first/wpilibj/buttons/InternalButton.java | 2 +- .../first/wpilibj/buttons/JoystickButton.java | 2 +- .../first/wpilibj/buttons/NetworkButton.java | 2 +- .../wpi/first/wpilibj/buttons/POVButton.java | 2 +- .../wpi/first/wpilibj/buttons/Trigger.java | 0 .../wpi/first/wpilibj/command/Command.java | 0 .../first/wpilibj/command/CommandGroup.java | 2 +- .../wpilibj/command/ConditionalCommand.java | 0 .../command/IllegalUseOfCommandException.java | 2 +- .../first/wpilibj/command/InstantCommand.java | 2 +- .../wpilibj/command/LinkedListElement.java | 2 +- .../wpi/first/wpilibj/command/PIDCommand.java | 2 +- .../first/wpilibj/command/PIDSubsystem.java | 2 +- .../first/wpilibj/command/PrintCommand.java | 2 +- .../wpi/first/wpilibj/command/Scheduler.java | 0 .../edu/wpi/first/wpilibj/command/Set.java | 2 +- .../first/wpilibj/command/StartCommand.java | 2 +- .../wpi/first/wpilibj/command/Subsystem.java | 0 .../first/wpilibj/command/TimedCommand.java | 2 +- .../first/wpilibj/command/WaitCommand.java | 2 +- .../wpilibj/command/WaitForChildren.java | 2 +- .../wpilibj/command/WaitUntilCommand.java | 2 +- .../src/main/native/cpp/buttons/Button.cpp | 2 +- .../native/cpp/buttons/ButtonScheduler.cpp | 2 +- .../cpp/buttons/CancelButtonScheduler.cpp | 2 +- .../cpp/buttons/HeldButtonScheduler.cpp | 2 +- .../native/cpp/buttons/InternalButton.cpp | 2 +- .../native/cpp/buttons/JoystickButton.cpp | 2 +- .../main/native/cpp/buttons/NetworkButton.cpp | 2 +- .../src/main/native/cpp/buttons/POVButton.cpp | 2 +- .../cpp/buttons/PressedButtonScheduler.cpp | 2 +- .../cpp/buttons/ReleasedButtonScheduler.cpp | 2 +- .../cpp/buttons/ToggleButtonScheduler.cpp | 2 +- .../src/main/native/cpp/buttons/Trigger.cpp | 0 .../src/main/native/cpp/commands/Command.cpp | 0 .../main/native/cpp/commands/CommandGroup.cpp | 2 +- .../native/cpp/commands/CommandGroupEntry.cpp | 2 +- .../cpp/commands/ConditionalCommand.cpp | 2 +- .../native/cpp/commands/InstantCommand.cpp | 2 +- .../main/native/cpp/commands/PIDCommand.cpp | 2 +- .../main/native/cpp/commands/PIDSubsystem.cpp | 2 +- .../main/native/cpp/commands/PrintCommand.cpp | 2 +- .../main/native/cpp/commands/Scheduler.cpp | 0 .../main/native/cpp/commands/StartCommand.cpp | 2 +- .../main/native/cpp/commands/Subsystem.cpp | 0 .../main/native/cpp/commands/TimedCommand.cpp | 2 +- .../main/native/cpp/commands/WaitCommand.cpp | 2 +- .../native/cpp/commands/WaitForChildren.cpp | 2 +- .../native/cpp/commands/WaitUntilCommand.cpp | 2 +- .../main/native/include/frc/buttons/Button.h | 2 +- .../include/frc/buttons/ButtonScheduler.h | 2 +- .../frc/buttons/CancelButtonScheduler.h | 2 +- .../include/frc/buttons/HeldButtonScheduler.h | 2 +- .../include/frc/buttons/InternalButton.h | 2 +- .../include/frc/buttons/JoystickButton.h | 2 +- .../include/frc/buttons/NetworkButton.h | 2 +- .../native/include/frc/buttons/POVButton.h | 2 +- .../frc/buttons/PressedButtonScheduler.h | 2 +- .../frc/buttons/ReleasedButtonScheduler.h | 2 +- .../frc/buttons/ToggleButtonScheduler.h | 2 +- .../main/native/include/frc/buttons/Trigger.h | 0 .../native/include/frc/commands/Command.h | 0 .../include/frc/commands/CommandGroup.h | 2 +- .../include/frc/commands/CommandGroupEntry.h | 2 +- .../include/frc/commands/ConditionalCommand.h | 0 .../include/frc/commands/InstantCommand.h | 2 +- .../native/include/frc/commands/PIDCommand.h | 2 +- .../include/frc/commands/PIDSubsystem.h | 2 +- .../include/frc/commands/PrintCommand.h | 2 +- .../native/include/frc/commands/Scheduler.h | 0 .../include/frc/commands/StartCommand.h | 2 +- .../native/include/frc/commands/Subsystem.h | 0 .../include/frc/commands/TimedCommand.h | 2 +- .../native/include/frc/commands/WaitCommand.h | 2 +- .../include/frc/commands/WaitForChildren.h | 2 +- .../include/frc/commands/WaitUntilCommand.h | 2 +- .../first/wpilibj/MockHardwareExtension.java | 40 ++++++++ .../wpilibj/command/AbstractCommandTest.java | 2 +- .../wpi/first/wpilibj/command/ButtonTest.java | 2 +- .../command/CommandParallelGroupTest.java | 0 .../wpilibj/command/CommandScheduleTest.java | 2 +- .../command/CommandSequentialGroupTest.java | 0 .../wpilibj/command/CommandSupersedeTest.java | 2 +- .../wpilibj/command/CommandTimeoutTest.java | 2 +- .../command/ConditionalCommandTest.java | 2 +- .../wpilibj/command/DefaultCommandTest.java | 2 +- .../first/wpilibj/command/MockCommand.java | 2 +- .../command/MockConditionalCommand.java | 2 +- .../first/wpilibj/command/MockSubsystem.java | 2 +- .../shuffleboard/ShuffleboardTabTest.java | 2 +- .../src/test/native/cpp/main.cpp | 17 ++++ .../cpp/shuffleboard/ShuffleboardTabTest.cpp | 2 +- .../shuffleboard/ShuffleboardWidgetTest.cpp | 0 .../org.junit.jupiter.api.extension.Extension | 1 + .../main/native/cpp/IterativeRobotBase.cpp | 2 - .../main/native/cpp/livewindow/LiveWindow.cpp | 6 +- wpilibc/src/main/native/include/frc/WPILib.h | 1 - wpilibcExamples/build.gradle | 6 ++ wpilibcIntegrationTests/build.gradle | 1 + .../first/wpilibj/livewindow/LiveWindow.java | 5 - .../smartdashboard/SendableChooser.java | 3 +- wpilibjExamples/build.gradle | 2 + 271 files changed, 470 insertions(+), 91 deletions(-) create mode 100644 wpilibNewCommands/build.gradle create mode 100644 wpilibNewCommands/src/dev/java/edu/wpi/first/wpilibj2/commands/DevMain.java create mode 100644 wpilibNewCommands/src/dev/native/cpp/main.cpp rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/Command.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/CommandBase.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/CommandGroupBase.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/CommandScheduler.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/CommandState.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/ConditionalCommand.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/FunctionalCommand.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/InstantCommand.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/NotifierCommand.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/PIDCommand.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/PIDSubsystem.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroup.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroup.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroup.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/PerpetualCommand.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/PrintCommand.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/ProfiledPIDCommand.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/ProfiledPIDSubsystem.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/ProxyScheduleCommand.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/RamseteCommand.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/RunCommand.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/ScheduleCommand.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/SelectCommand.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroup.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/StartEndCommand.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/Subsystem.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/SubsystemBase.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/TrapezoidProfileCommand.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/WaitCommand.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/WaitUntilCommand.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/button/Button.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/button/InternalButton.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/button/JoystickButton.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/button/POVButton.java (100%) rename {wpilibj => wpilibNewCommands}/src/main/java/edu/wpi/first/wpilibj2/command/button/Trigger.java (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/Command.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/CommandBase.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/CommandGroupBase.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/CommandScheduler.cpp (99%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/CommandState.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/ConditionalCommand.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/FunctionalCommand.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/InstantCommand.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/NotifierCommand.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/PIDCommand.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/PIDSubsystem.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/ParallelCommandGroup.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/ParallelDeadlineGroup.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/ParallelRaceGroup.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/PerpetualCommand.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/PrintCommand.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/ProfiledPIDCommand.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/ProfiledPIDSubsystem.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/ProxyScheduleCommand.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/RamseteCommand.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/RunCommand.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/ScheduleCommand.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/SequentialCommandGroup.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/StartEndCommand.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/Subsystem.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/SubsystemBase.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/TrapezoidProfileCommand.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/WaitCommand.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/WaitUntilCommand.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/button/Button.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/cpp/frc2/command/button/Trigger.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/Command.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/CommandBase.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/CommandGroupBase.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/CommandHelper.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/CommandScheduler.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/CommandState.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/ConditionalCommand.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/FunctionalCommand.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/InstantCommand.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/NotifierCommand.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/PIDCommand.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/PIDSubsystem.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/ParallelCommandGroup.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/ParallelDeadlineGroup.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/ParallelRaceGroup.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/PerpetualCommand.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/PrintCommand.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/ProfiledPIDCommand.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/ProfiledPIDSubsystem.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/ProxyScheduleCommand.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/RamseteCommand.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/RunCommand.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/ScheduleCommand.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/SelectCommand.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/SequentialCommandGroup.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/SetUtilities.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/StartEndCommand.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/Subsystem.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/SubsystemBase.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/TrapezoidProfileCommand.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/WaitCommand.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/WaitUntilCommand.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/button/Button.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/button/JoystickButton.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/button/POVButton.h (100%) rename {wpilibc => wpilibNewCommands}/src/main/native/include/frc2/command/button/Trigger.h (100%) create mode 100644 wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/MockHardwareExtension.java rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/ButtonTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/CommandDecoratorTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/CommandGroupErrorTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/CommandRequirementsTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/CommandScheduleTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/CommandTestBase.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/ConditionalCommandTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/DefaultCommandTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/FunctionalCommandTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/InstantCommandTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/NotifierCommandTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroupTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroupTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroupTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/PerpetualCommandTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/PrintCommandTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/ProxyScheduleCommandTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/RobotDisabledCommandTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/RunCommandTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/ScheduleCommandTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/SchedulerTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/SelectCommandTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroupTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/StartEndCommandTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/WaitCommandTest.java (100%) rename {wpilibj => wpilibNewCommands}/src/test/java/edu/wpi/first/wpilibj2/command/WaitUntilCommandTest.java (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/ButtonTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/CommandDecoratorTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/CommandRequirementsTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/CommandScheduleTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/CommandTestBase.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/CommandTestBase.h (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/ConditionalCommandTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/DefaultCommandTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/ErrorConfirmer.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/ErrorConfirmer.h (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/FunctionalCommandTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/InstantCommandTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/NotifierCommandTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/ParallelCommandGroupTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/ParallelDeadlineGroupTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/ParallelRaceGroupTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/PerpetualCommandTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/PrintCommandTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/ProxyScheduleCommandTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/RobotDisabledCommandTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/RunCommandTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/ScheduleCommandTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/SchedulerTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/SelectCommandTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/SequentialCommandGroupTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/StartEndCommandTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/WaitCommandTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/WaitUntilCommandTest.cpp (100%) rename {wpilibc => wpilibNewCommands}/src/test/native/cpp/frc2/command/make_vector.h (100%) create mode 100644 wpilibNewCommands/src/test/native/cpp/main.cpp create mode 100644 wpilibNewCommands/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension create mode 100644 wpilibOldCommands/build.gradle create mode 100644 wpilibOldCommands/src/dev/java/edu/wpi/first/wpilibj/commands/DevMain.java create mode 100644 wpilibOldCommands/src/dev/native/cpp/main.cpp rename {wpilibj => wpilibOldCommands}/src/main/java/edu/wpi/first/wpilibj/buttons/Button.java (97%) rename {wpilibj => wpilibOldCommands}/src/main/java/edu/wpi/first/wpilibj/buttons/InternalButton.java (95%) rename {wpilibj => wpilibOldCommands}/src/main/java/edu/wpi/first/wpilibj/buttons/JoystickButton.java (95%) rename {wpilibj => wpilibOldCommands}/src/main/java/edu/wpi/first/wpilibj/buttons/NetworkButton.java (94%) rename {wpilibj => wpilibOldCommands}/src/main/java/edu/wpi/first/wpilibj/buttons/POVButton.java (96%) rename {wpilibj => wpilibOldCommands}/src/main/java/edu/wpi/first/wpilibj/buttons/Trigger.java (100%) rename {wpilibj => wpilibOldCommands}/src/main/java/edu/wpi/first/wpilibj/command/Command.java (100%) rename {wpilibj => wpilibOldCommands}/src/main/java/edu/wpi/first/wpilibj/command/CommandGroup.java (99%) rename {wpilibj => wpilibOldCommands}/src/main/java/edu/wpi/first/wpilibj/command/ConditionalCommand.java (100%) rename {wpilibj => wpilibOldCommands}/src/main/java/edu/wpi/first/wpilibj/command/IllegalUseOfCommandException.java (95%) rename {wpilibj => wpilibOldCommands}/src/main/java/edu/wpi/first/wpilibj/command/InstantCommand.java (97%) rename {wpilibj => wpilibOldCommands}/src/main/java/edu/wpi/first/wpilibj/command/LinkedListElement.java (96%) rename {wpilibj => wpilibOldCommands}/src/main/java/edu/wpi/first/wpilibj/command/PIDCommand.java (99%) rename {wpilibj => wpilibOldCommands}/src/main/java/edu/wpi/first/wpilibj/command/PIDSubsystem.java (99%) rename {wpilibj => wpilibOldCommands}/src/main/java/edu/wpi/first/wpilibj/command/PrintCommand.java (94%) rename {wpilibj => wpilibOldCommands}/src/main/java/edu/wpi/first/wpilibj/command/Scheduler.java (100%) rename {wpilibj => wpilibOldCommands}/src/main/java/edu/wpi/first/wpilibj/command/Set.java (94%) rename {wpilibj => wpilibOldCommands}/src/main/java/edu/wpi/first/wpilibj/command/StartCommand.java (94%) rename {wpilibj => wpilibOldCommands}/src/main/java/edu/wpi/first/wpilibj/command/Subsystem.java (100%) rename {wpilibj => wpilibOldCommands}/src/main/java/edu/wpi/first/wpilibj/command/TimedCommand.java (96%) rename {wpilibj => wpilibOldCommands}/src/main/java/edu/wpi/first/wpilibj/command/WaitCommand.java (94%) rename {wpilibj => wpilibOldCommands}/src/main/java/edu/wpi/first/wpilibj/command/WaitForChildren.java (94%) rename {wpilibj => wpilibOldCommands}/src/main/java/edu/wpi/first/wpilibj/command/WaitUntilCommand.java (93%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/buttons/Button.cpp (92%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/buttons/ButtonScheduler.cpp (92%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/buttons/CancelButtonScheduler.cpp (93%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/buttons/HeldButtonScheduler.cpp (93%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/buttons/InternalButton.cpp (92%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/buttons/JoystickButton.cpp (91%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/buttons/NetworkButton.cpp (94%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/buttons/POVButton.cpp (91%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/buttons/PressedButtonScheduler.cpp (93%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/buttons/ReleasedButtonScheduler.cpp (93%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/buttons/ToggleButtonScheduler.cpp (93%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/buttons/Trigger.cpp (100%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/commands/Command.cpp (100%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/commands/CommandGroup.cpp (99%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/commands/CommandGroupEntry.cpp (93%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/commands/ConditionalCommand.cpp (97%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/commands/InstantCommand.cpp (95%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/commands/PIDCommand.cpp (98%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/commands/PIDSubsystem.cpp (98%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/commands/PrintCommand.cpp (91%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/commands/Scheduler.cpp (100%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/commands/StartCommand.cpp (91%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/commands/Subsystem.cpp (100%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/commands/TimedCommand.cpp (93%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/commands/WaitCommand.cpp (91%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/commands/WaitForChildren.cpp (92%) rename {wpilibc => wpilibOldCommands}/src/main/native/cpp/commands/WaitUntilCommand.cpp (92%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/buttons/Button.h (97%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/buttons/ButtonScheduler.h (93%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/buttons/CancelButtonScheduler.h (93%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/buttons/HeldButtonScheduler.h (93%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/buttons/InternalButton.h (93%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/buttons/JoystickButton.h (93%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/buttons/NetworkButton.h (94%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/buttons/POVButton.h (94%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/buttons/PressedButtonScheduler.h (93%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/buttons/ReleasedButtonScheduler.h (93%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/buttons/ToggleButtonScheduler.h (93%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/buttons/Trigger.h (100%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/commands/Command.h (100%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/commands/CommandGroup.h (98%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/commands/CommandGroupEntry.h (93%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/commands/ConditionalCommand.h (100%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/commands/InstantCommand.h (97%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/commands/PIDCommand.h (97%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/commands/PIDSubsystem.h (99%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/commands/PrintCommand.h (93%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/commands/Scheduler.h (100%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/commands/StartCommand.h (92%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/commands/Subsystem.h (100%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/commands/TimedCommand.h (96%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/commands/WaitCommand.h (94%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/commands/WaitForChildren.h (93%) rename {wpilibc => wpilibOldCommands}/src/main/native/include/frc/commands/WaitUntilCommand.h (94%) create mode 100644 wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/MockHardwareExtension.java rename {wpilibj => wpilibOldCommands}/src/test/java/edu/wpi/first/wpilibj/command/AbstractCommandTest.java (96%) rename {wpilibj => wpilibOldCommands}/src/test/java/edu/wpi/first/wpilibj/command/ButtonTest.java (98%) rename {wpilibj => wpilibOldCommands}/src/test/java/edu/wpi/first/wpilibj/command/CommandParallelGroupTest.java (100%) rename {wpilibj => wpilibOldCommands}/src/test/java/edu/wpi/first/wpilibj/command/CommandScheduleTest.java (97%) rename {wpilibj => wpilibOldCommands}/src/test/java/edu/wpi/first/wpilibj/command/CommandSequentialGroupTest.java (100%) rename {wpilibj => wpilibOldCommands}/src/test/java/edu/wpi/first/wpilibj/command/CommandSupersedeTest.java (98%) rename {wpilibj => wpilibOldCommands}/src/test/java/edu/wpi/first/wpilibj/command/CommandTimeoutTest.java (95%) rename {wpilibj => wpilibOldCommands}/src/test/java/edu/wpi/first/wpilibj/command/ConditionalCommandTest.java (99%) rename {wpilibj => wpilibOldCommands}/src/test/java/edu/wpi/first/wpilibj/command/DefaultCommandTest.java (98%) rename {wpilibj => wpilibOldCommands}/src/test/java/edu/wpi/first/wpilibj/command/MockCommand.java (98%) rename {wpilibj => wpilibOldCommands}/src/test/java/edu/wpi/first/wpilibj/command/MockConditionalCommand.java (97%) rename {wpilibj => wpilibOldCommands}/src/test/java/edu/wpi/first/wpilibj/command/MockSubsystem.java (90%) rename {wpilibj => wpilibOldCommands}/src/test/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardTabTest.java (98%) create mode 100644 wpilibOldCommands/src/test/native/cpp/main.cpp rename {wpilibc => wpilibOldCommands}/src/test/native/cpp/shuffleboard/ShuffleboardTabTest.cpp (98%) rename {wpilibc => wpilibOldCommands}/src/test/native/cpp/shuffleboard/ShuffleboardWidgetTest.cpp (100%) create mode 100644 wpilibOldCommands/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension diff --git a/myRobot/build.gradle b/myRobot/build.gradle index 51dcbddcf4..4297aad350 100644 --- a/myRobot/build.gradle +++ b/myRobot/build.gradle @@ -42,6 +42,8 @@ dependencies { compile project(':ntcore') compile project(':cscore') compile project(':cameraserver') + compile project(':wpilibOldCommands') + compile project(':wpilibNewCommands') } jar { @@ -66,6 +68,8 @@ model { } } binaries.all { binary -> + lib project: ':wpilibOldCommands', library: 'wpilibOldCommands', linkage: 'shared' + lib project: ':wpilibNewCommands', library: 'wpilibNewCommands', linkage: 'shared' lib project: ':wpilibc', library: 'wpilibc', linkage: 'shared' lib project: ':ntcore', library: 'ntcore', linkage: 'shared' lib project: ':cscore', library: 'cscore', linkage: 'shared' @@ -93,6 +97,8 @@ model { } } binaries.all { binary -> + lib project: ':wpilibOldCommands', library: 'wpilibOldCommands', linkage: 'shared' + lib project: ':wpilibNewCommands', library: 'wpilibNewCommands', linkage: 'shared' lib project: ':wpilibc', library: 'wpilibc', linkage: 'static' lib project: ':ntcore', library: 'ntcore', linkage: 'static' lib project: ':cscore', library: 'cscore', linkage: 'static' diff --git a/settings.gradle b/settings.gradle index 1c1fa295b9..73ef0e8c73 100644 --- a/settings.gradle +++ b/settings.gradle @@ -33,5 +33,7 @@ include 'simulation:halsim_ds_socket' include 'simulation:halsim_gui' include 'cameraserver' include 'cameraserver:multiCameraServer' +include 'wpilibOldCommands' +include 'wpilibNewCommands' include 'myRobot' include 'docs' diff --git a/wpilibNewCommands/build.gradle b/wpilibNewCommands/build.gradle new file mode 100644 index 0000000000..ec4e111197 --- /dev/null +++ b/wpilibNewCommands/build.gradle @@ -0,0 +1,96 @@ +ext { + nativeName = 'wpilibNewCommands' + devMain = 'edu.wpi.first.wpilibj.commands.DevMain' +} + +evaluationDependsOn(':ntcore') +evaluationDependsOn(':cscore') +evaluationDependsOn(':hal') +evaluationDependsOn(':wpilibc') +evaluationDependsOn(':cameraserver') +evaluationDependsOn(':wpilibj') + +apply from: "${rootDir}/shared/javacpp/setupBuild.gradle" + +dependencies { + compile project(':wpiutil') + compile project(':ntcore') + compile project(':cscore') + compile project(':hal') + compile project(':wpilibj') + devCompile project(':wpiutil') + devCompile project(':ntcore') + devCompile project(':cscore') + devCompile project(':hal') + devCompile project(':wpilibj') + testCompile 'com.google.guava:guava:19.0' + testCompile 'org.mockito:mockito-core:2.27.0' +} + +nativeUtils.exportsConfigs { + wpilibNewCommands { + x86ExcludeSymbols = ['_CT??_R0?AV_System_error', '_CT??_R0?AVexception', '_CT??_R0?AVfailure', + '_CT??_R0?AVruntime_error', '_CT??_R0?AVsystem_error', '_CTA5?AVfailure', + '_TI5?AVfailure', '_CT??_R0?AVout_of_range', '_CTA3?AVout_of_range', + '_TI3?AVout_of_range', '_CT??_R0?AVbad_cast'] + x64ExcludeSymbols = ['_CT??_R0?AV_System_error', '_CT??_R0?AVexception', '_CT??_R0?AVfailure', + '_CT??_R0?AVruntime_error', '_CT??_R0?AVsystem_error', '_CTA5?AVfailure', + '_TI5?AVfailure', '_CT??_R0?AVout_of_range', '_CTA3?AVout_of_range', + '_TI3?AVout_of_range', '_CT??_R0?AVbad_cast'] + } +} + +apply from: "${rootDir}/shared/nilibraries.gradle" + +apply plugin: DisableBuildingGTest + +model { + components {} + binaries { + all { + if (!it.buildable || !(it instanceof NativeBinarySpec)) { + return + } + lib project: ':wpilibc', library: 'wpilibc', linkage: 'shared' + lib project: ':ntcore', library: 'ntcore', linkage: 'shared' + project(':hal').addHalDependency(it, 'shared') + lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' + + if (it.component.name == "${nativeName}Dev") { + lib project: ':ntcore', library: 'ntcoreJNIShared', linkage: 'shared' + project(':hal').addHalJniDependency(it) + } + + if (it instanceof GoogleTestTestSuiteBinarySpec) { + nativeUtils.useRequiredLibrary(it, 'opencv_shared') + lib project: ':cscore', library: 'cscore', linkage: 'shared' + } + } + } + tasks { + def c = $.components + def found = false + def systemArch = getCurrentArch() + c.each { + if (it in NativeExecutableSpec && it.name == "${nativeName}Dev") { + it.binaries.each { + if (!found) { + def arch = it.targetPlatform.name + if (arch == systemArch) { + def filePath = it.tasks.install.installDirectory.get().toString() + File.separatorChar + 'lib' + + found = true + } + } + } + } + } + } +} + +test { + testLogging { + outputs.upToDateWhen {false} + showStandardStreams = true + } +} diff --git a/wpilibNewCommands/src/dev/java/edu/wpi/first/wpilibj2/commands/DevMain.java b/wpilibNewCommands/src/dev/java/edu/wpi/first/wpilibj2/commands/DevMain.java new file mode 100644 index 0000000000..14b10f3234 --- /dev/null +++ b/wpilibNewCommands/src/dev/java/edu/wpi/first/wpilibj2/commands/DevMain.java @@ -0,0 +1,27 @@ +/*----------------------------------------------------------------------------*/ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ +/* Open Source Software - may be modified and shared by FRC teams. The code */ +/* must be accompanied by the FIRST BSD license file in the root directory of */ +/* the project. */ +/*----------------------------------------------------------------------------*/ + +package edu.wpi.first.wpilibj; + +import edu.wpi.first.hal.HALUtil; +import edu.wpi.first.networktables.NetworkTablesJNI; +import edu.wpi.first.wpiutil.RuntimeDetector; + +public final class DevMain { + /** + * Main entry point. + */ + public static void main(String[] args) { + System.out.println("Hello World!"); + System.out.println(RuntimeDetector.getPlatformPath()); + System.out.println(NetworkTablesJNI.now()); + System.out.println(HALUtil.getHALRuntimeType()); + } + + private DevMain() { + } +} diff --git a/wpilibNewCommands/src/dev/native/cpp/main.cpp b/wpilibNewCommands/src/dev/native/cpp/main.cpp new file mode 100644 index 0000000000..5312a1d766 --- /dev/null +++ b/wpilibNewCommands/src/dev/native/cpp/main.cpp @@ -0,0 +1,8 @@ +/*----------------------------------------------------------------------------*/ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ +/* Open Source Software - may be modified and shared by FRC teams. The code */ +/* must be accompanied by the FIRST BSD license file in the root directory of */ +/* the project. */ +/*----------------------------------------------------------------------------*/ + +int main() {} diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/Command.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/Command.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/Command.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/Command.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/CommandBase.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/CommandBase.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/CommandBase.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/CommandBase.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/CommandGroupBase.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/CommandGroupBase.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/CommandGroupBase.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/CommandGroupBase.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/CommandScheduler.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/CommandScheduler.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/CommandScheduler.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/CommandScheduler.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/CommandState.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/CommandState.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/CommandState.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/CommandState.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/ConditionalCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ConditionalCommand.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/ConditionalCommand.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ConditionalCommand.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/FunctionalCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/FunctionalCommand.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/FunctionalCommand.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/FunctionalCommand.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/InstantCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/InstantCommand.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/InstantCommand.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/InstantCommand.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/NotifierCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/NotifierCommand.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/NotifierCommand.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/NotifierCommand.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/PIDCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/PIDCommand.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/PIDCommand.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/PIDCommand.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/PIDSubsystem.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/PIDSubsystem.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/PIDSubsystem.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/PIDSubsystem.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroup.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroup.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroup.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroup.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroup.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroup.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroup.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroup.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroup.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroup.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroup.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroup.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/PerpetualCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/PerpetualCommand.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/PerpetualCommand.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/PerpetualCommand.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/PrintCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/PrintCommand.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/PrintCommand.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/PrintCommand.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/ProfiledPIDCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ProfiledPIDCommand.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/ProfiledPIDCommand.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ProfiledPIDCommand.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/ProfiledPIDSubsystem.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ProfiledPIDSubsystem.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/ProfiledPIDSubsystem.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ProfiledPIDSubsystem.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/ProxyScheduleCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ProxyScheduleCommand.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/ProxyScheduleCommand.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ProxyScheduleCommand.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/RamseteCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/RamseteCommand.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/RamseteCommand.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/RamseteCommand.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/RunCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/RunCommand.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/RunCommand.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/RunCommand.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/ScheduleCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ScheduleCommand.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/ScheduleCommand.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ScheduleCommand.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/SelectCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SelectCommand.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/SelectCommand.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SelectCommand.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroup.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroup.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroup.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroup.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/StartEndCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/StartEndCommand.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/StartEndCommand.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/StartEndCommand.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/Subsystem.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/Subsystem.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/Subsystem.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/Subsystem.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/SubsystemBase.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SubsystemBase.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/SubsystemBase.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SubsystemBase.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/TrapezoidProfileCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/TrapezoidProfileCommand.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/TrapezoidProfileCommand.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/TrapezoidProfileCommand.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/WaitCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/WaitCommand.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/WaitCommand.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/WaitCommand.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/WaitUntilCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/WaitUntilCommand.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/WaitUntilCommand.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/WaitUntilCommand.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/button/Button.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/Button.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/button/Button.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/Button.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/button/InternalButton.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/InternalButton.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/button/InternalButton.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/InternalButton.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/button/JoystickButton.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/JoystickButton.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/button/JoystickButton.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/JoystickButton.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/button/POVButton.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/POVButton.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/button/POVButton.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/POVButton.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/button/Trigger.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/Trigger.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj2/command/button/Trigger.java rename to wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/Trigger.java diff --git a/wpilibc/src/main/native/cpp/frc2/command/Command.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/Command.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/Command.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/Command.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/CommandBase.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/CommandBase.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/CommandBase.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/CommandBase.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/CommandGroupBase.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/CommandGroupBase.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/CommandGroupBase.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/CommandGroupBase.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/CommandScheduler.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/CommandScheduler.cpp similarity index 99% rename from wpilibc/src/main/native/cpp/frc2/command/CommandScheduler.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/CommandScheduler.cpp index 464a4a6239..66885e17f8 100644 --- a/wpilibc/src/main/native/cpp/frc2/command/CommandScheduler.cpp +++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/CommandScheduler.cpp @@ -9,7 +9,6 @@ #include #include -#include #include #include #include diff --git a/wpilibc/src/main/native/cpp/frc2/command/CommandState.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/CommandState.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/CommandState.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/CommandState.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/ConditionalCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/ConditionalCommand.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/ConditionalCommand.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/ConditionalCommand.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/FunctionalCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/FunctionalCommand.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/FunctionalCommand.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/FunctionalCommand.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/InstantCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/InstantCommand.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/InstantCommand.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/InstantCommand.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/NotifierCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/NotifierCommand.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/NotifierCommand.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/NotifierCommand.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/PIDCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/PIDCommand.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/PIDCommand.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/PIDCommand.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/PIDSubsystem.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/PIDSubsystem.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/PIDSubsystem.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/PIDSubsystem.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/ParallelCommandGroup.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelCommandGroup.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/ParallelCommandGroup.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelCommandGroup.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/ParallelDeadlineGroup.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelDeadlineGroup.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/ParallelDeadlineGroup.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelDeadlineGroup.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/ParallelRaceGroup.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelRaceGroup.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/ParallelRaceGroup.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelRaceGroup.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/PerpetualCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/PerpetualCommand.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/PerpetualCommand.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/PerpetualCommand.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/PrintCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/PrintCommand.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/PrintCommand.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/PrintCommand.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/ProfiledPIDCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/ProfiledPIDCommand.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/ProfiledPIDCommand.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/ProfiledPIDCommand.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/ProfiledPIDSubsystem.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/ProfiledPIDSubsystem.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/ProfiledPIDSubsystem.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/ProfiledPIDSubsystem.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/ProxyScheduleCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/ProxyScheduleCommand.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/ProxyScheduleCommand.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/ProxyScheduleCommand.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/RamseteCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/RamseteCommand.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/RamseteCommand.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/RamseteCommand.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/RunCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/RunCommand.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/RunCommand.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/RunCommand.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/ScheduleCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/ScheduleCommand.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/ScheduleCommand.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/ScheduleCommand.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/SequentialCommandGroup.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/SequentialCommandGroup.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/SequentialCommandGroup.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/SequentialCommandGroup.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/StartEndCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/StartEndCommand.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/StartEndCommand.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/StartEndCommand.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/Subsystem.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/Subsystem.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/Subsystem.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/Subsystem.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/SubsystemBase.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/SubsystemBase.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/SubsystemBase.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/SubsystemBase.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/TrapezoidProfileCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/TrapezoidProfileCommand.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/TrapezoidProfileCommand.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/TrapezoidProfileCommand.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/WaitCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/WaitCommand.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/WaitCommand.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/WaitCommand.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/WaitUntilCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/WaitUntilCommand.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/WaitUntilCommand.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/WaitUntilCommand.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/button/Button.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/button/Button.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/button/Button.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/button/Button.cpp diff --git a/wpilibc/src/main/native/cpp/frc2/command/button/Trigger.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/button/Trigger.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/frc2/command/button/Trigger.cpp rename to wpilibNewCommands/src/main/native/cpp/frc2/command/button/Trigger.cpp diff --git a/wpilibc/src/main/native/include/frc2/command/Command.h b/wpilibNewCommands/src/main/native/include/frc2/command/Command.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/Command.h rename to wpilibNewCommands/src/main/native/include/frc2/command/Command.h diff --git a/wpilibc/src/main/native/include/frc2/command/CommandBase.h b/wpilibNewCommands/src/main/native/include/frc2/command/CommandBase.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/CommandBase.h rename to wpilibNewCommands/src/main/native/include/frc2/command/CommandBase.h diff --git a/wpilibc/src/main/native/include/frc2/command/CommandGroupBase.h b/wpilibNewCommands/src/main/native/include/frc2/command/CommandGroupBase.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/CommandGroupBase.h rename to wpilibNewCommands/src/main/native/include/frc2/command/CommandGroupBase.h diff --git a/wpilibc/src/main/native/include/frc2/command/CommandHelper.h b/wpilibNewCommands/src/main/native/include/frc2/command/CommandHelper.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/CommandHelper.h rename to wpilibNewCommands/src/main/native/include/frc2/command/CommandHelper.h diff --git a/wpilibc/src/main/native/include/frc2/command/CommandScheduler.h b/wpilibNewCommands/src/main/native/include/frc2/command/CommandScheduler.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/CommandScheduler.h rename to wpilibNewCommands/src/main/native/include/frc2/command/CommandScheduler.h diff --git a/wpilibc/src/main/native/include/frc2/command/CommandState.h b/wpilibNewCommands/src/main/native/include/frc2/command/CommandState.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/CommandState.h rename to wpilibNewCommands/src/main/native/include/frc2/command/CommandState.h diff --git a/wpilibc/src/main/native/include/frc2/command/ConditionalCommand.h b/wpilibNewCommands/src/main/native/include/frc2/command/ConditionalCommand.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/ConditionalCommand.h rename to wpilibNewCommands/src/main/native/include/frc2/command/ConditionalCommand.h diff --git a/wpilibc/src/main/native/include/frc2/command/FunctionalCommand.h b/wpilibNewCommands/src/main/native/include/frc2/command/FunctionalCommand.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/FunctionalCommand.h rename to wpilibNewCommands/src/main/native/include/frc2/command/FunctionalCommand.h diff --git a/wpilibc/src/main/native/include/frc2/command/InstantCommand.h b/wpilibNewCommands/src/main/native/include/frc2/command/InstantCommand.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/InstantCommand.h rename to wpilibNewCommands/src/main/native/include/frc2/command/InstantCommand.h diff --git a/wpilibc/src/main/native/include/frc2/command/NotifierCommand.h b/wpilibNewCommands/src/main/native/include/frc2/command/NotifierCommand.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/NotifierCommand.h rename to wpilibNewCommands/src/main/native/include/frc2/command/NotifierCommand.h diff --git a/wpilibc/src/main/native/include/frc2/command/PIDCommand.h b/wpilibNewCommands/src/main/native/include/frc2/command/PIDCommand.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/PIDCommand.h rename to wpilibNewCommands/src/main/native/include/frc2/command/PIDCommand.h diff --git a/wpilibc/src/main/native/include/frc2/command/PIDSubsystem.h b/wpilibNewCommands/src/main/native/include/frc2/command/PIDSubsystem.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/PIDSubsystem.h rename to wpilibNewCommands/src/main/native/include/frc2/command/PIDSubsystem.h diff --git a/wpilibc/src/main/native/include/frc2/command/ParallelCommandGroup.h b/wpilibNewCommands/src/main/native/include/frc2/command/ParallelCommandGroup.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/ParallelCommandGroup.h rename to wpilibNewCommands/src/main/native/include/frc2/command/ParallelCommandGroup.h diff --git a/wpilibc/src/main/native/include/frc2/command/ParallelDeadlineGroup.h b/wpilibNewCommands/src/main/native/include/frc2/command/ParallelDeadlineGroup.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/ParallelDeadlineGroup.h rename to wpilibNewCommands/src/main/native/include/frc2/command/ParallelDeadlineGroup.h diff --git a/wpilibc/src/main/native/include/frc2/command/ParallelRaceGroup.h b/wpilibNewCommands/src/main/native/include/frc2/command/ParallelRaceGroup.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/ParallelRaceGroup.h rename to wpilibNewCommands/src/main/native/include/frc2/command/ParallelRaceGroup.h diff --git a/wpilibc/src/main/native/include/frc2/command/PerpetualCommand.h b/wpilibNewCommands/src/main/native/include/frc2/command/PerpetualCommand.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/PerpetualCommand.h rename to wpilibNewCommands/src/main/native/include/frc2/command/PerpetualCommand.h diff --git a/wpilibc/src/main/native/include/frc2/command/PrintCommand.h b/wpilibNewCommands/src/main/native/include/frc2/command/PrintCommand.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/PrintCommand.h rename to wpilibNewCommands/src/main/native/include/frc2/command/PrintCommand.h diff --git a/wpilibc/src/main/native/include/frc2/command/ProfiledPIDCommand.h b/wpilibNewCommands/src/main/native/include/frc2/command/ProfiledPIDCommand.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/ProfiledPIDCommand.h rename to wpilibNewCommands/src/main/native/include/frc2/command/ProfiledPIDCommand.h diff --git a/wpilibc/src/main/native/include/frc2/command/ProfiledPIDSubsystem.h b/wpilibNewCommands/src/main/native/include/frc2/command/ProfiledPIDSubsystem.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/ProfiledPIDSubsystem.h rename to wpilibNewCommands/src/main/native/include/frc2/command/ProfiledPIDSubsystem.h diff --git a/wpilibc/src/main/native/include/frc2/command/ProxyScheduleCommand.h b/wpilibNewCommands/src/main/native/include/frc2/command/ProxyScheduleCommand.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/ProxyScheduleCommand.h rename to wpilibNewCommands/src/main/native/include/frc2/command/ProxyScheduleCommand.h diff --git a/wpilibc/src/main/native/include/frc2/command/RamseteCommand.h b/wpilibNewCommands/src/main/native/include/frc2/command/RamseteCommand.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/RamseteCommand.h rename to wpilibNewCommands/src/main/native/include/frc2/command/RamseteCommand.h diff --git a/wpilibc/src/main/native/include/frc2/command/RunCommand.h b/wpilibNewCommands/src/main/native/include/frc2/command/RunCommand.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/RunCommand.h rename to wpilibNewCommands/src/main/native/include/frc2/command/RunCommand.h diff --git a/wpilibc/src/main/native/include/frc2/command/ScheduleCommand.h b/wpilibNewCommands/src/main/native/include/frc2/command/ScheduleCommand.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/ScheduleCommand.h rename to wpilibNewCommands/src/main/native/include/frc2/command/ScheduleCommand.h diff --git a/wpilibc/src/main/native/include/frc2/command/SelectCommand.h b/wpilibNewCommands/src/main/native/include/frc2/command/SelectCommand.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/SelectCommand.h rename to wpilibNewCommands/src/main/native/include/frc2/command/SelectCommand.h diff --git a/wpilibc/src/main/native/include/frc2/command/SequentialCommandGroup.h b/wpilibNewCommands/src/main/native/include/frc2/command/SequentialCommandGroup.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/SequentialCommandGroup.h rename to wpilibNewCommands/src/main/native/include/frc2/command/SequentialCommandGroup.h diff --git a/wpilibc/src/main/native/include/frc2/command/SetUtilities.h b/wpilibNewCommands/src/main/native/include/frc2/command/SetUtilities.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/SetUtilities.h rename to wpilibNewCommands/src/main/native/include/frc2/command/SetUtilities.h diff --git a/wpilibc/src/main/native/include/frc2/command/StartEndCommand.h b/wpilibNewCommands/src/main/native/include/frc2/command/StartEndCommand.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/StartEndCommand.h rename to wpilibNewCommands/src/main/native/include/frc2/command/StartEndCommand.h diff --git a/wpilibc/src/main/native/include/frc2/command/Subsystem.h b/wpilibNewCommands/src/main/native/include/frc2/command/Subsystem.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/Subsystem.h rename to wpilibNewCommands/src/main/native/include/frc2/command/Subsystem.h diff --git a/wpilibc/src/main/native/include/frc2/command/SubsystemBase.h b/wpilibNewCommands/src/main/native/include/frc2/command/SubsystemBase.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/SubsystemBase.h rename to wpilibNewCommands/src/main/native/include/frc2/command/SubsystemBase.h diff --git a/wpilibc/src/main/native/include/frc2/command/TrapezoidProfileCommand.h b/wpilibNewCommands/src/main/native/include/frc2/command/TrapezoidProfileCommand.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/TrapezoidProfileCommand.h rename to wpilibNewCommands/src/main/native/include/frc2/command/TrapezoidProfileCommand.h diff --git a/wpilibc/src/main/native/include/frc2/command/WaitCommand.h b/wpilibNewCommands/src/main/native/include/frc2/command/WaitCommand.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/WaitCommand.h rename to wpilibNewCommands/src/main/native/include/frc2/command/WaitCommand.h diff --git a/wpilibc/src/main/native/include/frc2/command/WaitUntilCommand.h b/wpilibNewCommands/src/main/native/include/frc2/command/WaitUntilCommand.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/WaitUntilCommand.h rename to wpilibNewCommands/src/main/native/include/frc2/command/WaitUntilCommand.h diff --git a/wpilibc/src/main/native/include/frc2/command/button/Button.h b/wpilibNewCommands/src/main/native/include/frc2/command/button/Button.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/button/Button.h rename to wpilibNewCommands/src/main/native/include/frc2/command/button/Button.h diff --git a/wpilibc/src/main/native/include/frc2/command/button/JoystickButton.h b/wpilibNewCommands/src/main/native/include/frc2/command/button/JoystickButton.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/button/JoystickButton.h rename to wpilibNewCommands/src/main/native/include/frc2/command/button/JoystickButton.h diff --git a/wpilibc/src/main/native/include/frc2/command/button/POVButton.h b/wpilibNewCommands/src/main/native/include/frc2/command/button/POVButton.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/button/POVButton.h rename to wpilibNewCommands/src/main/native/include/frc2/command/button/POVButton.h diff --git a/wpilibc/src/main/native/include/frc2/command/button/Trigger.h b/wpilibNewCommands/src/main/native/include/frc2/command/button/Trigger.h similarity index 100% rename from wpilibc/src/main/native/include/frc2/command/button/Trigger.h rename to wpilibNewCommands/src/main/native/include/frc2/command/button/Trigger.h diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/MockHardwareExtension.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/MockHardwareExtension.java new file mode 100644 index 0000000000..4f9abf05b4 --- /dev/null +++ b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/MockHardwareExtension.java @@ -0,0 +1,40 @@ +/*----------------------------------------------------------------------------*/ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ +/* Open Source Software - may be modified and shared by FRC teams. The code */ +/* must be accompanied by the FIRST BSD license file in the root directory of */ +/* the project. */ +/*----------------------------------------------------------------------------*/ + +package edu.wpi.first.wpilibj2; + +import org.junit.jupiter.api.extension.BeforeAllCallback; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.ExtensionContext.Namespace; + +import edu.wpi.first.hal.HAL; +import edu.wpi.first.hal.sim.DriverStationSim; + +public final class MockHardwareExtension implements BeforeAllCallback { + private static ExtensionContext getRoot(ExtensionContext context) { + return context.getParent().map(MockHardwareExtension::getRoot).orElse(context); + } + + @Override + public void beforeAll(ExtensionContext context) { + getRoot(context).getStore(Namespace.GLOBAL).getOrComputeIfAbsent("HAL Initalized", key -> { + initializeHardware(); + return true; + }, Boolean.class); + } + + private void initializeHardware() { + HAL.initialize(500, 0); + DriverStationSim dsSim = new DriverStationSim(); + dsSim.setDsAttached(true); + dsSim.setAutonomous(false); + dsSim.setEnabled(true); + dsSim.setTest(true); + + + } +} diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/ButtonTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ButtonTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/ButtonTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ButtonTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/CommandDecoratorTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandDecoratorTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/CommandDecoratorTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandDecoratorTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/CommandGroupErrorTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandGroupErrorTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/CommandGroupErrorTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandGroupErrorTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/CommandRequirementsTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandRequirementsTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/CommandRequirementsTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandRequirementsTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/CommandScheduleTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandScheduleTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/CommandScheduleTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandScheduleTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/CommandTestBase.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandTestBase.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/CommandTestBase.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandTestBase.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/ConditionalCommandTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ConditionalCommandTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/ConditionalCommandTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ConditionalCommandTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/DefaultCommandTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/DefaultCommandTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/DefaultCommandTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/DefaultCommandTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/FunctionalCommandTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/FunctionalCommandTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/FunctionalCommandTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/FunctionalCommandTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/InstantCommandTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/InstantCommandTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/InstantCommandTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/InstantCommandTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/NotifierCommandTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/NotifierCommandTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/NotifierCommandTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/NotifierCommandTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroupTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroupTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroupTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroupTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroupTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroupTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroupTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroupTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroupTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroupTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroupTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroupTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/PerpetualCommandTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/PerpetualCommandTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/PerpetualCommandTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/PerpetualCommandTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/PrintCommandTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/PrintCommandTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/PrintCommandTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/PrintCommandTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/ProxyScheduleCommandTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ProxyScheduleCommandTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/ProxyScheduleCommandTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ProxyScheduleCommandTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/RobotDisabledCommandTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/RobotDisabledCommandTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/RobotDisabledCommandTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/RobotDisabledCommandTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/RunCommandTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/RunCommandTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/RunCommandTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/RunCommandTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/ScheduleCommandTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ScheduleCommandTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/ScheduleCommandTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ScheduleCommandTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/SchedulerTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/SchedulerTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/SchedulerTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/SchedulerTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/SelectCommandTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/SelectCommandTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/SelectCommandTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/SelectCommandTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroupTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroupTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroupTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroupTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/StartEndCommandTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/StartEndCommandTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/StartEndCommandTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/StartEndCommandTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/WaitCommandTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/WaitCommandTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/WaitCommandTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/WaitCommandTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/WaitUntilCommandTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/WaitUntilCommandTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj2/command/WaitUntilCommandTest.java rename to wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/WaitUntilCommandTest.java diff --git a/wpilibc/src/test/native/cpp/frc2/command/ButtonTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/ButtonTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/ButtonTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/ButtonTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/CommandDecoratorTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandDecoratorTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/CommandDecoratorTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/CommandDecoratorTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/CommandRequirementsTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandRequirementsTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/CommandRequirementsTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/CommandRequirementsTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/CommandScheduleTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandScheduleTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/CommandScheduleTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/CommandScheduleTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/CommandTestBase.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandTestBase.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/CommandTestBase.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/CommandTestBase.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/CommandTestBase.h b/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandTestBase.h similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/CommandTestBase.h rename to wpilibNewCommands/src/test/native/cpp/frc2/command/CommandTestBase.h diff --git a/wpilibc/src/test/native/cpp/frc2/command/ConditionalCommandTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/ConditionalCommandTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/ConditionalCommandTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/ConditionalCommandTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/DefaultCommandTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/DefaultCommandTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/DefaultCommandTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/DefaultCommandTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/ErrorConfirmer.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/ErrorConfirmer.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/ErrorConfirmer.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/ErrorConfirmer.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/ErrorConfirmer.h b/wpilibNewCommands/src/test/native/cpp/frc2/command/ErrorConfirmer.h similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/ErrorConfirmer.h rename to wpilibNewCommands/src/test/native/cpp/frc2/command/ErrorConfirmer.h diff --git a/wpilibc/src/test/native/cpp/frc2/command/FunctionalCommandTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/FunctionalCommandTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/FunctionalCommandTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/FunctionalCommandTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/InstantCommandTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/InstantCommandTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/InstantCommandTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/InstantCommandTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/NotifierCommandTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/NotifierCommandTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/NotifierCommandTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/NotifierCommandTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/ParallelCommandGroupTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelCommandGroupTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/ParallelCommandGroupTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelCommandGroupTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/ParallelDeadlineGroupTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelDeadlineGroupTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/ParallelDeadlineGroupTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelDeadlineGroupTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/ParallelRaceGroupTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelRaceGroupTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/ParallelRaceGroupTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelRaceGroupTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/PerpetualCommandTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/PerpetualCommandTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/PerpetualCommandTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/PerpetualCommandTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/PrintCommandTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/PrintCommandTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/PrintCommandTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/PrintCommandTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/ProxyScheduleCommandTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/ProxyScheduleCommandTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/ProxyScheduleCommandTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/ProxyScheduleCommandTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/RobotDisabledCommandTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/RobotDisabledCommandTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/RobotDisabledCommandTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/RobotDisabledCommandTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/RunCommandTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/RunCommandTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/RunCommandTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/RunCommandTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/ScheduleCommandTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/ScheduleCommandTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/ScheduleCommandTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/ScheduleCommandTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/SchedulerTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/SchedulerTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/SchedulerTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/SchedulerTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/SelectCommandTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/SelectCommandTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/SelectCommandTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/SelectCommandTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/SequentialCommandGroupTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/SequentialCommandGroupTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/SequentialCommandGroupTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/SequentialCommandGroupTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/StartEndCommandTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/StartEndCommandTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/StartEndCommandTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/StartEndCommandTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/WaitCommandTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/WaitCommandTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/WaitCommandTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/WaitCommandTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/WaitUntilCommandTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/WaitUntilCommandTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/WaitUntilCommandTest.cpp rename to wpilibNewCommands/src/test/native/cpp/frc2/command/WaitUntilCommandTest.cpp diff --git a/wpilibc/src/test/native/cpp/frc2/command/make_vector.h b/wpilibNewCommands/src/test/native/cpp/frc2/command/make_vector.h similarity index 100% rename from wpilibc/src/test/native/cpp/frc2/command/make_vector.h rename to wpilibNewCommands/src/test/native/cpp/frc2/command/make_vector.h diff --git a/wpilibNewCommands/src/test/native/cpp/main.cpp b/wpilibNewCommands/src/test/native/cpp/main.cpp new file mode 100644 index 0000000000..fd8f022427 --- /dev/null +++ b/wpilibNewCommands/src/test/native/cpp/main.cpp @@ -0,0 +1,17 @@ +/*----------------------------------------------------------------------------*/ +/* Copyright (c) 2015-2019 FIRST. All Rights Reserved. */ +/* Open Source Software - may be modified and shared by FRC teams. The code */ +/* must be accompanied by the FIRST BSD license file in the root directory of */ +/* the project. */ +/*----------------------------------------------------------------------------*/ + +#include + +#include "gtest/gtest.h" + +int main(int argc, char** argv) { + HAL_Initialize(500, 0); + ::testing::InitGoogleTest(&argc, argv); + int ret = RUN_ALL_TESTS(); + return ret; +} diff --git a/wpilibNewCommands/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/wpilibNewCommands/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension new file mode 100644 index 0000000000..daaab59dba --- /dev/null +++ b/wpilibNewCommands/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension @@ -0,0 +1 @@ +edu.wpi.first.wpilibj2.MockHardwareExtension diff --git a/wpilibOldCommands/build.gradle b/wpilibOldCommands/build.gradle new file mode 100644 index 0000000000..496ebcf5b7 --- /dev/null +++ b/wpilibOldCommands/build.gradle @@ -0,0 +1,94 @@ +ext { + nativeName = 'wpilibOldCommands' + devMain = 'edu.wpi.first.wpilibj.commands.DevMain' +} + +evaluationDependsOn(':ntcore') +evaluationDependsOn(':cscore') +evaluationDependsOn(':hal') +evaluationDependsOn(':wpilibc') +evaluationDependsOn(':cameraserver') +evaluationDependsOn(':wpilibj') + +apply from: "${rootDir}/shared/javacpp/setupBuild.gradle" + +dependencies { + compile project(':wpiutil') + compile project(':ntcore') + compile project(':cscore') + compile project(':hal') + compile project(':wpilibj') + devCompile project(':wpiutil') + devCompile project(':ntcore') + devCompile project(':cscore') + devCompile project(':hal') + devCompile project(':wpilibj') +} + +nativeUtils.exportsConfigs { + wpilibOldCommands { + x86ExcludeSymbols = ['_CT??_R0?AV_System_error', '_CT??_R0?AVexception', '_CT??_R0?AVfailure', + '_CT??_R0?AVruntime_error', '_CT??_R0?AVsystem_error', '_CTA5?AVfailure', + '_TI5?AVfailure', '_CT??_R0?AVout_of_range', '_CTA3?AVout_of_range', + '_TI3?AVout_of_range', '_CT??_R0?AVbad_cast'] + x64ExcludeSymbols = ['_CT??_R0?AV_System_error', '_CT??_R0?AVexception', '_CT??_R0?AVfailure', + '_CT??_R0?AVruntime_error', '_CT??_R0?AVsystem_error', '_CTA5?AVfailure', + '_TI5?AVfailure', '_CT??_R0?AVout_of_range', '_CTA3?AVout_of_range', + '_TI3?AVout_of_range', '_CT??_R0?AVbad_cast'] + } +} + +apply from: "${rootDir}/shared/nilibraries.gradle" + +apply plugin: DisableBuildingGTest + +model { + components {} + binaries { + all { + if (!it.buildable || !(it instanceof NativeBinarySpec)) { + return + } + lib project: ':wpilibc', library: 'wpilibc', linkage: 'shared' + lib project: ':ntcore', library: 'ntcore', linkage: 'shared' + project(':hal').addHalDependency(it, 'shared') + lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' + + if (it.component.name == "${nativeName}Dev") { + lib project: ':ntcore', library: 'ntcoreJNIShared', linkage: 'shared' + project(':hal').addHalJniDependency(it) + } + + if (it instanceof GoogleTestTestSuiteBinarySpec) { + nativeUtils.useRequiredLibrary(it, 'opencv_shared') + lib project: ':cscore', library: 'cscore', linkage: 'shared' + } + } + } + tasks { + def c = $.components + def found = false + def systemArch = getCurrentArch() + c.each { + if (it in NativeExecutableSpec && it.name == "${nativeName}Dev") { + it.binaries.each { + if (!found) { + def arch = it.targetPlatform.name + if (arch == systemArch) { + def filePath = it.tasks.install.installDirectory.get().toString() + File.separatorChar + 'lib' + + found = true + } + } + } + } + } + } +} + +test { + testLogging { + outputs.upToDateWhen {false} + showStandardStreams = true + } +} diff --git a/wpilibOldCommands/src/dev/java/edu/wpi/first/wpilibj/commands/DevMain.java b/wpilibOldCommands/src/dev/java/edu/wpi/first/wpilibj/commands/DevMain.java new file mode 100644 index 0000000000..14b10f3234 --- /dev/null +++ b/wpilibOldCommands/src/dev/java/edu/wpi/first/wpilibj/commands/DevMain.java @@ -0,0 +1,27 @@ +/*----------------------------------------------------------------------------*/ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ +/* Open Source Software - may be modified and shared by FRC teams. The code */ +/* must be accompanied by the FIRST BSD license file in the root directory of */ +/* the project. */ +/*----------------------------------------------------------------------------*/ + +package edu.wpi.first.wpilibj; + +import edu.wpi.first.hal.HALUtil; +import edu.wpi.first.networktables.NetworkTablesJNI; +import edu.wpi.first.wpiutil.RuntimeDetector; + +public final class DevMain { + /** + * Main entry point. + */ + public static void main(String[] args) { + System.out.println("Hello World!"); + System.out.println(RuntimeDetector.getPlatformPath()); + System.out.println(NetworkTablesJNI.now()); + System.out.println(HALUtil.getHALRuntimeType()); + } + + private DevMain() { + } +} diff --git a/wpilibOldCommands/src/dev/native/cpp/main.cpp b/wpilibOldCommands/src/dev/native/cpp/main.cpp new file mode 100644 index 0000000000..5312a1d766 --- /dev/null +++ b/wpilibOldCommands/src/dev/native/cpp/main.cpp @@ -0,0 +1,8 @@ +/*----------------------------------------------------------------------------*/ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ +/* Open Source Software - may be modified and shared by FRC teams. The code */ +/* must be accompanied by the FIRST BSD license file in the root directory of */ +/* the project. */ +/*----------------------------------------------------------------------------*/ + +int main() {} diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/Button.java b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/buttons/Button.java similarity index 97% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/Button.java rename to wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/buttons/Button.java index a7dc2fa8f3..dcd4401a12 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/Button.java +++ b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/buttons/Button.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/InternalButton.java b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/buttons/InternalButton.java similarity index 95% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/InternalButton.java rename to wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/buttons/InternalButton.java index bb1eff7d63..c2a6eb1efb 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/InternalButton.java +++ b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/buttons/InternalButton.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/JoystickButton.java b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/buttons/JoystickButton.java similarity index 95% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/JoystickButton.java rename to wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/buttons/JoystickButton.java index db0d4c65fc..8d2b20ec84 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/JoystickButton.java +++ b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/buttons/JoystickButton.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/NetworkButton.java b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/buttons/NetworkButton.java similarity index 94% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/NetworkButton.java rename to wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/buttons/NetworkButton.java index 2fa79247bf..3176977c99 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/NetworkButton.java +++ b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/buttons/NetworkButton.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/POVButton.java b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/buttons/POVButton.java similarity index 96% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/POVButton.java rename to wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/buttons/POVButton.java index abf8ca7244..39c891df9b 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/POVButton.java +++ b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/buttons/POVButton.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/Trigger.java b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/buttons/Trigger.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/Trigger.java rename to wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/buttons/Trigger.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/Command.java b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/Command.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/command/Command.java rename to wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/Command.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/CommandGroup.java b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/CommandGroup.java similarity index 99% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/command/CommandGroup.java rename to wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/CommandGroup.java index 53b62eebdc..525e681ae2 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/CommandGroup.java +++ b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/CommandGroup.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/ConditionalCommand.java b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/ConditionalCommand.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/command/ConditionalCommand.java rename to wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/ConditionalCommand.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/IllegalUseOfCommandException.java b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/IllegalUseOfCommandException.java similarity index 95% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/command/IllegalUseOfCommandException.java rename to wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/IllegalUseOfCommandException.java index 59f6e9c369..1053f55bbd 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/IllegalUseOfCommandException.java +++ b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/IllegalUseOfCommandException.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/InstantCommand.java b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/InstantCommand.java similarity index 97% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/command/InstantCommand.java rename to wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/InstantCommand.java index 1f3c5de7a5..f255e485d5 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/InstantCommand.java +++ b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/InstantCommand.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/LinkedListElement.java b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/LinkedListElement.java similarity index 96% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/command/LinkedListElement.java rename to wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/LinkedListElement.java index e717a47cc7..78da002e9b 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/LinkedListElement.java +++ b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/LinkedListElement.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/PIDCommand.java b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/PIDCommand.java similarity index 99% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/command/PIDCommand.java rename to wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/PIDCommand.java index 3d7fd984ed..8b60254682 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/PIDCommand.java +++ b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/PIDCommand.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/PIDSubsystem.java b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/PIDSubsystem.java similarity index 99% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/command/PIDSubsystem.java rename to wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/PIDSubsystem.java index 6465eb1cb2..1f30f38683 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/PIDSubsystem.java +++ b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/PIDSubsystem.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/PrintCommand.java b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/PrintCommand.java similarity index 94% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/command/PrintCommand.java rename to wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/PrintCommand.java index 6199c6d2fc..b8d7fedb45 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/PrintCommand.java +++ b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/PrintCommand.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/Scheduler.java b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/Scheduler.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/command/Scheduler.java rename to wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/Scheduler.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/Set.java b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/Set.java similarity index 94% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/command/Set.java rename to wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/Set.java index 4b05467969..6aac6d7b37 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/Set.java +++ b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/Set.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/StartCommand.java b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/StartCommand.java similarity index 94% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/command/StartCommand.java rename to wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/StartCommand.java index 6dd7db836f..bd8c65859f 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/StartCommand.java +++ b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/StartCommand.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/Subsystem.java b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/Subsystem.java similarity index 100% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/command/Subsystem.java rename to wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/Subsystem.java diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/TimedCommand.java b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/TimedCommand.java similarity index 96% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/command/TimedCommand.java rename to wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/TimedCommand.java index 6c9193b2d1..386bb0e551 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/TimedCommand.java +++ b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/TimedCommand.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/WaitCommand.java b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/WaitCommand.java similarity index 94% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/command/WaitCommand.java rename to wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/WaitCommand.java index 1af7c1fb13..0e1762afd5 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/WaitCommand.java +++ b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/WaitCommand.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/WaitForChildren.java b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/WaitForChildren.java similarity index 94% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/command/WaitForChildren.java rename to wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/WaitForChildren.java index 27795c0a62..118da6a304 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/WaitForChildren.java +++ b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/WaitForChildren.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/WaitUntilCommand.java b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/WaitUntilCommand.java similarity index 93% rename from wpilibj/src/main/java/edu/wpi/first/wpilibj/command/WaitUntilCommand.java rename to wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/WaitUntilCommand.java index 799fa8c601..dadcab5af6 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/WaitUntilCommand.java +++ b/wpilibOldCommands/src/main/java/edu/wpi/first/wpilibj/command/WaitUntilCommand.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/cpp/buttons/Button.cpp b/wpilibOldCommands/src/main/native/cpp/buttons/Button.cpp similarity index 92% rename from wpilibc/src/main/native/cpp/buttons/Button.cpp rename to wpilibOldCommands/src/main/native/cpp/buttons/Button.cpp index 45ede654f3..57c86bdd3e 100644 --- a/wpilibc/src/main/native/cpp/buttons/Button.cpp +++ b/wpilibOldCommands/src/main/native/cpp/buttons/Button.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/cpp/buttons/ButtonScheduler.cpp b/wpilibOldCommands/src/main/native/cpp/buttons/ButtonScheduler.cpp similarity index 92% rename from wpilibc/src/main/native/cpp/buttons/ButtonScheduler.cpp rename to wpilibOldCommands/src/main/native/cpp/buttons/ButtonScheduler.cpp index 1e10255366..f79c487e36 100644 --- a/wpilibc/src/main/native/cpp/buttons/ButtonScheduler.cpp +++ b/wpilibOldCommands/src/main/native/cpp/buttons/ButtonScheduler.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/cpp/buttons/CancelButtonScheduler.cpp b/wpilibOldCommands/src/main/native/cpp/buttons/CancelButtonScheduler.cpp similarity index 93% rename from wpilibc/src/main/native/cpp/buttons/CancelButtonScheduler.cpp rename to wpilibOldCommands/src/main/native/cpp/buttons/CancelButtonScheduler.cpp index 39d1d256c6..b0f4433fd0 100644 --- a/wpilibc/src/main/native/cpp/buttons/CancelButtonScheduler.cpp +++ b/wpilibOldCommands/src/main/native/cpp/buttons/CancelButtonScheduler.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/cpp/buttons/HeldButtonScheduler.cpp b/wpilibOldCommands/src/main/native/cpp/buttons/HeldButtonScheduler.cpp similarity index 93% rename from wpilibc/src/main/native/cpp/buttons/HeldButtonScheduler.cpp rename to wpilibOldCommands/src/main/native/cpp/buttons/HeldButtonScheduler.cpp index feaa3c6927..9abf8bc34e 100644 --- a/wpilibc/src/main/native/cpp/buttons/HeldButtonScheduler.cpp +++ b/wpilibOldCommands/src/main/native/cpp/buttons/HeldButtonScheduler.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/cpp/buttons/InternalButton.cpp b/wpilibOldCommands/src/main/native/cpp/buttons/InternalButton.cpp similarity index 92% rename from wpilibc/src/main/native/cpp/buttons/InternalButton.cpp rename to wpilibOldCommands/src/main/native/cpp/buttons/InternalButton.cpp index cac67c45cc..6ff7971705 100644 --- a/wpilibc/src/main/native/cpp/buttons/InternalButton.cpp +++ b/wpilibOldCommands/src/main/native/cpp/buttons/InternalButton.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/cpp/buttons/JoystickButton.cpp b/wpilibOldCommands/src/main/native/cpp/buttons/JoystickButton.cpp similarity index 91% rename from wpilibc/src/main/native/cpp/buttons/JoystickButton.cpp rename to wpilibOldCommands/src/main/native/cpp/buttons/JoystickButton.cpp index 2c93be2b70..c1d5a2934e 100644 --- a/wpilibc/src/main/native/cpp/buttons/JoystickButton.cpp +++ b/wpilibOldCommands/src/main/native/cpp/buttons/JoystickButton.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/cpp/buttons/NetworkButton.cpp b/wpilibOldCommands/src/main/native/cpp/buttons/NetworkButton.cpp similarity index 94% rename from wpilibc/src/main/native/cpp/buttons/NetworkButton.cpp rename to wpilibOldCommands/src/main/native/cpp/buttons/NetworkButton.cpp index 5e8b1e071c..8bca356062 100644 --- a/wpilibc/src/main/native/cpp/buttons/NetworkButton.cpp +++ b/wpilibOldCommands/src/main/native/cpp/buttons/NetworkButton.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/cpp/buttons/POVButton.cpp b/wpilibOldCommands/src/main/native/cpp/buttons/POVButton.cpp similarity index 91% rename from wpilibc/src/main/native/cpp/buttons/POVButton.cpp rename to wpilibOldCommands/src/main/native/cpp/buttons/POVButton.cpp index 672992306f..73e847a953 100644 --- a/wpilibc/src/main/native/cpp/buttons/POVButton.cpp +++ b/wpilibOldCommands/src/main/native/cpp/buttons/POVButton.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/cpp/buttons/PressedButtonScheduler.cpp b/wpilibOldCommands/src/main/native/cpp/buttons/PressedButtonScheduler.cpp similarity index 93% rename from wpilibc/src/main/native/cpp/buttons/PressedButtonScheduler.cpp rename to wpilibOldCommands/src/main/native/cpp/buttons/PressedButtonScheduler.cpp index a964117ebd..4a470f52b5 100644 --- a/wpilibc/src/main/native/cpp/buttons/PressedButtonScheduler.cpp +++ b/wpilibOldCommands/src/main/native/cpp/buttons/PressedButtonScheduler.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/cpp/buttons/ReleasedButtonScheduler.cpp b/wpilibOldCommands/src/main/native/cpp/buttons/ReleasedButtonScheduler.cpp similarity index 93% rename from wpilibc/src/main/native/cpp/buttons/ReleasedButtonScheduler.cpp rename to wpilibOldCommands/src/main/native/cpp/buttons/ReleasedButtonScheduler.cpp index 6d67004e68..671c13e434 100644 --- a/wpilibc/src/main/native/cpp/buttons/ReleasedButtonScheduler.cpp +++ b/wpilibOldCommands/src/main/native/cpp/buttons/ReleasedButtonScheduler.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/cpp/buttons/ToggleButtonScheduler.cpp b/wpilibOldCommands/src/main/native/cpp/buttons/ToggleButtonScheduler.cpp similarity index 93% rename from wpilibc/src/main/native/cpp/buttons/ToggleButtonScheduler.cpp rename to wpilibOldCommands/src/main/native/cpp/buttons/ToggleButtonScheduler.cpp index b722d45331..cefccb51a4 100644 --- a/wpilibc/src/main/native/cpp/buttons/ToggleButtonScheduler.cpp +++ b/wpilibOldCommands/src/main/native/cpp/buttons/ToggleButtonScheduler.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/cpp/buttons/Trigger.cpp b/wpilibOldCommands/src/main/native/cpp/buttons/Trigger.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/buttons/Trigger.cpp rename to wpilibOldCommands/src/main/native/cpp/buttons/Trigger.cpp diff --git a/wpilibc/src/main/native/cpp/commands/Command.cpp b/wpilibOldCommands/src/main/native/cpp/commands/Command.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/commands/Command.cpp rename to wpilibOldCommands/src/main/native/cpp/commands/Command.cpp diff --git a/wpilibc/src/main/native/cpp/commands/CommandGroup.cpp b/wpilibOldCommands/src/main/native/cpp/commands/CommandGroup.cpp similarity index 99% rename from wpilibc/src/main/native/cpp/commands/CommandGroup.cpp rename to wpilibOldCommands/src/main/native/cpp/commands/CommandGroup.cpp index eac1746517..f64ba67b6b 100644 --- a/wpilibc/src/main/native/cpp/commands/CommandGroup.cpp +++ b/wpilibOldCommands/src/main/native/cpp/commands/CommandGroup.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/cpp/commands/CommandGroupEntry.cpp b/wpilibOldCommands/src/main/native/cpp/commands/CommandGroupEntry.cpp similarity index 93% rename from wpilibc/src/main/native/cpp/commands/CommandGroupEntry.cpp rename to wpilibOldCommands/src/main/native/cpp/commands/CommandGroupEntry.cpp index 7a75f00490..34417438df 100644 --- a/wpilibc/src/main/native/cpp/commands/CommandGroupEntry.cpp +++ b/wpilibOldCommands/src/main/native/cpp/commands/CommandGroupEntry.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/cpp/commands/ConditionalCommand.cpp b/wpilibOldCommands/src/main/native/cpp/commands/ConditionalCommand.cpp similarity index 97% rename from wpilibc/src/main/native/cpp/commands/ConditionalCommand.cpp rename to wpilibOldCommands/src/main/native/cpp/commands/ConditionalCommand.cpp index c44f7ba949..1c75c65f8c 100644 --- a/wpilibc/src/main/native/cpp/commands/ConditionalCommand.cpp +++ b/wpilibOldCommands/src/main/native/cpp/commands/ConditionalCommand.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/cpp/commands/InstantCommand.cpp b/wpilibOldCommands/src/main/native/cpp/commands/InstantCommand.cpp similarity index 95% rename from wpilibc/src/main/native/cpp/commands/InstantCommand.cpp rename to wpilibOldCommands/src/main/native/cpp/commands/InstantCommand.cpp index 88ebfde9cf..445c5e0e6b 100644 --- a/wpilibc/src/main/native/cpp/commands/InstantCommand.cpp +++ b/wpilibOldCommands/src/main/native/cpp/commands/InstantCommand.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/cpp/commands/PIDCommand.cpp b/wpilibOldCommands/src/main/native/cpp/commands/PIDCommand.cpp similarity index 98% rename from wpilibc/src/main/native/cpp/commands/PIDCommand.cpp rename to wpilibOldCommands/src/main/native/cpp/commands/PIDCommand.cpp index 875d8fe28b..90a05f4d9e 100644 --- a/wpilibc/src/main/native/cpp/commands/PIDCommand.cpp +++ b/wpilibOldCommands/src/main/native/cpp/commands/PIDCommand.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/cpp/commands/PIDSubsystem.cpp b/wpilibOldCommands/src/main/native/cpp/commands/PIDSubsystem.cpp similarity index 98% rename from wpilibc/src/main/native/cpp/commands/PIDSubsystem.cpp rename to wpilibOldCommands/src/main/native/cpp/commands/PIDSubsystem.cpp index 0893da3898..4d359437c4 100644 --- a/wpilibc/src/main/native/cpp/commands/PIDSubsystem.cpp +++ b/wpilibOldCommands/src/main/native/cpp/commands/PIDSubsystem.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/cpp/commands/PrintCommand.cpp b/wpilibOldCommands/src/main/native/cpp/commands/PrintCommand.cpp similarity index 91% rename from wpilibc/src/main/native/cpp/commands/PrintCommand.cpp rename to wpilibOldCommands/src/main/native/cpp/commands/PrintCommand.cpp index b4bea248a3..888e8a14d4 100644 --- a/wpilibc/src/main/native/cpp/commands/PrintCommand.cpp +++ b/wpilibOldCommands/src/main/native/cpp/commands/PrintCommand.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/cpp/commands/Scheduler.cpp b/wpilibOldCommands/src/main/native/cpp/commands/Scheduler.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/commands/Scheduler.cpp rename to wpilibOldCommands/src/main/native/cpp/commands/Scheduler.cpp diff --git a/wpilibc/src/main/native/cpp/commands/StartCommand.cpp b/wpilibOldCommands/src/main/native/cpp/commands/StartCommand.cpp similarity index 91% rename from wpilibc/src/main/native/cpp/commands/StartCommand.cpp rename to wpilibOldCommands/src/main/native/cpp/commands/StartCommand.cpp index 8884124083..97ddfb9a22 100644 --- a/wpilibc/src/main/native/cpp/commands/StartCommand.cpp +++ b/wpilibOldCommands/src/main/native/cpp/commands/StartCommand.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/cpp/commands/Subsystem.cpp b/wpilibOldCommands/src/main/native/cpp/commands/Subsystem.cpp similarity index 100% rename from wpilibc/src/main/native/cpp/commands/Subsystem.cpp rename to wpilibOldCommands/src/main/native/cpp/commands/Subsystem.cpp diff --git a/wpilibc/src/main/native/cpp/commands/TimedCommand.cpp b/wpilibOldCommands/src/main/native/cpp/commands/TimedCommand.cpp similarity index 93% rename from wpilibc/src/main/native/cpp/commands/TimedCommand.cpp rename to wpilibOldCommands/src/main/native/cpp/commands/TimedCommand.cpp index 122751a3d3..f5113b2f29 100644 --- a/wpilibc/src/main/native/cpp/commands/TimedCommand.cpp +++ b/wpilibOldCommands/src/main/native/cpp/commands/TimedCommand.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/cpp/commands/WaitCommand.cpp b/wpilibOldCommands/src/main/native/cpp/commands/WaitCommand.cpp similarity index 91% rename from wpilibc/src/main/native/cpp/commands/WaitCommand.cpp rename to wpilibOldCommands/src/main/native/cpp/commands/WaitCommand.cpp index 225d95bb92..d32619340e 100644 --- a/wpilibc/src/main/native/cpp/commands/WaitCommand.cpp +++ b/wpilibOldCommands/src/main/native/cpp/commands/WaitCommand.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/cpp/commands/WaitForChildren.cpp b/wpilibOldCommands/src/main/native/cpp/commands/WaitForChildren.cpp similarity index 92% rename from wpilibc/src/main/native/cpp/commands/WaitForChildren.cpp rename to wpilibOldCommands/src/main/native/cpp/commands/WaitForChildren.cpp index 5c99c1b75d..374c11ceb3 100644 --- a/wpilibc/src/main/native/cpp/commands/WaitForChildren.cpp +++ b/wpilibOldCommands/src/main/native/cpp/commands/WaitForChildren.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/cpp/commands/WaitUntilCommand.cpp b/wpilibOldCommands/src/main/native/cpp/commands/WaitUntilCommand.cpp similarity index 92% rename from wpilibc/src/main/native/cpp/commands/WaitUntilCommand.cpp rename to wpilibOldCommands/src/main/native/cpp/commands/WaitUntilCommand.cpp index 6e24b6b5ad..07ff00b4f2 100644 --- a/wpilibc/src/main/native/cpp/commands/WaitUntilCommand.cpp +++ b/wpilibOldCommands/src/main/native/cpp/commands/WaitUntilCommand.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/include/frc/buttons/Button.h b/wpilibOldCommands/src/main/native/include/frc/buttons/Button.h similarity index 97% rename from wpilibc/src/main/native/include/frc/buttons/Button.h rename to wpilibOldCommands/src/main/native/include/frc/buttons/Button.h index 71641e910f..c0830bfabb 100644 --- a/wpilibc/src/main/native/include/frc/buttons/Button.h +++ b/wpilibOldCommands/src/main/native/include/frc/buttons/Button.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/include/frc/buttons/ButtonScheduler.h b/wpilibOldCommands/src/main/native/include/frc/buttons/ButtonScheduler.h similarity index 93% rename from wpilibc/src/main/native/include/frc/buttons/ButtonScheduler.h rename to wpilibOldCommands/src/main/native/include/frc/buttons/ButtonScheduler.h index ec2e35bc8e..960fbc8e5d 100644 --- a/wpilibc/src/main/native/include/frc/buttons/ButtonScheduler.h +++ b/wpilibOldCommands/src/main/native/include/frc/buttons/ButtonScheduler.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/include/frc/buttons/CancelButtonScheduler.h b/wpilibOldCommands/src/main/native/include/frc/buttons/CancelButtonScheduler.h similarity index 93% rename from wpilibc/src/main/native/include/frc/buttons/CancelButtonScheduler.h rename to wpilibOldCommands/src/main/native/include/frc/buttons/CancelButtonScheduler.h index 69b8a117b2..9131fc0ee8 100644 --- a/wpilibc/src/main/native/include/frc/buttons/CancelButtonScheduler.h +++ b/wpilibOldCommands/src/main/native/include/frc/buttons/CancelButtonScheduler.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/include/frc/buttons/HeldButtonScheduler.h b/wpilibOldCommands/src/main/native/include/frc/buttons/HeldButtonScheduler.h similarity index 93% rename from wpilibc/src/main/native/include/frc/buttons/HeldButtonScheduler.h rename to wpilibOldCommands/src/main/native/include/frc/buttons/HeldButtonScheduler.h index ad4a1607a7..2b51ce6ee4 100644 --- a/wpilibc/src/main/native/include/frc/buttons/HeldButtonScheduler.h +++ b/wpilibOldCommands/src/main/native/include/frc/buttons/HeldButtonScheduler.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/include/frc/buttons/InternalButton.h b/wpilibOldCommands/src/main/native/include/frc/buttons/InternalButton.h similarity index 93% rename from wpilibc/src/main/native/include/frc/buttons/InternalButton.h rename to wpilibOldCommands/src/main/native/include/frc/buttons/InternalButton.h index 430a21e7b1..ed4dc568c4 100644 --- a/wpilibc/src/main/native/include/frc/buttons/InternalButton.h +++ b/wpilibOldCommands/src/main/native/include/frc/buttons/InternalButton.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/include/frc/buttons/JoystickButton.h b/wpilibOldCommands/src/main/native/include/frc/buttons/JoystickButton.h similarity index 93% rename from wpilibc/src/main/native/include/frc/buttons/JoystickButton.h rename to wpilibOldCommands/src/main/native/include/frc/buttons/JoystickButton.h index 1b4264ff43..e0e2d4c059 100644 --- a/wpilibc/src/main/native/include/frc/buttons/JoystickButton.h +++ b/wpilibOldCommands/src/main/native/include/frc/buttons/JoystickButton.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/include/frc/buttons/NetworkButton.h b/wpilibOldCommands/src/main/native/include/frc/buttons/NetworkButton.h similarity index 94% rename from wpilibc/src/main/native/include/frc/buttons/NetworkButton.h rename to wpilibOldCommands/src/main/native/include/frc/buttons/NetworkButton.h index fef8065a55..f16821b501 100644 --- a/wpilibc/src/main/native/include/frc/buttons/NetworkButton.h +++ b/wpilibOldCommands/src/main/native/include/frc/buttons/NetworkButton.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/include/frc/buttons/POVButton.h b/wpilibOldCommands/src/main/native/include/frc/buttons/POVButton.h similarity index 94% rename from wpilibc/src/main/native/include/frc/buttons/POVButton.h rename to wpilibOldCommands/src/main/native/include/frc/buttons/POVButton.h index 15c4bf834a..bd73984b77 100644 --- a/wpilibc/src/main/native/include/frc/buttons/POVButton.h +++ b/wpilibOldCommands/src/main/native/include/frc/buttons/POVButton.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/include/frc/buttons/PressedButtonScheduler.h b/wpilibOldCommands/src/main/native/include/frc/buttons/PressedButtonScheduler.h similarity index 93% rename from wpilibc/src/main/native/include/frc/buttons/PressedButtonScheduler.h rename to wpilibOldCommands/src/main/native/include/frc/buttons/PressedButtonScheduler.h index 0c1fb039e0..29c6a95966 100644 --- a/wpilibc/src/main/native/include/frc/buttons/PressedButtonScheduler.h +++ b/wpilibOldCommands/src/main/native/include/frc/buttons/PressedButtonScheduler.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/include/frc/buttons/ReleasedButtonScheduler.h b/wpilibOldCommands/src/main/native/include/frc/buttons/ReleasedButtonScheduler.h similarity index 93% rename from wpilibc/src/main/native/include/frc/buttons/ReleasedButtonScheduler.h rename to wpilibOldCommands/src/main/native/include/frc/buttons/ReleasedButtonScheduler.h index 899a483a3d..a567a7b68c 100644 --- a/wpilibc/src/main/native/include/frc/buttons/ReleasedButtonScheduler.h +++ b/wpilibOldCommands/src/main/native/include/frc/buttons/ReleasedButtonScheduler.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/include/frc/buttons/ToggleButtonScheduler.h b/wpilibOldCommands/src/main/native/include/frc/buttons/ToggleButtonScheduler.h similarity index 93% rename from wpilibc/src/main/native/include/frc/buttons/ToggleButtonScheduler.h rename to wpilibOldCommands/src/main/native/include/frc/buttons/ToggleButtonScheduler.h index aeb93b37ea..406d131548 100644 --- a/wpilibc/src/main/native/include/frc/buttons/ToggleButtonScheduler.h +++ b/wpilibOldCommands/src/main/native/include/frc/buttons/ToggleButtonScheduler.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/include/frc/buttons/Trigger.h b/wpilibOldCommands/src/main/native/include/frc/buttons/Trigger.h similarity index 100% rename from wpilibc/src/main/native/include/frc/buttons/Trigger.h rename to wpilibOldCommands/src/main/native/include/frc/buttons/Trigger.h diff --git a/wpilibc/src/main/native/include/frc/commands/Command.h b/wpilibOldCommands/src/main/native/include/frc/commands/Command.h similarity index 100% rename from wpilibc/src/main/native/include/frc/commands/Command.h rename to wpilibOldCommands/src/main/native/include/frc/commands/Command.h diff --git a/wpilibc/src/main/native/include/frc/commands/CommandGroup.h b/wpilibOldCommands/src/main/native/include/frc/commands/CommandGroup.h similarity index 98% rename from wpilibc/src/main/native/include/frc/commands/CommandGroup.h rename to wpilibOldCommands/src/main/native/include/frc/commands/CommandGroup.h index 690ae6d05d..0275cb5cdc 100644 --- a/wpilibc/src/main/native/include/frc/commands/CommandGroup.h +++ b/wpilibOldCommands/src/main/native/include/frc/commands/CommandGroup.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/include/frc/commands/CommandGroupEntry.h b/wpilibOldCommands/src/main/native/include/frc/commands/CommandGroupEntry.h similarity index 93% rename from wpilibc/src/main/native/include/frc/commands/CommandGroupEntry.h rename to wpilibOldCommands/src/main/native/include/frc/commands/CommandGroupEntry.h index 2de1e43c6f..d1d2264c2f 100644 --- a/wpilibc/src/main/native/include/frc/commands/CommandGroupEntry.h +++ b/wpilibOldCommands/src/main/native/include/frc/commands/CommandGroupEntry.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/include/frc/commands/ConditionalCommand.h b/wpilibOldCommands/src/main/native/include/frc/commands/ConditionalCommand.h similarity index 100% rename from wpilibc/src/main/native/include/frc/commands/ConditionalCommand.h rename to wpilibOldCommands/src/main/native/include/frc/commands/ConditionalCommand.h diff --git a/wpilibc/src/main/native/include/frc/commands/InstantCommand.h b/wpilibOldCommands/src/main/native/include/frc/commands/InstantCommand.h similarity index 97% rename from wpilibc/src/main/native/include/frc/commands/InstantCommand.h rename to wpilibOldCommands/src/main/native/include/frc/commands/InstantCommand.h index 987dc1875f..3663b7f492 100644 --- a/wpilibc/src/main/native/include/frc/commands/InstantCommand.h +++ b/wpilibOldCommands/src/main/native/include/frc/commands/InstantCommand.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/include/frc/commands/PIDCommand.h b/wpilibOldCommands/src/main/native/include/frc/commands/PIDCommand.h similarity index 97% rename from wpilibc/src/main/native/include/frc/commands/PIDCommand.h rename to wpilibOldCommands/src/main/native/include/frc/commands/PIDCommand.h index 02f17102e1..d00ac9bb6f 100644 --- a/wpilibc/src/main/native/include/frc/commands/PIDCommand.h +++ b/wpilibOldCommands/src/main/native/include/frc/commands/PIDCommand.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/include/frc/commands/PIDSubsystem.h b/wpilibOldCommands/src/main/native/include/frc/commands/PIDSubsystem.h similarity index 99% rename from wpilibc/src/main/native/include/frc/commands/PIDSubsystem.h rename to wpilibOldCommands/src/main/native/include/frc/commands/PIDSubsystem.h index 19654920fa..2afc05bfb9 100644 --- a/wpilibc/src/main/native/include/frc/commands/PIDSubsystem.h +++ b/wpilibOldCommands/src/main/native/include/frc/commands/PIDSubsystem.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/include/frc/commands/PrintCommand.h b/wpilibOldCommands/src/main/native/include/frc/commands/PrintCommand.h similarity index 93% rename from wpilibc/src/main/native/include/frc/commands/PrintCommand.h rename to wpilibOldCommands/src/main/native/include/frc/commands/PrintCommand.h index 13156c9d4d..5e987d359b 100644 --- a/wpilibc/src/main/native/include/frc/commands/PrintCommand.h +++ b/wpilibOldCommands/src/main/native/include/frc/commands/PrintCommand.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/include/frc/commands/Scheduler.h b/wpilibOldCommands/src/main/native/include/frc/commands/Scheduler.h similarity index 100% rename from wpilibc/src/main/native/include/frc/commands/Scheduler.h rename to wpilibOldCommands/src/main/native/include/frc/commands/Scheduler.h diff --git a/wpilibc/src/main/native/include/frc/commands/StartCommand.h b/wpilibOldCommands/src/main/native/include/frc/commands/StartCommand.h similarity index 92% rename from wpilibc/src/main/native/include/frc/commands/StartCommand.h rename to wpilibOldCommands/src/main/native/include/frc/commands/StartCommand.h index 4f0b6767d4..5062f925df 100644 --- a/wpilibc/src/main/native/include/frc/commands/StartCommand.h +++ b/wpilibOldCommands/src/main/native/include/frc/commands/StartCommand.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/include/frc/commands/Subsystem.h b/wpilibOldCommands/src/main/native/include/frc/commands/Subsystem.h similarity index 100% rename from wpilibc/src/main/native/include/frc/commands/Subsystem.h rename to wpilibOldCommands/src/main/native/include/frc/commands/Subsystem.h diff --git a/wpilibc/src/main/native/include/frc/commands/TimedCommand.h b/wpilibOldCommands/src/main/native/include/frc/commands/TimedCommand.h similarity index 96% rename from wpilibc/src/main/native/include/frc/commands/TimedCommand.h rename to wpilibOldCommands/src/main/native/include/frc/commands/TimedCommand.h index d2be010364..16f334898b 100644 --- a/wpilibc/src/main/native/include/frc/commands/TimedCommand.h +++ b/wpilibOldCommands/src/main/native/include/frc/commands/TimedCommand.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/include/frc/commands/WaitCommand.h b/wpilibOldCommands/src/main/native/include/frc/commands/WaitCommand.h similarity index 94% rename from wpilibc/src/main/native/include/frc/commands/WaitCommand.h rename to wpilibOldCommands/src/main/native/include/frc/commands/WaitCommand.h index 481b1c6e08..794b0f7a44 100644 --- a/wpilibc/src/main/native/include/frc/commands/WaitCommand.h +++ b/wpilibOldCommands/src/main/native/include/frc/commands/WaitCommand.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/include/frc/commands/WaitForChildren.h b/wpilibOldCommands/src/main/native/include/frc/commands/WaitForChildren.h similarity index 93% rename from wpilibc/src/main/native/include/frc/commands/WaitForChildren.h rename to wpilibOldCommands/src/main/native/include/frc/commands/WaitForChildren.h index 6f2e285eed..cd1f85aabd 100644 --- a/wpilibc/src/main/native/include/frc/commands/WaitForChildren.h +++ b/wpilibOldCommands/src/main/native/include/frc/commands/WaitForChildren.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/main/native/include/frc/commands/WaitUntilCommand.h b/wpilibOldCommands/src/main/native/include/frc/commands/WaitUntilCommand.h similarity index 94% rename from wpilibc/src/main/native/include/frc/commands/WaitUntilCommand.h rename to wpilibOldCommands/src/main/native/include/frc/commands/WaitUntilCommand.h index 1231750599..b2f1ffe45f 100644 --- a/wpilibc/src/main/native/include/frc/commands/WaitUntilCommand.h +++ b/wpilibOldCommands/src/main/native/include/frc/commands/WaitUntilCommand.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2011-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2011-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/MockHardwareExtension.java b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/MockHardwareExtension.java new file mode 100644 index 0000000000..d97b35237f --- /dev/null +++ b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/MockHardwareExtension.java @@ -0,0 +1,40 @@ +/*----------------------------------------------------------------------------*/ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ +/* Open Source Software - may be modified and shared by FRC teams. The code */ +/* must be accompanied by the FIRST BSD license file in the root directory of */ +/* the project. */ +/*----------------------------------------------------------------------------*/ + +package edu.wpi.first.wpilibj; + +import org.junit.jupiter.api.extension.BeforeAllCallback; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.ExtensionContext.Namespace; + +import edu.wpi.first.hal.HAL; +import edu.wpi.first.hal.sim.DriverStationSim; + +public final class MockHardwareExtension implements BeforeAllCallback { + private static ExtensionContext getRoot(ExtensionContext context) { + return context.getParent().map(MockHardwareExtension::getRoot).orElse(context); + } + + @Override + public void beforeAll(ExtensionContext context) { + getRoot(context).getStore(Namespace.GLOBAL).getOrComputeIfAbsent("HAL Initalized", key -> { + initializeHardware(); + return true; + }, Boolean.class); + } + + private void initializeHardware() { + HAL.initialize(500, 0); + DriverStationSim dsSim = new DriverStationSim(); + dsSim.setDsAttached(true); + dsSim.setAutonomous(false); + dsSim.setEnabled(true); + dsSim.setTest(true); + + + } +} diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/command/AbstractCommandTest.java b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/AbstractCommandTest.java similarity index 96% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/command/AbstractCommandTest.java rename to wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/AbstractCommandTest.java index 1fa9aa89d4..409a74ff94 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/command/AbstractCommandTest.java +++ b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/AbstractCommandTest.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/command/ButtonTest.java b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/ButtonTest.java similarity index 98% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/command/ButtonTest.java rename to wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/ButtonTest.java index 3686c78076..690eade30b 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/command/ButtonTest.java +++ b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/ButtonTest.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/command/CommandParallelGroupTest.java b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/CommandParallelGroupTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/command/CommandParallelGroupTest.java rename to wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/CommandParallelGroupTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/command/CommandScheduleTest.java b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/CommandScheduleTest.java similarity index 97% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/command/CommandScheduleTest.java rename to wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/CommandScheduleTest.java index feb80bcbfa..5711032571 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/command/CommandScheduleTest.java +++ b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/CommandScheduleTest.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/command/CommandSequentialGroupTest.java b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/CommandSequentialGroupTest.java similarity index 100% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/command/CommandSequentialGroupTest.java rename to wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/CommandSequentialGroupTest.java diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/command/CommandSupersedeTest.java b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/CommandSupersedeTest.java similarity index 98% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/command/CommandSupersedeTest.java rename to wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/CommandSupersedeTest.java index 4ba965f838..91ec0def22 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/command/CommandSupersedeTest.java +++ b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/CommandSupersedeTest.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/command/CommandTimeoutTest.java b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/CommandTimeoutTest.java similarity index 95% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/command/CommandTimeoutTest.java rename to wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/CommandTimeoutTest.java index ff7ad86bfc..229742c90e 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/command/CommandTimeoutTest.java +++ b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/CommandTimeoutTest.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/command/ConditionalCommandTest.java b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/ConditionalCommandTest.java similarity index 99% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/command/ConditionalCommandTest.java rename to wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/ConditionalCommandTest.java index 5f3285c0dd..76ec10bbe7 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/command/ConditionalCommandTest.java +++ b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/ConditionalCommandTest.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/command/DefaultCommandTest.java b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/DefaultCommandTest.java similarity index 98% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/command/DefaultCommandTest.java rename to wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/DefaultCommandTest.java index 1cfec7f074..3ec2148611 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/command/DefaultCommandTest.java +++ b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/DefaultCommandTest.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/command/MockCommand.java b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/MockCommand.java similarity index 98% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/command/MockCommand.java rename to wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/MockCommand.java index bee2f80999..82fe3e24a3 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/command/MockCommand.java +++ b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/MockCommand.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/command/MockConditionalCommand.java b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/MockConditionalCommand.java similarity index 97% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/command/MockConditionalCommand.java rename to wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/MockConditionalCommand.java index 876f1c5964..688afa32b0 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/command/MockConditionalCommand.java +++ b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/MockConditionalCommand.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/command/MockSubsystem.java b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/MockSubsystem.java similarity index 90% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/command/MockSubsystem.java rename to wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/MockSubsystem.java index df39cd110e..604df892e0 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/command/MockSubsystem.java +++ b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/command/MockSubsystem.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardTabTest.java b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardTabTest.java similarity index 98% rename from wpilibj/src/test/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardTabTest.java rename to wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardTabTest.java index fe48c130ef..16f088f18d 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardTabTest.java +++ b/wpilibOldCommands/src/test/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardTabTest.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibOldCommands/src/test/native/cpp/main.cpp b/wpilibOldCommands/src/test/native/cpp/main.cpp new file mode 100644 index 0000000000..fd8f022427 --- /dev/null +++ b/wpilibOldCommands/src/test/native/cpp/main.cpp @@ -0,0 +1,17 @@ +/*----------------------------------------------------------------------------*/ +/* Copyright (c) 2015-2019 FIRST. All Rights Reserved. */ +/* Open Source Software - may be modified and shared by FRC teams. The code */ +/* must be accompanied by the FIRST BSD license file in the root directory of */ +/* the project. */ +/*----------------------------------------------------------------------------*/ + +#include + +#include "gtest/gtest.h" + +int main(int argc, char** argv) { + HAL_Initialize(500, 0); + ::testing::InitGoogleTest(&argc, argv); + int ret = RUN_ALL_TESTS(); + return ret; +} diff --git a/wpilibc/src/test/native/cpp/shuffleboard/ShuffleboardTabTest.cpp b/wpilibOldCommands/src/test/native/cpp/shuffleboard/ShuffleboardTabTest.cpp similarity index 98% rename from wpilibc/src/test/native/cpp/shuffleboard/ShuffleboardTabTest.cpp rename to wpilibOldCommands/src/test/native/cpp/shuffleboard/ShuffleboardTabTest.cpp index 23f3e3ac2c..e0e3db063c 100644 --- a/wpilibc/src/test/native/cpp/shuffleboard/ShuffleboardTabTest.cpp +++ b/wpilibOldCommands/src/test/native/cpp/shuffleboard/ShuffleboardTabTest.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ diff --git a/wpilibc/src/test/native/cpp/shuffleboard/ShuffleboardWidgetTest.cpp b/wpilibOldCommands/src/test/native/cpp/shuffleboard/ShuffleboardWidgetTest.cpp similarity index 100% rename from wpilibc/src/test/native/cpp/shuffleboard/ShuffleboardWidgetTest.cpp rename to wpilibOldCommands/src/test/native/cpp/shuffleboard/ShuffleboardWidgetTest.cpp diff --git a/wpilibOldCommands/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/wpilibOldCommands/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension new file mode 100644 index 0000000000..981f17041a --- /dev/null +++ b/wpilibOldCommands/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension @@ -0,0 +1 @@ +edu.wpi.first.wpilibj.MockHardwareExtension diff --git a/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp b/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp index 90dc54b77a..aae18db9a8 100644 --- a/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp +++ b/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp @@ -16,7 +16,6 @@ #include "frc/DriverStation.h" #include "frc/Timer.h" -#include "frc/commands/Scheduler.h" #include "frc/livewindow/LiveWindow.h" #include "frc/shuffleboard/Shuffleboard.h" #include "frc/smartdashboard/SmartDashboard.h" @@ -131,7 +130,6 @@ void IterativeRobotBase::LoopFunc() { TeleopInit(); m_watchdog.AddEpoch("TeleopInit()"); m_lastMode = Mode::kTeleop; - Scheduler::GetInstance()->SetEnabled(true); } HAL_ObserveUserProgramTeleop(); diff --git a/wpilibc/src/main/native/cpp/livewindow/LiveWindow.cpp b/wpilibc/src/main/native/cpp/livewindow/LiveWindow.cpp index 1f011f556e..10996e4ffe 100644 --- a/wpilibc/src/main/native/cpp/livewindow/LiveWindow.cpp +++ b/wpilibc/src/main/native/cpp/livewindow/LiveWindow.cpp @@ -12,7 +12,7 @@ #include #include -#include "frc/commands/Scheduler.h" +#include "frc/smartdashboard/Sendable.h" #include "frc/smartdashboard/SendableBuilderImpl.h" #include "frc/smartdashboard/SendableRegistry.h" @@ -99,19 +99,15 @@ bool LiveWindow::IsEnabled() const { void LiveWindow::SetEnabled(bool enabled) { std::scoped_lock lock(m_impl->mutex); if (m_impl->liveWindowEnabled == enabled) return; - Scheduler* scheduler = Scheduler::GetInstance(); m_impl->startLiveWindow = enabled; m_impl->liveWindowEnabled = enabled; // Force table generation now to make sure everything is defined UpdateValuesUnsafe(); if (enabled) { - scheduler->SetEnabled(false); - scheduler->RemoveAll(); } else { m_impl->registry.ForeachLiveWindow(m_impl->dataHandle, [&](auto& cbdata) { cbdata.builder.StopLiveWindowMode(); }); - scheduler->SetEnabled(true); } m_impl->enabledEntry.SetBoolean(enabled); } diff --git a/wpilibc/src/main/native/include/frc/WPILib.h b/wpilibc/src/main/native/include/frc/WPILib.h index 69fa061f42..d9445002b3 100644 --- a/wpilibc/src/main/native/include/frc/WPILib.h +++ b/wpilibc/src/main/native/include/frc/WPILib.h @@ -90,7 +90,6 @@ #include "frc/commands/PIDCommand.h" #include "frc/commands/PIDSubsystem.h" #include "frc/commands/PrintCommand.h" -#include "frc/commands/Scheduler.h" #include "frc/commands/StartCommand.h" #include "frc/commands/Subsystem.h" #include "frc/commands/WaitCommand.h" diff --git a/wpilibcExamples/build.gradle b/wpilibcExamples/build.gradle index c7f6ecb4a7..6754ad333d 100644 --- a/wpilibcExamples/build.gradle +++ b/wpilibcExamples/build.gradle @@ -67,6 +67,8 @@ model { binary.buildable = false return } + lib project: ':wpilibOldCommands', library: 'wpilibOldCommands', linkage: 'shared' + lib project: ':wpilibNewCommands', library: 'wpilibNewCommands', linkage: 'shared' lib project: ':wpilibc', library: 'wpilibc', linkage: 'shared' lib project: ':ntcore', library: 'ntcore', linkage: 'shared' lib project: ':cscore', library: 'cscore', linkage: 'shared' @@ -92,6 +94,8 @@ model { "${key}"(NativeExecutableSpec) { targetBuildTypes 'debug' binaries.all { binary -> + lib project: ':wpilibOldCommands', library: 'wpilibOldCommands', linkage: 'shared' + lib project: ':wpilibNewCommands', library: 'wpilibNewCommands', linkage: 'shared' lib project: ':wpilibc', library: 'wpilibc', linkage: 'shared' lib project: ':ntcore', library: 'ntcore', linkage: 'shared' lib project: ':cscore', library: 'cscore', linkage: 'shared' @@ -134,6 +138,8 @@ model { "${key}"(NativeExecutableSpec) { targetBuildTypes 'debug' binaries.all { binary -> + lib project: ':wpilibOldCommands', library: 'wpilibOldCommands', linkage: 'shared' + lib project: ':wpilibNewCommands', library: 'wpilibNewCommands', linkage: 'shared' lib project: ':wpilibc', library: 'wpilibc', linkage: 'shared' lib project: ':ntcore', library: 'ntcore', linkage: 'shared' lib project: ':cscore', library: 'cscore', linkage: 'shared' diff --git a/wpilibcIntegrationTests/build.gradle b/wpilibcIntegrationTests/build.gradle index 8a3797b7f5..83bcdebcb0 100644 --- a/wpilibcIntegrationTests/build.gradle +++ b/wpilibcIntegrationTests/build.gradle @@ -52,6 +52,7 @@ model { cppCompiler.args "-Wno-unused-variable" cppCompiler.args "-Wno-error=deprecated-declarations" } + lib project: ':wpilibOldCommands', library: 'wpilibOldCommands', linkage: 'shared' lib project: ':wpilibc', library: 'wpilibc', linkage: 'shared' lib project: ':ntcore', library: 'ntcore', linkage: 'shared' lib project: ':cscore', library: 'cscore', linkage: 'shared' diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/livewindow/LiveWindow.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/livewindow/LiveWindow.java index f545b7d610..5a4fb36e40 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/livewindow/LiveWindow.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/livewindow/LiveWindow.java @@ -11,7 +11,6 @@ import edu.wpi.first.networktables.NetworkTable; import edu.wpi.first.networktables.NetworkTableEntry; import edu.wpi.first.networktables.NetworkTableInstance; import edu.wpi.first.wpilibj.Sendable; -import edu.wpi.first.wpilibj.command.Scheduler; import edu.wpi.first.wpilibj.smartdashboard.SendableRegistry; @@ -64,17 +63,13 @@ public class LiveWindow { startLiveWindow = enabled; liveWindowEnabled = enabled; updateValues(); // Force table generation now to make sure everything is defined - Scheduler scheduler = Scheduler.getInstance(); if (enabled) { System.out.println("Starting live window mode."); - scheduler.disable(); - scheduler.removeAll(); } else { System.out.println("stopping live window mode."); SendableRegistry.foreachLiveWindow(dataHandle, cbdata -> { cbdata.builder.stopLiveWindowMode(); }); - scheduler.enable(); } enabledEntry.setBoolean(enabled); } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SendableChooser.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SendableChooser.java index 57435b437b..cdf1ffb1a1 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SendableChooser.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SendableChooser.java @@ -16,7 +16,6 @@ import java.util.concurrent.locks.ReentrantLock; import edu.wpi.first.networktables.NetworkTableEntry; import edu.wpi.first.wpilibj.Sendable; -import edu.wpi.first.wpilibj.command.Command; import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; @@ -25,7 +24,7 @@ import static edu.wpi.first.wpilibj.util.ErrorMessages.requireNonNullParam; * {@link SmartDashboard}. * *

For instance, you may wish to be able to select between multiple autonomous modes. You can do - * this by putting every possible {@link Command} you want to run as an autonomous into a {@link + * this by putting every possible Command you want to run as an autonomous into a {@link * SendableChooser} and then put it into the {@link SmartDashboard} to have a list of options appear * on the laptop. Once autonomous starts, simply ask the {@link SendableChooser} what the selected * value is. diff --git a/wpilibjExamples/build.gradle b/wpilibjExamples/build.gradle index 846c5bf771..76021e902f 100644 --- a/wpilibjExamples/build.gradle +++ b/wpilibjExamples/build.gradle @@ -18,6 +18,8 @@ dependencies { compile project(':ntcore') compile project(':cscore') compile project(':cameraserver') + compile project(':wpilibOldCommands') + compile project(':wpilibNewCommands') } if (!project.hasProperty('skipPMD')) {