diff --git a/commandsv2/src/main/java/org/wpilib/command2/CommandScheduler.java b/commandsv2/src/main/java/org/wpilib/command2/CommandScheduler.java index d3f8f35a04..c87db7e080 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/CommandScheduler.java +++ b/commandsv2/src/main/java/org/wpilib/command2/CommandScheduler.java @@ -25,10 +25,10 @@ import java.util.function.Consumer; import org.wpilib.command2.Command.InterruptionBehavior; import org.wpilib.driverstation.DriverStation; import org.wpilib.event.EventLoop; +import org.wpilib.framework.RobotBase; +import org.wpilib.framework.RobotState; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.hal.HAL; -import org.wpilib.opmode.RobotBase; -import org.wpilib.opmode.RobotState; -import org.wpilib.opmode.TimedRobot; import org.wpilib.system.Watchdog; import org.wpilib.util.sendable.Sendable; import org.wpilib.util.sendable.SendableBuilder; diff --git a/commandsv2/src/main/native/cpp/frc2/command/CommandScheduler.cpp b/commandsv2/src/main/native/cpp/frc2/command/CommandScheduler.cpp index 7c8ddb7981..348a27d1d0 100644 --- a/commandsv2/src/main/native/cpp/frc2/command/CommandScheduler.cpp +++ b/commandsv2/src/main/native/cpp/frc2/command/CommandScheduler.cpp @@ -12,13 +12,13 @@ #include "wpi/commands2/CommandPtr.hpp" #include "wpi/commands2/Subsystem.hpp" +#include "wpi/framework/RobotBase.hpp" +#include "wpi/framework/RobotState.hpp" +#include "wpi/framework/TimedRobot.hpp" #include "wpi/hal/HALBase.h" #include "wpi/hal/UsageReporting.h" #include "wpi/nt/IntegerArrayTopic.hpp" #include "wpi/nt/StringArrayTopic.hpp" -#include "wpi/opmode/RobotBase.hpp" -#include "wpi/opmode/RobotState.hpp" -#include "wpi/opmode/TimedRobot.hpp" #include "wpi/util/DenseMap.hpp" #include "wpi/util/SmallVector.hpp" #include "wpi/util/sendable/SendableBuilder.hpp" diff --git a/commandsv3/src/main/java/org/wpilib/command3/Scheduler.java b/commandsv3/src/main/java/org/wpilib/command3/Scheduler.java index e0bc788c05..0a86a5508c 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/Scheduler.java +++ b/commandsv3/src/main/java/org/wpilib/command3/Scheduler.java @@ -25,7 +25,7 @@ import org.wpilib.annotation.NoDiscard; import org.wpilib.command3.button.CommandGenericHID; import org.wpilib.command3.proto.SchedulerProto; import org.wpilib.event.EventLoop; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; import org.wpilib.system.RobotController; import org.wpilib.util.ErrorMessages; import org.wpilib.util.protobuf.ProtobufSerializable; diff --git a/developerRobot/src/main/java/frc/robot/Main.java b/developerRobot/src/main/java/frc/robot/Main.java index ab45ce742d..ad61a7d55b 100644 --- a/developerRobot/src/main/java/frc/robot/Main.java +++ b/developerRobot/src/main/java/frc/robot/Main.java @@ -4,7 +4,7 @@ package frc.robot; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; public final class Main { private Main() {} diff --git a/developerRobot/src/main/java/frc/robot/Robot.java b/developerRobot/src/main/java/frc/robot/Robot.java index fc961d9577..71a556969f 100644 --- a/developerRobot/src/main/java/frc/robot/Robot.java +++ b/developerRobot/src/main/java/frc/robot/Robot.java @@ -4,7 +4,7 @@ package frc.robot; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; public class Robot extends TimedRobot { /** diff --git a/developerRobot/src/main/native/cpp/Robot.cpp b/developerRobot/src/main/native/cpp/Robot.cpp index 02be50714f..b8d328bfb7 100644 --- a/developerRobot/src/main/native/cpp/Robot.cpp +++ b/developerRobot/src/main/native/cpp/Robot.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/opmode/TimedRobot.hpp" +#include "wpi/framework/TimedRobot.hpp" class Robot : public wpi::TimedRobot { public: diff --git a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/AnnotationProcessor.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/AnnotationProcessor.java index 6086e5b454..74706b23ad 100644 --- a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/AnnotationProcessor.java +++ b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/AnnotationProcessor.java @@ -385,7 +385,7 @@ public class AnnotationProcessor extends AbstractProcessor { // Used to check for a main robot class var robotBaseClass = - processingEnv.getElementUtils().getTypeElement("org.wpilib.opmode.TimedRobot").asType(); + processingEnv.getElementUtils().getTypeElement("org.wpilib.framework.TimedRobot").asType(); boolean validFields = validateFields(annotatedElements); boolean validMethods = validateMethods(annotatedElements); diff --git a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/EpilogueGenerator.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/EpilogueGenerator.java index 4b96b77316..ed437431bd 100644 --- a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/EpilogueGenerator.java +++ b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/EpilogueGenerator.java @@ -19,8 +19,8 @@ import org.wpilib.epilogue.EpilogueConfiguration; * Generates the {@code Epilogue} file used as the main entry point to logging with Epilogue in a * robot program. {@code Epilogue} has instances of every generated logger class, a {@link * EpilogueConfiguration config} object, and (if the main robot class inherits from {@link - * org.wpilib.opmode.TimedRobot TimedRobot}) a {@code bind()} method to automatically add a periodic - * logging call to the robot. + * org.wpilib.framework.TimedRobot TimedRobot}) a {@code bind()} method to automatically add a + * periodic logging call to the robot. */ public class EpilogueGenerator { private final ProcessingEnvironment m_processingEnv; diff --git a/epilogue-processor/src/test/java/org/wpilib/epilogue/processor/EpilogueGeneratorTest.java b/epilogue-processor/src/test/java/org/wpilib/epilogue/processor/EpilogueGeneratorTest.java index 79c30c596c..4a0395e285 100644 --- a/epilogue-processor/src/test/java/org/wpilib/epilogue/processor/EpilogueGeneratorTest.java +++ b/epilogue-processor/src/test/java/org/wpilib/epilogue/processor/EpilogueGeneratorTest.java @@ -74,7 +74,7 @@ class EpilogueGeneratorTest { package org.wpilib.epilogue; @Logged - class Example extends org.wpilib.opmode.RobotBase { + class Example extends org.wpilib.framework.RobotBase { @Override public void startCompetition() {} @Override @@ -128,7 +128,7 @@ class EpilogueGeneratorTest { package org.wpilib.epilogue; @Logged - class Example extends org.wpilib.opmode.TimedRobot { + class Example extends org.wpilib.framework.TimedRobot { } """; @@ -210,10 +210,10 @@ class EpilogueGeneratorTest { package org.wpilib.epilogue; @Logged - class AlphaBot extends org.wpilib.opmode.TimedRobot { } + class AlphaBot extends org.wpilib.framework.TimedRobot { } @Logged - class BetaBot extends org.wpilib.opmode.TimedRobot { } + class BetaBot extends org.wpilib.framework.TimedRobot { } """; String expected = diff --git a/wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticHub.cpp b/wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticHub.cpp index 2adce3e2b5..1973238acf 100644 --- a/wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticHub.cpp +++ b/wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticHub.cpp @@ -11,13 +11,13 @@ #include +#include "wpi/framework/RobotBase.hpp" #include "wpi/hal/Ports.h" #include "wpi/hal/REVPH.h" #include "wpi/hal/UsageReporting.h" #include "wpi/hardware/pneumatic/Compressor.hpp" #include "wpi/hardware/pneumatic/DoubleSolenoid.hpp" #include "wpi/hardware/pneumatic/Solenoid.hpp" -#include "wpi/opmode/RobotBase.hpp" #include "wpi/system/Errors.hpp" #include "wpi/util/NullDeleter.hpp" #include "wpi/util/SensorUtil.hpp" diff --git a/wpilibc/src/main/native/cpp/opmode/IterativeRobotBase.cpp b/wpilibc/src/main/native/cpp/opmode/IterativeRobotBase.cpp index 06d9a91b80..483f2ae2cd 100644 --- a/wpilibc/src/main/native/cpp/opmode/IterativeRobotBase.cpp +++ b/wpilibc/src/main/native/cpp/opmode/IterativeRobotBase.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/opmode/IterativeRobotBase.hpp" +#include "wpi/framework/IterativeRobotBase.hpp" #include "wpi/driverstation/DSControlWord.hpp" #include "wpi/driverstation/DriverStation.hpp" diff --git a/wpilibc/src/main/native/cpp/opmode/RobotState.cpp b/wpilibc/src/main/native/cpp/opmode/RobotState.cpp index 34543aa78c..55704a6044 100644 --- a/wpilibc/src/main/native/cpp/opmode/RobotState.cpp +++ b/wpilibc/src/main/native/cpp/opmode/RobotState.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/opmode/RobotState.hpp" +#include "wpi/framework/RobotState.hpp" #include "wpi/driverstation/DriverStation.hpp" diff --git a/wpilibc/src/main/native/cpp/opmode/TimedRobot.cpp b/wpilibc/src/main/native/cpp/opmode/TimedRobot.cpp index 74def619f1..7396c795dc 100644 --- a/wpilibc/src/main/native/cpp/opmode/TimedRobot.cpp +++ b/wpilibc/src/main/native/cpp/opmode/TimedRobot.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/opmode/TimedRobot.hpp" +#include "wpi/framework/TimedRobot.hpp" #include diff --git a/wpilibc/src/main/native/cpp/opmode/TimesliceRobot.cpp b/wpilibc/src/main/native/cpp/opmode/TimesliceRobot.cpp index 578b63d55c..48e212c92c 100644 --- a/wpilibc/src/main/native/cpp/opmode/TimesliceRobot.cpp +++ b/wpilibc/src/main/native/cpp/opmode/TimesliceRobot.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/opmode/TimesliceRobot.hpp" +#include "wpi/framework/TimesliceRobot.hpp" #include "wpi/system/Errors.hpp" diff --git a/wpilibc/src/main/native/cpp/system/DataLogManager.cpp b/wpilibc/src/main/native/cpp/system/DataLogManager.cpp index 73a315c038..04aee9c038 100644 --- a/wpilibc/src/main/native/cpp/system/DataLogManager.cpp +++ b/wpilibc/src/main/native/cpp/system/DataLogManager.cpp @@ -16,9 +16,9 @@ #include "wpi/datalog/DataLogBackgroundWriter.hpp" #include "wpi/datalog/FileLogger.hpp" #include "wpi/driverstation/DriverStation.hpp" +#include "wpi/framework/RobotBase.hpp" #include "wpi/hal/UsageReporting.h" #include "wpi/nt/NetworkTableInstance.hpp" -#include "wpi/opmode/RobotBase.hpp" #include "wpi/system/Errors.hpp" #include "wpi/system/Filesystem.hpp" #include "wpi/system/RobotController.hpp" diff --git a/wpilibc/src/main/native/cpp/system/Filesystem.cpp b/wpilibc/src/main/native/cpp/system/Filesystem.cpp index 62c49a6822..7224a6fbca 100644 --- a/wpilibc/src/main/native/cpp/system/Filesystem.cpp +++ b/wpilibc/src/main/native/cpp/system/Filesystem.cpp @@ -6,7 +6,7 @@ #include -#include "wpi/opmode/RobotBase.hpp" +#include "wpi/framework/RobotBase.hpp" #include "wpi/util/fs.hpp" std::string wpi::filesystem::GetLaunchDirectory() { diff --git a/wpilibc/src/main/native/cppcs/RobotBase.cpp b/wpilibc/src/main/native/cppcs/RobotBase.cpp index e1644aad49..c585ddac77 100644 --- a/wpilibc/src/main/native/cppcs/RobotBase.cpp +++ b/wpilibc/src/main/native/cppcs/RobotBase.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/opmode/RobotBase.hpp" +#include "wpi/framework/RobotBase.hpp" #ifdef __FRC_SYSTEMCORE__ #include diff --git a/wpilibc/src/main/native/include/wpi/opmode/IterativeRobotBase.hpp b/wpilibc/src/main/native/include/wpi/framework/IterativeRobotBase.hpp similarity index 99% rename from wpilibc/src/main/native/include/wpi/opmode/IterativeRobotBase.hpp rename to wpilibc/src/main/native/include/wpi/framework/IterativeRobotBase.hpp index ab0fccc86b..726e3b5c54 100644 --- a/wpilibc/src/main/native/include/wpi/opmode/IterativeRobotBase.hpp +++ b/wpilibc/src/main/native/include/wpi/framework/IterativeRobotBase.hpp @@ -4,7 +4,7 @@ #pragma once -#include "wpi/opmode/RobotBase.hpp" +#include "wpi/framework/RobotBase.hpp" #include "wpi/system/Watchdog.hpp" #include "wpi/units/time.hpp" diff --git a/wpilibc/src/main/native/include/wpi/opmode/RobotBase.hpp b/wpilibc/src/main/native/include/wpi/framework/RobotBase.hpp similarity index 100% rename from wpilibc/src/main/native/include/wpi/opmode/RobotBase.hpp rename to wpilibc/src/main/native/include/wpi/framework/RobotBase.hpp diff --git a/wpilibc/src/main/native/include/wpi/opmode/RobotState.hpp b/wpilibc/src/main/native/include/wpi/framework/RobotState.hpp similarity index 100% rename from wpilibc/src/main/native/include/wpi/opmode/RobotState.hpp rename to wpilibc/src/main/native/include/wpi/framework/RobotState.hpp diff --git a/wpilibc/src/main/native/include/wpi/opmode/TimedRobot.hpp b/wpilibc/src/main/native/include/wpi/framework/TimedRobot.hpp similarity index 98% rename from wpilibc/src/main/native/include/wpi/opmode/TimedRobot.hpp rename to wpilibc/src/main/native/include/wpi/framework/TimedRobot.hpp index 80f4ff4312..0a56b6dab3 100644 --- a/wpilibc/src/main/native/include/wpi/opmode/TimedRobot.hpp +++ b/wpilibc/src/main/native/include/wpi/framework/TimedRobot.hpp @@ -9,9 +9,9 @@ #include #include +#include "wpi/framework/IterativeRobotBase.hpp" #include "wpi/hal/Notifier.h" #include "wpi/hal/Types.h" -#include "wpi/opmode/IterativeRobotBase.hpp" #include "wpi/system/RobotController.hpp" #include "wpi/units/frequency.hpp" #include "wpi/units/math.hpp" diff --git a/wpilibc/src/main/native/include/wpi/opmode/TimesliceRobot.hpp b/wpilibc/src/main/native/include/wpi/framework/TimesliceRobot.hpp similarity index 99% rename from wpilibc/src/main/native/include/wpi/opmode/TimesliceRobot.hpp rename to wpilibc/src/main/native/include/wpi/framework/TimesliceRobot.hpp index 3147dffc8d..e68904f5ef 100644 --- a/wpilibc/src/main/native/include/wpi/opmode/TimesliceRobot.hpp +++ b/wpilibc/src/main/native/include/wpi/framework/TimesliceRobot.hpp @@ -6,7 +6,7 @@ #include -#include "wpi/opmode/TimedRobot.hpp" +#include "wpi/framework/TimedRobot.hpp" #include "wpi/units/time.hpp" namespace wpi { diff --git a/wpilibc/src/main/native/include/wpi/simulation/SendableChooserSim.hpp b/wpilibc/src/main/native/include/wpi/simulation/SendableChooserSim.hpp index 82f88cf692..d52cb57c8d 100644 --- a/wpilibc/src/main/native/include/wpi/simulation/SendableChooserSim.hpp +++ b/wpilibc/src/main/native/include/wpi/simulation/SendableChooserSim.hpp @@ -6,9 +6,9 @@ #include +#include "wpi/framework/RobotBase.hpp" #include "wpi/nt/NetworkTableInstance.hpp" #include "wpi/nt/StringTopic.hpp" -#include "wpi/opmode/RobotBase.hpp" namespace wpi::sim { diff --git a/wpilibc/src/main/python/pyproject.toml b/wpilibc/src/main/python/pyproject.toml index 5afae50c79..93e8afac1b 100644 --- a/wpilibc/src/main/python/pyproject.toml +++ b/wpilibc/src/main/python/pyproject.toml @@ -119,7 +119,7 @@ ExpansionHubServo = "wpi/ExpansionHubServo.hpp" Filesystem = "rpy/Filesystem.h" Gamepad = "wpi/driverstation/Gamepad.hpp" I2C = "wpi/hardware/bus/I2C.hpp" -IterativeRobotBase = "wpi/opmode/IterativeRobotBase.hpp" +IterativeRobotBase = "wpi/framework/IterativeRobotBase.hpp" Joystick = "wpi/driverstation/Joystick.hpp" LEDPattern = "wpi/hardware/led/LEDPattern.hpp" MotorSafety = "wpi/hardware/motor/MotorSafety.hpp" @@ -134,9 +134,9 @@ PneumaticsControlModule = "wpi/hardware/pneumatic/PneumaticsControlModule.hpp" PneumaticsModuleType = "wpi/hardware/pneumatic/PneumaticsModuleType.hpp" PowerDistribution = "wpi/hardware/power/PowerDistribution.hpp" Preferences = "wpi/util/Preferences.hpp" -RobotBase = "wpi/opmode/RobotBase.hpp" +RobotBase = "wpi/framework/RobotBase.hpp" RobotController = "wpi/system/RobotController.hpp" -RobotState = "wpi/opmode/RobotState.hpp" +RobotState = "wpi/framework/RobotState.hpp" RuntimeType = "wpi/system/RuntimeType.hpp" SensorUtil = "wpi/util/SensorUtil.hpp" SerialPort = "wpi/hardware/bus/SerialPort.hpp" @@ -145,9 +145,9 @@ Solenoid = "wpi/hardware/pneumatic/Solenoid.hpp" StadiaController = "wpi/driverstation/StadiaController.hpp" SystemServer = "wpi/system/SystemServer.hpp" Threads = "wpi/system/Threads.hpp" -TimedRobot = "wpi/opmode/TimedRobot.hpp" +TimedRobot = "wpi/framework/TimedRobot.hpp" Timer = "wpi/system/Timer.hpp" -TimesliceRobot = "wpi/opmode/TimesliceRobot.hpp" +TimesliceRobot = "wpi/framework/TimesliceRobot.hpp" Tracer = "wpi/system/Tracer.hpp" Watchdog = "wpi/system/Watchdog.hpp" XboxController = "wpi/driverstation/XboxController.hpp" diff --git a/wpilibc/src/test/native/cpp/TimedRobotTest.cpp b/wpilibc/src/test/native/cpp/TimedRobotTest.cpp index 8cf5057ee2..1ccabfc1d3 100644 --- a/wpilibc/src/test/native/cpp/TimedRobotTest.cpp +++ b/wpilibc/src/test/native/cpp/TimedRobotTest.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/opmode/TimedRobot.hpp" // NOLINT(build/include_order) +#include "wpi/framework/TimedRobot.hpp" // NOLINT(build/include_order) #include diff --git a/wpilibc/src/test/native/cpp/TimesliceRobotTest.cpp b/wpilibc/src/test/native/cpp/TimesliceRobotTest.cpp index d9d119245b..cb398044b8 100644 --- a/wpilibc/src/test/native/cpp/TimesliceRobotTest.cpp +++ b/wpilibc/src/test/native/cpp/TimesliceRobotTest.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "wpi/opmode/TimesliceRobot.hpp" // NOLINT(build/include_order) +#include "wpi/framework/TimesliceRobot.hpp" // NOLINT(build/include_order) #include diff --git a/wpilibc/src/test/native/cpp/simulation/DriverStationSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/DriverStationSimTest.cpp index d2f4926602..b49eb86650 100644 --- a/wpilibc/src/test/native/cpp/simulation/DriverStationSimTest.cpp +++ b/wpilibc/src/test/native/cpp/simulation/DriverStationSimTest.cpp @@ -10,7 +10,7 @@ #include "callback_helpers/TestCallbackHelpers.hpp" #include "wpi/driverstation/DriverStation.hpp" #include "wpi/driverstation/Joystick.hpp" -#include "wpi/opmode/RobotState.hpp" +#include "wpi/framework/RobotState.hpp" #include "wpi/simulation/DriverStationSim.hpp" #include "wpi/simulation/SimHooks.hpp" diff --git a/wpilibcExamples/src/main/cpp/examples/AddressableLED/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/AddressableLED/include/Robot.hpp index b97cd31a88..cda057f1ec 100644 --- a/wpilibcExamples/src/main/cpp/examples/AddressableLED/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/examples/AddressableLED/include/Robot.hpp @@ -6,9 +6,9 @@ #include +#include #include #include -#include class Robot : public wpi::TimedRobot { public: diff --git a/wpilibcExamples/src/main/cpp/examples/AprilTagsVision/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/AprilTagsVision/cpp/Robot.cpp index b2b85d7085..00c3914e9f 100644 --- a/wpilibcExamples/src/main/cpp/examples/AprilTagsVision/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/AprilTagsVision/cpp/Robot.cpp @@ -16,10 +16,10 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/wpilibcExamples/src/main/cpp/examples/ArcadeDrive/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/ArcadeDrive/cpp/Robot.cpp index df2fb9690b..723e015c1c 100644 --- a/wpilibcExamples/src/main/cpp/examples/ArcadeDrive/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/ArcadeDrive/cpp/Robot.cpp @@ -4,8 +4,8 @@ #include #include +#include #include -#include /** * This is a demo program showing the use of the DifferentialDrive class. diff --git a/wpilibcExamples/src/main/cpp/examples/ArcadeDriveXboxController/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/ArcadeDriveXboxController/cpp/Robot.cpp index 30bbcd68dc..db86c4523b 100644 --- a/wpilibcExamples/src/main/cpp/examples/ArcadeDriveXboxController/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/ArcadeDriveXboxController/cpp/Robot.cpp @@ -4,8 +4,8 @@ #include #include +#include #include -#include /** * This is a demo program showing the use of the DifferentialDrive class. diff --git a/wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/Robot.hpp index 032fff4033..1b121cc859 100644 --- a/wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/Robot.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include "subsystems/Arm.hpp" diff --git a/wpilibcExamples/src/main/cpp/examples/CANPDP/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/CANPDP/cpp/Robot.cpp index c123b73be9..d724fd364d 100644 --- a/wpilibcExamples/src/main/cpp/examples/CANPDP/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/CANPDP/cpp/Robot.cpp @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. +#include #include -#include #include /** diff --git a/wpilibcExamples/src/main/cpp/examples/DifferentialDriveBot/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/DifferentialDriveBot/cpp/Robot.cpp index 37f366255d..2ca624e32f 100644 --- a/wpilibcExamples/src/main/cpp/examples/DifferentialDriveBot/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/DifferentialDriveBot/cpp/Robot.cpp @@ -3,8 +3,8 @@ // the WPILib BSD license file in the root directory of this project. #include +#include #include -#include #include "Drivetrain.hpp" diff --git a/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/cpp/Robot.cpp index edab8635a6..7fa83dbb9d 100644 --- a/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/cpp/Robot.cpp @@ -3,8 +3,8 @@ // the WPILib BSD license file in the root directory of this project. #include +#include #include -#include #include "Drivetrain.hpp" diff --git a/wpilibcExamples/src/main/cpp/examples/DigitalCommunication/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/DigitalCommunication/include/Robot.hpp index 70c95bffa2..acd34a8d25 100644 --- a/wpilibcExamples/src/main/cpp/examples/DigitalCommunication/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/examples/DigitalCommunication/include/Robot.hpp @@ -6,8 +6,8 @@ #include +#include #include -#include /** * This is a sample program demonstrating how to communicate to a light diff --git a/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/Robot.hpp index b49f882eb4..6fe0087197 100644 --- a/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/Robot.hpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include "RobotContainer.hpp" diff --git a/wpilibcExamples/src/main/cpp/examples/DutyCycleEncoder/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/DutyCycleEncoder/cpp/Robot.cpp index aa23c180cd..83a4b8ba88 100644 --- a/wpilibcExamples/src/main/cpp/examples/DutyCycleEncoder/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/DutyCycleEncoder/cpp/Robot.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. +#include #include #include -#include #include constexpr double fullRange = 1.3; diff --git a/wpilibcExamples/src/main/cpp/examples/DutyCycleInput/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/DutyCycleInput/cpp/Robot.cpp index 0d5345270b..54c2ca74c3 100644 --- a/wpilibcExamples/src/main/cpp/examples/DutyCycleInput/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/DutyCycleInput/cpp/Robot.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. +#include #include #include -#include #include class Robot : public wpi::TimedRobot { diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialProfile/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialProfile/cpp/Robot.cpp index 475e0e7b9d..995f6d6417 100644 --- a/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialProfile/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialProfile/cpp/Robot.cpp @@ -5,9 +5,9 @@ #include #include +#include #include #include -#include #include #include #include diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/Robot.hpp index 34f0c6a84b..0ad8678515 100644 --- a/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/Robot.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include "subsystems/Elevator.hpp" diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorProfiledPID/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/ElevatorProfiledPID/cpp/Robot.cpp index 0b061f7876..5eca546ffc 100644 --- a/wpilibcExamples/src/main/cpp/examples/ElevatorProfiledPID/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/ElevatorProfiledPID/cpp/Robot.cpp @@ -5,12 +5,12 @@ #include #include +#include #include #include #include #include #include -#include #include #include #include diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/Robot.hpp index 1c0ac7a33a..e32864add2 100644 --- a/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/Robot.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include "subsystems/Elevator.hpp" diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorTrapezoidProfile/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/ElevatorTrapezoidProfile/cpp/Robot.cpp index d5586f6026..277a0ef847 100644 --- a/wpilibcExamples/src/main/cpp/examples/ElevatorTrapezoidProfile/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/ElevatorTrapezoidProfile/cpp/Robot.cpp @@ -5,9 +5,9 @@ #include #include +#include #include #include -#include #include #include #include diff --git a/wpilibcExamples/src/main/cpp/examples/Encoder/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/Encoder/cpp/Robot.cpp index 034a9d365d..0db1ffed80 100644 --- a/wpilibcExamples/src/main/cpp/examples/Encoder/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/Encoder/cpp/Robot.cpp @@ -4,8 +4,8 @@ #include +#include #include -#include #include /** diff --git a/wpilibcExamples/src/main/cpp/examples/EventLoop/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/EventLoop/cpp/Robot.cpp index 9f6174e860..c12c6e54ee 100644 --- a/wpilibcExamples/src/main/cpp/examples/EventLoop/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/EventLoop/cpp/Robot.cpp @@ -5,11 +5,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include #include diff --git a/wpilibcExamples/src/main/cpp/examples/FlywheelBangBangController/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/FlywheelBangBangController/cpp/Robot.cpp index feaeea3510..4d72dc6b20 100644 --- a/wpilibcExamples/src/main/cpp/examples/FlywheelBangBangController/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/FlywheelBangBangController/cpp/Robot.cpp @@ -3,12 +3,12 @@ // the WPILib BSD license file in the root directory of this project. #include +#include #include #include #include #include #include -#include #include #include #include diff --git a/wpilibcExamples/src/main/cpp/examples/GettingStarted/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/GettingStarted/cpp/Robot.cpp index af2e9732d8..ee5fa80fd3 100644 --- a/wpilibcExamples/src/main/cpp/examples/GettingStarted/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/GettingStarted/cpp/Robot.cpp @@ -4,8 +4,8 @@ #include #include +#include #include -#include #include class Robot : public wpi::TimedRobot { diff --git a/wpilibcExamples/src/main/cpp/examples/Gyro/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/Gyro/cpp/Robot.cpp index f9404e730e..9a828578aa 100644 --- a/wpilibcExamples/src/main/cpp/examples/Gyro/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/Gyro/cpp/Robot.cpp @@ -6,9 +6,9 @@ #include #include +#include #include #include -#include /** * This is a sample program to demonstrate how to use a gyro sensor to make a diff --git a/wpilibcExamples/src/main/cpp/examples/GyroMecanum/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/GyroMecanum/cpp/Robot.cpp index 03f83320ad..f8b8126e41 100644 --- a/wpilibcExamples/src/main/cpp/examples/GyroMecanum/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/GyroMecanum/cpp/Robot.cpp @@ -4,9 +4,9 @@ #include #include +#include #include #include -#include /** * This is a sample program that uses mecanum drive with a gyro sensor to diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/Robot.hpp index 219b7b9799..46630d3c0c 100644 --- a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/Robot.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include "RobotContainer.hpp" diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/Robot.hpp index 219b7b9799..46630d3c0c 100644 --- a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/Robot.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include "RobotContainer.hpp" diff --git a/wpilibcExamples/src/main/cpp/examples/HidRumble/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/HidRumble/cpp/Robot.cpp index 4b53b75dac..c750742bc4 100644 --- a/wpilibcExamples/src/main/cpp/examples/HidRumble/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/HidRumble/cpp/Robot.cpp @@ -3,7 +3,7 @@ // the WPILib BSD license file in the root directory of this project. #include -#include +#include /** * This is a demo program showing the use of GenericHID's rumble feature. diff --git a/wpilibcExamples/src/main/cpp/examples/HttpCamera/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/HttpCamera/cpp/Robot.cpp index 42fa47bb7e..438e1c7a89 100644 --- a/wpilibcExamples/src/main/cpp/examples/HttpCamera/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/HttpCamera/cpp/Robot.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include /** * This is a demo program showing the use of OpenCV to do vision processing. The diff --git a/wpilibcExamples/src/main/cpp/examples/I2CCommunication/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/I2CCommunication/include/Robot.hpp index 4172a92b82..e7ca252917 100644 --- a/wpilibcExamples/src/main/cpp/examples/I2CCommunication/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/examples/I2CCommunication/include/Robot.hpp @@ -6,8 +6,8 @@ #include +#include #include -#include /** * This is a sample program demonstrating how to communicate to a light diff --git a/wpilibcExamples/src/main/cpp/examples/IntermediateVision/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/IntermediateVision/cpp/Robot.cpp index b32fea2ec3..e9c17c2797 100644 --- a/wpilibcExamples/src/main/cpp/examples/IntermediateVision/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/IntermediateVision/cpp/Robot.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include /** * This is a demo program showing the use of OpenCV to do vision processing. The diff --git a/wpilibcExamples/src/main/cpp/examples/MecanumBot/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/MecanumBot/cpp/Robot.cpp index 3f31658292..735af87274 100644 --- a/wpilibcExamples/src/main/cpp/examples/MecanumBot/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/MecanumBot/cpp/Robot.cpp @@ -3,8 +3,8 @@ // the WPILib BSD license file in the root directory of this project. #include +#include #include -#include #include "Drivetrain.hpp" diff --git a/wpilibcExamples/src/main/cpp/examples/MecanumDrive/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/MecanumDrive/cpp/Robot.cpp index af96d23f33..953478a1b7 100644 --- a/wpilibcExamples/src/main/cpp/examples/MecanumDrive/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/MecanumDrive/cpp/Robot.cpp @@ -4,8 +4,8 @@ #include #include +#include #include -#include /** * This is a demo program showing how to use Mecanum control with the diff --git a/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/cpp/Robot.cpp index 3f31658292..735af87274 100644 --- a/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/cpp/Robot.cpp @@ -3,8 +3,8 @@ // the WPILib BSD license file in the root directory of this project. #include +#include #include -#include #include "Drivetrain.hpp" diff --git a/wpilibcExamples/src/main/cpp/examples/Mechanism2d/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/Mechanism2d/cpp/Robot.cpp index de24e4ead9..f3343f5382 100644 --- a/wpilibcExamples/src/main/cpp/examples/Mechanism2d/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/Mechanism2d/cpp/Robot.cpp @@ -3,10 +3,10 @@ // the WPILib BSD license file in the root directory of this project. #include +#include #include #include #include -#include #include #include #include diff --git a/wpilibcExamples/src/main/cpp/examples/MotorControl/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/MotorControl/cpp/Robot.cpp index 41b020bef5..c2673de1be 100644 --- a/wpilibcExamples/src/main/cpp/examples/MotorControl/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/MotorControl/cpp/Robot.cpp @@ -5,9 +5,9 @@ #include #include +#include #include #include -#include #include /** diff --git a/wpilibcExamples/src/main/cpp/examples/PotentiometerPID/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/PotentiometerPID/include/Robot.hpp index e812187800..c0860024a8 100644 --- a/wpilibcExamples/src/main/cpp/examples/PotentiometerPID/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/examples/PotentiometerPID/include/Robot.hpp @@ -7,10 +7,10 @@ #include #include +#include #include #include #include -#include #include /** diff --git a/wpilibcExamples/src/main/cpp/examples/QuickVision/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/QuickVision/cpp/Robot.cpp index ed816b2323..ad46373e19 100644 --- a/wpilibcExamples/src/main/cpp/examples/QuickVision/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/QuickVision/cpp/Robot.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include /** * Uses the CameraServer class to automatically capture video from a USB webcam diff --git a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/Robot.hpp index eff1a55b71..0cbfa765bb 100644 --- a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/Robot.hpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include "RapidReactCommandBot.hpp" diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/Robot.hpp index ffeab02e6f..c3dae38a53 100644 --- a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/Robot.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include "RobotContainer.hpp" diff --git a/wpilibcExamples/src/main/cpp/examples/SelectCommand/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/SelectCommand/include/Robot.hpp index 219b7b9799..46630d3c0c 100644 --- a/wpilibcExamples/src/main/cpp/examples/SelectCommand/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/examples/SelectCommand/include/Robot.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include "RobotContainer.hpp" diff --git a/wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/cpp/Robot.cpp index 31f8e66dbb..4257503dfe 100644 --- a/wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/cpp/Robot.cpp @@ -3,10 +3,10 @@ // the WPILib BSD license file in the root directory of this project. #include +#include #include #include #include -#include #include #include "Drivetrain.hpp" diff --git a/wpilibcExamples/src/main/cpp/examples/Solenoid/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/Solenoid/include/Robot.hpp index 11ce33e648..7ef191eb18 100644 --- a/wpilibcExamples/src/main/cpp/examples/Solenoid/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/examples/Solenoid/include/Robot.hpp @@ -5,12 +5,12 @@ #pragma once #include +#include #include #include #include #include #include -#include /** * This is a sample program showing the use of the solenoid classes during diff --git a/wpilibcExamples/src/main/cpp/examples/StateSpaceArm/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/StateSpaceArm/cpp/Robot.cpp index 468df2f365..6146c8a04c 100644 --- a/wpilibcExamples/src/main/cpp/examples/StateSpaceArm/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/StateSpaceArm/cpp/Robot.cpp @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -14,7 +15,6 @@ #include #include #include -#include #include #include diff --git a/wpilibcExamples/src/main/cpp/examples/StateSpaceElevator/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/StateSpaceElevator/cpp/Robot.cpp index 82f967afcb..c5049c42e6 100644 --- a/wpilibcExamples/src/main/cpp/examples/StateSpaceElevator/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/StateSpaceElevator/cpp/Robot.cpp @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -14,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/wpilibcExamples/src/main/cpp/examples/StateSpaceFlywheel/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/StateSpaceFlywheel/cpp/Robot.cpp index 6488864667..f3259d704f 100644 --- a/wpilibcExamples/src/main/cpp/examples/StateSpaceFlywheel/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/StateSpaceFlywheel/cpp/Robot.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -14,7 +15,6 @@ #include #include #include -#include #include /** diff --git a/wpilibcExamples/src/main/cpp/examples/StateSpaceFlywheelSysId/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/StateSpaceFlywheelSysId/cpp/Robot.cpp index 1b3169588d..2f9068cbab 100644 --- a/wpilibcExamples/src/main/cpp/examples/StateSpaceFlywheelSysId/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/StateSpaceFlywheelSysId/cpp/Robot.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -14,7 +15,6 @@ #include #include #include -#include /** * This is a sample program to demonstrate how to use a state-space controller diff --git a/wpilibcExamples/src/main/cpp/examples/SwerveBot/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/SwerveBot/cpp/Robot.cpp index c0af9983ae..b0c4ed39d1 100644 --- a/wpilibcExamples/src/main/cpp/examples/SwerveBot/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/SwerveBot/cpp/Robot.cpp @@ -3,9 +3,9 @@ // the WPILib BSD license file in the root directory of this project. #include +#include #include #include -#include #include "Drivetrain.hpp" diff --git a/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/cpp/Robot.cpp index 4cd7a4bf7a..bf5e5a5341 100644 --- a/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/cpp/Robot.cpp @@ -3,8 +3,8 @@ // the WPILib BSD license file in the root directory of this project. #include +#include #include -#include #include "Drivetrain.hpp" diff --git a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/Robot.hpp index 249141697b..a98b7e5887 100644 --- a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/Robot.hpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include "SysIdRoutineBot.hpp" diff --git a/wpilibcExamples/src/main/cpp/examples/TankDrive/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/TankDrive/cpp/Robot.cpp index b1e84a3bda..38b7d2e872 100644 --- a/wpilibcExamples/src/main/cpp/examples/TankDrive/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/TankDrive/cpp/Robot.cpp @@ -4,8 +4,8 @@ #include #include +#include #include -#include /** * This is a demo program showing the use of the DifferentialDrive class. diff --git a/wpilibcExamples/src/main/cpp/examples/TankDriveXboxController/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/TankDriveXboxController/cpp/Robot.cpp index 2b0ee5b9cb..247f932e07 100644 --- a/wpilibcExamples/src/main/cpp/examples/TankDriveXboxController/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/examples/TankDriveXboxController/cpp/Robot.cpp @@ -4,8 +4,8 @@ #include #include +#include #include -#include /** * This is a demo program showing the use of the DifferentialDrive class. diff --git a/wpilibcExamples/src/main/cpp/examples/UnitTest/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/UnitTest/include/Robot.hpp index 3f850ede06..a6fa4017f6 100644 --- a/wpilibcExamples/src/main/cpp/examples/UnitTest/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/examples/UnitTest/include/Robot.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include "Constants.hpp" #include "subsystems/Intake.hpp" diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/Robot.hpp index ffeab02e6f..c3dae38a53 100644 --- a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/Robot.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include "RobotContainer.hpp" diff --git a/wpilibcExamples/src/main/cpp/snippets/ADXLAccelerometers/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/ADXLAccelerometers/cpp/Robot.cpp index 1652500e7e..d0c5846919 100644 --- a/wpilibcExamples/src/main/cpp/snippets/ADXLAccelerometers/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/snippets/ADXLAccelerometers/cpp/Robot.cpp @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. +#include #include #include #include -#include /** * ADXL346, 362 Accelerometer snippets for frc-docs. diff --git a/wpilibcExamples/src/main/cpp/snippets/AccelerometerCollision/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/AccelerometerCollision/cpp/Robot.cpp index 3be3a61869..b2efd41360 100644 --- a/wpilibcExamples/src/main/cpp/snippets/AccelerometerCollision/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/snippets/AccelerometerCollision/cpp/Robot.cpp @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. +#include #include -#include #include #include diff --git a/wpilibcExamples/src/main/cpp/snippets/AccelerometerFilter/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/AccelerometerFilter/cpp/Robot.cpp index f4bc3e688f..87b4c9fcf4 100644 --- a/wpilibcExamples/src/main/cpp/snippets/AccelerometerFilter/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/snippets/AccelerometerFilter/cpp/Robot.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. +#include #include #include -#include #include #include diff --git a/wpilibcExamples/src/main/cpp/snippets/AnalogAccelerometer/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/AnalogAccelerometer/cpp/Robot.cpp index 2c381b457c..86ca00375c 100644 --- a/wpilibcExamples/src/main/cpp/snippets/AnalogAccelerometer/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/snippets/AnalogAccelerometer/cpp/Robot.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. +#include #include #include -#include /** * AnalogAccelerometer snippets for frc-docs. diff --git a/wpilibcExamples/src/main/cpp/snippets/AnalogEncoder/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/AnalogEncoder/cpp/Robot.cpp index adce2d3f2a..9200c95cfb 100644 --- a/wpilibcExamples/src/main/cpp/snippets/AnalogEncoder/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/snippets/AnalogEncoder/cpp/Robot.cpp @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. +#include #include -#include /** * AnalogEncoder snippets for frc-docs. diff --git a/wpilibcExamples/src/main/cpp/snippets/AnalogInput/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/AnalogInput/cpp/Robot.cpp index c5963ea416..60c6d10836 100644 --- a/wpilibcExamples/src/main/cpp/snippets/AnalogInput/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/snippets/AnalogInput/cpp/Robot.cpp @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. +#include #include -#include /** * AnalogInput snippets for frc-docs. diff --git a/wpilibcExamples/src/main/cpp/snippets/AnalogPotentiometer/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/AnalogPotentiometer/cpp/Robot.cpp index 120f51eb7b..993cae8475 100644 --- a/wpilibcExamples/src/main/cpp/snippets/AnalogPotentiometer/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/snippets/AnalogPotentiometer/cpp/Robot.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. +#include #include #include -#include /** * AnalogPotentiometer snippets for frc-docs. diff --git a/wpilibcExamples/src/main/cpp/snippets/DigitalInput/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/DigitalInput/cpp/Robot.cpp index fb5b2ee586..a8455a7c4a 100644 --- a/wpilibcExamples/src/main/cpp/snippets/DigitalInput/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/snippets/DigitalInput/cpp/Robot.cpp @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. +#include #include -#include /** * Digital Input snippets for frc-docs. diff --git a/wpilibcExamples/src/main/cpp/snippets/DutyCycleEncoder/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/DutyCycleEncoder/cpp/Robot.cpp index 43b88b1277..4c4ae48356 100644 --- a/wpilibcExamples/src/main/cpp/snippets/DutyCycleEncoder/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/snippets/DutyCycleEncoder/cpp/Robot.cpp @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. +#include #include -#include /** * DutyCycleEncoder snippets for frc-docs. diff --git a/wpilibcExamples/src/main/cpp/snippets/Encoder/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/Encoder/cpp/Robot.cpp index fc94180e5e..95c82183a9 100644 --- a/wpilibcExamples/src/main/cpp/snippets/Encoder/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/snippets/Encoder/cpp/Robot.cpp @@ -2,8 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. +#include #include -#include #include /** diff --git a/wpilibcExamples/src/main/cpp/snippets/EncoderDrive/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/EncoderDrive/cpp/Robot.cpp index ac3f3f8371..ec577037de 100644 --- a/wpilibcExamples/src/main/cpp/snippets/EncoderDrive/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/snippets/EncoderDrive/cpp/Robot.cpp @@ -3,9 +3,9 @@ // the WPILib BSD license file in the root directory of this project. #include +#include #include #include -#include /** * Encoder drive to distance snippets for frc-docs. diff --git a/wpilibcExamples/src/main/cpp/snippets/EncoderHoming/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/EncoderHoming/cpp/Robot.cpp index 98b53210d1..a6cc986956 100644 --- a/wpilibcExamples/src/main/cpp/snippets/EncoderHoming/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/snippets/EncoderHoming/cpp/Robot.cpp @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. +#include #include #include #include -#include /** * Encoder mechanism homing snippets for frc-docs. diff --git a/wpilibcExamples/src/main/cpp/snippets/LimitSwitch/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/LimitSwitch/cpp/Robot.cpp index f391ca8358..3112580a23 100644 --- a/wpilibcExamples/src/main/cpp/snippets/LimitSwitch/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/snippets/LimitSwitch/cpp/Robot.cpp @@ -3,10 +3,10 @@ // the WPILib BSD license file in the root directory of this project. #include +#include #include #include #include -#include /** * Limit Switch snippets for frc-docs. diff --git a/wpilibcExamples/src/main/cpp/snippets/OnboardIMU/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/OnboardIMU/cpp/Robot.cpp index b6e346f350..efcc03ee1b 100644 --- a/wpilibcExamples/src/main/cpp/snippets/OnboardIMU/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/snippets/OnboardIMU/cpp/Robot.cpp @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. +#include #include #include -#include #include #include diff --git a/wpilibcExamples/src/main/cpp/snippets/ProfiledPIDFeedforward/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/ProfiledPIDFeedforward/cpp/Robot.cpp index c125323fa2..e2853b9278 100644 --- a/wpilibcExamples/src/main/cpp/snippets/ProfiledPIDFeedforward/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/snippets/ProfiledPIDFeedforward/cpp/Robot.cpp @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. +#include #include #include #include #include -#include #include #include #include diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.hpp b/wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.hpp index aa768950ec..42eab89a12 100644 --- a/wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.hpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include "RobotContainer.hpp" diff --git a/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/Robot.hpp b/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/Robot.hpp index 8939b73080..2fe8c786cb 100644 --- a/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/Robot.hpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include "RobotContainer.hpp" diff --git a/wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/include/Robot.hpp b/wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/include/Robot.hpp index d91687bcb4..b8138e8716 100644 --- a/wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/include/Robot.hpp @@ -6,7 +6,7 @@ #include -#include +#include class Robot : public wpi::RobotBase { public: diff --git a/wpilibcExamples/src/main/cpp/templates/timed/include/Robot.hpp b/wpilibcExamples/src/main/cpp/templates/timed/include/Robot.hpp index e034f38868..785eb2845d 100644 --- a/wpilibcExamples/src/main/cpp/templates/timed/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/templates/timed/include/Robot.hpp @@ -6,7 +6,7 @@ #include -#include +#include #include class Robot : public wpi::TimedRobot { diff --git a/wpilibcExamples/src/main/cpp/templates/timedskeleton/include/Robot.hpp b/wpilibcExamples/src/main/cpp/templates/timedskeleton/include/Robot.hpp index aebabcb187..9eb9c8445d 100644 --- a/wpilibcExamples/src/main/cpp/templates/timedskeleton/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/templates/timedskeleton/include/Robot.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include class Robot : public wpi::TimedRobot { public: diff --git a/wpilibcExamples/src/main/cpp/templates/timeslice/include/Robot.hpp b/wpilibcExamples/src/main/cpp/templates/timeslice/include/Robot.hpp index 927297d553..19a5dc63fb 100644 --- a/wpilibcExamples/src/main/cpp/templates/timeslice/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/templates/timeslice/include/Robot.hpp @@ -6,7 +6,7 @@ #include -#include +#include #include class Robot : public wpi::TimesliceRobot { diff --git a/wpilibcExamples/src/main/cpp/templates/timesliceskeleton/include/Robot.hpp b/wpilibcExamples/src/main/cpp/templates/timesliceskeleton/include/Robot.hpp index 8edaad8882..cb86e608c9 100644 --- a/wpilibcExamples/src/main/cpp/templates/timesliceskeleton/include/Robot.hpp +++ b/wpilibcExamples/src/main/cpp/templates/timesliceskeleton/include/Robot.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include class Robot : public wpi::TimesliceRobot { public: diff --git a/wpilibj/src/main/java/org/wpilib/opmode/IterativeRobotBase.java b/wpilibj/src/main/java/org/wpilib/framework/IterativeRobotBase.java similarity index 99% rename from wpilibj/src/main/java/org/wpilib/opmode/IterativeRobotBase.java rename to wpilibj/src/main/java/org/wpilib/framework/IterativeRobotBase.java index 2fddd0295f..009164591b 100644 --- a/wpilibj/src/main/java/org/wpilib/opmode/IterativeRobotBase.java +++ b/wpilibj/src/main/java/org/wpilib/framework/IterativeRobotBase.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.opmode; +package org.wpilib.framework; import org.wpilib.driverstation.DSControlWord; import org.wpilib.driverstation.DriverStation; diff --git a/wpilibj/src/main/java/org/wpilib/opmode/RobotBase.java b/wpilibj/src/main/java/org/wpilib/framework/RobotBase.java similarity index 99% rename from wpilibj/src/main/java/org/wpilib/opmode/RobotBase.java rename to wpilibj/src/main/java/org/wpilib/framework/RobotBase.java index 12191558b0..15bb8a772e 100644 --- a/wpilibj/src/main/java/org/wpilib/opmode/RobotBase.java +++ b/wpilibj/src/main/java/org/wpilib/framework/RobotBase.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.opmode; +package org.wpilib.framework; import java.util.concurrent.locks.ReentrantLock; import java.util.function.Supplier; diff --git a/wpilibj/src/main/java/org/wpilib/opmode/RobotState.java b/wpilibj/src/main/java/org/wpilib/framework/RobotState.java similarity index 98% rename from wpilibj/src/main/java/org/wpilib/opmode/RobotState.java rename to wpilibj/src/main/java/org/wpilib/framework/RobotState.java index 568721af60..e5b389cdf5 100644 --- a/wpilibj/src/main/java/org/wpilib/opmode/RobotState.java +++ b/wpilibj/src/main/java/org/wpilib/framework/RobotState.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.opmode; +package org.wpilib.framework; import org.wpilib.driverstation.DriverStation; diff --git a/wpilibj/src/main/java/org/wpilib/opmode/TimedRobot.java b/wpilibj/src/main/java/org/wpilib/framework/TimedRobot.java similarity index 99% rename from wpilibj/src/main/java/org/wpilib/opmode/TimedRobot.java rename to wpilibj/src/main/java/org/wpilib/framework/TimedRobot.java index ed48876ea5..52d735e4ac 100644 --- a/wpilibj/src/main/java/org/wpilib/opmode/TimedRobot.java +++ b/wpilibj/src/main/java/org/wpilib/framework/TimedRobot.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.opmode; +package org.wpilib.framework; import static org.wpilib.units.Units.Seconds; diff --git a/wpilibj/src/main/java/org/wpilib/opmode/TimesliceRobot.java b/wpilibj/src/main/java/org/wpilib/framework/TimesliceRobot.java similarity index 99% rename from wpilibj/src/main/java/org/wpilib/opmode/TimesliceRobot.java rename to wpilibj/src/main/java/org/wpilib/framework/TimesliceRobot.java index 06d27319a9..3644356972 100644 --- a/wpilibj/src/main/java/org/wpilib/opmode/TimesliceRobot.java +++ b/wpilibj/src/main/java/org/wpilib/framework/TimesliceRobot.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.opmode; +package org.wpilib.framework; /** * TimesliceRobot extends the TimedRobot robot program framework to provide timeslice scheduling of diff --git a/wpilibj/src/main/java/org/wpilib/hardware/motor/MotorSafety.java b/wpilibj/src/main/java/org/wpilib/hardware/motor/MotorSafety.java index 3a89e38b1f..6dc32b3f91 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/motor/MotorSafety.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/motor/MotorSafety.java @@ -7,9 +7,9 @@ package org.wpilib.hardware.motor; import java.util.LinkedHashSet; import java.util.Set; import org.wpilib.driverstation.DriverStation; +import org.wpilib.framework.RobotState; import org.wpilib.hardware.hal.ControlWord; import org.wpilib.hardware.hal.DriverStationJNI; -import org.wpilib.opmode.RobotState; import org.wpilib.system.Timer; import org.wpilib.util.WPIUtilJNI; diff --git a/wpilibj/src/main/java/org/wpilib/simulation/LinearSystemSim.java b/wpilibj/src/main/java/org/wpilib/simulation/LinearSystemSim.java index 457ccbb8d9..43f517b5a9 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/LinearSystemSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/LinearSystemSim.java @@ -14,7 +14,7 @@ import org.wpilib.math.util.StateSpaceUtil; /** * This class helps simulate linear systems. To use this class, do the following in the {@link - * org.wpilib.opmode.IterativeRobotBase#simulationPeriodic} method. + * org.wpilib.framework.IterativeRobotBase#simulationPeriodic} method. * *

Call {@link #setInput(double...)} with the inputs to the system (usually voltage). * diff --git a/wpilibj/src/main/java/org/wpilib/simulation/SendableChooserSim.java b/wpilibj/src/main/java/org/wpilib/simulation/SendableChooserSim.java index ec6017180b..6a9b3c5e8a 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/SendableChooserSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/SendableChooserSim.java @@ -4,9 +4,9 @@ package org.wpilib.simulation; +import org.wpilib.framework.RobotBase; import org.wpilib.networktables.NetworkTableInstance; import org.wpilib.networktables.StringPublisher; -import org.wpilib.opmode.RobotBase; /** Class that facilitates control of a SendableChooser's selected option in simulation. */ public class SendableChooserSim implements AutoCloseable { diff --git a/wpilibj/src/main/java/org/wpilib/system/DataLogManager.java b/wpilibj/src/main/java/org/wpilib/system/DataLogManager.java index cd7f618fc5..21b8b20fbf 100644 --- a/wpilibj/src/main/java/org/wpilib/system/DataLogManager.java +++ b/wpilibj/src/main/java/org/wpilib/system/DataLogManager.java @@ -21,9 +21,9 @@ import org.wpilib.datalog.FileLogger; import org.wpilib.datalog.IntegerLogEntry; import org.wpilib.datalog.StringLogEntry; import org.wpilib.driverstation.DriverStation; +import org.wpilib.framework.RobotBase; import org.wpilib.hardware.hal.HAL; import org.wpilib.networktables.NetworkTableInstance; -import org.wpilib.opmode.RobotBase; import org.wpilib.util.WPIUtilJNI; import org.wpilib.util.concurrent.Event; diff --git a/wpilibj/src/main/java/org/wpilib/system/Filesystem.java b/wpilibj/src/main/java/org/wpilib/system/Filesystem.java index 2167a63ad2..b403fc6147 100644 --- a/wpilibj/src/main/java/org/wpilib/system/Filesystem.java +++ b/wpilibj/src/main/java/org/wpilib/system/Filesystem.java @@ -5,7 +5,7 @@ package org.wpilib.system; import java.io.File; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Class for interacting with the Filesystem, particularly, interacting with FRC-related paths on diff --git a/wpilibj/src/test/java/org/wpilib/opmode/TimedRobotTest.java b/wpilibj/src/test/java/org/wpilib/framework/TimedRobotTest.java similarity index 99% rename from wpilibj/src/test/java/org/wpilib/opmode/TimedRobotTest.java rename to wpilibj/src/test/java/org/wpilib/framework/TimedRobotTest.java index 2ce35023d4..70dda4736d 100644 --- a/wpilibj/src/test/java/org/wpilib/opmode/TimedRobotTest.java +++ b/wpilibj/src/test/java/org/wpilib/framework/TimedRobotTest.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.opmode; +package org.wpilib.framework; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/wpilibj/src/test/java/org/wpilib/opmode/TimesliceRobotTest.java b/wpilibj/src/test/java/org/wpilib/framework/TimesliceRobotTest.java similarity index 99% rename from wpilibj/src/test/java/org/wpilib/opmode/TimesliceRobotTest.java rename to wpilibj/src/test/java/org/wpilib/framework/TimesliceRobotTest.java index 3b81e46340..2d4abf8a6d 100644 --- a/wpilibj/src/test/java/org/wpilib/opmode/TimesliceRobotTest.java +++ b/wpilibj/src/test/java/org/wpilib/framework/TimesliceRobotTest.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.opmode; +package org.wpilib.framework; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/addressableled/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/addressableled/Main.java index 447bfbe92a..acd802fb05 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/addressableled/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/addressableled/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.addressableled; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/addressableled/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/addressableled/Robot.java index 11c74ccf94..18595537d2 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/addressableled/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/addressableled/Robot.java @@ -7,10 +7,10 @@ package org.wpilib.examples.addressableled; import static org.wpilib.units.Units.Meters; import static org.wpilib.units.Units.MetersPerSecond; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.led.AddressableLED; import org.wpilib.hardware.led.AddressableLEDBuffer; import org.wpilib.hardware.led.LEDPattern; -import org.wpilib.opmode.TimedRobot; import org.wpilib.units.measure.Distance; public class Robot extends TimedRobot { diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/apriltagsvision/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/apriltagsvision/Main.java index 9b7212fdf3..81ba89ca97 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/apriltagsvision/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/apriltagsvision/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.apriltagsvision; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/apriltagsvision/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/apriltagsvision/Robot.java index 9067c19959..db10b98dc3 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/apriltagsvision/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/apriltagsvision/Robot.java @@ -9,12 +9,12 @@ import org.opencv.core.Mat; import org.opencv.core.Point; import org.opencv.core.Scalar; import org.opencv.imgproc.Imgproc; +import org.wpilib.framework.TimedRobot; import org.wpilib.math.geometry.Rotation3d; import org.wpilib.math.geometry.Transform3d; import org.wpilib.networktables.IntegerArrayPublisher; import org.wpilib.networktables.NetworkTable; import org.wpilib.networktables.NetworkTableInstance; -import org.wpilib.opmode.TimedRobot; import org.wpilib.vision.apriltag.AprilTagDetection; import org.wpilib.vision.apriltag.AprilTagDetector; import org.wpilib.vision.apriltag.AprilTagPoseEstimator; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrive/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrive/Main.java index fa3edaf586..ba836052ef 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrive/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrive/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.arcadedrive; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrive/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrive/Robot.java index d5e575fc9b..0980086c34 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrive/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrive/Robot.java @@ -6,8 +6,8 @@ package org.wpilib.examples.arcadedrive; import org.wpilib.drive.DifferentialDrive; import org.wpilib.driverstation.Joystick; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.motor.PWMSparkMax; -import org.wpilib.opmode.TimedRobot; import org.wpilib.util.sendable.SendableRegistry; /** diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrivexboxcontroller/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrivexboxcontroller/Main.java index 547b2be178..ca1e146728 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrivexboxcontroller/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrivexboxcontroller/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.arcadedrivexboxcontroller; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrivexboxcontroller/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrivexboxcontroller/Robot.java index 663f198ea7..f8fc513680 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrivexboxcontroller/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrivexboxcontroller/Robot.java @@ -6,8 +6,8 @@ package org.wpilib.examples.arcadedrivexboxcontroller; import org.wpilib.drive.DifferentialDrive; import org.wpilib.driverstation.XboxController; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.motor.PWMSparkMax; -import org.wpilib.opmode.TimedRobot; import org.wpilib.util.sendable.SendableRegistry; /** diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/Main.java index 152acaae60..141aac5d20 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.armsimulation; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/Robot.java index df4a9fd83d..39e2a53db0 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/Robot.java @@ -6,7 +6,7 @@ package org.wpilib.examples.armsimulation; import org.wpilib.driverstation.Joystick; import org.wpilib.examples.armsimulation.subsystems.Arm; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; /** This is a sample program to demonstrate the use of arm simulation with existing code. */ public class Robot extends TimedRobot { diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/canpdp/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/canpdp/Main.java index 3b4d0ae59c..a9f7ec2626 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/canpdp/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/canpdp/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.canpdp; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/canpdp/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/canpdp/Robot.java index 02f7909c9d..04c3beed3b 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/canpdp/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/canpdp/Robot.java @@ -4,8 +4,8 @@ package org.wpilib.examples.canpdp; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.power.PowerDistribution; -import org.wpilib.opmode.TimedRobot; import org.wpilib.smartdashboard.SmartDashboard; /** diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdrivebot/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdrivebot/Main.java index f8561fe710..8fbae2bb95 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdrivebot/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdrivebot/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.differentialdrivebot; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdrivebot/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdrivebot/Robot.java index 9a8f9eea91..f4c73ae0e4 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdrivebot/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdrivebot/Robot.java @@ -5,8 +5,8 @@ package org.wpilib.examples.differentialdrivebot; import org.wpilib.driverstation.XboxController; +import org.wpilib.framework.TimedRobot; import org.wpilib.math.filter.SlewRateLimiter; -import org.wpilib.opmode.TimedRobot; public class Robot extends TimedRobot { private final XboxController m_controller = new XboxController(0); diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/Main.java index bb4442fb7e..fed4caf508 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.differentialdriveposeestimator; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/Robot.java index 06b77c4a01..721a623fb7 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/Robot.java @@ -5,10 +5,10 @@ package org.wpilib.examples.differentialdriveposeestimator; import org.wpilib.driverstation.XboxController; +import org.wpilib.framework.TimedRobot; import org.wpilib.math.filter.SlewRateLimiter; import org.wpilib.networktables.DoubleArrayTopic; import org.wpilib.networktables.NetworkTableInstance; -import org.wpilib.opmode.TimedRobot; public class Robot extends TimedRobot { private final NetworkTableInstance m_inst = NetworkTableInstance.getDefault(); diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/digitalcommunication/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/digitalcommunication/Main.java index 89dbca7a43..bac4a6e3fd 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/digitalcommunication/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/digitalcommunication/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.digitalcommunication; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/digitalcommunication/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/digitalcommunication/Robot.java index 845088479f..5ee78aed8c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/digitalcommunication/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/digitalcommunication/Robot.java @@ -6,8 +6,8 @@ package org.wpilib.examples.digitalcommunication; import java.util.Optional; import org.wpilib.driverstation.DriverStation; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.discrete.DigitalOutput; -import org.wpilib.opmode.TimedRobot; /** * This is a sample program demonstrating how to communicate to a light controller from the robot diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/Main.java index 9c51b21f59..84bc566f64 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.drivedistanceoffboard; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/Robot.java index 43a5bcd1bc..03655e2944 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/Robot.java @@ -6,7 +6,7 @@ package org.wpilib.examples.drivedistanceoffboard; import org.wpilib.command2.Command; import org.wpilib.command2.CommandScheduler; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; /** * The methods in this class are called automatically corresponding to each mode, as described in diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleencoder/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleencoder/Main.java index be3c133e54..662622ae1e 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleencoder/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleencoder/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.dutycycleencoder; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleencoder/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleencoder/Robot.java index c27da7b4f6..e556456d9d 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleencoder/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleencoder/Robot.java @@ -4,9 +4,9 @@ package org.wpilib.examples.dutycycleencoder; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.rotation.DutyCycleEncoder; import org.wpilib.math.util.MathUtil; -import org.wpilib.opmode.TimedRobot; import org.wpilib.smartdashboard.SmartDashboard; /** This example shows how to use a duty cycle encoder for devices such as an arm or elevator. */ diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleinput/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleinput/Main.java index 128d1e18ad..cf67dcec08 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleinput/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleinput/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.dutycycleinput; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleinput/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleinput/Robot.java index 0eeba79884..84a0366bb4 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleinput/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleinput/Robot.java @@ -4,8 +4,8 @@ package org.wpilib.examples.dutycycleinput; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.rotation.DutyCycle; -import org.wpilib.opmode.TimedRobot; import org.wpilib.smartdashboard.SmartDashboard; public class Robot extends TimedRobot { diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialprofile/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialprofile/Main.java index b02bc58e79..a4bb556609 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialprofile/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialprofile/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.elevatorexponentialprofile; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialprofile/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialprofile/Robot.java index aec91cdf96..5127c54d62 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialprofile/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialprofile/Robot.java @@ -5,9 +5,9 @@ package org.wpilib.examples.elevatorexponentialprofile; import org.wpilib.driverstation.Joystick; +import org.wpilib.framework.TimedRobot; import org.wpilib.math.controller.SimpleMotorFeedforward; import org.wpilib.math.trajectory.ExponentialProfile; -import org.wpilib.opmode.TimedRobot; public class Robot extends TimedRobot { private static double kDt = 0.02; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/Main.java index e630d2adc5..ec4a846dec 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.elevatorexponentialsimulation; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/Robot.java index 1730a1bc20..e17ee1dea3 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/Robot.java @@ -6,7 +6,7 @@ package org.wpilib.examples.elevatorexponentialsimulation; import org.wpilib.driverstation.Joystick; import org.wpilib.examples.elevatorexponentialsimulation.subsystems.Elevator; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; /** This is a sample program to demonstrate the use of elevator simulation. */ public class Robot extends TimedRobot { diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorprofiledpid/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorprofiledpid/Main.java index 9f275d35ac..eaf99a6d69 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorprofiledpid/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorprofiledpid/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.elevatorprofiledpid; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorprofiledpid/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorprofiledpid/Robot.java index 9a4b13566d..1dfe05abfa 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorprofiledpid/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorprofiledpid/Robot.java @@ -5,12 +5,12 @@ package org.wpilib.examples.elevatorprofiledpid; import org.wpilib.driverstation.Joystick; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.motor.PWMSparkMax; import org.wpilib.hardware.rotation.Encoder; import org.wpilib.math.controller.ElevatorFeedforward; import org.wpilib.math.controller.ProfiledPIDController; import org.wpilib.math.trajectory.TrapezoidProfile; -import org.wpilib.opmode.TimedRobot; public class Robot extends TimedRobot { private static double kDt = 0.02; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/Main.java index 9d93b12dee..ba31ab6e72 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.elevatorsimulation; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/Robot.java index 6232b8f255..3186cf716a 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/Robot.java @@ -6,7 +6,7 @@ package org.wpilib.examples.elevatorsimulation; import org.wpilib.driverstation.Joystick; import org.wpilib.examples.elevatorsimulation.subsystems.Elevator; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; /** This is a sample program to demonstrate the use of elevator simulation. */ public class Robot extends TimedRobot { diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatortrapezoidprofile/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatortrapezoidprofile/Main.java index 3d7794593b..11cce10256 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatortrapezoidprofile/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatortrapezoidprofile/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.elevatortrapezoidprofile; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatortrapezoidprofile/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatortrapezoidprofile/Robot.java index 94d9b31e24..e13a74f30f 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatortrapezoidprofile/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatortrapezoidprofile/Robot.java @@ -5,9 +5,9 @@ package org.wpilib.examples.elevatortrapezoidprofile; import org.wpilib.driverstation.Joystick; +import org.wpilib.framework.TimedRobot; import org.wpilib.math.controller.SimpleMotorFeedforward; import org.wpilib.math.trajectory.TrapezoidProfile; -import org.wpilib.opmode.TimedRobot; public class Robot extends TimedRobot { private static double kDt = 0.02; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/encoder/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/encoder/Main.java index 18e095cb00..e0eefa0c65 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/encoder/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/encoder/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.encoder; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/encoder/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/encoder/Robot.java index 6a0a045cb1..0bee0754a1 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/encoder/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/encoder/Robot.java @@ -4,9 +4,9 @@ package org.wpilib.examples.encoder; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.discrete.CounterBase; import org.wpilib.hardware.rotation.Encoder; -import org.wpilib.opmode.TimedRobot; import org.wpilib.smartdashboard.SmartDashboard; /** diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/eventloop/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/eventloop/Main.java index b27ad0a914..8a0a90dc19 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/eventloop/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/eventloop/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.eventloop; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/eventloop/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/eventloop/Robot.java index dd5871b1b0..b3a565e89c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/eventloop/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/eventloop/Robot.java @@ -7,11 +7,11 @@ package org.wpilib.examples.eventloop; import org.wpilib.driverstation.Joystick; import org.wpilib.event.BooleanEvent; import org.wpilib.event.EventLoop; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.motor.PWMSparkMax; import org.wpilib.hardware.rotation.Encoder; import org.wpilib.math.controller.PIDController; import org.wpilib.math.controller.SimpleMotorFeedforward; -import org.wpilib.opmode.TimedRobot; public class Robot extends TimedRobot { public static final double SHOT_VELOCITY = 200; // rpm diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/flywheelbangbangcontroller/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/flywheelbangbangcontroller/Main.java index 17aa0eb11c..2bf5bc9d26 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/flywheelbangbangcontroller/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/flywheelbangbangcontroller/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.flywheelbangbangcontroller; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/flywheelbangbangcontroller/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/flywheelbangbangcontroller/Robot.java index f57dccb4fd..32c55a6335 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/flywheelbangbangcontroller/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/flywheelbangbangcontroller/Robot.java @@ -5,6 +5,7 @@ package org.wpilib.examples.flywheelbangbangcontroller; import org.wpilib.driverstation.Joystick; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.motor.PWMSparkMax; import org.wpilib.hardware.rotation.Encoder; import org.wpilib.math.controller.BangBangController; @@ -14,7 +15,6 @@ import org.wpilib.math.system.LinearSystem; import org.wpilib.math.system.plant.DCMotor; import org.wpilib.math.system.plant.LinearSystemId; import org.wpilib.math.util.Units; -import org.wpilib.opmode.TimedRobot; import org.wpilib.simulation.EncoderSim; import org.wpilib.simulation.FlywheelSim; import org.wpilib.smartdashboard.SmartDashboard; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/gettingstarted/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/gettingstarted/Main.java index ade2b88127..ae7538f523 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/gettingstarted/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/gettingstarted/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.gettingstarted; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/gettingstarted/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/gettingstarted/Robot.java index 4a58146d74..e72123b6eb 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/gettingstarted/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/gettingstarted/Robot.java @@ -6,8 +6,8 @@ package org.wpilib.examples.gettingstarted; import org.wpilib.drive.DifferentialDrive; import org.wpilib.driverstation.XboxController; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.motor.PWMSparkMax; -import org.wpilib.opmode.TimedRobot; import org.wpilib.system.Timer; import org.wpilib.util.sendable.SendableRegistry; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/gyro/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/gyro/Main.java index cf5cad7b1a..3776b37465 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/gyro/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/gyro/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.gyro; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/gyro/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/gyro/Robot.java index 4600bba005..ba6f45c085 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/gyro/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/gyro/Robot.java @@ -6,9 +6,9 @@ package org.wpilib.examples.gyro; import org.wpilib.drive.DifferentialDrive; import org.wpilib.driverstation.Joystick; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.imu.OnboardIMU; import org.wpilib.hardware.motor.PWMSparkMax; -import org.wpilib.opmode.TimedRobot; import org.wpilib.util.sendable.SendableRegistry; /** diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/gyromecanum/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/gyromecanum/Main.java index 83f8bd5579..ce0037539c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/gyromecanum/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/gyromecanum/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.gyromecanum; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/gyromecanum/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/gyromecanum/Robot.java index 1accc501ef..3774058b6f 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/gyromecanum/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/gyromecanum/Robot.java @@ -6,9 +6,9 @@ package org.wpilib.examples.gyromecanum; import org.wpilib.drive.MecanumDrive; import org.wpilib.driverstation.Joystick; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.imu.OnboardIMU; import org.wpilib.hardware.motor.PWMSparkMax; -import org.wpilib.opmode.TimedRobot; import org.wpilib.util.sendable.SendableRegistry; /** diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Main.java index 2960407c82..b59dd85e17 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.hatchbotinlined; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Robot.java index 68257d7923..87f3711b11 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Robot.java @@ -7,7 +7,7 @@ package org.wpilib.examples.hatchbotinlined; import org.wpilib.command2.Command; import org.wpilib.command2.CommandScheduler; import org.wpilib.driverstation.DriverStation; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; import org.wpilib.system.DataLogManager; /** diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Main.java index 7073de07ad..185abf2e72 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.hatchbottraditional; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Robot.java index 4a29c080f8..97e9867501 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Robot.java @@ -7,7 +7,7 @@ package org.wpilib.examples.hatchbottraditional; import org.wpilib.command2.Command; import org.wpilib.command2.CommandScheduler; import org.wpilib.driverstation.DriverStation; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; import org.wpilib.system.DataLogManager; /** diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/hidrumble/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hidrumble/Main.java index b4416b981b..f52ad5d3fa 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hidrumble/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hidrumble/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.hidrumble; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/hidrumble/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hidrumble/Robot.java index e1c2fec47b..744d599967 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hidrumble/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hidrumble/Robot.java @@ -6,7 +6,7 @@ package org.wpilib.examples.hidrumble; import org.wpilib.driverstation.GenericHID.RumbleType; import org.wpilib.driverstation.XboxController; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; /** This is a demo program showing the use of GenericHID's rumble feature. */ public class Robot extends TimedRobot { diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/httpcamera/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/httpcamera/Main.java index 87b60de882..a554c6d155 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/httpcamera/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/httpcamera/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.httpcamera; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/httpcamera/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/httpcamera/Robot.java index 80e6f8ed2b..bc3ba0c3cf 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/httpcamera/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/httpcamera/Robot.java @@ -8,7 +8,7 @@ import org.opencv.core.Mat; import org.opencv.core.Point; import org.opencv.core.Scalar; import org.opencv.imgproc.Imgproc; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; import org.wpilib.vision.camera.CvSink; import org.wpilib.vision.camera.CvSource; import org.wpilib.vision.camera.HttpCamera; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/i2ccommunication/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/i2ccommunication/Main.java index d83ce16ab7..a93f868dad 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/i2ccommunication/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/i2ccommunication/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.i2ccommunication; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/i2ccommunication/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/i2ccommunication/Robot.java index 8554c282ef..851c942960 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/i2ccommunication/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/i2ccommunication/Robot.java @@ -6,9 +6,9 @@ package org.wpilib.examples.i2ccommunication; import java.util.Optional; import org.wpilib.driverstation.DriverStation; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.bus.I2C; import org.wpilib.hardware.bus.I2C.Port; -import org.wpilib.opmode.TimedRobot; /** * This is a sample program demonstrating how to communicate to a light controller from the robot diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/intermediatevision/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/intermediatevision/Main.java index 8fa2dc6a04..59e2c4a3ee 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/intermediatevision/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/intermediatevision/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.intermediatevision; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/intermediatevision/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/intermediatevision/Robot.java index b42b278fca..3a6b6b6e02 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/intermediatevision/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/intermediatevision/Robot.java @@ -8,7 +8,7 @@ import org.opencv.core.Mat; import org.opencv.core.Point; import org.opencv.core.Scalar; import org.opencv.imgproc.Imgproc; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; import org.wpilib.vision.camera.CvSink; import org.wpilib.vision.camera.CvSource; import org.wpilib.vision.camera.UsbCamera; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumbot/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumbot/Main.java index bda4bd124f..193f3fb1d8 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumbot/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumbot/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.mecanumbot; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumbot/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumbot/Robot.java index 5adec03450..8ab9e68bcb 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumbot/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumbot/Robot.java @@ -5,8 +5,8 @@ package org.wpilib.examples.mecanumbot; import org.wpilib.driverstation.XboxController; +import org.wpilib.framework.TimedRobot; import org.wpilib.math.filter.SlewRateLimiter; -import org.wpilib.opmode.TimedRobot; public class Robot extends TimedRobot { private final XboxController m_controller = new XboxController(0); diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdrive/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdrive/Main.java index 517ea9dcb0..b8a2276bcf 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdrive/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdrive/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.mecanumdrive; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdrive/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdrive/Robot.java index d10da6c25a..661fa5845e 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdrive/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdrive/Robot.java @@ -6,8 +6,8 @@ package org.wpilib.examples.mecanumdrive; import org.wpilib.drive.MecanumDrive; import org.wpilib.driverstation.Joystick; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.motor.PWMSparkMax; -import org.wpilib.opmode.TimedRobot; import org.wpilib.util.sendable.SendableRegistry; /** This is a demo program showing how to use Mecanum control with the MecanumDrive class. */ diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/Main.java index 1ec708498a..c1489b061b 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.mecanumdriveposeestimator; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/Robot.java index 0779e29e19..09fcae287b 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/Robot.java @@ -5,8 +5,8 @@ package org.wpilib.examples.mecanumdriveposeestimator; import org.wpilib.driverstation.XboxController; +import org.wpilib.framework.TimedRobot; import org.wpilib.math.filter.SlewRateLimiter; -import org.wpilib.opmode.TimedRobot; public class Robot extends TimedRobot { private final XboxController m_controller = new XboxController(0); diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/mechanism2d/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/mechanism2d/Main.java index c4c1ad2203..f8a66a5822 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/mechanism2d/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/mechanism2d/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.mechanism2d; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/mechanism2d/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/mechanism2d/Robot.java index cee73786a2..4368159742 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/mechanism2d/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/mechanism2d/Robot.java @@ -5,10 +5,10 @@ package org.wpilib.examples.mechanism2d; import org.wpilib.driverstation.Joystick; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.motor.PWMSparkMax; import org.wpilib.hardware.rotation.AnalogPotentiometer; import org.wpilib.hardware.rotation.Encoder; -import org.wpilib.opmode.TimedRobot; import org.wpilib.smartdashboard.Mechanism2d; import org.wpilib.smartdashboard.MechanismLigament2d; import org.wpilib.smartdashboard.MechanismRoot2d; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/motorcontrol/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/motorcontrol/Main.java index 7295c8ca62..2093812125 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/motorcontrol/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/motorcontrol/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.motorcontrol; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/motorcontrol/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/motorcontrol/Robot.java index e97223fe13..5b4671eb82 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/motorcontrol/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/motorcontrol/Robot.java @@ -5,9 +5,9 @@ package org.wpilib.examples.motorcontrol; import org.wpilib.driverstation.Joystick; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.motor.PWMSparkMax; import org.wpilib.hardware.rotation.Encoder; -import org.wpilib.opmode.TimedRobot; import org.wpilib.smartdashboard.SmartDashboard; /** diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/potentiometerpid/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/potentiometerpid/Main.java index a0abbdcc6b..db077cd99c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/potentiometerpid/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/potentiometerpid/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.potentiometerpid; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/potentiometerpid/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/potentiometerpid/Robot.java index 701c0c05b1..7395dcb23e 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/potentiometerpid/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/potentiometerpid/Robot.java @@ -5,10 +5,10 @@ package org.wpilib.examples.potentiometerpid; import org.wpilib.driverstation.Joystick; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.motor.PWMSparkMax; import org.wpilib.hardware.rotation.AnalogPotentiometer; import org.wpilib.math.controller.PIDController; -import org.wpilib.opmode.TimedRobot; /** * This is a sample program to demonstrate how to use a soft potentiometer and a PID controller to diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/quickvision/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/quickvision/Main.java index 69c63e0950..e5dc2dbc38 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/quickvision/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/quickvision/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.quickvision; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/quickvision/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/quickvision/Robot.java index 6d1ad099c4..3c2554b97f 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/quickvision/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/quickvision/Robot.java @@ -4,7 +4,7 @@ package org.wpilib.examples.quickvision; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; import org.wpilib.vision.stream.CameraServer; /** diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Main.java index 7cb0fc9078..e1e63bc048 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.rapidreactcommandbot; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Robot.java index d40c39e1a5..94acc47779 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Robot.java @@ -8,7 +8,7 @@ import org.wpilib.command2.Command; import org.wpilib.command2.CommandScheduler; import org.wpilib.epilogue.Epilogue; import org.wpilib.epilogue.Logged; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; import org.wpilib.system.DataLogManager; /** diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Main.java index fc474eb255..b4f98482d5 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.romireference; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Robot.java index cb641b0f6b..1d60fba5b5 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Robot.java @@ -6,7 +6,7 @@ package org.wpilib.examples.romireference; import org.wpilib.command2.Command; import org.wpilib.command2.CommandScheduler; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; /** * The methods in this class are called automatically corresponding to each mode, as described in diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Main.java index da53b02401..842b81d270 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.selectcommand; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Robot.java index 30f94aaa51..f9879dce5e 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Robot.java @@ -6,7 +6,7 @@ package org.wpilib.examples.selectcommand; import org.wpilib.command2.Command; import org.wpilib.command2.CommandScheduler; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; /** * The methods in this class are called automatically corresponding to each mode, as described in diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/simpledifferentialdrivesimulation/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/simpledifferentialdrivesimulation/Main.java index b14477ec2a..c05b29c5ec 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/simpledifferentialdrivesimulation/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/simpledifferentialdrivesimulation/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.simpledifferentialdrivesimulation; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/simpledifferentialdrivesimulation/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/simpledifferentialdrivesimulation/Robot.java index ac8b8e4801..30379ef0f5 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/simpledifferentialdrivesimulation/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/simpledifferentialdrivesimulation/Robot.java @@ -6,6 +6,7 @@ package org.wpilib.examples.simpledifferentialdrivesimulation; import java.util.List; import org.wpilib.driverstation.XboxController; +import org.wpilib.framework.TimedRobot; import org.wpilib.math.controller.LTVUnicycleController; import org.wpilib.math.filter.SlewRateLimiter; import org.wpilib.math.geometry.Pose2d; @@ -14,7 +15,6 @@ import org.wpilib.math.kinematics.ChassisSpeeds; import org.wpilib.math.trajectory.Trajectory; import org.wpilib.math.trajectory.TrajectoryConfig; import org.wpilib.math.trajectory.TrajectoryGenerator; -import org.wpilib.opmode.TimedRobot; import org.wpilib.system.Timer; public class Robot extends TimedRobot { diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/solenoid/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/solenoid/Main.java index 3f156797c0..49b8ac655b 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/solenoid/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/solenoid/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.solenoid; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/solenoid/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/solenoid/Robot.java index 41fccd1671..b1ca9511d4 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/solenoid/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/solenoid/Robot.java @@ -5,11 +5,11 @@ package org.wpilib.examples.solenoid; import org.wpilib.driverstation.Joystick; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.pneumatic.Compressor; import org.wpilib.hardware.pneumatic.DoubleSolenoid; import org.wpilib.hardware.pneumatic.PneumaticsModuleType; import org.wpilib.hardware.pneumatic.Solenoid; -import org.wpilib.opmode.TimedRobot; import org.wpilib.smartdashboard.SmartDashboard; /** diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/statespacearm/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/statespacearm/Main.java index 41b1642863..0d1d9a4265 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/statespacearm/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/statespacearm/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.statespacearm; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/statespacearm/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/statespacearm/Robot.java index 25f3f2114e..a932ee8b8c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/statespacearm/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/statespacearm/Robot.java @@ -5,6 +5,7 @@ package org.wpilib.examples.statespacearm; import org.wpilib.driverstation.Joystick; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.motor.PWMSparkMax; import org.wpilib.hardware.rotation.Encoder; import org.wpilib.math.controller.LinearQuadraticRegulator; @@ -19,7 +20,6 @@ import org.wpilib.math.system.plant.LinearSystemId; import org.wpilib.math.trajectory.TrapezoidProfile; import org.wpilib.math.util.Nat; import org.wpilib.math.util.Units; -import org.wpilib.opmode.TimedRobot; /** * This is a sample program to demonstrate how to use a state-space controller to control an arm. diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceelevator/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceelevator/Main.java index b7e40499e5..7cc51bd97c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceelevator/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceelevator/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.statespaceelevator; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceelevator/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceelevator/Robot.java index f68f758a0f..da96742f21 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceelevator/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceelevator/Robot.java @@ -5,6 +5,7 @@ package org.wpilib.examples.statespaceelevator; import org.wpilib.driverstation.Joystick; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.motor.PWMSparkMax; import org.wpilib.hardware.rotation.Encoder; import org.wpilib.math.controller.LinearQuadraticRegulator; @@ -19,7 +20,6 @@ import org.wpilib.math.system.plant.LinearSystemId; import org.wpilib.math.trajectory.TrapezoidProfile; import org.wpilib.math.util.Nat; import org.wpilib.math.util.Units; -import org.wpilib.opmode.TimedRobot; /** * This is a sample program to demonstrate how to use a state-space controller to control an diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheel/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheel/Main.java index 36979d7cf2..a96f1824db 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheel/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheel/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.statespaceflywheel; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheel/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheel/Robot.java index 727fd7b6a6..01a02729a5 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheel/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheel/Robot.java @@ -5,6 +5,7 @@ package org.wpilib.examples.statespaceflywheel; import org.wpilib.driverstation.Joystick; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.motor.PWMSparkMax; import org.wpilib.hardware.rotation.Encoder; import org.wpilib.math.controller.LinearQuadraticRegulator; @@ -17,7 +18,6 @@ import org.wpilib.math.system.plant.DCMotor; import org.wpilib.math.system.plant.LinearSystemId; import org.wpilib.math.util.Nat; import org.wpilib.math.util.Units; -import org.wpilib.opmode.TimedRobot; /** * This is a sample program to demonstrate how to use a state-space controller to control a diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheelsysid/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheelsysid/Main.java index e0cdd68add..69f042c1c6 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheelsysid/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheelsysid/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.statespaceflywheelsysid; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheelsysid/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheelsysid/Robot.java index c97b6f881d..a54d056aee 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheelsysid/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheelsysid/Robot.java @@ -5,6 +5,7 @@ package org.wpilib.examples.statespaceflywheelsysid; import org.wpilib.driverstation.Joystick; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.motor.PWMSparkMax; import org.wpilib.hardware.rotation.Encoder; import org.wpilib.math.controller.LinearQuadraticRegulator; @@ -16,7 +17,6 @@ import org.wpilib.math.system.LinearSystemLoop; import org.wpilib.math.system.plant.LinearSystemId; import org.wpilib.math.util.Nat; import org.wpilib.math.util.Units; -import org.wpilib.opmode.TimedRobot; /** * This is a sample program to demonstrate how to use a state-space controller to control a diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/Main.java index 77881e765b..50bea52b39 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.swervebot; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/Robot.java index 6fe5f392b0..6668e8abe9 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/Robot.java @@ -5,9 +5,9 @@ package org.wpilib.examples.swervebot; import org.wpilib.driverstation.XboxController; +import org.wpilib.framework.TimedRobot; import org.wpilib.math.filter.SlewRateLimiter; import org.wpilib.math.util.MathUtil; -import org.wpilib.opmode.TimedRobot; public class Robot extends TimedRobot { private final XboxController m_controller = new XboxController(0); diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/Main.java index 24a028a637..6c70620271 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.swervedriveposeestimator; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/Robot.java index dd299e7719..1fb7414eb4 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/Robot.java @@ -5,8 +5,8 @@ package org.wpilib.examples.swervedriveposeestimator; import org.wpilib.driverstation.XboxController; +import org.wpilib.framework.TimedRobot; import org.wpilib.math.filter.SlewRateLimiter; -import org.wpilib.opmode.TimedRobot; public class Robot extends TimedRobot { private final XboxController m_controller = new XboxController(0); diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Main.java index 06d4b23df3..9b6d4a2a83 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.sysidroutine; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Robot.java index 8de2815fbe..d8a481ee67 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Robot.java @@ -6,7 +6,7 @@ package org.wpilib.examples.sysidroutine; import org.wpilib.command2.Command; import org.wpilib.command2.CommandScheduler; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; /** * The methods in this class are called automatically corresponding to each mode, as described in diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrive/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrive/Main.java index cb5c3e763a..082d089f5c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrive/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrive/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.tankdrive; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrive/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrive/Robot.java index d9a872848d..ee2a8a9a7d 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrive/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrive/Robot.java @@ -6,8 +6,8 @@ package org.wpilib.examples.tankdrive; import org.wpilib.drive.DifferentialDrive; import org.wpilib.driverstation.Joystick; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.motor.PWMSparkMax; -import org.wpilib.opmode.TimedRobot; import org.wpilib.util.sendable.SendableRegistry; /** diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrivexboxcontroller/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrivexboxcontroller/Main.java index 984c844a4d..24c2f9efcb 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrivexboxcontroller/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrivexboxcontroller/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.tankdrivexboxcontroller; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrivexboxcontroller/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrivexboxcontroller/Robot.java index 9ab7c79869..63ab1d9258 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrivexboxcontroller/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrivexboxcontroller/Robot.java @@ -6,8 +6,8 @@ package org.wpilib.examples.tankdrivexboxcontroller; import org.wpilib.drive.DifferentialDrive; import org.wpilib.driverstation.XboxController; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.motor.PWMSparkMax; -import org.wpilib.opmode.TimedRobot; import org.wpilib.util.sendable.SendableRegistry; /** diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Main.java index 0e0f57443d..f9ba2c4dc3 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.unittest; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Robot.java index 0696922bf2..877f73f2d3 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Robot.java @@ -7,7 +7,7 @@ package org.wpilib.examples.unittest; import org.wpilib.driverstation.Joystick; import org.wpilib.examples.unittest.Constants.IntakeConstants; import org.wpilib.examples.unittest.subsystems.Intake; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; /** * The methods in this class are called automatically corresponding to each mode, as described in diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Main.java index 457221fb7a..824910e654 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Main.java @@ -4,7 +4,7 @@ package org.wpilib.examples.xrpreference; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Robot.java index 04651bc91c..fe5eebebf0 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Robot.java @@ -6,7 +6,7 @@ package org.wpilib.examples.xrpreference; import org.wpilib.command2.Command; import org.wpilib.command2.CommandScheduler; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; /** * The methods in this class are called automatically corresponding to each mode, as described in diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometercollision/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometercollision/Main.java index 7681fffbd9..40c4cf7aa7 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometercollision/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometercollision/Main.java @@ -4,7 +4,7 @@ package org.wpilib.snippets.accelerometercollision; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometercollision/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometercollision/Robot.java index dfab2fa1d2..399b180493 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometercollision/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometercollision/Robot.java @@ -4,9 +4,9 @@ package org.wpilib.snippets.accelerometercollision; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.imu.OnboardIMU; import org.wpilib.hardware.imu.OnboardIMU.MountOrientation; -import org.wpilib.opmode.TimedRobot; import org.wpilib.smartdashboard.SmartDashboard; /** diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometerfilter/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometerfilter/Main.java index 8b5ac4b12a..0172c847c0 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometerfilter/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometerfilter/Main.java @@ -4,7 +4,7 @@ package org.wpilib.snippets.accelerometerfilter; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometerfilter/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometerfilter/Robot.java index ee6858f242..59d5e2840c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometerfilter/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometerfilter/Robot.java @@ -4,10 +4,10 @@ package org.wpilib.snippets.accelerometerfilter; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.imu.OnboardIMU; import org.wpilib.hardware.imu.OnboardIMU.MountOrientation; import org.wpilib.math.filter.LinearFilter; -import org.wpilib.opmode.TimedRobot; import org.wpilib.smartdashboard.SmartDashboard; /** diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/adxlaccelerometers/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/adxlaccelerometers/Main.java index 26af8398d1..b07286243d 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/adxlaccelerometers/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/adxlaccelerometers/Main.java @@ -4,7 +4,7 @@ package org.wpilib.snippets.adxlaccelerometers; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/adxlaccelerometers/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/adxlaccelerometers/Robot.java index 7c9597c72f..3333d99f86 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/adxlaccelerometers/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/adxlaccelerometers/Robot.java @@ -4,9 +4,9 @@ package org.wpilib.snippets.adxlaccelerometers; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.accelerometer.ADXL345_I2C; import org.wpilib.hardware.bus.I2C; -import org.wpilib.opmode.TimedRobot; /** * ADXL345, 362 Accelerometer snippets for frc-docs. diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/analogaccelerometer/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogaccelerometer/Main.java index a520408e4c..0ec8a0ea66 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/analogaccelerometer/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogaccelerometer/Main.java @@ -4,7 +4,7 @@ package org.wpilib.snippets.analogaccelerometer; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/analogaccelerometer/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogaccelerometer/Robot.java index 2dbed7d781..562e8ed2a6 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/analogaccelerometer/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogaccelerometer/Robot.java @@ -4,8 +4,8 @@ package org.wpilib.snippets.analogaccelerometer; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.accelerometer.AnalogAccelerometer; -import org.wpilib.opmode.TimedRobot; /** * AnalogAccelerometer snippets for frc-docs. diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/analogencoder/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogencoder/Main.java index c4ec1cd01a..5a8291757c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/analogencoder/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogencoder/Main.java @@ -4,7 +4,7 @@ package org.wpilib.snippets.analogencoder; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/analogencoder/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogencoder/Robot.java index e065839bd2..6a549e21b8 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/analogencoder/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogencoder/Robot.java @@ -4,8 +4,8 @@ package org.wpilib.snippets.analogencoder; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.rotation.AnalogEncoder; -import org.wpilib.opmode.TimedRobot; /** * AnalogEncoder snippets for frc-docs. diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/analoginput/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/analoginput/Main.java index aa0a3d3296..203d8ad377 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/analoginput/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/analoginput/Main.java @@ -4,7 +4,7 @@ package org.wpilib.snippets.analoginput; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/analoginput/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/analoginput/Robot.java index 20cc09c639..4538c96222 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/analoginput/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/analoginput/Robot.java @@ -4,8 +4,8 @@ package org.wpilib.snippets.analoginput; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.discrete.AnalogInput; -import org.wpilib.opmode.TimedRobot; /** * AnalogInput snippets for frc-docs. diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/analogpotentiometer/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogpotentiometer/Main.java index 0ecf2e72bf..b22606cf07 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/analogpotentiometer/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogpotentiometer/Main.java @@ -4,7 +4,7 @@ package org.wpilib.snippets.analogpotentiometer; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/analogpotentiometer/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogpotentiometer/Robot.java index 391cdae366..ad187a7df7 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/analogpotentiometer/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogpotentiometer/Robot.java @@ -4,9 +4,9 @@ package org.wpilib.snippets.analogpotentiometer; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.discrete.AnalogInput; import org.wpilib.hardware.rotation.AnalogPotentiometer; -import org.wpilib.opmode.TimedRobot; /** * AnalogPotentiometer snippets for frc-docs. diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/digitalinput/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/digitalinput/Main.java index bb9649c3f3..0669e4cdf5 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/digitalinput/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/digitalinput/Main.java @@ -4,7 +4,7 @@ package org.wpilib.snippets.digitalinput; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/digitalinput/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/digitalinput/Robot.java index db91fc44f4..52d1246e1c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/digitalinput/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/digitalinput/Robot.java @@ -4,8 +4,8 @@ package org.wpilib.snippets.digitalinput; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.discrete.DigitalInput; -import org.wpilib.opmode.TimedRobot; /** * DigitalInput snippets for frc-docs. diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/dutycycleencoder/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/dutycycleencoder/Main.java index b9f5887a42..25f0bcfbe6 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/dutycycleencoder/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/dutycycleencoder/Main.java @@ -4,7 +4,7 @@ package org.wpilib.snippets.dutycycleencoder; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/dutycycleencoder/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/dutycycleencoder/Robot.java index 66884c45d0..de694afcb0 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/dutycycleencoder/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/dutycycleencoder/Robot.java @@ -4,8 +4,8 @@ package org.wpilib.snippets.dutycycleencoder; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.rotation.DutyCycleEncoder; -import org.wpilib.opmode.TimedRobot; /** * DutyCycleEncoder snippets for frc-docs. diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/encoder/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoder/Main.java index bc96c509e6..7504ef5f47 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/encoder/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoder/Main.java @@ -4,7 +4,7 @@ package org.wpilib.snippets.encoder; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/encoder/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoder/Robot.java index 7f33b41c9a..795b7bfe3d 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/encoder/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoder/Robot.java @@ -4,8 +4,8 @@ package org.wpilib.snippets.encoder; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.rotation.Encoder; -import org.wpilib.opmode.TimedRobot; /** * Encoder snippets for frc-docs. diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderdrive/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderdrive/Main.java index 0f7d3ba1f7..9e59d54e67 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderdrive/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderdrive/Main.java @@ -4,7 +4,7 @@ package org.wpilib.snippets.encoderdrive; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderdrive/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderdrive/Robot.java index b2d9bbf325..d5357ed1aa 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderdrive/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderdrive/Robot.java @@ -5,9 +5,9 @@ package org.wpilib.snippets.encoderdrive; import org.wpilib.drive.DifferentialDrive; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.motor.Spark; import org.wpilib.hardware.rotation.Encoder; -import org.wpilib.opmode.TimedRobot; /** * Encoder drive to distance snippets for frc-docs. diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderhoming/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderhoming/Main.java index c991d24e41..4325b6822d 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderhoming/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderhoming/Main.java @@ -4,7 +4,7 @@ package org.wpilib.snippets.encoderhoming; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderhoming/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderhoming/Robot.java index ad2a0eb3ab..74f70f2b5d 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderhoming/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderhoming/Robot.java @@ -4,10 +4,10 @@ package org.wpilib.snippets.encoderhoming; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.discrete.DigitalInput; import org.wpilib.hardware.motor.Spark; import org.wpilib.hardware.rotation.Encoder; -import org.wpilib.opmode.TimedRobot; /** * Encoder mechanism homing snippets for frc-docs. diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/limitswitch/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/limitswitch/Main.java index b379c6afbd..80f18e21f8 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/limitswitch/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/limitswitch/Main.java @@ -4,7 +4,7 @@ package org.wpilib.snippets.limitswitch; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/limitswitch/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/limitswitch/Robot.java index e6d36ab14d..3b9683458f 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/limitswitch/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/limitswitch/Robot.java @@ -5,9 +5,9 @@ package org.wpilib.snippets.limitswitch; import org.wpilib.driverstation.Joystick; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.discrete.DigitalInput; import org.wpilib.hardware.motor.PWMVictorSPX; -import org.wpilib.opmode.TimedRobot; /** * Limit Switch snippets for frc-docs. diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/onboardimu/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/onboardimu/Main.java index ac0bf1250b..7c0b2c79d9 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/onboardimu/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/onboardimu/Main.java @@ -4,7 +4,7 @@ package org.wpilib.snippets.onboardimu; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/onboardimu/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/onboardimu/Robot.java index 07ad66d4af..55641205fc 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/onboardimu/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/onboardimu/Robot.java @@ -4,9 +4,9 @@ package org.wpilib.snippets.onboardimu; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.imu.OnboardIMU; import org.wpilib.hardware.imu.OnboardIMU.MountOrientation; -import org.wpilib.opmode.TimedRobot; /** * on board IMU snippets for frc-docs. diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/profiledpidfeedforward/Main.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/profiledpidfeedforward/Main.java index 95af619f0d..b399211898 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/profiledpidfeedforward/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/profiledpidfeedforward/Main.java @@ -4,7 +4,7 @@ package org.wpilib.snippets.profiledpidfeedforward; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/snippets/profiledpidfeedforward/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/snippets/profiledpidfeedforward/Robot.java index 0d05ac0598..2e0b78c16f 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/profiledpidfeedforward/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/profiledpidfeedforward/Robot.java @@ -4,12 +4,12 @@ package org.wpilib.snippets.profiledpidfeedforward; +import org.wpilib.framework.TimedRobot; import org.wpilib.hardware.motor.PWMSparkMax; import org.wpilib.hardware.rotation.Encoder; import org.wpilib.math.controller.ProfiledPIDController; import org.wpilib.math.controller.SimpleMotorFeedforward; import org.wpilib.math.trajectory.TrapezoidProfile; -import org.wpilib.opmode.TimedRobot; /** * ProfiledPIDController with feedforward snippets for frc-docs. diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Main.java index df61e0d095..cf6ed4f6c6 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Main.java @@ -4,7 +4,7 @@ package org.wpilib.templates.commandbased; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Robot.java index 1683b3d358..c1c507215f 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Robot.java @@ -6,7 +6,7 @@ package org.wpilib.templates.commandbased; import org.wpilib.command2.Command; import org.wpilib.command2.CommandScheduler; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; /** * The methods in this class are called automatically corresponding to each mode, as described in diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/Main.java index 608bb4a3f1..46206467ed 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/Main.java @@ -4,7 +4,7 @@ package org.wpilib.templates.commandbasedskeleton; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; public final class Main { private Main() {} diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/Robot.java index 064d2e0e6c..dcf7b05da0 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/Robot.java @@ -6,7 +6,7 @@ package org.wpilib.templates.commandbasedskeleton; import org.wpilib.command2.Command; import org.wpilib.command2.CommandScheduler; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; public class Robot extends TimedRobot { private Command m_autonomousCommand; diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/educational/EducationalRobot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/educational/EducationalRobot.java index bd6492451e..f23f0c7b77 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/educational/EducationalRobot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/educational/EducationalRobot.java @@ -5,9 +5,9 @@ package org.wpilib.templates.educational; import org.wpilib.driverstation.DriverStation; +import org.wpilib.framework.RobotBase; import org.wpilib.hardware.hal.DriverStationJNI; import org.wpilib.internal.DriverStationModeThread; -import org.wpilib.opmode.RobotBase; import org.wpilib.util.WPIUtilJNI; /** Educational robot base class. */ diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/educational/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/educational/Main.java index 8bc985fd46..005ab473cd 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/educational/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/educational/Main.java @@ -4,7 +4,7 @@ package org.wpilib.templates.educational; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/robotbaseskeleton/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/robotbaseskeleton/Main.java index f9969a2aaf..3f3601828a 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/robotbaseskeleton/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/robotbaseskeleton/Main.java @@ -4,7 +4,7 @@ package org.wpilib.templates.robotbaseskeleton; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/robotbaseskeleton/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/robotbaseskeleton/Robot.java index c861d8cb2c..817f3b9189 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/robotbaseskeleton/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/robotbaseskeleton/Robot.java @@ -5,9 +5,9 @@ package org.wpilib.templates.robotbaseskeleton; import org.wpilib.driverstation.DriverStation; +import org.wpilib.framework.RobotBase; import org.wpilib.hardware.hal.DriverStationJNI; import org.wpilib.internal.DriverStationModeThread; -import org.wpilib.opmode.RobotBase; import org.wpilib.util.WPIUtilJNI; /** diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Main.java index 0a05cedbf3..b06da91ccf 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Main.java @@ -4,7 +4,7 @@ package org.wpilib.templates.romicommandbased; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Robot.java index 3c716a2bd7..8feb90af3c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Robot.java @@ -6,7 +6,7 @@ package org.wpilib.templates.romicommandbased; import org.wpilib.command2.Command; import org.wpilib.command2.CommandScheduler; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; /** * The methods in this class are called automatically corresponding to each mode, as described in diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/EducationalRobot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/EducationalRobot.java index a28de03fa0..e311c2ceb2 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/EducationalRobot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/EducationalRobot.java @@ -5,9 +5,9 @@ package org.wpilib.templates.romieducational; import org.wpilib.driverstation.DriverStation; +import org.wpilib.framework.RobotBase; import org.wpilib.hardware.hal.DriverStationJNI; import org.wpilib.internal.DriverStationModeThread; -import org.wpilib.opmode.RobotBase; import org.wpilib.util.WPIUtilJNI; /** Educational robot base class. */ diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/Main.java index 79f12f01d5..3e816f899b 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/Main.java @@ -4,7 +4,7 @@ package org.wpilib.templates.romieducational; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/romitimed/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romitimed/Main.java index c7c89f7b05..f1c26a697a 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romitimed/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romitimed/Main.java @@ -4,7 +4,7 @@ package org.wpilib.templates.romitimed; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/romitimed/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romitimed/Robot.java index ba8cd30d7d..7654f6cd66 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romitimed/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romitimed/Robot.java @@ -4,7 +4,7 @@ package org.wpilib.templates.romitimed; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; import org.wpilib.smartdashboard.SendableChooser; import org.wpilib.smartdashboard.SmartDashboard; diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/timed/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/timed/Main.java index 4c976aa523..905fa85e2b 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/timed/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/timed/Main.java @@ -4,7 +4,7 @@ package org.wpilib.templates.timed; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/timed/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/timed/Robot.java index ed2e64666a..11c7bb933c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/timed/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/timed/Robot.java @@ -4,7 +4,7 @@ package org.wpilib.templates.timed; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; import org.wpilib.smartdashboard.SendableChooser; import org.wpilib.smartdashboard.SmartDashboard; diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/timedskeleton/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/timedskeleton/Main.java index 59887747b3..d601d4d5f0 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/timedskeleton/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/timedskeleton/Main.java @@ -4,7 +4,7 @@ package org.wpilib.templates.timedskeleton; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/timedskeleton/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/timedskeleton/Robot.java index b0c9adb4c7..e3dbac296e 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/timedskeleton/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/timedskeleton/Robot.java @@ -4,7 +4,7 @@ package org.wpilib.templates.timedskeleton; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; /** * The methods in this class are called automatically corresponding to each mode, as described in diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/timeslice/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/timeslice/Main.java index a3eb1d9234..bb06bc51aa 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/timeslice/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/timeslice/Main.java @@ -4,7 +4,7 @@ package org.wpilib.templates.timeslice; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/timeslice/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/timeslice/Robot.java index 9949d1f355..c1633973f0 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/timeslice/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/timeslice/Robot.java @@ -4,7 +4,7 @@ package org.wpilib.templates.timeslice; -import org.wpilib.opmode.TimesliceRobot; +import org.wpilib.framework.TimesliceRobot; import org.wpilib.smartdashboard.SendableChooser; import org.wpilib.smartdashboard.SmartDashboard; diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/timesliceskeleton/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/timesliceskeleton/Main.java index eb760c8f8a..2fe4110143 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/timesliceskeleton/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/timesliceskeleton/Main.java @@ -4,7 +4,7 @@ package org.wpilib.templates.timesliceskeleton; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/timesliceskeleton/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/timesliceskeleton/Robot.java index 7c34555766..a2bf0fe25e 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/timesliceskeleton/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/timesliceskeleton/Robot.java @@ -4,7 +4,7 @@ package org.wpilib.templates.timesliceskeleton; -import org.wpilib.opmode.TimesliceRobot; +import org.wpilib.framework.TimesliceRobot; /** * The methods in this class are called automatically corresponding to each mode, as described in diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Main.java index 767447b89c..36d2995621 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Main.java @@ -4,7 +4,7 @@ package org.wpilib.templates.xrpcommandbased; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Robot.java index b9b2485e9b..16a2b40904 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Robot.java @@ -6,7 +6,7 @@ package org.wpilib.templates.xrpcommandbased; import org.wpilib.command2.Command; import org.wpilib.command2.CommandScheduler; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; /** * The methods in this class are called automatically corresponding to each mode, as described in diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/EducationalRobot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/EducationalRobot.java index abf8b77cdc..74e168d159 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/EducationalRobot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/EducationalRobot.java @@ -5,9 +5,9 @@ package org.wpilib.templates.xrpeducational; import org.wpilib.driverstation.DriverStation; +import org.wpilib.framework.RobotBase; import org.wpilib.hardware.hal.DriverStationJNI; import org.wpilib.internal.DriverStationModeThread; -import org.wpilib.opmode.RobotBase; import org.wpilib.util.WPIUtilJNI; /** Educational robot base class. */ diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/Main.java index 466037c548..5163f56954 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/Main.java @@ -4,7 +4,7 @@ package org.wpilib.templates.xrpeducational; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/xrptimed/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrptimed/Main.java index d6ef3ec01c..53ec8680f0 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrptimed/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrptimed/Main.java @@ -4,7 +4,7 @@ package org.wpilib.templates.xrptimed; -import org.wpilib.opmode.RobotBase; +import org.wpilib.framework.RobotBase; /** * Do NOT add any static variables to this class, or any initialization at all. Unless you know what diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/xrptimed/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrptimed/Robot.java index 60b2885556..c2d957f3b1 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrptimed/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrptimed/Robot.java @@ -4,7 +4,7 @@ package org.wpilib.templates.xrptimed; -import org.wpilib.opmode.TimedRobot; +import org.wpilib.framework.TimedRobot; import org.wpilib.smartdashboard.SendableChooser; import org.wpilib.smartdashboard.SmartDashboard;