From f0a3c641212b29a9a1ca6bf3d77e1c6e74e64776 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Fri, 7 Nov 2025 19:55:43 -0500 Subject: [PATCH] SCRIPT Run java package replacements --- apriltag/CMakeLists.txt | 4 +- .../org/wpilib/vision/apriltag/DevMain.java | 2 +- .../org/wpilib/vision/apriltag/AprilTag.java | 8 +- .../vision/apriltag/AprilTagDetection.java | 10 +- .../vision/apriltag/AprilTagDetector.java | 4 +- .../vision/apriltag/AprilTagFieldLayout.java | 8 +- .../vision/apriltag/AprilTagFields.java | 4 +- .../vision/apriltag/AprilTagPoseEstimate.java | 4 +- .../apriltag/AprilTagPoseEstimator.java | 6 +- .../vision/apriltag/jni/AprilTagJNI.java | 14 +- .../src/main/native/cpp/jni/AprilTagJNI.cpp | 90 +-- .../vision/apriltag/AprilTagDetectorTest.java | 8 +- .../apriltag/AprilTagGenerationTest.java | 4 +- .../apriltag/AprilTagPoseSetOriginTest.java | 10 +- .../apriltag/AprilTagSerializationTest.java | 8 +- .../vision/apriltag/LoadConfigTest.java | 8 +- benchmark/src/main/java/frc/robot/Main.java | 6 +- .../src/main/java/edu/wpi/Main.java | 6 +- .../org/wpilib/vision/stream/DevMain.java | 2 +- .../wpilib/vision/process/VisionPipeline.java | 2 +- .../wpilib/vision/process/VisionRunner.java | 8 +- .../wpilib/vision/process/VisionThread.java | 4 +- .../wpilib/vision/process/package-info.java | 12 +- .../wpilib/vision/stream/CameraServer.java | 46 +- .../vision/stream/CameraServerShared.java | 2 +- .../stream/CameraServerSharedStore.java | 2 +- .../java/org/wpilib/commands2/DevMain.java | 8 +- .../generate/main/java/commandhid.java.jinja | 8 +- .../command2/button/CommandPS4Controller.java | 8 +- .../command2/button/CommandPS5Controller.java | 8 +- .../button/CommandStadiaController.java | 8 +- .../button/CommandXboxController.java | 8 +- .../java/org/wpilib/command2/Command.java | 16 +- .../org/wpilib/command2/CommandScheduler.java | 30 +- .../java/org/wpilib/command2/Commands.java | 6 +- .../wpilib/command2/ConditionalCommand.java | 6 +- .../org/wpilib/command2/DeferredCommand.java | 6 +- .../wpilib/command2/FunctionalCommand.java | 4 +- .../org/wpilib/command2/InstantCommand.java | 2 +- .../org/wpilib/command2/NotifierCommand.java | 4 +- .../wpilib/command2/ParallelCommandGroup.java | 2 +- .../command2/ParallelDeadlineGroup.java | 4 +- .../wpilib/command2/ParallelRaceGroup.java | 2 +- .../org/wpilib/command2/PrintCommand.java | 2 +- .../org/wpilib/command2/ProxyCommand.java | 6 +- .../org/wpilib/command2/RepeatCommand.java | 6 +- .../java/org/wpilib/command2/RunCommand.java | 2 +- .../org/wpilib/command2/ScheduleCommand.java | 2 +- .../org/wpilib/command2/SelectCommand.java | 6 +- .../command2/SequentialCommandGroup.java | 4 +- .../org/wpilib/command2/StartEndCommand.java | 4 +- .../java/org/wpilib/command2/Subsystem.java | 4 +- .../org/wpilib/command2/SubsystemBase.java | 8 +- .../java/org/wpilib/command2/WaitCommand.java | 12 +- .../org/wpilib/command2/WaitUntilCommand.java | 6 +- .../org/wpilib/command2/WrapperCommand.java | 2 +- .../command2/button/CommandGamepad.java | 8 +- .../command2/button/CommandGenericHID.java | 12 +- .../command2/button/CommandJoystick.java | 8 +- .../command2/button/InternalButton.java | 2 +- .../command2/button/JoystickButton.java | 6 +- .../wpilib/command2/button/NetworkButton.java | 12 +- .../org/wpilib/command2/button/POVButton.java | 8 +- .../command2/button/RobotModeTriggers.java | 4 +- .../org/wpilib/command2/button/Trigger.java | 16 +- .../wpilib/command2/sysid/SysIdRoutine.java | 24 +- .../org/wpilib/MockHardwareExtension.java | 6 +- .../wpilib/command2/CommandDecoratorTest.java | 6 +- .../command2/CommandRequirementsTest.java | 2 +- .../wpilib/command2/CommandScheduleTest.java | 6 +- .../wpilib/command2/CommandSchedulerTest.java | 2 +- .../command2/CommandSendableButtonTest.java | 8 +- .../org/wpilib/command2/CommandTestBase.java | 8 +- .../command2/ConditionalCommandTest.java | 4 +- .../wpilib/command2/DefaultCommandTest.java | 2 +- .../wpilib/command2/DeferredCommandTest.java | 2 +- .../command2/FunctionalCommandTest.java | 2 +- .../wpilib/command2/InstantCommandTest.java | 2 +- .../command2/MultiCompositionTestBase.java | 4 +- .../wpilib/command2/NotifierCommandTest.java | 6 +- .../command2/ParallelCommandGroupTest.java | 2 +- .../command2/ParallelDeadlineGroupTest.java | 2 +- .../command2/ParallelRaceGroupTest.java | 2 +- .../org/wpilib/command2/PrintCommandTest.java | 2 +- .../org/wpilib/command2/ProxyCommandTest.java | 2 +- .../wpilib/command2/RepeatCommandTest.java | 2 +- .../command2/RobotDisabledCommandTest.java | 4 +- .../org/wpilib/command2/RunCommandTest.java | 2 +- .../wpilib/command2/ScheduleCommandTest.java | 2 +- .../command2/SchedulingRecursionTest.java | 4 +- .../wpilib/command2/SelectCommandTest.java | 2 +- .../command2/SequentialCommandGroupTest.java | 2 +- .../command2/SingleCompositionTestBase.java | 2 +- .../wpilib/command2/StartEndCommandTest.java | 2 +- .../org/wpilib/command2/WaitCommandTest.java | 6 +- .../wpilib/command2/WaitUntilCommandTest.java | 2 +- .../command2/button/NetworkButtonTest.java | 8 +- .../button/RobotModeTriggersTest.java | 6 +- .../wpilib/command2/button/TriggerTest.java | 18 +- .../command2/sysid/SysIdRoutineTest.java | 16 +- .../org.junit.jupiter.api.extension.Extension | 2 +- commandsv3/.styleguide | 4 +- .../dev/java/org/wpilib/command3/DevMain.java | 8 +- .../generate/main/java/commandhid.java.jinja | 10 +- .../command3/button/CommandPS4Controller.java | 10 +- .../command3/button/CommandPS5Controller.java | 10 +- .../button/CommandStadiaController.java | 10 +- .../button/CommandXboxController.java | 10 +- .../command3/proto/ProtobufCommands.java | 2 +- .../java/org/wpilib/command3/Binding.java | 4 +- .../org/wpilib/command3/BindingScope.java | 2 +- .../java/org/wpilib/command3/BindingType.java | 2 +- .../java/org/wpilib/command3/Command.java | 6 +- .../org/wpilib/command3/CommandState.java | 2 +- .../wpilib/command3/CommandTraceHelper.java | 4 +- .../org/wpilib/command3/ConflictDetector.java | 4 +- .../org/wpilib/command3/Continuation.java | 2 +- .../wpilib/command3/ContinuationScope.java | 2 +- .../java/org/wpilib/command3/Coroutine.java | 10 +- .../java/org/wpilib/command3/Mechanism.java | 4 +- .../command3/NeedsExecutionBuilderStage.java | 2 +- .../command3/NeedsNameBuilderStage.java | 2 +- .../org/wpilib/command3/ParallelGroup.java | 4 +- .../wpilib/command3/ParallelGroupBuilder.java | 4 +- .../java/org/wpilib/command3/Scheduler.java | 20 +- .../org/wpilib/command3/SchedulerEvent.java | 4 +- .../org/wpilib/command3/SequentialGroup.java | 4 +- .../command3/SequentialGroupBuilder.java | 4 +- .../wpilib/command3/StagedCommandBuilder.java | 4 +- .../java/org/wpilib/command3/Trigger.java | 14 +- .../command3/button/CommandGamepad.java | 10 +- .../command3/button/CommandGenericHID.java | 14 +- .../command3/button/CommandJoystick.java | 10 +- .../command3/button/InternalButton.java | 4 +- .../command3/button/JoystickButton.java | 8 +- .../wpilib/command3/button/NetworkButton.java | 14 +- .../org/wpilib/command3/button/POVButton.java | 10 +- .../command3/button/RobotModeTriggers.java | 6 +- .../wpilib/command3/proto/CommandProto.java | 12 +- .../wpilib/command3/proto/MechanismProto.java | 8 +- .../wpilib/command3/proto/SchedulerProto.java | 10 +- .../src/main/proto/protobuf_commands.proto | 2 +- .../org/wpilib/command3/CommandTestBase.java | 4 +- .../wpilib/command3/ConflictDetectorTest.java | 8 +- .../org/wpilib/command3/CoroutineTest.java | 2 +- .../java/org/wpilib/command3/NullCommand.java | 2 +- .../wpilib/command3/ParallelGroupTest.java | 2 +- .../org/wpilib/command3/PriorityCommand.java | 2 +- .../command3/SchedulerCancellationTests.java | 2 +- .../command3/SchedulerConflictTests.java | 2 +- .../command3/SchedulerErrorHandlingTests.java | 4 +- .../command3/SchedulerPriorityLevelTests.java | 2 +- .../SchedulerSideloadFunctionTests.java | 2 +- .../command3/SchedulerTelemetryTests.java | 2 +- .../org/wpilib/command3/SchedulerTest.java | 2 +- .../wpilib/command3/SchedulerTimingTests.java | 10 +- .../wpilib/command3/SequentialGroupTest.java | 2 +- .../command3/StagedCommandBuilderTest.java | 2 +- .../java/org/wpilib/command3/TriggerTest.java | 2 +- .../org/wpilib/vision/camera/DevMain.java | 4 +- .../org/wpilib/vision/camera/AxisCamera.java | 2 +- .../wpilib/vision/camera/CameraServerJNI.java | 6 +- .../java/org/wpilib/vision/camera/CvSink.java | 8 +- .../org/wpilib/vision/camera/CvSource.java | 4 +- .../org/wpilib/vision/camera/HttpCamera.java | 2 +- .../org/wpilib/vision/camera/ImageSink.java | 2 +- .../org/wpilib/vision/camera/ImageSource.java | 2 +- .../org/wpilib/vision/camera/MjpegServer.java | 2 +- .../wpilib/vision/camera/OpenCvLoader.java | 4 +- .../org/wpilib/vision/camera/UsbCamera.java | 2 +- .../wpilib/vision/camera/UsbCameraInfo.java | 2 +- .../org/wpilib/vision/camera/VideoCamera.java | 2 +- .../org/wpilib/vision/camera/VideoEvent.java | 2 +- .../wpilib/vision/camera/VideoException.java | 2 +- .../wpilib/vision/camera/VideoListener.java | 2 +- .../org/wpilib/vision/camera/VideoMode.java | 4 +- .../wpilib/vision/camera/VideoProperty.java | 2 +- .../org/wpilib/vision/camera/VideoSink.java | 2 +- .../org/wpilib/vision/camera/VideoSource.java | 4 +- .../org/wpilib/vision/camera/raw/RawSink.java | 8 +- .../wpilib/vision/camera/raw/RawSource.java | 12 +- .../main/native/cpp/jni/CameraServerJNI.cpp | 412 +++++------ .../org/wpilib/vision/camera/JNITest.java | 2 +- .../wpilib/vision/camera/UsbCameraTest.java | 2 +- .../wpilib/vision/camera/VideoModeTest.java | 4 +- .../dev/java/org/wpilib/datalog/DevMain.java | 2 +- .../wpilib/datalog/BooleanArrayLogEntry.java | 2 +- .../org/wpilib/datalog/BooleanLogEntry.java | 2 +- .../main/java/org/wpilib/datalog/DataLog.java | 8 +- .../datalog/DataLogBackgroundWriter.java | 2 +- .../java/org/wpilib/datalog/DataLogEntry.java | 2 +- .../org/wpilib/datalog/DataLogIterator.java | 2 +- .../java/org/wpilib/datalog/DataLogJNI.java | 4 +- .../org/wpilib/datalog/DataLogReader.java | 2 +- .../org/wpilib/datalog/DataLogRecord.java | 2 +- .../org/wpilib/datalog/DataLogWriter.java | 2 +- .../wpilib/datalog/DoubleArrayLogEntry.java | 2 +- .../org/wpilib/datalog/DoubleLogEntry.java | 2 +- .../java/org/wpilib/datalog/FileLogger.java | 2 +- .../wpilib/datalog/FloatArrayLogEntry.java | 2 +- .../org/wpilib/datalog/FloatLogEntry.java | 2 +- .../wpilib/datalog/IntegerArrayLogEntry.java | 2 +- .../org/wpilib/datalog/IntegerLogEntry.java | 2 +- .../org/wpilib/datalog/ProtobufLogEntry.java | 6 +- .../java/org/wpilib/datalog/RawLogEntry.java | 2 +- .../wpilib/datalog/StringArrayLogEntry.java | 2 +- .../org/wpilib/datalog/StringLogEntry.java | 2 +- .../wpilib/datalog/StructArrayLogEntry.java | 6 +- .../org/wpilib/datalog/StructLogEntry.java | 6 +- .../src/main/native/cpp/jni/DataLogJNI.cpp | 122 +-- .../src/printlog/java/printlog/PrintLog.java | 4 +- .../java/org/wpilib/datalog/DataLogTest.java | 6 +- .../src/main/java/frc/robot/Main.java | 2 +- .../src/main/java/frc/robot/Robot.java | 2 +- .../processor/AnnotationProcessor.java | 22 +- .../epilogue/processor/ArrayHandler.java | 2 +- .../epilogue/processor/CollectionHandler.java | 2 +- .../processor/ConfiguredLoggerHandler.java | 2 +- .../epilogue/processor/ElementHandler.java | 8 +- .../epilogue/processor/EnumHandler.java | 2 +- .../epilogue/processor/EpilogueGenerator.java | 14 +- .../epilogue/processor/LoggableHandler.java | 4 +- .../epilogue/processor/LoggerGenerator.java | 16 +- .../epilogue/processor/MeasureHandler.java | 4 +- .../epilogue/processor/PrimitiveHandler.java | 2 +- .../epilogue/processor/ProtobufHandler.java | 6 +- .../epilogue/processor/SendableHandler.java | 8 +- .../epilogue/processor/StringUtils.java | 4 +- .../epilogue/processor/StructHandler.java | 6 +- .../epilogue/processor/SupplierHandler.java | 2 +- .../processor/AnnotationProcessorTest.java | 696 +++++++++--------- .../processor/CompileTestOptions.java | 2 +- .../processor/EpilogueGeneratorTest.java | 80 +- .../epilogue/processor/StringUtilsTest.java | 2 +- .../org/wpilib/epilogue/CustomLoggerFor.java | 2 +- .../epilogue/EpilogueConfiguration.java | 14 +- .../main/java/org/wpilib/epilogue/Logged.java | 2 +- .../java/org/wpilib/epilogue/NotLogged.java | 2 +- .../epilogue/logging/ClassSpecificLogger.java | 10 +- .../epilogue/logging/EpilogueBackend.java | 10 +- .../wpilib/epilogue/logging/FileBackend.java | 40 +- .../wpilib/epilogue/logging/LazyBackend.java | 6 +- .../logging/LogBackedSendableBuilder.java | 10 +- .../wpilib/epilogue/logging/MultiBackend.java | 6 +- .../epilogue/logging/NTEpilogueBackend.java | 38 +- .../epilogue/logging/NestedBackend.java | 6 +- .../wpilib/epilogue/logging/NullBackend.java | 6 +- .../epilogue/logging/errors/CrashOnError.java | 4 +- .../epilogue/logging/errors/ErrorHandler.java | 4 +- .../epilogue/logging/errors/ErrorPrinter.java | 4 +- .../logging/errors/LoggerDisabler.java | 4 +- .../logging/ClassSpecificLoggerTest.java | 4 +- .../wpilib/epilogue/logging/CustomStruct.java | 6 +- .../epilogue/logging/LazyBackendTest.java | 4 +- .../epilogue/logging/NestedBackendTest.java | 2 +- .../wpilib/epilogue/logging/TestBackend.java | 8 +- fields/CMakeLists.txt | 4 +- .../java/org/wpilib/fields/FieldConfig.java | 2 +- .../main/java/org/wpilib/fields/Fields.java | 4 +- .../org/wpilib/fields/LoadConfigTest.java | 2 +- .../java/org/wpilib/hardware/hal/DevMain.java | 2 +- .../hardware/hal/AddressableLEDJNI.java | 2 +- .../hardware/hal/AllianceStationID.java | 2 +- .../org/wpilib/hardware/hal/AnalogJNI.java | 2 +- .../org/wpilib/hardware/hal/CANAPIJNI.java | 4 +- .../org/wpilib/hardware/hal/CANAPITypes.java | 2 +- .../org/wpilib/hardware/hal/CTREPCMJNI.java | 2 +- .../org/wpilib/hardware/hal/ConstantsJNI.java | 2 +- .../org/wpilib/hardware/hal/ControlWord.java | 2 +- .../org/wpilib/hardware/hal/CounterJNI.java | 2 +- .../java/org/wpilib/hardware/hal/DIOJNI.java | 2 +- .../wpilib/hardware/hal/DriverStationJNI.java | 2 +- .../org/wpilib/hardware/hal/DutyCycleJNI.java | 2 +- .../org/wpilib/hardware/hal/EncoderJNI.java | 2 +- .../java/org/wpilib/hardware/hal/HAL.java | 2 +- .../java/org/wpilib/hardware/hal/HALUtil.java | 2 +- .../org/wpilib/hardware/hal/HALValue.java | 2 +- .../java/org/wpilib/hardware/hal/I2CJNI.java | 2 +- .../java/org/wpilib/hardware/hal/IMUJNI.java | 2 +- .../org/wpilib/hardware/hal/JNIWrapper.java | 4 +- .../wpilib/hardware/hal/MatchInfoData.java | 2 +- .../org/wpilib/hardware/hal/NotifierJNI.java | 4 +- .../java/org/wpilib/hardware/hal/PWMJNI.java | 2 +- .../org/wpilib/hardware/hal/PortsJNI.java | 2 +- .../hardware/hal/PowerDistributionFaults.java | 2 +- .../hardware/hal/PowerDistributionJNI.java | 2 +- .../hal/PowerDistributionStickyFaults.java | 2 +- .../hal/PowerDistributionVersion.java | 2 +- .../org/wpilib/hardware/hal/PowerJNI.java | 2 +- .../org/wpilib/hardware/hal/REVPHFaults.java | 2 +- .../org/wpilib/hardware/hal/REVPHJNI.java | 2 +- .../hardware/hal/REVPHStickyFaults.java | 2 +- .../org/wpilib/hardware/hal/REVPHVersion.java | 2 +- .../wpilib/hardware/hal/SerialPortJNI.java | 2 +- .../org/wpilib/hardware/hal/SimBoolean.java | 2 +- .../org/wpilib/hardware/hal/SimDevice.java | 6 +- .../org/wpilib/hardware/hal/SimDeviceJNI.java | 2 +- .../org/wpilib/hardware/hal/SimDouble.java | 2 +- .../java/org/wpilib/hardware/hal/SimEnum.java | 2 +- .../java/org/wpilib/hardware/hal/SimInt.java | 2 +- .../java/org/wpilib/hardware/hal/SimLong.java | 2 +- .../org/wpilib/hardware/hal/SimValue.java | 2 +- .../wpilib/hardware/hal/SystemServerJNI.java | 2 +- .../org/wpilib/hardware/hal/ThreadsJNI.java | 2 +- .../hardware/hal/UsageReportingJNI.java | 2 +- .../org/wpilib/hardware/hal/can/CANJNI.java | 4 +- .../hardware/hal/can/CANReceiveMessage.java | 2 +- .../wpilib/hardware/hal/can/CANStatus.java | 2 +- .../hardware/hal/can/CANStreamMessage.java | 2 +- .../hal/can/CANStreamOverflowException.java | 2 +- .../hal/communication/NIRioStatus.java | 2 +- .../hal/simulation/AddressableLEDDataJNI.java | 4 +- .../hal/simulation/AnalogInDataJNI.java | 4 +- .../hal/simulation/BufferCallback.java | 2 +- .../hal/simulation/CTREPCMDataJNI.java | 4 +- .../hal/simulation/ConstBufferCallback.java | 2 +- .../hardware/hal/simulation/DIODataJNI.java | 4 +- .../hal/simulation/DigitalPWMDataJNI.java | 4 +- .../hal/simulation/DriverStationDataJNI.java | 4 +- .../hal/simulation/DutyCycleDataJNI.java | 4 +- .../hal/simulation/EncoderDataJNI.java | 4 +- .../hardware/hal/simulation/I2CDataJNI.java | 4 +- .../hal/simulation/NotifierDataJNI.java | 4 +- .../hal/simulation/NotifyCallback.java | 4 +- .../hardware/hal/simulation/PWMDataJNI.java | 4 +- .../simulation/PowerDistributionDataJNI.java | 4 +- .../hardware/hal/simulation/REVPHDataJNI.java | 4 +- .../hal/simulation/RoboRioDataJNI.java | 4 +- .../hal/simulation/SimDeviceCallback.java | 2 +- .../hal/simulation/SimDeviceDataJNI.java | 6 +- .../hal/simulation/SimValueCallback.java | 4 +- .../hardware/hal/simulation/SimulatorJNI.java | 4 +- .../hal/util/AllocationException.java | 2 +- .../hardware/hal/util/BoundaryException.java | 2 +- .../hal/util/CheckedAllocationException.java | 2 +- .../hardware/hal/util/HalHandleException.java | 2 +- .../hal/util/UncleanStatusException.java | 2 +- .../main/native/cpp/jni/AddressableLEDJNI.cpp | 38 +- hal/src/main/native/cpp/jni/AnalogJNI.cpp | 78 +- hal/src/main/native/cpp/jni/CANAPIJNI.cpp | 50 +- hal/src/main/native/cpp/jni/CANJNI.cpp | 26 +- hal/src/main/native/cpp/jni/CTREPCMJNI.cpp | 90 +-- hal/src/main/native/cpp/jni/ConstantsJNI.cpp | 6 +- hal/src/main/native/cpp/jni/CounterJNI.cpp | 34 +- hal/src/main/native/cpp/jni/DIOJNI.cpp | 74 +- .../main/native/cpp/jni/DriverStationJNI.cpp | 102 +-- hal/src/main/native/cpp/jni/DutyCycleJNI.cpp | 22 +- hal/src/main/native/cpp/jni/EncoderJNI.cpp | 94 +-- hal/src/main/native/cpp/jni/HAL.cpp | 54 +- hal/src/main/native/cpp/jni/HALUtil.cpp | 70 +- hal/src/main/native/cpp/jni/I2CJNI.cpp | 34 +- hal/src/main/native/cpp/jni/IMUJNI.cpp | 38 +- hal/src/main/native/cpp/jni/NotifierJNI.cpp | 34 +- hal/src/main/native/cpp/jni/PWMJNI.cpp | 30 +- hal/src/main/native/cpp/jni/PortsJNI.cpp | 66 +- .../native/cpp/jni/PowerDistributionJNI.cpp | 114 +-- hal/src/main/native/cpp/jni/PowerJNI.cpp | 42 +- hal/src/main/native/cpp/jni/REVPHJNI.cpp | 110 +-- hal/src/main/native/cpp/jni/SerialPortJNI.cpp | 78 +- hal/src/main/native/cpp/jni/SimDeviceJNI.cpp | 58 +- .../main/native/cpp/jni/SystemServerJNI.cpp | 6 +- hal/src/main/native/cpp/jni/ThreadsJNI.cpp | 14 +- .../main/native/cpp/jni/UsageReportingJNI.cpp | 6 +- .../jni/simulation/AddressableLEDDataJNI.cpp | 70 +- .../cpp/jni/simulation/AnalogInDataJNI.cpp | 70 +- .../cpp/jni/simulation/CTREPCMDataJNI.cpp | 110 +-- .../native/cpp/jni/simulation/DIODataJNI.cpp | 86 +-- .../cpp/jni/simulation/DigitalPWMDataJNI.cpp | 58 +- .../jni/simulation/DriverStationDataJNI.cpp | 234 +++--- .../cpp/jni/simulation/DutyCycleDataJNI.cpp | 54 +- .../cpp/jni/simulation/EncoderDataJNI.cpp | 170 ++--- .../native/cpp/jni/simulation/I2CDataJNI.cpp | 38 +- .../cpp/jni/simulation/NotifierDataJNI.cpp | 10 +- .../native/cpp/jni/simulation/PWMDataJNI.cpp | 54 +- .../simulation/PowerDistributionDataJNI.cpp | 70 +- .../cpp/jni/simulation/REVPHDataJNI.cpp | 110 +-- .../cpp/jni/simulation/RoboRioDataJNI.cpp | 150 ++-- .../cpp/jni/simulation/SimDeviceDataJNI.cpp | 94 +-- .../cpp/jni/simulation/SimulatorJNI.cpp | 52 +- .../java/org/wpilib/hardware/hal/JNITest.java | 2 +- .../javacplugin/CoroutineBasedDetector.java | 2 +- .../CodeAfterCoroutineParkDetectorTest.java | 30 +- .../CoroutineInLoopListenerTest.java | 46 +- .../IncorrectCoroutineUseDetectorTest.java | 34 +- .../ReturnValueUsedListenerTest.java | 26 +- .../java/edu/wpi/first/ntcore/DevMain.java | 4 +- .../src/generate/main/java/Entry.java.jinja | 2 +- .../generate/main/java/EntryImpl.java.jinja | 2 +- .../main/java/GenericEntryImpl.java.jinja | 2 +- .../main/java/GenericPublisher.java.jinja | 2 +- .../main/java/GenericSubscriber.java.jinja | 2 +- .../main/java/NetworkTableEntry.java.jinja | 2 +- .../main/java/NetworkTableInstance.java.jinja | 12 +- .../main/java/NetworkTableValue.java.jinja | 2 +- .../main/java/NetworkTablesJNI.java.jinja | 6 +- .../generate/main/java/Publisher.java.jinja | 2 +- .../generate/main/java/Subscriber.java.jinja | 2 +- .../generate/main/java/Timestamped.java.jinja | 2 +- .../src/generate/main/java/Topic.java.jinja | 2 +- .../main/native/cpp/jni/types_jni.cpp.jinja | 48 +- ntcore/src/generate/types.json | 6 +- .../networktables/BooleanArrayEntry.java | 2 +- .../networktables/BooleanArrayEntryImpl.java | 2 +- .../networktables/BooleanArrayPublisher.java | 2 +- .../networktables/BooleanArraySubscriber.java | 2 +- .../networktables/BooleanArrayTopic.java | 2 +- .../wpilib/networktables/BooleanEntry.java | 2 +- .../networktables/BooleanEntryImpl.java | 2 +- .../networktables/BooleanPublisher.java | 4 +- .../networktables/BooleanSubscriber.java | 2 +- .../wpilib/networktables/BooleanTopic.java | 2 +- .../networktables/DoubleArrayEntry.java | 2 +- .../networktables/DoubleArrayEntryImpl.java | 2 +- .../networktables/DoubleArrayPublisher.java | 2 +- .../networktables/DoubleArraySubscriber.java | 2 +- .../networktables/DoubleArrayTopic.java | 2 +- .../org/wpilib/networktables/DoubleEntry.java | 2 +- .../wpilib/networktables/DoubleEntryImpl.java | 2 +- .../wpilib/networktables/DoublePublisher.java | 2 +- .../networktables/DoubleSubscriber.java | 2 +- .../org/wpilib/networktables/DoubleTopic.java | 2 +- .../wpilib/networktables/FloatArrayEntry.java | 2 +- .../networktables/FloatArrayEntryImpl.java | 2 +- .../networktables/FloatArrayPublisher.java | 2 +- .../networktables/FloatArraySubscriber.java | 2 +- .../wpilib/networktables/FloatArrayTopic.java | 2 +- .../org/wpilib/networktables/FloatEntry.java | 2 +- .../wpilib/networktables/FloatEntryImpl.java | 2 +- .../wpilib/networktables/FloatPublisher.java | 4 +- .../wpilib/networktables/FloatSubscriber.java | 4 +- .../org/wpilib/networktables/FloatTopic.java | 2 +- .../networktables/GenericEntryImpl.java | 2 +- .../networktables/GenericPublisher.java | 2 +- .../networktables/GenericSubscriber.java | 2 +- .../networktables/IntegerArrayEntry.java | 2 +- .../networktables/IntegerArrayEntryImpl.java | 2 +- .../networktables/IntegerArrayPublisher.java | 2 +- .../networktables/IntegerArraySubscriber.java | 2 +- .../networktables/IntegerArrayTopic.java | 2 +- .../wpilib/networktables/IntegerEntry.java | 2 +- .../networktables/IntegerEntryImpl.java | 2 +- .../networktables/IntegerPublisher.java | 2 +- .../networktables/IntegerSubscriber.java | 2 +- .../wpilib/networktables/IntegerTopic.java | 2 +- .../networktables/NetworkTableEntry.java | 2 +- .../networktables/NetworkTableInstance.java | 12 +- .../networktables/NetworkTableValue.java | 2 +- .../networktables/NetworkTablesJNI.java | 6 +- .../org/wpilib/networktables/RawEntry.java | 2 +- .../wpilib/networktables/RawEntryImpl.java | 2 +- .../wpilib/networktables/RawPublisher.java | 2 +- .../wpilib/networktables/RawSubscriber.java | 2 +- .../org/wpilib/networktables/RawTopic.java | 2 +- .../networktables/StringArrayEntry.java | 2 +- .../networktables/StringArrayEntryImpl.java | 2 +- .../networktables/StringArrayPublisher.java | 2 +- .../networktables/StringArraySubscriber.java | 2 +- .../networktables/StringArrayTopic.java | 2 +- .../org/wpilib/networktables/StringEntry.java | 2 +- .../wpilib/networktables/StringEntryImpl.java | 2 +- .../wpilib/networktables/StringPublisher.java | 2 +- .../networktables/StringSubscriber.java | 2 +- .../org/wpilib/networktables/StringTopic.java | 2 +- .../networktables/TimestampedBoolean.java | 2 +- .../TimestampedBooleanArray.java | 2 +- .../networktables/TimestampedDouble.java | 2 +- .../networktables/TimestampedDoubleArray.java | 2 +- .../networktables/TimestampedFloat.java | 2 +- .../networktables/TimestampedFloatArray.java | 2 +- .../networktables/TimestampedInteger.java | 2 +- .../TimestampedIntegerArray.java | 2 +- .../wpilib/networktables/TimestampedRaw.java | 2 +- .../networktables/TimestampedString.java | 2 +- .../networktables/TimestampedStringArray.java | 2 +- .../main/native/cpp/jni/types_jni.cpp | 340 ++++----- .../wpilib/networktables/ConnectionInfo.java | 2 +- .../org/wpilib/networktables/EntryBase.java | 2 +- .../wpilib/networktables/GenericEntry.java | 2 +- .../org/wpilib/networktables/LogMessage.java | 2 +- .../wpilib/networktables/MultiSubscriber.java | 2 +- .../org/wpilib/networktables/NTSendable.java | 6 +- .../networktables/NTSendableBuilder.java | 4 +- .../wpilib/networktables/NetworkTable.java | 6 +- .../networktables/NetworkTableEvent.java | 2 +- .../networktables/NetworkTableListener.java | 2 +- .../NetworkTableListenerPoller.java | 2 +- .../networktables/NetworkTableType.java | 2 +- .../wpilib/networktables/ProtobufEntry.java | 2 +- .../networktables/ProtobufEntryImpl.java | 4 +- .../networktables/ProtobufPublisher.java | 2 +- .../networktables/ProtobufSubscriber.java | 2 +- .../wpilib/networktables/ProtobufTopic.java | 6 +- .../java/org/wpilib/networktables/PubSub.java | 2 +- .../wpilib/networktables/PubSubOption.java | 2 +- .../wpilib/networktables/PubSubOptions.java | 2 +- .../org/wpilib/networktables/Publisher.java | 2 +- .../networktables/StructArrayEntry.java | 2 +- .../networktables/StructArrayEntryImpl.java | 4 +- .../networktables/StructArrayPublisher.java | 2 +- .../networktables/StructArraySubscriber.java | 2 +- .../networktables/StructArrayTopic.java | 6 +- .../org/wpilib/networktables/StructEntry.java | 2 +- .../wpilib/networktables/StructEntryImpl.java | 4 +- .../wpilib/networktables/StructPublisher.java | 2 +- .../networktables/StructSubscriber.java | 2 +- .../org/wpilib/networktables/StructTopic.java | 6 +- .../org/wpilib/networktables/Subscriber.java | 2 +- .../wpilib/networktables/TableListener.java | 2 +- .../networktables/TimeSyncEventData.java | 2 +- .../networktables/TimestampedObject.java | 2 +- .../java/org/wpilib/networktables/Topic.java | 2 +- .../org/wpilib/networktables/TopicInfo.java | 2 +- .../wpilib/networktables/ValueEventData.java | 2 +- .../main/native/cpp/jni/NetworkTablesJNI.cpp | 332 ++++----- .../networktables/ConnectionListenerTest.java | 4 +- .../org/wpilib/networktables/JNITest.java | 2 +- .../org/wpilib/networktables/LoggerTest.java | 2 +- .../networktables/NetworkTableTest.java | 2 +- .../org/wpilib/networktables/RawTest.java | 2 +- .../networktables/TableListenerTest.java | 2 +- .../wpilib/networktables/TimeSyncTest.java | 2 +- .../networktables/TopicListenerTest.java | 4 +- .../src/dev/java/org/wpilib/romi/DevMain.java | 8 +- .../main/java/org/wpilib/romi/OnBoardIO.java | 10 +- .../main/java/org/wpilib/romi/RomiGyro.java | 8 +- .../main/java/org/wpilib/romi/RomiMotor.java | 6 +- styleguide/spotbugs-exclude.xml | 74 +- wpilibj/CMakeLists.txt | 6 +- wpilibj/src/dev/java/org/wpilib/DevMain.java | 8 +- wpilibj/src/generate/main/java/hid.java.jinja | 12 +- .../src/generate/main/java/hidsim.java.jinja | 4 +- .../main/java/pwm_motor_controller.java.jinja | 6 +- .../wpilib/driverstation/PS4Controller.java | 12 +- .../wpilib/driverstation/PS5Controller.java | 12 +- .../driverstation/StadiaController.java | 12 +- .../wpilib/driverstation/XboxController.java | 12 +- .../org/wpilib/hardware/motor/Koors40.java | 6 +- .../wpilib/hardware/motor/PWMSparkFlex.java | 6 +- .../wpilib/hardware/motor/PWMSparkMax.java | 6 +- .../org/wpilib/hardware/motor/PWMTalonFX.java | 6 +- .../wpilib/hardware/motor/PWMTalonSRX.java | 6 +- .../org/wpilib/hardware/motor/PWMVenom.java | 6 +- .../wpilib/hardware/motor/PWMVictorSPX.java | 6 +- .../java/org/wpilib/hardware/motor/Spark.java | 6 +- .../org/wpilib/hardware/motor/SparkMini.java | 6 +- .../java/org/wpilib/hardware/motor/Talon.java | 6 +- .../org/wpilib/hardware/motor/VictorSP.java | 6 +- .../wpilib/simulation/PS4ControllerSim.java | 4 +- .../wpilib/simulation/PS5ControllerSim.java | 4 +- .../simulation/StadiaControllerSim.java | 4 +- .../wpilib/simulation/XboxControllerSim.java | 4 +- .../main/java/org/wpilib/ExpansionHub.java | 8 +- .../java/org/wpilib/ExpansionHubMotor.java | 26 +- .../org/wpilib/ExpansionHubPidConstants.java | 10 +- .../java/org/wpilib/ExpansionHubServo.java | 20 +- .../org/wpilib/counter/EdgeConfiguration.java | 2 +- .../java/org/wpilib/counter/Tachometer.java | 12 +- .../org/wpilib/counter/UpDownCounter.java | 12 +- .../org/wpilib/drive/DifferentialDrive.java | 26 +- .../java/org/wpilib/drive/MecanumDrive.java | 24 +- .../java/org/wpilib/drive/RobotDriveBase.java | 8 +- .../wpilib/driverstation/DSControlWord.java | 4 +- .../wpilib/driverstation/DriverStation.java | 38 +- .../org/wpilib/driverstation/Gamepad.java | 12 +- .../org/wpilib/driverstation/GenericHID.java | 12 +- .../org/wpilib/driverstation/Joystick.java | 8 +- .../java/org/wpilib/event/BooleanEvent.java | 10 +- .../main/java/org/wpilib/event/EventLoop.java | 2 +- .../org/wpilib/event/NetworkBooleanEvent.java | 12 +- .../hardware/accelerometer/ADXL345_I2C.java | 20 +- .../accelerometer/AnalogAccelerometer.java | 12 +- .../java/org/wpilib/hardware/bus/CAN.java | 10 +- .../java/org/wpilib/hardware/bus/I2C.java | 10 +- .../org/wpilib/hardware/bus/SerialPort.java | 6 +- .../wpilib/hardware/discrete/AnalogInput.java | 14 +- .../wpilib/hardware/discrete/CounterBase.java | 2 +- .../hardware/discrete/DigitalInput.java | 14 +- .../hardware/discrete/DigitalOutput.java | 14 +- .../org/wpilib/hardware/discrete/PWM.java | 14 +- .../org/wpilib/hardware/imu/OnboardIMU.java | 10 +- .../wpilib/hardware/led/AddressableLED.java | 6 +- .../hardware/led/AddressableLEDBuffer.java | 2 +- .../led/AddressableLEDBufferView.java | 8 +- .../org/wpilib/hardware/led/LEDPattern.java | 26 +- .../org/wpilib/hardware/led/LEDReader.java | 6 +- .../org/wpilib/hardware/led/LEDWriter.java | 6 +- .../hardware/motor/MotorController.java | 8 +- .../hardware/motor/MotorControllerGroup.java | 8 +- .../wpilib/hardware/motor/MotorSafety.java | 8 +- .../hardware/motor/PWMMotorController.java | 20 +- .../wpilib/hardware/pneumatic/Compressor.java | 10 +- .../pneumatic/CompressorConfigType.java | 4 +- .../hardware/pneumatic/DoubleSolenoid.java | 10 +- .../hardware/pneumatic/PneumaticHub.java | 14 +- .../hardware/pneumatic/PneumaticsBase.java | 2 +- .../pneumatic/PneumaticsControlModule.java | 8 +- .../pneumatic/PneumaticsModuleType.java | 2 +- .../wpilib/hardware/pneumatic/Solenoid.java | 10 +- .../hardware/power/PowerDistribution.java | 18 +- .../org/wpilib/hardware/range/SharpIR.java | 16 +- .../hardware/rotation/AnalogEncoder.java | 18 +- .../rotation/AnalogPotentiometer.java | 8 +- .../wpilib/hardware/rotation/DutyCycle.java | 12 +- .../hardware/rotation/DutyCycleEncoder.java | 16 +- .../org/wpilib/hardware/rotation/Encoder.java | 16 +- .../internal/DriverStationModeThread.java | 8 +- .../org/wpilib/opmode/IterativeRobotBase.java | 10 +- .../java/org/wpilib/opmode/RobotBase.java | 24 +- .../java/org/wpilib/opmode/RobotState.java | 2 +- .../java/org/wpilib/opmode/TimedRobot.java | 14 +- .../org/wpilib/opmode/TimesliceRobot.java | 2 +- .../org/wpilib/simulation/ADXL345Sim.java | 6 +- .../wpilib/simulation/AddressableLEDSim.java | 10 +- .../wpilib/simulation/AnalogEncoderSim.java | 6 +- .../org/wpilib/simulation/AnalogInputSim.java | 8 +- .../org/wpilib/simulation/BatterySim.java | 6 +- .../org/wpilib/simulation/CTREPCMSim.java | 10 +- .../org/wpilib/simulation/CallbackStore.java | 2 +- .../org/wpilib/simulation/DCMotorSim.java | 20 +- .../java/org/wpilib/simulation/DIOSim.java | 10 +- .../simulation/DifferentialDrivetrainSim.java | 38 +- .../org/wpilib/simulation/DigitalPWMSim.java | 8 +- .../wpilib/simulation/DoubleSolenoidSim.java | 10 +- .../wpilib/simulation/DriverStationSim.java | 14 +- .../simulation/DutyCycleEncoderSim.java | 8 +- .../org/wpilib/simulation/DutyCycleSim.java | 8 +- .../org/wpilib/simulation/ElevatorSim.java | 22 +- .../org/wpilib/simulation/EncoderSim.java | 8 +- .../org/wpilib/simulation/FlywheelSim.java | 14 +- .../org/wpilib/simulation/GamepadSim.java | 4 +- .../org/wpilib/simulation/GenericHIDSim.java | 6 +- .../java/org/wpilib/simulation/I2CSim.java | 10 +- .../org/wpilib/simulation/JoystickSim.java | 4 +- .../wpilib/simulation/LinearSystemSim.java | 14 +- .../org/wpilib/simulation/NotifierSim.java | 4 +- .../java/org/wpilib/simulation/PDPSim.java | 8 +- .../simulation/PWMMotorControllerSim.java | 6 +- .../java/org/wpilib/simulation/PWMSim.java | 8 +- .../wpilib/simulation/PneumaticsBaseSim.java | 8 +- .../java/org/wpilib/simulation/REVPHSim.java | 10 +- .../org/wpilib/simulation/RoboRioSim.java | 6 +- .../wpilib/simulation/SendableChooserSim.java | 8 +- .../org/wpilib/simulation/SharpIRSim.java | 6 +- .../org/wpilib/simulation/SimDeviceSim.java | 24 +- .../java/org/wpilib/simulation/SimHooks.java | 4 +- .../simulation/SingleJointedArmSim.java | 22 +- .../org/wpilib/simulation/SolenoidSim.java | 10 +- .../org/wpilib/smartdashboard/Field2d.java | 18 +- .../wpilib/smartdashboard/FieldObject2d.java | 16 +- .../smartdashboard/ListenerExecutor.java | 4 +- .../wpilib/smartdashboard/Mechanism2d.java | 14 +- .../smartdashboard/MechanismLigament2d.java | 16 +- .../smartdashboard/MechanismObject2d.java | 4 +- .../smartdashboard/MechanismRoot2d.java | 6 +- .../smartdashboard/SendableBuilderImpl.java | 88 +-- .../smartdashboard/SendableChooser.java | 10 +- .../wpilib/smartdashboard/SmartDashboard.java | 14 +- .../org/wpilib/sysid/SysIdRoutineLog.java | 38 +- .../org/wpilib/system/DataLogManager.java | 20 +- .../java/org/wpilib/system/Filesystem.java | 2 +- .../main/java/org/wpilib/system/Notifier.java | 12 +- .../main/java/org/wpilib/system/Resource.java | 6 +- .../org/wpilib/system/RobotController.java | 28 +- .../java/org/wpilib/system/RuntimeType.java | 4 +- .../java/org/wpilib/system/SensorUtil.java | 12 +- .../java/org/wpilib/system/SystemServer.java | 6 +- .../main/java/org/wpilib/system/Threads.java | 4 +- .../main/java/org/wpilib/system/Timer.java | 6 +- .../main/java/org/wpilib/system/Tracer.java | 2 +- .../main/java/org/wpilib/system/Watchdog.java | 8 +- .../src/main/java/org/wpilib/util/Alert.java | 10 +- .../src/main/java/org/wpilib/util/Color.java | 4 +- .../main/java/org/wpilib/util/Color8Bit.java | 2 +- .../java/org/wpilib/util/Preferences.java | 24 +- .../edu/wpi/first/math/util/ColorTest.java | 4 +- .../org/wpilib/MockHardwareExtension.java | 6 +- .../java/org/wpilib/UtilityClassTest.java | 4 +- .../java/org/wpilib/can/CANStatusTest.java | 8 +- .../wpilib/drive/DifferentialDriveTest.java | 4 +- .../org/wpilib/drive/MecanumDriveTest.java | 6 +- .../driverstation/DriverStationTest.java | 4 +- .../wpilib/driverstation/GenericHIDTest.java | 6 +- .../wpilib/driverstation/JoystickTest.java | 6 +- .../driverstation/PS4ControllerTest.java | 6 +- .../driverstation/PS5ControllerTest.java | 6 +- .../driverstation/XboxControllerTest.java | 6 +- .../org/wpilib/event/BooleanEventTest.java | 2 +- .../java/org/wpilib/event/EventLoopTest.java | 2 +- .../wpilib/event/NetworkBooleanEventTest.java | 4 +- .../src/test/java/org/wpilib/hal/JNITest.java | 8 +- .../org/wpilib/hal/MatchInfoDataTest.java | 12 +- .../hardware/discrete/DigitalOutputTest.java | 6 +- .../led/AddressableLEDBufferTest.java | 6 +- .../led/AddressableLEDBufferViewTest.java | 4 +- .../wpilib/hardware/led/LEDPatternTest.java | 46 +- .../hardware/motor/MockMotorController.java | 2 +- .../motor/MockPWMMotorController.java | 2 +- .../motor/MotorControllerGroupTest.java | 2 +- .../pneumatic/DoubleSolenoidTestCTRE.java | 4 +- .../pneumatic/DoubleSolenoidTestREV.java | 4 +- .../hardware/pneumatic/SolenoidTestCTRE.java | 4 +- .../hardware/pneumatic/SolenoidTestREV.java | 4 +- .../hardware/power/PowerDistributionTest.java | 8 +- .../wpilib/hardware/range/SharpIRTest.java | 4 +- .../rotation/AnalogPotentiometerTest.java | 8 +- .../org/wpilib/opmode/TimedRobotTest.java | 6 +- .../org/wpilib/opmode/TimesliceRobotTest.java | 6 +- .../org/wpilib/simulation/ADXL345SimTest.java | 8 +- .../simulation/AddressableLEDSimTest.java | 14 +- .../simulation/AnalogEncoderSimTest.java | 6 +- .../wpilib/simulation/AnalogInputSimTest.java | 10 +- .../org/wpilib/simulation/CTREPCMSimTest.java | 16 +- .../org/wpilib/simulation/DCMotorSimTest.java | 20 +- .../org/wpilib/simulation/DIOSimTest.java | 10 +- .../DifferentialDrivetrainSimTest.java | 38 +- .../wpilib/simulation/DigitalPWMSimTest.java | 12 +- .../simulation/DriverStationSimTest.java | 14 +- .../simulation/DutyCycleEncoderSimTest.java | 6 +- .../wpilib/simulation/DutyCycleSimTest.java | 10 +- .../wpilib/simulation/ElevatorSimTest.java | 18 +- .../org/wpilib/simulation/EncoderSimTest.java | 10 +- .../simulation/PWMMotorControllerSimTest.java | 6 +- .../org/wpilib/simulation/PWMSimTest.java | 10 +- .../org/wpilib/simulation/REVPHSimTest.java | 18 +- .../org/wpilib/simulation/RoboRioSimTest.java | 10 +- .../wpilib/simulation/SimDeviceSimTest.java | 10 +- .../simulation/SingleJointedArmSimTest.java | 8 +- .../simulation/testutils/BooleanCallback.java | 4 +- .../simulation/testutils/BufferCallback.java | 4 +- .../testutils/CallbackHelperBase.java | 4 +- .../simulation/testutils/DoubleCallback.java | 4 +- .../simulation/testutils/EnumCallback.java | 4 +- .../simulation/testutils/IntCallback.java | 4 +- .../smartdashboard/Mechanism2dTest.java | 6 +- .../smartdashboard/SendableChooserTest.java | 6 +- .../smartdashboard/SmartDashboardTest.java | 8 +- .../java/org/wpilib/system/NotifierTest.java | 6 +- .../wpilib/system/RobotControllerTest.java | 2 +- .../org/wpilib/system/SensorUtilTest.java | 2 +- .../java/org/wpilib/system/TimerTest.java | 6 +- .../java/org/wpilib/system/WatchdogTest.java | 6 +- .../test/java/org/wpilib/util/AlertTest.java | 12 +- .../java/org/wpilib/util/Color8BitTest.java | 2 +- .../test/java/org/wpilib/util/ColorTest.java | 2 +- .../java/org/wpilib/util/PreferencesTest.java | 8 +- .../org.junit.jupiter.api.extension.Extension | 2 +- .../commands/command2/ReplaceMeCommand.java | 4 +- .../emptyclass/ReplaceMeEmptyClass.java | 2 +- .../ReplaceMeInstantCommand.java | 4 +- .../ReplaceMeParallelCommandGroup.java | 4 +- .../ReplaceMeParallelDeadlineGroup.java | 6 +- .../ReplaceMeParallelRaceGroup.java | 4 +- .../ReplaceMeSequentialCommandGroup.java | 4 +- .../subsystem2/ReplaceMeSubsystem.java | 4 +- .../wpilib/examples/addressableled/Main.java | 4 +- .../wpilib/examples/addressableled/Robot.java | 16 +- .../wpilib/examples/apriltagsvision/Main.java | 4 +- .../examples/apriltagsvision/Robot.java | 28 +- .../org/wpilib/examples/arcadedrive/Main.java | 4 +- .../wpilib/examples/arcadedrive/Robot.java | 12 +- .../arcadedrivexboxcontroller/Main.java | 4 +- .../arcadedrivexboxcontroller/Robot.java | 12 +- .../examples/armsimulation/Constants.java | 4 +- .../wpilib/examples/armsimulation/Main.java | 4 +- .../wpilib/examples/armsimulation/Robot.java | 8 +- .../armsimulation/subsystems/Arm.java | 38 +- .../java/org/wpilib/examples/canpdp/Main.java | 4 +- .../org/wpilib/examples/canpdp/Robot.java | 8 +- .../differentialdrivebot/Drivetrain.java | 20 +- .../examples/differentialdrivebot/Main.java | 4 +- .../examples/differentialdrivebot/Robot.java | 8 +- .../Drivetrain.java | 66 +- .../ExampleGlobalMeasurementSensor.java | 12 +- .../differentialdriveposeestimator/Main.java | 4 +- .../differentialdriveposeestimator/Robot.java | 12 +- .../examples/digitalcommunication/Main.java | 4 +- .../examples/digitalcommunication/Robot.java | 8 +- .../drivedistanceoffboard/Constants.java | 2 +- .../ExampleSmartMotorController.java | 2 +- .../examples/drivedistanceoffboard/Main.java | 4 +- .../examples/drivedistanceoffboard/Robot.java | 8 +- .../drivedistanceoffboard/RobotContainer.java | 20 +- .../subsystems/DriveSubsystem.java | 24 +- .../examples/dutycycleencoder/Main.java | 4 +- .../examples/dutycycleencoder/Robot.java | 10 +- .../wpilib/examples/dutycycleinput/Main.java | 4 +- .../wpilib/examples/dutycycleinput/Robot.java | 8 +- .../ExampleSmartMotorController.java | 2 +- .../elevatorexponentialprofile/Main.java | 4 +- .../elevatorexponentialprofile/Robot.java | 10 +- .../Constants.java | 4 +- .../elevatorexponentialsimulation/Main.java | 4 +- .../elevatorexponentialsimulation/Robot.java | 8 +- .../subsystems/Elevator.java | 38 +- .../examples/elevatorprofiledpid/Main.java | 4 +- .../examples/elevatorprofiledpid/Robot.java | 16 +- .../elevatorsimulation/Constants.java | 4 +- .../examples/elevatorsimulation/Main.java | 4 +- .../examples/elevatorsimulation/Robot.java | 8 +- .../subsystems/Elevator.java | 36 +- .../ExampleSmartMotorController.java | 2 +- .../elevatortrapezoidprofile/Main.java | 4 +- .../elevatortrapezoidprofile/Robot.java | 10 +- .../org/wpilib/examples/encoder/Main.java | 4 +- .../org/wpilib/examples/encoder/Robot.java | 10 +- .../org/wpilib/examples/eventloop/Main.java | 4 +- .../org/wpilib/examples/eventloop/Robot.java | 18 +- .../flywheelbangbangcontroller/Main.java | 4 +- .../flywheelbangbangcontroller/Robot.java | 32 +- .../wpilib/examples/gettingstarted/Main.java | 4 +- .../wpilib/examples/gettingstarted/Robot.java | 14 +- .../java/org/wpilib/examples/gyro/Main.java | 4 +- .../java/org/wpilib/examples/gyro/Robot.java | 14 +- .../org/wpilib/examples/gyromecanum/Main.java | 4 +- .../wpilib/examples/gyromecanum/Robot.java | 14 +- .../examples/hatchbotinlined/Constants.java | 2 +- .../wpilib/examples/hatchbotinlined/Main.java | 4 +- .../examples/hatchbotinlined/Robot.java | 12 +- .../hatchbotinlined/RobotContainer.java | 28 +- .../hatchbotinlined/commands/Autos.java | 14 +- .../subsystems/DriveSubsystem.java | 16 +- .../subsystems/HatchSubsystem.java | 20 +- .../hatchbottraditional/Constants.java | 2 +- .../examples/hatchbottraditional/Main.java | 4 +- .../examples/hatchbottraditional/Robot.java | 12 +- .../hatchbottraditional/RobotContainer.java | 40 +- .../commands/ComplexAuto.java | 10 +- .../commands/DefaultDrive.java | 8 +- .../commands/DriveDistance.java | 6 +- .../commands/GrabHatch.java | 8 +- .../commands/HalveDriveSpeed.java | 6 +- .../commands/ReleaseHatch.java | 6 +- .../subsystems/DriveSubsystem.java | 16 +- .../subsystems/HatchSubsystem.java | 16 +- .../org/wpilib/examples/hidrumble/Main.java | 4 +- .../org/wpilib/examples/hidrumble/Robot.java | 8 +- .../org/wpilib/examples/httpcamera/Main.java | 4 +- .../org/wpilib/examples/httpcamera/Robot.java | 12 +- .../examples/i2ccommunication/Main.java | 4 +- .../examples/i2ccommunication/Robot.java | 10 +- .../examples/intermediatevision/Main.java | 4 +- .../examples/intermediatevision/Robot.java | 12 +- .../examples/mecanumbot/Drivetrain.java | 24 +- .../org/wpilib/examples/mecanumbot/Main.java | 4 +- .../org/wpilib/examples/mecanumbot/Robot.java | 8 +- .../wpilib/examples/mecanumdrive/Main.java | 4 +- .../wpilib/examples/mecanumdrive/Robot.java | 12 +- .../mecanumdriveposeestimator/Drivetrain.java | 32 +- .../ExampleGlobalMeasurementSensor.java | 12 +- .../mecanumdriveposeestimator/Main.java | 4 +- .../mecanumdriveposeestimator/Robot.java | 8 +- .../org/wpilib/examples/mechanism2d/Main.java | 4 +- .../wpilib/examples/mechanism2d/Robot.java | 24 +- .../wpilib/examples/motorcontrol/Main.java | 4 +- .../wpilib/examples/motorcontrol/Robot.java | 12 +- .../examples/potentiometerpid/Main.java | 4 +- .../examples/potentiometerpid/Robot.java | 12 +- .../org/wpilib/examples/quickvision/Main.java | 4 +- .../wpilib/examples/quickvision/Robot.java | 6 +- .../rapidreactcommandbot/Constants.java | 4 +- .../examples/rapidreactcommandbot/Main.java | 4 +- .../RapidReactCommandBot.java | 28 +- .../examples/rapidreactcommandbot/Robot.java | 14 +- .../subsystems/Drive.java | 30 +- .../subsystems/Intake.java | 18 +- .../subsystems/Pneumatics.java | 14 +- .../subsystems/Shooter.java | 22 +- .../subsystems/Storage.java | 18 +- .../examples/romireference/Constants.java | 2 +- .../wpilib/examples/romireference/Main.java | 4 +- .../wpilib/examples/romireference/Robot.java | 8 +- .../romireference/RobotContainer.java | 34 +- .../romireference/commands/ArcadeDrive.java | 6 +- .../commands/AutonomousDistance.java | 6 +- .../commands/AutonomousTime.java | 6 +- .../romireference/commands/DriveDistance.java | 6 +- .../romireference/commands/DriveTime.java | 6 +- .../romireference/commands/TurnDegrees.java | 6 +- .../romireference/commands/TurnTime.java | 6 +- .../romireference/subsystems/Drivetrain.java | 14 +- .../examples/selectcommand/Constants.java | 2 +- .../wpilib/examples/selectcommand/Main.java | 4 +- .../wpilib/examples/selectcommand/Robot.java | 8 +- .../selectcommand/RobotContainer.java | 16 +- .../Drivetrain.java | 40 +- .../Main.java | 4 +- .../Robot.java | 24 +- .../org/wpilib/examples/solenoid/Main.java | 4 +- .../org/wpilib/examples/solenoid/Robot.java | 16 +- .../wpilib/examples/statespacearm/Main.java | 4 +- .../wpilib/examples/statespacearm/Robot.java | 34 +- .../examples/statespaceelevator/Main.java | 4 +- .../examples/statespaceelevator/Robot.java | 34 +- .../examples/statespaceflywheel/Main.java | 4 +- .../examples/statespaceflywheel/Robot.java | 30 +- .../statespaceflywheelsysid/Main.java | 4 +- .../statespaceflywheelsysid/Robot.java | 28 +- .../wpilib/examples/swervebot/Drivetrain.java | 14 +- .../org/wpilib/examples/swervebot/Main.java | 4 +- .../org/wpilib/examples/swervebot/Robot.java | 10 +- .../examples/swervebot/SwerveModule.java | 20 +- .../swervedriveposeestimator/Drivetrain.java | 22 +- .../ExampleGlobalMeasurementSensor.java | 12 +- .../swervedriveposeestimator/Main.java | 4 +- .../swervedriveposeestimator/Robot.java | 8 +- .../SwerveModule.java | 20 +- .../examples/sysidroutine/Constants.java | 4 +- .../wpilib/examples/sysidroutine/Main.java | 4 +- .../wpilib/examples/sysidroutine/Robot.java | 8 +- .../sysidroutine/SysIdRoutineBot.java | 16 +- .../sysidroutine/subsystems/Drive.java | 24 +- .../sysidroutine/subsystems/Shooter.java | 26 +- .../org/wpilib/examples/tankdrive/Main.java | 4 +- .../org/wpilib/examples/tankdrive/Robot.java | 12 +- .../tankdrivexboxcontroller/Main.java | 4 +- .../tankdrivexboxcontroller/Robot.java | 12 +- .../wpilib/examples/unittest/Constants.java | 2 +- .../org/wpilib/examples/unittest/Main.java | 4 +- .../org/wpilib/examples/unittest/Robot.java | 10 +- .../examples/unittest/subsystems/Intake.java | 10 +- .../examples/xrpreference/Constants.java | 2 +- .../wpilib/examples/xrpreference/Main.java | 4 +- .../wpilib/examples/xrpreference/Robot.java | 8 +- .../examples/xrpreference/RobotContainer.java | 38 +- .../xrpreference/commands/ArcadeDrive.java | 6 +- .../commands/AutonomousDistance.java | 6 +- .../xrpreference/commands/AutonomousTime.java | 6 +- .../xrpreference/commands/DriveDistance.java | 6 +- .../xrpreference/commands/DriveTime.java | 6 +- .../xrpreference/commands/TurnDegrees.java | 6 +- .../xrpreference/commands/TurnTime.java | 6 +- .../examples/xrpreference/subsystems/Arm.java | 6 +- .../xrpreference/subsystems/Drivetrain.java | 14 +- .../snippets/accelerometercollision/Main.java | 4 +- .../accelerometercollision/Robot.java | 10 +- .../snippets/accelerometerfilter/Main.java | 4 +- .../snippets/accelerometerfilter/Robot.java | 12 +- .../snippets/adxlaccelerometers/Main.java | 4 +- .../snippets/adxlaccelerometers/Robot.java | 8 +- .../snippets/analogaccelerometer/Main.java | 4 +- .../snippets/analogaccelerometer/Robot.java | 6 +- .../wpilib/snippets/analogencoder/Main.java | 4 +- .../wpilib/snippets/analogencoder/Robot.java | 6 +- .../org/wpilib/snippets/analoginput/Main.java | 4 +- .../wpilib/snippets/analoginput/Robot.java | 6 +- .../snippets/analogpotentiometer/Main.java | 4 +- .../snippets/analogpotentiometer/Robot.java | 8 +- .../wpilib/snippets/digitalinput/Main.java | 4 +- .../wpilib/snippets/digitalinput/Robot.java | 6 +- .../snippets/dutycycleencoder/Main.java | 4 +- .../snippets/dutycycleencoder/Robot.java | 6 +- .../org/wpilib/snippets/encoder/Main.java | 4 +- .../org/wpilib/snippets/encoder/Robot.java | 6 +- .../wpilib/snippets/encoderdrive/Main.java | 4 +- .../wpilib/snippets/encoderdrive/Robot.java | 10 +- .../wpilib/snippets/encoderhoming/Main.java | 4 +- .../wpilib/snippets/encoderhoming/Robot.java | 10 +- .../org/wpilib/snippets/limitswitch/Main.java | 4 +- .../wpilib/snippets/limitswitch/Robot.java | 10 +- .../org/wpilib/snippets/onboardimu/Main.java | 4 +- .../org/wpilib/snippets/onboardimu/Robot.java | 8 +- .../snippets/profiledpidfeedforward/Main.java | 4 +- .../profiledpidfeedforward/Robot.java | 14 +- .../templates/commandbased/Constants.java | 2 +- .../wpilib/templates/commandbased/Main.java | 4 +- .../wpilib/templates/commandbased/Robot.java | 8 +- .../commandbased/RobotContainer.java | 22 +- .../commandbased/commands/Autos.java | 8 +- .../commandbased/commands/ExampleCommand.java | 6 +- .../subsystems/ExampleSubsystem.java | 6 +- .../templates/commandbasedskeleton/Main.java | 4 +- .../templates/commandbasedskeleton/Robot.java | 8 +- .../commandbasedskeleton/RobotContainer.java | 6 +- .../educational/EducationalRobot.java | 12 +- .../wpilib/templates/educational/Main.java | 4 +- .../wpilib/templates/educational/Robot.java | 2 +- .../templates/robotbaseskeleton/Main.java | 4 +- .../templates/robotbaseskeleton/Robot.java | 12 +- .../templates/romicommandbased/Constants.java | 2 +- .../templates/romicommandbased/Main.java | 4 +- .../templates/romicommandbased/Robot.java | 8 +- .../romicommandbased/RobotContainer.java | 16 +- .../commands/ExampleCommand.java | 6 +- .../subsystems/RomiDrivetrain.java | 10 +- .../romieducational/EducationalRobot.java | 12 +- .../templates/romieducational/Main.java | 4 +- .../templates/romieducational/Robot.java | 2 +- .../romieducational/RomiDrivetrain.java | 8 +- .../org/wpilib/templates/romitimed/Main.java | 4 +- .../org/wpilib/templates/romitimed/Robot.java | 8 +- .../templates/romitimed/RomiDrivetrain.java | 8 +- .../java/org/wpilib/templates/timed/Main.java | 4 +- .../org/wpilib/templates/timed/Robot.java | 8 +- .../wpilib/templates/timedskeleton/Main.java | 4 +- .../wpilib/templates/timedskeleton/Robot.java | 4 +- .../org/wpilib/templates/timeslice/Main.java | 4 +- .../org/wpilib/templates/timeslice/Robot.java | 8 +- .../templates/timesliceskeleton/Main.java | 4 +- .../templates/timesliceskeleton/Robot.java | 4 +- .../templates/xrpcommandbased/Constants.java | 2 +- .../templates/xrpcommandbased/Main.java | 4 +- .../templates/xrpcommandbased/Robot.java | 8 +- .../xrpcommandbased/RobotContainer.java | 16 +- .../commands/ExampleCommand.java | 6 +- .../subsystems/XRPDrivetrain.java | 10 +- .../xrpeducational/EducationalRobot.java | 12 +- .../wpilib/templates/xrpeducational/Main.java | 4 +- .../templates/xrpeducational/Robot.java | 2 +- .../xrpeducational/XRPDrivetrain.java | 8 +- .../org/wpilib/templates/xrptimed/Main.java | 4 +- .../org/wpilib/templates/xrptimed/Robot.java | 8 +- .../templates/xrptimed/XRPDrivetrain.java | 8 +- .../armsimulation/ArmSimulationTest.java | 20 +- .../DigitalCommunicationTest.java | 12 +- .../ElevatorSimulationTest.java | 16 +- .../I2CCommunicationTest.java | 16 +- .../PotentiometerPIDTest.java | 24 +- .../unittest/subsystems/IntakeTest.java | 14 +- wpimath/.styleguide | 2 +- .../src/dev/java/org/wpilib/math/DevMain.java | 2 +- .../main/java/GenericNumber.java.jinja | 6 +- wpimath/src/generate/main/java/Nat.java.jinja | 4 +- .../main/java/org/wpilib/math/numbers/N0.java | 6 +- .../main/java/org/wpilib/math/numbers/N1.java | 6 +- .../java/org/wpilib/math/numbers/N10.java | 6 +- .../java/org/wpilib/math/numbers/N11.java | 6 +- .../java/org/wpilib/math/numbers/N12.java | 6 +- .../java/org/wpilib/math/numbers/N13.java | 6 +- .../java/org/wpilib/math/numbers/N14.java | 6 +- .../java/org/wpilib/math/numbers/N15.java | 6 +- .../java/org/wpilib/math/numbers/N16.java | 6 +- .../java/org/wpilib/math/numbers/N17.java | 6 +- .../java/org/wpilib/math/numbers/N18.java | 6 +- .../java/org/wpilib/math/numbers/N19.java | 6 +- .../main/java/org/wpilib/math/numbers/N2.java | 6 +- .../java/org/wpilib/math/numbers/N20.java | 6 +- .../main/java/org/wpilib/math/numbers/N3.java | 6 +- .../main/java/org/wpilib/math/numbers/N4.java | 6 +- .../main/java/org/wpilib/math/numbers/N5.java | 6 +- .../main/java/org/wpilib/math/numbers/N6.java | 6 +- .../main/java/org/wpilib/math/numbers/N7.java | 6 +- .../main/java/org/wpilib/math/numbers/N8.java | 6 +- .../main/java/org/wpilib/math/numbers/N9.java | 6 +- .../org/wpilib/math/proto/Controller.java | 2 +- .../org/wpilib/math/proto/Geometry2D.java | 2 +- .../org/wpilib/math/proto/Geometry3D.java | 2 +- .../org/wpilib/math/proto/Kinematics.java | 2 +- .../java/org/wpilib/math/proto/Plant.java | 2 +- .../java/org/wpilib/math/proto/Spline.java | 2 +- .../java/org/wpilib/math/proto/System.java | 2 +- .../org/wpilib/math/proto/Trajectory.java | 2 +- .../java/org/wpilib/math/proto/Wpimath.java | 2 +- .../main/java/org/wpilib/math/util/Nat.java | 44 +- .../math/controller/ArmFeedforward.java | 12 +- .../math/controller/BangBangController.java | 10 +- ...ontrolAffinePlantInversionFeedforward.java | 12 +- .../DifferentialDriveAccelerationLimiter.java | 18 +- .../DifferentialDriveFeedforward.java | 18 +- .../DifferentialDriveWheelVoltages.java | 10 +- .../math/controller/ElevatorFeedforward.java | 10 +- .../controller/ImplicitModelFollower.java | 10 +- .../LTVDifferentialDriveController.java | 32 +- .../controller/LTVUnicycleController.java | 28 +- .../LinearPlantInversionFeedforward.java | 12 +- .../controller/LinearQuadraticRegulator.java | 18 +- .../wpilib/math/controller/PIDController.java | 12 +- .../controller/ProfiledPIDController.java | 14 +- .../controller/SimpleMotorFeedforward.java | 10 +- .../controller/proto/ArmFeedforwardProto.java | 8 +- .../DifferentialDriveFeedforwardProto.java | 8 +- .../DifferentialDriveWheelVoltagesProto.java | 8 +- .../proto/ElevatorFeedforwardProto.java | 8 +- .../proto/SimpleMotorFeedforwardProto.java | 8 +- .../struct/ArmFeedforwardStruct.java | 6 +- .../DifferentialDriveFeedforwardStruct.java | 6 +- .../DifferentialDriveWheelVoltagesStruct.java | 6 +- .../struct/ElevatorFeedforwardStruct.java | 6 +- .../struct/SimpleMotorFeedforwardStruct.java | 6 +- .../math/estimator/AngleStatistics.java | 10 +- .../DifferentialDrivePoseEstimator.java | 20 +- .../DifferentialDrivePoseEstimator3d.java | 28 +- .../math/estimator/ExtendedKalmanFilter.java | 20 +- .../wpilib/math/estimator/KalmanFilter.java | 18 +- .../KalmanFilterLatencyCompensator.java | 10 +- .../math/estimator/KalmanTypeFilter.java | 8 +- .../estimator/MecanumDrivePoseEstimator.java | 20 +- .../MecanumDrivePoseEstimator3d.java | 28 +- .../estimator/MerweScaledSigmaPoints.java | 10 +- .../org/wpilib/math/estimator/MerweUKF.java | 10 +- .../wpilib/math/estimator/PoseEstimator.java | 36 +- .../math/estimator/PoseEstimator3d.java | 44 +- .../wpilib/math/estimator/S3SigmaPoints.java | 10 +- .../java/org/wpilib/math/estimator/S3UKF.java | 10 +- .../wpilib/math/estimator/SigmaPoints.java | 8 +- .../estimator/SteadyStateKalmanFilter.java | 18 +- .../estimator/SwerveDrivePoseEstimator.java | 20 +- .../estimator/SwerveDrivePoseEstimator3d.java | 28 +- .../math/estimator/UnscentedKalmanFilter.java | 20 +- .../org/wpilib/math/filter/Debouncer.java | 4 +- .../org/wpilib/math/filter/LinearFilter.java | 6 +- .../org/wpilib/math/filter/MedianFilter.java | 4 +- .../wpilib/math/filter/SlewRateLimiter.java | 6 +- .../wpilib/math/geometry/CoordinateAxis.java | 8 +- .../math/geometry/CoordinateSystem.java | 6 +- .../org/wpilib/math/geometry/Ellipse2d.java | 18 +- .../java/org/wpilib/math/geometry/Pose2d.java | 24 +- .../java/org/wpilib/math/geometry/Pose3d.java | 24 +- .../org/wpilib/math/geometry/Quaternion.java | 16 +- .../org/wpilib/math/geometry/Rectangle2d.java | 14 +- .../org/wpilib/math/geometry/Rotation2d.java | 28 +- .../org/wpilib/math/geometry/Rotation3d.java | 30 +- .../org/wpilib/math/geometry/Transform2d.java | 22 +- .../org/wpilib/math/geometry/Transform3d.java | 24 +- .../wpilib/math/geometry/Translation2d.java | 24 +- .../wpilib/math/geometry/Translation3d.java | 24 +- .../org/wpilib/math/geometry/Twist2d.java | 10 +- .../org/wpilib/math/geometry/Twist3d.java | 12 +- .../math/geometry/proto/Ellipse2dProto.java | 10 +- .../math/geometry/proto/Pose2dProto.java | 12 +- .../math/geometry/proto/Pose3dProto.java | 12 +- .../math/geometry/proto/QuaternionProto.java | 8 +- .../math/geometry/proto/Rectangle2dProto.java | 10 +- .../math/geometry/proto/Rotation2dProto.java | 8 +- .../math/geometry/proto/Rotation3dProto.java | 10 +- .../math/geometry/proto/Transform2dProto.java | 12 +- .../math/geometry/proto/Transform3dProto.java | 12 +- .../geometry/proto/Translation2dProto.java | 8 +- .../geometry/proto/Translation3dProto.java | 8 +- .../math/geometry/proto/Twist2dProto.java | 8 +- .../math/geometry/proto/Twist3dProto.java | 8 +- .../math/geometry/struct/Ellipse2dStruct.java | 8 +- .../math/geometry/struct/Pose2dStruct.java | 10 +- .../math/geometry/struct/Pose3dStruct.java | 10 +- .../geometry/struct/QuaternionStruct.java | 6 +- .../geometry/struct/Rectangle2dStruct.java | 8 +- .../geometry/struct/Rotation2dStruct.java | 6 +- .../geometry/struct/Rotation3dStruct.java | 8 +- .../geometry/struct/Transform2dStruct.java | 10 +- .../geometry/struct/Transform3dStruct.java | 10 +- .../geometry/struct/Translation2dStruct.java | 6 +- .../geometry/struct/Translation3dStruct.java | 6 +- .../math/geometry/struct/Twist2dStruct.java | 6 +- .../math/geometry/struct/Twist3dStruct.java | 6 +- .../math/interpolation/Interpolatable.java | 2 +- .../InterpolatingDoubleTreeMap.java | 2 +- .../InterpolatingMatrixTreeMap.java | 2 +- .../interpolation/InterpolatingTreeMap.java | 2 +- .../math/interpolation/Interpolator.java | 4 +- .../interpolation/InverseInterpolator.java | 4 +- .../TimeInterpolatableBuffer.java | 4 +- .../wpilib/math/jni/ArmFeedforwardJNI.java | 2 +- .../java/org/wpilib/math/jni/DAREJNI.java | 2 +- .../java/org/wpilib/math/jni/EigenJNI.java | 2 +- .../org/wpilib/math/jni/Ellipse2dJNI.java | 2 +- .../wpilib/math/jni/StateSpaceUtilJNI.java | 2 +- .../org/wpilib/math/jni/Transform3dJNI.java | 2 +- .../java/org/wpilib/math/jni/Twist3dJNI.java | 2 +- .../java/org/wpilib/math/jni/WPIMathJNI.java | 4 +- .../wpilib/math/kinematics/ChassisSpeeds.java | 26 +- .../DifferentialDriveKinematics.java | 18 +- .../kinematics/DifferentialDriveOdometry.java | 12 +- .../DifferentialDriveOdometry3d.java | 20 +- .../DifferentialDriveWheelPositions.java | 18 +- .../DifferentialDriveWheelSpeeds.java | 14 +- .../wpilib/math/kinematics/Kinematics.java | 6 +- .../kinematics/MecanumDriveKinematics.java | 16 +- .../math/kinematics/MecanumDriveOdometry.java | 8 +- .../kinematics/MecanumDriveOdometry3d.java | 16 +- .../MecanumDriveWheelPositions.java | 18 +- .../kinematics/MecanumDriveWheelSpeeds.java | 14 +- .../org/wpilib/math/kinematics/Odometry.java | 8 +- .../wpilib/math/kinematics/Odometry3d.java | 16 +- .../kinematics/SwerveDriveKinematics.java | 28 +- .../math/kinematics/SwerveDriveOdometry.java | 8 +- .../kinematics/SwerveDriveOdometry3d.java | 16 +- .../math/kinematics/SwerveModulePosition.java | 20 +- .../math/kinematics/SwerveModuleState.java | 16 +- .../kinematics/proto/ChassisSpeedsProto.java | 8 +- .../DifferentialDriveKinematicsProto.java | 8 +- .../DifferentialDriveWheelPositionsProto.java | 8 +- .../DifferentialDriveWheelSpeedsProto.java | 8 +- .../proto/MecanumDriveKinematicsProto.java | 10 +- .../MecanumDriveWheelPositionsProto.java | 8 +- .../proto/MecanumDriveWheelSpeedsProto.java | 8 +- .../proto/SwerveDriveKinematicsProto.java | 10 +- .../proto/SwerveModulePositionProto.java | 10 +- .../proto/SwerveModuleStateProto.java | 10 +- .../struct/ChassisSpeedsStruct.java | 6 +- .../DifferentialDriveKinematicsStruct.java | 6 +- ...DifferentialDriveWheelPositionsStruct.java | 6 +- .../DifferentialDriveWheelSpeedsStruct.java | 6 +- .../struct/MecanumDriveKinematicsStruct.java | 8 +- .../MecanumDriveWheelPositionsStruct.java | 6 +- .../struct/MecanumDriveWheelSpeedsStruct.java | 6 +- .../struct/SwerveDriveKinematicsStruct.java | 8 +- .../struct/SwerveModulePositionStruct.java | 8 +- .../struct/SwerveModuleStateStruct.java | 8 +- .../java/org/wpilib/math/linalg/DARE.java | 4 +- .../org/wpilib/math/linalg/MatBuilder.java | 2 +- .../java/org/wpilib/math/linalg/Matrix.java | 18 +- .../org/wpilib/math/linalg/VecBuilder.java | 22 +- .../java/org/wpilib/math/linalg/Vector.java | 18 +- .../wpilib/math/linalg/proto/MatrixProto.java | 14 +- .../wpilib/math/linalg/proto/VectorProto.java | 12 +- .../math/linalg/struct/MatrixStruct.java | 12 +- .../math/linalg/struct/VectorStruct.java | 10 +- .../math/optimization/SimulatedAnnealing.java | 4 +- .../wpilib/math/path/TravelingSalesman.java | 10 +- .../math/spline/CubicHermiteSpline.java | 10 +- .../wpilib/math/spline/PoseWithCurvature.java | 4 +- .../math/spline/QuinticHermiteSpline.java | 10 +- .../java/org/wpilib/math/spline/Spline.java | 6 +- .../org/wpilib/math/spline/SplineHelper.java | 6 +- .../math/spline/SplineParameterizer.java | 2 +- .../spline/proto/CubicHermiteSplineProto.java | 8 +- .../proto/QuinticHermiteSplineProto.java | 8 +- .../struct/CubicHermiteSplineStruct.java | 6 +- .../struct/QuinticHermiteSplineStruct.java | 6 +- .../wpilib/math/system/Discretization.java | 8 +- .../org/wpilib/math/system/LinearSystem.java | 60 +- .../wpilib/math/system/LinearSystemLoop.java | 16 +- .../math/system/NumericalIntegration.java | 8 +- .../wpilib/math/system/NumericalJacobian.java | 10 +- .../org/wpilib/math/system/plant/DCMotor.java | 12 +- .../math/system/plant/LinearSystemId.java | 22 +- .../math/system/plant/proto/DCMotorProto.java | 8 +- .../system/plant/struct/DCMotorStruct.java | 6 +- .../math/system/proto/LinearSystemProto.java | 16 +- .../system/struct/LinearSystemStruct.java | 14 +- .../math/trajectory/ExponentialProfile.java | 6 +- .../wpilib/math/trajectory/Trajectory.java | 14 +- .../math/trajectory/TrajectoryConfig.java | 24 +- .../math/trajectory/TrajectoryGenerator.java | 22 +- .../trajectory/TrajectoryParameterizer.java | 6 +- .../math/trajectory/TrapezoidProfile.java | 6 +- .../CentripetalAccelerationConstraint.java | 4 +- ...DifferentialDriveKinematicsConstraint.java | 8 +- .../DifferentialDriveVoltageConstraint.java | 12 +- .../EllipticalRegionConstraint.java | 10 +- .../constraint/MaxVelocityConstraint.java | 4 +- .../MecanumDriveKinematicsConstraint.java | 8 +- .../RectangularRegionConstraint.java | 8 +- .../SwerveDriveKinematicsConstraint.java | 8 +- .../constraint/TrajectoryConstraint.java | 4 +- .../trajectory/proto/TrajectoryProto.java | 10 +- .../proto/TrajectoryStateProto.java | 10 +- .../struct/ExponentialProfileStateStruct.java | 6 +- .../struct/TrapezoidProfileStateStruct.java | 6 +- .../wpilib/math/util/ComputerVisionUtil.java | 6 +- .../java/org/wpilib/math/util/MathShared.java | 2 +- .../org/wpilib/math/util/MathSharedStore.java | 4 +- .../java/org/wpilib/math/util/MathUtil.java | 6 +- .../main/java/org/wpilib/math/util/Num.java | 2 +- .../main/java/org/wpilib/math/util/Pair.java | 2 +- .../org/wpilib/math/util/StateSpaceUtil.java | 12 +- .../main/java/org/wpilib/math/util/Units.java | 2 +- .../main/native/cpp/jni/ArmFeedforwardJNI.cpp | 6 +- wpimath/src/main/native/cpp/jni/DAREJNI.cpp | 18 +- wpimath/src/main/native/cpp/jni/EigenJNI.cpp | 18 +- .../src/main/native/cpp/jni/Ellipse2dJNI.cpp | 6 +- .../main/native/cpp/jni/StateSpaceUtilJNI.cpp | 6 +- .../main/native/cpp/jni/Transform3dJNI.cpp | 6 +- .../src/main/native/cpp/jni/Twist3dJNI.cpp | 6 +- wpimath/src/main/proto/controller.proto | 2 +- wpimath/src/main/proto/geometry2d.proto | 2 +- wpimath/src/main/proto/geometry3d.proto | 2 +- wpimath/src/main/proto/kinematics.proto | 2 +- wpimath/src/main/proto/plant.proto | 2 +- wpimath/src/main/proto/spline.proto | 2 +- wpimath/src/main/proto/system.proto | 2 +- wpimath/src/main/proto/trajectory.proto | 2 +- wpimath/src/main/proto/wpimath.proto | 2 +- .../test/java/org/wpilib/ProtoTestBase.java | 4 +- .../test/java/org/wpilib/StructTestBase.java | 4 +- .../java/org/wpilib/UtilityClassTest.java | 4 +- .../math/controller/ArmFeedforwardTest.java | 14 +- .../controller/BangBangInputOutputTest.java | 2 +- .../controller/BangBangToleranceTest.java | 2 +- ...olAffinePlantInversionFeedforwardTest.java | 14 +- ...ferentialDriveAccelerationLimiterTest.java | 12 +- .../DifferentialDriveFeedforwardTest.java | 14 +- .../controller/ElevatorFeedforwardTest.java | 10 +- .../controller/ImplicitModelFollowerTest.java | 12 +- .../LTVDifferentialDriveControllerTest.java | 32 +- .../controller/LTVUnicycleControllerTest.java | 16 +- .../LinearPlantInversionFeedforwardTest.java | 14 +- .../LinearQuadraticRegulatorTest.java | 18 +- .../math/controller/LinearSystemLoopTest.java | 24 +- .../math/controller/PIDInputOutputTest.java | 2 +- .../math/controller/PIDToleranceTest.java | 2 +- .../controller/ProfiledPIDControllerTest.java | 4 +- .../ProfiledPIDInputOutputTest.java | 4 +- .../SimpleMotorFeedforwardTest.java | 10 +- .../proto/ArmFeedforwardProtoTest.java | 6 +- ...DifferentialDriveFeedforwardProtoTest.java | 8 +- ...fferentialDriveWheelVoltagesProtoTest.java | 6 +- .../proto/ElevatorFeedforwardProtoTest.java | 6 +- .../SimpleMotorFeedforwardProtoTest.java | 8 +- .../struct/ArmFeedforwardStructTest.java | 4 +- ...ifferentialDriveFeedforwardStructTest.java | 6 +- ...ferentialDriveWheelVoltagesStructTest.java | 4 +- .../struct/ElevatorFeedforwardStructTest.java | 4 +- .../SimpleMotorFeedforwardStructTest.java | 6 +- .../math/estimator/AngleStatisticsTest.java | 10 +- .../DifferentialDrivePoseEstimator3dTest.java | 28 +- .../DifferentialDrivePoseEstimatorTest.java | 22 +- .../estimator/ExtendedKalmanFilterTest.java | 32 +- .../math/estimator/KalmanFilterTest.java | 32 +- .../MecanumDrivePoseEstimator3dTest.java | 30 +- .../MecanumDrivePoseEstimatorTest.java | 24 +- .../estimator/MerweScaledSigmaPointsTest.java | 8 +- .../wpilib/math/estimator/MerweUKFTest.java | 40 +- .../math/estimator/S3SigmaPointsTest.java | 14 +- .../org/wpilib/math/estimator/S3UKFTest.java | 40 +- .../SwerveDrivePoseEstimator3dTest.java | 30 +- .../SwerveDrivePoseEstimatorTest.java | 24 +- .../org/wpilib/math/filter/DebouncerTest.java | 4 +- .../wpilib/math/filter/LinearFilterTest.java | 2 +- .../wpilib/math/filter/MedianFilterTest.java | 2 +- .../math/filter/SlewRateLimiterTest.java | 4 +- .../math/geometry/CoordinateSystemTest.java | 4 +- .../wpilib/math/geometry/Ellipse2dTest.java | 2 +- .../org/wpilib/math/geometry/Pose2dTest.java | 4 +- .../org/wpilib/math/geometry/Pose3dTest.java | 6 +- .../wpilib/math/geometry/QuaternionTest.java | 4 +- .../wpilib/math/geometry/Rectangle2dTest.java | 2 +- .../wpilib/math/geometry/Rotation2dTest.java | 4 +- .../wpilib/math/geometry/Rotation3dTest.java | 12 +- .../wpilib/math/geometry/Transform2dTest.java | 4 +- .../wpilib/math/geometry/Transform3dTest.java | 6 +- .../math/geometry/Translation2dTest.java | 4 +- .../math/geometry/Translation3dTest.java | 8 +- .../org/wpilib/math/geometry/Twist2dTest.java | 2 +- .../org/wpilib/math/geometry/Twist3dTest.java | 6 +- .../geometry/proto/Ellipse2dProtoTest.java | 10 +- .../math/geometry/proto/Pose2dProtoTest.java | 10 +- .../math/geometry/proto/Pose3dProtoTest.java | 12 +- .../geometry/proto/QuaternionProtoTest.java | 6 +- .../geometry/proto/Rectangle2dProtoTest.java | 10 +- .../geometry/proto/Rotation2dProtoTest.java | 6 +- .../geometry/proto/Rotation3dProtoTest.java | 8 +- .../geometry/proto/Transform2dProtoTest.java | 10 +- .../geometry/proto/Transform3dProtoTest.java | 12 +- .../proto/Translation2dProtoTest.java | 6 +- .../proto/Translation3dProtoTest.java | 6 +- .../math/geometry/proto/Twist2dProtoTest.java | 6 +- .../math/geometry/proto/Twist3dProtoTest.java | 6 +- .../geometry/struct/Ellipse2dStructTest.java | 8 +- .../geometry/struct/Pose2dStructTest.java | 8 +- .../geometry/struct/Pose3dStructTest.java | 10 +- .../geometry/struct/QuaternionStructTest.java | 4 +- .../struct/Rectangle2dStructTest.java | 8 +- .../geometry/struct/Rotation2dStructTest.java | 4 +- .../geometry/struct/Rotation3dStructTest.java | 6 +- .../struct/Transform2dStructTest.java | 8 +- .../struct/Transform3dStructTest.java | 10 +- .../struct/Translation2dStructTest.java | 4 +- .../struct/Translation3dStructTest.java | 4 +- .../geometry/struct/Twist2dStructTest.java | 4 +- .../geometry/struct/Twist3dStructTest.java | 4 +- .../InterpolatingDoubleTreeMapTest.java | 2 +- .../InterpolatingTreeMapTest.java | 2 +- .../TimeInterpolatableBufferTest.java | 6 +- .../math/jni/ArmFeedforwardJNITest.java | 2 +- .../java/org/wpilib/math/jni/DAREJNITest.java | 2 +- .../org/wpilib/math/jni/EigenJNITest.java | 2 +- .../org/wpilib/math/jni/Ellipse2dJNITest.java | 2 +- .../math/jni/StateSpaceUtilJNITest.java | 2 +- .../wpilib/math/jni/Transform3dJNITest.java | 2 +- .../org/wpilib/math/jni/Twist3dJNITest.java | 2 +- .../math/kinematics/ChassisSpeedsTest.java | 12 +- .../DifferentialDriveKinematicsTest.java | 2 +- .../DifferentialDriveOdometry3dTest.java | 8 +- .../DifferentialDriveOdometryTest.java | 6 +- .../DifferentialDriveWheelSpeedsTest.java | 2 +- .../MecanumDriveKinematicsTest.java | 4 +- .../MecanumDriveOdometry3dTest.java | 20 +- .../kinematics/MecanumDriveOdometryTest.java | 12 +- .../MecanumDriveWheelSpeedsTest.java | 2 +- .../kinematics/SwerveDriveKinematicsTest.java | 6 +- .../kinematics/SwerveDriveOdometry3dTest.java | 20 +- .../kinematics/SwerveDriveOdometryTest.java | 12 +- .../kinematics/SwerveModuleStateTest.java | 4 +- .../proto/ChassisSpeedsProtoTest.java | 6 +- .../DifferentialDriveKinematicsProtoTest.java | 6 +- ...DifferentialDriveWheelSpeedsProtoTest.java | 6 +- .../MecanumDriveKinematicsProtoTest.java | 8 +- .../MecanumDriveWheelPositionsProtoTest.java | 6 +- .../MecanumDriveWheelSpeedsProtoTest.java | 6 +- .../proto/SwerveDriveKinematicsProtoTest.java | 10 +- .../proto/SwerveModulePositionProtoTest.java | 8 +- .../proto/SwerveModuleStateProtoTest.java | 8 +- .../struct/ChassisSpeedsStructTest.java | 4 +- ...DifferentialDriveKinematicsStructTest.java | 4 +- ...erentialDriveWheelPositionsStructTest.java | 4 +- ...ifferentialDriveWheelSpeedsStructTest.java | 4 +- .../MecanumDriveKinematicsStructTest.java | 6 +- .../MecanumDriveWheelPositionsStructTest.java | 4 +- .../MecanumDriveWheelSpeedsStructTest.java | 4 +- .../SwerveDriveKinematicsStructTest.java | 8 +- .../SwerveModulePositionStructTest.java | 6 +- .../struct/SwerveModuleStateStructTest.java | 6 +- .../java/org/wpilib/math/linalg/DARETest.java | 4 +- .../org/wpilib/math/linalg/MatrixTest.java | 10 +- .../org/wpilib/math/linalg/VectorTest.java | 2 +- .../math/linalg/proto/MatrixProtoTest.java | 16 +- .../math/linalg/proto/VectorProtoTest.java | 14 +- .../math/linalg/struct/MatrixStructTest.java | 14 +- .../math/linalg/struct/VectorStructTest.java | 12 +- .../optimization/SimulatedAnnealingTest.java | 2 +- .../math/path/TravelingSalesmanTest.java | 8 +- .../math/spline/CubicHermiteSplineTest.java | 10 +- .../math/spline/QuinticHermiteSplineTest.java | 8 +- .../proto/CubicHermiteSplineProtoTest.java | 8 +- .../proto/QuinticHermiteSplineProtoTest.java | 8 +- .../struct/CubicHermiteSplineStructTest.java | 6 +- .../QuinticHermiteSplineStructTest.java | 6 +- .../math/system/DiscretizationTest.java | 12 +- .../math/system/LinearSystemIDTest.java | 14 +- .../math/system/NumericalIntegrationTest.java | 12 +- .../system/plant/proto/DCMotorProtoTest.java | 6 +- .../plant/struct/DCMotorStructTest.java | 4 +- .../system/proto/LinearSystemProtoTest.java | 18 +- .../system/struct/LinearSystemStructTest.java | 16 +- ...CentripetalAccelerationConstraintTest.java | 6 +- ...erentialDriveKinematicsConstraintTest.java | 10 +- ...ifferentialDriveVoltageConstraintTest.java | 14 +- .../EllipticalRegionConstraintTest.java | 14 +- .../trajectory/ExponentialProfileTest.java | 4 +- .../RectangularRegionConstraintTest.java | 12 +- .../trajectory/TrajectoryConcatenateTest.java | 6 +- .../trajectory/TrajectoryGeneratorTest.java | 14 +- .../trajectory/TrajectoryTransformTest.java | 10 +- .../math/trajectory/TrapezoidProfileTest.java | 2 +- .../trajectory/proto/TrajectoryProtoTest.java | 12 +- .../proto/TrajectoryStateProtoTest.java | 12 +- .../ExponentialProfileStateStructTest.java | 4 +- .../TrapezoidProfileStateStructTest.java | 4 +- .../math/util/ComputerVisionUtilTest.java | 14 +- .../org/wpilib/math/util/MathUtilTest.java | 8 +- .../wpilib/math/util/StateSpaceUtilTest.java | 12 +- .../java/org/wpilib/math/util/UnitsTest.java | 4 +- .../src/dev/java/org/wpilib/net/DevMain.java | 4 +- .../wpilib/net/MulticastServiceAnnouncer.java | 4 +- .../wpilib/net/MulticastServiceResolver.java | 4 +- .../java/org/wpilib/net/PortForwarder.java | 2 +- .../main/java/org/wpilib/net/ServiceData.java | 2 +- .../main/java/org/wpilib/net/WPINetJNI.java | 4 +- .../main/java/org/wpilib/net/WebServer.java | 2 +- wpinet/src/main/native/cpp/jni/WPINetJNI.cpp | 68 +- .../java/org/wpilib/net/WPINetJNITest.java | 2 +- .../dev/java/org/wpilib/units/DevMain.java | 2 +- .../java/Measure-implementation.java.jinja | 6 +- .../wpilib/units/measure/Acceleration.java | 6 +- .../java/org/wpilib/units/measure/Angle.java | 6 +- .../units/measure/AngularAcceleration.java | 6 +- .../wpilib/units/measure/AngularMomentum.java | 6 +- .../wpilib/units/measure/AngularVelocity.java | 6 +- .../org/wpilib/units/measure/Current.java | 6 +- .../wpilib/units/measure/Dimensionless.java | 6 +- .../org/wpilib/units/measure/Distance.java | 6 +- .../java/org/wpilib/units/measure/Energy.java | 6 +- .../java/org/wpilib/units/measure/Force.java | 6 +- .../org/wpilib/units/measure/Frequency.java | 6 +- .../units/measure/LinearAcceleration.java | 6 +- .../wpilib/units/measure/LinearMomentum.java | 6 +- .../wpilib/units/measure/LinearVelocity.java | 6 +- .../java/org/wpilib/units/measure/Mass.java | 6 +- .../wpilib/units/measure/MomentOfInertia.java | 6 +- .../java/org/wpilib/units/measure/Mult.java | 6 +- .../java/org/wpilib/units/measure/Per.java | 6 +- .../java/org/wpilib/units/measure/Power.java | 6 +- .../org/wpilib/units/measure/Resistance.java | 6 +- .../org/wpilib/units/measure/Temperature.java | 6 +- .../java/org/wpilib/units/measure/Time.java | 6 +- .../java/org/wpilib/units/measure/Torque.java | 6 +- .../org/wpilib/units/measure/Velocity.java | 6 +- .../org/wpilib/units/measure/Voltage.java | 6 +- .../org/wpilib/units/AccelerationUnit.java | 8 +- .../main/java/org/wpilib/units/AngleUnit.java | 4 +- .../wpilib/units/AngularAccelerationUnit.java | 4 +- .../org/wpilib/units/AngularMomentumUnit.java | 4 +- .../org/wpilib/units/AngularVelocityUnit.java | 4 +- .../main/java/org/wpilib/units/BaseUnits.java | 2 +- .../wpilib/units/CombinatoryUnitCache.java | 4 +- .../java/org/wpilib/units/CurrentUnit.java | 4 +- .../org/wpilib/units/DimensionlessUnit.java | 4 +- .../java/org/wpilib/units/DistanceUnit.java | 4 +- .../java/org/wpilib/units/EnergyUnit.java | 4 +- .../main/java/org/wpilib/units/ForceUnit.java | 4 +- .../java/org/wpilib/units/FrequencyUnit.java | 8 +- .../org/wpilib/units/ImmutableMeasure.java | 4 +- .../wpilib/units/LinearAccelerationUnit.java | 6 +- .../org/wpilib/units/LinearMomentumUnit.java | 6 +- .../org/wpilib/units/LinearVelocityUnit.java | 6 +- .../main/java/org/wpilib/units/MassUnit.java | 4 +- .../main/java/org/wpilib/units/Measure.java | 54 +- .../org/wpilib/units/MomentOfInertiaUnit.java | 6 +- .../main/java/org/wpilib/units/MultUnit.java | 8 +- .../main/java/org/wpilib/units/PerUnit.java | 8 +- .../main/java/org/wpilib/units/PowerUnit.java | 8 +- .../java/org/wpilib/units/ResistanceUnit.java | 4 +- .../org/wpilib/units/TemperatureUnit.java | 4 +- .../main/java/org/wpilib/units/TimeUnit.java | 4 +- .../java/org/wpilib/units/TorqueUnit.java | 6 +- .../java/org/wpilib/units/UnaryFunction.java | 2 +- .../src/main/java/org/wpilib/units/Unit.java | 2 +- .../java/org/wpilib/units/UnitBuilder.java | 2 +- .../src/main/java/org/wpilib/units/Units.java | 2 +- .../java/org/wpilib/units/VelocityUnit.java | 4 +- .../java/org/wpilib/units/VoltageUnit.java | 4 +- .../collections/LongToObjectHashMap.java | 2 +- .../collections/ReadOnlyPrimitiveLongSet.java | 2 +- .../org/wpilib/units/CurrentUnitTest.java | 2 +- .../org/wpilib/units/DistanceUnitTest.java | 2 +- .../java/org/wpilib/units/ExampleUnit.java | 2 +- .../java/org/wpilib/units/MeasureTest.java | 14 +- .../java/org/wpilib/units/MultUnitTest.java | 2 +- .../java/org/wpilib/units/PerUnitTest.java | 8 +- .../org/wpilib/units/UnaryFunctionTest.java | 2 +- .../test/java/org/wpilib/units/UnitTest.java | 2 +- .../test/java/org/wpilib/units/UnitsTest.java | 72 +- .../org/wpilib/units/VelocityUnitTest.java | 22 +- .../org/wpilib/units/VoltageUnitTest.java | 2 +- .../collections/LongToObjectHashMapTest.java | 2 +- .../wpilib/units/measure/VelocityTest.java | 14 +- .../src/dev/java/org/wpilib/util/DevMain.java | 2 +- .../java/org/wpilib/util/ErrorMessages.java | 2 +- .../java/org/wpilib/util/PixelFormat.java | 2 +- .../main/java/org/wpilib/util/RawFrame.java | 2 +- .../java/org/wpilib/util/TimestampSource.java | 2 +- .../java/org/wpilib/util/WPISerializable.java | 2 +- .../main/java/org/wpilib/util/WPIUtilJNI.java | 2 +- .../org/wpilib/util/cleanup/CleanupPool.java | 4 +- .../util/cleanup/ReflectionCleanup.java | 2 +- .../org/wpilib/util/cleanup/SkipCleanup.java | 2 +- .../org/wpilib/util/cleanup/WPICleaner.java | 2 +- .../org/wpilib/util/concurrent/Event.java | 4 +- .../wpilib/util/concurrent/EventVector.java | 2 +- .../org/wpilib/util/concurrent/Semaphore.java | 4 +- .../wpilib/util/container/CircularBuffer.java | 2 +- .../util/container/DoubleCircularBuffer.java | 2 +- .../wpilib/util/function/BooleanConsumer.java | 2 +- .../wpilib/util/function/FloatConsumer.java | 2 +- .../wpilib/util/function/FloatSupplier.java | 2 +- .../org/wpilib/util/protobuf/Protobuf.java | 2 +- .../wpilib/util/protobuf/ProtobufBuffer.java | 2 +- .../util/protobuf/ProtobufSerializable.java | 4 +- .../wpilib/util/runtime/ClassPreloader.java | 2 +- .../util/runtime/CombinedRuntimeLoader.java | 2 +- .../util/runtime/MsvcRuntimeException.java | 2 +- .../wpilib/util/runtime/RuntimeDetector.java | 2 +- .../wpilib/util/runtime/RuntimeLoader.java | 2 +- .../org/wpilib/util/sendable/Sendable.java | 2 +- .../wpilib/util/sendable/SendableBuilder.java | 8 +- .../util/sendable/SendableRegistry.java | 2 +- .../util/struct/BadSchemaException.java | 2 +- .../org/wpilib/util/struct/DynamicStruct.java | 2 +- .../java/org/wpilib/util/struct/Struct.java | 2 +- .../org/wpilib/util/struct/StructBuffer.java | 2 +- .../wpilib/util/struct/StructDescriptor.java | 2 +- .../util/struct/StructDescriptorDatabase.java | 10 +- .../org/wpilib/util/struct/StructFetcher.java | 2 +- .../util/struct/StructFieldDescriptor.java | 2 +- .../wpilib/util/struct/StructFieldType.java | 2 +- .../wpilib/util/struct/StructGenerator.java | 2 +- .../util/struct/StructSerializable.java | 4 +- .../org/wpilib/util/struct/parser/Lexer.java | 2 +- .../util/struct/parser/ParseException.java | 2 +- .../util/struct/parser/ParsedDeclaration.java | 2 +- .../util/struct/parser/ParsedSchema.java | 2 +- .../org/wpilib/util/struct/parser/Parser.java | 2 +- .../wpilib/util/struct/parser/TokenKind.java | 2 +- .../src/main/native/cpp/jni/WPIUtilJNI.cpp | 100 +-- .../org/wpilib/util/ErrorMessagesTest.java | 4 +- .../java/org/wpilib/util/WPIUtilJNITest.java | 2 +- .../wpilib/util/cleanup/CleanupPoolTest.java | 2 +- .../util/cleanup/ReflectionCleanupTest.java | 2 +- .../util/container/CircularBufferTest.java | 2 +- .../container/DoubleCircularBufferTest.java | 2 +- .../wpilib/util/struct/DynamicStructTest.java | 2 +- .../util/struct/StructGeneratorTest.java | 6 +- .../wpilib/util/struct/parser/ParserTest.java | 2 +- .../src/dev/java/org/wpilib/xrp/DevMain.java | 8 +- .../src/main/java/org/wpilib/xrp/XRPGyro.java | 10 +- .../main/java/org/wpilib/xrp/XRPMotor.java | 12 +- .../java/org/wpilib/xrp/XRPOnBoardIO.java | 6 +- .../java/org/wpilib/xrp/XRPRangefinder.java | 4 +- .../org/wpilib/xrp/XRPReflectanceSensor.java | 4 +- .../main/java/org/wpilib/xrp/XRPServo.java | 8 +- 1590 files changed, 8469 insertions(+), 8469 deletions(-) diff --git a/apriltag/CMakeLists.txt b/apriltag/CMakeLists.txt index f2ea5dff00..bbafaebf71 100644 --- a/apriltag/CMakeLists.txt +++ b/apriltag/CMakeLists.txt @@ -62,7 +62,7 @@ if(WITH_JAVA) apriltag_jar SOURCES ${JAVA_SOURCES} RESOURCES - NAMESPACE "edu/wpi/first/apriltag" ${JAVA_RESOURCES} + NAMESPACE "org/wpilib/vision/apriltag" ${JAVA_RESOURCES} INCLUDE_JARS wpimath_jar wpiunits_jar @@ -107,7 +107,7 @@ if(WITH_JAVA_SOURCE) endif() generate_resources( - src/main/native/resources/edu/wpi/first/apriltag + src/main/native/resources/org/wpilib/vision/apriltag generated/main/cpp APRILTAG frc diff --git a/apriltag/src/dev/java/org/wpilib/vision/apriltag/DevMain.java b/apriltag/src/dev/java/org/wpilib/vision/apriltag/DevMain.java index 1047088044..841cecd653 100644 --- a/apriltag/src/dev/java/org/wpilib/vision/apriltag/DevMain.java +++ b/apriltag/src/dev/java/org/wpilib/vision/apriltag/DevMain.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 edu.wpi.first.apriltag; +package org.wpilib.vision.apriltag; public final class DevMain { /** Main entry point. */ diff --git a/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTag.java b/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTag.java index e145cbc0e5..c79bd49cf1 100644 --- a/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTag.java +++ b/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTag.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.apriltag; +package org.wpilib.vision.apriltag; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import edu.wpi.first.apriltag.jni.AprilTagJNI; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.util.RawFrame; +import org.wpilib.vision.apriltag.jni.AprilTagJNI; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.util.RawFrame; import java.util.Objects; /** Represents an AprilTag's metadata. */ diff --git a/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagDetection.java b/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagDetection.java index 954cb8635d..3db3b24c1b 100644 --- a/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagDetection.java +++ b/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagDetection.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.apriltag; +package org.wpilib.vision.apriltag; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.numbers.N3; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.numbers.N3; import java.util.Arrays; /** A detection of an AprilTag tag. */ diff --git a/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagDetector.java b/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagDetector.java index 23473f5412..bc4b8fa2f7 100644 --- a/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagDetector.java +++ b/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagDetector.java @@ -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. -package edu.wpi.first.apriltag; +package org.wpilib.vision.apriltag; -import edu.wpi.first.apriltag.jni.AprilTagJNI; +import org.wpilib.vision.apriltag.jni.AprilTagJNI; import org.opencv.core.Mat; /** diff --git a/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagFieldLayout.java b/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagFieldLayout.java index 3a85ded7c0..fda76e007b 100644 --- a/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagFieldLayout.java +++ b/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagFieldLayout.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 edu.wpi.first.apriltag; +package org.wpilib.vision.apriltag; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonCreator; @@ -10,9 +10,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Translation3d; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Translation3d; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagFields.java b/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagFields.java index 2050ed3e08..d2fb0199cc 100644 --- a/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagFields.java +++ b/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagFields.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 edu.wpi.first.apriltag; +package org.wpilib.vision.apriltag; import java.io.UncheckedIOException; @@ -20,7 +20,7 @@ public enum AprilTagFields { k2025ReefscapeAndyMark("2025-reefscape-andymark.json"); /** Base resource directory. */ - public static final String kBaseResourceDir = "/edu/wpi/first/apriltag/"; + public static final String kBaseResourceDir = "/org/wpilib/vision/apriltag/"; /** Alias to the current game. */ public static final AprilTagFields kDefaultField = k2025ReefscapeWelded; diff --git a/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagPoseEstimate.java b/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagPoseEstimate.java index 7bf079a0f7..54727e1a4f 100644 --- a/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagPoseEstimate.java +++ b/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagPoseEstimate.java @@ -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. -package edu.wpi.first.apriltag; +package org.wpilib.vision.apriltag; -import edu.wpi.first.math.geometry.Transform3d; +import org.wpilib.math.geometry.Transform3d; /** A pair of AprilTag pose estimates. */ @SuppressWarnings("MemberName") diff --git a/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagPoseEstimator.java b/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagPoseEstimator.java index d0d8865a71..141895af14 100644 --- a/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagPoseEstimator.java +++ b/apriltag/src/main/java/org/wpilib/vision/apriltag/AprilTagPoseEstimator.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.apriltag; +package org.wpilib.vision.apriltag; -import edu.wpi.first.apriltag.jni.AprilTagJNI; -import edu.wpi.first.math.geometry.Transform3d; +import org.wpilib.vision.apriltag.jni.AprilTagJNI; +import org.wpilib.math.geometry.Transform3d; /** Pose estimators for AprilTag tags. */ public class AprilTagPoseEstimator { diff --git a/apriltag/src/main/java/org/wpilib/vision/apriltag/jni/AprilTagJNI.java b/apriltag/src/main/java/org/wpilib/vision/apriltag/jni/AprilTagJNI.java index 87c61e8279..a06b6b5bc6 100644 --- a/apriltag/src/main/java/org/wpilib/vision/apriltag/jni/AprilTagJNI.java +++ b/apriltag/src/main/java/org/wpilib/vision/apriltag/jni/AprilTagJNI.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.apriltag.jni; +package org.wpilib.vision.apriltag.jni; -import edu.wpi.first.apriltag.AprilTagDetection; -import edu.wpi.first.apriltag.AprilTagDetector; -import edu.wpi.first.apriltag.AprilTagPoseEstimate; -import edu.wpi.first.math.geometry.Transform3d; -import edu.wpi.first.util.RawFrame; -import edu.wpi.first.util.RuntimeLoader; +import org.wpilib.vision.apriltag.AprilTagDetection; +import org.wpilib.vision.apriltag.AprilTagDetector; +import org.wpilib.vision.apriltag.AprilTagPoseEstimate; +import org.wpilib.math.geometry.Transform3d; +import org.wpilib.util.RawFrame; +import org.wpilib.util.runtime.RuntimeLoader; import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/apriltag/src/main/native/cpp/jni/AprilTagJNI.cpp b/apriltag/src/main/native/cpp/jni/AprilTagJNI.cpp index b68b131087..c345ba47f8 100644 --- a/apriltag/src/main/native/cpp/jni/AprilTagJNI.cpp +++ b/apriltag/src/main/native/cpp/jni/AprilTagJNI.cpp @@ -11,7 +11,7 @@ #include #include -#include "edu_wpi_first_apriltag_jni_AprilTagJNI.h" +#include "org_wpilib_vision_apriltag_jni_AprilTagJNI.h" #include "frc/apriltag/AprilTag.h" #include "frc/apriltag/AprilTagDetector.h" #include "frc/apriltag/AprilTagPoseEstimator.h" @@ -34,16 +34,16 @@ static JException illegalArgEx; static JException nullPointerEx; static const JClassInit classes[] = { - {"edu/wpi/first/apriltag/AprilTagDetection", &detectionCls}, - {"edu/wpi/first/apriltag/AprilTagDetector$Config", &detectorConfigCls}, - {"edu/wpi/first/apriltag/AprilTagDetector$QuadThresholdParameters", + {"org/wpilib/vision/apriltag/AprilTagDetection", &detectionCls}, + {"org/wpilib/vision/apriltag/AprilTagDetector$Config", &detectorConfigCls}, + {"org/wpilib/vision/apriltag/AprilTagDetector$QuadThresholdParameters", &detectorQTPCls}, - {"edu/wpi/first/apriltag/AprilTagPoseEstimate", &poseEstimateCls}, - {"edu/wpi/first/math/geometry/Quaternion", &quaternionCls}, - {"edu/wpi/first/math/geometry/Rotation3d", &rotation3dCls}, - {"edu/wpi/first/math/geometry/Transform3d", &transform3dCls}, - {"edu/wpi/first/math/geometry/Translation3d", &translation3dCls}, - {"edu/wpi/first/util/RawFrame", &rawFrameCls}}; + {"org/wpilib/vision/apriltag/AprilTagPoseEstimate", &poseEstimateCls}, + {"org/wpilib/math/geometry/Quaternion", &quaternionCls}, + {"org/wpilib/math/geometry/Rotation3d", &rotation3dCls}, + {"org/wpilib/math/geometry/Transform3d", &transform3dCls}, + {"org/wpilib/math/geometry/Translation3d", &translation3dCls}, + {"org/wpilib/util/RawFrame", &rawFrameCls}}; static const JExceptionInit exceptions[] = { {"java/lang/IllegalArgumentException", &illegalArgEx}, @@ -283,7 +283,7 @@ static jobject MakeJObject(JNIEnv* env, const Quaternion& q) { static jobject MakeJObject(JNIEnv* env, const Rotation3d& rot) { static jmethodID constructor = env->GetMethodID( - rotation3dCls, "", "(Ledu/wpi/first/math/geometry/Quaternion;)V"); + rotation3dCls, "", "(Lorg/wpilib/math/geometry/Quaternion;)V"); if (!constructor) { return nullptr; } @@ -295,8 +295,8 @@ static jobject MakeJObject(JNIEnv* env, const Rotation3d& rot) { static jobject MakeJObject(JNIEnv* env, const Transform3d& xform) { static jmethodID constructor = env->GetMethodID(transform3dCls, "", - "(Ledu/wpi/first/math/geometry/Translation3d;" - "Ledu/wpi/first/math/geometry/Rotation3d;)V"); + "(Lorg/wpilib/math/geometry/Translation3d;" + "Lorg/wpilib/math/geometry/Rotation3d;)V"); if (!constructor) { return nullptr; } @@ -309,8 +309,8 @@ static jobject MakeJObject(JNIEnv* env, const Transform3d& xform) { static jobject MakeJObject(JNIEnv* env, const AprilTagPoseEstimate& est) { static jmethodID constructor = env->GetMethodID(poseEstimateCls, "", - "(Ledu/wpi/first/math/geometry/Transform3d;" - "Ledu/wpi/first/math/geometry/Transform3d;DD)V"); + "(Lorg/wpilib/math/geometry/Transform3d;" + "Lorg/wpilib/math/geometry/Transform3d;DD)V"); if (!constructor) { return nullptr; } @@ -325,36 +325,36 @@ static jobject MakeJObject(JNIEnv* env, const AprilTagPoseEstimate& est) { extern "C" { /* - * Class: edu_wpi_first_apriltag_jni_AprilTagJNI + * Class: org_wpilib_vision_apriltag_jni_AprilTagJNI * Method: createDetector * Signature: ()J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_apriltag_jni_AprilTagJNI_createDetector +Java_org_wpilib_vision_apriltag_jni_AprilTagJNI_createDetector (JNIEnv* env, jclass) { return reinterpret_cast(new AprilTagDetector); } /* - * Class: edu_wpi_first_apriltag_jni_AprilTagJNI + * Class: org_wpilib_vision_apriltag_jni_AprilTagJNI * Method: destroyDetector * Signature: (J)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_apriltag_jni_AprilTagJNI_destroyDetector +Java_org_wpilib_vision_apriltag_jni_AprilTagJNI_destroyDetector (JNIEnv* env, jclass, jlong det) { delete reinterpret_cast(det); } /* - * Class: edu_wpi_first_apriltag_jni_AprilTagJNI + * Class: org_wpilib_vision_apriltag_jni_AprilTagJNI * Method: setDetectorConfig * Signature: (JLjava/lang/Object;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_apriltag_jni_AprilTagJNI_setDetectorConfig +Java_org_wpilib_vision_apriltag_jni_AprilTagJNI_setDetectorConfig (JNIEnv* env, jclass, jlong det, jobject config) { if (det == 0) { @@ -366,12 +366,12 @@ Java_edu_wpi_first_apriltag_jni_AprilTagJNI_setDetectorConfig } /* - * Class: edu_wpi_first_apriltag_jni_AprilTagJNI + * Class: org_wpilib_vision_apriltag_jni_AprilTagJNI * Method: getDetectorConfig * Signature: (J)Ljava/lang/Object; */ JNIEXPORT jobject JNICALL -Java_edu_wpi_first_apriltag_jni_AprilTagJNI_getDetectorConfig +Java_org_wpilib_vision_apriltag_jni_AprilTagJNI_getDetectorConfig (JNIEnv* env, jclass, jlong det) { if (det == 0) { @@ -383,12 +383,12 @@ Java_edu_wpi_first_apriltag_jni_AprilTagJNI_getDetectorConfig } /* - * Class: edu_wpi_first_apriltag_jni_AprilTagJNI + * Class: org_wpilib_vision_apriltag_jni_AprilTagJNI * Method: setDetectorQTP * Signature: (JLjava/lang/Object;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_apriltag_jni_AprilTagJNI_setDetectorQTP +Java_org_wpilib_vision_apriltag_jni_AprilTagJNI_setDetectorQTP (JNIEnv* env, jclass, jlong det, jobject params) { if (det == 0) { @@ -400,12 +400,12 @@ Java_edu_wpi_first_apriltag_jni_AprilTagJNI_setDetectorQTP } /* - * Class: edu_wpi_first_apriltag_jni_AprilTagJNI + * Class: org_wpilib_vision_apriltag_jni_AprilTagJNI * Method: getDetectorQTP * Signature: (J)Ljava/lang/Object; */ JNIEXPORT jobject JNICALL -Java_edu_wpi_first_apriltag_jni_AprilTagJNI_getDetectorQTP +Java_org_wpilib_vision_apriltag_jni_AprilTagJNI_getDetectorQTP (JNIEnv* env, jclass, jlong det) { if (det == 0) { @@ -418,12 +418,12 @@ Java_edu_wpi_first_apriltag_jni_AprilTagJNI_getDetectorQTP } /* - * Class: edu_wpi_first_apriltag_jni_AprilTagJNI + * Class: org_wpilib_vision_apriltag_jni_AprilTagJNI * Method: addFamily * Signature: (JLjava/lang/String;I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_apriltag_jni_AprilTagJNI_addFamily +Java_org_wpilib_vision_apriltag_jni_AprilTagJNI_addFamily (JNIEnv* env, jclass, jlong det, jstring fam, jint bitsCorrected) { if (det == 0) { @@ -439,12 +439,12 @@ Java_edu_wpi_first_apriltag_jni_AprilTagJNI_addFamily } /* - * Class: edu_wpi_first_apriltag_jni_AprilTagJNI + * Class: org_wpilib_vision_apriltag_jni_AprilTagJNI * Method: removeFamily * Signature: (JLjava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_apriltag_jni_AprilTagJNI_removeFamily +Java_org_wpilib_vision_apriltag_jni_AprilTagJNI_removeFamily (JNIEnv* env, jclass, jlong det, jstring fam) { if (det == 0) { @@ -459,12 +459,12 @@ Java_edu_wpi_first_apriltag_jni_AprilTagJNI_removeFamily } /* - * Class: edu_wpi_first_apriltag_jni_AprilTagJNI + * Class: org_wpilib_vision_apriltag_jni_AprilTagJNI * Method: clearFamilies * Signature: (J)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_apriltag_jni_AprilTagJNI_clearFamilies +Java_org_wpilib_vision_apriltag_jni_AprilTagJNI_clearFamilies (JNIEnv* env, jclass, jlong det) { if (det == 0) { @@ -475,12 +475,12 @@ Java_edu_wpi_first_apriltag_jni_AprilTagJNI_clearFamilies } /* - * Class: edu_wpi_first_apriltag_jni_AprilTagJNI + * Class: org_wpilib_vision_apriltag_jni_AprilTagJNI * Method: detect * Signature: (JIIIJ)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_apriltag_jni_AprilTagJNI_detect +Java_org_wpilib_vision_apriltag_jni_AprilTagJNI_detect (JNIEnv* env, jclass, jlong det, jint width, jint height, jint stride, jlong bufAddr) { @@ -498,12 +498,12 @@ Java_edu_wpi_first_apriltag_jni_AprilTagJNI_detect } /* - * Class: edu_wpi_first_apriltag_jni_AprilTagJNI + * Class: org_wpilib_vision_apriltag_jni_AprilTagJNI * Method: estimatePoseHomography * Signature: ([DDDDDD)Ljava/lang/Object; */ JNIEXPORT jobject JNICALL -Java_edu_wpi_first_apriltag_jni_AprilTagJNI_estimatePoseHomography +Java_org_wpilib_vision_apriltag_jni_AprilTagJNI_estimatePoseHomography (JNIEnv* env, jclass, jdoubleArray homography, jdouble tagSize, jdouble fx, jdouble fy, jdouble cx, jdouble cy) { @@ -522,12 +522,12 @@ Java_edu_wpi_first_apriltag_jni_AprilTagJNI_estimatePoseHomography } /* - * Class: edu_wpi_first_apriltag_jni_AprilTagJNI + * Class: org_wpilib_vision_apriltag_jni_AprilTagJNI * Method: estimatePoseOrthogonalIteration * Signature: ([D[DDDDDDI)Ljava/lang/Object; */ JNIEXPORT jobject JNICALL -Java_edu_wpi_first_apriltag_jni_AprilTagJNI_estimatePoseOrthogonalIteration +Java_org_wpilib_vision_apriltag_jni_AprilTagJNI_estimatePoseOrthogonalIteration (JNIEnv* env, jclass, jdoubleArray homography, jdoubleArray corners, jdouble tagSize, jdouble fx, jdouble fy, jdouble cx, jdouble cy, jint nIters) { @@ -559,12 +559,12 @@ Java_edu_wpi_first_apriltag_jni_AprilTagJNI_estimatePoseOrthogonalIteration } /* - * Class: edu_wpi_first_apriltag_jni_AprilTagJNI + * Class: org_wpilib_vision_apriltag_jni_AprilTagJNI * Method: estimatePose * Signature: ([D[DDDDDD)Ljava/lang/Object; */ JNIEXPORT jobject JNICALL -Java_edu_wpi_first_apriltag_jni_AprilTagJNI_estimatePose +Java_org_wpilib_vision_apriltag_jni_AprilTagJNI_estimatePose (JNIEnv* env, jclass, jdoubleArray homography, jdoubleArray corners, jdouble tagSize, jdouble fx, jdouble fy, jdouble cx, jdouble cy) { @@ -595,12 +595,12 @@ Java_edu_wpi_first_apriltag_jni_AprilTagJNI_estimatePose } /* - * Class: edu_wpi_first_apriltag_jni_AprilTagJNI + * Class: org_wpilib_vision_apriltag_jni_AprilTagJNI * Method: generate16h5AprilTagImage * Signature: (Ljava/lang/Object;JI)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_apriltag_jni_AprilTagJNI_generate16h5AprilTagImage +Java_org_wpilib_vision_apriltag_jni_AprilTagJNI_generate16h5AprilTagImage (JNIEnv* env, jclass, jobject frameObj, jlong framePtr, jint id) { auto* frame = reinterpret_cast(framePtr); @@ -613,12 +613,12 @@ Java_edu_wpi_first_apriltag_jni_AprilTagJNI_generate16h5AprilTagImage } /* - * Class: edu_wpi_first_apriltag_jni_AprilTagJNI + * Class: org_wpilib_vision_apriltag_jni_AprilTagJNI * Method: generate36h11AprilTagImage * Signature: (Ljava/lang/Object;JI)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_apriltag_jni_AprilTagJNI_generate36h11AprilTagImage +Java_org_wpilib_vision_apriltag_jni_AprilTagJNI_generate36h11AprilTagImage (JNIEnv* env, jclass, jobject frameObj, jlong framePtr, jint id) { auto* frame = reinterpret_cast(framePtr); diff --git a/apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagDetectorTest.java b/apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagDetectorTest.java index 4a83016b8c..f6d2664f99 100644 --- a/apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagDetectorTest.java +++ b/apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagDetectorTest.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.apriltag; +package org.wpilib.vision.apriltag; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; -import edu.wpi.first.math.geometry.Transform3d; -import edu.wpi.first.math.util.Units; -import edu.wpi.first.util.RuntimeLoader; +import org.wpilib.math.geometry.Transform3d; +import org.wpilib.math.util.Units; +import org.wpilib.util.runtime.RuntimeLoader; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; diff --git a/apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagGenerationTest.java b/apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagGenerationTest.java index 3f3a9e65d9..88e362d902 100644 --- a/apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagGenerationTest.java +++ b/apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagGenerationTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.apriltag; +package org.wpilib.vision.apriltag; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.util.PixelFormat; +import org.wpilib.util.PixelFormat; import org.junit.jupiter.api.Test; class AprilTagGenerationTest { diff --git a/apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagPoseSetOriginTest.java b/apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagPoseSetOriginTest.java index 8f373b363d..99db5fd4db 100644 --- a/apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagPoseSetOriginTest.java +++ b/apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagPoseSetOriginTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.apriltag; +package org.wpilib.vision.apriltag; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.math.util.Units; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagSerializationTest.java b/apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagSerializationTest.java index df734f3766..b1ee681f5a 100644 --- a/apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagSerializationTest.java +++ b/apriltag/src/test/java/org/wpilib/vision/apriltag/AprilTagSerializationTest.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.apriltag; +package org.wpilib.vision.apriltag; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import com.fasterxml.jackson.databind.ObjectMapper; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.util.Units; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/apriltag/src/test/java/org/wpilib/vision/apriltag/LoadConfigTest.java b/apriltag/src/test/java/org/wpilib/vision/apriltag/LoadConfigTest.java index 66923f4401..5118ea548d 100644 --- a/apriltag/src/test/java/org/wpilib/vision/apriltag/LoadConfigTest.java +++ b/apriltag/src/test/java/org/wpilib/vision/apriltag/LoadConfigTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.apriltag; +package org.wpilib.vision.apriltag; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.util.Units; import java.util.Optional; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/benchmark/src/main/java/frc/robot/Main.java b/benchmark/src/main/java/frc/robot/Main.java index 862a2f58b7..cf0fc63c82 100644 --- a/benchmark/src/main/java/frc/robot/Main.java +++ b/benchmark/src/main/java/frc/robot/Main.java @@ -4,9 +4,9 @@ package frc.robot; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.path.TravelingSalesman; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.path.TravelingSalesman; import java.util.concurrent.TimeUnit; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; diff --git a/cameraserver/multiCameraServer/src/main/java/edu/wpi/Main.java b/cameraserver/multiCameraServer/src/main/java/edu/wpi/Main.java index fb85333b27..751cf3a919 100644 --- a/cameraserver/multiCameraServer/src/main/java/edu/wpi/Main.java +++ b/cameraserver/multiCameraServer/src/main/java/edu/wpi/Main.java @@ -10,9 +10,9 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import edu.wpi.first.cameraserver.CameraServer; -import edu.wpi.first.cscore.VideoSource; -import edu.wpi.first.networktables.NetworkTableInstance; +import org.wpilib.vision.stream.CameraServer; +import org.wpilib.vision.camera.VideoSource; +import org.wpilib.networktables.NetworkTableInstance; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; diff --git a/cameraserver/src/dev/java/org/wpilib/vision/stream/DevMain.java b/cameraserver/src/dev/java/org/wpilib/vision/stream/DevMain.java index df4affa9d9..fece6d4d12 100644 --- a/cameraserver/src/dev/java/org/wpilib/vision/stream/DevMain.java +++ b/cameraserver/src/dev/java/org/wpilib/vision/stream/DevMain.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 edu.wpi.first.cameraserver; +package org.wpilib.vision.stream; public final class DevMain { public static void main(String[] args) {} diff --git a/cameraserver/src/main/java/org/wpilib/vision/process/VisionPipeline.java b/cameraserver/src/main/java/org/wpilib/vision/process/VisionPipeline.java index d9e65df896..44368d67e1 100644 --- a/cameraserver/src/main/java/org/wpilib/vision/process/VisionPipeline.java +++ b/cameraserver/src/main/java/org/wpilib/vision/process/VisionPipeline.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 edu.wpi.first.vision; +package org.wpilib.vision.process; import org.opencv.core.Mat; diff --git a/cameraserver/src/main/java/org/wpilib/vision/process/VisionRunner.java b/cameraserver/src/main/java/org/wpilib/vision/process/VisionRunner.java index bb8dc9ff8d..ece5b67882 100644 --- a/cameraserver/src/main/java/org/wpilib/vision/process/VisionRunner.java +++ b/cameraserver/src/main/java/org/wpilib/vision/process/VisionRunner.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.vision; +package org.wpilib.vision.process; -import edu.wpi.first.cameraserver.CameraServerSharedStore; -import edu.wpi.first.cscore.CvSink; -import edu.wpi.first.cscore.VideoSource; +import org.wpilib.vision.stream.CameraServerSharedStore; +import org.wpilib.vision.camera.CvSink; +import org.wpilib.vision.camera.VideoSource; import org.opencv.core.Mat; /** diff --git a/cameraserver/src/main/java/org/wpilib/vision/process/VisionThread.java b/cameraserver/src/main/java/org/wpilib/vision/process/VisionThread.java index 93d4e83758..53f2068f0c 100644 --- a/cameraserver/src/main/java/org/wpilib/vision/process/VisionThread.java +++ b/cameraserver/src/main/java/org/wpilib/vision/process/VisionThread.java @@ -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. -package edu.wpi.first.vision; +package org.wpilib.vision.process; -import edu.wpi.first.cscore.VideoSource; +import org.wpilib.vision.camera.VideoSource; /** * A vision thread is a special thread that runs a vision pipeline. It is a daemon thread; it diff --git a/cameraserver/src/main/java/org/wpilib/vision/process/package-info.java b/cameraserver/src/main/java/org/wpilib/vision/process/package-info.java index d666206c32..00892edad1 100644 --- a/cameraserver/src/main/java/org/wpilib/vision/process/package-info.java +++ b/cameraserver/src/main/java/org/wpilib/vision/process/package-info.java @@ -3,7 +3,7 @@ // the WPILib BSD license file in the root directory of this project. /** - * Classes in the {@code edu.wpi.first.vision} package are designed to simplify using OpenCV vision + * Classes in the {@code org.wpilib.vision.process} package are designed to simplify using OpenCV vision * processing code from a robot program. * *

An example use case for grabbing a yellow tote from 2015 in autonomous:
@@ -13,13 +13,13 @@ * implements VisionRunner.Listener<MyFindTotePipeline> { * * // A USB camera connected to the roboRIO. - * private {@link edu.wpi.first.cscore.VideoSource VideoSource} usbCamera; + * private {@link org.wpilib.vision.camera.VideoSource VideoSource} usbCamera; * * // A vision pipeline. This could be handwritten or generated by GRIP. - * // This has to implement {@link edu.wpi.first.vision.VisionPipeline}. + * // This has to implement {@link org.wpilib.vision.process.VisionPipeline}. * // For this example, assume that it's perfect and will always see the tote. * private MyFindTotePipeline findTotePipeline; - * private {@link edu.wpi.first.vision.VisionThread} findToteThread; + * private {@link org.wpilib.vision.process.VisionThread} findToteThread; * * // The object to synchronize on to make sure the vision thread doesn't * // write to variables the main thread is using. @@ -37,7 +37,7 @@ * } * * {@literal @}Override - * public void {@link edu.wpi.first.vision.VisionRunner.Listener#copyPipelineOutputs + * public void {@link org.wpilib.vision.process.VisionRunner.Listener#copyPipelineOutputs * copyPipelineOutputs(MyFindTotePipeline pipeline)} { * synchronized (visionLock) { * // Take a snapshot of the pipeline's output because @@ -81,4 +81,4 @@ * } * */ -package edu.wpi.first.vision; +package org.wpilib.vision.process; diff --git a/cameraserver/src/main/java/org/wpilib/vision/stream/CameraServer.java b/cameraserver/src/main/java/org/wpilib/vision/stream/CameraServer.java index 7bb5eff433..5bc4905803 100644 --- a/cameraserver/src/main/java/org/wpilib/vision/stream/CameraServer.java +++ b/cameraserver/src/main/java/org/wpilib/vision/stream/CameraServer.java @@ -2,30 +2,30 @@ // 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 edu.wpi.first.cameraserver; +package org.wpilib.vision.stream; -import edu.wpi.first.cscore.CameraServerJNI; -import edu.wpi.first.cscore.CvSink; -import edu.wpi.first.cscore.CvSource; -import edu.wpi.first.cscore.MjpegServer; -import edu.wpi.first.cscore.UsbCamera; -import edu.wpi.first.cscore.VideoEvent; -import edu.wpi.first.cscore.VideoException; -import edu.wpi.first.cscore.VideoListener; -import edu.wpi.first.cscore.VideoMode; -import edu.wpi.first.cscore.VideoSink; -import edu.wpi.first.cscore.VideoSource; -import edu.wpi.first.networktables.BooleanEntry; -import edu.wpi.first.networktables.BooleanPublisher; -import edu.wpi.first.networktables.IntegerEntry; -import edu.wpi.first.networktables.IntegerPublisher; -import edu.wpi.first.networktables.NetworkTable; -import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.networktables.StringArrayPublisher; -import edu.wpi.first.networktables.StringArrayTopic; -import edu.wpi.first.networktables.StringEntry; -import edu.wpi.first.networktables.StringPublisher; -import edu.wpi.first.util.PixelFormat; +import org.wpilib.vision.camera.CameraServerJNI; +import org.wpilib.vision.camera.CvSink; +import org.wpilib.vision.camera.CvSource; +import org.wpilib.vision.camera.MjpegServer; +import org.wpilib.vision.camera.UsbCamera; +import org.wpilib.vision.camera.VideoEvent; +import org.wpilib.vision.camera.VideoException; +import org.wpilib.vision.camera.VideoListener; +import org.wpilib.vision.camera.VideoMode; +import org.wpilib.vision.camera.VideoSink; +import org.wpilib.vision.camera.VideoSource; +import org.wpilib.networktables.BooleanEntry; +import org.wpilib.networktables.BooleanPublisher; +import org.wpilib.networktables.IntegerEntry; +import org.wpilib.networktables.IntegerPublisher; +import org.wpilib.networktables.NetworkTable; +import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.networktables.StringArrayPublisher; +import org.wpilib.networktables.StringArrayTopic; +import org.wpilib.networktables.StringEntry; +import org.wpilib.networktables.StringPublisher; +import org.wpilib.util.PixelFormat; import java.lang.ref.Reference; import java.util.ArrayList; import java.util.Arrays; diff --git a/cameraserver/src/main/java/org/wpilib/vision/stream/CameraServerShared.java b/cameraserver/src/main/java/org/wpilib/vision/stream/CameraServerShared.java index 737aed8990..4f17b54699 100644 --- a/cameraserver/src/main/java/org/wpilib/vision/stream/CameraServerShared.java +++ b/cameraserver/src/main/java/org/wpilib/vision/stream/CameraServerShared.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 edu.wpi.first.cameraserver; +package org.wpilib.vision.stream; /** CameraServer shared functions. */ public interface CameraServerShared { diff --git a/cameraserver/src/main/java/org/wpilib/vision/stream/CameraServerSharedStore.java b/cameraserver/src/main/java/org/wpilib/vision/stream/CameraServerSharedStore.java index c9458c6338..af56dec47d 100644 --- a/cameraserver/src/main/java/org/wpilib/vision/stream/CameraServerSharedStore.java +++ b/cameraserver/src/main/java/org/wpilib/vision/stream/CameraServerSharedStore.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 edu.wpi.first.cameraserver; +package org.wpilib.vision.stream; /** Storage for CameraServerShared instance. */ public final class CameraServerSharedStore { diff --git a/commandsv2/src/dev/java/org/wpilib/commands2/DevMain.java b/commandsv2/src/dev/java/org/wpilib/commands2/DevMain.java index 5a4eff1c07..b88b4e7916 100644 --- a/commandsv2/src/dev/java/org/wpilib/commands2/DevMain.java +++ b/commandsv2/src/dev/java/org/wpilib/commands2/DevMain.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj2.commands; +package org.wpilib.commands2; -import edu.wpi.first.hal.HALUtil; -import edu.wpi.first.networktables.NetworkTablesJNI; -import edu.wpi.first.util.CombinedRuntimeLoader; +import org.wpilib.hardware.hal.HALUtil; +import org.wpilib.networktables.NetworkTablesJNI; +import org.wpilib.util.runtime.CombinedRuntimeLoader; public final class DevMain { /** Main entry point. */ diff --git a/commandsv2/src/generate/main/java/commandhid.java.jinja b/commandsv2/src/generate/main/java/commandhid.java.jinja index 54a6c1f72f..b1a7749fa0 100644 --- a/commandsv2/src/generate/main/java/commandhid.java.jinja +++ b/commandsv2/src/generate/main/java/commandhid.java.jinja @@ -6,11 +6,11 @@ {% macro capitalize_first(string) -%} {{ string[0]|capitalize + string[1:] }} {%- endmacro %} -package edu.wpi.first.wpilibj2.command.button; +package org.wpilib.command2.button; -import edu.wpi.first.wpilibj.{{ ConsoleName }}Controller; -import edu.wpi.first.wpilibj.event.EventLoop; -import edu.wpi.first.wpilibj2.command.CommandScheduler; +import org.wpilib.{{ ConsoleName }}Controller; +import org.wpilib.event.EventLoop; +import org.wpilib.command2.CommandScheduler; /** * A version of {@link {{ ConsoleName }}Controller} with {@link Trigger} factories for command-based. diff --git a/commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandPS4Controller.java b/commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandPS4Controller.java index 79faec3fba..e6ad56a4c5 100644 --- a/commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandPS4Controller.java +++ b/commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandPS4Controller.java @@ -4,11 +4,11 @@ // THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY -package edu.wpi.first.wpilibj2.command.button; +package org.wpilib.command2.button; -import edu.wpi.first.wpilibj.PS4Controller; -import edu.wpi.first.wpilibj.event.EventLoop; -import edu.wpi.first.wpilibj2.command.CommandScheduler; +import org.wpilib.driverstation.PS4Controller; +import org.wpilib.event.EventLoop; +import org.wpilib.command2.CommandScheduler; /** * A version of {@link PS4Controller} with {@link Trigger} factories for command-based. diff --git a/commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandPS5Controller.java b/commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandPS5Controller.java index 708f5a8b4d..6d5cea29e4 100644 --- a/commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandPS5Controller.java +++ b/commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandPS5Controller.java @@ -4,11 +4,11 @@ // THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY -package edu.wpi.first.wpilibj2.command.button; +package org.wpilib.command2.button; -import edu.wpi.first.wpilibj.PS5Controller; -import edu.wpi.first.wpilibj.event.EventLoop; -import edu.wpi.first.wpilibj2.command.CommandScheduler; +import org.wpilib.driverstation.PS5Controller; +import org.wpilib.event.EventLoop; +import org.wpilib.command2.CommandScheduler; /** * A version of {@link PS5Controller} with {@link Trigger} factories for command-based. diff --git a/commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandStadiaController.java b/commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandStadiaController.java index dc6c6f1658..5d8b00a503 100644 --- a/commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandStadiaController.java +++ b/commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandStadiaController.java @@ -4,11 +4,11 @@ // THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY -package edu.wpi.first.wpilibj2.command.button; +package org.wpilib.command2.button; -import edu.wpi.first.wpilibj.StadiaController; -import edu.wpi.first.wpilibj.event.EventLoop; -import edu.wpi.first.wpilibj2.command.CommandScheduler; +import org.wpilib.driverstation.StadiaController; +import org.wpilib.event.EventLoop; +import org.wpilib.command2.CommandScheduler; /** * A version of {@link StadiaController} with {@link Trigger} factories for command-based. diff --git a/commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandXboxController.java b/commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandXboxController.java index 1b8104a6d4..1047f0aeec 100644 --- a/commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandXboxController.java +++ b/commandsv2/src/generated/main/java/org/wpilib/command2/button/CommandXboxController.java @@ -4,11 +4,11 @@ // THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY -package edu.wpi.first.wpilibj2.command.button; +package org.wpilib.command2.button; -import edu.wpi.first.wpilibj.XboxController; -import edu.wpi.first.wpilibj.event.EventLoop; -import edu.wpi.first.wpilibj2.command.CommandScheduler; +import org.wpilib.driverstation.XboxController; +import org.wpilib.event.EventLoop; +import org.wpilib.command2.CommandScheduler; /** * A version of {@link XboxController} with {@link Trigger} factories for command-based. diff --git a/commandsv2/src/main/java/org/wpilib/command2/Command.java b/commandsv2/src/main/java/org/wpilib/command2/Command.java index 68944440e0..91894e9681 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/Command.java +++ b/commandsv2/src/main/java/org/wpilib/command2/Command.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; -import static edu.wpi.first.units.Units.Seconds; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.units.Units.Seconds; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.units.measure.Time; -import edu.wpi.first.util.function.BooleanConsumer; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.units.measure.Time; +import org.wpilib.util.function.BooleanConsumer; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; import java.util.Collection; import java.util.HashSet; import java.util.Set; diff --git a/commandsv2/src/main/java/org/wpilib/command2/CommandScheduler.java b/commandsv2/src/main/java/org/wpilib/command2/CommandScheduler.java index 299e07c56e..762f394020 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/CommandScheduler.java +++ b/commandsv2/src/main/java/org/wpilib/command2/CommandScheduler.java @@ -2,21 +2,21 @@ // 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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; -import edu.wpi.first.wpilibj.DriverStation; -import edu.wpi.first.wpilibj.RobotBase; -import edu.wpi.first.wpilibj.RobotState; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.Watchdog; -import edu.wpi.first.wpilibj.event.EventLoop; -import edu.wpi.first.wpilibj2.command.Command.InterruptionBehavior; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; +import org.wpilib.driverstation.DriverStation; +import org.wpilib.opmode.RobotBase; +import org.wpilib.opmode.RobotState; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.system.Watchdog; +import org.wpilib.event.EventLoop; +import org.wpilib.command2.Command.InterruptionBehavior; import java.io.PrintWriter; import java.io.StringWriter; import java.util.ArrayList; @@ -650,12 +650,12 @@ public final class CommandScheduler implements Sendable, AutoCloseable { * * @param stacktrace the original stacktrace * @return the stacktrace stripped of leading elements so there is at max one leading element from - * the edu.wpi.first.wpilibj2.command package. + * the org.wpilib.command2 package. */ private StackTraceElement[] stripFrameworkStackElements(StackTraceElement[] stacktrace) { int i = stacktrace.length - 1; for (; i > 0; i--) { - if (stacktrace[i].getClassName().startsWith("edu.wpi.first.wpilibj2.command.")) { + if (stacktrace[i].getClassName().startsWith("org.wpilib.command2.")) { break; } } diff --git a/commandsv2/src/main/java/org/wpilib/command2/Commands.java b/commandsv2/src/main/java/org/wpilib/command2/Commands.java index 49f68dc591..88b808e765 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/Commands.java +++ b/commandsv2/src/main/java/org/wpilib/command2/Commands.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.units.measure.Time; +import org.wpilib.units.measure.Time; import java.util.Map; import java.util.Set; import java.util.function.BooleanSupplier; diff --git a/commandsv2/src/main/java/org/wpilib/command2/ConditionalCommand.java b/commandsv2/src/main/java/org/wpilib/command2/ConditionalCommand.java index 1d2661afb6..749b86dd09 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/ConditionalCommand.java +++ b/commandsv2/src/main/java/org/wpilib/command2/ConditionalCommand.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableBuilder; import java.util.function.BooleanSupplier; /** diff --git a/commandsv2/src/main/java/org/wpilib/command2/DeferredCommand.java b/commandsv2/src/main/java/org/wpilib/command2/DeferredCommand.java index f76cf90923..1085e39ec1 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/DeferredCommand.java +++ b/commandsv2/src/main/java/org/wpilib/command2/DeferredCommand.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableBuilder; import java.util.Set; import java.util.function.Supplier; diff --git a/commandsv2/src/main/java/org/wpilib/command2/FunctionalCommand.java b/commandsv2/src/main/java/org/wpilib/command2/FunctionalCommand.java index 9f1d8a8130..77cdc60979 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/FunctionalCommand.java +++ b/commandsv2/src/main/java/org/wpilib/command2/FunctionalCommand.java @@ -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. -package edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; import java.util.function.BooleanSupplier; import java.util.function.Consumer; diff --git a/commandsv2/src/main/java/org/wpilib/command2/InstantCommand.java b/commandsv2/src/main/java/org/wpilib/command2/InstantCommand.java index 25f7c9a109..966cc18588 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/InstantCommand.java +++ b/commandsv2/src/main/java/org/wpilib/command2/InstantCommand.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; /** * A Command that runs instantly; it will initialize, execute once, and end on the same iteration of diff --git a/commandsv2/src/main/java/org/wpilib/command2/NotifierCommand.java b/commandsv2/src/main/java/org/wpilib/command2/NotifierCommand.java index 4109091cd1..ae5b0a9951 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/NotifierCommand.java +++ b/commandsv2/src/main/java/org/wpilib/command2/NotifierCommand.java @@ -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. -package edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; -import edu.wpi.first.wpilibj.Notifier; +import org.wpilib.system.Notifier; /** * A command that starts a notifier to run the given runnable periodically in a separate thread. Has diff --git a/commandsv2/src/main/java/org/wpilib/command2/ParallelCommandGroup.java b/commandsv2/src/main/java/org/wpilib/command2/ParallelCommandGroup.java index 0fc31876ce..24f03e28df 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/ParallelCommandGroup.java +++ b/commandsv2/src/main/java/org/wpilib/command2/ParallelCommandGroup.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/commandsv2/src/main/java/org/wpilib/command2/ParallelDeadlineGroup.java b/commandsv2/src/main/java/org/wpilib/command2/ParallelDeadlineGroup.java index 2286cee7de..936dbf43eb 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/ParallelDeadlineGroup.java +++ b/commandsv2/src/main/java/org/wpilib/command2/ParallelDeadlineGroup.java @@ -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. -package edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; -import edu.wpi.first.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableBuilder; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; diff --git a/commandsv2/src/main/java/org/wpilib/command2/ParallelRaceGroup.java b/commandsv2/src/main/java/org/wpilib/command2/ParallelRaceGroup.java index 069f4a8162..8c3d81817f 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/ParallelRaceGroup.java +++ b/commandsv2/src/main/java/org/wpilib/command2/ParallelRaceGroup.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import java.util.Collections; import java.util.LinkedHashSet; diff --git a/commandsv2/src/main/java/org/wpilib/command2/PrintCommand.java b/commandsv2/src/main/java/org/wpilib/command2/PrintCommand.java index 3d7726e46f..39a7e26bbd 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/PrintCommand.java +++ b/commandsv2/src/main/java/org/wpilib/command2/PrintCommand.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; /** * A command that prints a string when initialized. diff --git a/commandsv2/src/main/java/org/wpilib/command2/ProxyCommand.java b/commandsv2/src/main/java/org/wpilib/command2/ProxyCommand.java index 67f8fdb1ce..562f7264c4 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/ProxyCommand.java +++ b/commandsv2/src/main/java/org/wpilib/command2/ProxyCommand.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableBuilder; import java.util.function.Supplier; /** diff --git a/commandsv2/src/main/java/org/wpilib/command2/RepeatCommand.java b/commandsv2/src/main/java/org/wpilib/command2/RepeatCommand.java index 6c64b4f2e4..bf4b6b400f 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/RepeatCommand.java +++ b/commandsv2/src/main/java/org/wpilib/command2/RepeatCommand.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableBuilder; /** * A command that runs another command repeatedly, restarting it when it ends, until this command is diff --git a/commandsv2/src/main/java/org/wpilib/command2/RunCommand.java b/commandsv2/src/main/java/org/wpilib/command2/RunCommand.java index c0a17b57c1..aa2c523979 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/RunCommand.java +++ b/commandsv2/src/main/java/org/wpilib/command2/RunCommand.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import java.util.function.BooleanSupplier; diff --git a/commandsv2/src/main/java/org/wpilib/command2/ScheduleCommand.java b/commandsv2/src/main/java/org/wpilib/command2/ScheduleCommand.java index 788f6fc2b0..db44261869 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/ScheduleCommand.java +++ b/commandsv2/src/main/java/org/wpilib/command2/ScheduleCommand.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import java.util.Set; diff --git a/commandsv2/src/main/java/org/wpilib/command2/SelectCommand.java b/commandsv2/src/main/java/org/wpilib/command2/SelectCommand.java index 2712b4508e..1c1b6d6480 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/SelectCommand.java +++ b/commandsv2/src/main/java/org/wpilib/command2/SelectCommand.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableBuilder; import java.util.Map; import java.util.function.Supplier; diff --git a/commandsv2/src/main/java/org/wpilib/command2/SequentialCommandGroup.java b/commandsv2/src/main/java/org/wpilib/command2/SequentialCommandGroup.java index 5d6b2cd1e5..9ab0250cf8 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/SequentialCommandGroup.java +++ b/commandsv2/src/main/java/org/wpilib/command2/SequentialCommandGroup.java @@ -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. -package edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; -import edu.wpi.first.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableBuilder; import java.util.ArrayList; import java.util.List; diff --git a/commandsv2/src/main/java/org/wpilib/command2/StartEndCommand.java b/commandsv2/src/main/java/org/wpilib/command2/StartEndCommand.java index 9eff70d9d9..ede00ab0b7 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/StartEndCommand.java +++ b/commandsv2/src/main/java/org/wpilib/command2/StartEndCommand.java @@ -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. -package edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; import java.util.function.Consumer; diff --git a/commandsv2/src/main/java/org/wpilib/command2/Subsystem.java b/commandsv2/src/main/java/org/wpilib/command2/Subsystem.java index 4a0c056149..4ae2b8a71f 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/Subsystem.java +++ b/commandsv2/src/main/java/org/wpilib/command2/Subsystem.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import java.util.Set; import java.util.function.Supplier; @@ -36,7 +36,7 @@ public interface Subsystem { /** * This method is called periodically by the {@link CommandScheduler}. Useful for updating * subsystem-specific state that needs to be maintained for simulations, such as for updating - * {@link edu.wpi.first.wpilibj.simulation} classes and setting simulated sensor readings. + * {@link org.wpilib.simulation} classes and setting simulated sensor readings. */ default void simulationPeriodic() {} diff --git a/commandsv2/src/main/java/org/wpilib/command2/SubsystemBase.java b/commandsv2/src/main/java/org/wpilib/command2/SubsystemBase.java index 0ab58cd4fb..2c6c57a103 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/SubsystemBase.java +++ b/commandsv2/src/main/java/org/wpilib/command2/SubsystemBase.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; /** * A base for subsystems that handles registration in the constructor, and provides a more intuitive diff --git a/commandsv2/src/main/java/org/wpilib/command2/WaitCommand.java b/commandsv2/src/main/java/org/wpilib/command2/WaitCommand.java index 556d134c7e..be414c032b 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/WaitCommand.java +++ b/commandsv2/src/main/java/org/wpilib/command2/WaitCommand.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; -import static edu.wpi.first.units.Units.Seconds; +import static org.wpilib.units.Units.Seconds; -import edu.wpi.first.units.measure.Time; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; -import edu.wpi.first.wpilibj.Timer; +import org.wpilib.units.measure.Time; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; +import org.wpilib.system.Timer; /** * A command that does nothing but takes a specified amount of time to finish. diff --git a/commandsv2/src/main/java/org/wpilib/command2/WaitUntilCommand.java b/commandsv2/src/main/java/org/wpilib/command2/WaitUntilCommand.java index b96bc26a3a..1a90015a1a 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/WaitUntilCommand.java +++ b/commandsv2/src/main/java/org/wpilib/command2/WaitUntilCommand.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.wpilibj.Timer; +import org.wpilib.system.Timer; import java.util.function.BooleanSupplier; /** diff --git a/commandsv2/src/main/java/org/wpilib/command2/WrapperCommand.java b/commandsv2/src/main/java/org/wpilib/command2/WrapperCommand.java index 5e6ccaef82..e15f3000a1 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/WrapperCommand.java +++ b/commandsv2/src/main/java/org/wpilib/command2/WrapperCommand.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import java.util.Set; diff --git a/commandsv2/src/main/java/org/wpilib/command2/button/CommandGamepad.java b/commandsv2/src/main/java/org/wpilib/command2/button/CommandGamepad.java index 646b503074..f1d343c24b 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/button/CommandGamepad.java +++ b/commandsv2/src/main/java/org/wpilib/command2/button/CommandGamepad.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj2.command.button; +package org.wpilib.command2.button; -import edu.wpi.first.wpilibj.Gamepad; -import edu.wpi.first.wpilibj.event.EventLoop; -import edu.wpi.first.wpilibj2.command.CommandScheduler; +import org.wpilib.driverstation.Gamepad; +import org.wpilib.event.EventLoop; +import org.wpilib.command2.CommandScheduler; /** * A version of {@link Gamepad} with {@link Trigger} factories for command-based. diff --git a/commandsv2/src/main/java/org/wpilib/command2/button/CommandGenericHID.java b/commandsv2/src/main/java/org/wpilib/command2/button/CommandGenericHID.java index 8415781353..cb1a6ebf75 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/button/CommandGenericHID.java +++ b/commandsv2/src/main/java/org/wpilib/command2/button/CommandGenericHID.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj2.command.button; +package org.wpilib.command2.button; -import edu.wpi.first.math.Pair; -import edu.wpi.first.wpilibj.DriverStation.POVDirection; -import edu.wpi.first.wpilibj.GenericHID; -import edu.wpi.first.wpilibj.event.EventLoop; -import edu.wpi.first.wpilibj2.command.CommandScheduler; +import org.wpilib.math.util.Pair; +import org.wpilib.driverstation.DriverStation.POVDirection; +import org.wpilib.driverstation.GenericHID; +import org.wpilib.event.EventLoop; +import org.wpilib.command2.CommandScheduler; import java.util.HashMap; import java.util.Map; diff --git a/commandsv2/src/main/java/org/wpilib/command2/button/CommandJoystick.java b/commandsv2/src/main/java/org/wpilib/command2/button/CommandJoystick.java index 00d913e669..e23025e017 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/button/CommandJoystick.java +++ b/commandsv2/src/main/java/org/wpilib/command2/button/CommandJoystick.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj2.command.button; +package org.wpilib.command2.button; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.event.EventLoop; -import edu.wpi.first.wpilibj2.command.CommandScheduler; +import org.wpilib.driverstation.Joystick; +import org.wpilib.event.EventLoop; +import org.wpilib.command2.CommandScheduler; /** * A version of {@link Joystick} with {@link Trigger} factories for command-based. diff --git a/commandsv2/src/main/java/org/wpilib/command2/button/InternalButton.java b/commandsv2/src/main/java/org/wpilib/command2/button/InternalButton.java index 87c9b739b3..b0e0f4f5a5 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/button/InternalButton.java +++ b/commandsv2/src/main/java/org/wpilib/command2/button/InternalButton.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 edu.wpi.first.wpilibj2.command.button; +package org.wpilib.command2.button; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/commandsv2/src/main/java/org/wpilib/command2/button/JoystickButton.java b/commandsv2/src/main/java/org/wpilib/command2/button/JoystickButton.java index e85b666e85..02f54a4000 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/button/JoystickButton.java +++ b/commandsv2/src/main/java/org/wpilib/command2/button/JoystickButton.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj2.command.button; +package org.wpilib.command2.button; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.wpilibj.GenericHID; +import org.wpilib.driverstation.GenericHID; /** * A {@link Trigger} that gets its state from a {@link GenericHID}. diff --git a/commandsv2/src/main/java/org/wpilib/command2/button/NetworkButton.java b/commandsv2/src/main/java/org/wpilib/command2/button/NetworkButton.java index 0fb55711a4..9a9b2460b5 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/button/NetworkButton.java +++ b/commandsv2/src/main/java/org/wpilib/command2/button/NetworkButton.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj2.command.button; +package org.wpilib.command2.button; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.networktables.BooleanSubscriber; -import edu.wpi.first.networktables.BooleanTopic; -import edu.wpi.first.networktables.NetworkTable; -import edu.wpi.first.networktables.NetworkTableInstance; +import org.wpilib.networktables.BooleanSubscriber; +import org.wpilib.networktables.BooleanTopic; +import org.wpilib.networktables.NetworkTable; +import org.wpilib.networktables.NetworkTableInstance; /** * A {@link Trigger} that uses a {@link NetworkTable} boolean field. diff --git a/commandsv2/src/main/java/org/wpilib/command2/button/POVButton.java b/commandsv2/src/main/java/org/wpilib/command2/button/POVButton.java index 2f398c7cd2..64a7068472 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/button/POVButton.java +++ b/commandsv2/src/main/java/org/wpilib/command2/button/POVButton.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj2.command.button; +package org.wpilib.command2.button; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.wpilibj.DriverStation.POVDirection; -import edu.wpi.first.wpilibj.GenericHID; +import org.wpilib.driverstation.DriverStation.POVDirection; +import org.wpilib.driverstation.GenericHID; /** * A {@link Trigger} that gets its state from a POV on a {@link GenericHID}. diff --git a/commandsv2/src/main/java/org/wpilib/command2/button/RobotModeTriggers.java b/commandsv2/src/main/java/org/wpilib/command2/button/RobotModeTriggers.java index 9bef66abfa..8edcea3208 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/button/RobotModeTriggers.java +++ b/commandsv2/src/main/java/org/wpilib/command2/button/RobotModeTriggers.java @@ -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. -package edu.wpi.first.wpilibj2.command.button; +package org.wpilib.command2.button; -import edu.wpi.first.wpilibj.DriverStation; +import org.wpilib.driverstation.DriverStation; /** * A class containing static {@link Trigger} factories for running callbacks when the robot mode diff --git a/commandsv2/src/main/java/org/wpilib/command2/button/Trigger.java b/commandsv2/src/main/java/org/wpilib/command2/button/Trigger.java index 65c6145f6b..fe545ea14d 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/button/Trigger.java +++ b/commandsv2/src/main/java/org/wpilib/command2/button/Trigger.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj2.command.button; +package org.wpilib.command2.button; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.math.filter.Debouncer; -import edu.wpi.first.wpilibj.event.EventLoop; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.CommandScheduler; +import org.wpilib.math.filter.Debouncer; +import org.wpilib.event.EventLoop; +import org.wpilib.command2.Command; +import org.wpilib.command2.CommandScheduler; import java.util.function.BooleanSupplier; /** @@ -138,7 +138,7 @@ public class Trigger implements BooleanSupplier { * changes to `false`. * *

Doesn't re-start the command if it ends while the condition is still `true`. If the command - * should restart, see {@link edu.wpi.first.wpilibj2.command.RepeatCommand}. + * should restart, see {@link org.wpilib.command2.RepeatCommand}. * * @param command the command to start * @return this trigger, so calls can be chained @@ -161,7 +161,7 @@ public class Trigger implements BooleanSupplier { * condition changes to `true`. * *

Doesn't re-start the command if it ends while the condition is still `false`. If the command - * should restart, see {@link edu.wpi.first.wpilibj2.command.RepeatCommand}. + * should restart, see {@link org.wpilib.command2.RepeatCommand}. * * @param command the command to start * @return this trigger, so calls can be chained diff --git a/commandsv2/src/main/java/org/wpilib/command2/sysid/SysIdRoutine.java b/commandsv2/src/main/java/org/wpilib/command2/sysid/SysIdRoutine.java index 1935c84fdc..b5337c58ce 100644 --- a/commandsv2/src/main/java/org/wpilib/command2/sysid/SysIdRoutine.java +++ b/commandsv2/src/main/java/org/wpilib/command2/sysid/SysIdRoutine.java @@ -2,21 +2,21 @@ // 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 edu.wpi.first.wpilibj2.command.sysid; +package org.wpilib.command2.sysid; -import static edu.wpi.first.units.Units.Second; -import static edu.wpi.first.units.Units.Seconds; -import static edu.wpi.first.units.Units.Volts; +import static org.wpilib.units.Units.Second; +import static org.wpilib.units.Units.Seconds; +import static org.wpilib.units.Units.Volts; import static java.util.Map.entry; -import edu.wpi.first.units.VoltageUnit; -import edu.wpi.first.units.measure.Time; -import edu.wpi.first.units.measure.Velocity; -import edu.wpi.first.units.measure.Voltage; -import edu.wpi.first.wpilibj.Timer; -import edu.wpi.first.wpilibj.sysid.SysIdRoutineLog; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.Subsystem; +import org.wpilib.units.VoltageUnit; +import org.wpilib.units.measure.Time; +import org.wpilib.units.measure.Velocity; +import org.wpilib.units.measure.Voltage; +import org.wpilib.system.Timer; +import org.wpilib.sysid.SysIdRoutineLog; +import org.wpilib.command2.Command; +import org.wpilib.command2.Subsystem; import java.util.Map; import java.util.function.Consumer; diff --git a/commandsv2/src/test/java/org/wpilib/MockHardwareExtension.java b/commandsv2/src/test/java/org/wpilib/MockHardwareExtension.java index 2de1a07583..13ccafead2 100644 --- a/commandsv2/src/test/java/org/wpilib/MockHardwareExtension.java +++ b/commandsv2/src/test/java/org/wpilib/MockHardwareExtension.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj2; +package org.wpilib; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.simulation.DriverStationSim; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.simulation.DriverStationSim; import org.junit.jupiter.api.extension.BeforeAllCallback; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ExtensionContext.Namespace; diff --git a/commandsv2/src/test/java/org/wpilib/command2/CommandDecoratorTest.java b/commandsv2/src/test/java/org/wpilib/command2/CommandDecoratorTest.java index 704c690f5f..abaea1bda7 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/CommandDecoratorTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/CommandDecoratorTest.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.simulation.SimHooks; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.simulation.SimHooks; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.Test; diff --git a/commandsv2/src/test/java/org/wpilib/command2/CommandRequirementsTest.java b/commandsv2/src/test/java/org/wpilib/command2/CommandRequirementsTest.java index 45f017c388..40f2d89821 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/CommandRequirementsTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/CommandRequirementsTest.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/commandsv2/src/test/java/org/wpilib/command2/CommandScheduleTest.java b/commandsv2/src/test/java/org/wpilib/command2/CommandScheduleTest.java index 793ad95f1e..2d43265e31 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/CommandScheduleTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/CommandScheduleTest.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -11,8 +11,8 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; +import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.smartdashboard.SmartDashboard; import org.junit.jupiter.api.Test; class CommandScheduleTest extends CommandTestBase { diff --git a/commandsv2/src/test/java/org/wpilib/command2/CommandSchedulerTest.java b/commandsv2/src/test/java/org/wpilib/command2/CommandSchedulerTest.java index 2d4a3e4ab9..6acd03d07a 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/CommandSchedulerTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/CommandSchedulerTest.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/commandsv2/src/test/java/org/wpilib/command2/CommandSendableButtonTest.java b/commandsv2/src/test/java/org/wpilib/command2/CommandSendableButtonTest.java index 809044aeb0..82ebdb467b 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/CommandSendableButtonTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/CommandSendableButtonTest.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.networktables.BooleanPublisher; -import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; +import org.wpilib.networktables.BooleanPublisher; +import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.smartdashboard.SmartDashboard; import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/commandsv2/src/test/java/org/wpilib/command2/CommandTestBase.java b/commandsv2/src/test/java/org/wpilib/command2/CommandTestBase.java index 13f6597738..3936437b10 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/CommandTestBase.java +++ b/commandsv2/src/test/java/org/wpilib/command2/CommandTestBase.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import edu.wpi.first.wpilibj.DriverStation; -import edu.wpi.first.wpilibj.simulation.DriverStationSim; -import edu.wpi.first.wpilibj2.command.Command.InterruptionBehavior; +import org.wpilib.driverstation.DriverStation; +import org.wpilib.simulation.DriverStationSim; +import org.wpilib.command2.Command.InterruptionBehavior; import java.util.Set; import org.junit.jupiter.api.BeforeEach; diff --git a/commandsv2/src/test/java/org/wpilib/command2/ConditionalCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/ConditionalCommandTest.java index 7b9817f564..813fa5cbda 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/ConditionalCommandTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/ConditionalCommandTest.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -10,7 +10,7 @@ import static org.junit.jupiter.params.provider.Arguments.arguments; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import edu.wpi.first.wpilibj2.command.Command.InterruptionBehavior; +import org.wpilib.command2.Command.InterruptionBehavior; import java.util.function.BooleanSupplier; import java.util.stream.Stream; import org.junit.jupiter.api.Test; diff --git a/commandsv2/src/test/java/org/wpilib/command2/DefaultCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/DefaultCommandTest.java index 23ae47d648..da9a9b7d57 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/DefaultCommandTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/DefaultCommandTest.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/commandsv2/src/test/java/org/wpilib/command2/DeferredCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/DeferredCommandTest.java index 259ba0fdce..38fb976578 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/DeferredCommandTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/DeferredCommandTest.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/commandsv2/src/test/java/org/wpilib/command2/FunctionalCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/FunctionalCommandTest.java index f983e8a667..4b6f990d61 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/FunctionalCommandTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/FunctionalCommandTest.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/commandsv2/src/test/java/org/wpilib/command2/InstantCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/InstantCommandTest.java index 813a44adf5..bee4d61c16 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/InstantCommandTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/InstantCommandTest.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/commandsv2/src/test/java/org/wpilib/command2/MultiCompositionTestBase.java b/commandsv2/src/test/java/org/wpilib/command2/MultiCompositionTestBase.java index 1b0e8e9141..a8cfe163c1 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/MultiCompositionTestBase.java +++ b/commandsv2/src/test/java/org/wpilib/command2/MultiCompositionTestBase.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.params.provider.Arguments.arguments; -import edu.wpi.first.wpilibj2.command.Command.InterruptionBehavior; +import org.wpilib.command2.Command.InterruptionBehavior; import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/commandsv2/src/test/java/org/wpilib/command2/NotifierCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/NotifierCommandTest.java index 4928cb1014..270189fcce 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/NotifierCommandTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/NotifierCommandTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.simulation.SimHooks; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.simulation.SimHooks; import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/commandsv2/src/test/java/org/wpilib/command2/ParallelCommandGroupTest.java b/commandsv2/src/test/java/org/wpilib/command2/ParallelCommandGroupTest.java index a837baac8a..a78582c332 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/ParallelCommandGroupTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/ParallelCommandGroupTest.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/commandsv2/src/test/java/org/wpilib/command2/ParallelDeadlineGroupTest.java b/commandsv2/src/test/java/org/wpilib/command2/ParallelDeadlineGroupTest.java index b3d7dfb556..488c5adc41 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/ParallelDeadlineGroupTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/ParallelDeadlineGroupTest.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/commandsv2/src/test/java/org/wpilib/command2/ParallelRaceGroupTest.java b/commandsv2/src/test/java/org/wpilib/command2/ParallelRaceGroupTest.java index bd44a128b8..f555bd3a98 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/ParallelRaceGroupTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/ParallelRaceGroupTest.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/commandsv2/src/test/java/org/wpilib/command2/PrintCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/PrintCommandTest.java index 6abd94b987..ff0927e9b3 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/PrintCommandTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/PrintCommandTest.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/commandsv2/src/test/java/org/wpilib/command2/ProxyCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/ProxyCommandTest.java index 9b1fe4270c..98fe244610 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/ProxyCommandTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/ProxyCommandTest.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/commandsv2/src/test/java/org/wpilib/command2/RepeatCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/RepeatCommandTest.java index 2aaecc6d93..7914f64f1e 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/RepeatCommandTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/RepeatCommandTest.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/commandsv2/src/test/java/org/wpilib/command2/RobotDisabledCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/RobotDisabledCommandTest.java index a248810e33..641a7d6c69 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/RobotDisabledCommandTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/RobotDisabledCommandTest.java @@ -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. -package edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; -import static edu.wpi.first.wpilibj2.command.Commands.parallel; +import static org.wpilib.command2.Commands.parallel; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/commandsv2/src/test/java/org/wpilib/command2/RunCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/RunCommandTest.java index 1f63487f34..d575c6b200 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/RunCommandTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/RunCommandTest.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/commandsv2/src/test/java/org/wpilib/command2/ScheduleCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/ScheduleCommandTest.java index e5c47493de..237df8bbc4 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/ScheduleCommandTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/ScheduleCommandTest.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.mockito.Mockito.verify; diff --git a/commandsv2/src/test/java/org/wpilib/command2/SchedulingRecursionTest.java b/commandsv2/src/test/java/org/wpilib/command2/SchedulingRecursionTest.java index 06f4023f6b..525921782d 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/SchedulingRecursionTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/SchedulingRecursionTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.wpilibj2.command.Command.InterruptionBehavior; +import org.wpilib.command2.Command.InterruptionBehavior; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.Test; diff --git a/commandsv2/src/test/java/org/wpilib/command2/SelectCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/SelectCommandTest.java index f6f551bd6e..92bd1c5cd8 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/SelectCommandTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/SelectCommandTest.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/commandsv2/src/test/java/org/wpilib/command2/SequentialCommandGroupTest.java b/commandsv2/src/test/java/org/wpilib/command2/SequentialCommandGroupTest.java index abbc49062c..fc7b045da4 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/SequentialCommandGroupTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/SequentialCommandGroupTest.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/commandsv2/src/test/java/org/wpilib/command2/SingleCompositionTestBase.java b/commandsv2/src/test/java/org/wpilib/command2/SingleCompositionTestBase.java index 0474271818..379665f2b7 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/SingleCompositionTestBase.java +++ b/commandsv2/src/test/java/org/wpilib/command2/SingleCompositionTestBase.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/commandsv2/src/test/java/org/wpilib/command2/StartEndCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/StartEndCommandTest.java index db0d792818..13dbe471c6 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/StartEndCommandTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/StartEndCommandTest.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/commandsv2/src/test/java/org/wpilib/command2/WaitCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/WaitCommandTest.java index 7cf1a28543..c2467af8e7 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/WaitCommandTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/WaitCommandTest.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -12,8 +12,8 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.simulation.SimHooks; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.simulation.SimHooks; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/commandsv2/src/test/java/org/wpilib/command2/WaitUntilCommandTest.java b/commandsv2/src/test/java/org/wpilib/command2/WaitUntilCommandTest.java index e91ae4e563..fcc0f2e3ef 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/WaitUntilCommandTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/WaitUntilCommandTest.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 edu.wpi.first.wpilibj2.command; +package org.wpilib.command2; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/commandsv2/src/test/java/org/wpilib/command2/button/NetworkButtonTest.java b/commandsv2/src/test/java/org/wpilib/command2/button/NetworkButtonTest.java index 7b1de35046..8ae728e34f 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/button/NetworkButtonTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/button/NetworkButtonTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj2.command.button; +package org.wpilib.command2.button; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.wpilibj2.command.CommandScheduler; -import edu.wpi.first.wpilibj2.command.CommandTestBase; +import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.command2.CommandScheduler; +import org.wpilib.command2.CommandTestBase; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/commandsv2/src/test/java/org/wpilib/command2/button/RobotModeTriggersTest.java b/commandsv2/src/test/java/org/wpilib/command2/button/RobotModeTriggersTest.java index f7df7f0bcb..ce63dbe791 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/button/RobotModeTriggersTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/button/RobotModeTriggersTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj2.command.button; +package org.wpilib.command2.button; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.wpilibj.simulation.DriverStationSim; -import edu.wpi.first.wpilibj2.command.CommandTestBase; +import org.wpilib.simulation.DriverStationSim; +import org.wpilib.command2.CommandTestBase; import org.junit.jupiter.api.Test; class RobotModeTriggersTest extends CommandTestBase { diff --git a/commandsv2/src/test/java/org/wpilib/command2/button/TriggerTest.java b/commandsv2/src/test/java/org/wpilib/command2/button/TriggerTest.java index 58406847ef..fa5d20c5e9 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/button/TriggerTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/button/TriggerTest.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 edu.wpi.first.wpilibj2.command.button; +package org.wpilib.command2.button; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -10,14 +10,14 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import edu.wpi.first.wpilibj.simulation.SimHooks; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.CommandScheduler; -import edu.wpi.first.wpilibj2.command.CommandTestBase; -import edu.wpi.first.wpilibj2.command.FunctionalCommand; -import edu.wpi.first.wpilibj2.command.RunCommand; -import edu.wpi.first.wpilibj2.command.StartEndCommand; -import edu.wpi.first.wpilibj2.command.WaitUntilCommand; +import org.wpilib.simulation.SimHooks; +import org.wpilib.command2.Command; +import org.wpilib.command2.CommandScheduler; +import org.wpilib.command2.CommandTestBase; +import org.wpilib.command2.FunctionalCommand; +import org.wpilib.command2.RunCommand; +import org.wpilib.command2.StartEndCommand; +import org.wpilib.command2.WaitUntilCommand; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.BooleanSupplier; diff --git a/commandsv2/src/test/java/org/wpilib/command2/sysid/SysIdRoutineTest.java b/commandsv2/src/test/java/org/wpilib/command2/sysid/SysIdRoutineTest.java index 48b0ba89a0..b5fcf0ab8d 100644 --- a/commandsv2/src/test/java/org/wpilib/command2/sysid/SysIdRoutineTest.java +++ b/commandsv2/src/test/java/org/wpilib/command2/sysid/SysIdRoutineTest.java @@ -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. -package edu.wpi.first.wpilibj2.command.sysid; +package org.wpilib.command2.sysid; -import static edu.wpi.first.units.Units.Volts; +import static org.wpilib.units.Units.Volts; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.clearInvocations; @@ -13,12 +13,12 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.units.measure.Voltage; -import edu.wpi.first.wpilibj.simulation.SimHooks; -import edu.wpi.first.wpilibj.sysid.SysIdRoutineLog; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.Subsystem; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.units.measure.Voltage; +import org.wpilib.simulation.SimHooks; +import org.wpilib.sysid.SysIdRoutineLog; +import org.wpilib.command2.Command; +import org.wpilib.command2.Subsystem; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/commandsv2/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/commandsv2/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension index 3a4908fd20..c4262fb18f 100644 --- a/commandsv2/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension +++ b/commandsv2/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension @@ -1 +1 @@ -edu.wpi.first.wpilibj2.MockHardwareExtension +org.wpilib.MockHardwareExtension diff --git a/commandsv3/.styleguide b/commandsv3/.styleguide index 0f2122eeb7..36ea1fe068 100644 --- a/commandsv3/.styleguide +++ b/commandsv3/.styleguide @@ -3,8 +3,8 @@ modifiableFileExclude { } generatedFileExclude { - src/generated/main/java/org/wpilib/commands3/button/ - src/generated/main/java/org/wpilib/commands3/proto/ + src/generated/main/java/org/wpilib/command3/button/ + src/generated/main/java/org/wpilib/command3/proto/ } repoRootNameOverride { diff --git a/commandsv3/src/dev/java/org/wpilib/command3/DevMain.java b/commandsv3/src/dev/java/org/wpilib/command3/DevMain.java index 8a92b7b09d..8b73a7b586 100644 --- a/commandsv3/src/dev/java/org/wpilib/command3/DevMain.java +++ b/commandsv3/src/dev/java/org/wpilib/command3/DevMain.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.commands3; +package org.wpilib.command3; -import edu.wpi.first.hal.HALUtil; -import edu.wpi.first.networktables.NetworkTablesJNI; -import edu.wpi.first.util.CombinedRuntimeLoader; +import org.wpilib.hardware.hal.HALUtil; +import org.wpilib.networktables.NetworkTablesJNI; +import org.wpilib.util.runtime.CombinedRuntimeLoader; /** Dev main. */ public final class DevMain { diff --git a/commandsv3/src/generate/main/java/commandhid.java.jinja b/commandsv3/src/generate/main/java/commandhid.java.jinja index 17f538a762..d48c80b257 100644 --- a/commandsv3/src/generate/main/java/commandhid.java.jinja +++ b/commandsv3/src/generate/main/java/commandhid.java.jinja @@ -6,12 +6,12 @@ {% macro capitalize_first(string) -%} {{ string[0]|capitalize + string[1:] }} {%- endmacro %} -package org.wpilib.commands3.button; +package org.wpilib.command3.button; -import edu.wpi.first.wpilibj.{{ ConsoleName }}Controller; -import edu.wpi.first.wpilibj.event.EventLoop; -import org.wpilib.commands3.Scheduler; -import org.wpilib.commands3.Trigger; +import org.wpilib.{{ ConsoleName }}Controller; +import org.wpilib.event.EventLoop; +import org.wpilib.command3.Scheduler; +import org.wpilib.command3.Trigger; /** * A version of {@link {{ ConsoleName }}Controller} with {@link Trigger} factories for command-based. diff --git a/commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandPS4Controller.java b/commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandPS4Controller.java index e48b2358e0..e883fdc23e 100644 --- a/commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandPS4Controller.java +++ b/commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandPS4Controller.java @@ -4,12 +4,12 @@ // THIS FILE WAS AUTO-GENERATED BY ./commandsv3/generate_files.py. DO NOT MODIFY -package org.wpilib.commands3.button; +package org.wpilib.command3.button; -import edu.wpi.first.wpilibj.PS4Controller; -import edu.wpi.first.wpilibj.event.EventLoop; -import org.wpilib.commands3.Scheduler; -import org.wpilib.commands3.Trigger; +import org.wpilib.driverstation.PS4Controller; +import org.wpilib.event.EventLoop; +import org.wpilib.command3.Scheduler; +import org.wpilib.command3.Trigger; /** * A version of {@link PS4Controller} with {@link Trigger} factories for command-based. diff --git a/commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandPS5Controller.java b/commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandPS5Controller.java index 5ee032fdb4..fd79335d0d 100644 --- a/commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandPS5Controller.java +++ b/commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandPS5Controller.java @@ -4,12 +4,12 @@ // THIS FILE WAS AUTO-GENERATED BY ./commandsv3/generate_files.py. DO NOT MODIFY -package org.wpilib.commands3.button; +package org.wpilib.command3.button; -import edu.wpi.first.wpilibj.PS5Controller; -import edu.wpi.first.wpilibj.event.EventLoop; -import org.wpilib.commands3.Scheduler; -import org.wpilib.commands3.Trigger; +import org.wpilib.driverstation.PS5Controller; +import org.wpilib.event.EventLoop; +import org.wpilib.command3.Scheduler; +import org.wpilib.command3.Trigger; /** * A version of {@link PS5Controller} with {@link Trigger} factories for command-based. diff --git a/commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandStadiaController.java b/commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandStadiaController.java index 3b9cdac1c5..1c687e9a44 100644 --- a/commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandStadiaController.java +++ b/commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandStadiaController.java @@ -4,12 +4,12 @@ // THIS FILE WAS AUTO-GENERATED BY ./commandsv3/generate_files.py. DO NOT MODIFY -package org.wpilib.commands3.button; +package org.wpilib.command3.button; -import edu.wpi.first.wpilibj.StadiaController; -import edu.wpi.first.wpilibj.event.EventLoop; -import org.wpilib.commands3.Scheduler; -import org.wpilib.commands3.Trigger; +import org.wpilib.driverstation.StadiaController; +import org.wpilib.event.EventLoop; +import org.wpilib.command3.Scheduler; +import org.wpilib.command3.Trigger; /** * A version of {@link StadiaController} with {@link Trigger} factories for command-based. diff --git a/commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandXboxController.java b/commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandXboxController.java index ef1008d396..6adb70f68a 100644 --- a/commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandXboxController.java +++ b/commandsv3/src/generated/main/java/org/wpilib/command3/button/CommandXboxController.java @@ -4,12 +4,12 @@ // THIS FILE WAS AUTO-GENERATED BY ./commandsv3/generate_files.py. DO NOT MODIFY -package org.wpilib.commands3.button; +package org.wpilib.command3.button; -import edu.wpi.first.wpilibj.XboxController; -import edu.wpi.first.wpilibj.event.EventLoop; -import org.wpilib.commands3.Scheduler; -import org.wpilib.commands3.Trigger; +import org.wpilib.driverstation.XboxController; +import org.wpilib.event.EventLoop; +import org.wpilib.command3.Scheduler; +import org.wpilib.command3.Trigger; /** * A version of {@link XboxController} with {@link Trigger} factories for command-based. diff --git a/commandsv3/src/generated/main/java/org/wpilib/command3/proto/ProtobufCommands.java b/commandsv3/src/generated/main/java/org/wpilib/command3/proto/ProtobufCommands.java index d0b91ff476..dd92c09398 100644 --- a/commandsv3/src/generated/main/java/org/wpilib/command3/proto/ProtobufCommands.java +++ b/commandsv3/src/generated/main/java/org/wpilib/command3/proto/ProtobufCommands.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. // Code generated by protocol buffer compiler. Do not edit! -package org.wpilib.commands3.proto; +package org.wpilib.command3.proto; import java.io.IOException; import us.hebi.quickbuf.Descriptors; diff --git a/commandsv3/src/main/java/org/wpilib/command3/Binding.java b/commandsv3/src/main/java/org/wpilib/command3/Binding.java index 69943c22c5..4d79496612 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/Binding.java +++ b/commandsv3/src/main/java/org/wpilib/command3/Binding.java @@ -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. -package org.wpilib.commands3; +package org.wpilib.command3; -import edu.wpi.first.util.ErrorMessages; +import org.wpilib.util.ErrorMessages; /** * A single trigger binding. diff --git a/commandsv3/src/main/java/org/wpilib/command3/BindingScope.java b/commandsv3/src/main/java/org/wpilib/command3/BindingScope.java index 3925aca807..5aae3fcbfb 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/BindingScope.java +++ b/commandsv3/src/main/java/org/wpilib/command3/BindingScope.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.commands3; +package org.wpilib.command3; /** * A scope for when a binding is live. Bindings tied to a scope must be deleted when the scope diff --git a/commandsv3/src/main/java/org/wpilib/command3/BindingType.java b/commandsv3/src/main/java/org/wpilib/command3/BindingType.java index 188c39acb8..9f4161960a 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/BindingType.java +++ b/commandsv3/src/main/java/org/wpilib/command3/BindingType.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.commands3; +package org.wpilib.command3; /** Describes when a command bound to a trigger should run. */ enum BindingType { diff --git a/commandsv3/src/main/java/org/wpilib/command3/Command.java b/commandsv3/src/main/java/org/wpilib/command3/Command.java index 4e75a6918b..e3427dd58e 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/Command.java +++ b/commandsv3/src/main/java/org/wpilib/command3/Command.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.commands3; +package org.wpilib.command3; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.units.measure.Time; +import org.wpilib.units.measure.Time; import java.util.Collection; import java.util.Collections; import java.util.Set; diff --git a/commandsv3/src/main/java/org/wpilib/command3/CommandState.java b/commandsv3/src/main/java/org/wpilib/command3/CommandState.java index ab10842f13..56f1aacb58 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/CommandState.java +++ b/commandsv3/src/main/java/org/wpilib/command3/CommandState.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.commands3; +package org.wpilib.command3; import static java.util.Objects.requireNonNull; diff --git a/commandsv3/src/main/java/org/wpilib/command3/CommandTraceHelper.java b/commandsv3/src/main/java/org/wpilib/command3/CommandTraceHelper.java index 97bcf62476..ff8d5c9c55 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/CommandTraceHelper.java +++ b/commandsv3/src/main/java/org/wpilib/command3/CommandTraceHelper.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.commands3; +package org.wpilib.command3; import java.util.ArrayList; import java.util.List; @@ -30,7 +30,7 @@ final class CommandTraceHelper { Coroutine.class.getName(), Continuation.class.getName(), Scheduler.class.getName(), - "org.wpilib.commands3.StagedCommandBuilder$BuilderBackedCommand", + "org.wpilib.command3.StagedCommandBuilder$BuilderBackedCommand", "jdk.internal.vm.Continuation"); boolean sawRun = false; diff --git a/commandsv3/src/main/java/org/wpilib/command3/ConflictDetector.java b/commandsv3/src/main/java/org/wpilib/command3/ConflictDetector.java index 5be5953fc7..45c427b418 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/ConflictDetector.java +++ b/commandsv3/src/main/java/org/wpilib/command3/ConflictDetector.java @@ -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. -package org.wpilib.commands3; +package org.wpilib.command3; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; import java.util.ArrayList; import java.util.Collection; diff --git a/commandsv3/src/main/java/org/wpilib/command3/Continuation.java b/commandsv3/src/main/java/org/wpilib/command3/Continuation.java index 6a0f9aa907..c7ba7ff572 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/Continuation.java +++ b/commandsv3/src/main/java/org/wpilib/command3/Continuation.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.commands3; +package org.wpilib.command3; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; diff --git a/commandsv3/src/main/java/org/wpilib/command3/ContinuationScope.java b/commandsv3/src/main/java/org/wpilib/command3/ContinuationScope.java index 27484d88fc..d44b19d978 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/ContinuationScope.java +++ b/commandsv3/src/main/java/org/wpilib/command3/ContinuationScope.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.commands3; +package org.wpilib.command3; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; diff --git a/commandsv3/src/main/java/org/wpilib/command3/Coroutine.java b/commandsv3/src/main/java/org/wpilib/command3/Coroutine.java index 71e159e67a..e56cb5487e 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/Coroutine.java +++ b/commandsv3/src/main/java/org/wpilib/command3/Coroutine.java @@ -2,13 +2,13 @@ // 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.commands3; +package org.wpilib.command3; -import static edu.wpi.first.units.Units.Seconds; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.units.Units.Seconds; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.units.measure.Time; -import edu.wpi.first.wpilibj.Timer; +import org.wpilib.units.measure.Time; +import org.wpilib.system.Timer; import java.util.Arrays; import java.util.Collection; import java.util.List; diff --git a/commandsv3/src/main/java/org/wpilib/command3/Mechanism.java b/commandsv3/src/main/java/org/wpilib/command3/Mechanism.java index 4d8e41ac4c..d88cb4138c 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/Mechanism.java +++ b/commandsv3/src/main/java/org/wpilib/command3/Mechanism.java @@ -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. -package org.wpilib.commands3; +package org.wpilib.command3; -import edu.wpi.first.units.measure.Time; +import org.wpilib.units.measure.Time; import java.util.List; import java.util.function.Consumer; import org.wpilib.annotation.NoDiscard; diff --git a/commandsv3/src/main/java/org/wpilib/command3/NeedsExecutionBuilderStage.java b/commandsv3/src/main/java/org/wpilib/command3/NeedsExecutionBuilderStage.java index 23b5b2f641..409764d4eb 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/NeedsExecutionBuilderStage.java +++ b/commandsv3/src/main/java/org/wpilib/command3/NeedsExecutionBuilderStage.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.commands3; +package org.wpilib.command3; import java.util.Collection; import java.util.function.Consumer; diff --git a/commandsv3/src/main/java/org/wpilib/command3/NeedsNameBuilderStage.java b/commandsv3/src/main/java/org/wpilib/command3/NeedsNameBuilderStage.java index d89691a6ba..c854a33f13 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/NeedsNameBuilderStage.java +++ b/commandsv3/src/main/java/org/wpilib/command3/NeedsNameBuilderStage.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.commands3; +package org.wpilib.command3; import java.util.function.BooleanSupplier; import java.util.function.Consumer; diff --git a/commandsv3/src/main/java/org/wpilib/command3/ParallelGroup.java b/commandsv3/src/main/java/org/wpilib/command3/ParallelGroup.java index 75025c2b28..bce639d2a3 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/ParallelGroup.java +++ b/commandsv3/src/main/java/org/wpilib/command3/ParallelGroup.java @@ -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. -package org.wpilib.commands3; +package org.wpilib.command3; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; import java.util.Collection; import java.util.HashSet; diff --git a/commandsv3/src/main/java/org/wpilib/command3/ParallelGroupBuilder.java b/commandsv3/src/main/java/org/wpilib/command3/ParallelGroupBuilder.java index e5660ebd23..f9ff315751 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/ParallelGroupBuilder.java +++ b/commandsv3/src/main/java/org/wpilib/command3/ParallelGroupBuilder.java @@ -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. -package org.wpilib.commands3; +package org.wpilib.command3; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; import java.util.Arrays; import java.util.LinkedHashSet; diff --git a/commandsv3/src/main/java/org/wpilib/command3/Scheduler.java b/commandsv3/src/main/java/org/wpilib/command3/Scheduler.java index 752b779253..969ecc9d70 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/Scheduler.java +++ b/commandsv3/src/main/java/org/wpilib/command3/Scheduler.java @@ -2,16 +2,16 @@ // 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.commands3; +package org.wpilib.command3; -import static edu.wpi.first.units.Units.Microseconds; -import static edu.wpi.first.units.Units.Milliseconds; +import static org.wpilib.units.Units.Microseconds; +import static org.wpilib.units.Units.Milliseconds; -import edu.wpi.first.util.ErrorMessages; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.wpilibj.RobotController; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.event.EventLoop; +import org.wpilib.util.ErrorMessages; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.system.RobotController; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.event.EventLoop; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -27,8 +27,8 @@ import java.util.Stack; import java.util.function.Consumer; import java.util.stream.Collectors; import org.wpilib.annotation.NoDiscard; -import org.wpilib.commands3.button.CommandGenericHID; -import org.wpilib.commands3.proto.SchedulerProto; +import org.wpilib.command3.button.CommandGenericHID; +import org.wpilib.command3.proto.SchedulerProto; /** * Manages the lifecycles of {@link Coroutine}-based {@link Command Commands}. Commands may be diff --git a/commandsv3/src/main/java/org/wpilib/command3/SchedulerEvent.java b/commandsv3/src/main/java/org/wpilib/command3/SchedulerEvent.java index 32641722bb..f4422aef10 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/SchedulerEvent.java +++ b/commandsv3/src/main/java/org/wpilib/command3/SchedulerEvent.java @@ -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. -package org.wpilib.commands3; +package org.wpilib.command3; -import edu.wpi.first.wpilibj.RobotController; +import org.wpilib.system.RobotController; import java.util.function.Consumer; /** diff --git a/commandsv3/src/main/java/org/wpilib/command3/SequentialGroup.java b/commandsv3/src/main/java/org/wpilib/command3/SequentialGroup.java index e6458527a1..7f05b524d5 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/SequentialGroup.java +++ b/commandsv3/src/main/java/org/wpilib/command3/SequentialGroup.java @@ -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. -package org.wpilib.commands3; +package org.wpilib.command3; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; import java.util.ArrayList; import java.util.HashSet; diff --git a/commandsv3/src/main/java/org/wpilib/command3/SequentialGroupBuilder.java b/commandsv3/src/main/java/org/wpilib/command3/SequentialGroupBuilder.java index 5c10a61aa4..5a2dc0b6b0 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/SequentialGroupBuilder.java +++ b/commandsv3/src/main/java/org/wpilib/command3/SequentialGroupBuilder.java @@ -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. -package org.wpilib.commands3; +package org.wpilib.command3; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; import java.util.ArrayList; import java.util.Arrays; diff --git a/commandsv3/src/main/java/org/wpilib/command3/StagedCommandBuilder.java b/commandsv3/src/main/java/org/wpilib/command3/StagedCommandBuilder.java index 5b68ce5602..8f9c54dcf4 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/StagedCommandBuilder.java +++ b/commandsv3/src/main/java/org/wpilib/command3/StagedCommandBuilder.java @@ -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. -package org.wpilib.commands3; +package org.wpilib.command3; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; import java.util.Arrays; import java.util.Collection; diff --git a/commandsv3/src/main/java/org/wpilib/command3/Trigger.java b/commandsv3/src/main/java/org/wpilib/command3/Trigger.java index d9e273f029..20bb88a829 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/Trigger.java +++ b/commandsv3/src/main/java/org/wpilib/command3/Trigger.java @@ -2,14 +2,14 @@ // 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.commands3; +package org.wpilib.command3; -import static edu.wpi.first.units.Units.Seconds; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.units.Units.Seconds; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.math.filter.Debouncer; -import edu.wpi.first.units.measure.Time; -import edu.wpi.first.wpilibj.event.EventLoop; +import org.wpilib.math.filter.Debouncer; +import org.wpilib.units.measure.Time; +import org.wpilib.event.EventLoop; import java.util.ArrayList; import java.util.EnumMap; import java.util.List; @@ -19,7 +19,7 @@ import java.util.function.BooleanSupplier; /** * Triggers allow users to specify conditions for when commands should run. Triggers can be set up * to read from joystick and controller buttons (eg {@link - * org.wpilib.commands3.button.CommandXboxController#x()}) or be customized to read sensor values or + * org.wpilib.command3.button.CommandXboxController#x()}) or be customized to read sensor values or * any other arbitrary true/false condition. * *

It is very easy to link a button to a command. For instance, you could link the trigger button diff --git a/commandsv3/src/main/java/org/wpilib/command3/button/CommandGamepad.java b/commandsv3/src/main/java/org/wpilib/command3/button/CommandGamepad.java index d0514dd5f7..b3c26e61d6 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/button/CommandGamepad.java +++ b/commandsv3/src/main/java/org/wpilib/command3/button/CommandGamepad.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.commands3.button; +package org.wpilib.command3.button; -import edu.wpi.first.wpilibj.Gamepad; -import edu.wpi.first.wpilibj.event.EventLoop; -import org.wpilib.commands3.Scheduler; -import org.wpilib.commands3.Trigger; +import org.wpilib.driverstation.Gamepad; +import org.wpilib.event.EventLoop; +import org.wpilib.command3.Scheduler; +import org.wpilib.command3.Trigger; /** * A version of {@link Gamepad} with {@link Trigger} factories for command-based. diff --git a/commandsv3/src/main/java/org/wpilib/command3/button/CommandGenericHID.java b/commandsv3/src/main/java/org/wpilib/command3/button/CommandGenericHID.java index b3e7a710fc..27d0bbb6f8 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/button/CommandGenericHID.java +++ b/commandsv3/src/main/java/org/wpilib/command3/button/CommandGenericHID.java @@ -2,16 +2,16 @@ // 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.commands3.button; +package org.wpilib.command3.button; -import edu.wpi.first.math.Pair; -import edu.wpi.first.wpilibj.DriverStation.POVDirection; -import edu.wpi.first.wpilibj.GenericHID; -import edu.wpi.first.wpilibj.event.EventLoop; +import org.wpilib.math.util.Pair; +import org.wpilib.driverstation.DriverStation.POVDirection; +import org.wpilib.driverstation.GenericHID; +import org.wpilib.event.EventLoop; import java.util.HashMap; import java.util.Map; -import org.wpilib.commands3.Scheduler; -import org.wpilib.commands3.Trigger; +import org.wpilib.command3.Scheduler; +import org.wpilib.command3.Trigger; /** * A version of {@link GenericHID} with {@link Trigger} factories for command-based. diff --git a/commandsv3/src/main/java/org/wpilib/command3/button/CommandJoystick.java b/commandsv3/src/main/java/org/wpilib/command3/button/CommandJoystick.java index cc7bf9a335..ecc7e796fa 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/button/CommandJoystick.java +++ b/commandsv3/src/main/java/org/wpilib/command3/button/CommandJoystick.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.commands3.button; +package org.wpilib.command3.button; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.event.EventLoop; -import org.wpilib.commands3.Scheduler; -import org.wpilib.commands3.Trigger; +import org.wpilib.driverstation.Joystick; +import org.wpilib.event.EventLoop; +import org.wpilib.command3.Scheduler; +import org.wpilib.command3.Trigger; /** * A version of {@link Joystick} with {@link Trigger} factories for command-based. diff --git a/commandsv3/src/main/java/org/wpilib/command3/button/InternalButton.java b/commandsv3/src/main/java/org/wpilib/command3/button/InternalButton.java index 6bedec6d7f..36e8da2bff 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/button/InternalButton.java +++ b/commandsv3/src/main/java/org/wpilib/command3/button/InternalButton.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.commands3.button; +package org.wpilib.command3.button; import java.util.concurrent.atomic.AtomicBoolean; -import org.wpilib.commands3.Trigger; +import org.wpilib.command3.Trigger; /** * This class is intended to be used within a program. The programmer can manually set its value. diff --git a/commandsv3/src/main/java/org/wpilib/command3/button/JoystickButton.java b/commandsv3/src/main/java/org/wpilib/command3/button/JoystickButton.java index 5c968a939f..e8bde30fd0 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/button/JoystickButton.java +++ b/commandsv3/src/main/java/org/wpilib/command3/button/JoystickButton.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.commands3.button; +package org.wpilib.command3.button; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.wpilibj.GenericHID; -import org.wpilib.commands3.Trigger; +import org.wpilib.driverstation.GenericHID; +import org.wpilib.command3.Trigger; /** A {@link Trigger} that gets its state from a {@link GenericHID}. */ public class JoystickButton extends Trigger { diff --git a/commandsv3/src/main/java/org/wpilib/command3/button/NetworkButton.java b/commandsv3/src/main/java/org/wpilib/command3/button/NetworkButton.java index 330160339e..e80d9d6442 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/button/NetworkButton.java +++ b/commandsv3/src/main/java/org/wpilib/command3/button/NetworkButton.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.commands3.button; +package org.wpilib.command3.button; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.networktables.BooleanSubscriber; -import edu.wpi.first.networktables.BooleanTopic; -import edu.wpi.first.networktables.NetworkTable; -import edu.wpi.first.networktables.NetworkTableInstance; -import org.wpilib.commands3.Trigger; +import org.wpilib.networktables.BooleanSubscriber; +import org.wpilib.networktables.BooleanTopic; +import org.wpilib.networktables.NetworkTable; +import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.command3.Trigger; /** A {@link Trigger} that uses a {@link NetworkTable} boolean field. */ public class NetworkButton extends Trigger { diff --git a/commandsv3/src/main/java/org/wpilib/command3/button/POVButton.java b/commandsv3/src/main/java/org/wpilib/command3/button/POVButton.java index 154ddbc3f9..7aebb18a76 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/button/POVButton.java +++ b/commandsv3/src/main/java/org/wpilib/command3/button/POVButton.java @@ -2,13 +2,13 @@ // 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.commands3.button; +package org.wpilib.command3.button; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.wpilibj.DriverStation.POVDirection; -import edu.wpi.first.wpilibj.GenericHID; -import org.wpilib.commands3.Trigger; +import org.wpilib.driverstation.DriverStation.POVDirection; +import org.wpilib.driverstation.GenericHID; +import org.wpilib.command3.Trigger; /** A {@link Trigger} that gets its state from a POV on a {@link GenericHID}. */ public class POVButton extends Trigger { diff --git a/commandsv3/src/main/java/org/wpilib/command3/button/RobotModeTriggers.java b/commandsv3/src/main/java/org/wpilib/command3/button/RobotModeTriggers.java index 6a84df1ff0..c2d092fa0d 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/button/RobotModeTriggers.java +++ b/commandsv3/src/main/java/org/wpilib/command3/button/RobotModeTriggers.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.commands3.button; +package org.wpilib.command3.button; -import edu.wpi.first.wpilibj.DriverStation; -import org.wpilib.commands3.Trigger; +import org.wpilib.driverstation.DriverStation; +import org.wpilib.command3.Trigger; /** * A class containing static {@link Trigger} factories for running callbacks when the robot mode diff --git a/commandsv3/src/main/java/org/wpilib/command3/proto/CommandProto.java b/commandsv3/src/main/java/org/wpilib/command3/proto/CommandProto.java index f8fe21f771..2161477a36 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/proto/CommandProto.java +++ b/commandsv3/src/main/java/org/wpilib/command3/proto/CommandProto.java @@ -2,13 +2,13 @@ // 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.commands3.proto; +package org.wpilib.command3.proto; -import edu.wpi.first.util.protobuf.Protobuf; -import org.wpilib.commands3.Command; -import org.wpilib.commands3.Mechanism; -import org.wpilib.commands3.Scheduler; -import org.wpilib.commands3.proto.ProtobufCommands.ProtobufCommand; +import org.wpilib.util.protobuf.Protobuf; +import org.wpilib.command3.Command; +import org.wpilib.command3.Mechanism; +import org.wpilib.command3.Scheduler; +import org.wpilib.command3.proto.ProtobufCommands.ProtobufCommand; import us.hebi.quickbuf.Descriptors; /** Protobuf serde for running commands. */ diff --git a/commandsv3/src/main/java/org/wpilib/command3/proto/MechanismProto.java b/commandsv3/src/main/java/org/wpilib/command3/proto/MechanismProto.java index 5e469d2d54..9dafc343e6 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/proto/MechanismProto.java +++ b/commandsv3/src/main/java/org/wpilib/command3/proto/MechanismProto.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.commands3.proto; +package org.wpilib.command3.proto; -import edu.wpi.first.util.protobuf.Protobuf; -import org.wpilib.commands3.Mechanism; -import org.wpilib.commands3.proto.ProtobufCommands.ProtobufMechanism; +import org.wpilib.util.protobuf.Protobuf; +import org.wpilib.command3.Mechanism; +import org.wpilib.command3.proto.ProtobufCommands.ProtobufMechanism; import us.hebi.quickbuf.Descriptors; public class MechanismProto implements Protobuf { diff --git a/commandsv3/src/main/java/org/wpilib/command3/proto/SchedulerProto.java b/commandsv3/src/main/java/org/wpilib/command3/proto/SchedulerProto.java index bc5ad124c4..27931efc71 100644 --- a/commandsv3/src/main/java/org/wpilib/command3/proto/SchedulerProto.java +++ b/commandsv3/src/main/java/org/wpilib/command3/proto/SchedulerProto.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package org.wpilib.commands3.proto; +package org.wpilib.command3.proto; -import edu.wpi.first.util.protobuf.Protobuf; -import org.wpilib.commands3.Command; -import org.wpilib.commands3.Scheduler; -import org.wpilib.commands3.proto.ProtobufCommands.ProtobufScheduler; +import org.wpilib.util.protobuf.Protobuf; +import org.wpilib.command3.Command; +import org.wpilib.command3.Scheduler; +import org.wpilib.command3.proto.ProtobufCommands.ProtobufScheduler; import us.hebi.quickbuf.Descriptors; /** diff --git a/commandsv3/src/main/proto/protobuf_commands.proto b/commandsv3/src/main/proto/protobuf_commands.proto index beaba6b8c0..dc84ff1088 100644 --- a/commandsv3/src/main/proto/protobuf_commands.proto +++ b/commandsv3/src/main/proto/protobuf_commands.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package wpi.proto; -option java_package = "org.wpilib.commands3.proto"; +option java_package = "org.wpilib.command3.proto"; /* Or use the generate_files.py script: diff --git a/commandsv3/src/test/java/org/wpilib/command3/CommandTestBase.java b/commandsv3/src/test/java/org/wpilib/command3/CommandTestBase.java index 0423924397..5034230c81 100644 --- a/commandsv3/src/test/java/org/wpilib/command3/CommandTestBase.java +++ b/commandsv3/src/test/java/org/wpilib/command3/CommandTestBase.java @@ -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. -package org.wpilib.commands3; +package org.wpilib.command3; -import edu.wpi.first.wpilibj.RobotController; +import org.wpilib.system.RobotController; import java.util.ArrayList; import java.util.List; import org.junit.jupiter.api.BeforeEach; diff --git a/commandsv3/src/test/java/org/wpilib/command3/ConflictDetectorTest.java b/commandsv3/src/test/java/org/wpilib/command3/ConflictDetectorTest.java index ae1e5ef862..c5b0d73a11 100644 --- a/commandsv3/src/test/java/org/wpilib/command3/ConflictDetectorTest.java +++ b/commandsv3/src/test/java/org/wpilib/command3/ConflictDetectorTest.java @@ -2,17 +2,17 @@ // 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.commands3; +package org.wpilib.command3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.wpilib.commands3.ConflictDetector.findAllConflicts; -import static org.wpilib.commands3.ConflictDetector.throwIfConflicts; +import static org.wpilib.command3.ConflictDetector.findAllConflicts; +import static org.wpilib.command3.ConflictDetector.throwIfConflicts; import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; -import org.wpilib.commands3.ConflictDetector.Conflict; +import org.wpilib.command3.ConflictDetector.Conflict; class ConflictDetectorTest extends CommandTestBase { @Test diff --git a/commandsv3/src/test/java/org/wpilib/command3/CoroutineTest.java b/commandsv3/src/test/java/org/wpilib/command3/CoroutineTest.java index 7b143751cf..b257a5e8f0 100644 --- a/commandsv3/src/test/java/org/wpilib/command3/CoroutineTest.java +++ b/commandsv3/src/test/java/org/wpilib/command3/CoroutineTest.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.commands3; +package org.wpilib.command3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/commandsv3/src/test/java/org/wpilib/command3/NullCommand.java b/commandsv3/src/test/java/org/wpilib/command3/NullCommand.java index e66060c7d4..e8eca9c419 100644 --- a/commandsv3/src/test/java/org/wpilib/command3/NullCommand.java +++ b/commandsv3/src/test/java/org/wpilib/command3/NullCommand.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.commands3; +package org.wpilib.command3; import java.util.Set; diff --git a/commandsv3/src/test/java/org/wpilib/command3/ParallelGroupTest.java b/commandsv3/src/test/java/org/wpilib/command3/ParallelGroupTest.java index f89bd647f0..bac8725be1 100644 --- a/commandsv3/src/test/java/org/wpilib/command3/ParallelGroupTest.java +++ b/commandsv3/src/test/java/org/wpilib/command3/ParallelGroupTest.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.commands3; +package org.wpilib.command3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/commandsv3/src/test/java/org/wpilib/command3/PriorityCommand.java b/commandsv3/src/test/java/org/wpilib/command3/PriorityCommand.java index 6599b3f861..8cb4c634f9 100644 --- a/commandsv3/src/test/java/org/wpilib/command3/PriorityCommand.java +++ b/commandsv3/src/test/java/org/wpilib/command3/PriorityCommand.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.commands3; +package org.wpilib.command3; import java.util.Set; diff --git a/commandsv3/src/test/java/org/wpilib/command3/SchedulerCancellationTests.java b/commandsv3/src/test/java/org/wpilib/command3/SchedulerCancellationTests.java index 90d2dfffef..bfb060b758 100644 --- a/commandsv3/src/test/java/org/wpilib/command3/SchedulerCancellationTests.java +++ b/commandsv3/src/test/java/org/wpilib/command3/SchedulerCancellationTests.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.commands3; +package org.wpilib.command3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/commandsv3/src/test/java/org/wpilib/command3/SchedulerConflictTests.java b/commandsv3/src/test/java/org/wpilib/command3/SchedulerConflictTests.java index a4823fea4d..e4b4411adf 100644 --- a/commandsv3/src/test/java/org/wpilib/command3/SchedulerConflictTests.java +++ b/commandsv3/src/test/java/org/wpilib/command3/SchedulerConflictTests.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.commands3; +package org.wpilib.command3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/commandsv3/src/test/java/org/wpilib/command3/SchedulerErrorHandlingTests.java b/commandsv3/src/test/java/org/wpilib/command3/SchedulerErrorHandlingTests.java index 758639dc42..347a1c1d3c 100644 --- a/commandsv3/src/test/java/org/wpilib/command3/SchedulerErrorHandlingTests.java +++ b/commandsv3/src/test/java/org/wpilib/command3/SchedulerErrorHandlingTests.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.commands3; +package org.wpilib.command3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -31,7 +31,7 @@ class SchedulerErrorHandlingTests extends CommandTestBase { assertEquals("The exception", e.getMessage()); assertEquals( - "org.wpilib.commands3.SchedulerErrorHandlingTests", e.getStackTrace()[0].getClassName()); + "org.wpilib.command3.SchedulerErrorHandlingTests", e.getStackTrace()[0].getClassName()); assertEquals("lambda$errorDetection$0", e.getStackTrace()[0].getMethodName()); assertEquals("=== Command Binding Trace ===", e.getStackTrace()[2].getClassName()); diff --git a/commandsv3/src/test/java/org/wpilib/command3/SchedulerPriorityLevelTests.java b/commandsv3/src/test/java/org/wpilib/command3/SchedulerPriorityLevelTests.java index 3e65aa8163..d9f1c1967a 100644 --- a/commandsv3/src/test/java/org/wpilib/command3/SchedulerPriorityLevelTests.java +++ b/commandsv3/src/test/java/org/wpilib/command3/SchedulerPriorityLevelTests.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.commands3; +package org.wpilib.command3; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/commandsv3/src/test/java/org/wpilib/command3/SchedulerSideloadFunctionTests.java b/commandsv3/src/test/java/org/wpilib/command3/SchedulerSideloadFunctionTests.java index 958005e5e7..17a1cfb222 100644 --- a/commandsv3/src/test/java/org/wpilib/command3/SchedulerSideloadFunctionTests.java +++ b/commandsv3/src/test/java/org/wpilib/command3/SchedulerSideloadFunctionTests.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.commands3; +package org.wpilib.command3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/commandsv3/src/test/java/org/wpilib/command3/SchedulerTelemetryTests.java b/commandsv3/src/test/java/org/wpilib/command3/SchedulerTelemetryTests.java index 9c7f07bff4..46def5a11e 100644 --- a/commandsv3/src/test/java/org/wpilib/command3/SchedulerTelemetryTests.java +++ b/commandsv3/src/test/java/org/wpilib/command3/SchedulerTelemetryTests.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.commands3; +package org.wpilib.command3; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/commandsv3/src/test/java/org/wpilib/command3/SchedulerTest.java b/commandsv3/src/test/java/org/wpilib/command3/SchedulerTest.java index 4d5fd92a7b..4db9d272d7 100644 --- a/commandsv3/src/test/java/org/wpilib/command3/SchedulerTest.java +++ b/commandsv3/src/test/java/org/wpilib/command3/SchedulerTest.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.commands3; +package org.wpilib.command3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/commandsv3/src/test/java/org/wpilib/command3/SchedulerTimingTests.java b/commandsv3/src/test/java/org/wpilib/command3/SchedulerTimingTests.java index 1643c7777f..83c4cbd91d 100644 --- a/commandsv3/src/test/java/org/wpilib/command3/SchedulerTimingTests.java +++ b/commandsv3/src/test/java/org/wpilib/command3/SchedulerTimingTests.java @@ -2,16 +2,16 @@ // 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.commands3; +package org.wpilib.command3; -import static edu.wpi.first.units.Units.Microseconds; -import static edu.wpi.first.units.Units.Milliseconds; -import static edu.wpi.first.units.Units.Seconds; +import static org.wpilib.units.Units.Microseconds; +import static org.wpilib.units.Units.Milliseconds; +import static org.wpilib.units.Units.Seconds; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.wpilibj.RobotController; +import org.wpilib.system.RobotController; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; diff --git a/commandsv3/src/test/java/org/wpilib/command3/SequentialGroupTest.java b/commandsv3/src/test/java/org/wpilib/command3/SequentialGroupTest.java index 4481ee8181..b4863c2f4a 100644 --- a/commandsv3/src/test/java/org/wpilib/command3/SequentialGroupTest.java +++ b/commandsv3/src/test/java/org/wpilib/command3/SequentialGroupTest.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.commands3; +package org.wpilib.command3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/commandsv3/src/test/java/org/wpilib/command3/StagedCommandBuilderTest.java b/commandsv3/src/test/java/org/wpilib/command3/StagedCommandBuilderTest.java index 44fef542a8..5c9919fbb4 100644 --- a/commandsv3/src/test/java/org/wpilib/command3/StagedCommandBuilderTest.java +++ b/commandsv3/src/test/java/org/wpilib/command3/StagedCommandBuilderTest.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.commands3; +package org.wpilib.command3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/commandsv3/src/test/java/org/wpilib/command3/TriggerTest.java b/commandsv3/src/test/java/org/wpilib/command3/TriggerTest.java index fdc5b5dce5..0d8925b5a8 100644 --- a/commandsv3/src/test/java/org/wpilib/command3/TriggerTest.java +++ b/commandsv3/src/test/java/org/wpilib/command3/TriggerTest.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.commands3; +package org.wpilib.command3; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/cscore/src/dev/java/org/wpilib/vision/camera/DevMain.java b/cscore/src/dev/java/org/wpilib/vision/camera/DevMain.java index ec6468f90f..74549fd7b3 100644 --- a/cscore/src/dev/java/org/wpilib/vision/camera/DevMain.java +++ b/cscore/src/dev/java/org/wpilib/vision/camera/DevMain.java @@ -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. -package edu.wpi.first.cscore; +package org.wpilib.vision.camera; -import edu.wpi.first.util.CombinedRuntimeLoader; +import org.wpilib.util.runtime.CombinedRuntimeLoader; public final class DevMain { /** Main method. */ diff --git a/cscore/src/main/java/org/wpilib/vision/camera/AxisCamera.java b/cscore/src/main/java/org/wpilib/vision/camera/AxisCamera.java index 6165fb545d..5190ef4449 100644 --- a/cscore/src/main/java/org/wpilib/vision/camera/AxisCamera.java +++ b/cscore/src/main/java/org/wpilib/vision/camera/AxisCamera.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 edu.wpi.first.cscore; +package org.wpilib.vision.camera; /** * A source that represents an Axis IP camera. diff --git a/cscore/src/main/java/org/wpilib/vision/camera/CameraServerJNI.java b/cscore/src/main/java/org/wpilib/vision/camera/CameraServerJNI.java index 261a7f7e07..a9f8e76423 100644 --- a/cscore/src/main/java/org/wpilib/vision/camera/CameraServerJNI.java +++ b/cscore/src/main/java/org/wpilib/vision/camera/CameraServerJNI.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.cscore; +package org.wpilib.vision.camera; -import edu.wpi.first.util.RawFrame; -import edu.wpi.first.util.RuntimeLoader; +import org.wpilib.util.RawFrame; +import org.wpilib.util.runtime.RuntimeLoader; import java.io.IOException; import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/cscore/src/main/java/org/wpilib/vision/camera/CvSink.java b/cscore/src/main/java/org/wpilib/vision/camera/CvSink.java index e75062878a..fd1a913dc2 100644 --- a/cscore/src/main/java/org/wpilib/vision/camera/CvSink.java +++ b/cscore/src/main/java/org/wpilib/vision/camera/CvSink.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.cscore; +package org.wpilib.vision.camera; -import edu.wpi.first.util.PixelFormat; -import edu.wpi.first.util.RawFrame; -import edu.wpi.first.util.TimestampSource; +import org.wpilib.util.PixelFormat; +import org.wpilib.util.RawFrame; +import org.wpilib.util.TimestampSource; import java.nio.ByteBuffer; import org.opencv.core.CvType; import org.opencv.core.Mat; diff --git a/cscore/src/main/java/org/wpilib/vision/camera/CvSource.java b/cscore/src/main/java/org/wpilib/vision/camera/CvSource.java index 4ca03a4194..0602a9712f 100644 --- a/cscore/src/main/java/org/wpilib/vision/camera/CvSource.java +++ b/cscore/src/main/java/org/wpilib/vision/camera/CvSource.java @@ -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. -package edu.wpi.first.cscore; +package org.wpilib.vision.camera; -import edu.wpi.first.util.PixelFormat; +import org.wpilib.util.PixelFormat; import org.opencv.core.Mat; /** diff --git a/cscore/src/main/java/org/wpilib/vision/camera/HttpCamera.java b/cscore/src/main/java/org/wpilib/vision/camera/HttpCamera.java index d1e2815748..84dce0c8b8 100644 --- a/cscore/src/main/java/org/wpilib/vision/camera/HttpCamera.java +++ b/cscore/src/main/java/org/wpilib/vision/camera/HttpCamera.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 edu.wpi.first.cscore; +package org.wpilib.vision.camera; /** A source that represents a MJPEG-over-HTTP (IP) camera. */ public class HttpCamera extends VideoCamera { diff --git a/cscore/src/main/java/org/wpilib/vision/camera/ImageSink.java b/cscore/src/main/java/org/wpilib/vision/camera/ImageSink.java index 701488da17..b1c4d6940b 100644 --- a/cscore/src/main/java/org/wpilib/vision/camera/ImageSink.java +++ b/cscore/src/main/java/org/wpilib/vision/camera/ImageSink.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 edu.wpi.first.cscore; +package org.wpilib.vision.camera; /** A base class for single image reading sinks. */ public abstract class ImageSink extends VideoSink { diff --git a/cscore/src/main/java/org/wpilib/vision/camera/ImageSource.java b/cscore/src/main/java/org/wpilib/vision/camera/ImageSource.java index cde0aaca1e..4b470a6173 100644 --- a/cscore/src/main/java/org/wpilib/vision/camera/ImageSource.java +++ b/cscore/src/main/java/org/wpilib/vision/camera/ImageSource.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 edu.wpi.first.cscore; +package org.wpilib.vision.camera; /** A base class for single image providing sources. */ public abstract class ImageSource extends VideoSource { diff --git a/cscore/src/main/java/org/wpilib/vision/camera/MjpegServer.java b/cscore/src/main/java/org/wpilib/vision/camera/MjpegServer.java index 54c8053b47..f0a8186f6d 100644 --- a/cscore/src/main/java/org/wpilib/vision/camera/MjpegServer.java +++ b/cscore/src/main/java/org/wpilib/vision/camera/MjpegServer.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 edu.wpi.first.cscore; +package org.wpilib.vision.camera; /** A sink that acts as a MJPEG-over-HTTP network server. */ public class MjpegServer extends VideoSink { diff --git a/cscore/src/main/java/org/wpilib/vision/camera/OpenCvLoader.java b/cscore/src/main/java/org/wpilib/vision/camera/OpenCvLoader.java index d6df2eec92..35eccbdea7 100644 --- a/cscore/src/main/java/org/wpilib/vision/camera/OpenCvLoader.java +++ b/cscore/src/main/java/org/wpilib/vision/camera/OpenCvLoader.java @@ -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. -package edu.wpi.first.cscore; +package org.wpilib.vision.camera; -import edu.wpi.first.util.RuntimeLoader; +import org.wpilib.util.runtime.RuntimeLoader; import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; import org.opencv.core.Core; diff --git a/cscore/src/main/java/org/wpilib/vision/camera/UsbCamera.java b/cscore/src/main/java/org/wpilib/vision/camera/UsbCamera.java index 8e0817eb99..e24ec2c2e6 100644 --- a/cscore/src/main/java/org/wpilib/vision/camera/UsbCamera.java +++ b/cscore/src/main/java/org/wpilib/vision/camera/UsbCamera.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 edu.wpi.first.cscore; +package org.wpilib.vision.camera; /** A source that represents a USB camera. */ public class UsbCamera extends VideoCamera { diff --git a/cscore/src/main/java/org/wpilib/vision/camera/UsbCameraInfo.java b/cscore/src/main/java/org/wpilib/vision/camera/UsbCameraInfo.java index 04b122921d..dc164b4854 100644 --- a/cscore/src/main/java/org/wpilib/vision/camera/UsbCameraInfo.java +++ b/cscore/src/main/java/org/wpilib/vision/camera/UsbCameraInfo.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 edu.wpi.first.cscore; +package org.wpilib.vision.camera; /** USB camera information. */ @SuppressWarnings("MemberName") diff --git a/cscore/src/main/java/org/wpilib/vision/camera/VideoCamera.java b/cscore/src/main/java/org/wpilib/vision/camera/VideoCamera.java index 089c77f730..3b71e45b2f 100644 --- a/cscore/src/main/java/org/wpilib/vision/camera/VideoCamera.java +++ b/cscore/src/main/java/org/wpilib/vision/camera/VideoCamera.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 edu.wpi.first.cscore; +package org.wpilib.vision.camera; /** A source that represents a video camera. */ public class VideoCamera extends VideoSource { diff --git a/cscore/src/main/java/org/wpilib/vision/camera/VideoEvent.java b/cscore/src/main/java/org/wpilib/vision/camera/VideoEvent.java index 07445a0c77..61657eb413 100644 --- a/cscore/src/main/java/org/wpilib/vision/camera/VideoEvent.java +++ b/cscore/src/main/java/org/wpilib/vision/camera/VideoEvent.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 edu.wpi.first.cscore; +package org.wpilib.vision.camera; /** Video event. */ @SuppressWarnings("MemberName") diff --git a/cscore/src/main/java/org/wpilib/vision/camera/VideoException.java b/cscore/src/main/java/org/wpilib/vision/camera/VideoException.java index afc16b5112..93963cb801 100644 --- a/cscore/src/main/java/org/wpilib/vision/camera/VideoException.java +++ b/cscore/src/main/java/org/wpilib/vision/camera/VideoException.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 edu.wpi.first.cscore; +package org.wpilib.vision.camera; /** An exception raised by the camera server. */ public class VideoException extends RuntimeException { diff --git a/cscore/src/main/java/org/wpilib/vision/camera/VideoListener.java b/cscore/src/main/java/org/wpilib/vision/camera/VideoListener.java index 752f2a69dd..6cf9ba8068 100644 --- a/cscore/src/main/java/org/wpilib/vision/camera/VideoListener.java +++ b/cscore/src/main/java/org/wpilib/vision/camera/VideoListener.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 edu.wpi.first.cscore; +package org.wpilib.vision.camera; import java.util.HashMap; import java.util.Map; diff --git a/cscore/src/main/java/org/wpilib/vision/camera/VideoMode.java b/cscore/src/main/java/org/wpilib/vision/camera/VideoMode.java index b7478987c7..2f9c436584 100644 --- a/cscore/src/main/java/org/wpilib/vision/camera/VideoMode.java +++ b/cscore/src/main/java/org/wpilib/vision/camera/VideoMode.java @@ -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. -package edu.wpi.first.cscore; +package org.wpilib.vision.camera; -import edu.wpi.first.util.PixelFormat; +import org.wpilib.util.PixelFormat; import java.util.Objects; /** Video mode. */ diff --git a/cscore/src/main/java/org/wpilib/vision/camera/VideoProperty.java b/cscore/src/main/java/org/wpilib/vision/camera/VideoProperty.java index cd063c38fc..788867640b 100644 --- a/cscore/src/main/java/org/wpilib/vision/camera/VideoProperty.java +++ b/cscore/src/main/java/org/wpilib/vision/camera/VideoProperty.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 edu.wpi.first.cscore; +package org.wpilib.vision.camera; /** A source or sink property. */ public class VideoProperty { diff --git a/cscore/src/main/java/org/wpilib/vision/camera/VideoSink.java b/cscore/src/main/java/org/wpilib/vision/camera/VideoSink.java index 167db477fb..a54d15e739 100644 --- a/cscore/src/main/java/org/wpilib/vision/camera/VideoSink.java +++ b/cscore/src/main/java/org/wpilib/vision/camera/VideoSink.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 edu.wpi.first.cscore; +package org.wpilib.vision.camera; /** * A sink for video that accepts a sequence of frames. Each frame may consist of multiple images diff --git a/cscore/src/main/java/org/wpilib/vision/camera/VideoSource.java b/cscore/src/main/java/org/wpilib/vision/camera/VideoSource.java index 36d3d5f7c8..9080b70bb5 100644 --- a/cscore/src/main/java/org/wpilib/vision/camera/VideoSource.java +++ b/cscore/src/main/java/org/wpilib/vision/camera/VideoSource.java @@ -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. -package edu.wpi.first.cscore; +package org.wpilib.vision.camera; -import edu.wpi.first.util.PixelFormat; +import org.wpilib.util.PixelFormat; /** * A source for video that provides a sequence of frames. Each frame may consist of multiple images diff --git a/cscore/src/main/java/org/wpilib/vision/camera/raw/RawSink.java b/cscore/src/main/java/org/wpilib/vision/camera/raw/RawSink.java index ba567a98e3..a9010a9203 100644 --- a/cscore/src/main/java/org/wpilib/vision/camera/raw/RawSink.java +++ b/cscore/src/main/java/org/wpilib/vision/camera/raw/RawSink.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.cscore.raw; +package org.wpilib.vision.camera.raw; -import edu.wpi.first.cscore.CameraServerJNI; -import edu.wpi.first.cscore.ImageSink; -import edu.wpi.first.util.RawFrame; +import org.wpilib.vision.camera.CameraServerJNI; +import org.wpilib.vision.camera.ImageSink; +import org.wpilib.util.RawFrame; /** * A sink for user code to accept video frames as raw bytes. diff --git a/cscore/src/main/java/org/wpilib/vision/camera/raw/RawSource.java b/cscore/src/main/java/org/wpilib/vision/camera/raw/RawSource.java index f1dafd9a01..5998c6a320 100644 --- a/cscore/src/main/java/org/wpilib/vision/camera/raw/RawSource.java +++ b/cscore/src/main/java/org/wpilib/vision/camera/raw/RawSource.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.cscore.raw; +package org.wpilib.vision.camera.raw; -import edu.wpi.first.cscore.CameraServerJNI; -import edu.wpi.first.cscore.ImageSource; -import edu.wpi.first.cscore.VideoMode; -import edu.wpi.first.util.PixelFormat; -import edu.wpi.first.util.RawFrame; +import org.wpilib.vision.camera.CameraServerJNI; +import org.wpilib.vision.camera.ImageSource; +import org.wpilib.vision.camera.VideoMode; +import org.wpilib.util.PixelFormat; +import org.wpilib.util.RawFrame; import java.nio.ByteBuffer; /** diff --git a/cscore/src/main/native/cpp/jni/CameraServerJNI.cpp b/cscore/src/main/native/cpp/jni/CameraServerJNI.cpp index 6bb160751d..b7a3d7ac89 100644 --- a/cscore/src/main/native/cpp/jni/CameraServerJNI.cpp +++ b/cscore/src/main/native/cpp/jni/CameraServerJNI.cpp @@ -15,7 +15,7 @@ #include "cscore_raw.h" #include "cscore_runloop.h" -#include "edu_wpi_first_cscore_CameraServerJNI.h" +#include "org_wpilib_vision_camera_CameraServerJNI.h" namespace cv { class Mat; @@ -42,13 +42,13 @@ static JException exceptionEx; static JNIEnv* listenerEnv = nullptr; static const JClassInit classes[] = { - {"edu/wpi/first/cscore/UsbCameraInfo", &usbCameraInfoCls}, - {"edu/wpi/first/cscore/VideoMode", &videoModeCls}, - {"edu/wpi/first/cscore/VideoEvent", &videoEventCls}, - {"edu/wpi/first/util/RawFrame", &rawFrameCls}}; + {"org/wpilib/vision/camera/UsbCameraInfo", &usbCameraInfoCls}, + {"org/wpilib/vision/camera/VideoMode", &videoModeCls}, + {"org/wpilib/vision/camera/VideoEvent", &videoEventCls}, + {"org/wpilib/util/RawFrame", &rawFrameCls}}; static const JExceptionInit exceptions[] = { - {"edu/wpi/first/cscore/VideoException", &videoEx}, + {"org/wpilib/vision/camera/VideoException", &videoEx}, {"java/lang/InterruptedException", &interruptedEx}, {"java/lang/NullPointerException", &nullPointerEx}, {"java/lang/UnsupportedOperationException", &unsupportedEx}, @@ -287,12 +287,12 @@ static jobjectArray MakeJObject(JNIEnv* env, extern "C" { /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getPropertyKind * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getPropertyKind +Java_org_wpilib_vision_camera_CameraServerJNI_getPropertyKind (JNIEnv* env, jclass, jint property) { CS_Status status = 0; @@ -302,12 +302,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getPropertyKind } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getPropertyName * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getPropertyName +Java_org_wpilib_vision_camera_CameraServerJNI_getPropertyName (JNIEnv* env, jclass, jint property) { CS_Status status = 0; @@ -320,12 +320,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getPropertyName } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getProperty * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getProperty +Java_org_wpilib_vision_camera_CameraServerJNI_getProperty (JNIEnv* env, jclass, jint property) { CS_Status status = 0; @@ -335,12 +335,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getProperty } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setProperty * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setProperty +Java_org_wpilib_vision_camera_CameraServerJNI_setProperty (JNIEnv* env, jclass, jint property, jint value) { CS_Status status = 0; @@ -349,12 +349,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setProperty } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getPropertyMin * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getPropertyMin +Java_org_wpilib_vision_camera_CameraServerJNI_getPropertyMin (JNIEnv* env, jclass, jint property) { CS_Status status = 0; @@ -364,12 +364,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getPropertyMin } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getPropertyMax * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getPropertyMax +Java_org_wpilib_vision_camera_CameraServerJNI_getPropertyMax (JNIEnv* env, jclass, jint property) { CS_Status status = 0; @@ -379,12 +379,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getPropertyMax } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getPropertyStep * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getPropertyStep +Java_org_wpilib_vision_camera_CameraServerJNI_getPropertyStep (JNIEnv* env, jclass, jint property) { CS_Status status = 0; @@ -394,12 +394,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getPropertyStep } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getPropertyDefault * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getPropertyDefault +Java_org_wpilib_vision_camera_CameraServerJNI_getPropertyDefault (JNIEnv* env, jclass, jint property) { CS_Status status = 0; @@ -409,12 +409,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getPropertyDefault } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getStringProperty * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getStringProperty +Java_org_wpilib_vision_camera_CameraServerJNI_getStringProperty (JNIEnv* env, jclass, jint property) { CS_Status status = 0; @@ -427,12 +427,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getStringProperty } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setStringProperty * Signature: (ILjava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setStringProperty +Java_org_wpilib_vision_camera_CameraServerJNI_setStringProperty (JNIEnv* env, jclass, jint property, jstring value) { if (!value) { @@ -445,12 +445,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setStringProperty } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getEnumPropertyChoices * Signature: (I)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getEnumPropertyChoices +Java_org_wpilib_vision_camera_CameraServerJNI_getEnumPropertyChoices (JNIEnv* env, jclass, jint property) { CS_Status status = 0; @@ -462,12 +462,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getEnumPropertyChoices } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: createUsbCameraDev * Signature: (Ljava/lang/String;I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_createUsbCameraDev +Java_org_wpilib_vision_camera_CameraServerJNI_createUsbCameraDev (JNIEnv* env, jclass, jstring name, jint dev) { if (!name) { @@ -481,12 +481,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_createUsbCameraDev } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: createUsbCameraPath * Signature: (Ljava/lang/String;Ljava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_createUsbCameraPath +Java_org_wpilib_vision_camera_CameraServerJNI_createUsbCameraPath (JNIEnv* env, jclass, jstring name, jstring path) { if (!name) { @@ -505,12 +505,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_createUsbCameraPath } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: createHttpCamera * Signature: (Ljava/lang/String;Ljava/lang/String;I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_createHttpCamera +Java_org_wpilib_vision_camera_CameraServerJNI_createHttpCamera (JNIEnv* env, jclass, jstring name, jstring url, jint kind) { if (!name) { @@ -530,12 +530,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_createHttpCamera } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: createHttpCameraMulti * Signature: (Ljava/lang/String;[Ljava/lang/Object;I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_createHttpCameraMulti +Java_org_wpilib_vision_camera_CameraServerJNI_createHttpCameraMulti (JNIEnv* env, jclass, jstring name, jobjectArray urls, jint kind) { if (!name) { @@ -567,12 +567,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_createHttpCameraMulti } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: createRawSource * Signature: (Ljava/lang/String;ZIIII)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_createRawSource +Java_org_wpilib_vision_camera_CameraServerJNI_createRawSource (JNIEnv* env, jclass, jstring name, jboolean isCv, jint pixelFormat, jint width, jint height, jint fps) { @@ -592,12 +592,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_createRawSource } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getSourceKind * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getSourceKind +Java_org_wpilib_vision_camera_CameraServerJNI_getSourceKind (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -607,12 +607,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getSourceKind } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getSourceName * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getSourceName +Java_org_wpilib_vision_camera_CameraServerJNI_getSourceName (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -625,12 +625,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getSourceName } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getSourceDescription * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getSourceDescription +Java_org_wpilib_vision_camera_CameraServerJNI_getSourceDescription (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -643,12 +643,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getSourceDescription } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getSourceLastFrameTime * Signature: (I)J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getSourceLastFrameTime +Java_org_wpilib_vision_camera_CameraServerJNI_getSourceLastFrameTime (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -658,12 +658,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getSourceLastFrameTime } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setSourceConnectionStrategy * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setSourceConnectionStrategy +Java_org_wpilib_vision_camera_CameraServerJNI_setSourceConnectionStrategy (JNIEnv* env, jclass, jint source, jint strategy) { CS_Status status = 0; @@ -673,12 +673,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setSourceConnectionStrategy } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: isSourceConnected * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_isSourceConnected +Java_org_wpilib_vision_camera_CameraServerJNI_isSourceConnected (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -688,12 +688,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_isSourceConnected } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: isSourceEnabled * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_isSourceEnabled +Java_org_wpilib_vision_camera_CameraServerJNI_isSourceEnabled (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -703,12 +703,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_isSourceEnabled } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getSourceProperty * Signature: (ILjava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getSourceProperty +Java_org_wpilib_vision_camera_CameraServerJNI_getSourceProperty (JNIEnv* env, jclass, jint source, jstring name) { if (!name) { @@ -723,12 +723,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getSourceProperty } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: enumerateSourceProperties * Signature: (I)[I */ JNIEXPORT jintArray JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_enumerateSourceProperties +Java_org_wpilib_vision_camera_CameraServerJNI_enumerateSourceProperties (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -741,12 +741,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_enumerateSourceProperties } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getSourceVideoMode * Signature: (I)Ljava/lang/Object; */ JNIEXPORT jobject JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getSourceVideoMode +Java_org_wpilib_vision_camera_CameraServerJNI_getSourceVideoMode (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -758,12 +758,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getSourceVideoMode } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setSourceVideoMode * Signature: (IIIII)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setSourceVideoMode +Java_org_wpilib_vision_camera_CameraServerJNI_setSourceVideoMode (JNIEnv* env, jclass, jint source, jint pixelFormat, jint width, jint height, jint fps) { @@ -778,12 +778,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setSourceVideoMode } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setSourcePixelFormat * Signature: (II)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setSourcePixelFormat +Java_org_wpilib_vision_camera_CameraServerJNI_setSourcePixelFormat (JNIEnv* env, jclass, jint source, jint pixelFormat) { CS_Status status = 0; @@ -794,12 +794,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setSourcePixelFormat } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setSourceResolution * Signature: (III)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setSourceResolution +Java_org_wpilib_vision_camera_CameraServerJNI_setSourceResolution (JNIEnv* env, jclass, jint source, jint width, jint height) { CS_Status status = 0; @@ -809,12 +809,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setSourceResolution } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setSourceFPS * Signature: (II)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setSourceFPS +Java_org_wpilib_vision_camera_CameraServerJNI_setSourceFPS (JNIEnv* env, jclass, jint source, jint fps) { CS_Status status = 0; @@ -824,12 +824,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setSourceFPS } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setSourceConfigJson * Signature: (ILjava/lang/String;)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setSourceConfigJson +Java_org_wpilib_vision_camera_CameraServerJNI_setSourceConfigJson (JNIEnv* env, jclass, jint source, jstring config) { CS_Status status = 0; @@ -839,12 +839,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setSourceConfigJson } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getSourceConfigJson * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getSourceConfigJson +Java_org_wpilib_vision_camera_CameraServerJNI_getSourceConfigJson (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -854,12 +854,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getSourceConfigJson } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: enumerateSourceVideoModes * Signature: (I)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_enumerateSourceVideoModes +Java_org_wpilib_vision_camera_CameraServerJNI_enumerateSourceVideoModes (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -879,12 +879,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_enumerateSourceVideoModes } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: enumerateSourceSinks * Signature: (I)[I */ JNIEXPORT jintArray JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_enumerateSourceSinks +Java_org_wpilib_vision_camera_CameraServerJNI_enumerateSourceSinks (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -897,12 +897,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_enumerateSourceSinks } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: copySource * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_copySource +Java_org_wpilib_vision_camera_CameraServerJNI_copySource (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -912,12 +912,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_copySource } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: releaseSource * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_releaseSource +Java_org_wpilib_vision_camera_CameraServerJNI_releaseSource (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -926,12 +926,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_releaseSource } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setCameraBrightness * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setCameraBrightness +Java_org_wpilib_vision_camera_CameraServerJNI_setCameraBrightness (JNIEnv* env, jclass, jint source, jint brightness) { CS_Status status = 0; @@ -940,12 +940,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setCameraBrightness } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getCameraBrightness * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getCameraBrightness +Java_org_wpilib_vision_camera_CameraServerJNI_getCameraBrightness (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -955,12 +955,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getCameraBrightness } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setCameraWhiteBalanceAuto * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setCameraWhiteBalanceAuto +Java_org_wpilib_vision_camera_CameraServerJNI_setCameraWhiteBalanceAuto (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -969,12 +969,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setCameraWhiteBalanceAuto } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setCameraWhiteBalanceHoldCurrent * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setCameraWhiteBalanceHoldCurrent +Java_org_wpilib_vision_camera_CameraServerJNI_setCameraWhiteBalanceHoldCurrent (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -983,12 +983,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setCameraWhiteBalanceHoldCurrent } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setCameraWhiteBalanceManual * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setCameraWhiteBalanceManual +Java_org_wpilib_vision_camera_CameraServerJNI_setCameraWhiteBalanceManual (JNIEnv* env, jclass, jint source, jint value) { CS_Status status = 0; @@ -997,12 +997,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setCameraWhiteBalanceManual } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setCameraExposureAuto * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setCameraExposureAuto +Java_org_wpilib_vision_camera_CameraServerJNI_setCameraExposureAuto (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -1011,12 +1011,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setCameraExposureAuto } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setCameraExposureHoldCurrent * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setCameraExposureHoldCurrent +Java_org_wpilib_vision_camera_CameraServerJNI_setCameraExposureHoldCurrent (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -1025,12 +1025,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setCameraExposureHoldCurrent } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setCameraExposureManual * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setCameraExposureManual +Java_org_wpilib_vision_camera_CameraServerJNI_setCameraExposureManual (JNIEnv* env, jclass, jint source, jint value) { CS_Status status = 0; @@ -1039,12 +1039,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setCameraExposureManual } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setUsbCameraPath * Signature: (ILjava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setUsbCameraPath +Java_org_wpilib_vision_camera_CameraServerJNI_setUsbCameraPath (JNIEnv* env, jclass, jint source, jstring path) { CS_Status status = 0; @@ -1053,12 +1053,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setUsbCameraPath } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getUsbCameraPath * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getUsbCameraPath +Java_org_wpilib_vision_camera_CameraServerJNI_getUsbCameraPath (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -1070,12 +1070,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getUsbCameraPath } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getUsbCameraInfo * Signature: (I)Ljava/lang/Object; */ JNIEXPORT jobject JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getUsbCameraInfo +Java_org_wpilib_vision_camera_CameraServerJNI_getUsbCameraInfo (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -1087,12 +1087,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getUsbCameraInfo } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getHttpCameraKind * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getHttpCameraKind +Java_org_wpilib_vision_camera_CameraServerJNI_getHttpCameraKind (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -1104,12 +1104,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getHttpCameraKind } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setHttpCameraUrls * Signature: (I[Ljava/lang/Object;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setHttpCameraUrls +Java_org_wpilib_vision_camera_CameraServerJNI_setHttpCameraUrls (JNIEnv* env, jclass, jint source, jobjectArray urls) { if (!urls) { @@ -1134,12 +1134,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setHttpCameraUrls } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getHttpCameraUrls * Signature: (I)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getHttpCameraUrls +Java_org_wpilib_vision_camera_CameraServerJNI_getHttpCameraUrls (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -1151,12 +1151,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getHttpCameraUrls } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: putRawSourceFrame * Signature: (IJ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_putRawSourceFrame +Java_org_wpilib_vision_camera_CameraServerJNI_putRawSourceFrame (JNIEnv* env, jclass, jint source, jlong framePtr) { auto* frame = reinterpret_cast(framePtr); @@ -1170,12 +1170,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_putRawSourceFrame } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: putRawSourceFrameBB * Signature: (ILjava/lang/Object;IIIII)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_putRawSourceFrameBB +Java_org_wpilib_vision_camera_CameraServerJNI_putRawSourceFrameBB (JNIEnv* env, jclass, jint source, jobject data, jint size, jint width, jint height, jint stride, jint pixelFormat) { @@ -1198,12 +1198,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_putRawSourceFrameBB } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: putRawSourceFrameData * Signature: (IJIIIII)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_putRawSourceFrameData +Java_org_wpilib_vision_camera_CameraServerJNI_putRawSourceFrameData (JNIEnv* env, jclass, jint source, jlong data, jint size, jint width, jint height, jint stride, jint pixelFormat) { @@ -1226,12 +1226,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_putRawSourceFrameData } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: notifySourceError * Signature: (ILjava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_notifySourceError +Java_org_wpilib_vision_camera_CameraServerJNI_notifySourceError (JNIEnv* env, jclass, jint source, jstring msg) { if (!msg) { @@ -1244,12 +1244,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_notifySourceError } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setSourceConnected * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setSourceConnected +Java_org_wpilib_vision_camera_CameraServerJNI_setSourceConnected (JNIEnv* env, jclass, jint source, jboolean connected) { CS_Status status = 0; @@ -1258,12 +1258,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setSourceConnected } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setSourceDescription * Signature: (ILjava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setSourceDescription +Java_org_wpilib_vision_camera_CameraServerJNI_setSourceDescription (JNIEnv* env, jclass, jint source, jstring description) { if (!description) { @@ -1276,12 +1276,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setSourceDescription } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: createSourceProperty * Signature: (ILjava/lang/String;IIIIII)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_createSourceProperty +Java_org_wpilib_vision_camera_CameraServerJNI_createSourceProperty (JNIEnv* env, jclass, jint source, jstring name, jint kind, jint minimum, jint maximum, jint step, jint defaultValue, jint value) { @@ -1294,12 +1294,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_createSourceProperty } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setSourceEnumPropertyChoices * Signature: (II[Ljava/lang/Object;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setSourceEnumPropertyChoices +Java_org_wpilib_vision_camera_CameraServerJNI_setSourceEnumPropertyChoices (JNIEnv* env, jclass, jint source, jint property, jobjectArray choices) { if (!choices) { @@ -1324,12 +1324,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setSourceEnumPropertyChoices } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: createMjpegServer * Signature: (Ljava/lang/String;Ljava/lang/String;I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_createMjpegServer +Java_org_wpilib_vision_camera_CameraServerJNI_createMjpegServer (JNIEnv* env, jclass, jstring name, jstring listenAddress, jint port) { if (!name) { @@ -1349,12 +1349,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_createMjpegServer } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: createRawSink * Signature: (Ljava/lang/String;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_createRawSink +Java_org_wpilib_vision_camera_CameraServerJNI_createRawSink (JNIEnv* env, jclass, jstring name, jboolean isCv) { if (!name) { @@ -1368,12 +1368,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_createRawSink } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getSinkKind * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getSinkKind +Java_org_wpilib_vision_camera_CameraServerJNI_getSinkKind (JNIEnv* env, jclass, jint sink) { CS_Status status = 0; @@ -1383,12 +1383,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getSinkKind } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getSinkName * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getSinkName +Java_org_wpilib_vision_camera_CameraServerJNI_getSinkName (JNIEnv* env, jclass, jint sink) { CS_Status status = 0; @@ -1401,12 +1401,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getSinkName } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getSinkDescription * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getSinkDescription +Java_org_wpilib_vision_camera_CameraServerJNI_getSinkDescription (JNIEnv* env, jclass, jint sink) { CS_Status status = 0; @@ -1419,12 +1419,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getSinkDescription } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getSinkProperty * Signature: (ILjava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getSinkProperty +Java_org_wpilib_vision_camera_CameraServerJNI_getSinkProperty (JNIEnv* env, jclass, jint sink, jstring name) { if (!name) { @@ -1438,12 +1438,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getSinkProperty } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: enumerateSinkProperties * Signature: (I)[I */ JNIEXPORT jintArray JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_enumerateSinkProperties +Java_org_wpilib_vision_camera_CameraServerJNI_enumerateSinkProperties (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -1456,12 +1456,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_enumerateSinkProperties } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setSinkConfigJson * Signature: (ILjava/lang/String;)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setSinkConfigJson +Java_org_wpilib_vision_camera_CameraServerJNI_setSinkConfigJson (JNIEnv* env, jclass, jint source, jstring config) { CS_Status status = 0; @@ -1471,12 +1471,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setSinkConfigJson } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getSinkConfigJson * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getSinkConfigJson +Java_org_wpilib_vision_camera_CameraServerJNI_getSinkConfigJson (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -1486,12 +1486,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getSinkConfigJson } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setSinkSource * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setSinkSource +Java_org_wpilib_vision_camera_CameraServerJNI_setSinkSource (JNIEnv* env, jclass, jint sink, jint source) { CS_Status status = 0; @@ -1500,12 +1500,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setSinkSource } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getSinkSourceProperty * Signature: (ILjava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getSinkSourceProperty +Java_org_wpilib_vision_camera_CameraServerJNI_getSinkSourceProperty (JNIEnv* env, jclass, jint sink, jstring name) { if (!name) { @@ -1520,12 +1520,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getSinkSourceProperty } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getSinkSource * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getSinkSource +Java_org_wpilib_vision_camera_CameraServerJNI_getSinkSource (JNIEnv* env, jclass, jint sink) { CS_Status status = 0; @@ -1535,12 +1535,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getSinkSource } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: copySink * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_copySink +Java_org_wpilib_vision_camera_CameraServerJNI_copySink (JNIEnv* env, jclass, jint sink) { CS_Status status = 0; @@ -1550,12 +1550,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_copySink } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: releaseSink * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_releaseSink +Java_org_wpilib_vision_camera_CameraServerJNI_releaseSink (JNIEnv* env, jclass, jint sink) { CS_Status status = 0; @@ -1564,12 +1564,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_releaseSink } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getMjpegServerListenAddress * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getMjpegServerListenAddress +Java_org_wpilib_vision_camera_CameraServerJNI_getMjpegServerListenAddress (JNIEnv* env, jclass, jint sink) { CS_Status status = 0; @@ -1581,12 +1581,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getMjpegServerListenAddress } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getMjpegServerPort * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getMjpegServerPort +Java_org_wpilib_vision_camera_CameraServerJNI_getMjpegServerPort (JNIEnv* env, jclass, jint sink) { CS_Status status = 0; @@ -1596,12 +1596,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getMjpegServerPort } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setSinkDescription * Signature: (ILjava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setSinkDescription +Java_org_wpilib_vision_camera_CameraServerJNI_setSinkDescription (JNIEnv* env, jclass, jint sink, jstring description) { if (!description) { @@ -1614,12 +1614,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setSinkDescription } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: grabRawSinkFrame * Signature: (ILjava/lang/Object;J)J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_grabRawSinkFrame +Java_org_wpilib_vision_camera_CameraServerJNI_grabRawSinkFrame (JNIEnv* env, jclass, jint sink, jobject frameObj, jlong framePtr) { auto* frame = reinterpret_cast(framePtr); @@ -1635,12 +1635,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_grabRawSinkFrame } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: grabRawSinkFrameTimeout * Signature: (ILjava/lang/Object;JD)J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_grabRawSinkFrameTimeout +Java_org_wpilib_vision_camera_CameraServerJNI_grabRawSinkFrameTimeout (JNIEnv* env, jclass, jint sink, jobject frameObj, jlong framePtr, jdouble timeout) { @@ -1658,12 +1658,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_grabRawSinkFrameTimeout } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getSinkError * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getSinkError +Java_org_wpilib_vision_camera_CameraServerJNI_getSinkError (JNIEnv* env, jclass, jint sink) { CS_Status status = 0; @@ -1676,12 +1676,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getSinkError } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setSinkEnabled * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setSinkEnabled +Java_org_wpilib_vision_camera_CameraServerJNI_setSinkEnabled (JNIEnv* env, jclass, jint sink, jboolean enabled) { CS_Status status = 0; @@ -1690,12 +1690,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setSinkEnabled } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: addListener * Signature: (Ljava/lang/Object;IZ)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_addListener +Java_org_wpilib_vision_camera_CameraServerJNI_addListener (JNIEnv* envouter, jclass, jobject listener, jint eventMask, jboolean immediateNotify) { @@ -1754,12 +1754,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_addListener } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: removeListener * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_removeListener +Java_org_wpilib_vision_camera_CameraServerJNI_removeListener (JNIEnv* env, jclass, jint handle) { CS_Status status = 0; @@ -1768,36 +1768,36 @@ Java_edu_wpi_first_cscore_CameraServerJNI_removeListener } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: createListenerPoller * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_createListenerPoller +Java_org_wpilib_vision_camera_CameraServerJNI_createListenerPoller (JNIEnv*, jclass) { return cs::CreateListenerPoller(); } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: destroyListenerPoller * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_destroyListenerPoller +Java_org_wpilib_vision_camera_CameraServerJNI_destroyListenerPoller (JNIEnv*, jclass, jint poller) { cs::DestroyListenerPoller(poller); } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: addPolledListener * Signature: (IIZ)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_addPolledListener +Java_org_wpilib_vision_camera_CameraServerJNI_addPolledListener (JNIEnv* env, jclass, jint poller, jint eventMask, jboolean immediateNotify) { CS_Status status = 0; @@ -1807,12 +1807,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_addPolledListener } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: pollListener * Signature: (I)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_pollListener +Java_org_wpilib_vision_camera_CameraServerJNI_pollListener (JNIEnv* env, jclass, jint poller) { auto events = cs::PollListener(poller); @@ -1824,12 +1824,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_pollListener } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: pollListenerTimeout * Signature: (ID)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_pollListenerTimeout +Java_org_wpilib_vision_camera_CameraServerJNI_pollListenerTimeout (JNIEnv* env, jclass, jint poller, jdouble timeout) { bool timed_out = false; @@ -1842,48 +1842,48 @@ Java_edu_wpi_first_cscore_CameraServerJNI_pollListenerTimeout } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: cancelPollListener * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_cancelPollListener +Java_org_wpilib_vision_camera_CameraServerJNI_cancelPollListener (JNIEnv*, jclass, jint poller) { cs::CancelPollListener(poller); } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setTelemetryPeriod * Signature: (D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setTelemetryPeriod +Java_org_wpilib_vision_camera_CameraServerJNI_setTelemetryPeriod (JNIEnv* env, jclass, jdouble seconds) { cs::SetTelemetryPeriod(seconds); } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getTelemetryElapsedTime * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getTelemetryElapsedTime +Java_org_wpilib_vision_camera_CameraServerJNI_getTelemetryElapsedTime (JNIEnv* env, jclass) { return cs::GetTelemetryElapsedTime(); } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getTelemetryValue * Signature: (II)J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getTelemetryValue +Java_org_wpilib_vision_camera_CameraServerJNI_getTelemetryValue (JNIEnv* env, jclass, jint handle, jint kind) { CS_Status status = 0; @@ -1894,12 +1894,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getTelemetryValue } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getTelemetryAverageValue * Signature: (II)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getTelemetryAverageValue +Java_org_wpilib_vision_camera_CameraServerJNI_getTelemetryAverageValue (JNIEnv* env, jclass, jint handle, jint kind) { CS_Status status = 0; @@ -1910,12 +1910,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_getTelemetryAverageValue } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: enumerateUsbCameras * Signature: ()[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_enumerateUsbCameras +Java_org_wpilib_vision_camera_CameraServerJNI_enumerateUsbCameras (JNIEnv* env, jclass) { CS_Status status = 0; @@ -1936,12 +1936,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_enumerateUsbCameras } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: enumerateSources * Signature: ()[I */ JNIEXPORT jintArray JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_enumerateSources +Java_org_wpilib_vision_camera_CameraServerJNI_enumerateSources (JNIEnv* env, jclass) { CS_Status status = 0; @@ -1954,12 +1954,12 @@ Java_edu_wpi_first_cscore_CameraServerJNI_enumerateSources } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: enumerateSinks * Signature: ()[I */ JNIEXPORT jintArray JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_enumerateSinks +Java_org_wpilib_vision_camera_CameraServerJNI_enumerateSinks (JNIEnv* env, jclass) { CS_Status status = 0; @@ -1972,24 +1972,24 @@ Java_edu_wpi_first_cscore_CameraServerJNI_enumerateSinks } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getHostname * Signature: ()Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getHostname +Java_org_wpilib_vision_camera_CameraServerJNI_getHostname (JNIEnv* env, jclass) { return MakeJString(env, cs::GetHostname()); } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: getNetworkInterfaces * Signature: ()[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_getNetworkInterfaces +Java_org_wpilib_vision_camera_CameraServerJNI_getNetworkInterfaces (JNIEnv* env, jclass) { return MakeJStringArray(env, cs::GetNetworkInterfaces()); @@ -2029,12 +2029,12 @@ using LoggerJNI = JSingletonCallbackManager; extern "C" { /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: setLogger * Signature: (Ljava/lang/Object;I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_setLogger +Java_org_wpilib_vision_camera_CameraServerJNI_setLogger (JNIEnv* env, jclass, jobject func, jint minLevel) { if (!func) { @@ -2067,36 +2067,36 @@ Java_edu_wpi_first_cscore_CameraServerJNI_setLogger } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: runMainRunLoop * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_runMainRunLoop +Java_org_wpilib_vision_camera_CameraServerJNI_runMainRunLoop (JNIEnv*, jclass) { cs::RunMainRunLoop(); } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: runMainRunLoopTimeout * Signature: (D)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_runMainRunLoopTimeout +Java_org_wpilib_vision_camera_CameraServerJNI_runMainRunLoopTimeout (JNIEnv*, jclass, jdouble timeout) { return cs::RunMainRunLoopTimeout(timeout); } /* - * Class: edu_wpi_first_cscore_CameraServerJNI + * Class: org_wpilib_vision_camera_CameraServerJNI * Method: stopMainRunLoop * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_cscore_CameraServerJNI_stopMainRunLoop +Java_org_wpilib_vision_camera_CameraServerJNI_stopMainRunLoop (JNIEnv*, jclass) { return cs::StopMainRunLoop(); diff --git a/cscore/src/test/java/org/wpilib/vision/camera/JNITest.java b/cscore/src/test/java/org/wpilib/vision/camera/JNITest.java index 40e2584a98..e387102560 100644 --- a/cscore/src/test/java/org/wpilib/vision/camera/JNITest.java +++ b/cscore/src/test/java/org/wpilib/vision/camera/JNITest.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 edu.wpi.first.cscore; +package org.wpilib.vision.camera; import org.junit.jupiter.api.Test; diff --git a/cscore/src/test/java/org/wpilib/vision/camera/UsbCameraTest.java b/cscore/src/test/java/org/wpilib/vision/camera/UsbCameraTest.java index 395f7dfc03..12b64e436a 100644 --- a/cscore/src/test/java/org/wpilib/vision/camera/UsbCameraTest.java +++ b/cscore/src/test/java/org/wpilib/vision/camera/UsbCameraTest.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 edu.wpi.first.cscore; +package org.wpilib.vision.camera; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively; diff --git a/cscore/src/test/java/org/wpilib/vision/camera/VideoModeTest.java b/cscore/src/test/java/org/wpilib/vision/camera/VideoModeTest.java index 6108c5ca1c..c3f768e7e9 100644 --- a/cscore/src/test/java/org/wpilib/vision/camera/VideoModeTest.java +++ b/cscore/src/test/java/org/wpilib/vision/camera/VideoModeTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.cscore; +package org.wpilib.vision.camera; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import edu.wpi.first.util.PixelFormat; +import org.wpilib.util.PixelFormat; import org.junit.jupiter.api.Test; class VideoModeTest { diff --git a/datalog/src/dev/java/org/wpilib/datalog/DevMain.java b/datalog/src/dev/java/org/wpilib/datalog/DevMain.java index 2c424d6c84..3adafe8792 100644 --- a/datalog/src/dev/java/org/wpilib/datalog/DevMain.java +++ b/datalog/src/dev/java/org/wpilib/datalog/DevMain.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 edu.wpi.first.datalog; +package org.wpilib.datalog; public final class DevMain { /** Main entry point. */ diff --git a/datalog/src/main/java/org/wpilib/datalog/BooleanArrayLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/BooleanArrayLogEntry.java index 01a3fffce1..3e5c9c6058 100644 --- a/datalog/src/main/java/org/wpilib/datalog/BooleanArrayLogEntry.java +++ b/datalog/src/main/java/org/wpilib/datalog/BooleanArrayLogEntry.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 edu.wpi.first.datalog; +package org.wpilib.datalog; import java.util.Arrays; diff --git a/datalog/src/main/java/org/wpilib/datalog/BooleanLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/BooleanLogEntry.java index b037370fcc..998299f3df 100644 --- a/datalog/src/main/java/org/wpilib/datalog/BooleanLogEntry.java +++ b/datalog/src/main/java/org/wpilib/datalog/BooleanLogEntry.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 edu.wpi.first.datalog; +package org.wpilib.datalog; /** Log boolean values. */ public class BooleanLogEntry extends DataLogEntry { diff --git a/datalog/src/main/java/org/wpilib/datalog/DataLog.java b/datalog/src/main/java/org/wpilib/datalog/DataLog.java index 42985210a5..5c33a774d8 100644 --- a/datalog/src/main/java/org/wpilib/datalog/DataLog.java +++ b/datalog/src/main/java/org/wpilib/datalog/DataLog.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.datalog; +package org.wpilib.datalog; -import edu.wpi.first.util.WPIUtilJNI; -import edu.wpi.first.util.protobuf.Protobuf; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.util.WPIUtilJNI; +import org.wpilib.util.protobuf.Protobuf; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; import java.util.HashSet; import java.util.Set; diff --git a/datalog/src/main/java/org/wpilib/datalog/DataLogBackgroundWriter.java b/datalog/src/main/java/org/wpilib/datalog/DataLogBackgroundWriter.java index f9ac427e6a..79f8fa2537 100644 --- a/datalog/src/main/java/org/wpilib/datalog/DataLogBackgroundWriter.java +++ b/datalog/src/main/java/org/wpilib/datalog/DataLogBackgroundWriter.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 edu.wpi.first.datalog; +package org.wpilib.datalog; /** * A data log background writer that periodically flushes the data log on a background thread. The diff --git a/datalog/src/main/java/org/wpilib/datalog/DataLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/DataLogEntry.java index 9c58f94e97..133768ecaf 100644 --- a/datalog/src/main/java/org/wpilib/datalog/DataLogEntry.java +++ b/datalog/src/main/java/org/wpilib/datalog/DataLogEntry.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 edu.wpi.first.datalog; +package org.wpilib.datalog; /** Log entry base class. */ public class DataLogEntry { diff --git a/datalog/src/main/java/org/wpilib/datalog/DataLogIterator.java b/datalog/src/main/java/org/wpilib/datalog/DataLogIterator.java index f6579e54a4..904f5d873f 100644 --- a/datalog/src/main/java/org/wpilib/datalog/DataLogIterator.java +++ b/datalog/src/main/java/org/wpilib/datalog/DataLogIterator.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 edu.wpi.first.datalog; +package org.wpilib.datalog; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/datalog/src/main/java/org/wpilib/datalog/DataLogJNI.java b/datalog/src/main/java/org/wpilib/datalog/DataLogJNI.java index bffd6ab3c3..e1fc495a2e 100644 --- a/datalog/src/main/java/org/wpilib/datalog/DataLogJNI.java +++ b/datalog/src/main/java/org/wpilib/datalog/DataLogJNI.java @@ -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. -package edu.wpi.first.datalog; +package org.wpilib.datalog; -import edu.wpi.first.util.RuntimeLoader; +import org.wpilib.util.runtime.RuntimeLoader; import java.io.IOException; import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/datalog/src/main/java/org/wpilib/datalog/DataLogReader.java b/datalog/src/main/java/org/wpilib/datalog/DataLogReader.java index c58da2dc16..154401ef52 100644 --- a/datalog/src/main/java/org/wpilib/datalog/DataLogReader.java +++ b/datalog/src/main/java/org/wpilib/datalog/DataLogReader.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 edu.wpi.first.datalog; +package org.wpilib.datalog; import java.io.IOException; import java.io.RandomAccessFile; diff --git a/datalog/src/main/java/org/wpilib/datalog/DataLogRecord.java b/datalog/src/main/java/org/wpilib/datalog/DataLogRecord.java index cf7f2d2d52..b2f0638851 100644 --- a/datalog/src/main/java/org/wpilib/datalog/DataLogRecord.java +++ b/datalog/src/main/java/org/wpilib/datalog/DataLogRecord.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 edu.wpi.first.datalog; +package org.wpilib.datalog; import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; diff --git a/datalog/src/main/java/org/wpilib/datalog/DataLogWriter.java b/datalog/src/main/java/org/wpilib/datalog/DataLogWriter.java index ce751d7776..09f7512679 100644 --- a/datalog/src/main/java/org/wpilib/datalog/DataLogWriter.java +++ b/datalog/src/main/java/org/wpilib/datalog/DataLogWriter.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 edu.wpi.first.datalog; +package org.wpilib.datalog; import java.io.IOException; import java.io.OutputStream; diff --git a/datalog/src/main/java/org/wpilib/datalog/DoubleArrayLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/DoubleArrayLogEntry.java index 7a9b494352..eeaf8ddc5e 100644 --- a/datalog/src/main/java/org/wpilib/datalog/DoubleArrayLogEntry.java +++ b/datalog/src/main/java/org/wpilib/datalog/DoubleArrayLogEntry.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 edu.wpi.first.datalog; +package org.wpilib.datalog; import java.util.Arrays; diff --git a/datalog/src/main/java/org/wpilib/datalog/DoubleLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/DoubleLogEntry.java index e4ec6909af..98e988f06a 100644 --- a/datalog/src/main/java/org/wpilib/datalog/DoubleLogEntry.java +++ b/datalog/src/main/java/org/wpilib/datalog/DoubleLogEntry.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 edu.wpi.first.datalog; +package org.wpilib.datalog; /** Log double values. */ public class DoubleLogEntry extends DataLogEntry { diff --git a/datalog/src/main/java/org/wpilib/datalog/FileLogger.java b/datalog/src/main/java/org/wpilib/datalog/FileLogger.java index afa98b2a6f..caf795faed 100644 --- a/datalog/src/main/java/org/wpilib/datalog/FileLogger.java +++ b/datalog/src/main/java/org/wpilib/datalog/FileLogger.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 edu.wpi.first.datalog; +package org.wpilib.datalog; /** * A class version of `tail -f`, otherwise known as `tail -f` at home. Watches a file and puts the diff --git a/datalog/src/main/java/org/wpilib/datalog/FloatArrayLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/FloatArrayLogEntry.java index 8532e3ab1e..edcc17fbb1 100644 --- a/datalog/src/main/java/org/wpilib/datalog/FloatArrayLogEntry.java +++ b/datalog/src/main/java/org/wpilib/datalog/FloatArrayLogEntry.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 edu.wpi.first.datalog; +package org.wpilib.datalog; import java.util.Arrays; diff --git a/datalog/src/main/java/org/wpilib/datalog/FloatLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/FloatLogEntry.java index 2286a7328c..cdb51d313d 100644 --- a/datalog/src/main/java/org/wpilib/datalog/FloatLogEntry.java +++ b/datalog/src/main/java/org/wpilib/datalog/FloatLogEntry.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 edu.wpi.first.datalog; +package org.wpilib.datalog; /** Log float values. */ public class FloatLogEntry extends DataLogEntry { diff --git a/datalog/src/main/java/org/wpilib/datalog/IntegerArrayLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/IntegerArrayLogEntry.java index 1f9c9ff64e..fb6ad8f3b5 100644 --- a/datalog/src/main/java/org/wpilib/datalog/IntegerArrayLogEntry.java +++ b/datalog/src/main/java/org/wpilib/datalog/IntegerArrayLogEntry.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 edu.wpi.first.datalog; +package org.wpilib.datalog; import java.util.Arrays; diff --git a/datalog/src/main/java/org/wpilib/datalog/IntegerLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/IntegerLogEntry.java index 0b807e70e9..6fd5548599 100644 --- a/datalog/src/main/java/org/wpilib/datalog/IntegerLogEntry.java +++ b/datalog/src/main/java/org/wpilib/datalog/IntegerLogEntry.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 edu.wpi.first.datalog; +package org.wpilib.datalog; /** Log integer values. */ public class IntegerLogEntry extends DataLogEntry { diff --git a/datalog/src/main/java/org/wpilib/datalog/ProtobufLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/ProtobufLogEntry.java index f91cc47bf4..9d88266d2d 100644 --- a/datalog/src/main/java/org/wpilib/datalog/ProtobufLogEntry.java +++ b/datalog/src/main/java/org/wpilib/datalog/ProtobufLogEntry.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.datalog; +package org.wpilib.datalog; -import edu.wpi.first.util.protobuf.Protobuf; -import edu.wpi.first.util.protobuf.ProtobufBuffer; +import org.wpilib.util.protobuf.Protobuf; +import org.wpilib.util.protobuf.ProtobufBuffer; import java.io.IOException; import java.nio.ByteBuffer; import us.hebi.quickbuf.ProtoMessage; diff --git a/datalog/src/main/java/org/wpilib/datalog/RawLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/RawLogEntry.java index b2a29b9b27..c4ff88834e 100644 --- a/datalog/src/main/java/org/wpilib/datalog/RawLogEntry.java +++ b/datalog/src/main/java/org/wpilib/datalog/RawLogEntry.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 edu.wpi.first.datalog; +package org.wpilib.datalog; import java.nio.ByteBuffer; import java.util.Arrays; diff --git a/datalog/src/main/java/org/wpilib/datalog/StringArrayLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/StringArrayLogEntry.java index f93603833c..c5e526e44b 100644 --- a/datalog/src/main/java/org/wpilib/datalog/StringArrayLogEntry.java +++ b/datalog/src/main/java/org/wpilib/datalog/StringArrayLogEntry.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 edu.wpi.first.datalog; +package org.wpilib.datalog; import java.util.Arrays; diff --git a/datalog/src/main/java/org/wpilib/datalog/StringLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/StringLogEntry.java index 367c0c8986..7b8510b3c3 100644 --- a/datalog/src/main/java/org/wpilib/datalog/StringLogEntry.java +++ b/datalog/src/main/java/org/wpilib/datalog/StringLogEntry.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 edu.wpi.first.datalog; +package org.wpilib.datalog; /** Log string values. */ public class StringLogEntry extends DataLogEntry { diff --git a/datalog/src/main/java/org/wpilib/datalog/StructArrayLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/StructArrayLogEntry.java index 1fcd6f05d1..306ef845c0 100644 --- a/datalog/src/main/java/org/wpilib/datalog/StructArrayLogEntry.java +++ b/datalog/src/main/java/org/wpilib/datalog/StructArrayLogEntry.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.datalog; +package org.wpilib.datalog; -import edu.wpi.first.util.struct.Struct; -import edu.wpi.first.util.struct.StructBuffer; +import org.wpilib.util.struct.Struct; +import org.wpilib.util.struct.StructBuffer; import java.lang.reflect.Array; import java.nio.ByteBuffer; import java.util.Arrays; diff --git a/datalog/src/main/java/org/wpilib/datalog/StructLogEntry.java b/datalog/src/main/java/org/wpilib/datalog/StructLogEntry.java index 1d0351e7fc..3e71ad1164 100644 --- a/datalog/src/main/java/org/wpilib/datalog/StructLogEntry.java +++ b/datalog/src/main/java/org/wpilib/datalog/StructLogEntry.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.datalog; +package org.wpilib.datalog; -import edu.wpi.first.util.struct.Struct; -import edu.wpi.first.util.struct.StructBuffer; +import org.wpilib.util.struct.Struct; +import org.wpilib.util.struct.StructBuffer; import java.nio.ByteBuffer; /** diff --git a/datalog/src/main/native/cpp/jni/DataLogJNI.cpp b/datalog/src/main/native/cpp/jni/DataLogJNI.cpp index 2cc965e177..26506d48a9 100644 --- a/datalog/src/main/native/cpp/jni/DataLogJNI.cpp +++ b/datalog/src/main/native/cpp/jni/DataLogJNI.cpp @@ -13,7 +13,7 @@ #include #include -#include "edu_wpi_first_datalog_DataLogJNI.h" +#include "org_wpilib_datalog_DataLogJNI.h" #include "wpi/datalog/DataLog.h" #include "wpi/datalog/DataLogBackgroundWriter.h" #include "wpi/datalog/DataLogWriter.h" @@ -94,12 +94,12 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM* vm, void* reserved) { } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: bgCreate * Signature: (Ljava/lang/String;Ljava/lang/String;DLjava/lang/String;)J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_bgCreate +Java_org_wpilib_datalog_DataLogJNI_bgCreate (JNIEnv* env, jclass, jstring dir, jstring filename, jdouble period, jstring extraHeader) { @@ -121,12 +121,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_bgCreate } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: bgSetFilename * Signature: (JLjava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_bgSetFilename +Java_org_wpilib_datalog_DataLogJNI_bgSetFilename (JNIEnv* env, jclass, jlong impl, jstring filename) { if (impl == 0) { @@ -142,12 +142,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_bgSetFilename } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: fgCreate * Signature: (Ljava/lang/String;Ljava/lang/String;)J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_fgCreate +Java_org_wpilib_datalog_DataLogJNI_fgCreate (JNIEnv* env, jclass, jstring filename, jstring extraHeader) { if (!filename) { @@ -170,12 +170,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_fgCreate } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: now * Signature: ()J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_now +Java_org_wpilib_util_WPIUtilJNI_now (JNIEnv*, jclass) { if (mockTimeEnabled) { @@ -186,12 +186,12 @@ Java_edu_wpi_first_util_WPIUtilJNI_now } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: fgCreateMemory * Signature: (Ljava/lang/String;)J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_fgCreateMemory +Java_org_wpilib_datalog_DataLogJNI_fgCreateMemory (JNIEnv* env, jclass, jstring extraHeader) { if (!extraHeader) { @@ -204,12 +204,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_fgCreateMemory } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: flush * Signature: (J)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_flush +Java_org_wpilib_datalog_DataLogJNI_flush (JNIEnv* env, jclass, jlong impl) { if (impl == 0) { @@ -220,12 +220,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_flush } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: copyWriteBuffer * Signature: (J[BI)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_copyWriteBuffer +Java_org_wpilib_datalog_DataLogJNI_copyWriteBuffer (JNIEnv* env, jclass, jlong impl, jbyteArray buf, jint start) { if (impl == 0) { @@ -247,12 +247,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_copyWriteBuffer } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: pause * Signature: (J)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_pause +Java_org_wpilib_datalog_DataLogJNI_pause (JNIEnv* env, jclass, jlong impl) { if (impl == 0) { @@ -263,12 +263,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_pause } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: resume * Signature: (J)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_resume +Java_org_wpilib_datalog_DataLogJNI_resume (JNIEnv* env, jclass, jlong impl) { if (impl == 0) { @@ -279,12 +279,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_resume } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: stop * Signature: (J)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_stop +Java_org_wpilib_datalog_DataLogJNI_stop (JNIEnv* env, jclass, jlong impl) { if (impl == 0) { @@ -295,12 +295,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_stop } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: addSchema * Signature: (JLjava/lang/String;Ljava/lang/String;[BJ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_addSchema +Java_org_wpilib_datalog_DataLogJNI_addSchema (JNIEnv* env, jclass, jlong impl, jstring name, jstring type, jbyteArray schema, jlong timestamp) { @@ -314,12 +314,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_addSchema } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: addSchemaString * Signature: (JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;J)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_addSchemaString +Java_org_wpilib_datalog_DataLogJNI_addSchemaString (JNIEnv* env, jclass, jlong impl, jstring name, jstring type, jstring schema, jlong timestamp) { @@ -336,12 +336,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_addSchemaString } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: start * Signature: (JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;J)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_start +Java_org_wpilib_datalog_DataLogJNI_start (JNIEnv* env, jclass, jlong impl, jstring name, jstring type, jstring metadata, jlong timestamp) { @@ -355,12 +355,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_start } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: finish * Signature: (JIJ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_finish +Java_org_wpilib_datalog_DataLogJNI_finish (JNIEnv* env, jclass, jlong impl, jint entry, jlong timestamp) { if (impl == 0) { @@ -371,12 +371,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_finish } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: setMetadata * Signature: (JILjava/lang/String;J)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_setMetadata +Java_org_wpilib_datalog_DataLogJNI_setMetadata (JNIEnv* env, jclass, jlong impl, jint entry, jstring metadata, jlong timestamp) { @@ -389,24 +389,24 @@ Java_edu_wpi_first_datalog_DataLogJNI_setMetadata } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: close * Signature: (J)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_close +Java_org_wpilib_datalog_DataLogJNI_close (JNIEnv*, jclass, jlong impl) { delete reinterpret_cast(impl); } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: appendRaw * Signature: (JI[BIIJ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_appendRaw +Java_org_wpilib_datalog_DataLogJNI_appendRaw (JNIEnv* env, jclass, jlong impl, jint entry, jbyteArray value, jint start, jint length, jlong timestamp) { @@ -437,12 +437,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_appendRaw } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: appendRawBuffer * Signature: (JILjava/lang/Object;IIJ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_appendRawBuffer +Java_org_wpilib_datalog_DataLogJNI_appendRawBuffer (JNIEnv* env, jclass, jlong impl, jint entry, jobject value, jint start, jint length, jlong timestamp) { @@ -473,12 +473,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_appendRawBuffer } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: appendBoolean * Signature: (JIZJ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_appendBoolean +Java_org_wpilib_datalog_DataLogJNI_appendBoolean (JNIEnv* env, jclass, jlong impl, jint entry, jboolean value, jlong timestamp) { if (impl == 0) { @@ -489,12 +489,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_appendBoolean } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: appendInteger * Signature: (JIJJ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_appendInteger +Java_org_wpilib_datalog_DataLogJNI_appendInteger (JNIEnv* env, jclass, jlong impl, jint entry, jlong value, jlong timestamp) { if (impl == 0) { @@ -505,12 +505,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_appendInteger } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: appendFloat * Signature: (JIFJ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_appendFloat +Java_org_wpilib_datalog_DataLogJNI_appendFloat (JNIEnv* env, jclass, jlong impl, jint entry, jfloat value, jlong timestamp) { if (impl == 0) { @@ -521,12 +521,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_appendFloat } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: appendDouble * Signature: (JIDJ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_appendDouble +Java_org_wpilib_datalog_DataLogJNI_appendDouble (JNIEnv* env, jclass, jlong impl, jint entry, jdouble value, jlong timestamp) { if (impl == 0) { @@ -537,12 +537,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_appendDouble } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: appendString * Signature: (JILjava/lang/String;J)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_appendString +Java_org_wpilib_datalog_DataLogJNI_appendString (JNIEnv* env, jclass, jlong impl, jint entry, jstring value, jlong timestamp) { if (impl == 0) { @@ -554,12 +554,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_appendString } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: appendBooleanArray * Signature: (JI[ZJ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_appendBooleanArray +Java_org_wpilib_datalog_DataLogJNI_appendBooleanArray (JNIEnv* env, jclass, jlong impl, jint entry, jbooleanArray value, jlong timestamp) { @@ -576,12 +576,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_appendBooleanArray } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: appendIntegerArray * Signature: (JI[JJ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_appendIntegerArray +Java_org_wpilib_datalog_DataLogJNI_appendIntegerArray (JNIEnv* env, jclass, jlong impl, jint entry, jlongArray value, jlong timestamp) { @@ -609,12 +609,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_appendIntegerArray } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: appendFloatArray * Signature: (JI[FJ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_appendFloatArray +Java_org_wpilib_datalog_DataLogJNI_appendFloatArray (JNIEnv* env, jclass, jlong impl, jint entry, jfloatArray value, jlong timestamp) { @@ -631,12 +631,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_appendFloatArray } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: appendDoubleArray * Signature: (JI[DJ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_appendDoubleArray +Java_org_wpilib_datalog_DataLogJNI_appendDoubleArray (JNIEnv* env, jclass, jlong impl, jint entry, jdoubleArray value, jlong timestamp) { @@ -653,12 +653,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_appendDoubleArray } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: appendStringArray * Signature: (JI[Ljava/lang/Object;J)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_appendStringArray +Java_org_wpilib_datalog_DataLogJNI_appendStringArray (JNIEnv* env, jclass, jlong impl, jint entry, jobjectArray value, jlong timestamp) { @@ -686,12 +686,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_appendStringArray reinterpret_cast(impl)->AppendStringArray(entry, arr, timestamp); } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: createFileLogger * Signature: (Ljava/lang/String;JLjava/lang/String;)J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_createFileLogger +Java_org_wpilib_datalog_DataLogJNI_createFileLogger (JNIEnv* env, jclass, jstring file, jlong log, jstring key) { if (!file) { @@ -712,12 +712,12 @@ Java_edu_wpi_first_datalog_DataLogJNI_createFileLogger } /* - * Class: edu_wpi_first_datalog_DataLogJNI + * Class: org_wpilib_datalog_DataLogJNI * Method: freeFileLogger * Signature: (J)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_datalog_DataLogJNI_freeFileLogger +Java_org_wpilib_datalog_DataLogJNI_freeFileLogger (JNIEnv* env, jclass, jlong fileTail) { delete reinterpret_cast(fileTail); diff --git a/datalog/src/printlog/java/printlog/PrintLog.java b/datalog/src/printlog/java/printlog/PrintLog.java index 739e5ec187..76aef1c116 100644 --- a/datalog/src/printlog/java/printlog/PrintLog.java +++ b/datalog/src/printlog/java/printlog/PrintLog.java @@ -4,8 +4,8 @@ package printlog; -import edu.wpi.first.datalog.DataLogReader; -import edu.wpi.first.datalog.DataLogRecord; +import org.wpilib.datalog.DataLogReader; +import org.wpilib.datalog.DataLogRecord; import java.io.IOException; import java.time.LocalDateTime; import java.time.ZoneOffset; diff --git a/datalog/src/test/java/org/wpilib/datalog/DataLogTest.java b/datalog/src/test/java/org/wpilib/datalog/DataLogTest.java index 217bb7d409..759708a374 100644 --- a/datalog/src/test/java/org/wpilib/datalog/DataLogTest.java +++ b/datalog/src/test/java/org/wpilib/datalog/DataLogTest.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.datalog; +package org.wpilib.datalog; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.util.struct.Struct; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.util.struct.Struct; +import org.wpilib.util.struct.StructSerializable; import java.io.ByteArrayOutputStream; import java.nio.ByteBuffer; import java.util.Objects; diff --git a/developerRobot/src/main/java/frc/robot/Main.java b/developerRobot/src/main/java/frc/robot/Main.java index 9d5286d912..ab45ce742d 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 edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 6cf3f4738d..fc961d9577 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 edu.wpi.first.wpilibj.TimedRobot; +import org.wpilib.opmode.TimedRobot; public class Robot extends TimedRobot { /** 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 15602cd31e..b0991aebd7 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 @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.epilogue.processor; +package org.wpilib.epilogue.processor; -import edu.wpi.first.epilogue.CustomLoggerFor; -import edu.wpi.first.epilogue.Logged; -import edu.wpi.first.epilogue.NotLogged; +import org.wpilib.epilogue.CustomLoggerFor; +import org.wpilib.epilogue.Logged; +import org.wpilib.epilogue.NotLogged; import java.io.IOException; import java.util.ArrayList; import java.util.Comparator; @@ -37,15 +37,15 @@ import javax.lang.model.type.TypeMirror; import javax.tools.Diagnostic; @SupportedAnnotationTypes({ - "edu.wpi.first.epilogue.CustomLoggerFor", - "edu.wpi.first.epilogue.Logged" + "org.wpilib.epilogue.CustomLoggerFor", + "org.wpilib.epilogue.Logged" }) @SupportedSourceVersion(SourceVersion.RELEASE_21) public class AnnotationProcessor extends AbstractProcessor { - private static final String kCustomLoggerFqn = "edu.wpi.first.epilogue.CustomLoggerFor"; + private static final String kCustomLoggerFqn = "org.wpilib.epilogue.CustomLoggerFor"; private static final String kClassSpecificLoggerFqn = - "edu.wpi.first.epilogue.logging.ClassSpecificLogger"; - private static final String kLoggedFqn = "edu.wpi.first.epilogue.Logged"; + "org.wpilib.epilogue.logging.ClassSpecificLogger"; + private static final String kLoggedFqn = "org.wpilib.epilogue.Logged"; private EpilogueGenerator m_epiloguerGenerator; private LoggerGenerator m_loggerGenerator; @@ -297,7 +297,7 @@ public class AnnotationProcessor extends AbstractProcessor { var loggerSuperClass = processingEnv .getElementUtils() - .getTypeElement("edu.wpi.first.epilogue.logging.ClassSpecificLogger"); + .getTypeElement("org.wpilib.epilogue.logging.ClassSpecificLogger"); for (Element annotatedElement : annotatedElements) { List targetTypes = List.of(); @@ -388,7 +388,7 @@ public class AnnotationProcessor extends AbstractProcessor { // Used to check for a main robot class var robotBaseClass = - processingEnv.getElementUtils().getTypeElement("edu.wpi.first.wpilibj.TimedRobot").asType(); + processingEnv.getElementUtils().getTypeElement("org.wpilib.opmode.TimedRobot").asType(); boolean validFields = validateFields(annotatedElements); boolean validMethods = validateMethods(annotatedElements); diff --git a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ArrayHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ArrayHandler.java index 37b9c421fd..dda1ca121f 100644 --- a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ArrayHandler.java +++ b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ArrayHandler.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 edu.wpi.first.epilogue.processor; +package org.wpilib.epilogue.processor; import javax.annotation.processing.ProcessingEnvironment; import javax.lang.model.element.Element; diff --git a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/CollectionHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/CollectionHandler.java index d864f093d6..c0e94673e1 100644 --- a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/CollectionHandler.java +++ b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/CollectionHandler.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 edu.wpi.first.epilogue.processor; +package org.wpilib.epilogue.processor; import javax.annotation.processing.ProcessingEnvironment; import javax.lang.model.element.Element; diff --git a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ConfiguredLoggerHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ConfiguredLoggerHandler.java index 086e7fbe40..97c0508208 100644 --- a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ConfiguredLoggerHandler.java +++ b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ConfiguredLoggerHandler.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 edu.wpi.first.epilogue.processor; +package org.wpilib.epilogue.processor; import java.util.Map; import javax.annotation.processing.ProcessingEnvironment; diff --git a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ElementHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ElementHandler.java index 61e3d49974..0e237d4cee 100644 --- a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ElementHandler.java +++ b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ElementHandler.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.epilogue.processor; +package org.wpilib.epilogue.processor; -import edu.wpi.first.epilogue.Logged; -import edu.wpi.first.epilogue.logging.ClassSpecificLogger; -import edu.wpi.first.epilogue.logging.EpilogueBackend; +import org.wpilib.epilogue.Logged; +import org.wpilib.epilogue.logging.ClassSpecificLogger; +import org.wpilib.epilogue.logging.EpilogueBackend; import javax.annotation.processing.ProcessingEnvironment; import javax.lang.model.element.Element; import javax.lang.model.element.ExecutableElement; diff --git a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/EnumHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/EnumHandler.java index f8c05670b0..0e8abb0169 100644 --- a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/EnumHandler.java +++ b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/EnumHandler.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 edu.wpi.first.epilogue.processor; +package org.wpilib.epilogue.processor; import javax.annotation.processing.ProcessingEnvironment; import javax.lang.model.element.Element; 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 28380a70e6..66399307de 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 @@ -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. -package edu.wpi.first.epilogue.processor; +package org.wpilib.epilogue.processor; -import edu.wpi.first.epilogue.EpilogueConfiguration; +import org.wpilib.epilogue.EpilogueConfiguration; import java.io.IOException; import java.io.PrintWriter; import java.util.Collection; @@ -19,7 +19,7 @@ import javax.lang.model.type.TypeMirror; * 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 - * edu.wpi.first.wpilibj.TimedRobot TimedRobot}) a {@code bind()} method to automatically add a + * org.wpilib.opmode.TimedRobot TimedRobot}) a {@code bind()} method to automatically add a * periodic logging call to the robot. */ public class EpilogueGenerator { @@ -46,16 +46,16 @@ public class EpilogueGenerator { List loggerClassNames, Collection mainRobotClasses) { try { var centralStore = - m_processingEnv.getFiler().createSourceFile("edu.wpi.first.epilogue.Epilogue"); + m_processingEnv.getFiler().createSourceFile("org.wpilib.epilogue.Epilogue"); try (var out = new PrintWriter(centralStore.openOutputStream())) { - out.println("package edu.wpi.first.epilogue;"); + out.println("package org.wpilib.epilogue;"); out.println(); - out.println("import static edu.wpi.first.units.Units.Seconds;"); + out.println("import static org.wpilib.units.Units.Seconds;"); out.println(); - out.println("import edu.wpi.first.hal.HAL;"); + out.println("import org.wpilib.hardware.hal.HAL;"); out.println(); loggerClassNames.stream() diff --git a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/LoggableHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/LoggableHandler.java index 001716a637..990201c6c7 100644 --- a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/LoggableHandler.java +++ b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/LoggableHandler.java @@ -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. -package edu.wpi.first.epilogue.processor; +package org.wpilib.epilogue.processor; -import edu.wpi.first.epilogue.Logged; +import org.wpilib.epilogue.Logged; import java.util.Collection; import java.util.Comparator; import java.util.Set; diff --git a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/LoggerGenerator.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/LoggerGenerator.java index 20b1e1cebc..d9ec03778f 100644 --- a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/LoggerGenerator.java +++ b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/LoggerGenerator.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 edu.wpi.first.epilogue.processor; +package org.wpilib.epilogue.processor; import static java.util.stream.Collectors.groupingBy; import static java.util.stream.Collectors.toList; @@ -11,8 +11,8 @@ import com.sun.source.tree.IdentifierTree; import com.sun.source.tree.ReturnTree; import com.sun.source.util.SimpleTreeVisitor; import com.sun.source.util.Trees; -import edu.wpi.first.epilogue.Logged; -import edu.wpi.first.epilogue.NotLogged; +import org.wpilib.epilogue.Logged; +import org.wpilib.epilogue.NotLogged; import java.io.IOException; import java.io.PrintWriter; import java.lang.annotation.Annotation; @@ -104,7 +104,7 @@ public class LoggerGenerator { /** * Generates the logger class used to handle data objects of the given type. The generated logger - * class will subclass from {@link edu.wpi.first.epilogue.logging.ClassSpecificLogger} and + * class will subclass from {@link org.wpilib.epilogue.logging.ClassSpecificLogger} and * implement the {@code update()} method to populate a data log with information from an instance * of the data type. * @@ -211,10 +211,10 @@ public class LoggerGenerator { out.println(); } - out.println("import edu.wpi.first.epilogue.Logged;"); - out.println("import edu.wpi.first.epilogue.Epilogue;"); - out.println("import edu.wpi.first.epilogue.logging.ClassSpecificLogger;"); - out.println("import edu.wpi.first.epilogue.logging.EpilogueBackend;"); + out.println("import org.wpilib.epilogue.Logged;"); + out.println("import org.wpilib.epilogue.Epilogue;"); + out.println("import org.wpilib.epilogue.logging.ClassSpecificLogger;"); + out.println("import org.wpilib.epilogue.logging.EpilogueBackend;"); if (requiresVarHandles) { out.println("import java.lang.invoke.MethodHandles;"); out.println("import java.lang.invoke.VarHandle;"); diff --git a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/MeasureHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/MeasureHandler.java index bff3e8533a..792016160a 100644 --- a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/MeasureHandler.java +++ b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/MeasureHandler.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 edu.wpi.first.epilogue.processor; +package org.wpilib.epilogue.processor; import javax.annotation.processing.ProcessingEnvironment; import javax.lang.model.element.Element; @@ -21,7 +21,7 @@ public class MeasureHandler extends ElementHandler { .erasure( processingEnv .getElementUtils() - .getTypeElement("edu.wpi.first.units.Measure") + .getTypeElement("org.wpilib.units.Measure") .asType()); } diff --git a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/PrimitiveHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/PrimitiveHandler.java index 8da8ece405..8c8b0ea9dc 100644 --- a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/PrimitiveHandler.java +++ b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/PrimitiveHandler.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 edu.wpi.first.epilogue.processor; +package org.wpilib.epilogue.processor; import static javax.lang.model.type.TypeKind.BOOLEAN; import static javax.lang.model.type.TypeKind.BYTE; diff --git a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ProtobufHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ProtobufHandler.java index 63186b1640..148e2281c0 100644 --- a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ProtobufHandler.java +++ b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/ProtobufHandler.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 edu.wpi.first.epilogue.processor; +package org.wpilib.epilogue.processor; import java.util.Set; import javax.annotation.processing.ProcessingEnvironment; @@ -30,10 +30,10 @@ public class ProtobufHandler extends ElementHandler { m_serializable = processingEnv .getElementUtils() - .getTypeElement("edu.wpi.first.util.protobuf.ProtobufSerializable") + .getTypeElement("org.wpilib.util.protobuf.ProtobufSerializable") .asType(); m_protobufType = - processingEnv.getElementUtils().getTypeElement("edu.wpi.first.util.protobuf.Protobuf"); + processingEnv.getElementUtils().getTypeElement("org.wpilib.util.protobuf.Protobuf"); m_typeUtils = processingEnv.getTypeUtils(); m_elementUtils = processingEnv.getElementUtils(); } diff --git a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/SendableHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/SendableHandler.java index 635b565940..89e5ffad92 100644 --- a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/SendableHandler.java +++ b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/SendableHandler.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 edu.wpi.first.epilogue.processor; +package org.wpilib.epilogue.processor; import java.util.Optional; import javax.annotation.processing.ProcessingEnvironment; @@ -20,15 +20,15 @@ public class SendableHandler extends ElementHandler { m_sendableType = Optional.ofNullable( - lookupTypeElement(processingEnv, "edu.wpi.first.util.sendable.Sendable")) + lookupTypeElement(processingEnv, "org.wpilib.util.sendable.Sendable")) .map(TypeElement::asType); m_commandType = Optional.ofNullable( - lookupTypeElement(processingEnv, "edu.wpi.first.wpilibj2.command.Command")) + lookupTypeElement(processingEnv, "org.wpilib.command2.Command")) .map(TypeElement::asType); m_subsystemType = Optional.ofNullable( - lookupTypeElement(processingEnv, "edu.wpi.first.wpilibj2.command.SubsystemBase")) + lookupTypeElement(processingEnv, "org.wpilib.command2.SubsystemBase")) .map(TypeElement::asType); } diff --git a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/StringUtils.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/StringUtils.java index 44063eed65..7d6198b3ba 100644 --- a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/StringUtils.java +++ b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/StringUtils.java @@ -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. -package edu.wpi.first.epilogue.processor; +package org.wpilib.epilogue.processor; -import edu.wpi.first.epilogue.Logged; +import org.wpilib.epilogue.Logged; import java.util.ArrayDeque; import java.util.Arrays; import java.util.Deque; diff --git a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/StructHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/StructHandler.java index a6063227d5..a4ab94154a 100644 --- a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/StructHandler.java +++ b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/StructHandler.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 edu.wpi.first.epilogue.processor; +package org.wpilib.epilogue.processor; import java.util.Set; import javax.annotation.processing.ProcessingEnvironment; @@ -30,10 +30,10 @@ public class StructHandler extends ElementHandler { m_serializable = processingEnv .getElementUtils() - .getTypeElement("edu.wpi.first.util.struct.StructSerializable") + .getTypeElement("org.wpilib.util.struct.StructSerializable") .asType(); m_structType = - processingEnv.getElementUtils().getTypeElement("edu.wpi.first.util.struct.Struct"); + processingEnv.getElementUtils().getTypeElement("org.wpilib.util.struct.Struct"); m_typeUtils = processingEnv.getTypeUtils(); m_elementUtils = processingEnv.getElementUtils(); } diff --git a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/SupplierHandler.java b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/SupplierHandler.java index 49f2e06935..fd7d8e9c5e 100644 --- a/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/SupplierHandler.java +++ b/epilogue-processor/src/main/java/org/wpilib/epilogue/processor/SupplierHandler.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 edu.wpi.first.epilogue.processor; +package org.wpilib.epilogue.processor; import javax.annotation.processing.ProcessingEnvironment; import javax.lang.model.element.Element; diff --git a/epilogue-processor/src/test/java/org/wpilib/epilogue/processor/AnnotationProcessorTest.java b/epilogue-processor/src/test/java/org/wpilib/epilogue/processor/AnnotationProcessorTest.java index 36f656d0d8..82a942de38 100644 --- a/epilogue-processor/src/test/java/org/wpilib/epilogue/processor/AnnotationProcessorTest.java +++ b/epilogue-processor/src/test/java/org/wpilib/epilogue/processor/AnnotationProcessorTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.epilogue.processor; +package org.wpilib.epilogue.processor; import static com.google.testing.compile.CompilationSubject.assertThat; import static com.google.testing.compile.Compiler.javac; -import static edu.wpi.first.epilogue.processor.CompileTestOptions.kJavaVersionOptions; +import static org.wpilib.epilogue.processor.CompileTestOptions.kJavaVersionOptions; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -27,7 +27,7 @@ class AnnotationProcessorTest { void simple() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged class Example { @@ -37,12 +37,12 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -65,7 +65,7 @@ class AnnotationProcessorTest { void optInFields() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; class Example { @Logged double x; @@ -75,12 +75,12 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -104,7 +104,7 @@ class AnnotationProcessorTest { void optInMethods() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; class Example { @Logged public double getValue() { return 2.0; } @@ -114,12 +114,12 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -153,7 +153,7 @@ class AnnotationProcessorTest { javac() .withOptions(kJavaVersionOptions) .withProcessors(new AnnotationProcessor()) - .compile(JavaFileObjects.forSourceString("edu.wpi.first.epilogue.Example", source)); + .compile(JavaFileObjects.forSourceString("org.wpilib.epilogue.Example", source)); assertThat(compilation).succeeded(); // nothing is annotated with @Logged; so, no logger file should be generated @@ -166,7 +166,7 @@ class AnnotationProcessorTest { void multiple() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged class Example { @@ -177,12 +177,12 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -206,7 +206,7 @@ class AnnotationProcessorTest { void privateFields() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged class Example { @@ -216,24 +216,24 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; import java.lang.invoke.MethodHandles; import java.lang.invoke.VarHandle; public class ExampleLogger extends ClassSpecificLogger { - // Accesses private or superclass field edu.wpi.first.epilogue.Example.x - private static final VarHandle $edu_wpi_first_epilogue_Example_x; + // Accesses private or superclass field org.wpilib.epilogue.Example.x + private static final VarHandle $org_wpilib_epilogue_Example_x; static { try { var rootLookup = MethodHandles.lookup(); - var lookup$$edu_wpi_first_epilogue_Example = MethodHandles.privateLookupIn(edu.wpi.first.epilogue.Example.class, rootLookup); - $edu_wpi_first_epilogue_Example_x = lookup$$edu_wpi_first_epilogue_Example.findVarHandle(edu.wpi.first.epilogue.Example.class, "x", double.class); + var lookup$$org_wpilib_epilogue_Example = MethodHandles.privateLookupIn(org.wpilib.epilogue.Example.class, rootLookup); + $org_wpilib_epilogue_Example_x = lookup$$org_wpilib_epilogue_Example.findVarHandle(org.wpilib.epilogue.Example.class, "x", double.class); } catch (ReflectiveOperationException e) { throw new RuntimeException("[EPILOGUE] Could not load private fields for logging!", e); } @@ -246,7 +246,7 @@ class AnnotationProcessorTest { @Override public void update(EpilogueBackend backend, Example object) { if (Epilogue.shouldLog(Logged.Importance.DEBUG)) { - backend.log("x", ((double) $edu_wpi_first_epilogue_Example_x.get(object))); + backend.log("x", ((double) $org_wpilib_epilogue_Example_x.get(object))); } } } @@ -259,7 +259,7 @@ class AnnotationProcessorTest { void privateSuppliers() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; import java.util.function.DoubleSupplier; @@ -271,24 +271,24 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; import java.lang.invoke.MethodHandles; import java.lang.invoke.VarHandle; public class ExampleLogger extends ClassSpecificLogger { - // Accesses private or superclass field edu.wpi.first.epilogue.Example.x - private static final VarHandle $edu_wpi_first_epilogue_Example_x; + // Accesses private or superclass field org.wpilib.epilogue.Example.x + private static final VarHandle $org_wpilib_epilogue_Example_x; static { try { var rootLookup = MethodHandles.lookup(); - var lookup$$edu_wpi_first_epilogue_Example = MethodHandles.privateLookupIn(edu.wpi.first.epilogue.Example.class, rootLookup); - $edu_wpi_first_epilogue_Example_x = lookup$$edu_wpi_first_epilogue_Example.findVarHandle(edu.wpi.first.epilogue.Example.class, "x", java.util.function.DoubleSupplier.class); + var lookup$$org_wpilib_epilogue_Example = MethodHandles.privateLookupIn(org.wpilib.epilogue.Example.class, rootLookup); + $org_wpilib_epilogue_Example_x = lookup$$org_wpilib_epilogue_Example.findVarHandle(org.wpilib.epilogue.Example.class, "x", java.util.function.DoubleSupplier.class); } catch (ReflectiveOperationException e) { throw new RuntimeException("[EPILOGUE] Could not load private fields for logging!", e); } @@ -301,7 +301,7 @@ class AnnotationProcessorTest { @Override public void update(EpilogueBackend backend, Example object) { if (Epilogue.shouldLog(Logged.Importance.DEBUG)) { - backend.log("x", ((java.util.function.DoubleSupplier) $edu_wpi_first_epilogue_Example_x.get(object)).getAsDouble()); + backend.log("x", ((java.util.function.DoubleSupplier) $org_wpilib_epilogue_Example_x.get(object)).getAsDouble()); } } } @@ -314,34 +314,34 @@ class AnnotationProcessorTest { void privateWithGenerics() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged class Example { - private edu.wpi.first.wpilibj.smartdashboard.SendableChooser chooser; + private org.wpilib.smartdashboard.SendableChooser chooser; } """; String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; import java.lang.invoke.MethodHandles; import java.lang.invoke.VarHandle; public class ExampleLogger extends ClassSpecificLogger { - // Accesses private or superclass field edu.wpi.first.epilogue.Example.chooser - private static final VarHandle $edu_wpi_first_epilogue_Example_chooser; + // Accesses private or superclass field org.wpilib.epilogue.Example.chooser + private static final VarHandle $org_wpilib_epilogue_Example_chooser; static { try { var rootLookup = MethodHandles.lookup(); - var lookup$$edu_wpi_first_epilogue_Example = MethodHandles.privateLookupIn(edu.wpi.first.epilogue.Example.class, rootLookup); - $edu_wpi_first_epilogue_Example_chooser = lookup$$edu_wpi_first_epilogue_Example.findVarHandle(edu.wpi.first.epilogue.Example.class, "chooser", edu.wpi.first.wpilibj.smartdashboard.SendableChooser.class); + var lookup$$org_wpilib_epilogue_Example = MethodHandles.privateLookupIn(org.wpilib.epilogue.Example.class, rootLookup); + $org_wpilib_epilogue_Example_chooser = lookup$$org_wpilib_epilogue_Example.findVarHandle(org.wpilib.epilogue.Example.class, "chooser", org.wpilib.smartdashboard.SendableChooser.class); } catch (ReflectiveOperationException e) { throw new RuntimeException("[EPILOGUE] Could not load private fields for logging!", e); } @@ -354,7 +354,7 @@ class AnnotationProcessorTest { @Override public void update(EpilogueBackend backend, Example object) { if (Epilogue.shouldLog(Logged.Importance.DEBUG)) { - logSendable(backend.getNested("chooser"), ((edu.wpi.first.wpilibj.smartdashboard.SendableChooser) $edu_wpi_first_epilogue_Example_chooser.get(object))); + logSendable(backend.getNested("chooser"), ((org.wpilib.smartdashboard.SendableChooser) $org_wpilib_epilogue_Example_chooser.get(object))); } } } @@ -367,7 +367,7 @@ class AnnotationProcessorTest { void importanceLevels() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged(importance = Logged.Importance.INFO) class Example { @@ -379,12 +379,12 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -413,7 +413,7 @@ class AnnotationProcessorTest { void logEnum() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged class Example { @@ -427,12 +427,12 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -455,7 +455,7 @@ class AnnotationProcessorTest { void superclassStillOptIn() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; // nothing should be logged from BaseExample class BaseExample { @@ -471,12 +471,12 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -499,7 +499,7 @@ class AnnotationProcessorTest { void simpleSuperclass() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged class BaseExample { @@ -517,30 +517,30 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; import java.lang.invoke.MethodHandles; import java.lang.invoke.VarHandle; public class ExampleLogger extends ClassSpecificLogger { - // Accesses private or superclass field edu.wpi.first.epilogue.BaseExample.b - private static final VarHandle $edu_wpi_first_epilogue_BaseExample_b; - // Accesses private or superclass field edu.wpi.first.epilogue.BaseExample.c - private static final VarHandle $edu_wpi_first_epilogue_BaseExample_c; - // Accesses private or superclass field edu.wpi.first.epilogue.BaseExample.d - private static final VarHandle $edu_wpi_first_epilogue_BaseExample_d; + // Accesses private or superclass field org.wpilib.epilogue.BaseExample.b + private static final VarHandle $org_wpilib_epilogue_BaseExample_b; + // Accesses private or superclass field org.wpilib.epilogue.BaseExample.c + private static final VarHandle $org_wpilib_epilogue_BaseExample_c; + // Accesses private or superclass field org.wpilib.epilogue.BaseExample.d + private static final VarHandle $org_wpilib_epilogue_BaseExample_d; static { try { var rootLookup = MethodHandles.lookup(); - var lookup$$edu_wpi_first_epilogue_BaseExample = MethodHandles.privateLookupIn(edu.wpi.first.epilogue.BaseExample.class, rootLookup); - $edu_wpi_first_epilogue_BaseExample_b = lookup$$edu_wpi_first_epilogue_BaseExample.findVarHandle(edu.wpi.first.epilogue.BaseExample.class, "b", double.class); - $edu_wpi_first_epilogue_BaseExample_c = lookup$$edu_wpi_first_epilogue_BaseExample.findVarHandle(edu.wpi.first.epilogue.BaseExample.class, "c", double.class); - $edu_wpi_first_epilogue_BaseExample_d = lookup$$edu_wpi_first_epilogue_BaseExample.findVarHandle(edu.wpi.first.epilogue.BaseExample.class, "d", double.class); + var lookup$$org_wpilib_epilogue_BaseExample = MethodHandles.privateLookupIn(org.wpilib.epilogue.BaseExample.class, rootLookup); + $org_wpilib_epilogue_BaseExample_b = lookup$$org_wpilib_epilogue_BaseExample.findVarHandle(org.wpilib.epilogue.BaseExample.class, "b", double.class); + $org_wpilib_epilogue_BaseExample_c = lookup$$org_wpilib_epilogue_BaseExample.findVarHandle(org.wpilib.epilogue.BaseExample.class, "c", double.class); + $org_wpilib_epilogue_BaseExample_d = lookup$$org_wpilib_epilogue_BaseExample.findVarHandle(org.wpilib.epilogue.BaseExample.class, "d", double.class); } catch (ReflectiveOperationException e) { throw new RuntimeException("[EPILOGUE] Could not load private fields for logging!", e); } @@ -555,9 +555,9 @@ class AnnotationProcessorTest { if (Epilogue.shouldLog(Logged.Importance.DEBUG)) { backend.log("e", object.e); backend.log("a", object.a); - backend.log("b", ((double) $edu_wpi_first_epilogue_BaseExample_b.get(object))); - backend.log("c", ((double) $edu_wpi_first_epilogue_BaseExample_c.get(object))); - backend.log("d", ((double) $edu_wpi_first_epilogue_BaseExample_d.get(object))); + backend.log("b", ((double) $org_wpilib_epilogue_BaseExample_b.get(object))); + backend.log("c", ((double) $org_wpilib_epilogue_BaseExample_c.get(object))); + backend.log("d", ((double) $org_wpilib_epilogue_BaseExample_d.get(object))); } } } @@ -570,7 +570,7 @@ class AnnotationProcessorTest { void complexSuperclass() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; class Grandparent { @Logged @@ -598,34 +598,34 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; import java.lang.invoke.MethodHandles; import java.lang.invoke.VarHandle; public class ExampleLogger extends ClassSpecificLogger { - // Accesses private or superclass field edu.wpi.first.epilogue.Example.i - private static final VarHandle $edu_wpi_first_epilogue_Example_i; - // Accesses private or superclass field edu.wpi.first.epilogue.BaseExample.d - private static final VarHandle $edu_wpi_first_epilogue_BaseExample_d; - // Accesses private or superclass field edu.wpi.first.epilogue.BaseExample.f - private static final VarHandle $edu_wpi_first_epilogue_BaseExample_f; - // Accesses private or superclass field edu.wpi.first.epilogue.BaseExample.g - private static final VarHandle $edu_wpi_first_epilogue_BaseExample_g; + // Accesses private or superclass field org.wpilib.epilogue.Example.i + private static final VarHandle $org_wpilib_epilogue_Example_i; + // Accesses private or superclass field org.wpilib.epilogue.BaseExample.d + private static final VarHandle $org_wpilib_epilogue_BaseExample_d; + // Accesses private or superclass field org.wpilib.epilogue.BaseExample.f + private static final VarHandle $org_wpilib_epilogue_BaseExample_f; + // Accesses private or superclass field org.wpilib.epilogue.BaseExample.g + private static final VarHandle $org_wpilib_epilogue_BaseExample_g; static { try { var rootLookup = MethodHandles.lookup(); - var lookup$$edu_wpi_first_epilogue_BaseExample = MethodHandles.privateLookupIn(edu.wpi.first.epilogue.BaseExample.class, rootLookup); - $edu_wpi_first_epilogue_BaseExample_d = lookup$$edu_wpi_first_epilogue_BaseExample.findVarHandle(edu.wpi.first.epilogue.BaseExample.class, "d", double.class); - $edu_wpi_first_epilogue_BaseExample_f = lookup$$edu_wpi_first_epilogue_BaseExample.findVarHandle(edu.wpi.first.epilogue.BaseExample.class, "f", double.class); - $edu_wpi_first_epilogue_BaseExample_g = lookup$$edu_wpi_first_epilogue_BaseExample.findVarHandle(edu.wpi.first.epilogue.BaseExample.class, "g", double.class); - var lookup$$edu_wpi_first_epilogue_Example = MethodHandles.privateLookupIn(edu.wpi.first.epilogue.Example.class, rootLookup); - $edu_wpi_first_epilogue_Example_i = lookup$$edu_wpi_first_epilogue_Example.findVarHandle(edu.wpi.first.epilogue.Example.class, "i", double.class); + var lookup$$org_wpilib_epilogue_BaseExample = MethodHandles.privateLookupIn(org.wpilib.epilogue.BaseExample.class, rootLookup); + $org_wpilib_epilogue_BaseExample_d = lookup$$org_wpilib_epilogue_BaseExample.findVarHandle(org.wpilib.epilogue.BaseExample.class, "d", double.class); + $org_wpilib_epilogue_BaseExample_f = lookup$$org_wpilib_epilogue_BaseExample.findVarHandle(org.wpilib.epilogue.BaseExample.class, "f", double.class); + $org_wpilib_epilogue_BaseExample_g = lookup$$org_wpilib_epilogue_BaseExample.findVarHandle(org.wpilib.epilogue.BaseExample.class, "g", double.class); + var lookup$$org_wpilib_epilogue_Example = MethodHandles.privateLookupIn(org.wpilib.epilogue.Example.class, rootLookup); + $org_wpilib_epilogue_Example_i = lookup$$org_wpilib_epilogue_Example.findVarHandle(org.wpilib.epilogue.Example.class, "i", double.class); } catch (ReflectiveOperationException e) { throw new RuntimeException("[EPILOGUE] Could not load private fields for logging!", e); } @@ -639,11 +639,11 @@ class AnnotationProcessorTest { public void update(EpilogueBackend backend, Example object) { if (Epilogue.shouldLog(Logged.Importance.DEBUG)) { backend.log("h", object.h); - backend.log("i", ((double) $edu_wpi_first_epilogue_Example_i.get(object))); - backend.log("d", ((double) $edu_wpi_first_epilogue_BaseExample_d.get(object))); + backend.log("i", ((double) $org_wpilib_epilogue_Example_i.get(object))); + backend.log("d", ((double) $org_wpilib_epilogue_BaseExample_d.get(object))); backend.log("e", object.e); - backend.log("f", ((double) $edu_wpi_first_epilogue_BaseExample_f.get(object))); - backend.log("g", ((double) $edu_wpi_first_epilogue_BaseExample_g.get(object))); + backend.log("f", ((double) $org_wpilib_epilogue_BaseExample_f.get(object))); + backend.log("g", ((double) $org_wpilib_epilogue_BaseExample_g.get(object))); backend.log("a", object.a); backend.log("getValue", object.getValue()); backend.log("getB", object.getB()); @@ -659,7 +659,7 @@ class AnnotationProcessorTest { void bytes() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged class Example { @@ -675,12 +675,12 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -706,7 +706,7 @@ class AnnotationProcessorTest { void chars() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged class Example { @@ -722,12 +722,12 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -751,7 +751,7 @@ class AnnotationProcessorTest { void shorts() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged class Example { @@ -767,12 +767,12 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -796,7 +796,7 @@ class AnnotationProcessorTest { void ints() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged class Example { @@ -812,12 +812,12 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -843,7 +843,7 @@ class AnnotationProcessorTest { void longs() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged class Example { @@ -859,12 +859,12 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -890,7 +890,7 @@ class AnnotationProcessorTest { void floats() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged class Example { @@ -906,12 +906,12 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -937,7 +937,7 @@ class AnnotationProcessorTest { void doubles() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; import java.util.List; @@ -956,12 +956,12 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -987,7 +987,7 @@ class AnnotationProcessorTest { void booleans() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; import java.util.List; @Logged @@ -1005,12 +1005,12 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -1036,7 +1036,7 @@ class AnnotationProcessorTest { void strings() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; import java.util.List; @@ -1055,12 +1055,12 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -1087,10 +1087,10 @@ class AnnotationProcessorTest { void structs() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.util.struct.Struct; - import edu.wpi.first.util.struct.StructSerializable; + import org.wpilib.util.struct.Struct; + import org.wpilib.util.struct.StructSerializable; import java.util.List; @Logged @@ -1114,12 +1114,12 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -1129,11 +1129,11 @@ class AnnotationProcessorTest { @Override public void update(EpilogueBackend backend, Example object) { if (Epilogue.shouldLog(Logged.Importance.DEBUG)) { - backend.log("x", object.x, edu.wpi.first.epilogue.Example.Structable.struct); - backend.log("arr1", object.arr1, edu.wpi.first.epilogue.Example.Structable.struct); - backend.log("list", object.list, edu.wpi.first.epilogue.Example.Structable.struct); - backend.log("getX", object.getX(), edu.wpi.first.epilogue.Example.Structable.struct); - backend.log("getArr1", object.getArr1(), edu.wpi.first.epilogue.Example.Structable.struct); + backend.log("x", object.x, org.wpilib.epilogue.Example.Structable.struct); + backend.log("arr1", object.arr1, org.wpilib.epilogue.Example.Structable.struct); + backend.log("list", object.list, org.wpilib.epilogue.Example.Structable.struct); + backend.log("getX", object.getX(), org.wpilib.epilogue.Example.Structable.struct); + backend.log("getArr1", object.getArr1(), org.wpilib.epilogue.Example.Structable.struct); } } } @@ -1146,10 +1146,10 @@ class AnnotationProcessorTest { void protobuf() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.util.protobuf.Protobuf; - import edu.wpi.first.util.protobuf.ProtobufSerializable; + import org.wpilib.util.protobuf.Protobuf; + import org.wpilib.util.protobuf.ProtobufSerializable; import java.util.List; import us.hebi.quickbuf.*; @@ -1188,12 +1188,12 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -1203,7 +1203,7 @@ class AnnotationProcessorTest { @Override public void update(EpilogueBackend backend, Example object) { if (Epilogue.shouldLog(Logged.Importance.DEBUG)) { - backend.log("x", object.x, edu.wpi.first.epilogue.ProtobufType.proto); + backend.log("x", object.x, org.wpilib.epilogue.ProtobufType.proto); } } } @@ -1216,10 +1216,10 @@ class AnnotationProcessorTest { void lists() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.util.struct.Struct; - import edu.wpi.first.util.struct.StructSerializable; + import org.wpilib.util.struct.Struct; + import org.wpilib.util.struct.StructSerializable; import java.util.*; @Logged @@ -1235,12 +1235,12 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -1269,10 +1269,10 @@ class AnnotationProcessorTest { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.util.struct.Struct; - import edu.wpi.first.util.struct.StructSerializable; + import org.wpilib.util.struct.Struct; + import org.wpilib.util.struct.StructSerializable; import java.util.List; @Logged @@ -1285,12 +1285,12 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -1310,10 +1310,10 @@ class AnnotationProcessorTest { void badLogSetup() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.util.struct.Struct; - import edu.wpi.first.util.struct.StructSerializable; + import org.wpilib.util.struct.Struct; + import org.wpilib.util.struct.StructSerializable; import java.util.*; @Logged @@ -1349,7 +1349,7 @@ class AnnotationProcessorTest { javac() .withOptions(kJavaVersionOptions) .withProcessors(new AnnotationProcessor()) - .compile(JavaFileObjects.forSourceString("edu.wpi.first.epilogue.Example", source)); + .compile(JavaFileObjects.forSourceString("org.wpilib.epilogue.Example", source)); assertThat(compilation).failed(); assertThat(compilation).hadErrorCount(10); @@ -1404,7 +1404,7 @@ class AnnotationProcessorTest { void onGenericType() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged class Example { @@ -1417,24 +1417,24 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; import java.lang.invoke.MethodHandles; import java.lang.invoke.VarHandle; public class ExampleLogger extends ClassSpecificLogger { - // Accesses private or superclass field edu.wpi.first.epilogue.Example.valueB - private static final VarHandle $edu_wpi_first_epilogue_Example_valueB; + // Accesses private or superclass field org.wpilib.epilogue.Example.valueB + private static final VarHandle $org_wpilib_epilogue_Example_valueB; static { try { var rootLookup = MethodHandles.lookup(); - var lookup$$edu_wpi_first_epilogue_Example = MethodHandles.privateLookupIn(edu.wpi.first.epilogue.Example.class, rootLookup); - $edu_wpi_first_epilogue_Example_valueB = lookup$$edu_wpi_first_epilogue_Example.findVarHandle(edu.wpi.first.epilogue.Example.class, "valueB", java.lang.String.class); + var lookup$$org_wpilib_epilogue_Example = MethodHandles.privateLookupIn(org.wpilib.epilogue.Example.class, rootLookup); + $org_wpilib_epilogue_Example_valueB = lookup$$org_wpilib_epilogue_Example.findVarHandle(org.wpilib.epilogue.Example.class, "valueB", java.lang.String.class); } catch (ReflectiveOperationException e) { throw new RuntimeException("[EPILOGUE] Could not load private fields for logging!", e); } @@ -1448,7 +1448,7 @@ class AnnotationProcessorTest { public void update(EpilogueBackend backend, Example object) { if (Epilogue.shouldLog(Logged.Importance.DEBUG)) { backend.log("valueA", object.valueA); - backend.log("valueB", ((java.lang.String) $edu_wpi_first_epilogue_Example_valueB.get(object))); + backend.log("valueB", ((java.lang.String) $org_wpilib_epilogue_Example_valueB.get(object))); backend.log("upcast", object.upcast()); } } @@ -1462,7 +1462,7 @@ class AnnotationProcessorTest { void annotationInheritance() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged class Child {} @@ -1485,12 +1485,12 @@ class AnnotationProcessorTest { String expectedRootLogger = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -1514,7 +1514,7 @@ class AnnotationProcessorTest { void inheritanceOfLoggedTypes() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged interface IFace {} @@ -1572,12 +1572,12 @@ class AnnotationProcessorTest { String expectedRootLogger = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -1588,27 +1588,27 @@ class AnnotationProcessorTest { public void update(EpilogueBackend backend, Example object) { if (Epilogue.shouldLog(Logged.Importance.DEBUG)) { var $$asInterface = object.asInterface; - if ($$asInterface instanceof edu.wpi.first.epilogue.Impl1 edu_wpi_first_epilogue_Impl1) { - Epilogue.impl1Logger.tryUpdate(backend.getNested("asInterface"), edu_wpi_first_epilogue_Impl1, Epilogue.getConfig().errorHandler); - } else if ($$asInterface instanceof edu.wpi.first.epilogue.Impl2 edu_wpi_first_epilogue_Impl2) { - Epilogue.impl2Logger.tryUpdate(backend.getNested("asInterface"), edu_wpi_first_epilogue_Impl2, Epilogue.getConfig().errorHandler); + if ($$asInterface instanceof org.wpilib.epilogue.Impl1 org_wpilib_epilogue_Impl1) { + Epilogue.impl1Logger.tryUpdate(backend.getNested("asInterface"), org_wpilib_epilogue_Impl1, Epilogue.getConfig().errorHandler); + } else if ($$asInterface instanceof org.wpilib.epilogue.Impl2 org_wpilib_epilogue_Impl2) { + Epilogue.impl2Logger.tryUpdate(backend.getNested("asInterface"), org_wpilib_epilogue_Impl2, Epilogue.getConfig().errorHandler); } else { - // Base type edu.wpi.first.epilogue.IFace + // Base type org.wpilib.epilogue.IFace Epilogue.iFaceLogger.tryUpdate(backend.getNested("asInterface"), $$asInterface, Epilogue.getConfig().errorHandler); }; Epilogue.impl1Logger.tryUpdate(backend.getNested("firstImpl"), object.firstImpl, Epilogue.getConfig().errorHandler); Epilogue.impl2Logger.tryUpdate(backend.getNested("secondImpl"), object.secondImpl, Epilogue.getConfig().errorHandler); var $$complex = object.complex; - if ($$complex instanceof edu.wpi.first.epilogue.ConcreteLogged edu_wpi_first_epilogue_ConcreteLogged) { - Epilogue.concreteLoggedLogger.tryUpdate(backend.getNested("complex"), edu_wpi_first_epilogue_ConcreteLogged, Epilogue.getConfig().errorHandler); - } else if ($$complex instanceof edu.wpi.first.epilogue.I4 edu_wpi_first_epilogue_I4) { - Epilogue.i4Logger.tryUpdate(backend.getNested("complex"), edu_wpi_first_epilogue_I4, Epilogue.getConfig().errorHandler); - } else if ($$complex instanceof edu.wpi.first.epilogue.I2 edu_wpi_first_epilogue_I2) { - Epilogue.i2Logger.tryUpdate(backend.getNested("complex"), edu_wpi_first_epilogue_I2, Epilogue.getConfig().errorHandler); - } else if ($$complex instanceof edu.wpi.first.epilogue.I3 edu_wpi_first_epilogue_I3) { - Epilogue.i3Logger.tryUpdate(backend.getNested("complex"), edu_wpi_first_epilogue_I3, Epilogue.getConfig().errorHandler); + if ($$complex instanceof org.wpilib.epilogue.ConcreteLogged org_wpilib_epilogue_ConcreteLogged) { + Epilogue.concreteLoggedLogger.tryUpdate(backend.getNested("complex"), org_wpilib_epilogue_ConcreteLogged, Epilogue.getConfig().errorHandler); + } else if ($$complex instanceof org.wpilib.epilogue.I4 org_wpilib_epilogue_I4) { + Epilogue.i4Logger.tryUpdate(backend.getNested("complex"), org_wpilib_epilogue_I4, Epilogue.getConfig().errorHandler); + } else if ($$complex instanceof org.wpilib.epilogue.I2 org_wpilib_epilogue_I2) { + Epilogue.i2Logger.tryUpdate(backend.getNested("complex"), org_wpilib_epilogue_I2, Epilogue.getConfig().errorHandler); + } else if ($$complex instanceof org.wpilib.epilogue.I3 org_wpilib_epilogue_I3) { + Epilogue.i3Logger.tryUpdate(backend.getNested("complex"), org_wpilib_epilogue_I3, Epilogue.getConfig().errorHandler); } else { - // Base type edu.wpi.first.epilogue.I + // Base type org.wpilib.epilogue.I Epilogue.iLogger.tryUpdate(backend.getNested("complex"), $$complex, Epilogue.getConfig().errorHandler); }; } @@ -1623,7 +1623,7 @@ class AnnotationProcessorTest { void innerClasses() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; class Outer { @Logged @@ -1635,12 +1635,12 @@ class AnnotationProcessorTest { String expectedRootLogger = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class Outer$ExampleLogger extends ClassSpecificLogger { public Outer$ExampleLogger() { @@ -1663,7 +1663,7 @@ class AnnotationProcessorTest { void highlyNestedInnerClasses() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; class A { class B { @@ -1681,12 +1681,12 @@ class AnnotationProcessorTest { String expectedRootLogger = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class A$B$C$D$ExampleLogger extends ClassSpecificLogger { public A$B$C$D$ExampleLogger() { @@ -1709,7 +1709,7 @@ class AnnotationProcessorTest { void renamedInnerClass() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; class Outer { @Logged(name = "Custom Example") // For the sake of testing, needs "Example" somewhere in the name @@ -1721,12 +1721,12 @@ class AnnotationProcessorTest { String expectedRootLogger = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class CustomExampleLogger extends ClassSpecificLogger { public CustomExampleLogger() { @@ -1749,7 +1749,7 @@ class AnnotationProcessorTest { void diamondInheritance() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged interface I {} @@ -1774,12 +1774,12 @@ class AnnotationProcessorTest { String expectedRootLogger = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -1790,12 +1790,12 @@ class AnnotationProcessorTest { public void update(EpilogueBackend backend, Example object) { if (Epilogue.shouldLog(Logged.Importance.DEBUG)) { var $$theField = object.theField; - if ($$theField instanceof edu.wpi.first.epilogue.Base edu_wpi_first_epilogue_Base) { - Epilogue.baseLogger.tryUpdate(backend.getNested("theField"), edu_wpi_first_epilogue_Base, Epilogue.getConfig().errorHandler); - } else if ($$theField instanceof edu.wpi.first.epilogue.ExtendingInterface edu_wpi_first_epilogue_ExtendingInterface) { - Epilogue.extendingInterfaceLogger.tryUpdate(backend.getNested("theField"), edu_wpi_first_epilogue_ExtendingInterface, Epilogue.getConfig().errorHandler); + if ($$theField instanceof org.wpilib.epilogue.Base org_wpilib_epilogue_Base) { + Epilogue.baseLogger.tryUpdate(backend.getNested("theField"), org_wpilib_epilogue_Base, Epilogue.getConfig().errorHandler); + } else if ($$theField instanceof org.wpilib.epilogue.ExtendingInterface org_wpilib_epilogue_ExtendingInterface) { + Epilogue.extendingInterfaceLogger.tryUpdate(backend.getNested("theField"), org_wpilib_epilogue_ExtendingInterface, Epilogue.getConfig().errorHandler); } else { - // Base type edu.wpi.first.epilogue.I + // Base type org.wpilib.epilogue.I Epilogue.iLogger.tryUpdate(backend.getNested("theField"), $$theField, Epilogue.getConfig().errorHandler); }; } @@ -1810,7 +1810,7 @@ class AnnotationProcessorTest { void instanceofChainWithField() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged interface I {} @@ -1826,24 +1826,24 @@ class AnnotationProcessorTest { String expectedRootLogger = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; import java.lang.invoke.MethodHandles; import java.lang.invoke.VarHandle; public class ExampleLogger extends ClassSpecificLogger { - // Accesses private or superclass field edu.wpi.first.epilogue.Example.theField - private static final VarHandle $edu_wpi_first_epilogue_Example_theField; + // Accesses private or superclass field org.wpilib.epilogue.Example.theField + private static final VarHandle $org_wpilib_epilogue_Example_theField; static { try { var rootLookup = MethodHandles.lookup(); - var lookup$$edu_wpi_first_epilogue_Example = MethodHandles.privateLookupIn(edu.wpi.first.epilogue.Example.class, rootLookup); - $edu_wpi_first_epilogue_Example_theField = lookup$$edu_wpi_first_epilogue_Example.findVarHandle(edu.wpi.first.epilogue.Example.class, "theField", edu.wpi.first.epilogue.I.class); + var lookup$$org_wpilib_epilogue_Example = MethodHandles.privateLookupIn(org.wpilib.epilogue.Example.class, rootLookup); + $org_wpilib_epilogue_Example_theField = lookup$$org_wpilib_epilogue_Example.findVarHandle(org.wpilib.epilogue.Example.class, "theField", org.wpilib.epilogue.I.class); } catch (ReflectiveOperationException e) { throw new RuntimeException("[EPILOGUE] Could not load private fields for logging!", e); } @@ -1856,11 +1856,11 @@ class AnnotationProcessorTest { @Override public void update(EpilogueBackend backend, Example object) { if (Epilogue.shouldLog(Logged.Importance.DEBUG)) { - var $$theField = ((edu.wpi.first.epilogue.I) $edu_wpi_first_epilogue_Example_theField.get(object)); - if ($$theField instanceof edu.wpi.first.epilogue.Base edu_wpi_first_epilogue_Base) { - Epilogue.baseLogger.tryUpdate(backend.getNested("theField"), edu_wpi_first_epilogue_Base, Epilogue.getConfig().errorHandler); + var $$theField = ((org.wpilib.epilogue.I) $org_wpilib_epilogue_Example_theField.get(object)); + if ($$theField instanceof org.wpilib.epilogue.Base org_wpilib_epilogue_Base) { + Epilogue.baseLogger.tryUpdate(backend.getNested("theField"), org_wpilib_epilogue_Base, Epilogue.getConfig().errorHandler); } else { - // Base type edu.wpi.first.epilogue.I + // Base type org.wpilib.epilogue.I Epilogue.iLogger.tryUpdate(backend.getNested("theField"), $$theField, Epilogue.getConfig().errorHandler); }; } @@ -1875,7 +1875,7 @@ class AnnotationProcessorTest { void nestedOptIn() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; class Implicit { @Logged double x; @@ -1888,12 +1888,12 @@ class AnnotationProcessorTest { String expectedRootLogger = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -1916,9 +1916,9 @@ class AnnotationProcessorTest { void customLogger() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.logging.*; + import org.wpilib.epilogue.logging.*; record Point(int x, int y) {} @@ -1942,12 +1942,12 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -1970,12 +1970,12 @@ class AnnotationProcessorTest { void customGenericLogger() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.logging.*; - import edu.wpi.first.math.numbers.*; - import edu.wpi.first.math.Num; - import edu.wpi.first.math.Vector; + import org.wpilib.epilogue.logging.*; + import org.wpilib.math.numbers.*; + import org.wpilib.math.util.Num; + import org.wpilib.math.linalg.Vector; @CustomLoggerFor(Vector.class) class VectorLogger extends ClassSpecificLogger> { @@ -1997,12 +1997,12 @@ class AnnotationProcessorTest { String expectedGeneratedSource = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -2025,9 +2025,9 @@ class AnnotationProcessorTest { void genericLoggerForGenericType() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.logging.*; + import org.wpilib.epilogue.logging.*; class Generic { } @@ -2054,7 +2054,7 @@ class AnnotationProcessorTest { javac() .withOptions(kJavaVersionOptions) .withProcessors(new AnnotationProcessor()) - .compile(JavaFileObjects.forSourceString("edu.wpi.first.epilogue.Example", source)); + .compile(JavaFileObjects.forSourceString("org.wpilib.epilogue.Example", source)); assertThat(compilation).failed(); assertThat(compilation).hadErrorCount(1); @@ -2070,7 +2070,7 @@ class AnnotationProcessorTest { void warnsAboutNonLoggableFields() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged(warnForNonLoggableTypes = true) class Example { @@ -2082,7 +2082,7 @@ class AnnotationProcessorTest { javac() .withOptions(kJavaVersionOptions) .withProcessors(new AnnotationProcessor()) - .compile(JavaFileObjects.forSourceString("edu.wpi.first.epilogue.Example", source)); + .compile(JavaFileObjects.forSourceString("org.wpilib.epilogue.Example", source)); assertThat(compilation).succeeded(); assertEquals(1, compilation.notes().size()); @@ -2097,7 +2097,7 @@ class AnnotationProcessorTest { void loggingRecords() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged record Example(double x, double y) { } @@ -2105,12 +2105,12 @@ class AnnotationProcessorTest { String expectedRootLogger = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -2134,7 +2134,7 @@ class AnnotationProcessorTest { void errorsOnFieldNameConflicts() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged class Example { @@ -2147,7 +2147,7 @@ class AnnotationProcessorTest { Compilation compilation = javac() .withProcessors(new AnnotationProcessor()) - .compile(JavaFileObjects.forSourceString("edu.wpi.first.epilogue.Example", source)); + .compile(JavaFileObjects.forSourceString("org.wpilib.epilogue.Example", source)); assertThat(compilation).failed(); assertThat(compilation).hadErrorCount(3); @@ -2178,7 +2178,7 @@ class AnnotationProcessorTest { void doesNotErrorOnGetterMethod() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged class Example { @@ -2193,12 +2193,12 @@ class AnnotationProcessorTest { String expectedRootLogger = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -2223,7 +2223,7 @@ class AnnotationProcessorTest { void configuredDefaultNaming() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged(defaultNaming = Logged.Naming.USE_HUMAN_NAME) class Example { @@ -2245,12 +2245,12 @@ class AnnotationProcessorTest { String expectedRootLogger = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.Logged; - import edu.wpi.first.epilogue.Epilogue; - import edu.wpi.first.epilogue.logging.ClassSpecificLogger; - import edu.wpi.first.epilogue.logging.EpilogueBackend; + import org.wpilib.epilogue.Logged; + import org.wpilib.epilogue.Epilogue; + import org.wpilib.epilogue.logging.ClassSpecificLogger; + import org.wpilib.epilogue.logging.EpilogueBackend; public class ExampleLogger extends ClassSpecificLogger { public ExampleLogger() { @@ -2280,7 +2280,7 @@ class AnnotationProcessorTest { """ package example; - import edu.wpi.first.epilogue.*; + import org.wpilib.epilogue.*; @Logged class Example {} @@ -2336,7 +2336,7 @@ class AnnotationProcessorTest { .withProcessors(new AnnotationProcessor()) .compile( JavaFileObjects.forSourceString( - "edu.wpi.first.epilogue.Example", loggedClassContent)); + "org.wpilib.epilogue.Example", loggedClassContent)); assertThat(compilation).succeeded(); var generatedFiles = compilation.generatedSourceFiles(); diff --git a/epilogue-processor/src/test/java/org/wpilib/epilogue/processor/CompileTestOptions.java b/epilogue-processor/src/test/java/org/wpilib/epilogue/processor/CompileTestOptions.java index 9ce1fc4da0..b88fe17fd9 100644 --- a/epilogue-processor/src/test/java/org/wpilib/epilogue/processor/CompileTestOptions.java +++ b/epilogue-processor/src/test/java/org/wpilib/epilogue/processor/CompileTestOptions.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 edu.wpi.first.epilogue.processor; +package org.wpilib.epilogue.processor; import java.util.List; 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 65a1dde8ed..de8e1db1e0 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 @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.epilogue.processor; +package org.wpilib.epilogue.processor; import static com.google.testing.compile.CompilationSubject.assertThat; import static com.google.testing.compile.Compiler.javac; -import static edu.wpi.first.epilogue.processor.CompileTestOptions.kJavaVersionOptions; +import static org.wpilib.epilogue.processor.CompileTestOptions.kJavaVersionOptions; import static org.junit.jupiter.api.Assertions.assertEquals; import com.google.testing.compile.Compilation; @@ -20,7 +20,7 @@ class EpilogueGeneratorTest { void noFields() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged class Example { @@ -29,13 +29,13 @@ class EpilogueGeneratorTest { String expected = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import static edu.wpi.first.units.Units.Seconds; + import static org.wpilib.units.Units.Seconds; - import edu.wpi.first.hal.HAL; + import org.wpilib.hardware.hal.HAL; - import edu.wpi.first.epilogue.ExampleLogger; + import org.wpilib.epilogue.ExampleLogger; public final class Epilogue { static { @@ -71,10 +71,10 @@ class EpilogueGeneratorTest { void robotBase() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged - class Example extends edu.wpi.first.wpilibj.RobotBase { + class Example extends org.wpilib.opmode.RobotBase { @Override public void startCompetition() {} @Override @@ -84,13 +84,13 @@ class EpilogueGeneratorTest { String expected = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import static edu.wpi.first.units.Units.Seconds; + import static org.wpilib.units.Units.Seconds; - import edu.wpi.first.hal.HAL; + import org.wpilib.hardware.hal.HAL; - import edu.wpi.first.epilogue.ExampleLogger; + import org.wpilib.epilogue.ExampleLogger; public final class Epilogue { static { @@ -125,22 +125,22 @@ class EpilogueGeneratorTest { void timedRobot() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged - class Example extends edu.wpi.first.wpilibj.TimedRobot { + class Example extends org.wpilib.opmode.TimedRobot { } """; String expected = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import static edu.wpi.first.units.Units.Seconds; + import static org.wpilib.units.Units.Seconds; - import edu.wpi.first.hal.HAL; + import org.wpilib.hardware.hal.HAL; - import edu.wpi.first.epilogue.ExampleLogger; + import org.wpilib.epilogue.ExampleLogger; public final class Epilogue { static { @@ -171,7 +171,7 @@ class EpilogueGeneratorTest { * new values. Alternatively, {@code bind()} can be used to update at an offset from * the main robot loop. */ - public static void update(edu.wpi.first.epilogue.Example robot) { + public static void update(org.wpilib.epilogue.Example robot) { long start = System.nanoTime(); exampleLogger.tryUpdate(config.backend.getNested(config.root), robot, config.errorHandler); config.backend.log(\"Epilogue/Stats/Last Run\", (System.nanoTime() - start) / 1e6); @@ -185,7 +185,7 @@ class EpilogueGeneratorTest { * directly from sensors will be slightly different from data used in the main robot * loop. */ - public static void bind(edu.wpi.first.epilogue.Example robot) { + public static void bind(org.wpilib.epilogue.Example robot) { if (config.loggingPeriod == null) { config.loggingPeriod = Seconds.of(robot.getPeriod()); } @@ -207,25 +207,25 @@ class EpilogueGeneratorTest { void multipleRobots() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; @Logged - class AlphaBot extends edu.wpi.first.wpilibj.TimedRobot { } + class AlphaBot extends org.wpilib.opmode.TimedRobot { } @Logged - class BetaBot extends edu.wpi.first.wpilibj.TimedRobot { } + class BetaBot extends org.wpilib.opmode.TimedRobot { } """; String expected = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import static edu.wpi.first.units.Units.Seconds; + import static org.wpilib.units.Units.Seconds; - import edu.wpi.first.hal.HAL; + import org.wpilib.hardware.hal.HAL; - import edu.wpi.first.epilogue.AlphaBotLogger; - import edu.wpi.first.epilogue.BetaBotLogger; + import org.wpilib.epilogue.AlphaBotLogger; + import org.wpilib.epilogue.BetaBotLogger; public final class Epilogue { static { @@ -257,7 +257,7 @@ class EpilogueGeneratorTest { * new values. Alternatively, {@code bind()} can be used to update at an offset from * the main robot loop. */ - public static void update(edu.wpi.first.epilogue.AlphaBot robot) { + public static void update(org.wpilib.epilogue.AlphaBot robot) { long start = System.nanoTime(); alphaBotLogger.tryUpdate(config.backend.getNested(config.root), robot, config.errorHandler); config.backend.log(\"Epilogue/Stats/Last Run\", (System.nanoTime() - start) / 1e6); @@ -271,7 +271,7 @@ class EpilogueGeneratorTest { * directly from sensors will be slightly different from data used in the main robot * loop. */ - public static void bind(edu.wpi.first.epilogue.AlphaBot robot) { + public static void bind(org.wpilib.epilogue.AlphaBot robot) { if (config.loggingPeriod == null) { config.loggingPeriod = Seconds.of(robot.getPeriod()); } @@ -289,7 +289,7 @@ class EpilogueGeneratorTest { * new values. Alternatively, {@code bind()} can be used to update at an offset from * the main robot loop. */ - public static void update(edu.wpi.first.epilogue.BetaBot robot) { + public static void update(org.wpilib.epilogue.BetaBot robot) { long start = System.nanoTime(); betaBotLogger.tryUpdate(config.backend.getNested(config.root), robot, config.errorHandler); config.backend.log(\"Epilogue/Stats/Last Run\", (System.nanoTime() - start) / 1e6); @@ -303,7 +303,7 @@ class EpilogueGeneratorTest { * directly from sensors will be slightly different from data used in the main robot * loop. */ - public static void bind(edu.wpi.first.epilogue.BetaBot robot) { + public static void bind(org.wpilib.epilogue.BetaBot robot) { if (config.loggingPeriod == null) { config.loggingPeriod = Seconds.of(robot.getPeriod()); } @@ -325,9 +325,9 @@ class EpilogueGeneratorTest { void genericCustomLogger() { String source = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import edu.wpi.first.epilogue.logging.*; + import org.wpilib.epilogue.logging.*; class A {} class B extends A {} @@ -351,14 +351,14 @@ class EpilogueGeneratorTest { String expected = """ - package edu.wpi.first.epilogue; + package org.wpilib.epilogue; - import static edu.wpi.first.units.Units.Seconds; + import static org.wpilib.units.Units.Seconds; - import edu.wpi.first.hal.HAL; + import org.wpilib.hardware.hal.HAL; - import edu.wpi.first.epilogue.ExampleLogger; - import edu.wpi.first.epilogue.CustomLogger; + import org.wpilib.epilogue.ExampleLogger; + import org.wpilib.epilogue.CustomLogger; public final class Epilogue { static { diff --git a/epilogue-processor/src/test/java/org/wpilib/epilogue/processor/StringUtilsTest.java b/epilogue-processor/src/test/java/org/wpilib/epilogue/processor/StringUtilsTest.java index 8703e9a0a7..23806ef555 100644 --- a/epilogue-processor/src/test/java/org/wpilib/epilogue/processor/StringUtilsTest.java +++ b/epilogue-processor/src/test/java/org/wpilib/epilogue/processor/StringUtilsTest.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 edu.wpi.first.epilogue.processor; +package org.wpilib.epilogue.processor; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/epilogue-runtime/src/main/java/org/wpilib/epilogue/CustomLoggerFor.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/CustomLoggerFor.java index 93b11cf1f4..aec6b60f3c 100644 --- a/epilogue-runtime/src/main/java/org/wpilib/epilogue/CustomLoggerFor.java +++ b/epilogue-runtime/src/main/java/org/wpilib/epilogue/CustomLoggerFor.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 edu.wpi.first.epilogue; +package org.wpilib.epilogue; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/epilogue-runtime/src/main/java/org/wpilib/epilogue/EpilogueConfiguration.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/EpilogueConfiguration.java index 28bdf341de..5e046eb87a 100644 --- a/epilogue-runtime/src/main/java/org/wpilib/epilogue/EpilogueConfiguration.java +++ b/epilogue-runtime/src/main/java/org/wpilib/epilogue/EpilogueConfiguration.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.epilogue; +package org.wpilib.epilogue; -import edu.wpi.first.epilogue.logging.EpilogueBackend; -import edu.wpi.first.epilogue.logging.NTEpilogueBackend; -import edu.wpi.first.epilogue.logging.errors.ErrorHandler; -import edu.wpi.first.epilogue.logging.errors.ErrorPrinter; -import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.units.measure.Time; +import org.wpilib.epilogue.logging.EpilogueBackend; +import org.wpilib.epilogue.logging.NTEpilogueBackend; +import org.wpilib.epilogue.logging.errors.ErrorHandler; +import org.wpilib.epilogue.logging.errors.ErrorPrinter; +import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.units.measure.Time; /** * A configuration object to be used by the generated {@code Epilogue} class to customize its diff --git a/epilogue-runtime/src/main/java/org/wpilib/epilogue/Logged.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/Logged.java index c939d019d3..36c60418b8 100644 --- a/epilogue-runtime/src/main/java/org/wpilib/epilogue/Logged.java +++ b/epilogue-runtime/src/main/java/org/wpilib/epilogue/Logged.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 edu.wpi.first.epilogue; +package org.wpilib.epilogue; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/epilogue-runtime/src/main/java/org/wpilib/epilogue/NotLogged.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/NotLogged.java index af0d3217b5..ed7c6b6e72 100644 --- a/epilogue-runtime/src/main/java/org/wpilib/epilogue/NotLogged.java +++ b/epilogue-runtime/src/main/java/org/wpilib/epilogue/NotLogged.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 edu.wpi.first.epilogue; +package org.wpilib.epilogue; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/ClassSpecificLogger.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/ClassSpecificLogger.java index 4f5b0bac3d..e990232e90 100644 --- a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/ClassSpecificLogger.java +++ b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/ClassSpecificLogger.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.epilogue.logging; +package org.wpilib.epilogue.logging; -import edu.wpi.first.epilogue.CustomLoggerFor; -import edu.wpi.first.epilogue.logging.errors.ErrorHandler; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; +import org.wpilib.epilogue.CustomLoggerFor; +import org.wpilib.epilogue.logging.errors.ErrorHandler; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; import java.util.LinkedHashMap; import java.util.Map; diff --git a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/EpilogueBackend.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/EpilogueBackend.java index f941b7ca6f..46f152da1c 100644 --- a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/EpilogueBackend.java +++ b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/EpilogueBackend.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.epilogue.logging; +package org.wpilib.epilogue.logging; -import edu.wpi.first.units.Measure; -import edu.wpi.first.units.Unit; -import edu.wpi.first.util.protobuf.Protobuf; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.units.Measure; +import org.wpilib.units.Unit; +import org.wpilib.util.protobuf.Protobuf; +import org.wpilib.util.struct.Struct; import java.util.Collection; import us.hebi.quickbuf.ProtoMessage; diff --git a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/FileBackend.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/FileBackend.java index cc3a1e4544..988fca86bf 100644 --- a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/FileBackend.java +++ b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/FileBackend.java @@ -2,28 +2,28 @@ // 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 edu.wpi.first.epilogue.logging; +package org.wpilib.epilogue.logging; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.datalog.BooleanArrayLogEntry; -import edu.wpi.first.datalog.BooleanLogEntry; -import edu.wpi.first.datalog.DataLog; -import edu.wpi.first.datalog.DataLogEntry; -import edu.wpi.first.datalog.DoubleArrayLogEntry; -import edu.wpi.first.datalog.DoubleLogEntry; -import edu.wpi.first.datalog.FloatArrayLogEntry; -import edu.wpi.first.datalog.FloatLogEntry; -import edu.wpi.first.datalog.IntegerArrayLogEntry; -import edu.wpi.first.datalog.IntegerLogEntry; -import edu.wpi.first.datalog.ProtobufLogEntry; -import edu.wpi.first.datalog.RawLogEntry; -import edu.wpi.first.datalog.StringArrayLogEntry; -import edu.wpi.first.datalog.StringLogEntry; -import edu.wpi.first.datalog.StructArrayLogEntry; -import edu.wpi.first.datalog.StructLogEntry; -import edu.wpi.first.util.protobuf.Protobuf; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.datalog.BooleanArrayLogEntry; +import org.wpilib.datalog.BooleanLogEntry; +import org.wpilib.datalog.DataLog; +import org.wpilib.datalog.DataLogEntry; +import org.wpilib.datalog.DoubleArrayLogEntry; +import org.wpilib.datalog.DoubleLogEntry; +import org.wpilib.datalog.FloatArrayLogEntry; +import org.wpilib.datalog.FloatLogEntry; +import org.wpilib.datalog.IntegerArrayLogEntry; +import org.wpilib.datalog.IntegerLogEntry; +import org.wpilib.datalog.ProtobufLogEntry; +import org.wpilib.datalog.RawLogEntry; +import org.wpilib.datalog.StringArrayLogEntry; +import org.wpilib.datalog.StringLogEntry; +import org.wpilib.datalog.StructArrayLogEntry; +import org.wpilib.datalog.StructLogEntry; +import org.wpilib.util.protobuf.Protobuf; +import org.wpilib.util.struct.Struct; import java.util.HashMap; import java.util.HashSet; import java.util.Map; diff --git a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/LazyBackend.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/LazyBackend.java index 34938e2d98..9aee749256 100644 --- a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/LazyBackend.java +++ b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/LazyBackend.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.epilogue.logging; +package org.wpilib.epilogue.logging; -import edu.wpi.first.util.protobuf.Protobuf; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.util.protobuf.Protobuf; +import org.wpilib.util.struct.Struct; import java.util.Arrays; import java.util.HashMap; import java.util.Map; diff --git a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/LogBackedSendableBuilder.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/LogBackedSendableBuilder.java index a9ebe32aed..1d50910a6c 100644 --- a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/LogBackedSendableBuilder.java +++ b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/LogBackedSendableBuilder.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.epilogue.logging; +package org.wpilib.epilogue.logging; -import edu.wpi.first.util.function.BooleanConsumer; -import edu.wpi.first.util.function.FloatConsumer; -import edu.wpi.first.util.function.FloatSupplier; -import edu.wpi.first.util.sendable.SendableBuilder; +import org.wpilib.util.function.BooleanConsumer; +import org.wpilib.util.function.FloatConsumer; +import org.wpilib.util.function.FloatSupplier; +import org.wpilib.util.sendable.SendableBuilder; import java.util.ArrayList; import java.util.Collection; import java.util.function.BooleanSupplier; diff --git a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/MultiBackend.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/MultiBackend.java index c6710a53eb..cab80982cb 100644 --- a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/MultiBackend.java +++ b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/MultiBackend.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.epilogue.logging; +package org.wpilib.epilogue.logging; -import edu.wpi.first.util.protobuf.Protobuf; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.util.protobuf.Protobuf; +import org.wpilib.util.struct.Struct; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/NTEpilogueBackend.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/NTEpilogueBackend.java index 0af1b82440..d8817512df 100644 --- a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/NTEpilogueBackend.java +++ b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/NTEpilogueBackend.java @@ -2,26 +2,26 @@ // 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 edu.wpi.first.epilogue.logging; +package org.wpilib.epilogue.logging; -import edu.wpi.first.networktables.BooleanArrayPublisher; -import edu.wpi.first.networktables.BooleanPublisher; -import edu.wpi.first.networktables.DoubleArrayPublisher; -import edu.wpi.first.networktables.DoublePublisher; -import edu.wpi.first.networktables.FloatArrayPublisher; -import edu.wpi.first.networktables.FloatPublisher; -import edu.wpi.first.networktables.IntegerArrayPublisher; -import edu.wpi.first.networktables.IntegerPublisher; -import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.networktables.ProtobufPublisher; -import edu.wpi.first.networktables.Publisher; -import edu.wpi.first.networktables.RawPublisher; -import edu.wpi.first.networktables.StringArrayPublisher; -import edu.wpi.first.networktables.StringPublisher; -import edu.wpi.first.networktables.StructArrayPublisher; -import edu.wpi.first.networktables.StructPublisher; -import edu.wpi.first.util.protobuf.Protobuf; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.networktables.BooleanArrayPublisher; +import org.wpilib.networktables.BooleanPublisher; +import org.wpilib.networktables.DoubleArrayPublisher; +import org.wpilib.networktables.DoublePublisher; +import org.wpilib.networktables.FloatArrayPublisher; +import org.wpilib.networktables.FloatPublisher; +import org.wpilib.networktables.IntegerArrayPublisher; +import org.wpilib.networktables.IntegerPublisher; +import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.networktables.ProtobufPublisher; +import org.wpilib.networktables.Publisher; +import org.wpilib.networktables.RawPublisher; +import org.wpilib.networktables.StringArrayPublisher; +import org.wpilib.networktables.StringPublisher; +import org.wpilib.networktables.StructArrayPublisher; +import org.wpilib.networktables.StructPublisher; +import org.wpilib.util.protobuf.Protobuf; +import org.wpilib.util.struct.Struct; import java.util.HashMap; import java.util.HashSet; import java.util.Map; diff --git a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/NestedBackend.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/NestedBackend.java index e256b81172..becdeeed0d 100644 --- a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/NestedBackend.java +++ b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/NestedBackend.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.epilogue.logging; +package org.wpilib.epilogue.logging; -import edu.wpi.first.util.protobuf.Protobuf; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.util.protobuf.Protobuf; +import org.wpilib.util.struct.Struct; import java.util.HashMap; import java.util.Map; import us.hebi.quickbuf.ProtoMessage; diff --git a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/NullBackend.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/NullBackend.java index 8a2c52f2b6..fef655f6db 100644 --- a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/NullBackend.java +++ b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/NullBackend.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.epilogue.logging; +package org.wpilib.epilogue.logging; -import edu.wpi.first.util.protobuf.Protobuf; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.util.protobuf.Protobuf; +import org.wpilib.util.struct.Struct; import us.hebi.quickbuf.ProtoMessage; /** Null backend implementation that logs nothing. */ diff --git a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/CrashOnError.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/CrashOnError.java index 716695fd90..aae1c2a80c 100644 --- a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/CrashOnError.java +++ b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/CrashOnError.java @@ -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. -package edu.wpi.first.epilogue.logging.errors; +package org.wpilib.epilogue.logging.errors; -import edu.wpi.first.epilogue.logging.ClassSpecificLogger; +import org.wpilib.epilogue.logging.ClassSpecificLogger; /** * An error handler implementation that will throw an exception if logging raised an exception. This diff --git a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/ErrorHandler.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/ErrorHandler.java index 910de79089..46b51624de 100644 --- a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/ErrorHandler.java +++ b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/ErrorHandler.java @@ -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. -package edu.wpi.first.epilogue.logging.errors; +package org.wpilib.epilogue.logging.errors; -import edu.wpi.first.epilogue.logging.ClassSpecificLogger; +import org.wpilib.epilogue.logging.ClassSpecificLogger; /** * An error handler is used by the Logged framework to catch and process any errors that occur diff --git a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/ErrorPrinter.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/ErrorPrinter.java index 7baa6ffc09..308554b9ac 100644 --- a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/ErrorPrinter.java +++ b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/ErrorPrinter.java @@ -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. -package edu.wpi.first.epilogue.logging.errors; +package org.wpilib.epilogue.logging.errors; -import edu.wpi.first.epilogue.logging.ClassSpecificLogger; +import org.wpilib.epilogue.logging.ClassSpecificLogger; /** An error handler implementation that prints error information to the console. */ public class ErrorPrinter implements ErrorHandler { diff --git a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/LoggerDisabler.java b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/LoggerDisabler.java index 99b20aa4b2..fda344fd8b 100644 --- a/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/LoggerDisabler.java +++ b/epilogue-runtime/src/main/java/org/wpilib/epilogue/logging/errors/LoggerDisabler.java @@ -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. -package edu.wpi.first.epilogue.logging.errors; +package org.wpilib.epilogue.logging.errors; -import edu.wpi.first.epilogue.logging.ClassSpecificLogger; +import org.wpilib.epilogue.logging.ClassSpecificLogger; import java.util.HashMap; import java.util.Map; diff --git a/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/ClassSpecificLoggerTest.java b/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/ClassSpecificLoggerTest.java index 151c622d9c..3bd0cdd65f 100644 --- a/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/ClassSpecificLoggerTest.java +++ b/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/ClassSpecificLoggerTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.epilogue.logging; +package org.wpilib.epilogue.logging; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.epilogue.Logged; +import org.wpilib.epilogue.Logged; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/CustomStruct.java b/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/CustomStruct.java index d79ae2bc16..55c0eeed8a 100644 --- a/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/CustomStruct.java +++ b/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/CustomStruct.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.epilogue.logging; +package org.wpilib.epilogue.logging; -import edu.wpi.first.util.struct.Struct; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.util.struct.Struct; +import org.wpilib.util.struct.StructSerializable; import java.nio.ByteBuffer; public record CustomStruct(int x) implements StructSerializable { diff --git a/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/LazyBackendTest.java b/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/LazyBackendTest.java index 39525d8a9f..5bc5ab8ba5 100644 --- a/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/LazyBackendTest.java +++ b/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/LazyBackendTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.epilogue.logging; +package org.wpilib.epilogue.logging; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; -import edu.wpi.first.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Rotation2d; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/NestedBackendTest.java b/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/NestedBackendTest.java index e9ee64ac6a..fabd280330 100644 --- a/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/NestedBackendTest.java +++ b/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/NestedBackendTest.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 edu.wpi.first.epilogue.logging; +package org.wpilib.epilogue.logging; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/TestBackend.java b/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/TestBackend.java index 90c06b465a..62b05dc1a6 100644 --- a/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/TestBackend.java +++ b/epilogue-runtime/src/test/java/org/wpilib/epilogue/logging/TestBackend.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.epilogue.logging; +package org.wpilib.epilogue.logging; -import edu.wpi.first.util.protobuf.Protobuf; -import edu.wpi.first.util.struct.Struct; -import edu.wpi.first.util.struct.StructBuffer; +import org.wpilib.util.protobuf.Protobuf; +import org.wpilib.util.struct.Struct; +import org.wpilib.util.struct.StructBuffer; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/fields/CMakeLists.txt b/fields/CMakeLists.txt index 507b3f5668..0d337ca287 100644 --- a/fields/CMakeLists.txt +++ b/fields/CMakeLists.txt @@ -20,7 +20,7 @@ if(WITH_JAVA) field_images_jar SOURCES ${JAVA_SOURCES} RESOURCES - NAMESPACE "edu/wpi/first/fields" ${JAVA_RESOURCES} + NAMESPACE "org/wpilib/fields" ${JAVA_RESOURCES} INCLUDE_JARS ${JACKSON_JARS} OUTPUT_DIR ${WPILIB_BINARY_DIR}/${java_lib_dest} OUTPUT_NAME fields @@ -35,7 +35,7 @@ if(WITH_JAVA) endif() generate_resources( - src/main/native/resources/edu/wpi/first/fields + src/main/native/resources/org/wpilib/fields ${CMAKE_CURRENT_BINARY_DIR}/generated/main/cpp FIELDS fields diff --git a/fields/src/main/java/org/wpilib/fields/FieldConfig.java b/fields/src/main/java/org/wpilib/fields/FieldConfig.java index 34759f5cd0..cd1a29cbd9 100644 --- a/fields/src/main/java/org/wpilib/fields/FieldConfig.java +++ b/fields/src/main/java/org/wpilib/fields/FieldConfig.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 edu.wpi.first.fields; +package org.wpilib.fields; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/fields/src/main/java/org/wpilib/fields/Fields.java b/fields/src/main/java/org/wpilib/fields/Fields.java index 942af5f2fb..1bd1532c8f 100644 --- a/fields/src/main/java/org/wpilib/fields/Fields.java +++ b/fields/src/main/java/org/wpilib/fields/Fields.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 edu.wpi.first.fields; +package org.wpilib.fields; public enum Fields { k2018PowerUp("2018-powerup.json"), @@ -19,7 +19,7 @@ public enum Fields { k2024Crescendo("2024-crescendo.json"), k2025Reefscape("2025-reefscape.json"); - public static final String kBaseResourceDir = "/edu/wpi/first/fields/"; + public static final String kBaseResourceDir = "/org/wpilib/fields/"; /** Alias to the current game. */ public static final Fields kDefaultField = k2025Reefscape; diff --git a/fields/src/test/java/org/wpilib/fields/LoadConfigTest.java b/fields/src/test/java/org/wpilib/fields/LoadConfigTest.java index bb01d9f55a..3e588ab166 100644 --- a/fields/src/test/java/org/wpilib/fields/LoadConfigTest.java +++ b/fields/src/test/java/org/wpilib/fields/LoadConfigTest.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 edu.wpi.first.fields; +package org.wpilib.fields; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.params.ParameterizedTest; diff --git a/hal/src/dev/java/org/wpilib/hardware/hal/DevMain.java b/hal/src/dev/java/org/wpilib/hardware/hal/DevMain.java index efe8e9bd76..d78bc58dd6 100644 --- a/hal/src/dev/java/org/wpilib/hardware/hal/DevMain.java +++ b/hal/src/dev/java/org/wpilib/hardware/hal/DevMain.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; public final class DevMain { public static void main(String[] args) {} diff --git a/hal/src/main/java/org/wpilib/hardware/hal/AddressableLEDJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/AddressableLEDJNI.java index 25ae0c4e5e..aecf33e8a2 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/AddressableLEDJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/AddressableLEDJNI.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; import java.nio.ByteBuffer; diff --git a/hal/src/main/java/org/wpilib/hardware/hal/AllianceStationID.java b/hal/src/main/java/org/wpilib/hardware/hal/AllianceStationID.java index 6b1fd84ced..9854f3e067 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/AllianceStationID.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/AllianceStationID.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** Alliance station ID. */ public enum AllianceStationID { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/AnalogJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/AnalogJNI.java index fd83b800be..7b0f2f5cc8 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/AnalogJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/AnalogJNI.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * Analog Input / Output / Trigger JNI Functions. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/CANAPIJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/CANAPIJNI.java index b376b66124..bf92cbb68e 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/CANAPIJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/CANAPIJNI.java @@ -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. -package edu.wpi.first.hal; +package org.wpilib.hardware.hal; -import edu.wpi.first.hal.can.CANReceiveMessage; +import org.wpilib.hardware.hal.can.CANReceiveMessage; /** * CAN API HAL JNI Functions. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/CANAPITypes.java b/hal/src/main/java/org/wpilib/hardware/hal/CANAPITypes.java index f97cc18f92..63ed1015d6 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/CANAPITypes.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/CANAPITypes.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * CAN API Types. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/CTREPCMJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/CTREPCMJNI.java index 3d2dde69ab..c908642007 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/CTREPCMJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/CTREPCMJNI.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * CTRE Pneumatic Control Module (PCM) Functions. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/ConstantsJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/ConstantsJNI.java index 2ccef74db3..7db35db6ba 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/ConstantsJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/ConstantsJNI.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * Constants HAL JNI functions. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/ControlWord.java b/hal/src/main/java/org/wpilib/hardware/hal/ControlWord.java index d19c68b2b1..2855842a2e 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/ControlWord.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/ControlWord.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** A wrapper for the HALControlWord bitfield. */ public class ControlWord { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/CounterJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/CounterJNI.java index f5b237c26d..734b2b7b3f 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/CounterJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/CounterJNI.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * Counter HAL JNI functions. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/DIOJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/DIOJNI.java index 28028ddb2a..806b7bd758 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/DIOJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/DIOJNI.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * Digital Input/Output (IO) JNI Functions. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/DriverStationJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/DriverStationJNI.java index 379e9c78fc..9531dd291f 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/DriverStationJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/DriverStationJNI.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * Driver Station JNI Functions. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/DutyCycleJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/DutyCycleJNI.java index 560fbda8c1..0af1f90dae 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/DutyCycleJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/DutyCycleJNI.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * DutyCycle HAL JNI functions. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/EncoderJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/EncoderJNI.java index 87040eec7f..5d2777b6de 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/EncoderJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/EncoderJNI.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * Encoder JNI Functions. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/HAL.java b/hal/src/main/java/org/wpilib/hardware/hal/HAL.java index 485c4a36c1..a8560e9373 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/HAL.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/HAL.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; import java.util.ArrayList; import java.util.List; diff --git a/hal/src/main/java/org/wpilib/hardware/hal/HALUtil.java b/hal/src/main/java/org/wpilib/hardware/hal/HALUtil.java index 0913499910..0de79909a2 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/HALUtil.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/HALUtil.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * Hardware Abstraction Layer (HAL) Utilities JNI Functions. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/HALValue.java b/hal/src/main/java/org/wpilib/hardware/hal/HALValue.java index 24099e93b4..a1cb15de78 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/HALValue.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/HALValue.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** Represents a HAL entry value. */ public final class HALValue { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/I2CJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/I2CJNI.java index 1b729af805..d1543f73c8 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/I2CJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/I2CJNI.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; import java.nio.ByteBuffer; diff --git a/hal/src/main/java/org/wpilib/hardware/hal/IMUJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/IMUJNI.java index b4b554dec8..d99570b4c4 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/IMUJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/IMUJNI.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * IMU Functions. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/JNIWrapper.java b/hal/src/main/java/org/wpilib/hardware/hal/JNIWrapper.java index 5cc2e12655..16009ada78 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/JNIWrapper.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/JNIWrapper.java @@ -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. -package edu.wpi.first.hal; +package org.wpilib.hardware.hal; -import edu.wpi.first.util.RuntimeLoader; +import org.wpilib.util.runtime.RuntimeLoader; import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/hal/src/main/java/org/wpilib/hardware/hal/MatchInfoData.java b/hal/src/main/java/org/wpilib/hardware/hal/MatchInfoData.java index d9e9796a34..d247a0147a 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/MatchInfoData.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/MatchInfoData.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** Structure for holding the match info data request. */ @SuppressWarnings("MemberName") diff --git a/hal/src/main/java/org/wpilib/hardware/hal/NotifierJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/NotifierJNI.java index 04784bcf4d..96c1127000 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/NotifierJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/NotifierJNI.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * The NotifierJNI class directly wraps the C++ HAL Notifier. * - *

This class is not meant for direct use by teams. Instead, the edu.wpi.first.wpilibj.Notifier + *

This class is not meant for direct use by teams. Instead, the org.wpilib.system.Notifier * class, which corresponds to the C++ Notifier class, should be used. * * @see "hal/Notifier.h" diff --git a/hal/src/main/java/org/wpilib/hardware/hal/PWMJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/PWMJNI.java index 9a83bc132a..bfa7c7d1bd 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/PWMJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/PWMJNI.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * PWM JNI Functions. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/PortsJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/PortsJNI.java index 17d41698e2..e6a6257261 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/PortsJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/PortsJNI.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * Ports HAL JNI functions. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionFaults.java b/hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionFaults.java index ac141c1006..2a796f0682 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionFaults.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionFaults.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * Faults for a PowerDistribution device. These faults are only active while the condition is diff --git a/hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionJNI.java index 0e39cc5473..d4ec220048 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionJNI.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * Power Distribution JNI Functions. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionStickyFaults.java b/hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionStickyFaults.java index aced62501e..32eca38281 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionStickyFaults.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionStickyFaults.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * Sticky faults for a PowerDistribution device. These faults will remain active until they are diff --git a/hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionVersion.java b/hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionVersion.java index bfb5ff2d0e..086ed42f78 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionVersion.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/PowerDistributionVersion.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** Power distribution version. */ @SuppressWarnings("MemberName") diff --git a/hal/src/main/java/org/wpilib/hardware/hal/PowerJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/PowerJNI.java index 78ae1c6970..211785a0c0 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/PowerJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/PowerJNI.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * Power HAL JNI Functions. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/REVPHFaults.java b/hal/src/main/java/org/wpilib/hardware/hal/REVPHFaults.java index c445066473..d61da9c512 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/REVPHFaults.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/REVPHFaults.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** Faults for a REV PH. These faults are only active while the condition is active. */ @SuppressWarnings("MemberName") diff --git a/hal/src/main/java/org/wpilib/hardware/hal/REVPHJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/REVPHJNI.java index 20c22a30ef..456cd09c44 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/REVPHJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/REVPHJNI.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * REV Pneumatic Hub (PH) HAL JNI functions. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/REVPHStickyFaults.java b/hal/src/main/java/org/wpilib/hardware/hal/REVPHStickyFaults.java index 2a6139f6e8..945d88e5d4 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/REVPHStickyFaults.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/REVPHStickyFaults.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** Sticky faults for a REV PH. These faults will remain active until they are reset by the user. */ @SuppressWarnings("MemberName") diff --git a/hal/src/main/java/org/wpilib/hardware/hal/REVPHVersion.java b/hal/src/main/java/org/wpilib/hardware/hal/REVPHVersion.java index bb6ad017e4..1dbd075f54 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/REVPHVersion.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/REVPHVersion.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** Version and device data received from a REV PH. */ @SuppressWarnings("MemberName") diff --git a/hal/src/main/java/org/wpilib/hardware/hal/SerialPortJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/SerialPortJNI.java index 052218fbe7..223234c74e 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/SerialPortJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/SerialPortJNI.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * Serial Port JNI HAL functions. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/SimBoolean.java b/hal/src/main/java/org/wpilib/hardware/hal/SimBoolean.java index 3f4c25775b..ff0e401468 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/SimBoolean.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/SimBoolean.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** A wrapper around a simulator boolean value handle. */ public class SimBoolean extends SimValue { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/SimDevice.java b/hal/src/main/java/org/wpilib/hardware/hal/SimDevice.java index ab97d6122c..c91c9dee34 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/SimDevice.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/SimDevice.java @@ -2,18 +2,18 @@ // 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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * A wrapper around a simulator device handle. * *

Teams: if you are using this class, you are likely confusing it for {@link - * edu.wpi.first.wpilibj.simulation.SimDeviceSim}. + * org.wpilib.simulation.SimDeviceSim}. * *

Vendors: This class should be used from inside the device class to define the * properties/fields of the device. Use {@link #create} to get a SimDevice object, then use {@link * #createDouble(String, Direction, double)} or similar to define the device's fields. See {@link - * edu.wpi.first.wpilibj.ADXRS450_Gyro} for an example implementation. + * org.wpilib.ADXRS450_Gyro} for an example implementation. */ public class SimDevice implements AutoCloseable { /** Sim device direction. */ diff --git a/hal/src/main/java/org/wpilib/hardware/hal/SimDeviceJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/SimDeviceJNI.java index 398adfa2aa..43ca9d394c 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/SimDeviceJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/SimDeviceJNI.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * SimDevice JNI Functions. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/SimDouble.java b/hal/src/main/java/org/wpilib/hardware/hal/SimDouble.java index 508208fad2..5f8148e59d 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/SimDouble.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/SimDouble.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** A wrapper around a simulator double value handle. */ public class SimDouble extends SimValue { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/SimEnum.java b/hal/src/main/java/org/wpilib/hardware/hal/SimEnum.java index 78f963d552..129f7388d4 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/SimEnum.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/SimEnum.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** A wrapper around a simulator enum value handle. */ public class SimEnum extends SimValue { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/SimInt.java b/hal/src/main/java/org/wpilib/hardware/hal/SimInt.java index f2d30ebb98..8a2e83ca17 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/SimInt.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/SimInt.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** A wrapper around a simulator int value handle. */ public class SimInt extends SimValue { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/SimLong.java b/hal/src/main/java/org/wpilib/hardware/hal/SimLong.java index 80ad963677..a71a954a92 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/SimLong.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/SimLong.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** A wrapper around a simulator long value handle. */ public class SimLong extends SimValue { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/SimValue.java b/hal/src/main/java/org/wpilib/hardware/hal/SimValue.java index f83131050c..6b9a6ee938 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/SimValue.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/SimValue.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** A wrapper around a simulator value handle. */ public class SimValue { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/SystemServerJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/SystemServerJNI.java index b039eb02c2..6008fbb889 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/SystemServerJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/SystemServerJNI.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * SystemServer JNI Functions. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/ThreadsJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/ThreadsJNI.java index 2183ae3d55..a135e5af0c 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/ThreadsJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/ThreadsJNI.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * Threads HAL JNI Functions. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/UsageReportingJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/UsageReportingJNI.java index 12db0a57ee..dcb131e465 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/UsageReportingJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/UsageReportingJNI.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; /** * Usage Reporting JNI Functions. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/can/CANJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/can/CANJNI.java index 171e66987b..fafffc5f06 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/can/CANJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/can/CANJNI.java @@ -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. -package edu.wpi.first.hal.can; +package org.wpilib.hardware.hal.can; -import edu.wpi.first.hal.JNIWrapper; +import org.wpilib.hardware.hal.JNIWrapper; /** * CAN API HAL JNI Functions. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/can/CANReceiveMessage.java b/hal/src/main/java/org/wpilib/hardware/hal/can/CANReceiveMessage.java index 7c93ea3cba..1be388b017 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/can/CANReceiveMessage.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/can/CANReceiveMessage.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 edu.wpi.first.hal.can; +package org.wpilib.hardware.hal.can; /** Represents a CAN message read from a stream. */ public class CANReceiveMessage { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/can/CANStatus.java b/hal/src/main/java/org/wpilib/hardware/hal/can/CANStatus.java index 1966a17c83..e5aeb1e064 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/can/CANStatus.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/can/CANStatus.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 edu.wpi.first.hal.can; +package org.wpilib.hardware.hal.can; /** Structure for holding the result of a CAN Status request. */ @SuppressWarnings("MemberName") diff --git a/hal/src/main/java/org/wpilib/hardware/hal/can/CANStreamMessage.java b/hal/src/main/java/org/wpilib/hardware/hal/can/CANStreamMessage.java index 31ff39de92..d268103820 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/can/CANStreamMessage.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/can/CANStreamMessage.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 edu.wpi.first.hal.can; +package org.wpilib.hardware.hal.can; /** Represents a CAN message read from a stream. */ public class CANStreamMessage { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/can/CANStreamOverflowException.java b/hal/src/main/java/org/wpilib/hardware/hal/can/CANStreamOverflowException.java index d2c97b1ded..728a9b4907 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/can/CANStreamOverflowException.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/can/CANStreamOverflowException.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 edu.wpi.first.hal.can; +package org.wpilib.hardware.hal.can; import java.io.IOException; diff --git a/hal/src/main/java/org/wpilib/hardware/hal/communication/NIRioStatus.java b/hal/src/main/java/org/wpilib/hardware/hal/communication/NIRioStatus.java index f689b600c4..75de9ec5f1 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/communication/NIRioStatus.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/communication/NIRioStatus.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 edu.wpi.first.hal.communication; +package org.wpilib.hardware.hal.communication; /** NI RIO status. */ public class NIRioStatus { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/simulation/AddressableLEDDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/AddressableLEDDataJNI.java index 4aa57a7c29..39894c95ac 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/simulation/AddressableLEDDataJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/simulation/AddressableLEDDataJNI.java @@ -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. -package edu.wpi.first.hal.simulation; +package org.wpilib.hardware.hal.simulation; -import edu.wpi.first.hal.JNIWrapper; +import org.wpilib.hardware.hal.JNIWrapper; /** JNI for addressable LED data. */ public class AddressableLEDDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/simulation/AnalogInDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/AnalogInDataJNI.java index 9c63471a14..03d2092c15 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/simulation/AnalogInDataJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/simulation/AnalogInDataJNI.java @@ -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. -package edu.wpi.first.hal.simulation; +package org.wpilib.hardware.hal.simulation; -import edu.wpi.first.hal.JNIWrapper; +import org.wpilib.hardware.hal.JNIWrapper; /** JNI for analog input data. */ public class AnalogInDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/simulation/BufferCallback.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/BufferCallback.java index efe70af800..6115a89f92 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/simulation/BufferCallback.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/simulation/BufferCallback.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 edu.wpi.first.hal.simulation; +package org.wpilib.hardware.hal.simulation; /** Interface for simulation buffer callbacks. */ @FunctionalInterface diff --git a/hal/src/main/java/org/wpilib/hardware/hal/simulation/CTREPCMDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/CTREPCMDataJNI.java index 265edd036b..141221fde3 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/simulation/CTREPCMDataJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/simulation/CTREPCMDataJNI.java @@ -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. -package edu.wpi.first.hal.simulation; +package org.wpilib.hardware.hal.simulation; -import edu.wpi.first.hal.JNIWrapper; +import org.wpilib.hardware.hal.JNIWrapper; /** JNI for CTRE PCM data. */ public class CTREPCMDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/simulation/ConstBufferCallback.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/ConstBufferCallback.java index 21277b3c0b..3d91115746 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/simulation/ConstBufferCallback.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/simulation/ConstBufferCallback.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 edu.wpi.first.hal.simulation; +package org.wpilib.hardware.hal.simulation; @FunctionalInterface public interface ConstBufferCallback { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/simulation/DIODataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/DIODataJNI.java index dbbab99a51..674d1795b9 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/simulation/DIODataJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/simulation/DIODataJNI.java @@ -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. -package edu.wpi.first.hal.simulation; +package org.wpilib.hardware.hal.simulation; -import edu.wpi.first.hal.JNIWrapper; +import org.wpilib.hardware.hal.JNIWrapper; /** JNI for DIO data. */ public class DIODataJNI extends JNIWrapper { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/simulation/DigitalPWMDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/DigitalPWMDataJNI.java index e72a2337b9..1dd420aadb 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/simulation/DigitalPWMDataJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/simulation/DigitalPWMDataJNI.java @@ -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. -package edu.wpi.first.hal.simulation; +package org.wpilib.hardware.hal.simulation; -import edu.wpi.first.hal.JNIWrapper; +import org.wpilib.hardware.hal.JNIWrapper; /** JNI for digital PWM data. */ public class DigitalPWMDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/simulation/DriverStationDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/DriverStationDataJNI.java index 71e00d32f4..4fd9a65461 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/simulation/DriverStationDataJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/simulation/DriverStationDataJNI.java @@ -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. -package edu.wpi.first.hal.simulation; +package org.wpilib.hardware.hal.simulation; -import edu.wpi.first.hal.JNIWrapper; +import org.wpilib.hardware.hal.JNIWrapper; /** JNI for Driver Station data. */ public class DriverStationDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/simulation/DutyCycleDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/DutyCycleDataJNI.java index 916457fa04..72d4d98336 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/simulation/DutyCycleDataJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/simulation/DutyCycleDataJNI.java @@ -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. -package edu.wpi.first.hal.simulation; +package org.wpilib.hardware.hal.simulation; -import edu.wpi.first.hal.JNIWrapper; +import org.wpilib.hardware.hal.JNIWrapper; /** JNI for duty cycle data. */ public class DutyCycleDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/simulation/EncoderDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/EncoderDataJNI.java index d853d00508..df41913306 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/simulation/EncoderDataJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/simulation/EncoderDataJNI.java @@ -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. -package edu.wpi.first.hal.simulation; +package org.wpilib.hardware.hal.simulation; -import edu.wpi.first.hal.JNIWrapper; +import org.wpilib.hardware.hal.JNIWrapper; /** JNI for encoder data. */ public class EncoderDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/simulation/I2CDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/I2CDataJNI.java index f74d63e074..60aa3414f6 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/simulation/I2CDataJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/simulation/I2CDataJNI.java @@ -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. -package edu.wpi.first.hal.simulation; +package org.wpilib.hardware.hal.simulation; -import edu.wpi.first.hal.JNIWrapper; +import org.wpilib.hardware.hal.JNIWrapper; /** JNI for I2C data. */ public class I2CDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/simulation/NotifierDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/NotifierDataJNI.java index 9323d1afa0..39248b299c 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/simulation/NotifierDataJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/simulation/NotifierDataJNI.java @@ -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. -package edu.wpi.first.hal.simulation; +package org.wpilib.hardware.hal.simulation; -import edu.wpi.first.hal.JNIWrapper; +import org.wpilib.hardware.hal.JNIWrapper; /** JNI for notifier data. */ public class NotifierDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/simulation/NotifyCallback.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/NotifyCallback.java index e0b3233f52..68edf4d28d 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/simulation/NotifyCallback.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/simulation/NotifyCallback.java @@ -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. -package edu.wpi.first.hal.simulation; +package org.wpilib.hardware.hal.simulation; -import edu.wpi.first.hal.HALValue; +import org.wpilib.hardware.hal.HALValue; @FunctionalInterface public interface NotifyCallback { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/simulation/PWMDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/PWMDataJNI.java index 99e51ea86e..1caea16bc4 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/simulation/PWMDataJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/simulation/PWMDataJNI.java @@ -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. -package edu.wpi.first.hal.simulation; +package org.wpilib.hardware.hal.simulation; -import edu.wpi.first.hal.JNIWrapper; +import org.wpilib.hardware.hal.JNIWrapper; /** JNI for PWM data. */ public class PWMDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/simulation/PowerDistributionDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/PowerDistributionDataJNI.java index 80a7e46b1e..f7b49e23fa 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/simulation/PowerDistributionDataJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/simulation/PowerDistributionDataJNI.java @@ -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. -package edu.wpi.first.hal.simulation; +package org.wpilib.hardware.hal.simulation; -import edu.wpi.first.hal.JNIWrapper; +import org.wpilib.hardware.hal.JNIWrapper; /** JNI for power distribution data. */ public class PowerDistributionDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/simulation/REVPHDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/REVPHDataJNI.java index 9609f3dc22..fea591c498 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/simulation/REVPHDataJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/simulation/REVPHDataJNI.java @@ -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. -package edu.wpi.first.hal.simulation; +package org.wpilib.hardware.hal.simulation; -import edu.wpi.first.hal.JNIWrapper; +import org.wpilib.hardware.hal.JNIWrapper; /** JNI for REV PH data. */ public class REVPHDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/simulation/RoboRioDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/RoboRioDataJNI.java index caef4c7d89..fdacf3b073 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/simulation/RoboRioDataJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/simulation/RoboRioDataJNI.java @@ -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. -package edu.wpi.first.hal.simulation; +package org.wpilib.hardware.hal.simulation; -import edu.wpi.first.hal.JNIWrapper; +import org.wpilib.hardware.hal.JNIWrapper; /** JNI for roboRIO data. */ public class RoboRioDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/simulation/SimDeviceCallback.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/SimDeviceCallback.java index d9390ce6f2..fba306cf8a 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/simulation/SimDeviceCallback.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/simulation/SimDeviceCallback.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 edu.wpi.first.hal.simulation; +package org.wpilib.hardware.hal.simulation; @FunctionalInterface public interface SimDeviceCallback { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/simulation/SimDeviceDataJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/SimDeviceDataJNI.java index b4abb3306e..89fd771cb9 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/simulation/SimDeviceDataJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/simulation/SimDeviceDataJNI.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.hal.simulation; +package org.wpilib.hardware.hal.simulation; -import edu.wpi.first.hal.HALValue; -import edu.wpi.first.hal.JNIWrapper; +import org.wpilib.hardware.hal.HALValue; +import org.wpilib.hardware.hal.JNIWrapper; /** JNI for sim device data. */ public class SimDeviceDataJNI extends JNIWrapper { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/simulation/SimValueCallback.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/SimValueCallback.java index 4f9da942cc..fecb511806 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/simulation/SimValueCallback.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/simulation/SimValueCallback.java @@ -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. -package edu.wpi.first.hal.simulation; +package org.wpilib.hardware.hal.simulation; -import edu.wpi.first.hal.HALValue; +import org.wpilib.hardware.hal.HALValue; @FunctionalInterface public interface SimValueCallback { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/simulation/SimulatorJNI.java b/hal/src/main/java/org/wpilib/hardware/hal/simulation/SimulatorJNI.java index 298929c06f..08c5d56a12 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/simulation/SimulatorJNI.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/simulation/SimulatorJNI.java @@ -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. -package edu.wpi.first.hal.simulation; +package org.wpilib.hardware.hal.simulation; -import edu.wpi.first.hal.JNIWrapper; +import org.wpilib.hardware.hal.JNIWrapper; /** JNI for simulator. */ public class SimulatorJNI extends JNIWrapper { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/util/AllocationException.java b/hal/src/main/java/org/wpilib/hardware/hal/util/AllocationException.java index 3591a5f7a8..7fbe314c1d 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/util/AllocationException.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/util/AllocationException.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 edu.wpi.first.hal.util; +package org.wpilib.hardware.hal.util; /** Exception indicating that the resource is already allocated. */ public class AllocationException extends RuntimeException { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/util/BoundaryException.java b/hal/src/main/java/org/wpilib/hardware/hal/util/BoundaryException.java index bbecbbec3b..aca42a3df6 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/util/BoundaryException.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/util/BoundaryException.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 edu.wpi.first.hal.util; +package org.wpilib.hardware.hal.util; /** * This exception represents an error in which a lower limit was set as higher than an upper limit. diff --git a/hal/src/main/java/org/wpilib/hardware/hal/util/CheckedAllocationException.java b/hal/src/main/java/org/wpilib/hardware/hal/util/CheckedAllocationException.java index e4301abe88..6240703bc4 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/util/CheckedAllocationException.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/util/CheckedAllocationException.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 edu.wpi.first.hal.util; +package org.wpilib.hardware.hal.util; /** * Exception indicating that the resource is already allocated. This is meant to be thrown by the diff --git a/hal/src/main/java/org/wpilib/hardware/hal/util/HalHandleException.java b/hal/src/main/java/org/wpilib/hardware/hal/util/HalHandleException.java index aee93bb135..d81644efb3 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/util/HalHandleException.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/util/HalHandleException.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 edu.wpi.first.hal.util; +package org.wpilib.hardware.hal.util; /** Exception indicating that an error has occurred with a HAL Handle. */ public class HalHandleException extends RuntimeException { diff --git a/hal/src/main/java/org/wpilib/hardware/hal/util/UncleanStatusException.java b/hal/src/main/java/org/wpilib/hardware/hal/util/UncleanStatusException.java index 6c188d3752..ef12b958be 100644 --- a/hal/src/main/java/org/wpilib/hardware/hal/util/UncleanStatusException.java +++ b/hal/src/main/java/org/wpilib/hardware/hal/util/UncleanStatusException.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 edu.wpi.first.hal.util; +package org.wpilib.hardware.hal.util; /** Exception for bad status codes from the chip object. */ public final class UncleanStatusException extends IllegalStateException { diff --git a/hal/src/main/native/cpp/jni/AddressableLEDJNI.cpp b/hal/src/main/native/cpp/jni/AddressableLEDJNI.cpp index 59fb111102..811e520bc1 100644 --- a/hal/src/main/native/cpp/jni/AddressableLEDJNI.cpp +++ b/hal/src/main/native/cpp/jni/AddressableLEDJNI.cpp @@ -7,7 +7,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_hal_AddressableLEDJNI.h" +#include "org_wpilib_hardware_hal_AddressableLEDJNI.h" #include "hal/AddressableLED.h" using namespace hal; @@ -15,27 +15,27 @@ using namespace wpi::java; static_assert(sizeof(jbyte) * 3 == sizeof(HAL_AddressableLEDData)); -static_assert(edu_wpi_first_hal_AddressableLEDJNI_COLOR_ORDER_RGB == +static_assert(org_wpilib_hardware_hal_AddressableLEDJNI_COLOR_ORDER_RGB == HAL_ALED_RGB); -static_assert(edu_wpi_first_hal_AddressableLEDJNI_COLOR_ORDER_RBG == +static_assert(org_wpilib_hardware_hal_AddressableLEDJNI_COLOR_ORDER_RBG == HAL_ALED_RBG); -static_assert(edu_wpi_first_hal_AddressableLEDJNI_COLOR_ORDER_BGR == +static_assert(org_wpilib_hardware_hal_AddressableLEDJNI_COLOR_ORDER_BGR == HAL_ALED_BGR); -static_assert(edu_wpi_first_hal_AddressableLEDJNI_COLOR_ORDER_BRG == +static_assert(org_wpilib_hardware_hal_AddressableLEDJNI_COLOR_ORDER_BRG == HAL_ALED_BRG); -static_assert(edu_wpi_first_hal_AddressableLEDJNI_COLOR_ORDER_GBR == +static_assert(org_wpilib_hardware_hal_AddressableLEDJNI_COLOR_ORDER_GBR == HAL_ALED_GBR); -static_assert(edu_wpi_first_hal_AddressableLEDJNI_COLOR_ORDER_GRB == +static_assert(org_wpilib_hardware_hal_AddressableLEDJNI_COLOR_ORDER_GRB == HAL_ALED_GRB); extern "C" { /* - * Class: edu_wpi_first_hal_AddressableLEDJNI + * Class: org_wpilib_hardware_hal_AddressableLEDJNI * Method: initialize * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_AddressableLEDJNI_initialize +Java_org_wpilib_hardware_hal_AddressableLEDJNI_initialize (JNIEnv* env, jclass, jint channel) { int32_t status = 0; @@ -46,12 +46,12 @@ Java_edu_wpi_first_hal_AddressableLEDJNI_initialize } /* - * Class: edu_wpi_first_hal_AddressableLEDJNI + * Class: org_wpilib_hardware_hal_AddressableLEDJNI * Method: free * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_AddressableLEDJNI_free +Java_org_wpilib_hardware_hal_AddressableLEDJNI_free (JNIEnv* env, jclass, jint handle) { if (handle != HAL_kInvalidHandle) { @@ -60,12 +60,12 @@ Java_edu_wpi_first_hal_AddressableLEDJNI_free } /* - * Class: edu_wpi_first_hal_AddressableLEDJNI + * Class: org_wpilib_hardware_hal_AddressableLEDJNI * Method: setStart * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_AddressableLEDJNI_setStart +Java_org_wpilib_hardware_hal_AddressableLEDJNI_setStart (JNIEnv* env, jclass, jint handle, jint start) { int32_t status = 0; @@ -75,12 +75,12 @@ Java_edu_wpi_first_hal_AddressableLEDJNI_setStart } /* - * Class: edu_wpi_first_hal_AddressableLEDJNI + * Class: org_wpilib_hardware_hal_AddressableLEDJNI * Method: setLength * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_AddressableLEDJNI_setLength +Java_org_wpilib_hardware_hal_AddressableLEDJNI_setLength (JNIEnv* env, jclass, jint handle, jint length) { int32_t status = 0; @@ -90,12 +90,12 @@ Java_edu_wpi_first_hal_AddressableLEDJNI_setLength } /* - * Class: edu_wpi_first_hal_AddressableLEDJNI + * Class: org_wpilib_hardware_hal_AddressableLEDJNI * Method: setData * Signature: (II[BII)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_AddressableLEDJNI_setData +Java_org_wpilib_hardware_hal_AddressableLEDJNI_setData (JNIEnv* env, jclass, jint outStart, jint colorOrder, jbyteArray data, jint start, jint len) { @@ -130,12 +130,12 @@ Java_edu_wpi_first_hal_AddressableLEDJNI_setData } /* - * Class: edu_wpi_first_hal_AddressableLEDJNI + * Class: org_wpilib_hardware_hal_AddressableLEDJNI * Method: setDataFromBuffer * Signature: (IILjava/lang/Object;II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_AddressableLEDJNI_setDataFromBuffer +Java_org_wpilib_hardware_hal_AddressableLEDJNI_setDataFromBuffer (JNIEnv* env, jclass, jint outStart, jint colorOrder, jobject data, jint start, jint len) { diff --git a/hal/src/main/native/cpp/jni/AnalogJNI.cpp b/hal/src/main/native/cpp/jni/AnalogJNI.cpp index e09c6fb746..4567ec5607 100644 --- a/hal/src/main/native/cpp/jni/AnalogJNI.cpp +++ b/hal/src/main/native/cpp/jni/AnalogJNI.cpp @@ -9,7 +9,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_hal_AnalogJNI.h" +#include "org_wpilib_hardware_hal_AnalogJNI.h" #include "hal/AnalogInput.h" #include "hal/Ports.h" #include "hal/handles/HandlesInternal.h" @@ -19,12 +19,12 @@ using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_AnalogJNI + * Class: org_wpilib_hardware_hal_AnalogJNI * Method: initializeAnalogInputPort * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_AnalogJNI_initializeAnalogInputPort +Java_org_wpilib_hardware_hal_AnalogJNI_initializeAnalogInputPort (JNIEnv* env, jclass, jint channel) { int32_t status = 0; @@ -35,12 +35,12 @@ Java_edu_wpi_first_hal_AnalogJNI_initializeAnalogInputPort } /* - * Class: edu_wpi_first_hal_AnalogJNI + * Class: org_wpilib_hardware_hal_AnalogJNI * Method: freeAnalogInputPort * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_AnalogJNI_freeAnalogInputPort +Java_org_wpilib_hardware_hal_AnalogJNI_freeAnalogInputPort (JNIEnv* env, jclass, jint id) { if (id != HAL_kInvalidHandle) { @@ -49,12 +49,12 @@ Java_edu_wpi_first_hal_AnalogJNI_freeAnalogInputPort } /* - * Class: edu_wpi_first_hal_AnalogJNI + * Class: org_wpilib_hardware_hal_AnalogJNI * Method: checkAnalogModule * Signature: (B)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_AnalogJNI_checkAnalogModule +Java_org_wpilib_hardware_hal_AnalogJNI_checkAnalogModule (JNIEnv*, jclass, jbyte value) { jboolean returnValue = HAL_CheckAnalogModule(value); @@ -62,12 +62,12 @@ Java_edu_wpi_first_hal_AnalogJNI_checkAnalogModule } /* - * Class: edu_wpi_first_hal_AnalogJNI + * Class: org_wpilib_hardware_hal_AnalogJNI * Method: checkAnalogInputChannel * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_AnalogJNI_checkAnalogInputChannel +Java_org_wpilib_hardware_hal_AnalogJNI_checkAnalogInputChannel (JNIEnv*, jclass, jint value) { jboolean returnValue = HAL_CheckAnalogInputChannel(value); @@ -75,12 +75,12 @@ Java_edu_wpi_first_hal_AnalogJNI_checkAnalogInputChannel } /* - * Class: edu_wpi_first_hal_AnalogJNI + * Class: org_wpilib_hardware_hal_AnalogJNI * Method: setAnalogInputSimDevice * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_AnalogJNI_setAnalogInputSimDevice +Java_org_wpilib_hardware_hal_AnalogJNI_setAnalogInputSimDevice (JNIEnv* env, jclass, jint handle, jint device) { HAL_SetAnalogInputSimDevice((HAL_AnalogInputHandle)handle, @@ -88,12 +88,12 @@ Java_edu_wpi_first_hal_AnalogJNI_setAnalogInputSimDevice } /* - * Class: edu_wpi_first_hal_AnalogJNI + * Class: org_wpilib_hardware_hal_AnalogJNI * Method: setAnalogSampleRate * Signature: (D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_AnalogJNI_setAnalogSampleRate +Java_org_wpilib_hardware_hal_AnalogJNI_setAnalogSampleRate (JNIEnv* env, jclass, jdouble value) { int32_t status = 0; @@ -102,12 +102,12 @@ Java_edu_wpi_first_hal_AnalogJNI_setAnalogSampleRate } /* - * Class: edu_wpi_first_hal_AnalogJNI + * Class: org_wpilib_hardware_hal_AnalogJNI * Method: getAnalogSampleRate * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_AnalogJNI_getAnalogSampleRate +Java_org_wpilib_hardware_hal_AnalogJNI_getAnalogSampleRate (JNIEnv* env, jclass) { int32_t status = 0; @@ -117,12 +117,12 @@ Java_edu_wpi_first_hal_AnalogJNI_getAnalogSampleRate } /* - * Class: edu_wpi_first_hal_AnalogJNI + * Class: org_wpilib_hardware_hal_AnalogJNI * Method: setAnalogAverageBits * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_AnalogJNI_setAnalogAverageBits +Java_org_wpilib_hardware_hal_AnalogJNI_setAnalogAverageBits (JNIEnv* env, jclass, jint id, jint value) { int32_t status = 0; @@ -131,12 +131,12 @@ Java_edu_wpi_first_hal_AnalogJNI_setAnalogAverageBits } /* - * Class: edu_wpi_first_hal_AnalogJNI + * Class: org_wpilib_hardware_hal_AnalogJNI * Method: getAnalogAverageBits * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_AnalogJNI_getAnalogAverageBits +Java_org_wpilib_hardware_hal_AnalogJNI_getAnalogAverageBits (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -147,12 +147,12 @@ Java_edu_wpi_first_hal_AnalogJNI_getAnalogAverageBits } /* - * Class: edu_wpi_first_hal_AnalogJNI + * Class: org_wpilib_hardware_hal_AnalogJNI * Method: setAnalogOversampleBits * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_AnalogJNI_setAnalogOversampleBits +Java_org_wpilib_hardware_hal_AnalogJNI_setAnalogOversampleBits (JNIEnv* env, jclass, jint id, jint value) { int32_t status = 0; @@ -161,12 +161,12 @@ Java_edu_wpi_first_hal_AnalogJNI_setAnalogOversampleBits } /* - * Class: edu_wpi_first_hal_AnalogJNI + * Class: org_wpilib_hardware_hal_AnalogJNI * Method: getAnalogOversampleBits * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_AnalogJNI_getAnalogOversampleBits +Java_org_wpilib_hardware_hal_AnalogJNI_getAnalogOversampleBits (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -177,12 +177,12 @@ Java_edu_wpi_first_hal_AnalogJNI_getAnalogOversampleBits } /* - * Class: edu_wpi_first_hal_AnalogJNI + * Class: org_wpilib_hardware_hal_AnalogJNI * Method: getAnalogValue * Signature: (I)S */ JNIEXPORT jshort JNICALL -Java_edu_wpi_first_hal_AnalogJNI_getAnalogValue +Java_org_wpilib_hardware_hal_AnalogJNI_getAnalogValue (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -192,12 +192,12 @@ Java_edu_wpi_first_hal_AnalogJNI_getAnalogValue } /* - * Class: edu_wpi_first_hal_AnalogJNI + * Class: org_wpilib_hardware_hal_AnalogJNI * Method: getAnalogAverageValue * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_AnalogJNI_getAnalogAverageValue +Java_org_wpilib_hardware_hal_AnalogJNI_getAnalogAverageValue (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -208,12 +208,12 @@ Java_edu_wpi_first_hal_AnalogJNI_getAnalogAverageValue } /* - * Class: edu_wpi_first_hal_AnalogJNI + * Class: org_wpilib_hardware_hal_AnalogJNI * Method: getAnalogVoltsToValue * Signature: (ID)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_AnalogJNI_getAnalogVoltsToValue +Java_org_wpilib_hardware_hal_AnalogJNI_getAnalogVoltsToValue (JNIEnv* env, jclass, jint id, jdouble voltageValue) { int32_t status = 0; @@ -224,12 +224,12 @@ Java_edu_wpi_first_hal_AnalogJNI_getAnalogVoltsToValue } /* - * Class: edu_wpi_first_hal_AnalogJNI + * Class: org_wpilib_hardware_hal_AnalogJNI * Method: getAnalogValueToVolts * Signature: (II)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_AnalogJNI_getAnalogValueToVolts +Java_org_wpilib_hardware_hal_AnalogJNI_getAnalogValueToVolts (JNIEnv* env, jclass, jint id, jint rawValue) { int32_t status = 0; @@ -240,12 +240,12 @@ Java_edu_wpi_first_hal_AnalogJNI_getAnalogValueToVolts } /* - * Class: edu_wpi_first_hal_AnalogJNI + * Class: org_wpilib_hardware_hal_AnalogJNI * Method: getAnalogVoltage * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_AnalogJNI_getAnalogVoltage +Java_org_wpilib_hardware_hal_AnalogJNI_getAnalogVoltage (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -256,12 +256,12 @@ Java_edu_wpi_first_hal_AnalogJNI_getAnalogVoltage } /* - * Class: edu_wpi_first_hal_AnalogJNI + * Class: org_wpilib_hardware_hal_AnalogJNI * Method: getAnalogAverageVoltage * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_AnalogJNI_getAnalogAverageVoltage +Java_org_wpilib_hardware_hal_AnalogJNI_getAnalogAverageVoltage (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -272,12 +272,12 @@ Java_edu_wpi_first_hal_AnalogJNI_getAnalogAverageVoltage } /* - * Class: edu_wpi_first_hal_AnalogJNI + * Class: org_wpilib_hardware_hal_AnalogJNI * Method: getAnalogLSBWeight * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_AnalogJNI_getAnalogLSBWeight +Java_org_wpilib_hardware_hal_AnalogJNI_getAnalogLSBWeight (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -288,12 +288,12 @@ Java_edu_wpi_first_hal_AnalogJNI_getAnalogLSBWeight } /* - * Class: edu_wpi_first_hal_AnalogJNI + * Class: org_wpilib_hardware_hal_AnalogJNI * Method: getAnalogOffset * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_AnalogJNI_getAnalogOffset +Java_org_wpilib_hardware_hal_AnalogJNI_getAnalogOffset (JNIEnv* env, jclass, jint id) { int32_t status = 0; diff --git a/hal/src/main/native/cpp/jni/CANAPIJNI.cpp b/hal/src/main/native/cpp/jni/CANAPIJNI.cpp index 486b28b6e8..19deac6421 100644 --- a/hal/src/main/native/cpp/jni/CANAPIJNI.cpp +++ b/hal/src/main/native/cpp/jni/CANAPIJNI.cpp @@ -9,7 +9,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_hal_CANAPIJNI.h" +#include "org_wpilib_hardware_hal_CANAPIJNI.h" #include "hal/CAN.h" #include "hal/CANAPI.h" #include "hal/Errors.h" @@ -20,12 +20,12 @@ using namespace wpi::java; extern "C" { /* - * Class: edu_wpi_first_hal_CANAPIJNI + * Class: org_wpilib_hardware_hal_CANAPIJNI * Method: initializeCAN * Signature: (IIII)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_CANAPIJNI_initializeCAN +Java_org_wpilib_hardware_hal_CANAPIJNI_initializeCAN (JNIEnv* env, jclass, jint busId, jint manufacturer, jint deviceId, jint deviceType) { @@ -41,12 +41,12 @@ Java_edu_wpi_first_hal_CANAPIJNI_initializeCAN } /* - * Class: edu_wpi_first_hal_CANAPIJNI + * Class: org_wpilib_hardware_hal_CANAPIJNI * Method: cleanCAN * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_CANAPIJNI_cleanCAN +Java_org_wpilib_hardware_hal_CANAPIJNI_cleanCAN (JNIEnv* env, jclass, jint handle) { if (handle != HAL_kInvalidHandle) { @@ -85,12 +85,12 @@ static bool PackCANMessage(JNIEnv* env, jbyteArray data, jint dataLength, } /* - * Class: edu_wpi_first_hal_CANAPIJNI + * Class: org_wpilib_hardware_hal_CANAPIJNI * Method: writeCANPacket * Signature: (II[BII)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_CANAPIJNI_writeCANPacket +Java_org_wpilib_hardware_hal_CANAPIJNI_writeCANPacket (JNIEnv* env, jclass, jint handle, jint apiId, jbyteArray data, jint dataLength, jint flags) { @@ -106,12 +106,12 @@ Java_edu_wpi_first_hal_CANAPIJNI_writeCANPacket } /* - * Class: edu_wpi_first_hal_CANAPIJNI + * Class: org_wpilib_hardware_hal_CANAPIJNI * Method: writeCANPacketRepeating * Signature: (II[BIII)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_CANAPIJNI_writeCANPacketRepeating +Java_org_wpilib_hardware_hal_CANAPIJNI_writeCANPacketRepeating (JNIEnv* env, jclass, jint handle, jint apiId, jbyteArray data, jint dataLength, jint flags, jint repeatMs) { @@ -127,12 +127,12 @@ Java_edu_wpi_first_hal_CANAPIJNI_writeCANPacketRepeating } /* - * Class: edu_wpi_first_hal_CANAPIJNI + * Class: org_wpilib_hardware_hal_CANAPIJNI * Method: writeCANRTRFrame * Signature: (II[BII)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_CANAPIJNI_writeCANRTRFrame +Java_org_wpilib_hardware_hal_CANAPIJNI_writeCANRTRFrame (JNIEnv* env, jclass, jint handle, jint apiId, jbyteArray data, jint dataLength, jint flags) { @@ -163,12 +163,12 @@ Java_edu_wpi_first_hal_CANAPIJNI_writeCANRTRFrame } /* - * Class: edu_wpi_first_hal_CANAPIJNI + * Class: org_wpilib_hardware_hal_CANAPIJNI * Method: writeCANPacketNoThrow * Signature: (II[BII)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_CANAPIJNI_writeCANPacketNoThrow +Java_org_wpilib_hardware_hal_CANAPIJNI_writeCANPacketNoThrow (JNIEnv* env, jclass, jint handle, jint apiId, jbyteArray data, jint dataLength, jint flags) { @@ -184,12 +184,12 @@ Java_edu_wpi_first_hal_CANAPIJNI_writeCANPacketNoThrow } /* - * Class: edu_wpi_first_hal_CANAPIJNI + * Class: org_wpilib_hardware_hal_CANAPIJNI * Method: writeCANPacketRepeatingNoThrow * Signature: (II[BIII)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_CANAPIJNI_writeCANPacketRepeatingNoThrow +Java_org_wpilib_hardware_hal_CANAPIJNI_writeCANPacketRepeatingNoThrow (JNIEnv* env, jclass, jint handle, jint apiId, jbyteArray data, jint dataLength, jint flags, jint repeatMs) { @@ -205,12 +205,12 @@ Java_edu_wpi_first_hal_CANAPIJNI_writeCANPacketRepeatingNoThrow } /* - * Class: edu_wpi_first_hal_CANAPIJNI + * Class: org_wpilib_hardware_hal_CANAPIJNI * Method: writeCANRTRFrameNoThrow * Signature: (II[BII)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_CANAPIJNI_writeCANRTRFrameNoThrow +Java_org_wpilib_hardware_hal_CANAPIJNI_writeCANRTRFrameNoThrow (JNIEnv* env, jclass, jint handle, jint apiId, jbyteArray data, jint dataLength, jint flags) { @@ -241,12 +241,12 @@ Java_edu_wpi_first_hal_CANAPIJNI_writeCANRTRFrameNoThrow } /* - * Class: edu_wpi_first_hal_CANAPIJNI + * Class: org_wpilib_hardware_hal_CANAPIJNI * Method: stopCANPacketRepeating * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_CANAPIJNI_stopCANPacketRepeating +Java_org_wpilib_hardware_hal_CANAPIJNI_stopCANPacketRepeating (JNIEnv* env, jclass, jint handle, jint apiId) { auto halHandle = static_cast(handle); @@ -256,12 +256,12 @@ Java_edu_wpi_first_hal_CANAPIJNI_stopCANPacketRepeating } /* - * Class: edu_wpi_first_hal_CANAPIJNI + * Class: org_wpilib_hardware_hal_CANAPIJNI * Method: readCANPacketNew * Signature: (IILjava/lang/Object;)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_CANAPIJNI_readCANPacketNew +Java_org_wpilib_hardware_hal_CANAPIJNI_readCANPacketNew (JNIEnv* env, jclass, jint handle, jint apiId, jobject data) { auto halHandle = static_cast(handle); @@ -291,12 +291,12 @@ Java_edu_wpi_first_hal_CANAPIJNI_readCANPacketNew } /* - * Class: edu_wpi_first_hal_CANAPIJNI + * Class: org_wpilib_hardware_hal_CANAPIJNI * Method: readCANPacketLatest * Signature: (IILjava/lang/Object;)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_CANAPIJNI_readCANPacketLatest +Java_org_wpilib_hardware_hal_CANAPIJNI_readCANPacketLatest (JNIEnv* env, jclass, jint handle, jint apiId, jobject data) { auto halHandle = static_cast(handle); @@ -326,12 +326,12 @@ Java_edu_wpi_first_hal_CANAPIJNI_readCANPacketLatest } /* - * Class: edu_wpi_first_hal_CANAPIJNI + * Class: org_wpilib_hardware_hal_CANAPIJNI * Method: readCANPacketTimeout * Signature: (IILjava/lang/Object;I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_CANAPIJNI_readCANPacketTimeout +Java_org_wpilib_hardware_hal_CANAPIJNI_readCANPacketTimeout (JNIEnv* env, jclass, jint handle, jint apiId, jobject data, jint timeoutMs) { auto halHandle = static_cast(handle); diff --git a/hal/src/main/native/cpp/jni/CANJNI.cpp b/hal/src/main/native/cpp/jni/CANJNI.cpp index f6bd5c3021..bb1b53303d 100644 --- a/hal/src/main/native/cpp/jni/CANJNI.cpp +++ b/hal/src/main/native/cpp/jni/CANJNI.cpp @@ -9,7 +9,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_hal_can_CANJNI.h" +#include "org_wpilib_hardware_hal_can_CANJNI.h" #include "hal/CAN.h" #include "hal/Errors.h" @@ -49,12 +49,12 @@ static bool PackCANMessage(JNIEnv* env, jbyteArray data, jint dataLength, } /* - * Class: edu_wpi_first_hal_can_CANJNI + * Class: org_wpilib_hardware_hal_can_CANJNI * Method: sendMessage * Signature: (II[BIII)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_can_CANJNI_sendMessage +Java_org_wpilib_hardware_hal_can_CANJNI_sendMessage (JNIEnv* env, jclass, jint busId, jint messageId, jbyteArray data, jint dataLength, jint flags, jint periodMs) { @@ -69,12 +69,12 @@ Java_edu_wpi_first_hal_can_CANJNI_sendMessage } /* - * Class: edu_wpi_first_hal_can_CANJNI + * Class: org_wpilib_hardware_hal_can_CANJNI * Method: receiveMessage * Signature: (IILjava/lang/Object;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_can_CANJNI_receiveMessage +Java_org_wpilib_hardware_hal_can_CANJNI_receiveMessage (JNIEnv* env, jclass, jint busId, jint messageId, jobject data) { HAL_CANReceiveMessage message; @@ -96,12 +96,12 @@ Java_edu_wpi_first_hal_can_CANJNI_receiveMessage } /* - * Class: edu_wpi_first_hal_can_CANJNI + * Class: org_wpilib_hardware_hal_can_CANJNI * Method: getCANStatus * Signature: (ILjava/lang/Object;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_can_CANJNI_getCANStatus +Java_org_wpilib_hardware_hal_can_CANJNI_getCANStatus (JNIEnv* env, jclass, jint busId, jobject canStatus) { float percentBusUtilization = 0; @@ -123,12 +123,12 @@ Java_edu_wpi_first_hal_can_CANJNI_getCANStatus } /* - * Class: edu_wpi_first_hal_can_CANJNI + * Class: org_wpilib_hardware_hal_can_CANJNI * Method: openCANStreamSession * Signature: (IIII)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_can_CANJNI_openCANStreamSession +Java_org_wpilib_hardware_hal_can_CANJNI_openCANStreamSession (JNIEnv* env, jclass, jint busId, jint messageId, jint messageIDMask, jint maxMessages) { @@ -146,24 +146,24 @@ Java_edu_wpi_first_hal_can_CANJNI_openCANStreamSession } /* - * Class: edu_wpi_first_hal_can_CANJNI + * Class: org_wpilib_hardware_hal_can_CANJNI * Method: closeCANStreamSession * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_can_CANJNI_closeCANStreamSession +Java_org_wpilib_hardware_hal_can_CANJNI_closeCANStreamSession (JNIEnv* env, jclass, jint sessionHandle) { HAL_CAN_CloseStreamSession(static_cast(sessionHandle)); } /* - * Class: edu_wpi_first_hal_can_CANJNI + * Class: org_wpilib_hardware_hal_can_CANJNI * Method: readCANStreamSession * Signature: (I[Ljava/lang/Object;I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_can_CANJNI_readCANStreamSession +Java_org_wpilib_hardware_hal_can_CANJNI_readCANStreamSession (JNIEnv* env, jclass, jint sessionHandle, jobjectArray messages, jint messagesToRead) { diff --git a/hal/src/main/native/cpp/jni/CTREPCMJNI.cpp b/hal/src/main/native/cpp/jni/CTREPCMJNI.cpp index 6b5fe88c6a..7e0634e099 100644 --- a/hal/src/main/native/cpp/jni/CTREPCMJNI.cpp +++ b/hal/src/main/native/cpp/jni/CTREPCMJNI.cpp @@ -7,7 +7,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_hal_CTREPCMJNI.h" +#include "org_wpilib_hardware_hal_CTREPCMJNI.h" #include "hal/CTREPCM.h" #include "hal/Ports.h" #include "hal/handles/HandlesInternal.h" @@ -17,12 +17,12 @@ using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_CTREPCMJNI + * Class: org_wpilib_hardware_hal_CTREPCMJNI * Method: initialize * Signature: (II)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_CTREPCMJNI_initialize +Java_org_wpilib_hardware_hal_CTREPCMJNI_initialize (JNIEnv* env, jclass, jint busId, jint module) { int32_t status = 0; @@ -33,12 +33,12 @@ Java_edu_wpi_first_hal_CTREPCMJNI_initialize } /* - * Class: edu_wpi_first_hal_CTREPCMJNI + * Class: org_wpilib_hardware_hal_CTREPCMJNI * Method: free * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_CTREPCMJNI_free +Java_org_wpilib_hardware_hal_CTREPCMJNI_free (JNIEnv* env, jclass, jint handle) { if (handle != HAL_kInvalidHandle) { @@ -47,24 +47,24 @@ Java_edu_wpi_first_hal_CTREPCMJNI_free } /* - * Class: edu_wpi_first_hal_CTREPCMJNI + * Class: org_wpilib_hardware_hal_CTREPCMJNI * Method: checkSolenoidChannel * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_CTREPCMJNI_checkSolenoidChannel +Java_org_wpilib_hardware_hal_CTREPCMJNI_checkSolenoidChannel (JNIEnv*, jclass, jint channel) { return HAL_CheckCTREPCMSolenoidChannel(channel); } /* - * Class: edu_wpi_first_hal_CTREPCMJNI + * Class: org_wpilib_hardware_hal_CTREPCMJNI * Method: getCompressor * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_CTREPCMJNI_getCompressor +Java_org_wpilib_hardware_hal_CTREPCMJNI_getCompressor (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -74,12 +74,12 @@ Java_edu_wpi_first_hal_CTREPCMJNI_getCompressor } /* - * Class: edu_wpi_first_hal_CTREPCMJNI + * Class: org_wpilib_hardware_hal_CTREPCMJNI * Method: setClosedLoopControl * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_CTREPCMJNI_setClosedLoopControl +Java_org_wpilib_hardware_hal_CTREPCMJNI_setClosedLoopControl (JNIEnv* env, jclass, jint handle, jboolean enabled) { int32_t status = 0; @@ -88,12 +88,12 @@ Java_edu_wpi_first_hal_CTREPCMJNI_setClosedLoopControl } /* - * Class: edu_wpi_first_hal_CTREPCMJNI + * Class: org_wpilib_hardware_hal_CTREPCMJNI * Method: getClosedLoopControl * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_CTREPCMJNI_getClosedLoopControl +Java_org_wpilib_hardware_hal_CTREPCMJNI_getClosedLoopControl (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -103,12 +103,12 @@ Java_edu_wpi_first_hal_CTREPCMJNI_getClosedLoopControl } /* - * Class: edu_wpi_first_hal_CTREPCMJNI + * Class: org_wpilib_hardware_hal_CTREPCMJNI * Method: getPressureSwitch * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_CTREPCMJNI_getPressureSwitch +Java_org_wpilib_hardware_hal_CTREPCMJNI_getPressureSwitch (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -118,12 +118,12 @@ Java_edu_wpi_first_hal_CTREPCMJNI_getPressureSwitch } /* - * Class: edu_wpi_first_hal_CTREPCMJNI + * Class: org_wpilib_hardware_hal_CTREPCMJNI * Method: getCompressorCurrent * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_CTREPCMJNI_getCompressorCurrent +Java_org_wpilib_hardware_hal_CTREPCMJNI_getCompressorCurrent (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -133,12 +133,12 @@ Java_edu_wpi_first_hal_CTREPCMJNI_getCompressorCurrent } /* - * Class: edu_wpi_first_hal_CTREPCMJNI + * Class: org_wpilib_hardware_hal_CTREPCMJNI * Method: getCompressorCurrentTooHighFault * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_CTREPCMJNI_getCompressorCurrentTooHighFault +Java_org_wpilib_hardware_hal_CTREPCMJNI_getCompressorCurrentTooHighFault (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -148,12 +148,12 @@ Java_edu_wpi_first_hal_CTREPCMJNI_getCompressorCurrentTooHighFault } /* - * Class: edu_wpi_first_hal_CTREPCMJNI + * Class: org_wpilib_hardware_hal_CTREPCMJNI * Method: getCompressorCurrentTooHighStickyFault * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_CTREPCMJNI_getCompressorCurrentTooHighStickyFault +Java_org_wpilib_hardware_hal_CTREPCMJNI_getCompressorCurrentTooHighStickyFault (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -164,12 +164,12 @@ Java_edu_wpi_first_hal_CTREPCMJNI_getCompressorCurrentTooHighStickyFault } /* - * Class: edu_wpi_first_hal_CTREPCMJNI + * Class: org_wpilib_hardware_hal_CTREPCMJNI * Method: getCompressorShortedFault * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_CTREPCMJNI_getCompressorShortedFault +Java_org_wpilib_hardware_hal_CTREPCMJNI_getCompressorShortedFault (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -179,12 +179,12 @@ Java_edu_wpi_first_hal_CTREPCMJNI_getCompressorShortedFault } /* - * Class: edu_wpi_first_hal_CTREPCMJNI + * Class: org_wpilib_hardware_hal_CTREPCMJNI * Method: getCompressorShortedStickyFault * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_CTREPCMJNI_getCompressorShortedStickyFault +Java_org_wpilib_hardware_hal_CTREPCMJNI_getCompressorShortedStickyFault (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -194,12 +194,12 @@ Java_edu_wpi_first_hal_CTREPCMJNI_getCompressorShortedStickyFault } /* - * Class: edu_wpi_first_hal_CTREPCMJNI + * Class: org_wpilib_hardware_hal_CTREPCMJNI * Method: getCompressorNotConnectedFault * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_CTREPCMJNI_getCompressorNotConnectedFault +Java_org_wpilib_hardware_hal_CTREPCMJNI_getCompressorNotConnectedFault (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -209,12 +209,12 @@ Java_edu_wpi_first_hal_CTREPCMJNI_getCompressorNotConnectedFault } /* - * Class: edu_wpi_first_hal_CTREPCMJNI + * Class: org_wpilib_hardware_hal_CTREPCMJNI * Method: getCompressorNotConnectedStickyFault * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_CTREPCMJNI_getCompressorNotConnectedStickyFault +Java_org_wpilib_hardware_hal_CTREPCMJNI_getCompressorNotConnectedStickyFault (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -225,12 +225,12 @@ Java_edu_wpi_first_hal_CTREPCMJNI_getCompressorNotConnectedStickyFault } /* - * Class: edu_wpi_first_hal_CTREPCMJNI + * Class: org_wpilib_hardware_hal_CTREPCMJNI * Method: getSolenoids * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_CTREPCMJNI_getSolenoids +Java_org_wpilib_hardware_hal_CTREPCMJNI_getSolenoids (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -240,12 +240,12 @@ Java_edu_wpi_first_hal_CTREPCMJNI_getSolenoids } /* - * Class: edu_wpi_first_hal_CTREPCMJNI + * Class: org_wpilib_hardware_hal_CTREPCMJNI * Method: setSolenoids * Signature: (III)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_CTREPCMJNI_setSolenoids +Java_org_wpilib_hardware_hal_CTREPCMJNI_setSolenoids (JNIEnv* env, jclass, jint handle, jint mask, jint value) { int32_t status = 0; @@ -254,12 +254,12 @@ Java_edu_wpi_first_hal_CTREPCMJNI_setSolenoids } /* - * Class: edu_wpi_first_hal_CTREPCMJNI + * Class: org_wpilib_hardware_hal_CTREPCMJNI * Method: getSolenoidDisabledList * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_CTREPCMJNI_getSolenoidDisabledList +Java_org_wpilib_hardware_hal_CTREPCMJNI_getSolenoidDisabledList (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -269,12 +269,12 @@ Java_edu_wpi_first_hal_CTREPCMJNI_getSolenoidDisabledList } /* - * Class: edu_wpi_first_hal_CTREPCMJNI + * Class: org_wpilib_hardware_hal_CTREPCMJNI * Method: getSolenoidVoltageFault * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_CTREPCMJNI_getSolenoidVoltageFault +Java_org_wpilib_hardware_hal_CTREPCMJNI_getSolenoidVoltageFault (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -284,12 +284,12 @@ Java_edu_wpi_first_hal_CTREPCMJNI_getSolenoidVoltageFault } /* - * Class: edu_wpi_first_hal_CTREPCMJNI + * Class: org_wpilib_hardware_hal_CTREPCMJNI * Method: getSolenoidVoltageStickyFault * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_CTREPCMJNI_getSolenoidVoltageStickyFault +Java_org_wpilib_hardware_hal_CTREPCMJNI_getSolenoidVoltageStickyFault (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -299,12 +299,12 @@ Java_edu_wpi_first_hal_CTREPCMJNI_getSolenoidVoltageStickyFault } /* - * Class: edu_wpi_first_hal_CTREPCMJNI + * Class: org_wpilib_hardware_hal_CTREPCMJNI * Method: clearAllStickyFaults * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_CTREPCMJNI_clearAllStickyFaults +Java_org_wpilib_hardware_hal_CTREPCMJNI_clearAllStickyFaults (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -313,12 +313,12 @@ Java_edu_wpi_first_hal_CTREPCMJNI_clearAllStickyFaults } /* - * Class: edu_wpi_first_hal_CTREPCMJNI + * Class: org_wpilib_hardware_hal_CTREPCMJNI * Method: fireOneShot * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_CTREPCMJNI_fireOneShot +Java_org_wpilib_hardware_hal_CTREPCMJNI_fireOneShot (JNIEnv* env, jclass, jint handle, jint index) { int32_t status = 0; @@ -327,12 +327,12 @@ Java_edu_wpi_first_hal_CTREPCMJNI_fireOneShot } /* - * Class: edu_wpi_first_hal_CTREPCMJNI + * Class: org_wpilib_hardware_hal_CTREPCMJNI * Method: setOneShotDuration * Signature: (III)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_CTREPCMJNI_setOneShotDuration +Java_org_wpilib_hardware_hal_CTREPCMJNI_setOneShotDuration (JNIEnv* env, jclass, jint handle, jint index, jint durMs) { int32_t status = 0; diff --git a/hal/src/main/native/cpp/jni/ConstantsJNI.cpp b/hal/src/main/native/cpp/jni/ConstantsJNI.cpp index 600b7f7fc4..40d6dada8d 100644 --- a/hal/src/main/native/cpp/jni/ConstantsJNI.cpp +++ b/hal/src/main/native/cpp/jni/ConstantsJNI.cpp @@ -7,19 +7,19 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_hal_ConstantsJNI.h" +#include "org_wpilib_hardware_hal_ConstantsJNI.h" #include "hal/Constants.h" using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_ConstantsJNI + * Class: org_wpilib_hardware_hal_ConstantsJNI * Method: getSystemClockTicksPerMicrosecond * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_ConstantsJNI_getSystemClockTicksPerMicrosecond +Java_org_wpilib_hardware_hal_ConstantsJNI_getSystemClockTicksPerMicrosecond (JNIEnv* env, jclass) { jint value = HAL_GetSystemClockTicksPerMicrosecond(); diff --git a/hal/src/main/native/cpp/jni/CounterJNI.cpp b/hal/src/main/native/cpp/jni/CounterJNI.cpp index 0349c70dfb..1f7b9f4e93 100644 --- a/hal/src/main/native/cpp/jni/CounterJNI.cpp +++ b/hal/src/main/native/cpp/jni/CounterJNI.cpp @@ -9,7 +9,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_hal_CounterJNI.h" +#include "org_wpilib_hardware_hal_CounterJNI.h" #include "hal/Counter.h" #include "hal/Errors.h" @@ -18,12 +18,12 @@ using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_CounterJNI + * Class: org_wpilib_hardware_hal_CounterJNI * Method: initializeCounter * Signature: (IZ)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_CounterJNI_initializeCounter +Java_org_wpilib_hardware_hal_CounterJNI_initializeCounter (JNIEnv* env, jclass, jint channel, jboolean risingEdge) { int32_t status = 0; @@ -35,12 +35,12 @@ Java_edu_wpi_first_hal_CounterJNI_initializeCounter } /* - * Class: edu_wpi_first_hal_CounterJNI + * Class: org_wpilib_hardware_hal_CounterJNI * Method: freeCounter * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_CounterJNI_freeCounter +Java_org_wpilib_hardware_hal_CounterJNI_freeCounter (JNIEnv* env, jclass, jint id) { if (id != HAL_kInvalidHandle) { @@ -49,12 +49,12 @@ Java_edu_wpi_first_hal_CounterJNI_freeCounter } /* - * Class: edu_wpi_first_hal_CounterJNI + * Class: org_wpilib_hardware_hal_CounterJNI * Method: setCounterEdgeConfiguration * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_CounterJNI_setCounterEdgeConfiguration +Java_org_wpilib_hardware_hal_CounterJNI_setCounterEdgeConfiguration (JNIEnv* env, jclass, jint id, jboolean valueRise) { int32_t status = 0; @@ -63,12 +63,12 @@ Java_edu_wpi_first_hal_CounterJNI_setCounterEdgeConfiguration } /* - * Class: edu_wpi_first_hal_CounterJNI + * Class: org_wpilib_hardware_hal_CounterJNI * Method: resetCounter * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_CounterJNI_resetCounter +Java_org_wpilib_hardware_hal_CounterJNI_resetCounter (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -77,12 +77,12 @@ Java_edu_wpi_first_hal_CounterJNI_resetCounter } /* - * Class: edu_wpi_first_hal_CounterJNI + * Class: org_wpilib_hardware_hal_CounterJNI * Method: getCounter * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_CounterJNI_getCounter +Java_org_wpilib_hardware_hal_CounterJNI_getCounter (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -92,12 +92,12 @@ Java_edu_wpi_first_hal_CounterJNI_getCounter } /* - * Class: edu_wpi_first_hal_CounterJNI + * Class: org_wpilib_hardware_hal_CounterJNI * Method: getCounterPeriod * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_CounterJNI_getCounterPeriod +Java_org_wpilib_hardware_hal_CounterJNI_getCounterPeriod (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -107,12 +107,12 @@ Java_edu_wpi_first_hal_CounterJNI_getCounterPeriod } /* - * Class: edu_wpi_first_hal_CounterJNI + * Class: org_wpilib_hardware_hal_CounterJNI * Method: setCounterMaxPeriod * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_CounterJNI_setCounterMaxPeriod +Java_org_wpilib_hardware_hal_CounterJNI_setCounterMaxPeriod (JNIEnv* env, jclass, jint id, jdouble value) { int32_t status = 0; @@ -121,12 +121,12 @@ Java_edu_wpi_first_hal_CounterJNI_setCounterMaxPeriod } /* - * Class: edu_wpi_first_hal_CounterJNI + * Class: org_wpilib_hardware_hal_CounterJNI * Method: getCounterStopped * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_CounterJNI_getCounterStopped +Java_org_wpilib_hardware_hal_CounterJNI_getCounterStopped (JNIEnv* env, jclass, jint id) { int32_t status = 0; diff --git a/hal/src/main/native/cpp/jni/DIOJNI.cpp b/hal/src/main/native/cpp/jni/DIOJNI.cpp index 36136f3d5f..5a2d78824e 100644 --- a/hal/src/main/native/cpp/jni/DIOJNI.cpp +++ b/hal/src/main/native/cpp/jni/DIOJNI.cpp @@ -9,7 +9,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_hal_DIOJNI.h" +#include "org_wpilib_hardware_hal_DIOJNI.h" #include "hal/DIO.h" #include "hal/PWM.h" #include "hal/Ports.h" @@ -20,12 +20,12 @@ using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_DIOJNI + * Class: org_wpilib_hardware_hal_DIOJNI * Method: initializeDIOPort * Signature: (IZ)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_DIOJNI_initializeDIOPort +Java_org_wpilib_hardware_hal_DIOJNI_initializeDIOPort (JNIEnv* env, jclass, jint channel, jboolean input) { int32_t status = 0; @@ -37,24 +37,24 @@ Java_edu_wpi_first_hal_DIOJNI_initializeDIOPort } /* - * Class: edu_wpi_first_hal_DIOJNI + * Class: org_wpilib_hardware_hal_DIOJNI * Method: checkDIOChannel * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_DIOJNI_checkDIOChannel +Java_org_wpilib_hardware_hal_DIOJNI_checkDIOChannel (JNIEnv* env, jclass, jint channel) { return HAL_CheckDIOChannel(channel); } /* - * Class: edu_wpi_first_hal_DIOJNI + * Class: org_wpilib_hardware_hal_DIOJNI * Method: freeDIOPort * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_DIOJNI_freeDIOPort +Java_org_wpilib_hardware_hal_DIOJNI_freeDIOPort (JNIEnv* env, jclass, jint id) { if (id != HAL_kInvalidHandle) { @@ -63,24 +63,24 @@ Java_edu_wpi_first_hal_DIOJNI_freeDIOPort } /* - * Class: edu_wpi_first_hal_DIOJNI + * Class: org_wpilib_hardware_hal_DIOJNI * Method: setDIOSimDevice * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_DIOJNI_setDIOSimDevice +Java_org_wpilib_hardware_hal_DIOJNI_setDIOSimDevice (JNIEnv* env, jclass, jint handle, jint device) { HAL_SetDIOSimDevice((HAL_DigitalHandle)handle, (HAL_SimDeviceHandle)device); } /* - * Class: edu_wpi_first_hal_DIOJNI + * Class: org_wpilib_hardware_hal_DIOJNI * Method: setDIO * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_DIOJNI_setDIO +Java_org_wpilib_hardware_hal_DIOJNI_setDIO (JNIEnv* env, jclass, jint id, jboolean value) { int32_t status = 0; @@ -89,12 +89,12 @@ Java_edu_wpi_first_hal_DIOJNI_setDIO } /* - * Class: edu_wpi_first_hal_DIOJNI + * Class: org_wpilib_hardware_hal_DIOJNI * Method: setDIODirection * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_DIOJNI_setDIODirection +Java_org_wpilib_hardware_hal_DIOJNI_setDIODirection (JNIEnv* env, jclass, jint id, jboolean input) { int32_t status = 0; @@ -103,12 +103,12 @@ Java_edu_wpi_first_hal_DIOJNI_setDIODirection } /* - * Class: edu_wpi_first_hal_DIOJNI + * Class: org_wpilib_hardware_hal_DIOJNI * Method: getDIO * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_DIOJNI_getDIO +Java_org_wpilib_hardware_hal_DIOJNI_getDIO (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -118,12 +118,12 @@ Java_edu_wpi_first_hal_DIOJNI_getDIO } /* - * Class: edu_wpi_first_hal_DIOJNI + * Class: org_wpilib_hardware_hal_DIOJNI * Method: getDIODirection * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_DIOJNI_getDIODirection +Java_org_wpilib_hardware_hal_DIOJNI_getDIODirection (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -133,12 +133,12 @@ Java_edu_wpi_first_hal_DIOJNI_getDIODirection } /* - * Class: edu_wpi_first_hal_DIOJNI + * Class: org_wpilib_hardware_hal_DIOJNI * Method: pulse * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_DIOJNI_pulse +Java_org_wpilib_hardware_hal_DIOJNI_pulse (JNIEnv* env, jclass, jint id, jdouble value) { int32_t status = 0; @@ -147,12 +147,12 @@ Java_edu_wpi_first_hal_DIOJNI_pulse } /* - * Class: edu_wpi_first_hal_DIOJNI + * Class: org_wpilib_hardware_hal_DIOJNI * Method: pulseMultiple * Signature: (JD)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_DIOJNI_pulseMultiple +Java_org_wpilib_hardware_hal_DIOJNI_pulseMultiple (JNIEnv* env, jclass, jlong channelMask, jdouble value) { int32_t status = 0; @@ -161,12 +161,12 @@ Java_edu_wpi_first_hal_DIOJNI_pulseMultiple } /* - * Class: edu_wpi_first_hal_DIOJNI + * Class: org_wpilib_hardware_hal_DIOJNI * Method: isPulsing * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_DIOJNI_isPulsing +Java_org_wpilib_hardware_hal_DIOJNI_isPulsing (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -176,12 +176,12 @@ Java_edu_wpi_first_hal_DIOJNI_isPulsing } /* - * Class: edu_wpi_first_hal_DIOJNI + * Class: org_wpilib_hardware_hal_DIOJNI * Method: isAnyPulsing * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_DIOJNI_isAnyPulsing +Java_org_wpilib_hardware_hal_DIOJNI_isAnyPulsing (JNIEnv* env, jclass) { int32_t status = 0; @@ -191,12 +191,12 @@ Java_edu_wpi_first_hal_DIOJNI_isAnyPulsing } /* - * Class: edu_wpi_first_hal_DIOJNI + * Class: org_wpilib_hardware_hal_DIOJNI * Method: allocateDigitalPWM * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_DIOJNI_allocateDigitalPWM +Java_org_wpilib_hardware_hal_DIOJNI_allocateDigitalPWM (JNIEnv* env, jclass) { int32_t status = 0; @@ -206,12 +206,12 @@ Java_edu_wpi_first_hal_DIOJNI_allocateDigitalPWM } /* - * Class: edu_wpi_first_hal_DIOJNI + * Class: org_wpilib_hardware_hal_DIOJNI * Method: freeDigitalPWM * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_DIOJNI_freeDigitalPWM +Java_org_wpilib_hardware_hal_DIOJNI_freeDigitalPWM (JNIEnv* env, jclass, jint id) { if (id != HAL_kInvalidHandle) { @@ -220,12 +220,12 @@ Java_edu_wpi_first_hal_DIOJNI_freeDigitalPWM } /* - * Class: edu_wpi_first_hal_DIOJNI + * Class: org_wpilib_hardware_hal_DIOJNI * Method: setDigitalPWMRate * Signature: (D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_DIOJNI_setDigitalPWMRate +Java_org_wpilib_hardware_hal_DIOJNI_setDigitalPWMRate (JNIEnv* env, jclass, jdouble value) { int32_t status = 0; @@ -234,12 +234,12 @@ Java_edu_wpi_first_hal_DIOJNI_setDigitalPWMRate } /* - * Class: edu_wpi_first_hal_DIOJNI + * Class: org_wpilib_hardware_hal_DIOJNI * Method: setDigitalPWMDutyCycle * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_DIOJNI_setDigitalPWMDutyCycle +Java_org_wpilib_hardware_hal_DIOJNI_setDigitalPWMDutyCycle (JNIEnv* env, jclass, jint id, jdouble value) { int32_t status = 0; @@ -248,12 +248,12 @@ Java_edu_wpi_first_hal_DIOJNI_setDigitalPWMDutyCycle } /* - * Class: edu_wpi_first_hal_DIOJNI + * Class: org_wpilib_hardware_hal_DIOJNI * Method: setDigitalPWMPPS * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_DIOJNI_setDigitalPWMPPS +Java_org_wpilib_hardware_hal_DIOJNI_setDigitalPWMPPS (JNIEnv* env, jclass, jint id, jdouble value) { int32_t status = 0; @@ -262,12 +262,12 @@ Java_edu_wpi_first_hal_DIOJNI_setDigitalPWMPPS } /* - * Class: edu_wpi_first_hal_DIOJNI + * Class: org_wpilib_hardware_hal_DIOJNI * Method: setDigitalPWMOutputChannel * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_DIOJNI_setDigitalPWMOutputChannel +Java_org_wpilib_hardware_hal_DIOJNI_setDigitalPWMOutputChannel (JNIEnv* env, jclass, jint id, jint value) { int32_t status = 0; diff --git a/hal/src/main/native/cpp/jni/DriverStationJNI.cpp b/hal/src/main/native/cpp/jni/DriverStationJNI.cpp index dbbfde76fc..758a7cfe08 100644 --- a/hal/src/main/native/cpp/jni/DriverStationJNI.cpp +++ b/hal/src/main/native/cpp/jni/DriverStationJNI.cpp @@ -10,30 +10,30 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_hal_DriverStationJNI.h" +#include "org_wpilib_hardware_hal_DriverStationJNI.h" #include "hal/DriverStation.h" #include "hal/HALBase.h" -static_assert(edu_wpi_first_hal_DriverStationJNI_kUnknownAllianceStation == +static_assert(org_wpilib_hardware_hal_DriverStationJNI_kUnknownAllianceStation == HAL_AllianceStationID_kUnknown); -static_assert(edu_wpi_first_hal_DriverStationJNI_kRed1AllianceStation == +static_assert(org_wpilib_hardware_hal_DriverStationJNI_kRed1AllianceStation == HAL_AllianceStationID_kRed1); -static_assert(edu_wpi_first_hal_DriverStationJNI_kRed2AllianceStation == +static_assert(org_wpilib_hardware_hal_DriverStationJNI_kRed2AllianceStation == HAL_AllianceStationID_kRed2); -static_assert(edu_wpi_first_hal_DriverStationJNI_kRed3AllianceStation == +static_assert(org_wpilib_hardware_hal_DriverStationJNI_kRed3AllianceStation == HAL_AllianceStationID_kRed3); -static_assert(edu_wpi_first_hal_DriverStationJNI_kBlue1AllianceStation == +static_assert(org_wpilib_hardware_hal_DriverStationJNI_kBlue1AllianceStation == HAL_AllianceStationID_kBlue1); -static_assert(edu_wpi_first_hal_DriverStationJNI_kBlue2AllianceStation == +static_assert(org_wpilib_hardware_hal_DriverStationJNI_kBlue2AllianceStation == HAL_AllianceStationID_kBlue2); -static_assert(edu_wpi_first_hal_DriverStationJNI_kBlue3AllianceStation == +static_assert(org_wpilib_hardware_hal_DriverStationJNI_kBlue3AllianceStation == HAL_AllianceStationID_kBlue3); -static_assert(edu_wpi_first_hal_DriverStationJNI_kMaxJoystickAxes == +static_assert(org_wpilib_hardware_hal_DriverStationJNI_kMaxJoystickAxes == HAL_kMaxJoystickAxes); -static_assert(edu_wpi_first_hal_DriverStationJNI_kMaxJoystickPOVs == +static_assert(org_wpilib_hardware_hal_DriverStationJNI_kMaxJoystickPOVs == HAL_kMaxJoystickPOVs); -static_assert(edu_wpi_first_hal_DriverStationJNI_kMaxJoysticks == +static_assert(org_wpilib_hardware_hal_DriverStationJNI_kMaxJoysticks == HAL_kMaxJoysticks); using namespace hal; @@ -42,72 +42,72 @@ using namespace wpi::java; extern "C" { /* - * Class: edu_wpi_first_hal_DriverStationJNI + * Class: org_wpilib_hardware_hal_DriverStationJNI * Method: observeUserProgramStarting * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_DriverStationJNI_observeUserProgramStarting +Java_org_wpilib_hardware_hal_DriverStationJNI_observeUserProgramStarting (JNIEnv*, jclass) { HAL_ObserveUserProgramStarting(); } /* - * Class: edu_wpi_first_hal_DriverStationJNI + * Class: org_wpilib_hardware_hal_DriverStationJNI * Method: observeUserProgramDisabled * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_DriverStationJNI_observeUserProgramDisabled +Java_org_wpilib_hardware_hal_DriverStationJNI_observeUserProgramDisabled (JNIEnv*, jclass) { HAL_ObserveUserProgramDisabled(); } /* - * Class: edu_wpi_first_hal_DriverStationJNI + * Class: org_wpilib_hardware_hal_DriverStationJNI * Method: observeUserProgramAutonomous * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_DriverStationJNI_observeUserProgramAutonomous +Java_org_wpilib_hardware_hal_DriverStationJNI_observeUserProgramAutonomous (JNIEnv*, jclass) { HAL_ObserveUserProgramAutonomous(); } /* - * Class: edu_wpi_first_hal_DriverStationJNI + * Class: org_wpilib_hardware_hal_DriverStationJNI * Method: observeUserProgramTeleop * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_DriverStationJNI_observeUserProgramTeleop +Java_org_wpilib_hardware_hal_DriverStationJNI_observeUserProgramTeleop (JNIEnv*, jclass) { HAL_ObserveUserProgramTeleop(); } /* - * Class: edu_wpi_first_hal_DriverStationJNI + * Class: org_wpilib_hardware_hal_DriverStationJNI * Method: observeUserProgramTest * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_DriverStationJNI_observeUserProgramTest +Java_org_wpilib_hardware_hal_DriverStationJNI_observeUserProgramTest (JNIEnv*, jclass) { HAL_ObserveUserProgramTest(); } /* - * Class: edu_wpi_first_hal_DriverStationJNI + * Class: org_wpilib_hardware_hal_DriverStationJNI * Method: nativeGetControlWord * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_DriverStationJNI_nativeGetControlWord +Java_org_wpilib_hardware_hal_DriverStationJNI_nativeGetControlWord (JNIEnv*, jclass) { static_assert(sizeof(HAL_ControlWord) == sizeof(jint), @@ -120,12 +120,12 @@ Java_edu_wpi_first_hal_DriverStationJNI_nativeGetControlWord } /* - * Class: edu_wpi_first_hal_DriverStationJNI + * Class: org_wpilib_hardware_hal_DriverStationJNI * Method: nativeGetAllianceStation * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_DriverStationJNI_nativeGetAllianceStation +Java_org_wpilib_hardware_hal_DriverStationJNI_nativeGetAllianceStation (JNIEnv*, jclass) { int32_t status = 0; @@ -134,12 +134,12 @@ Java_edu_wpi_first_hal_DriverStationJNI_nativeGetAllianceStation } /* - * Class: edu_wpi_first_hal_DriverStationJNI + * Class: org_wpilib_hardware_hal_DriverStationJNI * Method: getAllJoystickData * Signature: (I[F[S[B[J)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_DriverStationJNI_getAllJoystickData +Java_org_wpilib_hardware_hal_DriverStationJNI_getAllJoystickData (JNIEnv* env, jclass cls, jint stick, jfloatArray axesArray, jshortArray rawAxesArray, jbyteArray povsArray, jlongArray buttonsAndMetadataArray) @@ -169,48 +169,48 @@ Java_edu_wpi_first_hal_DriverStationJNI_getAllJoystickData } /* - * Class: edu_wpi_first_hal_DriverStationJNI + * Class: org_wpilib_hardware_hal_DriverStationJNI * Method: setJoystickOutputs * Signature: (BIII)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_DriverStationJNI_setJoystickOutputs +Java_org_wpilib_hardware_hal_DriverStationJNI_setJoystickOutputs (JNIEnv*, jclass, jbyte port, jint outputs, jint leftRumble, jint rightRumble) { return HAL_SetJoystickOutputs(port, outputs, leftRumble, rightRumble); } /* - * Class: edu_wpi_first_hal_DriverStationJNI + * Class: org_wpilib_hardware_hal_DriverStationJNI * Method: getJoystickIsGamepad * Signature: (B)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_DriverStationJNI_getJoystickIsGamepad +Java_org_wpilib_hardware_hal_DriverStationJNI_getJoystickIsGamepad (JNIEnv*, jclass, jbyte port) { return HAL_GetJoystickIsGamepad(port); } /* - * Class: edu_wpi_first_hal_DriverStationJNI + * Class: org_wpilib_hardware_hal_DriverStationJNI * Method: getJoystickType * Signature: (B)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_DriverStationJNI_getJoystickType +Java_org_wpilib_hardware_hal_DriverStationJNI_getJoystickType (JNIEnv*, jclass, jbyte port) { return HAL_GetJoystickType(port); } /* - * Class: edu_wpi_first_hal_DriverStationJNI + * Class: org_wpilib_hardware_hal_DriverStationJNI * Method: getJoystickName * Signature: (B)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_hal_DriverStationJNI_getJoystickName +Java_org_wpilib_hardware_hal_DriverStationJNI_getJoystickName (JNIEnv* env, jclass, jbyte port) { WPI_String joystickName; @@ -221,12 +221,12 @@ Java_edu_wpi_first_hal_DriverStationJNI_getJoystickName } /* - * Class: edu_wpi_first_hal_DriverStationJNI + * Class: org_wpilib_hardware_hal_DriverStationJNI * Method: getMatchTime * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_DriverStationJNI_getMatchTime +Java_org_wpilib_hardware_hal_DriverStationJNI_getMatchTime (JNIEnv* env, jclass) { int32_t status = 0; @@ -234,12 +234,12 @@ Java_edu_wpi_first_hal_DriverStationJNI_getMatchTime } /* - * Class: edu_wpi_first_hal_DriverStationJNI + * Class: org_wpilib_hardware_hal_DriverStationJNI * Method: getMatchInfo * Signature: (Ljava/lang/Object;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_DriverStationJNI_getMatchInfo +Java_org_wpilib_hardware_hal_DriverStationJNI_getMatchInfo (JNIEnv* env, jclass, jobject info) { HAL_MatchInfo matchInfo; @@ -251,12 +251,12 @@ Java_edu_wpi_first_hal_DriverStationJNI_getMatchInfo } /* - * Class: edu_wpi_first_hal_DriverStationJNI + * Class: org_wpilib_hardware_hal_DriverStationJNI * Method: sendError * Signature: (ZIZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_DriverStationJNI_sendError +Java_org_wpilib_hardware_hal_DriverStationJNI_sendError (JNIEnv* env, jclass, jboolean isError, jint errorCode, jboolean isLVCode, jstring details, jstring location, jstring callStack, jboolean printMsg) { @@ -271,12 +271,12 @@ Java_edu_wpi_first_hal_DriverStationJNI_sendError } /* - * Class: edu_wpi_first_hal_DriverStationJNI + * Class: org_wpilib_hardware_hal_DriverStationJNI * Method: sendConsoleLine * Signature: (Ljava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_DriverStationJNI_sendConsoleLine +Java_org_wpilib_hardware_hal_DriverStationJNI_sendConsoleLine (JNIEnv* env, jclass, jstring line) { JStringRef lineStr{env, line}; @@ -286,48 +286,48 @@ Java_edu_wpi_first_hal_DriverStationJNI_sendConsoleLine } /* - * Class: edu_wpi_first_hal_DriverStationJNI + * Class: org_wpilib_hardware_hal_DriverStationJNI * Method: refreshDSData * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_DriverStationJNI_refreshDSData +Java_org_wpilib_hardware_hal_DriverStationJNI_refreshDSData (JNIEnv*, jclass) { return HAL_RefreshDSData(); } /* - * Class: edu_wpi_first_hal_DriverStationJNI + * Class: org_wpilib_hardware_hal_DriverStationJNI * Method: provideNewDataEventHandle * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_DriverStationJNI_provideNewDataEventHandle +Java_org_wpilib_hardware_hal_DriverStationJNI_provideNewDataEventHandle (JNIEnv*, jclass, jint handle) { HAL_ProvideNewDataEventHandle(handle); } /* - * Class: edu_wpi_first_hal_DriverStationJNI + * Class: org_wpilib_hardware_hal_DriverStationJNI * Method: removeNewDataEventHandle * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_DriverStationJNI_removeNewDataEventHandle +Java_org_wpilib_hardware_hal_DriverStationJNI_removeNewDataEventHandle (JNIEnv*, jclass, jint handle) { HAL_RemoveNewDataEventHandle(handle); } /* - * Class: edu_wpi_first_hal_DriverStationJNI + * Class: org_wpilib_hardware_hal_DriverStationJNI * Method: getOutputsActive * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_DriverStationJNI_getOutputsActive +Java_org_wpilib_hardware_hal_DriverStationJNI_getOutputsActive (JNIEnv*, jclass) { return HAL_GetOutputsEnabled(); diff --git a/hal/src/main/native/cpp/jni/DutyCycleJNI.cpp b/hal/src/main/native/cpp/jni/DutyCycleJNI.cpp index dbbfa0ac82..0556b55ac6 100644 --- a/hal/src/main/native/cpp/jni/DutyCycleJNI.cpp +++ b/hal/src/main/native/cpp/jni/DutyCycleJNI.cpp @@ -7,19 +7,19 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_hal_DutyCycleJNI.h" +#include "org_wpilib_hardware_hal_DutyCycleJNI.h" #include "hal/DutyCycle.h" using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_DutyCycleJNI + * Class: org_wpilib_hardware_hal_DutyCycleJNI * Method: initialize * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_DutyCycleJNI_initialize +Java_org_wpilib_hardware_hal_DutyCycleJNI_initialize (JNIEnv* env, jclass, jint channel) { int32_t status = 0; @@ -30,12 +30,12 @@ Java_edu_wpi_first_hal_DutyCycleJNI_initialize } /* - * Class: edu_wpi_first_hal_DutyCycleJNI + * Class: org_wpilib_hardware_hal_DutyCycleJNI * Method: free * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_DutyCycleJNI_free +Java_org_wpilib_hardware_hal_DutyCycleJNI_free (JNIEnv*, jclass, jint handle) { if (handle != HAL_kInvalidHandle) { @@ -44,12 +44,12 @@ Java_edu_wpi_first_hal_DutyCycleJNI_free } /* - * Class: edu_wpi_first_hal_DutyCycleJNI + * Class: org_wpilib_hardware_hal_DutyCycleJNI * Method: getFrequency * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_DutyCycleJNI_getFrequency +Java_org_wpilib_hardware_hal_DutyCycleJNI_getFrequency (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -60,12 +60,12 @@ Java_edu_wpi_first_hal_DutyCycleJNI_getFrequency } /* - * Class: edu_wpi_first_hal_DutyCycleJNI + * Class: org_wpilib_hardware_hal_DutyCycleJNI * Method: getOutput * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_DutyCycleJNI_getOutput +Java_org_wpilib_hardware_hal_DutyCycleJNI_getOutput (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -76,12 +76,12 @@ Java_edu_wpi_first_hal_DutyCycleJNI_getOutput } /* - * Class: edu_wpi_first_hal_DutyCycleJNI + * Class: org_wpilib_hardware_hal_DutyCycleJNI * Method: getHighTime * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_DutyCycleJNI_getHighTime +Java_org_wpilib_hardware_hal_DutyCycleJNI_getHighTime (JNIEnv* env, jclass, jint handle) { int32_t status = 0; diff --git a/hal/src/main/native/cpp/jni/EncoderJNI.cpp b/hal/src/main/native/cpp/jni/EncoderJNI.cpp index 50845e8ee3..0bab7b8907 100644 --- a/hal/src/main/native/cpp/jni/EncoderJNI.cpp +++ b/hal/src/main/native/cpp/jni/EncoderJNI.cpp @@ -7,7 +7,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_hal_EncoderJNI.h" +#include "org_wpilib_hardware_hal_EncoderJNI.h" #include "hal/Encoder.h" #include "hal/Errors.h" @@ -16,12 +16,12 @@ using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_EncoderJNI + * Class: org_wpilib_hardware_hal_EncoderJNI * Method: initializeEncoder * Signature: (IIZI)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_EncoderJNI_initializeEncoder +Java_org_wpilib_hardware_hal_EncoderJNI_initializeEncoder (JNIEnv* env, jclass, jint aChannel, jint bChannel, jboolean reverseDirection, jint encodingType) { @@ -34,12 +34,12 @@ Java_edu_wpi_first_hal_EncoderJNI_initializeEncoder } /* - * Class: edu_wpi_first_hal_EncoderJNI + * Class: org_wpilib_hardware_hal_EncoderJNI * Method: freeEncoder * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_EncoderJNI_freeEncoder +Java_org_wpilib_hardware_hal_EncoderJNI_freeEncoder (JNIEnv* env, jclass, jint id) { if (id != HAL_kInvalidHandle) { @@ -48,12 +48,12 @@ Java_edu_wpi_first_hal_EncoderJNI_freeEncoder } /* - * Class: edu_wpi_first_hal_EncoderJNI + * Class: org_wpilib_hardware_hal_EncoderJNI * Method: setEncoderSimDevice * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_EncoderJNI_setEncoderSimDevice +Java_org_wpilib_hardware_hal_EncoderJNI_setEncoderSimDevice (JNIEnv* env, jclass, jint handle, jint device) { HAL_SetEncoderSimDevice((HAL_EncoderHandle)handle, @@ -61,12 +61,12 @@ Java_edu_wpi_first_hal_EncoderJNI_setEncoderSimDevice } /* - * Class: edu_wpi_first_hal_EncoderJNI + * Class: org_wpilib_hardware_hal_EncoderJNI * Method: getEncoder * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_EncoderJNI_getEncoder +Java_org_wpilib_hardware_hal_EncoderJNI_getEncoder (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -76,12 +76,12 @@ Java_edu_wpi_first_hal_EncoderJNI_getEncoder } /* - * Class: edu_wpi_first_hal_EncoderJNI + * Class: org_wpilib_hardware_hal_EncoderJNI * Method: getEncoderRaw * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_EncoderJNI_getEncoderRaw +Java_org_wpilib_hardware_hal_EncoderJNI_getEncoderRaw (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -91,12 +91,12 @@ Java_edu_wpi_first_hal_EncoderJNI_getEncoderRaw } /* - * Class: edu_wpi_first_hal_EncoderJNI + * Class: org_wpilib_hardware_hal_EncoderJNI * Method: getEncodingScaleFactor * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_EncoderJNI_getEncodingScaleFactor +Java_org_wpilib_hardware_hal_EncoderJNI_getEncodingScaleFactor (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -107,12 +107,12 @@ Java_edu_wpi_first_hal_EncoderJNI_getEncodingScaleFactor } /* - * Class: edu_wpi_first_hal_EncoderJNI + * Class: org_wpilib_hardware_hal_EncoderJNI * Method: resetEncoder * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_EncoderJNI_resetEncoder +Java_org_wpilib_hardware_hal_EncoderJNI_resetEncoder (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -121,12 +121,12 @@ Java_edu_wpi_first_hal_EncoderJNI_resetEncoder } /* - * Class: edu_wpi_first_hal_EncoderJNI + * Class: org_wpilib_hardware_hal_EncoderJNI * Method: getEncoderPeriod * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_EncoderJNI_getEncoderPeriod +Java_org_wpilib_hardware_hal_EncoderJNI_getEncoderPeriod (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -136,12 +136,12 @@ Java_edu_wpi_first_hal_EncoderJNI_getEncoderPeriod } /* - * Class: edu_wpi_first_hal_EncoderJNI + * Class: org_wpilib_hardware_hal_EncoderJNI * Method: setEncoderMaxPeriod * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_EncoderJNI_setEncoderMaxPeriod +Java_org_wpilib_hardware_hal_EncoderJNI_setEncoderMaxPeriod (JNIEnv* env, jclass, jint id, jdouble value) { int32_t status = 0; @@ -150,12 +150,12 @@ Java_edu_wpi_first_hal_EncoderJNI_setEncoderMaxPeriod } /* - * Class: edu_wpi_first_hal_EncoderJNI + * Class: org_wpilib_hardware_hal_EncoderJNI * Method: getEncoderStopped * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_EncoderJNI_getEncoderStopped +Java_org_wpilib_hardware_hal_EncoderJNI_getEncoderStopped (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -165,12 +165,12 @@ Java_edu_wpi_first_hal_EncoderJNI_getEncoderStopped } /* - * Class: edu_wpi_first_hal_EncoderJNI + * Class: org_wpilib_hardware_hal_EncoderJNI * Method: getEncoderDirection * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_EncoderJNI_getEncoderDirection +Java_org_wpilib_hardware_hal_EncoderJNI_getEncoderDirection (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -181,12 +181,12 @@ Java_edu_wpi_first_hal_EncoderJNI_getEncoderDirection } /* - * Class: edu_wpi_first_hal_EncoderJNI + * Class: org_wpilib_hardware_hal_EncoderJNI * Method: getEncoderDistance * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_EncoderJNI_getEncoderDistance +Java_org_wpilib_hardware_hal_EncoderJNI_getEncoderDistance (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -196,12 +196,12 @@ Java_edu_wpi_first_hal_EncoderJNI_getEncoderDistance } /* - * Class: edu_wpi_first_hal_EncoderJNI + * Class: org_wpilib_hardware_hal_EncoderJNI * Method: getEncoderRate * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_EncoderJNI_getEncoderRate +Java_org_wpilib_hardware_hal_EncoderJNI_getEncoderRate (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -211,12 +211,12 @@ Java_edu_wpi_first_hal_EncoderJNI_getEncoderRate } /* - * Class: edu_wpi_first_hal_EncoderJNI + * Class: org_wpilib_hardware_hal_EncoderJNI * Method: setEncoderMinRate * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_EncoderJNI_setEncoderMinRate +Java_org_wpilib_hardware_hal_EncoderJNI_setEncoderMinRate (JNIEnv* env, jclass, jint id, jdouble value) { int32_t status = 0; @@ -225,12 +225,12 @@ Java_edu_wpi_first_hal_EncoderJNI_setEncoderMinRate } /* - * Class: edu_wpi_first_hal_EncoderJNI + * Class: org_wpilib_hardware_hal_EncoderJNI * Method: setEncoderDistancePerPulse * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_EncoderJNI_setEncoderDistancePerPulse +Java_org_wpilib_hardware_hal_EncoderJNI_setEncoderDistancePerPulse (JNIEnv* env, jclass, jint id, jdouble value) { int32_t status = 0; @@ -239,12 +239,12 @@ Java_edu_wpi_first_hal_EncoderJNI_setEncoderDistancePerPulse } /* - * Class: edu_wpi_first_hal_EncoderJNI + * Class: org_wpilib_hardware_hal_EncoderJNI * Method: setEncoderReverseDirection * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_EncoderJNI_setEncoderReverseDirection +Java_org_wpilib_hardware_hal_EncoderJNI_setEncoderReverseDirection (JNIEnv* env, jclass, jint id, jboolean value) { int32_t status = 0; @@ -253,12 +253,12 @@ Java_edu_wpi_first_hal_EncoderJNI_setEncoderReverseDirection } /* - * Class: edu_wpi_first_hal_EncoderJNI + * Class: org_wpilib_hardware_hal_EncoderJNI * Method: setEncoderSamplesToAverage * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_EncoderJNI_setEncoderSamplesToAverage +Java_org_wpilib_hardware_hal_EncoderJNI_setEncoderSamplesToAverage (JNIEnv* env, jclass, jint id, jint value) { int32_t status = 0; @@ -267,12 +267,12 @@ Java_edu_wpi_first_hal_EncoderJNI_setEncoderSamplesToAverage } /* - * Class: edu_wpi_first_hal_EncoderJNI + * Class: org_wpilib_hardware_hal_EncoderJNI * Method: getEncoderSamplesToAverage * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_EncoderJNI_getEncoderSamplesToAverage +Java_org_wpilib_hardware_hal_EncoderJNI_getEncoderSamplesToAverage (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -283,12 +283,12 @@ Java_edu_wpi_first_hal_EncoderJNI_getEncoderSamplesToAverage } /* - * Class: edu_wpi_first_hal_EncoderJNI + * Class: org_wpilib_hardware_hal_EncoderJNI * Method: getEncoderFPGAIndex * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_EncoderJNI_getEncoderFPGAIndex +Java_org_wpilib_hardware_hal_EncoderJNI_getEncoderFPGAIndex (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -298,12 +298,12 @@ Java_edu_wpi_first_hal_EncoderJNI_getEncoderFPGAIndex } /* - * Class: edu_wpi_first_hal_EncoderJNI + * Class: org_wpilib_hardware_hal_EncoderJNI * Method: getEncoderEncodingScale * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_EncoderJNI_getEncoderEncodingScale +Java_org_wpilib_hardware_hal_EncoderJNI_getEncoderEncodingScale (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -314,12 +314,12 @@ Java_edu_wpi_first_hal_EncoderJNI_getEncoderEncodingScale } /* - * Class: edu_wpi_first_hal_EncoderJNI + * Class: org_wpilib_hardware_hal_EncoderJNI * Method: getEncoderDecodingScaleFactor * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_EncoderJNI_getEncoderDecodingScaleFactor +Java_org_wpilib_hardware_hal_EncoderJNI_getEncoderDecodingScaleFactor (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -330,12 +330,12 @@ Java_edu_wpi_first_hal_EncoderJNI_getEncoderDecodingScaleFactor } /* - * Class: edu_wpi_first_hal_EncoderJNI + * Class: org_wpilib_hardware_hal_EncoderJNI * Method: getEncoderDistancePerPulse * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_EncoderJNI_getEncoderDistancePerPulse +Java_org_wpilib_hardware_hal_EncoderJNI_getEncoderDistancePerPulse (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -346,12 +346,12 @@ Java_edu_wpi_first_hal_EncoderJNI_getEncoderDistancePerPulse } /* - * Class: edu_wpi_first_hal_EncoderJNI + * Class: org_wpilib_hardware_hal_EncoderJNI * Method: getEncoderEncodingType * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_EncoderJNI_getEncoderEncodingType +Java_org_wpilib_hardware_hal_EncoderJNI_getEncoderEncodingType (JNIEnv* env, jclass, jint id) { int32_t status = 0; diff --git a/hal/src/main/native/cpp/jni/HAL.cpp b/hal/src/main/native/cpp/jni/HAL.cpp index f4ee086457..27f5162f67 100644 --- a/hal/src/main/native/cpp/jni/HAL.cpp +++ b/hal/src/main/native/cpp/jni/HAL.cpp @@ -17,7 +17,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_hal_HAL.h" +#include "org_wpilib_hardware_hal_HAL.h" #include "hal/DriverStation.h" #include "hal/Main.h" @@ -27,72 +27,72 @@ using namespace wpi::java; extern "C" { /* - * Class: edu_wpi_first_hal_HAL + * Class: org_wpilib_hardware_hal_HAL * Method: initialize * Signature: (II)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_HAL_initialize +Java_org_wpilib_hardware_hal_HAL_initialize (JNIEnv*, jclass, jint timeout, jint mode) { return HAL_Initialize(timeout, mode); } /* - * Class: edu_wpi_first_hal_HAL + * Class: org_wpilib_hardware_hal_HAL * Method: shutdown * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_HAL_shutdown +Java_org_wpilib_hardware_hal_HAL_shutdown (JNIEnv*, jclass) { return HAL_Shutdown(); } /* - * Class: edu_wpi_first_hal_HAL + * Class: org_wpilib_hardware_hal_HAL * Method: hasMain * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_HAL_hasMain +Java_org_wpilib_hardware_hal_HAL_hasMain (JNIEnv*, jclass) { return HAL_HasMain(); } /* - * Class: edu_wpi_first_hal_HAL + * Class: org_wpilib_hardware_hal_HAL * Method: runMain * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_HAL_runMain +Java_org_wpilib_hardware_hal_HAL_runMain (JNIEnv*, jclass) { HAL_RunMain(); } /* - * Class: edu_wpi_first_hal_HAL + * Class: org_wpilib_hardware_hal_HAL * Method: exitMain * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_HAL_exitMain +Java_org_wpilib_hardware_hal_HAL_exitMain (JNIEnv*, jclass) { HAL_ExitMain(); } /* - * Class: edu_wpi_first_hal_HAL + * Class: org_wpilib_hardware_hal_HAL * Method: terminate * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_HAL_terminate +Java_org_wpilib_hardware_hal_HAL_terminate (JNIEnv*, jclass) { #ifdef __FRC_SYSTEMCORE__ @@ -101,36 +101,36 @@ Java_edu_wpi_first_hal_HAL_terminate } /* - * Class: edu_wpi_first_hal_HAL + * Class: org_wpilib_hardware_hal_HAL * Method: simPeriodicBeforeNative * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_HAL_simPeriodicBeforeNative +Java_org_wpilib_hardware_hal_HAL_simPeriodicBeforeNative (JNIEnv*, jclass) { HAL_SimPeriodicBefore(); } /* - * Class: edu_wpi_first_hal_HAL + * Class: org_wpilib_hardware_hal_HAL * Method: simPeriodicAfterNative * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_HAL_simPeriodicAfterNative +Java_org_wpilib_hardware_hal_HAL_simPeriodicAfterNative (JNIEnv*, jclass) { HAL_SimPeriodicAfter(); } /* - * Class: edu_wpi_first_hal_HAL + * Class: org_wpilib_hardware_hal_HAL * Method: getSystemActive * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_HAL_getSystemActive +Java_org_wpilib_hardware_hal_HAL_getSystemActive (JNIEnv* env, jclass) { int32_t status = 0; @@ -140,12 +140,12 @@ Java_edu_wpi_first_hal_HAL_getSystemActive } /* - * Class: edu_wpi_first_hal_HAL + * Class: org_wpilib_hardware_hal_HAL * Method: getBrownedOut * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_HAL_getBrownedOut +Java_org_wpilib_hardware_hal_HAL_getBrownedOut (JNIEnv* env, jclass) { int32_t status = 0; @@ -155,12 +155,12 @@ Java_edu_wpi_first_hal_HAL_getBrownedOut } /* - * Class: edu_wpi_first_hal_HAL + * Class: org_wpilib_hardware_hal_HAL * Method: getCommsDisableCount * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_HAL_getCommsDisableCount +Java_org_wpilib_hardware_hal_HAL_getCommsDisableCount (JNIEnv* env, jclass) { int32_t status = 0; @@ -170,12 +170,12 @@ Java_edu_wpi_first_hal_HAL_getCommsDisableCount } /* - * Class: edu_wpi_first_hal_HAL + * Class: org_wpilib_hardware_hal_HAL * Method: getRSLState * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_HAL_getRSLState +Java_org_wpilib_hardware_hal_HAL_getRSLState (JNIEnv* env, jclass) { int32_t status = 0; @@ -185,12 +185,12 @@ Java_edu_wpi_first_hal_HAL_getRSLState } /* - * Class: edu_wpi_first_hal_HAL + * Class: org_wpilib_hardware_hal_HAL * Method: getSystemTimeValid * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_HAL_getSystemTimeValid +Java_org_wpilib_hardware_hal_HAL_getSystemTimeValid (JNIEnv* env, jclass) { int32_t status = 0; diff --git a/hal/src/main/native/cpp/jni/HALUtil.cpp b/hal/src/main/native/cpp/jni/HALUtil.cpp index 16166887a6..57c6fe5f39 100644 --- a/hal/src/main/native/cpp/jni/HALUtil.cpp +++ b/hal/src/main/native/cpp/jni/HALUtil.cpp @@ -15,7 +15,7 @@ #include #include -#include "edu_wpi_first_hal_HALUtil.h" +#include "org_wpilib_hardware_hal_HALUtil.h" #include "hal/CAN.h" #include "hal/DriverStation.h" #include "hal/Errors.h" @@ -30,12 +30,12 @@ using namespace wpi::java; #define kRIOStatusFeatureNotSupported (kRioStatusOffset - 193) #define kRIOStatusResourceNotInitialized -52010 -static_assert(edu_wpi_first_hal_HALUtil_RUNTIME_ROBORIO == HAL_Runtime_RoboRIO); -static_assert(edu_wpi_first_hal_HALUtil_RUNTIME_ROBORIO2 == +static_assert(org_wpilib_hardware_hal_HALUtil_RUNTIME_ROBORIO == HAL_Runtime_RoboRIO); +static_assert(org_wpilib_hardware_hal_HALUtil_RUNTIME_ROBORIO2 == HAL_Runtime_RoboRIO2); -static_assert(edu_wpi_first_hal_HALUtil_RUNTIME_SIMULATION == +static_assert(org_wpilib_hardware_hal_HALUtil_RUNTIME_SIMULATION == HAL_Runtime_Simulation); -static_assert(edu_wpi_first_hal_HALUtil_RUNTIME_SYSTEMCORE == +static_assert(org_wpilib_hardware_hal_HALUtil_RUNTIME_SYSTEMCORE == HAL_Runtime_SystemCore); static JavaVM* jvm = nullptr; @@ -56,24 +56,24 @@ static JClass revPHVersionCls; static JClass canStreamOverflowExCls; static const JClassInit classes[] = { - {"edu/wpi/first/hal/PowerDistributionVersion", + {"org/wpilib/hardware/hal/PowerDistributionVersion", &powerDistributionVersionCls}, - {"edu/wpi/first/hal/can/CANStatus", &canStatusCls}, - {"edu/wpi/first/hal/MatchInfoData", &matchInfoDataCls}, - {"edu/wpi/first/hal/can/CANReceiveMessage", &canReceiveMessageCls}, - {"edu/wpi/first/hal/can/CANStreamMessage", &canStreamMessageCls}, - {"edu/wpi/first/hal/HALValue", &halValueCls}, - {"edu/wpi/first/hal/REVPHVersion", &revPHVersionCls}, - {"edu/wpi/first/hal/can/CANStreamOverflowException", + {"org/wpilib/hardware/hal/can/CANStatus", &canStatusCls}, + {"org/wpilib/hardware/hal/MatchInfoData", &matchInfoDataCls}, + {"org/wpilib/hardware/hal/can/CANReceiveMessage", &canReceiveMessageCls}, + {"org/wpilib/hardware/hal/can/CANStreamMessage", &canStreamMessageCls}, + {"org/wpilib/hardware/hal/HALValue", &halValueCls}, + {"org/wpilib/hardware/hal/REVPHVersion", &revPHVersionCls}, + {"org/wpilib/hardware/hal/can/CANStreamOverflowException", &canStreamOverflowExCls}}; static const JExceptionInit exceptions[] = { {"java/lang/IllegalArgumentException", &illegalArgExCls}, {"java/lang/IndexOutOfBoundsException", &indexOobExCls}, - {"edu/wpi/first/hal/util/BoundaryException", &boundaryExCls}, - {"edu/wpi/first/hal/util/AllocationException", &allocationExCls}, - {"edu/wpi/first/hal/util/HalHandleException", &halHandleExCls}, - {"edu/wpi/first/hal/util/UncleanStatusException", &uncleanStatusExCls}, + {"org/wpilib/hardware/hal/util/BoundaryException", &boundaryExCls}, + {"org/wpilib/hardware/hal/util/AllocationException", &allocationExCls}, + {"org/wpilib/hardware/hal/util/HalHandleException", &halHandleExCls}, + {"org/wpilib/hardware/hal/util/UncleanStatusException", &uncleanStatusExCls}, {"java/lang/NullPointerException", &nullPointerEx}}; namespace hal { @@ -151,7 +151,7 @@ void ThrowCANStreamOverflowException(JNIEnv* env, jobjectArray messages, jint length) { static jmethodID constructor = env->GetMethodID(canStreamOverflowExCls, "", - "([Ledu/wpi/first/hal/CANStreamMessage;I)V"); + "([Lorg/wpilib/hardware/hal/CANStreamMessage;I)V"); jobject exception = env->NewObject(canStreamOverflowExCls, constructor, messages, length); env->Throw(static_cast(exception)); @@ -254,7 +254,7 @@ jbyteArray SetCANStreamObject(JNIEnv* env, jobject canStreamData, jobject CreateHALValue(JNIEnv* env, const HAL_Value& value) { static jmethodID fromNative = env->GetStaticMethodID( - halValueCls, "fromNative", "(IJD)Ledu/wpi/first/hal/HALValue;"); + halValueCls, "fromNative", "(IJD)Lorg/wpilib/hardware/hal/HALValue;"); jlong value1 = 0; jdouble value2 = 0.0; switch (value.type) { @@ -363,12 +363,12 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM* vm, void* reserved) { } /* - * Class: edu_wpi_first_hal_HALUtil + * Class: org_wpilib_hardware_hal_HALUtil * Method: getSerialNumber * Signature: ()Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_hal_HALUtil_getSerialNumber +Java_org_wpilib_hardware_hal_HALUtil_getSerialNumber (JNIEnv* env, jclass) { WPI_String serialNum; @@ -379,12 +379,12 @@ Java_edu_wpi_first_hal_HALUtil_getSerialNumber } /* - * Class: edu_wpi_first_hal_HALUtil + * Class: org_wpilib_hardware_hal_HALUtil * Method: getComments * Signature: ()Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_hal_HALUtil_getComments +Java_org_wpilib_hardware_hal_HALUtil_getComments (JNIEnv* env, jclass) { WPI_String comments; @@ -395,24 +395,24 @@ Java_edu_wpi_first_hal_HALUtil_getComments } /* - * Class: edu_wpi_first_hal_HALUtil + * Class: org_wpilib_hardware_hal_HALUtil * Method: getTeamNumber * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_HALUtil_getTeamNumber +Java_org_wpilib_hardware_hal_HALUtil_getTeamNumber (JNIEnv* env, jclass) { return HAL_GetTeamNumber(); } /* - * Class: edu_wpi_first_hal_HALUtil + * Class: org_wpilib_hardware_hal_HALUtil * Method: getFPGATime * Signature: ()J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_hal_HALUtil_getFPGATime +Java_org_wpilib_hardware_hal_HALUtil_getFPGATime (JNIEnv* env, jclass) { int32_t status = 0; @@ -422,12 +422,12 @@ Java_edu_wpi_first_hal_HALUtil_getFPGATime } /* - * Class: edu_wpi_first_hal_HALUtil + * Class: org_wpilib_hardware_hal_HALUtil * Method: getHALRuntimeType * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_HALUtil_getHALRuntimeType +Java_org_wpilib_hardware_hal_HALUtil_getHALRuntimeType (JNIEnv* env, jclass) { jint returnValue = HAL_GetRuntimeType(); @@ -435,12 +435,12 @@ Java_edu_wpi_first_hal_HALUtil_getHALRuntimeType } /* - * Class: edu_wpi_first_hal_HALUtil + * Class: org_wpilib_hardware_hal_HALUtil * Method: getHALErrorMessage * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_hal_HALUtil_getHALErrorMessage +Java_org_wpilib_hardware_hal_HALUtil_getHALErrorMessage (JNIEnv* paramEnv, jclass, jint paramId) { const char* msg = HAL_GetErrorMessage(paramId); @@ -448,24 +448,24 @@ Java_edu_wpi_first_hal_HALUtil_getHALErrorMessage } /* - * Class: edu_wpi_first_hal_HALUtil + * Class: org_wpilib_hardware_hal_HALUtil * Method: getHALErrno * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_HALUtil_getHALErrno +Java_org_wpilib_hardware_hal_HALUtil_getHALErrno (JNIEnv*, jclass) { return errno; } /* - * Class: edu_wpi_first_hal_HALUtil + * Class: org_wpilib_hardware_hal_HALUtil * Method: getHALstrerror * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_hal_HALUtil_getHALstrerror +Java_org_wpilib_hardware_hal_HALUtil_getHALstrerror (JNIEnv* env, jclass, jint errorCode) { const char* msg = std::strerror(errno); diff --git a/hal/src/main/native/cpp/jni/I2CJNI.cpp b/hal/src/main/native/cpp/jni/I2CJNI.cpp index 6e06bb897d..c0c98386df 100644 --- a/hal/src/main/native/cpp/jni/I2CJNI.cpp +++ b/hal/src/main/native/cpp/jni/I2CJNI.cpp @@ -9,7 +9,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_hal_I2CJNI.h" +#include "org_wpilib_hardware_hal_I2CJNI.h" #include "hal/I2C.h" using namespace hal; @@ -18,12 +18,12 @@ using namespace wpi::java; extern "C" { /* - * Class: edu_wpi_first_hal_I2CJNI + * Class: org_wpilib_hardware_hal_I2CJNI * Method: i2CInitialize * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_I2CJNI_i2CInitialize +Java_org_wpilib_hardware_hal_I2CJNI_i2CInitialize (JNIEnv* env, jclass, jint port) { int32_t status = 0; @@ -32,12 +32,12 @@ Java_edu_wpi_first_hal_I2CJNI_i2CInitialize } /* - * Class: edu_wpi_first_hal_I2CJNI + * Class: org_wpilib_hardware_hal_I2CJNI * Method: i2CTransaction * Signature: (IBLjava/lang/Object;BLjava/lang/Object;B)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_I2CJNI_i2CTransaction +Java_org_wpilib_hardware_hal_I2CJNI_i2CTransaction (JNIEnv* env, jclass, jint port, jbyte address, jobject dataToSend, jbyte sendSize, jobject dataReceived, jbyte receiveSize) { @@ -55,12 +55,12 @@ Java_edu_wpi_first_hal_I2CJNI_i2CTransaction } /* - * Class: edu_wpi_first_hal_I2CJNI + * Class: org_wpilib_hardware_hal_I2CJNI * Method: i2CTransactionB * Signature: (IB[BB[BB)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_I2CJNI_i2CTransactionB +Java_org_wpilib_hardware_hal_I2CJNI_i2CTransactionB (JNIEnv* env, jclass, jint port, jbyte address, jbyteArray dataToSend, jbyte sendSize, jbyteArray dataReceived, jbyte receiveSize) { @@ -87,12 +87,12 @@ Java_edu_wpi_first_hal_I2CJNI_i2CTransactionB } /* - * Class: edu_wpi_first_hal_I2CJNI + * Class: org_wpilib_hardware_hal_I2CJNI * Method: i2CWrite * Signature: (IBLjava/lang/Object;B)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_I2CJNI_i2CWrite +Java_org_wpilib_hardware_hal_I2CJNI_i2CWrite (JNIEnv* env, jclass, jint port, jbyte address, jobject dataToSend, jbyte sendSize) { @@ -108,12 +108,12 @@ Java_edu_wpi_first_hal_I2CJNI_i2CWrite } /* - * Class: edu_wpi_first_hal_I2CJNI + * Class: org_wpilib_hardware_hal_I2CJNI * Method: i2CWriteB * Signature: (IB[BB)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_I2CJNI_i2CWriteB +Java_org_wpilib_hardware_hal_I2CJNI_i2CWriteB (JNIEnv* env, jclass, jint port, jbyte address, jbyteArray dataToSend, jbyte sendSize) { @@ -126,12 +126,12 @@ Java_edu_wpi_first_hal_I2CJNI_i2CWriteB } /* - * Class: edu_wpi_first_hal_I2CJNI + * Class: org_wpilib_hardware_hal_I2CJNI * Method: i2CRead * Signature: (IBLjava/lang/Object;B)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_I2CJNI_i2CRead +Java_org_wpilib_hardware_hal_I2CJNI_i2CRead (JNIEnv* env, jclass, jint port, jbyte address, jobject dataReceived, jbyte receiveSize) { @@ -143,12 +143,12 @@ Java_edu_wpi_first_hal_I2CJNI_i2CRead } /* - * Class: edu_wpi_first_hal_I2CJNI + * Class: org_wpilib_hardware_hal_I2CJNI * Method: i2CReadB * Signature: (IB[BB)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_I2CJNI_i2CReadB +Java_org_wpilib_hardware_hal_I2CJNI_i2CReadB (JNIEnv* env, jclass, jint port, jbyte address, jbyteArray dataReceived, jbyte receiveSize) { @@ -167,12 +167,12 @@ Java_edu_wpi_first_hal_I2CJNI_i2CReadB } /* - * Class: edu_wpi_first_hal_I2CJNI + * Class: org_wpilib_hardware_hal_I2CJNI * Method: i2CClose * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_I2CJNI_i2CClose +Java_org_wpilib_hardware_hal_I2CJNI_i2CClose (JNIEnv*, jclass, jint port) { HAL_CloseI2C(static_cast(port)); diff --git a/hal/src/main/native/cpp/jni/IMUJNI.cpp b/hal/src/main/native/cpp/jni/IMUJNI.cpp index 36baafed88..5527a08b2d 100644 --- a/hal/src/main/native/cpp/jni/IMUJNI.cpp +++ b/hal/src/main/native/cpp/jni/IMUJNI.cpp @@ -9,7 +9,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_hal_IMUJNI.h" +#include "org_wpilib_hardware_hal_IMUJNI.h" #include "hal/IMU.h" using namespace hal; @@ -29,12 +29,12 @@ void assertArraySize(JNIEnv* env, jarray array, int minimumSize, extern "C" { /* - * Class: edu_wpi_first_hal_IMUJNI + * Class: org_wpilib_hardware_hal_IMUJNI * Method: getIMUAcceleration * Signature: ([D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_IMUJNI_getIMUAcceleration +Java_org_wpilib_hardware_hal_IMUJNI_getIMUAcceleration (JNIEnv* env, jclass, jdoubleArray accel) { assertArraySize(env, accel, 3, "accel"); @@ -50,12 +50,12 @@ Java_edu_wpi_first_hal_IMUJNI_getIMUAcceleration } /* - * Class: edu_wpi_first_hal_IMUJNI + * Class: org_wpilib_hardware_hal_IMUJNI * Method: getIMUGyroRates * Signature: ([D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_IMUJNI_getIMUGyroRates +Java_org_wpilib_hardware_hal_IMUJNI_getIMUGyroRates (JNIEnv* env, jclass, jdoubleArray rates) { assertArraySize(env, rates, 3, "rates"); @@ -71,12 +71,12 @@ Java_edu_wpi_first_hal_IMUJNI_getIMUGyroRates } /* - * Class: edu_wpi_first_hal_IMUJNI + * Class: org_wpilib_hardware_hal_IMUJNI * Method: getIMUEulerAnglesFlat * Signature: ([D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_IMUJNI_getIMUEulerAnglesFlat +Java_org_wpilib_hardware_hal_IMUJNI_getIMUEulerAnglesFlat (JNIEnv* env, jclass, jdoubleArray angles) { assertArraySize(env, angles, 3, "angles"); @@ -92,12 +92,12 @@ Java_edu_wpi_first_hal_IMUJNI_getIMUEulerAnglesFlat } /* - * Class: edu_wpi_first_hal_IMUJNI + * Class: org_wpilib_hardware_hal_IMUJNI * Method: getIMUEulerAnglesLandscape * Signature: ([D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_IMUJNI_getIMUEulerAnglesLandscape +Java_org_wpilib_hardware_hal_IMUJNI_getIMUEulerAnglesLandscape (JNIEnv* env, jclass, jdoubleArray angles) { assertArraySize(env, angles, 3, "angles"); @@ -113,12 +113,12 @@ Java_edu_wpi_first_hal_IMUJNI_getIMUEulerAnglesLandscape } /* - * Class: edu_wpi_first_hal_IMUJNI + * Class: org_wpilib_hardware_hal_IMUJNI * Method: getIMUEulerAnglesPortrait * Signature: ([D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_IMUJNI_getIMUEulerAnglesPortrait +Java_org_wpilib_hardware_hal_IMUJNI_getIMUEulerAnglesPortrait (JNIEnv* env, jclass, jdoubleArray angles) { assertArraySize(env, angles, 3, "angles"); @@ -134,12 +134,12 @@ Java_edu_wpi_first_hal_IMUJNI_getIMUEulerAnglesPortrait } /* - * Class: edu_wpi_first_hal_IMUJNI + * Class: org_wpilib_hardware_hal_IMUJNI * Method: getIMUQuaternion * Signature: ([D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_IMUJNI_getIMUQuaternion +Java_org_wpilib_hardware_hal_IMUJNI_getIMUQuaternion (JNIEnv* env, jclass, jdoubleArray quat) { assertArraySize(env, quat, 4, "quat"); @@ -155,12 +155,12 @@ Java_edu_wpi_first_hal_IMUJNI_getIMUQuaternion } /* - * Class: edu_wpi_first_hal_IMUJNI + * Class: org_wpilib_hardware_hal_IMUJNI * Method: getIMUYawFlat * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_IMUJNI_getIMUYawFlat +Java_org_wpilib_hardware_hal_IMUJNI_getIMUYawFlat (JNIEnv* env, jclass) { int64_t timestamp; @@ -168,12 +168,12 @@ Java_edu_wpi_first_hal_IMUJNI_getIMUYawFlat } /* - * Class: edu_wpi_first_hal_IMUJNI + * Class: org_wpilib_hardware_hal_IMUJNI * Method: getIMUYawLandscape * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_IMUJNI_getIMUYawLandscape +Java_org_wpilib_hardware_hal_IMUJNI_getIMUYawLandscape (JNIEnv* env, jclass) { int64_t timestamp; @@ -181,12 +181,12 @@ Java_edu_wpi_first_hal_IMUJNI_getIMUYawLandscape } /* - * Class: edu_wpi_first_hal_IMUJNI + * Class: org_wpilib_hardware_hal_IMUJNI * Method: getIMUYawPortrait * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_IMUJNI_getIMUYawPortrait +Java_org_wpilib_hardware_hal_IMUJNI_getIMUYawPortrait (JNIEnv* env, jclass) { int64_t timestamp; diff --git a/hal/src/main/native/cpp/jni/NotifierJNI.cpp b/hal/src/main/native/cpp/jni/NotifierJNI.cpp index d4e4ec6630..9306e0a205 100644 --- a/hal/src/main/native/cpp/jni/NotifierJNI.cpp +++ b/hal/src/main/native/cpp/jni/NotifierJNI.cpp @@ -10,7 +10,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_hal_NotifierJNI.h" +#include "org_wpilib_hardware_hal_NotifierJNI.h" #include "hal/Notifier.h" using namespace hal; @@ -18,12 +18,12 @@ using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_NotifierJNI + * Class: org_wpilib_hardware_hal_NotifierJNI * Method: initializeNotifier * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_NotifierJNI_initializeNotifier +Java_org_wpilib_hardware_hal_NotifierJNI_initializeNotifier (JNIEnv* env, jclass) { int32_t status = 0; @@ -37,12 +37,12 @@ Java_edu_wpi_first_hal_NotifierJNI_initializeNotifier } /* - * Class: edu_wpi_first_hal_NotifierJNI + * Class: org_wpilib_hardware_hal_NotifierJNI * Method: setHALThreadPriority * Signature: (ZI)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_NotifierJNI_setHALThreadPriority +Java_org_wpilib_hardware_hal_NotifierJNI_setHALThreadPriority (JNIEnv* env, jclass, jboolean realTime, jint priority) { int32_t status = 0; @@ -50,12 +50,12 @@ Java_edu_wpi_first_hal_NotifierJNI_setHALThreadPriority } /* - * Class: edu_wpi_first_hal_NotifierJNI + * Class: org_wpilib_hardware_hal_NotifierJNI * Method: setNotifierName * Signature: (ILjava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_NotifierJNI_setNotifierName +Java_org_wpilib_hardware_hal_NotifierJNI_setNotifierName (JNIEnv* env, jclass cls, jint notifierHandle, jstring name) { int32_t status = 0; @@ -65,12 +65,12 @@ Java_edu_wpi_first_hal_NotifierJNI_setNotifierName } /* - * Class: edu_wpi_first_hal_NotifierJNI + * Class: org_wpilib_hardware_hal_NotifierJNI * Method: stopNotifier * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_NotifierJNI_stopNotifier +Java_org_wpilib_hardware_hal_NotifierJNI_stopNotifier (JNIEnv* env, jclass cls, jint notifierHandle) { int32_t status = 0; @@ -79,12 +79,12 @@ Java_edu_wpi_first_hal_NotifierJNI_stopNotifier } /* - * Class: edu_wpi_first_hal_NotifierJNI + * Class: org_wpilib_hardware_hal_NotifierJNI * Method: cleanNotifier * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_NotifierJNI_cleanNotifier +Java_org_wpilib_hardware_hal_NotifierJNI_cleanNotifier (JNIEnv* env, jclass, jint notifierHandle) { if (notifierHandle != HAL_kInvalidHandle) { @@ -93,12 +93,12 @@ Java_edu_wpi_first_hal_NotifierJNI_cleanNotifier } /* - * Class: edu_wpi_first_hal_NotifierJNI + * Class: org_wpilib_hardware_hal_NotifierJNI * Method: updateNotifierAlarm * Signature: (IJ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_NotifierJNI_updateNotifierAlarm +Java_org_wpilib_hardware_hal_NotifierJNI_updateNotifierAlarm (JNIEnv* env, jclass cls, jint notifierHandle, jlong triggerTime) { int32_t status = 0; @@ -108,12 +108,12 @@ Java_edu_wpi_first_hal_NotifierJNI_updateNotifierAlarm } /* - * Class: edu_wpi_first_hal_NotifierJNI + * Class: org_wpilib_hardware_hal_NotifierJNI * Method: cancelNotifierAlarm * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_NotifierJNI_cancelNotifierAlarm +Java_org_wpilib_hardware_hal_NotifierJNI_cancelNotifierAlarm (JNIEnv* env, jclass cls, jint notifierHandle) { int32_t status = 0; @@ -122,12 +122,12 @@ Java_edu_wpi_first_hal_NotifierJNI_cancelNotifierAlarm } /* - * Class: edu_wpi_first_hal_NotifierJNI + * Class: org_wpilib_hardware_hal_NotifierJNI * Method: waitForNotifierAlarm * Signature: (I)J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_hal_NotifierJNI_waitForNotifierAlarm +Java_org_wpilib_hardware_hal_NotifierJNI_waitForNotifierAlarm (JNIEnv* env, jclass cls, jint notifierHandle) { int32_t status = 0; diff --git a/hal/src/main/native/cpp/jni/PWMJNI.cpp b/hal/src/main/native/cpp/jni/PWMJNI.cpp index dcee624730..dbfa11af04 100644 --- a/hal/src/main/native/cpp/jni/PWMJNI.cpp +++ b/hal/src/main/native/cpp/jni/PWMJNI.cpp @@ -9,7 +9,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_hal_PWMJNI.h" +#include "org_wpilib_hardware_hal_PWMJNI.h" #include "hal/DIO.h" #include "hal/PWM.h" #include "hal/Ports.h" @@ -20,12 +20,12 @@ using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_PWMJNI + * Class: org_wpilib_hardware_hal_PWMJNI * Method: initializePWMPort * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PWMJNI_initializePWMPort +Java_org_wpilib_hardware_hal_PWMJNI_initializePWMPort (JNIEnv* env, jclass, jint channel) { int32_t status = 0; @@ -36,24 +36,24 @@ Java_edu_wpi_first_hal_PWMJNI_initializePWMPort } /* - * Class: edu_wpi_first_hal_PWMJNI + * Class: org_wpilib_hardware_hal_PWMJNI * Method: checkPWMChannel * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_PWMJNI_checkPWMChannel +Java_org_wpilib_hardware_hal_PWMJNI_checkPWMChannel (JNIEnv* env, jclass, jint channel) { return HAL_CheckPWMChannel(channel); } /* - * Class: edu_wpi_first_hal_PWMJNI + * Class: org_wpilib_hardware_hal_PWMJNI * Method: freePWMPort * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_PWMJNI_freePWMPort +Java_org_wpilib_hardware_hal_PWMJNI_freePWMPort (JNIEnv* env, jclass, jint id) { if (id != HAL_kInvalidHandle) { @@ -62,24 +62,24 @@ Java_edu_wpi_first_hal_PWMJNI_freePWMPort } /* - * Class: edu_wpi_first_hal_PWMJNI + * Class: org_wpilib_hardware_hal_PWMJNI * Method: setPWMSimDevice * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_PWMJNI_setPWMSimDevice +Java_org_wpilib_hardware_hal_PWMJNI_setPWMSimDevice (JNIEnv* env, jclass, jint handle, jint device) { HAL_SetPWMSimDevice((HAL_DigitalHandle)handle, (HAL_SimDeviceHandle)device); } /* - * Class: edu_wpi_first_hal_PWMJNI + * Class: org_wpilib_hardware_hal_PWMJNI * Method: setPulseTimeMicroseconds * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_PWMJNI_setPulseTimeMicroseconds +Java_org_wpilib_hardware_hal_PWMJNI_setPulseTimeMicroseconds (JNIEnv* env, jclass, jint id, jint value) { int32_t status = 0; @@ -88,12 +88,12 @@ Java_edu_wpi_first_hal_PWMJNI_setPulseTimeMicroseconds } /* - * Class: edu_wpi_first_hal_PWMJNI + * Class: org_wpilib_hardware_hal_PWMJNI * Method: getPulseTimeMicroseconds * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PWMJNI_getPulseTimeMicroseconds +Java_org_wpilib_hardware_hal_PWMJNI_getPulseTimeMicroseconds (JNIEnv* env, jclass, jint id) { int32_t status = 0; @@ -104,12 +104,12 @@ Java_edu_wpi_first_hal_PWMJNI_getPulseTimeMicroseconds } /* - * Class: edu_wpi_first_hal_PWMJNI + * Class: org_wpilib_hardware_hal_PWMJNI * Method: setPWMOutputPeriod * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_PWMJNI_setPWMOutputPeriod +Java_org_wpilib_hardware_hal_PWMJNI_setPWMOutputPeriod (JNIEnv* env, jclass, jint id, jint value) { int32_t status = 0; diff --git a/hal/src/main/native/cpp/jni/PortsJNI.cpp b/hal/src/main/native/cpp/jni/PortsJNI.cpp index 2b65b1f660..4648279259 100644 --- a/hal/src/main/native/cpp/jni/PortsJNI.cpp +++ b/hal/src/main/native/cpp/jni/PortsJNI.cpp @@ -7,19 +7,19 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_hal_PortsJNI.h" +#include "org_wpilib_hardware_hal_PortsJNI.h" #include "hal/Ports.h" using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_PortsJNI + * Class: org_wpilib_hardware_hal_PortsJNI * Method: getNumCanBuses * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PortsJNI_getNumCanBuses +Java_org_wpilib_hardware_hal_PortsJNI_getNumCanBuses (JNIEnv*, jclass) { jint value = HAL_GetNumCanBuses(); @@ -27,12 +27,12 @@ Java_edu_wpi_first_hal_PortsJNI_getNumCanBuses } /* - * Class: edu_wpi_first_hal_PortsJNI + * Class: org_wpilib_hardware_hal_PortsJNI * Method: getNumAnalogInputs * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PortsJNI_getNumAnalogInputs +Java_org_wpilib_hardware_hal_PortsJNI_getNumAnalogInputs (JNIEnv* env, jclass) { jint value = HAL_GetNumAnalogInputs(); @@ -40,12 +40,12 @@ Java_edu_wpi_first_hal_PortsJNI_getNumAnalogInputs } /* - * Class: edu_wpi_first_hal_PortsJNI + * Class: org_wpilib_hardware_hal_PortsJNI * Method: getNumCounters * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PortsJNI_getNumCounters +Java_org_wpilib_hardware_hal_PortsJNI_getNumCounters (JNIEnv* env, jclass) { jint value = HAL_GetNumCounters(); @@ -53,12 +53,12 @@ Java_edu_wpi_first_hal_PortsJNI_getNumCounters } /* - * Class: edu_wpi_first_hal_PortsJNI + * Class: org_wpilib_hardware_hal_PortsJNI * Method: getNumDigitalChannels * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PortsJNI_getNumDigitalChannels +Java_org_wpilib_hardware_hal_PortsJNI_getNumDigitalChannels (JNIEnv* env, jclass) { jint value = HAL_GetNumDigitalChannels(); @@ -66,12 +66,12 @@ Java_edu_wpi_first_hal_PortsJNI_getNumDigitalChannels } /* - * Class: edu_wpi_first_hal_PortsJNI + * Class: org_wpilib_hardware_hal_PortsJNI * Method: getNumPWMChannels * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PortsJNI_getNumPWMChannels +Java_org_wpilib_hardware_hal_PortsJNI_getNumPWMChannels (JNIEnv* env, jclass) { jint value = HAL_GetNumPWMChannels(); @@ -79,12 +79,12 @@ Java_edu_wpi_first_hal_PortsJNI_getNumPWMChannels } /* - * Class: edu_wpi_first_hal_PortsJNI + * Class: org_wpilib_hardware_hal_PortsJNI * Method: getNumDigitalPWMOutputs * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PortsJNI_getNumDigitalPWMOutputs +Java_org_wpilib_hardware_hal_PortsJNI_getNumDigitalPWMOutputs (JNIEnv* env, jclass) { jint value = HAL_GetNumDigitalPWMOutputs(); @@ -92,12 +92,12 @@ Java_edu_wpi_first_hal_PortsJNI_getNumDigitalPWMOutputs } /* - * Class: edu_wpi_first_hal_PortsJNI + * Class: org_wpilib_hardware_hal_PortsJNI * Method: getNumEncoders * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PortsJNI_getNumEncoders +Java_org_wpilib_hardware_hal_PortsJNI_getNumEncoders (JNIEnv* env, jclass) { jint value = HAL_GetNumEncoders(); @@ -105,12 +105,12 @@ Java_edu_wpi_first_hal_PortsJNI_getNumEncoders } /* - * Class: edu_wpi_first_hal_PortsJNI + * Class: org_wpilib_hardware_hal_PortsJNI * Method: getNumInterrupts * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PortsJNI_getNumInterrupts +Java_org_wpilib_hardware_hal_PortsJNI_getNumInterrupts (JNIEnv* env, jclass) { jint value = HAL_GetNumInterrupts(); @@ -118,12 +118,12 @@ Java_edu_wpi_first_hal_PortsJNI_getNumInterrupts } /* - * Class: edu_wpi_first_hal_PortsJNI + * Class: org_wpilib_hardware_hal_PortsJNI * Method: getNumCTREPCMModules * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PortsJNI_getNumCTREPCMModules +Java_org_wpilib_hardware_hal_PortsJNI_getNumCTREPCMModules (JNIEnv* env, jclass) { jint value = HAL_GetNumCTREPCMModules(); @@ -131,12 +131,12 @@ Java_edu_wpi_first_hal_PortsJNI_getNumCTREPCMModules } /* - * Class: edu_wpi_first_hal_PortsJNI + * Class: org_wpilib_hardware_hal_PortsJNI * Method: getNumCTRESolenoidChannels * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PortsJNI_getNumCTRESolenoidChannels +Java_org_wpilib_hardware_hal_PortsJNI_getNumCTRESolenoidChannels (JNIEnv* env, jclass) { jint value = HAL_GetNumCTRESolenoidChannels(); @@ -144,12 +144,12 @@ Java_edu_wpi_first_hal_PortsJNI_getNumCTRESolenoidChannels } /* - * Class: edu_wpi_first_hal_PortsJNI + * Class: org_wpilib_hardware_hal_PortsJNI * Method: getNumCTREPDPModules * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PortsJNI_getNumCTREPDPModules +Java_org_wpilib_hardware_hal_PortsJNI_getNumCTREPDPModules (JNIEnv* env, jclass) { jint value = HAL_GetNumCTREPDPModules(); @@ -157,12 +157,12 @@ Java_edu_wpi_first_hal_PortsJNI_getNumCTREPDPModules } /* - * Class: edu_wpi_first_hal_PortsJNI + * Class: org_wpilib_hardware_hal_PortsJNI * Method: getNumCTREPDPChannels * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PortsJNI_getNumCTREPDPChannels +Java_org_wpilib_hardware_hal_PortsJNI_getNumCTREPDPChannels (JNIEnv* env, jclass) { jint value = HAL_GetNumCTREPDPChannels(); @@ -170,12 +170,12 @@ Java_edu_wpi_first_hal_PortsJNI_getNumCTREPDPChannels } /* - * Class: edu_wpi_first_hal_PortsJNI + * Class: org_wpilib_hardware_hal_PortsJNI * Method: getNumREVPDHModules * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PortsJNI_getNumREVPDHModules +Java_org_wpilib_hardware_hal_PortsJNI_getNumREVPDHModules (JNIEnv* env, jclass) { jint value = HAL_GetNumREVPDHModules(); @@ -183,12 +183,12 @@ Java_edu_wpi_first_hal_PortsJNI_getNumREVPDHModules } /* - * Class: edu_wpi_first_hal_PortsJNI + * Class: org_wpilib_hardware_hal_PortsJNI * Method: getNumREVPDHChannels * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PortsJNI_getNumREVPDHChannels +Java_org_wpilib_hardware_hal_PortsJNI_getNumREVPDHChannels (JNIEnv* env, jclass) { jint value = HAL_GetNumREVPDHChannels(); @@ -196,12 +196,12 @@ Java_edu_wpi_first_hal_PortsJNI_getNumREVPDHChannels } /* - * Class: edu_wpi_first_hal_PortsJNI + * Class: org_wpilib_hardware_hal_PortsJNI * Method: getNumREVPHModules * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PortsJNI_getNumREVPHModules +Java_org_wpilib_hardware_hal_PortsJNI_getNumREVPHModules (JNIEnv* env, jclass) { jint value = HAL_GetNumREVPHModules(); @@ -209,12 +209,12 @@ Java_edu_wpi_first_hal_PortsJNI_getNumREVPHModules } /* - * Class: edu_wpi_first_hal_PortsJNI + * Class: org_wpilib_hardware_hal_PortsJNI * Method: getNumREVPHChannels * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PortsJNI_getNumREVPHChannels +Java_org_wpilib_hardware_hal_PortsJNI_getNumREVPHChannels (JNIEnv* env, jclass) { jint value = HAL_GetNumREVPHChannels(); diff --git a/hal/src/main/native/cpp/jni/PowerDistributionJNI.cpp b/hal/src/main/native/cpp/jni/PowerDistributionJNI.cpp index 83ac85cb57..860f39063e 100644 --- a/hal/src/main/native/cpp/jni/PowerDistributionJNI.cpp +++ b/hal/src/main/native/cpp/jni/PowerDistributionJNI.cpp @@ -7,30 +7,30 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_hal_PowerDistributionJNI.h" +#include "org_wpilib_hardware_hal_PowerDistributionJNI.h" #include "hal/Ports.h" #include "hal/PowerDistribution.h" using namespace hal; -static_assert(edu_wpi_first_hal_PowerDistributionJNI_AUTOMATIC_TYPE == +static_assert(org_wpilib_hardware_hal_PowerDistributionJNI_AUTOMATIC_TYPE == HAL_PowerDistributionType::HAL_PowerDistributionType_kAutomatic); -static_assert(edu_wpi_first_hal_PowerDistributionJNI_CTRE_TYPE == +static_assert(org_wpilib_hardware_hal_PowerDistributionJNI_CTRE_TYPE == HAL_PowerDistributionType::HAL_PowerDistributionType_kCTRE); -static_assert(edu_wpi_first_hal_PowerDistributionJNI_REV_TYPE == +static_assert(org_wpilib_hardware_hal_PowerDistributionJNI_REV_TYPE == HAL_PowerDistributionType::HAL_PowerDistributionType_kRev); -static_assert(edu_wpi_first_hal_PowerDistributionJNI_DEFAULT_MODULE == +static_assert(org_wpilib_hardware_hal_PowerDistributionJNI_DEFAULT_MODULE == HAL_DEFAULT_POWER_DISTRIBUTION_MODULE); extern "C" { /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: initialize * Signature: (III)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_initialize +Java_org_wpilib_hardware_hal_PowerDistributionJNI_initialize (JNIEnv* env, jclass, jint busId, jint module, jint type) { int32_t status = 0; @@ -43,12 +43,12 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_initialize } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: free * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_free +Java_org_wpilib_hardware_hal_PowerDistributionJNI_free (JNIEnv*, jclass, jint handle) { if (handle != HAL_kInvalidHandle) { @@ -57,12 +57,12 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_free } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: getModuleNumber * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_getModuleNumber +Java_org_wpilib_hardware_hal_PowerDistributionJNI_getModuleNumber (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -72,24 +72,24 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_getModuleNumber } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: checkChannel * Signature: (II)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_checkChannel +Java_org_wpilib_hardware_hal_PowerDistributionJNI_checkChannel (JNIEnv* env, jclass, jint handle, jint channel) { return HAL_CheckPowerDistributionChannel(handle, channel); } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: checkModule * Signature: (II)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_checkModule +Java_org_wpilib_hardware_hal_PowerDistributionJNI_checkModule (JNIEnv* env, jclass, jint module, jint type) { return HAL_CheckPowerDistributionModule( @@ -97,12 +97,12 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_checkModule } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: getType * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_getType +Java_org_wpilib_hardware_hal_PowerDistributionJNI_getType (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -112,12 +112,12 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_getType } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: getNumChannels * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_getNumChannels +Java_org_wpilib_hardware_hal_PowerDistributionJNI_getNumChannels (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -127,12 +127,12 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_getNumChannels } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: getTemperature * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_getTemperature +Java_org_wpilib_hardware_hal_PowerDistributionJNI_getTemperature (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -142,12 +142,12 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_getTemperature } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: getVoltage * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_getVoltage +Java_org_wpilib_hardware_hal_PowerDistributionJNI_getVoltage (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -157,12 +157,12 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_getVoltage } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: getChannelCurrent * Signature: (II)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_getChannelCurrent +Java_org_wpilib_hardware_hal_PowerDistributionJNI_getChannelCurrent (JNIEnv* env, jclass, jint handle, jint channel) { int32_t status = 0; @@ -173,12 +173,12 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_getChannelCurrent } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: getAllCurrents * Signature: (I[D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_getAllCurrents +Java_org_wpilib_hardware_hal_PowerDistributionJNI_getAllCurrents (JNIEnv* env, jclass, jint handle, jdoubleArray jarr) { int32_t status = 0; @@ -196,12 +196,12 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_getAllCurrents } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: getTotalCurrent * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_getTotalCurrent +Java_org_wpilib_hardware_hal_PowerDistributionJNI_getTotalCurrent (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -211,12 +211,12 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_getTotalCurrent } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: getTotalPower * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_getTotalPower +Java_org_wpilib_hardware_hal_PowerDistributionJNI_getTotalPower (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -226,12 +226,12 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_getTotalPower } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: getTotalEnergy * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_getTotalEnergy +Java_org_wpilib_hardware_hal_PowerDistributionJNI_getTotalEnergy (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -241,12 +241,12 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_getTotalEnergy } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: resetTotalEnergy * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_resetTotalEnergy +Java_org_wpilib_hardware_hal_PowerDistributionJNI_resetTotalEnergy (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -255,12 +255,12 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_resetTotalEnergy } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: clearStickyFaults * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_clearStickyFaults +Java_org_wpilib_hardware_hal_PowerDistributionJNI_clearStickyFaults (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -269,12 +269,12 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_clearStickyFaults } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: setSwitchableChannel * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_setSwitchableChannel +Java_org_wpilib_hardware_hal_PowerDistributionJNI_setSwitchableChannel (JNIEnv* env, jclass, jint handle, jboolean enabled) { int32_t status = 0; @@ -283,12 +283,12 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_setSwitchableChannel } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: getSwitchableChannel * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_getSwitchableChannel +Java_org_wpilib_hardware_hal_PowerDistributionJNI_getSwitchableChannel (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -298,12 +298,12 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_getSwitchableChannel } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: getVoltageNoError * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_getVoltageNoError +Java_org_wpilib_hardware_hal_PowerDistributionJNI_getVoltageNoError (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -312,12 +312,12 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_getVoltageNoError } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: getChannelCurrentNoError * Signature: (II)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_getChannelCurrentNoError +Java_org_wpilib_hardware_hal_PowerDistributionJNI_getChannelCurrentNoError (JNIEnv* env, jclass, jint handle, jint channel) { int32_t status = 0; @@ -327,12 +327,12 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_getChannelCurrentNoError } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: getTotalCurrentNoError * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_getTotalCurrentNoError +Java_org_wpilib_hardware_hal_PowerDistributionJNI_getTotalCurrentNoError (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -341,12 +341,12 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_getTotalCurrentNoError } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: setSwitchableChannelNoError * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_setSwitchableChannelNoError +Java_org_wpilib_hardware_hal_PowerDistributionJNI_setSwitchableChannelNoError (JNIEnv* env, jclass, jint handle, jboolean enabled) { int32_t status = 0; @@ -354,12 +354,12 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_setSwitchableChannelNoError } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: getSwitchableChannelNoError * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_getSwitchableChannelNoError +Java_org_wpilib_hardware_hal_PowerDistributionJNI_getSwitchableChannelNoError (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -368,12 +368,12 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_getSwitchableChannelNoError } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: getStickyFaultsNative * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_getStickyFaultsNative +Java_org_wpilib_hardware_hal_PowerDistributionJNI_getStickyFaultsNative (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -388,12 +388,12 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_getStickyFaultsNative } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: getFaultsNative * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_getFaultsNative +Java_org_wpilib_hardware_hal_PowerDistributionJNI_getFaultsNative (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -408,12 +408,12 @@ Java_edu_wpi_first_hal_PowerDistributionJNI_getFaultsNative } /* - * Class: edu_wpi_first_hal_PowerDistributionJNI + * Class: org_wpilib_hardware_hal_PowerDistributionJNI * Method: getVersion * Signature: (I)Ljava/lang/Object; */ JNIEXPORT jobject JNICALL -Java_edu_wpi_first_hal_PowerDistributionJNI_getVersion +Java_org_wpilib_hardware_hal_PowerDistributionJNI_getVersion (JNIEnv* env, jclass, jint handle) { int32_t status = 0; diff --git a/hal/src/main/native/cpp/jni/PowerJNI.cpp b/hal/src/main/native/cpp/jni/PowerJNI.cpp index 192b29d89d..509f5ef5d7 100644 --- a/hal/src/main/native/cpp/jni/PowerJNI.cpp +++ b/hal/src/main/native/cpp/jni/PowerJNI.cpp @@ -5,7 +5,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_hal_PowerJNI.h" +#include "org_wpilib_hardware_hal_PowerJNI.h" #include "hal/Power.h" using namespace hal; @@ -13,12 +13,12 @@ using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_PowerJNI + * Class: org_wpilib_hardware_hal_PowerJNI * Method: getVinVoltage * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_PowerJNI_getVinVoltage +Java_org_wpilib_hardware_hal_PowerJNI_getVinVoltage (JNIEnv* env, jclass) { int32_t status = 0; @@ -28,12 +28,12 @@ Java_edu_wpi_first_hal_PowerJNI_getVinVoltage } /* - * Class: edu_wpi_first_hal_PowerJNI + * Class: org_wpilib_hardware_hal_PowerJNI * Method: getUserVoltage3V3 * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_PowerJNI_getUserVoltage3V3 +Java_org_wpilib_hardware_hal_PowerJNI_getUserVoltage3V3 (JNIEnv* env, jclass) { int32_t status = 0; @@ -43,12 +43,12 @@ Java_edu_wpi_first_hal_PowerJNI_getUserVoltage3V3 } /* - * Class: edu_wpi_first_hal_PowerJNI + * Class: org_wpilib_hardware_hal_PowerJNI * Method: getUserCurrent3V3 * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_PowerJNI_getUserCurrent3V3 +Java_org_wpilib_hardware_hal_PowerJNI_getUserCurrent3V3 (JNIEnv* env, jclass) { int32_t status = 0; @@ -58,12 +58,12 @@ Java_edu_wpi_first_hal_PowerJNI_getUserCurrent3V3 } /* - * Class: edu_wpi_first_hal_PowerJNI + * Class: org_wpilib_hardware_hal_PowerJNI * Method: setUserEnabled3V3 * Signature: (Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_PowerJNI_setUserEnabled3V3 +Java_org_wpilib_hardware_hal_PowerJNI_setUserEnabled3V3 (JNIEnv* env, jclass, jboolean enabled) { int32_t status = 0; @@ -72,12 +72,12 @@ Java_edu_wpi_first_hal_PowerJNI_setUserEnabled3V3 } /* - * Class: edu_wpi_first_hal_PowerJNI + * Class: org_wpilib_hardware_hal_PowerJNI * Method: getUserActive3V3 * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_PowerJNI_getUserActive3V3 +Java_org_wpilib_hardware_hal_PowerJNI_getUserActive3V3 (JNIEnv* env, jclass) { int32_t status = 0; @@ -87,12 +87,12 @@ Java_edu_wpi_first_hal_PowerJNI_getUserActive3V3 } /* - * Class: edu_wpi_first_hal_PowerJNI + * Class: org_wpilib_hardware_hal_PowerJNI * Method: getUserCurrentFaults3V3 * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_PowerJNI_getUserCurrentFaults3V3 +Java_org_wpilib_hardware_hal_PowerJNI_getUserCurrentFaults3V3 (JNIEnv* env, jclass) { int32_t status = 0; @@ -102,12 +102,12 @@ Java_edu_wpi_first_hal_PowerJNI_getUserCurrentFaults3V3 } /* - * Class: edu_wpi_first_hal_PowerJNI + * Class: org_wpilib_hardware_hal_PowerJNI * Method: resetUserCurrentFaults * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_PowerJNI_resetUserCurrentFaults +Java_org_wpilib_hardware_hal_PowerJNI_resetUserCurrentFaults (JNIEnv* env, jclass) { int32_t status = 0; @@ -116,12 +116,12 @@ Java_edu_wpi_first_hal_PowerJNI_resetUserCurrentFaults } /* - * Class: edu_wpi_first_hal_PowerJNI + * Class: org_wpilib_hardware_hal_PowerJNI * Method: setBrownoutVoltage * Signature: (D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_PowerJNI_setBrownoutVoltage +Java_org_wpilib_hardware_hal_PowerJNI_setBrownoutVoltage (JNIEnv* env, jclass, jdouble brownoutVoltage) { int32_t status = 0; @@ -130,12 +130,12 @@ Java_edu_wpi_first_hal_PowerJNI_setBrownoutVoltage } /* - * Class: edu_wpi_first_hal_PowerJNI + * Class: org_wpilib_hardware_hal_PowerJNI * Method: getBrownoutVoltage * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_PowerJNI_getBrownoutVoltage +Java_org_wpilib_hardware_hal_PowerJNI_getBrownoutVoltage (JNIEnv* env, jclass) { int32_t status = 0; @@ -145,12 +145,12 @@ Java_edu_wpi_first_hal_PowerJNI_getBrownoutVoltage } /* - * Class: edu_wpi_first_hal_PowerJNI + * Class: org_wpilib_hardware_hal_PowerJNI * Method: getCPUTemp * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_PowerJNI_getCPUTemp +Java_org_wpilib_hardware_hal_PowerJNI_getCPUTemp (JNIEnv* env, jclass) { int32_t status = 0; diff --git a/hal/src/main/native/cpp/jni/REVPHJNI.cpp b/hal/src/main/native/cpp/jni/REVPHJNI.cpp index d1818dd3f8..3876a7d954 100644 --- a/hal/src/main/native/cpp/jni/REVPHJNI.cpp +++ b/hal/src/main/native/cpp/jni/REVPHJNI.cpp @@ -7,22 +7,22 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_hal_REVPHJNI.h" +#include "org_wpilib_hardware_hal_REVPHJNI.h" #include "hal/Ports.h" #include "hal/REVPH.h" #include "hal/handles/HandlesInternal.h" static_assert( - edu_wpi_first_hal_REVPHJNI_COMPRESSOR_CONFIG_TYPE_DISABLED == + org_wpilib_hardware_hal_REVPHJNI_COMPRESSOR_CONFIG_TYPE_DISABLED == HAL_REVPHCompressorConfigType::HAL_REVPHCompressorConfigType_kDisabled); static_assert( - edu_wpi_first_hal_REVPHJNI_COMPRESSOR_CONFIG_TYPE_DIGITAL == + org_wpilib_hardware_hal_REVPHJNI_COMPRESSOR_CONFIG_TYPE_DIGITAL == HAL_REVPHCompressorConfigType::HAL_REVPHCompressorConfigType_kDigital); static_assert( - edu_wpi_first_hal_REVPHJNI_COMPRESSOR_CONFIG_TYPE_ANALOG == + org_wpilib_hardware_hal_REVPHJNI_COMPRESSOR_CONFIG_TYPE_ANALOG == HAL_REVPHCompressorConfigType::HAL_REVPHCompressorConfigType_kAnalog); static_assert( - edu_wpi_first_hal_REVPHJNI_COMPRESSOR_CONFIG_TYPE_HYBRID == + org_wpilib_hardware_hal_REVPHJNI_COMPRESSOR_CONFIG_TYPE_HYBRID == HAL_REVPHCompressorConfigType::HAL_REVPHCompressorConfigType_kHybrid); using namespace hal; @@ -30,12 +30,12 @@ using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: initialize * Signature: (II)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_REVPHJNI_initialize +Java_org_wpilib_hardware_hal_REVPHJNI_initialize (JNIEnv* env, jclass, jint busId, jint module) { int32_t status = 0; @@ -46,36 +46,36 @@ Java_edu_wpi_first_hal_REVPHJNI_initialize } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: free * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_REVPHJNI_free +Java_org_wpilib_hardware_hal_REVPHJNI_free (JNIEnv* env, jclass, jint handle) { HAL_FreeREVPH(handle); } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: checkSolenoidChannel * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_REVPHJNI_checkSolenoidChannel +Java_org_wpilib_hardware_hal_REVPHJNI_checkSolenoidChannel (JNIEnv*, jclass, jint channel) { return HAL_CheckREVPHSolenoidChannel(channel); } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: getCompressor * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_REVPHJNI_getCompressor +Java_org_wpilib_hardware_hal_REVPHJNI_getCompressor (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -85,12 +85,12 @@ Java_edu_wpi_first_hal_REVPHJNI_getCompressor } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: setCompressorConfig * Signature: (IDDZZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_REVPHJNI_setCompressorConfig +Java_org_wpilib_hardware_hal_REVPHJNI_setCompressorConfig (JNIEnv* env, jclass, jint handle, jdouble minAnalogVoltage, jdouble maxAnalogVoltage, jboolean forceDisable, jboolean useDigital) { @@ -105,12 +105,12 @@ Java_edu_wpi_first_hal_REVPHJNI_setCompressorConfig } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: setClosedLoopControlDisabled * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_REVPHJNI_setClosedLoopControlDisabled +Java_org_wpilib_hardware_hal_REVPHJNI_setClosedLoopControlDisabled (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -119,12 +119,12 @@ Java_edu_wpi_first_hal_REVPHJNI_setClosedLoopControlDisabled } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: setClosedLoopControlDigital * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_REVPHJNI_setClosedLoopControlDigital +Java_org_wpilib_hardware_hal_REVPHJNI_setClosedLoopControlDigital (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -133,12 +133,12 @@ Java_edu_wpi_first_hal_REVPHJNI_setClosedLoopControlDigital } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: setClosedLoopControlAnalog * Signature: (IDD)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_REVPHJNI_setClosedLoopControlAnalog +Java_org_wpilib_hardware_hal_REVPHJNI_setClosedLoopControlAnalog (JNIEnv* env, jclass, jint handle, jdouble minAnalogVoltage, jdouble maxAnalogVoltage) { @@ -149,12 +149,12 @@ Java_edu_wpi_first_hal_REVPHJNI_setClosedLoopControlAnalog } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: setClosedLoopControlHybrid * Signature: (IDD)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_REVPHJNI_setClosedLoopControlHybrid +Java_org_wpilib_hardware_hal_REVPHJNI_setClosedLoopControlHybrid (JNIEnv* env, jclass, jint handle, jdouble minAnalogVoltage, jdouble maxAnalogVoltage) { @@ -165,12 +165,12 @@ Java_edu_wpi_first_hal_REVPHJNI_setClosedLoopControlHybrid } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: getCompressorConfig * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_REVPHJNI_getCompressorConfig +Java_org_wpilib_hardware_hal_REVPHJNI_getCompressorConfig (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -180,12 +180,12 @@ Java_edu_wpi_first_hal_REVPHJNI_getCompressorConfig } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: getPressureSwitch * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_REVPHJNI_getPressureSwitch +Java_org_wpilib_hardware_hal_REVPHJNI_getPressureSwitch (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -195,12 +195,12 @@ Java_edu_wpi_first_hal_REVPHJNI_getPressureSwitch } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: getAnalogVoltage * Signature: (II)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_REVPHJNI_getAnalogVoltage +Java_org_wpilib_hardware_hal_REVPHJNI_getAnalogVoltage (JNIEnv* env, jclass, jint handle, jint channel) { int32_t status = 0; @@ -210,12 +210,12 @@ Java_edu_wpi_first_hal_REVPHJNI_getAnalogVoltage } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: getCompressorCurrent * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_REVPHJNI_getCompressorCurrent +Java_org_wpilib_hardware_hal_REVPHJNI_getCompressorCurrent (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -225,12 +225,12 @@ Java_edu_wpi_first_hal_REVPHJNI_getCompressorCurrent } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: getSolenoids * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_REVPHJNI_getSolenoids +Java_org_wpilib_hardware_hal_REVPHJNI_getSolenoids (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -240,12 +240,12 @@ Java_edu_wpi_first_hal_REVPHJNI_getSolenoids } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: setSolenoids * Signature: (III)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_REVPHJNI_setSolenoids +Java_org_wpilib_hardware_hal_REVPHJNI_setSolenoids (JNIEnv* env, jclass, jint handle, jint mask, jint value) { int32_t status = 0; @@ -254,12 +254,12 @@ Java_edu_wpi_first_hal_REVPHJNI_setSolenoids } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: fireOneShot * Signature: (III)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_REVPHJNI_fireOneShot +Java_org_wpilib_hardware_hal_REVPHJNI_fireOneShot (JNIEnv* env, jclass, jint handle, jint index, jint durMs) { int32_t status = 0; @@ -268,12 +268,12 @@ Java_edu_wpi_first_hal_REVPHJNI_fireOneShot } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: clearStickyFaults * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_REVPHJNI_clearStickyFaults +Java_org_wpilib_hardware_hal_REVPHJNI_clearStickyFaults (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -282,12 +282,12 @@ Java_edu_wpi_first_hal_REVPHJNI_clearStickyFaults } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: getInputVoltage * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_REVPHJNI_getInputVoltage +Java_org_wpilib_hardware_hal_REVPHJNI_getInputVoltage (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -297,12 +297,12 @@ Java_edu_wpi_first_hal_REVPHJNI_getInputVoltage } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: get5VVoltage * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_REVPHJNI_get5VVoltage +Java_org_wpilib_hardware_hal_REVPHJNI_get5VVoltage (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -312,12 +312,12 @@ Java_edu_wpi_first_hal_REVPHJNI_get5VVoltage } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: getSolenoidCurrent * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_REVPHJNI_getSolenoidCurrent +Java_org_wpilib_hardware_hal_REVPHJNI_getSolenoidCurrent (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -327,12 +327,12 @@ Java_edu_wpi_first_hal_REVPHJNI_getSolenoidCurrent } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: getSolenoidVoltage * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_REVPHJNI_getSolenoidVoltage +Java_org_wpilib_hardware_hal_REVPHJNI_getSolenoidVoltage (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -342,12 +342,12 @@ Java_edu_wpi_first_hal_REVPHJNI_getSolenoidVoltage } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: getStickyFaultsNative * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_REVPHJNI_getStickyFaultsNative +Java_org_wpilib_hardware_hal_REVPHJNI_getStickyFaultsNative (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -362,12 +362,12 @@ Java_edu_wpi_first_hal_REVPHJNI_getStickyFaultsNative } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: getFaultsNative * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_REVPHJNI_getFaultsNative +Java_org_wpilib_hardware_hal_REVPHJNI_getFaultsNative (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -382,12 +382,12 @@ Java_edu_wpi_first_hal_REVPHJNI_getFaultsNative } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: getSolenoidDisabledList * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_REVPHJNI_getSolenoidDisabledList +Java_org_wpilib_hardware_hal_REVPHJNI_getSolenoidDisabledList (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -397,12 +397,12 @@ Java_edu_wpi_first_hal_REVPHJNI_getSolenoidDisabledList } /* - * Class: edu_wpi_first_hal_REVPHJNI + * Class: org_wpilib_hardware_hal_REVPHJNI * Method: getVersion * Signature: (I)Ljava/lang/Object; */ JNIEXPORT jobject JNICALL -Java_edu_wpi_first_hal_REVPHJNI_getVersion +Java_org_wpilib_hardware_hal_REVPHJNI_getVersion (JNIEnv* env, jclass, jint handle) { int32_t status = 0; diff --git a/hal/src/main/native/cpp/jni/SerialPortJNI.cpp b/hal/src/main/native/cpp/jni/SerialPortJNI.cpp index e141e249f5..4aecfddc0f 100644 --- a/hal/src/main/native/cpp/jni/SerialPortJNI.cpp +++ b/hal/src/main/native/cpp/jni/SerialPortJNI.cpp @@ -9,7 +9,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_hal_SerialPortJNI.h" +#include "org_wpilib_hardware_hal_SerialPortJNI.h" #include "hal/SerialPort.h" using namespace hal; @@ -18,12 +18,12 @@ using namespace wpi::java; extern "C" { /* - * Class: edu_wpi_first_hal_SerialPortJNI + * Class: org_wpilib_hardware_hal_SerialPortJNI * Method: serialInitializePort * Signature: (B)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_SerialPortJNI_serialInitializePort +Java_org_wpilib_hardware_hal_SerialPortJNI_serialInitializePort (JNIEnv* env, jclass, jbyte port) { int32_t status = 0; @@ -34,12 +34,12 @@ Java_edu_wpi_first_hal_SerialPortJNI_serialInitializePort } /* - * Class: edu_wpi_first_hal_SerialPortJNI + * Class: org_wpilib_hardware_hal_SerialPortJNI * Method: serialInitializePortDirect * Signature: (BLjava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_SerialPortJNI_serialInitializePortDirect +Java_org_wpilib_hardware_hal_SerialPortJNI_serialInitializePortDirect (JNIEnv* env, jclass, jbyte port, jstring portName) { JStringRef portNameRef{env, portName}; @@ -51,12 +51,12 @@ Java_edu_wpi_first_hal_SerialPortJNI_serialInitializePortDirect } /* - * Class: edu_wpi_first_hal_SerialPortJNI + * Class: org_wpilib_hardware_hal_SerialPortJNI * Method: serialSetBaudRate * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_SerialPortJNI_serialSetBaudRate +Java_org_wpilib_hardware_hal_SerialPortJNI_serialSetBaudRate (JNIEnv* env, jclass, jint handle, jint rate) { int32_t status = 0; @@ -66,12 +66,12 @@ Java_edu_wpi_first_hal_SerialPortJNI_serialSetBaudRate } /* - * Class: edu_wpi_first_hal_SerialPortJNI + * Class: org_wpilib_hardware_hal_SerialPortJNI * Method: serialSetDataBits * Signature: (IB)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_SerialPortJNI_serialSetDataBits +Java_org_wpilib_hardware_hal_SerialPortJNI_serialSetDataBits (JNIEnv* env, jclass, jint handle, jbyte bits) { int32_t status = 0; @@ -81,12 +81,12 @@ Java_edu_wpi_first_hal_SerialPortJNI_serialSetDataBits } /* - * Class: edu_wpi_first_hal_SerialPortJNI + * Class: org_wpilib_hardware_hal_SerialPortJNI * Method: serialSetParity * Signature: (IB)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_SerialPortJNI_serialSetParity +Java_org_wpilib_hardware_hal_SerialPortJNI_serialSetParity (JNIEnv* env, jclass, jint handle, jbyte parity) { int32_t status = 0; @@ -96,12 +96,12 @@ Java_edu_wpi_first_hal_SerialPortJNI_serialSetParity } /* - * Class: edu_wpi_first_hal_SerialPortJNI + * Class: org_wpilib_hardware_hal_SerialPortJNI * Method: serialSetStopBits * Signature: (IB)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_SerialPortJNI_serialSetStopBits +Java_org_wpilib_hardware_hal_SerialPortJNI_serialSetStopBits (JNIEnv* env, jclass, jint handle, jbyte bits) { int32_t status = 0; @@ -111,12 +111,12 @@ Java_edu_wpi_first_hal_SerialPortJNI_serialSetStopBits } /* - * Class: edu_wpi_first_hal_SerialPortJNI + * Class: org_wpilib_hardware_hal_SerialPortJNI * Method: serialSetWriteMode * Signature: (IB)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_SerialPortJNI_serialSetWriteMode +Java_org_wpilib_hardware_hal_SerialPortJNI_serialSetWriteMode (JNIEnv* env, jclass, jint handle, jbyte mode) { int32_t status = 0; @@ -126,12 +126,12 @@ Java_edu_wpi_first_hal_SerialPortJNI_serialSetWriteMode } /* - * Class: edu_wpi_first_hal_SerialPortJNI + * Class: org_wpilib_hardware_hal_SerialPortJNI * Method: serialSetFlowControl * Signature: (IB)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_SerialPortJNI_serialSetFlowControl +Java_org_wpilib_hardware_hal_SerialPortJNI_serialSetFlowControl (JNIEnv* env, jclass, jint handle, jbyte flow) { int32_t status = 0; @@ -141,12 +141,12 @@ Java_edu_wpi_first_hal_SerialPortJNI_serialSetFlowControl } /* - * Class: edu_wpi_first_hal_SerialPortJNI + * Class: org_wpilib_hardware_hal_SerialPortJNI * Method: serialSetTimeout * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_SerialPortJNI_serialSetTimeout +Java_org_wpilib_hardware_hal_SerialPortJNI_serialSetTimeout (JNIEnv* env, jclass, jint handle, jdouble timeout) { int32_t status = 0; @@ -156,12 +156,12 @@ Java_edu_wpi_first_hal_SerialPortJNI_serialSetTimeout } /* - * Class: edu_wpi_first_hal_SerialPortJNI + * Class: org_wpilib_hardware_hal_SerialPortJNI * Method: serialEnableTermination * Signature: (IC)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_SerialPortJNI_serialEnableTermination +Java_org_wpilib_hardware_hal_SerialPortJNI_serialEnableTermination (JNIEnv* env, jclass, jint handle, jchar terminator) { int32_t status = 0; @@ -171,12 +171,12 @@ Java_edu_wpi_first_hal_SerialPortJNI_serialEnableTermination } /* - * Class: edu_wpi_first_hal_SerialPortJNI + * Class: org_wpilib_hardware_hal_SerialPortJNI * Method: serialDisableTermination * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_SerialPortJNI_serialDisableTermination +Java_org_wpilib_hardware_hal_SerialPortJNI_serialDisableTermination (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -186,12 +186,12 @@ Java_edu_wpi_first_hal_SerialPortJNI_serialDisableTermination } /* - * Class: edu_wpi_first_hal_SerialPortJNI + * Class: org_wpilib_hardware_hal_SerialPortJNI * Method: serialSetReadBufferSize * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_SerialPortJNI_serialSetReadBufferSize +Java_org_wpilib_hardware_hal_SerialPortJNI_serialSetReadBufferSize (JNIEnv* env, jclass, jint handle, jint size) { int32_t status = 0; @@ -201,12 +201,12 @@ Java_edu_wpi_first_hal_SerialPortJNI_serialSetReadBufferSize } /* - * Class: edu_wpi_first_hal_SerialPortJNI + * Class: org_wpilib_hardware_hal_SerialPortJNI * Method: serialSetWriteBufferSize * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_SerialPortJNI_serialSetWriteBufferSize +Java_org_wpilib_hardware_hal_SerialPortJNI_serialSetWriteBufferSize (JNIEnv* env, jclass, jint handle, jint size) { int32_t status = 0; @@ -216,12 +216,12 @@ Java_edu_wpi_first_hal_SerialPortJNI_serialSetWriteBufferSize } /* - * Class: edu_wpi_first_hal_SerialPortJNI + * Class: org_wpilib_hardware_hal_SerialPortJNI * Method: serialGetBytesReceived * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_SerialPortJNI_serialGetBytesReceived +Java_org_wpilib_hardware_hal_SerialPortJNI_serialGetBytesReceived (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -232,12 +232,12 @@ Java_edu_wpi_first_hal_SerialPortJNI_serialGetBytesReceived } /* - * Class: edu_wpi_first_hal_SerialPortJNI + * Class: org_wpilib_hardware_hal_SerialPortJNI * Method: serialRead * Signature: (I[BI)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_SerialPortJNI_serialRead +Java_org_wpilib_hardware_hal_SerialPortJNI_serialRead (JNIEnv* env, jclass, jint handle, jbyteArray dataReceived, jint size) { wpi::SmallVector recvBuf; @@ -252,12 +252,12 @@ Java_edu_wpi_first_hal_SerialPortJNI_serialRead } /* - * Class: edu_wpi_first_hal_SerialPortJNI + * Class: org_wpilib_hardware_hal_SerialPortJNI * Method: serialWrite * Signature: (I[BI)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_SerialPortJNI_serialWrite +Java_org_wpilib_hardware_hal_SerialPortJNI_serialWrite (JNIEnv* env, jclass, jint handle, jbyteArray dataToSend, jint size) { int32_t status = 0; @@ -270,12 +270,12 @@ Java_edu_wpi_first_hal_SerialPortJNI_serialWrite } /* - * Class: edu_wpi_first_hal_SerialPortJNI + * Class: org_wpilib_hardware_hal_SerialPortJNI * Method: serialFlush * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_SerialPortJNI_serialFlush +Java_org_wpilib_hardware_hal_SerialPortJNI_serialFlush (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -284,12 +284,12 @@ Java_edu_wpi_first_hal_SerialPortJNI_serialFlush } /* - * Class: edu_wpi_first_hal_SerialPortJNI + * Class: org_wpilib_hardware_hal_SerialPortJNI * Method: serialClear * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_SerialPortJNI_serialClear +Java_org_wpilib_hardware_hal_SerialPortJNI_serialClear (JNIEnv* env, jclass, jint handle) { int32_t status = 0; @@ -298,12 +298,12 @@ Java_edu_wpi_first_hal_SerialPortJNI_serialClear } /* - * Class: edu_wpi_first_hal_SerialPortJNI + * Class: org_wpilib_hardware_hal_SerialPortJNI * Method: serialClose * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_SerialPortJNI_serialClose +Java_org_wpilib_hardware_hal_SerialPortJNI_serialClose (JNIEnv* env, jclass, jint handle) { if (handle != HAL_kInvalidHandle) { diff --git a/hal/src/main/native/cpp/jni/SimDeviceJNI.cpp b/hal/src/main/native/cpp/jni/SimDeviceJNI.cpp index c001c2c5a1..9ca2cc0c9e 100644 --- a/hal/src/main/native/cpp/jni/SimDeviceJNI.cpp +++ b/hal/src/main/native/cpp/jni/SimDeviceJNI.cpp @@ -10,7 +10,7 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_hal_SimDeviceJNI.h" +#include "org_wpilib_hardware_hal_SimDeviceJNI.h" #include "hal/SimDevice.h" using namespace wpi::java; @@ -43,24 +43,24 @@ static HAL_Value ValueFromJava(jint type, jlong value1, jdouble value2) { extern "C" { /* - * Class: edu_wpi_first_hal_SimDeviceJNI + * Class: org_wpilib_hardware_hal_SimDeviceJNI * Method: createSimDevice * Signature: (Ljava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_SimDeviceJNI_createSimDevice +Java_org_wpilib_hardware_hal_SimDeviceJNI_createSimDevice (JNIEnv* env, jclass, jstring name) { return HAL_CreateSimDevice(JStringRef{env, name}.c_str()); } /* - * Class: edu_wpi_first_hal_SimDeviceJNI + * Class: org_wpilib_hardware_hal_SimDeviceJNI * Method: freeSimDevice * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_SimDeviceJNI_freeSimDevice +Java_org_wpilib_hardware_hal_SimDeviceJNI_freeSimDevice (JNIEnv*, jclass, jint handle) { if (handle != HAL_kInvalidHandle) { @@ -69,24 +69,24 @@ Java_edu_wpi_first_hal_SimDeviceJNI_freeSimDevice } /* - * Class: edu_wpi_first_hal_SimDeviceJNI + * Class: org_wpilib_hardware_hal_SimDeviceJNI * Method: getSimDeviceName * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_hal_SimDeviceJNI_getSimDeviceName +Java_org_wpilib_hardware_hal_SimDeviceJNI_getSimDeviceName (JNIEnv* env, jclass, jint handle) { return MakeJString(env, HAL_GetSimDeviceName(handle)); } /* - * Class: edu_wpi_first_hal_SimDeviceJNI + * Class: org_wpilib_hardware_hal_SimDeviceJNI * Method: createSimValueNative * Signature: (ILjava/lang/String;IIJD)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_SimDeviceJNI_createSimValueNative +Java_org_wpilib_hardware_hal_SimDeviceJNI_createSimValueNative (JNIEnv* env, jclass, jint device, jstring name, jint direction, jint type, jlong value1, jdouble value2) { @@ -95,12 +95,12 @@ Java_edu_wpi_first_hal_SimDeviceJNI_createSimValueNative } /* - * Class: edu_wpi_first_hal_SimDeviceJNI + * Class: org_wpilib_hardware_hal_SimDeviceJNI * Method: createSimValueEnum * Signature: (ILjava/lang/String;I[Ljava/lang/Object;I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_SimDeviceJNI_createSimValueEnum +Java_org_wpilib_hardware_hal_SimDeviceJNI_createSimValueEnum (JNIEnv* env, jclass, jint device, jstring name, jint direction, jobjectArray options, jint initialValue) { @@ -124,12 +124,12 @@ Java_edu_wpi_first_hal_SimDeviceJNI_createSimValueEnum } /* - * Class: edu_wpi_first_hal_SimDeviceJNI + * Class: org_wpilib_hardware_hal_SimDeviceJNI * Method: createSimValueEnumDouble * Signature: (ILjava/lang/String;I[Ljava/lang/Object;[DI)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_SimDeviceJNI_createSimValueEnumDouble +Java_org_wpilib_hardware_hal_SimDeviceJNI_createSimValueEnumDouble (JNIEnv* env, jclass, jint device, jstring name, jint direction, jobjectArray options, jdoubleArray optionValues, jint initialValue) { @@ -159,96 +159,96 @@ Java_edu_wpi_first_hal_SimDeviceJNI_createSimValueEnumDouble } /* - * Class: edu_wpi_first_hal_SimDeviceJNI + * Class: org_wpilib_hardware_hal_SimDeviceJNI * Method: getSimValue * Signature: (I)Ljava/lang/Object; */ JNIEXPORT jobject JNICALL -Java_edu_wpi_first_hal_SimDeviceJNI_getSimValue +Java_org_wpilib_hardware_hal_SimDeviceJNI_getSimValue (JNIEnv* env, jclass, jint handle) { return hal::CreateHALValue(env, HAL_GetSimValue(handle)); } /* - * Class: edu_wpi_first_hal_SimDeviceJNI + * Class: org_wpilib_hardware_hal_SimDeviceJNI * Method: getSimValueInt * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_SimDeviceJNI_getSimValueInt +Java_org_wpilib_hardware_hal_SimDeviceJNI_getSimValueInt (JNIEnv*, jclass, jint handle) { return HAL_GetSimValueInt(handle); } /* - * Class: edu_wpi_first_hal_SimDeviceJNI + * Class: org_wpilib_hardware_hal_SimDeviceJNI * Method: getSimValueLong * Signature: (I)J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_hal_SimDeviceJNI_getSimValueLong +Java_org_wpilib_hardware_hal_SimDeviceJNI_getSimValueLong (JNIEnv*, jclass, jint handle) { return HAL_GetSimValueLong(handle); } /* - * Class: edu_wpi_first_hal_SimDeviceJNI + * Class: org_wpilib_hardware_hal_SimDeviceJNI * Method: getSimValueDouble * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_SimDeviceJNI_getSimValueDouble +Java_org_wpilib_hardware_hal_SimDeviceJNI_getSimValueDouble (JNIEnv*, jclass, jint handle) { return HAL_GetSimValueDouble(handle); } /* - * Class: edu_wpi_first_hal_SimDeviceJNI + * Class: org_wpilib_hardware_hal_SimDeviceJNI * Method: getSimValueEnum * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_SimDeviceJNI_getSimValueEnum +Java_org_wpilib_hardware_hal_SimDeviceJNI_getSimValueEnum (JNIEnv*, jclass, jint handle) { return HAL_GetSimValueEnum(handle); } /* - * Class: edu_wpi_first_hal_SimDeviceJNI + * Class: org_wpilib_hardware_hal_SimDeviceJNI * Method: getSimValueBoolean * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_SimDeviceJNI_getSimValueBoolean +Java_org_wpilib_hardware_hal_SimDeviceJNI_getSimValueBoolean (JNIEnv*, jclass, jint handle) { return HAL_GetSimValueBoolean(handle); } /* - * Class: edu_wpi_first_hal_SimDeviceJNI + * Class: org_wpilib_hardware_hal_SimDeviceJNI * Method: setSimValueNative * Signature: (IIJD)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_SimDeviceJNI_setSimValueNative +Java_org_wpilib_hardware_hal_SimDeviceJNI_setSimValueNative (JNIEnv*, jclass, jint handle, jint type, jlong value1, jdouble value2) { HAL_SetSimValue(handle, ValueFromJava(type, value1, value2)); } /* - * Class: edu_wpi_first_hal_SimDeviceJNI + * Class: org_wpilib_hardware_hal_SimDeviceJNI * Method: resetSimValue * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_SimDeviceJNI_resetSimValue +Java_org_wpilib_hardware_hal_SimDeviceJNI_resetSimValue (JNIEnv*, jclass, jint handle) { HAL_ResetSimValue(handle); diff --git a/hal/src/main/native/cpp/jni/SystemServerJNI.cpp b/hal/src/main/native/cpp/jni/SystemServerJNI.cpp index 8fbf836130..2ba8d5a8be 100644 --- a/hal/src/main/native/cpp/jni/SystemServerJNI.cpp +++ b/hal/src/main/native/cpp/jni/SystemServerJNI.cpp @@ -4,18 +4,18 @@ #include -#include "edu_wpi_first_hal_SystemServerJNI.h" +#include "org_wpilib_hardware_hal_SystemServerJNI.h" #include "hal/SystemServer.h" extern "C" { /* - * Class: edu_wpi_first_hal_SystemServerJNI + * Class: org_wpilib_hardware_hal_SystemServerJNI * Method: getSystemServerHandle * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_SystemServerJNI_getSystemServerHandle +Java_org_wpilib_hardware_hal_SystemServerJNI_getSystemServerHandle (JNIEnv*, jclass) { return HAL_GetSystemServerHandle(); diff --git a/hal/src/main/native/cpp/jni/ThreadsJNI.cpp b/hal/src/main/native/cpp/jni/ThreadsJNI.cpp index 94f00c5b68..0f8fefce2e 100644 --- a/hal/src/main/native/cpp/jni/ThreadsJNI.cpp +++ b/hal/src/main/native/cpp/jni/ThreadsJNI.cpp @@ -7,19 +7,19 @@ #include #include "HALUtil.h" -#include "edu_wpi_first_hal_ThreadsJNI.h" +#include "org_wpilib_hardware_hal_ThreadsJNI.h" #include "hal/Threads.h" using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_ThreadsJNI + * Class: org_wpilib_hardware_hal_ThreadsJNI * Method: getCurrentThreadPriority * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_ThreadsJNI_getCurrentThreadPriority +Java_org_wpilib_hardware_hal_ThreadsJNI_getCurrentThreadPriority (JNIEnv* env, jclass) { int32_t status = 0; @@ -30,12 +30,12 @@ Java_edu_wpi_first_hal_ThreadsJNI_getCurrentThreadPriority } /* - * Class: edu_wpi_first_hal_ThreadsJNI + * Class: org_wpilib_hardware_hal_ThreadsJNI * Method: getCurrentThreadIsRealTime * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_ThreadsJNI_getCurrentThreadIsRealTime +Java_org_wpilib_hardware_hal_ThreadsJNI_getCurrentThreadIsRealTime (JNIEnv* env, jclass) { int32_t status = 0; @@ -46,12 +46,12 @@ Java_edu_wpi_first_hal_ThreadsJNI_getCurrentThreadIsRealTime } /* - * Class: edu_wpi_first_hal_ThreadsJNI + * Class: org_wpilib_hardware_hal_ThreadsJNI * Method: setCurrentThreadPriority * Signature: (ZI)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_ThreadsJNI_setCurrentThreadPriority +Java_org_wpilib_hardware_hal_ThreadsJNI_setCurrentThreadPriority (JNIEnv* env, jclass, jboolean realTime, jint priority) { int32_t status = 0; diff --git a/hal/src/main/native/cpp/jni/UsageReportingJNI.cpp b/hal/src/main/native/cpp/jni/UsageReportingJNI.cpp index 272770f6d1..96d0dd7b5e 100644 --- a/hal/src/main/native/cpp/jni/UsageReportingJNI.cpp +++ b/hal/src/main/native/cpp/jni/UsageReportingJNI.cpp @@ -9,7 +9,7 @@ #include #include -#include "edu_wpi_first_hal_UsageReportingJNI.h" +#include "org_wpilib_hardware_hal_UsageReportingJNI.h" #include "hal/UsageReporting.h" using namespace wpi::java; @@ -17,12 +17,12 @@ using namespace wpi::java; extern "C" { /* - * Class: edu_wpi_first_hal_UsageReportingJNI + * Class: org_wpilib_hardware_hal_UsageReportingJNI * Method: report * Signature: (Ljava/lang/String;Ljava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_UsageReportingJNI_report +Java_org_wpilib_hardware_hal_UsageReportingJNI_report (JNIEnv* env, jclass, jstring resource, jstring data) { JStringRef resourceStr{env, resource}; diff --git a/hal/src/main/native/cpp/jni/simulation/AddressableLEDDataJNI.cpp b/hal/src/main/native/cpp/jni/simulation/AddressableLEDDataJNI.cpp index 91dcdf088d..59ab175513 100644 --- a/hal/src/main/native/cpp/jni/simulation/AddressableLEDDataJNI.cpp +++ b/hal/src/main/native/cpp/jni/simulation/AddressableLEDDataJNI.cpp @@ -8,7 +8,7 @@ #include "CallbackStore.h" #include "ConstBufferCallbackStore.h" -#include "edu_wpi_first_hal_simulation_AddressableLEDDataJNI.h" +#include "org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI.h" #include "hal/simulation/AddressableLEDData.h" static_assert(sizeof(jbyte) * 3 == sizeof(HAL_AddressableLEDData)); @@ -19,12 +19,12 @@ using namespace wpi::java; extern "C" { /* - * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI + * Class: org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_registerInitializedCallback +Java_org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback( @@ -33,12 +33,12 @@ Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_registerInitializedCallb } /* - * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI + * Class: org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_cancelInitializedCallback +Java_org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -46,36 +46,36 @@ Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_cancelInitializedCallbac } /* - * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI + * Class: org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_getInitialized +Java_org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetAddressableLEDInitialized(index); } /* - * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI + * Class: org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_setInitialized +Java_org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetAddressableLEDInitialized(index, value); } /* - * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI + * Class: org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI * Method: registerStartCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_registerStartCallback +Java_org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI_registerStartCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -83,12 +83,12 @@ Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_registerStartCallback } /* - * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI + * Class: org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI * Method: cancelStartCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_cancelStartCallback +Java_org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI_cancelStartCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -96,36 +96,36 @@ Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_cancelStartCallback } /* - * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI + * Class: org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI * Method: getStart * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_getStart +Java_org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI_getStart (JNIEnv*, jclass, jint index) { return HALSIM_GetAddressableLEDStart(index); } /* - * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI + * Class: org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI * Method: setStart * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_setStart +Java_org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI_setStart (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetAddressableLEDStart(index, value); } /* - * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI + * Class: org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI * Method: registerLengthCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_registerLengthCallback +Java_org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI_registerLengthCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -133,12 +133,12 @@ Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_registerLengthCallback } /* - * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI + * Class: org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI * Method: cancelLengthCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_cancelLengthCallback +Java_org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI_cancelLengthCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -146,36 +146,36 @@ Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_cancelLengthCallback } /* - * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI + * Class: org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI * Method: getLength * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_getLength +Java_org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI_getLength (JNIEnv*, jclass, jint index) { return HALSIM_GetAddressableLEDLength(index); } /* - * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI + * Class: org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI * Method: setLength * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_setLength +Java_org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI_setLength (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetAddressableLEDLength(index, value); } /* - * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI + * Class: org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI * Method: registerDataCallback * Signature: (Ljava/lang/Object;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_registerDataCallback +Java_org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI_registerDataCallback (JNIEnv* env, jclass, jobject callback) { return sim::AllocateConstBufferCallback( @@ -186,12 +186,12 @@ Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_registerDataCallback } /* - * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI + * Class: org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI * Method: cancelDataCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_cancelDataCallback +Java_org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI_cancelDataCallback (JNIEnv* env, jclass, jint handle) { sim::FreeConstBufferCallback(env, handle, -1, [](int32_t, int32_t uid) { @@ -200,12 +200,12 @@ Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_cancelDataCallback } /* - * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI + * Class: org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI * Method: getData * Signature: (II)[B */ JNIEXPORT jbyteArray JNICALL -Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_getData +Java_org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI_getData (JNIEnv* env, jclass, jint start, jint length) { auto data = @@ -216,12 +216,12 @@ Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_getData } /* - * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI + * Class: org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI * Method: setData * Signature: (I[B)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_setData +Java_org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI_setData (JNIEnv* env, jclass, jint start, jbyteArray arr) { JSpan jArrRef{env, arr}; @@ -232,12 +232,12 @@ Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_setData } /* - * Class: edu_wpi_first_hal_simulation_AddressableLEDDataJNI + * Class: org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_AddressableLEDDataJNI_resetData +Java_org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetAddressableLEDData(index); diff --git a/hal/src/main/native/cpp/jni/simulation/AnalogInDataJNI.cpp b/hal/src/main/native/cpp/jni/simulation/AnalogInDataJNI.cpp index bdb6e387da..6868be20e4 100644 --- a/hal/src/main/native/cpp/jni/simulation/AnalogInDataJNI.cpp +++ b/hal/src/main/native/cpp/jni/simulation/AnalogInDataJNI.cpp @@ -5,7 +5,7 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_simulation_AnalogInDataJNI.h" +#include "org_wpilib_hardware_hal_simulation_AnalogInDataJNI.h" #include "hal/simulation/AnalogInData.h" using namespace hal; @@ -13,12 +13,12 @@ using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI + * Class: org_wpilib_hardware_hal_simulation_AnalogInDataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_registerInitializedCallback +Java_org_wpilib_hardware_hal_simulation_AnalogInDataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -26,12 +26,12 @@ Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_registerInitializedCallback } /* - * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI + * Class: org_wpilib_hardware_hal_simulation_AnalogInDataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_cancelInitializedCallback +Java_org_wpilib_hardware_hal_simulation_AnalogInDataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -39,36 +39,36 @@ Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_cancelInitializedCallback } /* - * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI + * Class: org_wpilib_hardware_hal_simulation_AnalogInDataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_getInitialized +Java_org_wpilib_hardware_hal_simulation_AnalogInDataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetAnalogInInitialized(index); } /* - * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI + * Class: org_wpilib_hardware_hal_simulation_AnalogInDataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_setInitialized +Java_org_wpilib_hardware_hal_simulation_AnalogInDataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetAnalogInInitialized(index, value); } /* - * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI + * Class: org_wpilib_hardware_hal_simulation_AnalogInDataJNI * Method: registerAverageBitsCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_registerAverageBitsCallback +Java_org_wpilib_hardware_hal_simulation_AnalogInDataJNI_registerAverageBitsCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -76,12 +76,12 @@ Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_registerAverageBitsCallback } /* - * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI + * Class: org_wpilib_hardware_hal_simulation_AnalogInDataJNI * Method: cancelAverageBitsCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_cancelAverageBitsCallback +Java_org_wpilib_hardware_hal_simulation_AnalogInDataJNI_cancelAverageBitsCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -89,36 +89,36 @@ Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_cancelAverageBitsCallback } /* - * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI + * Class: org_wpilib_hardware_hal_simulation_AnalogInDataJNI * Method: getAverageBits * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_getAverageBits +Java_org_wpilib_hardware_hal_simulation_AnalogInDataJNI_getAverageBits (JNIEnv*, jclass, jint index) { return HALSIM_GetAnalogInAverageBits(index); } /* - * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI + * Class: org_wpilib_hardware_hal_simulation_AnalogInDataJNI * Method: setAverageBits * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_setAverageBits +Java_org_wpilib_hardware_hal_simulation_AnalogInDataJNI_setAverageBits (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetAnalogInAverageBits(index, value); } /* - * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI + * Class: org_wpilib_hardware_hal_simulation_AnalogInDataJNI * Method: registerOversampleBitsCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_registerOversampleBitsCallback +Java_org_wpilib_hardware_hal_simulation_AnalogInDataJNI_registerOversampleBitsCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -126,12 +126,12 @@ Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_registerOversampleBitsCallback } /* - * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI + * Class: org_wpilib_hardware_hal_simulation_AnalogInDataJNI * Method: cancelOversampleBitsCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_cancelOversampleBitsCallback +Java_org_wpilib_hardware_hal_simulation_AnalogInDataJNI_cancelOversampleBitsCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -139,36 +139,36 @@ Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_cancelOversampleBitsCallback } /* - * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI + * Class: org_wpilib_hardware_hal_simulation_AnalogInDataJNI * Method: getOversampleBits * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_getOversampleBits +Java_org_wpilib_hardware_hal_simulation_AnalogInDataJNI_getOversampleBits (JNIEnv*, jclass, jint index) { return HALSIM_GetAnalogInOversampleBits(index); } /* - * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI + * Class: org_wpilib_hardware_hal_simulation_AnalogInDataJNI * Method: setOversampleBits * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_setOversampleBits +Java_org_wpilib_hardware_hal_simulation_AnalogInDataJNI_setOversampleBits (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetAnalogInOversampleBits(index, value); } /* - * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI + * Class: org_wpilib_hardware_hal_simulation_AnalogInDataJNI * Method: registerVoltageCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_registerVoltageCallback +Java_org_wpilib_hardware_hal_simulation_AnalogInDataJNI_registerVoltageCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -176,12 +176,12 @@ Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_registerVoltageCallback } /* - * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI + * Class: org_wpilib_hardware_hal_simulation_AnalogInDataJNI * Method: cancelVoltageCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_cancelVoltageCallback +Java_org_wpilib_hardware_hal_simulation_AnalogInDataJNI_cancelVoltageCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -189,36 +189,36 @@ Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_cancelVoltageCallback } /* - * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI + * Class: org_wpilib_hardware_hal_simulation_AnalogInDataJNI * Method: getVoltage * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_getVoltage +Java_org_wpilib_hardware_hal_simulation_AnalogInDataJNI_getVoltage (JNIEnv*, jclass, jint index) { return HALSIM_GetAnalogInVoltage(index); } /* - * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI + * Class: org_wpilib_hardware_hal_simulation_AnalogInDataJNI * Method: setVoltage * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_setVoltage +Java_org_wpilib_hardware_hal_simulation_AnalogInDataJNI_setVoltage (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetAnalogInVoltage(index, value); } /* - * Class: edu_wpi_first_hal_simulation_AnalogInDataJNI + * Class: org_wpilib_hardware_hal_simulation_AnalogInDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_AnalogInDataJNI_resetData +Java_org_wpilib_hardware_hal_simulation_AnalogInDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetAnalogInData(index); diff --git a/hal/src/main/native/cpp/jni/simulation/CTREPCMDataJNI.cpp b/hal/src/main/native/cpp/jni/simulation/CTREPCMDataJNI.cpp index 416478ca53..bc95e4bcfd 100644 --- a/hal/src/main/native/cpp/jni/simulation/CTREPCMDataJNI.cpp +++ b/hal/src/main/native/cpp/jni/simulation/CTREPCMDataJNI.cpp @@ -5,7 +5,7 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_simulation_CTREPCMDataJNI.h" +#include "org_wpilib_hardware_hal_simulation_CTREPCMDataJNI.h" #include "hal/simulation/CTREPCMData.h" using namespace hal; @@ -13,12 +13,12 @@ using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_registerInitializedCallback +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -26,12 +26,12 @@ Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_registerInitializedCallback } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_cancelInitializedCallback +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -39,36 +39,36 @@ Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_cancelInitializedCallback } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_getInitialized +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetCTREPCMInitialized(index); } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_setInitialized +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetCTREPCMInitialized(index, value); } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: registerSolenoidOutputCallback * Signature: (IILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_registerSolenoidOutputCallback +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_registerSolenoidOutputCallback (JNIEnv* env, jclass, jint index, jint channel, jobject callback, jboolean initialNotify) { @@ -78,12 +78,12 @@ Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_registerSolenoidOutputCallback } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: cancelSolenoidOutputCallback * Signature: (III)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_cancelSolenoidOutputCallback +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_cancelSolenoidOutputCallback (JNIEnv* env, jclass, jint index, jint channel, jint handle) { return sim::FreeChannelCallback(env, handle, index, channel, @@ -91,36 +91,36 @@ Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_cancelSolenoidOutputCallback } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: getSolenoidOutput * Signature: (II)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_getSolenoidOutput +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_getSolenoidOutput (JNIEnv*, jclass, jint index, jint channel) { return HALSIM_GetCTREPCMSolenoidOutput(index, channel); } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: setSolenoidOutput * Signature: (IIZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_setSolenoidOutput +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_setSolenoidOutput (JNIEnv*, jclass, jint index, jint channel, jboolean value) { HALSIM_SetCTREPCMSolenoidOutput(index, channel, value); } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: registerCompressorOnCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_registerCompressorOnCallback +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_registerCompressorOnCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -128,12 +128,12 @@ Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_registerCompressorOnCallback } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: cancelCompressorOnCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_cancelCompressorOnCallback +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_cancelCompressorOnCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -141,36 +141,36 @@ Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_cancelCompressorOnCallback } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: getCompressorOn * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_getCompressorOn +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_getCompressorOn (JNIEnv*, jclass, jint index) { return HALSIM_GetCTREPCMCompressorOn(index); } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: setCompressorOn * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_setCompressorOn +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_setCompressorOn (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetCTREPCMCompressorOn(index, value); } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: registerClosedLoopEnabledCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_registerClosedLoopEnabledCallback +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_registerClosedLoopEnabledCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback( @@ -179,12 +179,12 @@ Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_registerClosedLoopEnabledCallba } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: cancelClosedLoopEnabledCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_cancelClosedLoopEnabledCallback +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_cancelClosedLoopEnabledCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -192,36 +192,36 @@ Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_cancelClosedLoopEnabledCallback } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: getClosedLoopEnabled * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_getClosedLoopEnabled +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_getClosedLoopEnabled (JNIEnv*, jclass, jint index) { return HALSIM_GetCTREPCMClosedLoopEnabled(index); } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: setClosedLoopEnabled * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_setClosedLoopEnabled +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_setClosedLoopEnabled (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetCTREPCMClosedLoopEnabled(index, value); } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: registerPressureSwitchCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_registerPressureSwitchCallback +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_registerPressureSwitchCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -229,12 +229,12 @@ Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_registerPressureSwitchCallback } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: cancelPressureSwitchCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_cancelPressureSwitchCallback +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_cancelPressureSwitchCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -242,36 +242,36 @@ Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_cancelPressureSwitchCallback } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: getPressureSwitch * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_getPressureSwitch +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_getPressureSwitch (JNIEnv*, jclass, jint index) { return HALSIM_GetCTREPCMPressureSwitch(index); } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: setPressureSwitch * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_setPressureSwitch +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_setPressureSwitch (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetCTREPCMPressureSwitch(index, value); } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: registerCompressorCurrentCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_registerCompressorCurrentCallback +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_registerCompressorCurrentCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback( @@ -280,12 +280,12 @@ Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_registerCompressorCurrentCallba } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: cancelCompressorCurrentCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_cancelCompressorCurrentCallback +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_cancelCompressorCurrentCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -293,36 +293,36 @@ Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_cancelCompressorCurrentCallback } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: getCompressorCurrent * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_getCompressorCurrent +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_getCompressorCurrent (JNIEnv*, jclass, jint index) { return HALSIM_GetCTREPCMCompressorCurrent(index); } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: setCompressorCurrent * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_setCompressorCurrent +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_setCompressorCurrent (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetCTREPCMCompressorCurrent(index, value); } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: registerAllNonSolenoidCallbacks * Signature: (ILjava/lang/Object;Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_registerAllNonSolenoidCallbacks +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_registerAllNonSolenoidCallbacks (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { sim::AllocateCallback( @@ -334,12 +334,12 @@ Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_registerAllNonSolenoidCallbacks } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: registerAllSolenoidCallbacks * Signature: (IILjava/lang/Object;Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_registerAllSolenoidCallbacks +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_registerAllSolenoidCallbacks (JNIEnv* env, jclass, jint index, jint channel, jobject callback, jboolean initialNotify) { @@ -354,12 +354,12 @@ Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_registerAllSolenoidCallbacks } /* - * Class: edu_wpi_first_hal_simulation_CTREPCMDataJNI + * Class: org_wpilib_hardware_hal_simulation_CTREPCMDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_CTREPCMDataJNI_resetData +Java_org_wpilib_hardware_hal_simulation_CTREPCMDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetCTREPCMData(index); diff --git a/hal/src/main/native/cpp/jni/simulation/DIODataJNI.cpp b/hal/src/main/native/cpp/jni/simulation/DIODataJNI.cpp index e81ad7748a..5b89afef59 100644 --- a/hal/src/main/native/cpp/jni/simulation/DIODataJNI.cpp +++ b/hal/src/main/native/cpp/jni/simulation/DIODataJNI.cpp @@ -5,7 +5,7 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_simulation_DIODataJNI.h" +#include "org_wpilib_hardware_hal_simulation_DIODataJNI.h" #include "hal/simulation/DIOData.h" using namespace hal; @@ -13,12 +13,12 @@ using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_simulation_DIODataJNI + * Class: org_wpilib_hardware_hal_simulation_DIODataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DIODataJNI_registerInitializedCallback +Java_org_wpilib_hardware_hal_simulation_DIODataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -26,12 +26,12 @@ Java_edu_wpi_first_hal_simulation_DIODataJNI_registerInitializedCallback } /* - * Class: edu_wpi_first_hal_simulation_DIODataJNI + * Class: org_wpilib_hardware_hal_simulation_DIODataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DIODataJNI_cancelInitializedCallback +Java_org_wpilib_hardware_hal_simulation_DIODataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -39,36 +39,36 @@ Java_edu_wpi_first_hal_simulation_DIODataJNI_cancelInitializedCallback } /* - * Class: edu_wpi_first_hal_simulation_DIODataJNI + * Class: org_wpilib_hardware_hal_simulation_DIODataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_DIODataJNI_getInitialized +Java_org_wpilib_hardware_hal_simulation_DIODataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetDIOInitialized(index); } /* - * Class: edu_wpi_first_hal_simulation_DIODataJNI + * Class: org_wpilib_hardware_hal_simulation_DIODataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DIODataJNI_setInitialized +Java_org_wpilib_hardware_hal_simulation_DIODataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetDIOInitialized(index, value); } /* - * Class: edu_wpi_first_hal_simulation_DIODataJNI + * Class: org_wpilib_hardware_hal_simulation_DIODataJNI * Method: registerValueCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DIODataJNI_registerValueCallback +Java_org_wpilib_hardware_hal_simulation_DIODataJNI_registerValueCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -76,48 +76,48 @@ Java_edu_wpi_first_hal_simulation_DIODataJNI_registerValueCallback } /* - * Class: edu_wpi_first_hal_simulation_DIODataJNI + * Class: org_wpilib_hardware_hal_simulation_DIODataJNI * Method: cancelValueCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DIODataJNI_cancelValueCallback +Java_org_wpilib_hardware_hal_simulation_DIODataJNI_cancelValueCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, &HALSIM_CancelDIOValueCallback); } /* - * Class: edu_wpi_first_hal_simulation_DIODataJNI + * Class: org_wpilib_hardware_hal_simulation_DIODataJNI * Method: getValue * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_DIODataJNI_getValue +Java_org_wpilib_hardware_hal_simulation_DIODataJNI_getValue (JNIEnv*, jclass, jint index) { return HALSIM_GetDIOValue(index); } /* - * Class: edu_wpi_first_hal_simulation_DIODataJNI + * Class: org_wpilib_hardware_hal_simulation_DIODataJNI * Method: setValue * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DIODataJNI_setValue +Java_org_wpilib_hardware_hal_simulation_DIODataJNI_setValue (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetDIOValue(index, value); } /* - * Class: edu_wpi_first_hal_simulation_DIODataJNI + * Class: org_wpilib_hardware_hal_simulation_DIODataJNI * Method: registerPulseLengthCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DIODataJNI_registerPulseLengthCallback +Java_org_wpilib_hardware_hal_simulation_DIODataJNI_registerPulseLengthCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -125,12 +125,12 @@ Java_edu_wpi_first_hal_simulation_DIODataJNI_registerPulseLengthCallback } /* - * Class: edu_wpi_first_hal_simulation_DIODataJNI + * Class: org_wpilib_hardware_hal_simulation_DIODataJNI * Method: cancelPulseLengthCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DIODataJNI_cancelPulseLengthCallback +Java_org_wpilib_hardware_hal_simulation_DIODataJNI_cancelPulseLengthCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -138,36 +138,36 @@ Java_edu_wpi_first_hal_simulation_DIODataJNI_cancelPulseLengthCallback } /* - * Class: edu_wpi_first_hal_simulation_DIODataJNI + * Class: org_wpilib_hardware_hal_simulation_DIODataJNI * Method: getPulseLength * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_simulation_DIODataJNI_getPulseLength +Java_org_wpilib_hardware_hal_simulation_DIODataJNI_getPulseLength (JNIEnv*, jclass, jint index) { return HALSIM_GetDIOPulseLength(index); } /* - * Class: edu_wpi_first_hal_simulation_DIODataJNI + * Class: org_wpilib_hardware_hal_simulation_DIODataJNI * Method: setPulseLength * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DIODataJNI_setPulseLength +Java_org_wpilib_hardware_hal_simulation_DIODataJNI_setPulseLength (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetDIOPulseLength(index, value); } /* - * Class: edu_wpi_first_hal_simulation_DIODataJNI + * Class: org_wpilib_hardware_hal_simulation_DIODataJNI * Method: registerIsInputCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DIODataJNI_registerIsInputCallback +Java_org_wpilib_hardware_hal_simulation_DIODataJNI_registerIsInputCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -175,12 +175,12 @@ Java_edu_wpi_first_hal_simulation_DIODataJNI_registerIsInputCallback } /* - * Class: edu_wpi_first_hal_simulation_DIODataJNI + * Class: org_wpilib_hardware_hal_simulation_DIODataJNI * Method: cancelIsInputCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DIODataJNI_cancelIsInputCallback +Java_org_wpilib_hardware_hal_simulation_DIODataJNI_cancelIsInputCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -188,36 +188,36 @@ Java_edu_wpi_first_hal_simulation_DIODataJNI_cancelIsInputCallback } /* - * Class: edu_wpi_first_hal_simulation_DIODataJNI + * Class: org_wpilib_hardware_hal_simulation_DIODataJNI * Method: getIsInput * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_DIODataJNI_getIsInput +Java_org_wpilib_hardware_hal_simulation_DIODataJNI_getIsInput (JNIEnv*, jclass, jint index) { return HALSIM_GetDIOIsInput(index); } /* - * Class: edu_wpi_first_hal_simulation_DIODataJNI + * Class: org_wpilib_hardware_hal_simulation_DIODataJNI * Method: setIsInput * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DIODataJNI_setIsInput +Java_org_wpilib_hardware_hal_simulation_DIODataJNI_setIsInput (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetDIOIsInput(index, value); } /* - * Class: edu_wpi_first_hal_simulation_DIODataJNI + * Class: org_wpilib_hardware_hal_simulation_DIODataJNI * Method: registerFilterIndexCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DIODataJNI_registerFilterIndexCallback +Java_org_wpilib_hardware_hal_simulation_DIODataJNI_registerFilterIndexCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -225,12 +225,12 @@ Java_edu_wpi_first_hal_simulation_DIODataJNI_registerFilterIndexCallback } /* - * Class: edu_wpi_first_hal_simulation_DIODataJNI + * Class: org_wpilib_hardware_hal_simulation_DIODataJNI * Method: cancelFilterIndexCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DIODataJNI_cancelFilterIndexCallback +Java_org_wpilib_hardware_hal_simulation_DIODataJNI_cancelFilterIndexCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -238,36 +238,36 @@ Java_edu_wpi_first_hal_simulation_DIODataJNI_cancelFilterIndexCallback } /* - * Class: edu_wpi_first_hal_simulation_DIODataJNI + * Class: org_wpilib_hardware_hal_simulation_DIODataJNI * Method: getFilterIndex * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DIODataJNI_getFilterIndex +Java_org_wpilib_hardware_hal_simulation_DIODataJNI_getFilterIndex (JNIEnv*, jclass, jint index) { return HALSIM_GetDIOFilterIndex(index); } /* - * Class: edu_wpi_first_hal_simulation_DIODataJNI + * Class: org_wpilib_hardware_hal_simulation_DIODataJNI * Method: setFilterIndex * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DIODataJNI_setFilterIndex +Java_org_wpilib_hardware_hal_simulation_DIODataJNI_setFilterIndex (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetDIOFilterIndex(index, value); } /* - * Class: edu_wpi_first_hal_simulation_DIODataJNI + * Class: org_wpilib_hardware_hal_simulation_DIODataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DIODataJNI_resetData +Java_org_wpilib_hardware_hal_simulation_DIODataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetDIOData(index); diff --git a/hal/src/main/native/cpp/jni/simulation/DigitalPWMDataJNI.cpp b/hal/src/main/native/cpp/jni/simulation/DigitalPWMDataJNI.cpp index 3ba39318fd..f1dc2d4ecd 100644 --- a/hal/src/main/native/cpp/jni/simulation/DigitalPWMDataJNI.cpp +++ b/hal/src/main/native/cpp/jni/simulation/DigitalPWMDataJNI.cpp @@ -5,7 +5,7 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_simulation_DigitalPWMDataJNI.h" +#include "org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI.h" #include "hal/simulation/DigitalPWMData.h" using namespace hal; @@ -13,12 +13,12 @@ using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_registerInitializedCallback +Java_org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -26,12 +26,12 @@ Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_registerInitializedCallback } /* - * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_cancelInitializedCallback +Java_org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -39,36 +39,36 @@ Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_cancelInitializedCallback } /* - * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_getInitialized +Java_org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetDigitalPWMInitialized(index); } /* - * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_setInitialized +Java_org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetDigitalPWMInitialized(index, value); } /* - * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI * Method: registerDutyCycleCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_registerDutyCycleCallback +Java_org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI_registerDutyCycleCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -76,12 +76,12 @@ Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_registerDutyCycleCallback } /* - * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI * Method: cancelDutyCycleCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_cancelDutyCycleCallback +Java_org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI_cancelDutyCycleCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -89,36 +89,36 @@ Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_cancelDutyCycleCallback } /* - * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI * Method: getDutyCycle * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_getDutyCycle +Java_org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI_getDutyCycle (JNIEnv*, jclass, jint index) { return HALSIM_GetDigitalPWMDutyCycle(index); } /* - * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI * Method: setDutyCycle * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_setDutyCycle +Java_org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI_setDutyCycle (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetDigitalPWMDutyCycle(index, value); } /* - * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI * Method: registerPinCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_registerPinCallback +Java_org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI_registerPinCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -126,12 +126,12 @@ Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_registerPinCallback } /* - * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI * Method: cancelPinCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_cancelPinCallback +Java_org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI_cancelPinCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -139,48 +139,48 @@ Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_cancelPinCallback } /* - * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI * Method: getPin * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_getPin +Java_org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI_getPin (JNIEnv*, jclass, jint index) { return HALSIM_GetDigitalPWMPin(index); } /* - * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI * Method: setPin * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_setPin +Java_org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI_setPin (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetDigitalPWMPin(index, value); } /* - * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_resetData +Java_org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetDigitalPWMData(index); } /* - * Class: edu_wpi_first_hal_simulation_DigitalPWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI * Method: findForChannel * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DigitalPWMDataJNI_findForChannel +Java_org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI_findForChannel (JNIEnv*, jclass, jint channel) { return HALSIM_FindDigitalPWMForChannel(channel); diff --git a/hal/src/main/native/cpp/jni/simulation/DriverStationDataJNI.cpp b/hal/src/main/native/cpp/jni/simulation/DriverStationDataJNI.cpp index 0db407f316..7729d70277 100644 --- a/hal/src/main/native/cpp/jni/simulation/DriverStationDataJNI.cpp +++ b/hal/src/main/native/cpp/jni/simulation/DriverStationDataJNI.cpp @@ -8,7 +8,7 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_simulation_DriverStationDataJNI.h" +#include "org_wpilib_hardware_hal_simulation_DriverStationDataJNI.h" #include "hal/simulation/DriverStationData.h" #include "hal/simulation/MockHooks.h" @@ -18,12 +18,12 @@ using namespace wpi::java; extern "C" { /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: registerEnabledCallback * Signature: (Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerEnabledCallback +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_registerEnabledCallback (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { return sim::AllocateCallbackNoIndex( @@ -32,12 +32,12 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerEnabledCallback } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: cancelEnabledCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_cancelEnabledCallback +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_cancelEnabledCallback (JNIEnv* env, jclass, jint handle) { return sim::FreeCallbackNoIndex(env, handle, @@ -45,36 +45,36 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_cancelEnabledCallback } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: getEnabled * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_getEnabled +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_getEnabled (JNIEnv*, jclass) { return HALSIM_GetDriverStationEnabled(); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setEnabled * Signature: (Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setEnabled +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setEnabled (JNIEnv*, jclass, jboolean value) { HALSIM_SetDriverStationEnabled(value); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: registerAutonomousCallback * Signature: (Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerAutonomousCallback +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_registerAutonomousCallback (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { return sim::AllocateCallbackNoIndex( @@ -83,12 +83,12 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerAutonomousCallbac } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: cancelAutonomousCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_cancelAutonomousCallback +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_cancelAutonomousCallback (JNIEnv* env, jclass, jint handle) { return sim::FreeCallbackNoIndex( @@ -96,36 +96,36 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_cancelAutonomousCallback } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: getAutonomous * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_getAutonomous +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_getAutonomous (JNIEnv*, jclass) { return HALSIM_GetDriverStationAutonomous(); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setAutonomous * Signature: (Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setAutonomous +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setAutonomous (JNIEnv*, jclass, jboolean value) { HALSIM_SetDriverStationAutonomous(value); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: registerTestCallback * Signature: (Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerTestCallback +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_registerTestCallback (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { return sim::AllocateCallbackNoIndex( @@ -133,12 +133,12 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerTestCallback } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: cancelTestCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_cancelTestCallback +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_cancelTestCallback (JNIEnv* env, jclass, jint handle) { return sim::FreeCallbackNoIndex(env, handle, @@ -146,36 +146,36 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_cancelTestCallback } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: getTest * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_getTest +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_getTest (JNIEnv*, jclass) { return HALSIM_GetDriverStationTest(); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setTest * Signature: (Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setTest +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setTest (JNIEnv*, jclass, jboolean value) { HALSIM_SetDriverStationTest(value); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: registerEStopCallback * Signature: (Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerEStopCallback +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_registerEStopCallback (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { return sim::AllocateCallbackNoIndex( @@ -183,12 +183,12 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerEStopCallback } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: cancelEStopCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_cancelEStopCallback +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_cancelEStopCallback (JNIEnv* env, jclass, jint handle) { return sim::FreeCallbackNoIndex(env, handle, @@ -196,36 +196,36 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_cancelEStopCallback } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: getEStop * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_getEStop +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_getEStop (JNIEnv*, jclass) { return HALSIM_GetDriverStationEStop(); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setEStop * Signature: (Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setEStop +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setEStop (JNIEnv*, jclass, jboolean value) { HALSIM_SetDriverStationEStop(value); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: registerFmsAttachedCallback * Signature: (Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerFmsAttachedCallback +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_registerFmsAttachedCallback (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { return sim::AllocateCallbackNoIndex( @@ -234,12 +234,12 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerFmsAttachedCallba } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: cancelFmsAttachedCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_cancelFmsAttachedCallback +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_cancelFmsAttachedCallback (JNIEnv* env, jclass, jint handle) { return sim::FreeCallbackNoIndex( @@ -247,36 +247,36 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_cancelFmsAttachedCallback } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: getFmsAttached * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_getFmsAttached +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_getFmsAttached (JNIEnv*, jclass) { return HALSIM_GetDriverStationFmsAttached(); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setFmsAttached * Signature: (Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setFmsAttached +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setFmsAttached (JNIEnv*, jclass, jboolean value) { HALSIM_SetDriverStationFmsAttached(value); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: registerDsAttachedCallback * Signature: (Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerDsAttachedCallback +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_registerDsAttachedCallback (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { return sim::AllocateCallbackNoIndex( @@ -285,12 +285,12 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerDsAttachedCallbac } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: cancelDsAttachedCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_cancelDsAttachedCallback +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_cancelDsAttachedCallback (JNIEnv* env, jclass, jint handle) { return sim::FreeCallbackNoIndex( @@ -298,36 +298,36 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_cancelDsAttachedCallback } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: getDsAttached * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_getDsAttached +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_getDsAttached (JNIEnv*, jclass) { return HALSIM_GetDriverStationDsAttached(); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setDsAttached * Signature: (Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setDsAttached +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setDsAttached (JNIEnv*, jclass, jboolean value) { HALSIM_SetDriverStationDsAttached(value); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: registerAllianceStationIdCallback * Signature: (Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerAllianceStationIdCallback +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_registerAllianceStationIdCallback (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { return sim::AllocateCallbackNoIndex( @@ -336,12 +336,12 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerAllianceStationId } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: cancelAllianceStationIdCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_cancelAllianceStationIdCallback +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_cancelAllianceStationIdCallback (JNIEnv* env, jclass, jint handle) { return sim::FreeCallbackNoIndex( @@ -349,24 +349,24 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_cancelAllianceStationIdCa } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: getAllianceStationId * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_getAllianceStationId +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_getAllianceStationId (JNIEnv*, jclass) { return HALSIM_GetDriverStationAllianceStationId(); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setAllianceStationId * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setAllianceStationId +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setAllianceStationId (JNIEnv*, jclass, jint value) { HALSIM_SetDriverStationAllianceStationId( @@ -374,12 +374,12 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setAllianceStationId } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: registerMatchTimeCallback * Signature: (Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerMatchTimeCallback +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_registerMatchTimeCallback (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { return sim::AllocateCallbackNoIndex( @@ -388,12 +388,12 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerMatchTimeCallback } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: cancelMatchTimeCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_cancelMatchTimeCallback +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_cancelMatchTimeCallback (JNIEnv* env, jclass, jint handle) { return sim::FreeCallbackNoIndex(env, handle, @@ -401,36 +401,36 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_cancelMatchTimeCallback } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: getMatchTime * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_getMatchTime +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_getMatchTime (JNIEnv*, jclass) { return HALSIM_GetDriverStationMatchTime(); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setMatchTime * Signature: (D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setMatchTime +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setMatchTime (JNIEnv*, jclass, jdouble value) { HALSIM_SetDriverStationMatchTime(value); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setJoystickAxes * Signature: (B[FS)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setJoystickAxes +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setJoystickAxes (JNIEnv* env, jclass, jbyte joystickNum, jfloatArray axesArray, jshort availableAxes) { @@ -451,12 +451,12 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setJoystickAxes } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setJoystickPOVs * Signature: (B[BS)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setJoystickPOVs +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setJoystickPOVs (JNIEnv* env, jclass, jbyte joystickNum, jbyteArray povsArray, jshort availablePovs) { @@ -477,12 +477,12 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setJoystickPOVs } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setJoystickButtons * Signature: (BJJ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setJoystickButtons +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setJoystickButtons (JNIEnv* env, jclass, jbyte joystickNum, jlong buttons, jlong availableButtons) { @@ -493,12 +493,12 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setJoystickButtons } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: getJoystickOutputs * Signature: (I)J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_getJoystickOutputs +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_getJoystickOutputs (JNIEnv* env, jclass, jint stick) { int64_t outputs = 0; @@ -509,12 +509,12 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_getJoystickOutputs } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: getJoystickRumble * Signature: (II)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_getJoystickRumble +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_getJoystickRumble (JNIEnv* env, jclass, jint stick, jint rumbleNum) { int64_t outputs; @@ -525,12 +525,12 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_getJoystickRumble } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setMatchInfo * Signature: (Ljava/lang/String;Ljava/lang/String;III)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setMatchInfo +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setMatchInfo (JNIEnv* env, jclass, jstring eventName, jstring gameSpecificMessage, jint matchNumber, jint replayNumber, jint matchType) { @@ -552,12 +552,12 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setMatchInfo } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: registerAllCallbacks * Signature: (Ljava/lang/Object;Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerAllCallbacks +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_registerAllCallbacks (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { sim::AllocateCallbackNoIndex( @@ -569,24 +569,24 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_registerAllCallbacks } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: notifyNewData * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_notifyNewData +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_notifyNewData (JNIEnv*, jclass) { HALSIM_NotifyDriverStationNewData(); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setSendError * Signature: (Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setSendError +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setSendError (JNIEnv*, jclass, jboolean shouldSend) { if (shouldSend) { @@ -600,12 +600,12 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setSendError } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setSendConsoleLine * Signature: (Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setSendConsoleLine +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setSendConsoleLine (JNIEnv*, jclass, jboolean shouldSend) { if (shouldSend) { @@ -616,120 +616,120 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setSendConsoleLine } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setJoystickButton * Signature: (IIZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setJoystickButton +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setJoystickButton (JNIEnv*, jclass, jint stick, jint button, jboolean state) { HALSIM_SetJoystickButton(stick, button, state); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setJoystickAxis * Signature: (IID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setJoystickAxis +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setJoystickAxis (JNIEnv*, jclass, jint stick, jint axis, jdouble value) { HALSIM_SetJoystickAxis(stick, axis, value); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setJoystickPOV * Signature: (IIB)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setJoystickPOV +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setJoystickPOV (JNIEnv*, jclass, jint stick, jint pov, jbyte value) { HALSIM_SetJoystickPOV(stick, pov, static_cast(value)); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setJoystickButtonsValue * Signature: (IJ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setJoystickButtonsValue +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setJoystickButtonsValue (JNIEnv*, jclass, jint stick, jlong buttons) { HALSIM_SetJoystickButtonsValue(stick, buttons); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setJoystickAxesAvailable * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setJoystickAxesAvailable +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setJoystickAxesAvailable (JNIEnv*, jclass, jint stick, jint available) { HALSIM_SetJoystickAxesAvailable(stick, available); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setJoystickPOVsAvailable * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setJoystickPOVsAvailable +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setJoystickPOVsAvailable (JNIEnv*, jclass, jint stick, jint available) { HALSIM_SetJoystickPOVsAvailable(stick, available); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setJoystickButtonsAvailable * Signature: (IJ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setJoystickButtonsAvailable +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setJoystickButtonsAvailable (JNIEnv*, jclass, jint stick, jlong available) { HALSIM_SetJoystickButtonsAvailable(stick, available); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setJoystickIsGamepad * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setJoystickIsGamepad +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setJoystickIsGamepad (JNIEnv*, jclass, jint stick, jboolean isGamepad) { HALSIM_SetJoystickIsGamepad(stick, isGamepad); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setJoystickType * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setJoystickType +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setJoystickType (JNIEnv*, jclass, jint stick, jint type) { HALSIM_SetJoystickType(stick, type); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setJoystickName * Signature: (ILjava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setJoystickName +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setJoystickName (JNIEnv* env, jclass, jint stick, jstring name) { JStringRef nameJString{env, name}; @@ -738,12 +738,12 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setJoystickName } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setGameSpecificMessage * Signature: (Ljava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setGameSpecificMessage +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setGameSpecificMessage (JNIEnv* env, jclass, jstring message) { JStringRef messageJString{env, message}; @@ -752,12 +752,12 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setGameSpecificMessage } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setEventName * Signature: (Ljava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setEventName +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setEventName (JNIEnv* env, jclass, jstring name) { JStringRef nameJString{env, name}; @@ -766,48 +766,48 @@ Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setEventName } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setMatchType * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setMatchType +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setMatchType (JNIEnv*, jclass, jint type) { HALSIM_SetMatchType(static_cast(static_cast(type))); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setMatchNumber * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setMatchNumber +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setMatchNumber (JNIEnv*, jclass, jint matchNumber) { HALSIM_SetMatchNumber(matchNumber); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: setReplayNumber * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_setReplayNumber +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_setReplayNumber (JNIEnv*, jclass, jint replayNumber) { HALSIM_SetReplayNumber(replayNumber); } /* - * Class: edu_wpi_first_hal_simulation_DriverStationDataJNI + * Class: org_wpilib_hardware_hal_simulation_DriverStationDataJNI * Method: resetData * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DriverStationDataJNI_resetData +Java_org_wpilib_hardware_hal_simulation_DriverStationDataJNI_resetData (JNIEnv*, jclass) { HALSIM_ResetDriverStationData(); diff --git a/hal/src/main/native/cpp/jni/simulation/DutyCycleDataJNI.cpp b/hal/src/main/native/cpp/jni/simulation/DutyCycleDataJNI.cpp index 13f413676f..9eb74d99b4 100644 --- a/hal/src/main/native/cpp/jni/simulation/DutyCycleDataJNI.cpp +++ b/hal/src/main/native/cpp/jni/simulation/DutyCycleDataJNI.cpp @@ -5,7 +5,7 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_simulation_DutyCycleDataJNI.h" +#include "org_wpilib_hardware_hal_simulation_DutyCycleDataJNI.h" #include "hal/simulation/DutyCycleData.h" using namespace hal; @@ -13,12 +13,12 @@ using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI + * Class: org_wpilib_hardware_hal_simulation_DutyCycleDataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_registerInitializedCallback +Java_org_wpilib_hardware_hal_simulation_DutyCycleDataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -26,12 +26,12 @@ Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_registerInitializedCallback } /* - * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI + * Class: org_wpilib_hardware_hal_simulation_DutyCycleDataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_cancelInitializedCallback +Java_org_wpilib_hardware_hal_simulation_DutyCycleDataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -39,36 +39,36 @@ Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_cancelInitializedCallback } /* - * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI + * Class: org_wpilib_hardware_hal_simulation_DutyCycleDataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_getInitialized +Java_org_wpilib_hardware_hal_simulation_DutyCycleDataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetDutyCycleInitialized(index); } /* - * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI + * Class: org_wpilib_hardware_hal_simulation_DutyCycleDataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_setInitialized +Java_org_wpilib_hardware_hal_simulation_DutyCycleDataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetDutyCycleInitialized(index, value); } /* - * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI + * Class: org_wpilib_hardware_hal_simulation_DutyCycleDataJNI * Method: registerFrequencyCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_registerFrequencyCallback +Java_org_wpilib_hardware_hal_simulation_DutyCycleDataJNI_registerFrequencyCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -76,12 +76,12 @@ Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_registerFrequencyCallback } /* - * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI + * Class: org_wpilib_hardware_hal_simulation_DutyCycleDataJNI * Method: cancelFrequencyCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_cancelFrequencyCallback +Java_org_wpilib_hardware_hal_simulation_DutyCycleDataJNI_cancelFrequencyCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -89,36 +89,36 @@ Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_cancelFrequencyCallback } /* - * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI + * Class: org_wpilib_hardware_hal_simulation_DutyCycleDataJNI * Method: getFrequency * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_getFrequency +Java_org_wpilib_hardware_hal_simulation_DutyCycleDataJNI_getFrequency (JNIEnv*, jclass, jint index) { return HALSIM_GetDutyCycleFrequency(index); } /* - * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI + * Class: org_wpilib_hardware_hal_simulation_DutyCycleDataJNI * Method: setFrequency * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_setFrequency +Java_org_wpilib_hardware_hal_simulation_DutyCycleDataJNI_setFrequency (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetDutyCycleFrequency(index, value); } /* - * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI + * Class: org_wpilib_hardware_hal_simulation_DutyCycleDataJNI * Method: registerOutputCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_registerOutputCallback +Java_org_wpilib_hardware_hal_simulation_DutyCycleDataJNI_registerOutputCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -126,12 +126,12 @@ Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_registerOutputCallback } /* - * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI + * Class: org_wpilib_hardware_hal_simulation_DutyCycleDataJNI * Method: cancelOutputCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_cancelOutputCallback +Java_org_wpilib_hardware_hal_simulation_DutyCycleDataJNI_cancelOutputCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -139,36 +139,36 @@ Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_cancelOutputCallback } /* - * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI + * Class: org_wpilib_hardware_hal_simulation_DutyCycleDataJNI * Method: getOutput * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_getOutput +Java_org_wpilib_hardware_hal_simulation_DutyCycleDataJNI_getOutput (JNIEnv*, jclass, jint index) { return HALSIM_GetDutyCycleOutput(index); } /* - * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI + * Class: org_wpilib_hardware_hal_simulation_DutyCycleDataJNI * Method: setOutput * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_setOutput +Java_org_wpilib_hardware_hal_simulation_DutyCycleDataJNI_setOutput (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetDutyCycleOutput(index, value); } /* - * Class: edu_wpi_first_hal_simulation_DutyCycleDataJNI + * Class: org_wpilib_hardware_hal_simulation_DutyCycleDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_DutyCycleDataJNI_resetData +Java_org_wpilib_hardware_hal_simulation_DutyCycleDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetDutyCycleData(index); diff --git a/hal/src/main/native/cpp/jni/simulation/EncoderDataJNI.cpp b/hal/src/main/native/cpp/jni/simulation/EncoderDataJNI.cpp index a33458fab7..b573e61f2f 100644 --- a/hal/src/main/native/cpp/jni/simulation/EncoderDataJNI.cpp +++ b/hal/src/main/native/cpp/jni/simulation/EncoderDataJNI.cpp @@ -5,7 +5,7 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_simulation_EncoderDataJNI.h" +#include "org_wpilib_hardware_hal_simulation_EncoderDataJNI.h" #include "hal/simulation/EncoderData.h" using namespace hal; @@ -13,12 +13,12 @@ using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerInitializedCallback +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -26,12 +26,12 @@ Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerInitializedCallback } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelInitializedCallback +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -39,36 +39,36 @@ Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelInitializedCallback } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_getInitialized +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetEncoderInitialized(index); } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_setInitialized +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetEncoderInitialized(index, value); } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: registerCountCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerCountCallback +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_registerCountCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -76,12 +76,12 @@ Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerCountCallback } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: cancelCountCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelCountCallback +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_cancelCountCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -89,36 +89,36 @@ Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelCountCallback } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: getCount * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_getCount +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_getCount (JNIEnv*, jclass, jint index) { return HALSIM_GetEncoderCount(index); } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: setCount * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_setCount +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_setCount (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetEncoderCount(index, value); } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: registerPeriodCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerPeriodCallback +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_registerPeriodCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -126,12 +126,12 @@ Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerPeriodCallback } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: cancelPeriodCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelPeriodCallback +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_cancelPeriodCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -139,36 +139,36 @@ Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelPeriodCallback } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: getPeriod * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_getPeriod +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_getPeriod (JNIEnv*, jclass, jint index) { return HALSIM_GetEncoderPeriod(index); } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: setPeriod * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_setPeriod +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_setPeriod (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetEncoderPeriod(index, value); } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: registerResetCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerResetCallback +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_registerResetCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -176,12 +176,12 @@ Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerResetCallback } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: cancelResetCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelResetCallback +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_cancelResetCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -189,36 +189,36 @@ Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelResetCallback } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: getReset * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_getReset +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_getReset (JNIEnv*, jclass, jint index) { return HALSIM_GetEncoderReset(index); } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: setReset * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_setReset +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_setReset (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetEncoderReset(index, value); } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: registerMaxPeriodCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerMaxPeriodCallback +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_registerMaxPeriodCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -226,12 +226,12 @@ Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerMaxPeriodCallback } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: cancelMaxPeriodCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelMaxPeriodCallback +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_cancelMaxPeriodCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -239,36 +239,36 @@ Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelMaxPeriodCallback } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: getMaxPeriod * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_getMaxPeriod +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_getMaxPeriod (JNIEnv*, jclass, jint index) { return HALSIM_GetEncoderMaxPeriod(index); } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: setMaxPeriod * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_setMaxPeriod +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_setMaxPeriod (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetEncoderMaxPeriod(index, value); } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: registerDirectionCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerDirectionCallback +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_registerDirectionCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -276,12 +276,12 @@ Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerDirectionCallback } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: cancelDirectionCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelDirectionCallback +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_cancelDirectionCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -289,36 +289,36 @@ Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelDirectionCallback } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: getDirection * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_getDirection +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_getDirection (JNIEnv*, jclass, jint index) { return HALSIM_GetEncoderDirection(index); } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: setDirection * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_setDirection +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_setDirection (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetEncoderDirection(index, value); } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: registerReverseDirectionCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerReverseDirectionCallback +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_registerReverseDirectionCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -326,12 +326,12 @@ Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerReverseDirectionCallbac } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: cancelReverseDirectionCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelReverseDirectionCallback +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_cancelReverseDirectionCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -339,36 +339,36 @@ Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelReverseDirectionCallback } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: getReverseDirection * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_getReverseDirection +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_getReverseDirection (JNIEnv*, jclass, jint index) { return HALSIM_GetEncoderReverseDirection(index); } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: setReverseDirection * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_setReverseDirection +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_setReverseDirection (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetEncoderReverseDirection(index, value); } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: registerSamplesToAverageCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerSamplesToAverageCallback +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_registerSamplesToAverageCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -376,12 +376,12 @@ Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerSamplesToAverageCallbac } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: cancelSamplesToAverageCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelSamplesToAverageCallback +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_cancelSamplesToAverageCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -389,36 +389,36 @@ Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelSamplesToAverageCallback } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: getSamplesToAverage * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_getSamplesToAverage +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_getSamplesToAverage (JNIEnv*, jclass, jint index) { return HALSIM_GetEncoderSamplesToAverage(index); } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: setSamplesToAverage * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_setSamplesToAverage +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_setSamplesToAverage (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetEncoderSamplesToAverage(index, value); } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: registerDistancePerPulseCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerDistancePerPulseCallback +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_registerDistancePerPulseCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -426,12 +426,12 @@ Java_edu_wpi_first_hal_simulation_EncoderDataJNI_registerDistancePerPulseCallbac } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: cancelDistancePerPulseCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelDistancePerPulseCallback +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_cancelDistancePerPulseCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -439,96 +439,96 @@ Java_edu_wpi_first_hal_simulation_EncoderDataJNI_cancelDistancePerPulseCallback } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: getDistancePerPulse * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_getDistancePerPulse +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_getDistancePerPulse (JNIEnv*, jclass, jint index) { return HALSIM_GetEncoderDistancePerPulse(index); } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: setDistancePerPulse * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_setDistancePerPulse +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_setDistancePerPulse (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetEncoderDistancePerPulse(index, value); } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: setDistance * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_setDistance +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_setDistance (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetEncoderDistance(index, value); } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: getDistance * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_getDistance +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_getDistance (JNIEnv*, jclass, jint index) { return HALSIM_GetEncoderDistance(index); } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: setRate * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_setRate +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_setRate (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetEncoderRate(index, value); } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: getRate * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_getRate +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_getRate (JNIEnv*, jclass, jint index) { return HALSIM_GetEncoderRate(index); } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_resetData +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetEncoderData(index); } /* - * Class: edu_wpi_first_hal_simulation_EncoderDataJNI + * Class: org_wpilib_hardware_hal_simulation_EncoderDataJNI * Method: findForChannel * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_EncoderDataJNI_findForChannel +Java_org_wpilib_hardware_hal_simulation_EncoderDataJNI_findForChannel (JNIEnv*, jclass, jint channel) { return HALSIM_FindEncoderForChannel(channel); diff --git a/hal/src/main/native/cpp/jni/simulation/I2CDataJNI.cpp b/hal/src/main/native/cpp/jni/simulation/I2CDataJNI.cpp index c02375451d..f34bfdf19d 100644 --- a/hal/src/main/native/cpp/jni/simulation/I2CDataJNI.cpp +++ b/hal/src/main/native/cpp/jni/simulation/I2CDataJNI.cpp @@ -7,7 +7,7 @@ #include "BufferCallbackStore.h" #include "CallbackStore.h" #include "ConstBufferCallbackStore.h" -#include "edu_wpi_first_hal_simulation_I2CDataJNI.h" +#include "org_wpilib_hardware_hal_simulation_I2CDataJNI.h" #include "hal/simulation/I2CData.h" using namespace hal; @@ -15,12 +15,12 @@ using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_simulation_I2CDataJNI + * Class: org_wpilib_hardware_hal_simulation_I2CDataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_I2CDataJNI_registerInitializedCallback +Java_org_wpilib_hardware_hal_simulation_I2CDataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -28,12 +28,12 @@ Java_edu_wpi_first_hal_simulation_I2CDataJNI_registerInitializedCallback } /* - * Class: edu_wpi_first_hal_simulation_I2CDataJNI + * Class: org_wpilib_hardware_hal_simulation_I2CDataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_I2CDataJNI_cancelInitializedCallback +Java_org_wpilib_hardware_hal_simulation_I2CDataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -41,36 +41,36 @@ Java_edu_wpi_first_hal_simulation_I2CDataJNI_cancelInitializedCallback } /* - * Class: edu_wpi_first_hal_simulation_I2CDataJNI + * Class: org_wpilib_hardware_hal_simulation_I2CDataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_I2CDataJNI_getInitialized +Java_org_wpilib_hardware_hal_simulation_I2CDataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetI2CInitialized(index); } /* - * Class: edu_wpi_first_hal_simulation_I2CDataJNI + * Class: org_wpilib_hardware_hal_simulation_I2CDataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_I2CDataJNI_setInitialized +Java_org_wpilib_hardware_hal_simulation_I2CDataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetI2CInitialized(index, value); } /* - * Class: edu_wpi_first_hal_simulation_I2CDataJNI + * Class: org_wpilib_hardware_hal_simulation_I2CDataJNI * Method: registerReadCallback * Signature: (ILjava/lang/Object;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_I2CDataJNI_registerReadCallback +Java_org_wpilib_hardware_hal_simulation_I2CDataJNI_registerReadCallback (JNIEnv* env, jclass, jint index, jobject callback) { return sim::AllocateBufferCallback(env, index, callback, @@ -78,24 +78,24 @@ Java_edu_wpi_first_hal_simulation_I2CDataJNI_registerReadCallback } /* - * Class: edu_wpi_first_hal_simulation_I2CDataJNI + * Class: org_wpilib_hardware_hal_simulation_I2CDataJNI * Method: cancelReadCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_I2CDataJNI_cancelReadCallback +Java_org_wpilib_hardware_hal_simulation_I2CDataJNI_cancelReadCallback (JNIEnv* env, jclass, jint index, jint handle) { sim::FreeBufferCallback(env, handle, index, &HALSIM_CancelI2CReadCallback); } /* - * Class: edu_wpi_first_hal_simulation_I2CDataJNI + * Class: org_wpilib_hardware_hal_simulation_I2CDataJNI * Method: registerWriteCallback * Signature: (ILjava/lang/Object;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_I2CDataJNI_registerWriteCallback +Java_org_wpilib_hardware_hal_simulation_I2CDataJNI_registerWriteCallback (JNIEnv* env, jclass, jint index, jobject callback) { return sim::AllocateConstBufferCallback(env, index, callback, @@ -103,12 +103,12 @@ Java_edu_wpi_first_hal_simulation_I2CDataJNI_registerWriteCallback } /* - * Class: edu_wpi_first_hal_simulation_I2CDataJNI + * Class: org_wpilib_hardware_hal_simulation_I2CDataJNI * Method: cancelWriteCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_I2CDataJNI_cancelWriteCallback +Java_org_wpilib_hardware_hal_simulation_I2CDataJNI_cancelWriteCallback (JNIEnv* env, jclass, jint index, jint handle) { sim::FreeConstBufferCallback(env, handle, index, @@ -116,12 +116,12 @@ Java_edu_wpi_first_hal_simulation_I2CDataJNI_cancelWriteCallback } /* - * Class: edu_wpi_first_hal_simulation_I2CDataJNI + * Class: org_wpilib_hardware_hal_simulation_I2CDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_I2CDataJNI_resetData +Java_org_wpilib_hardware_hal_simulation_I2CDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetI2CData(index); diff --git a/hal/src/main/native/cpp/jni/simulation/NotifierDataJNI.cpp b/hal/src/main/native/cpp/jni/simulation/NotifierDataJNI.cpp index 15b02d79a9..dd34bf51f1 100644 --- a/hal/src/main/native/cpp/jni/simulation/NotifierDataJNI.cpp +++ b/hal/src/main/native/cpp/jni/simulation/NotifierDataJNI.cpp @@ -2,30 +2,30 @@ // 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 "edu_wpi_first_hal_simulation_NotifierDataJNI.h" +#include "org_wpilib_hardware_hal_simulation_NotifierDataJNI.h" #include "hal/simulation/NotifierData.h" extern "C" { /* - * Class: edu_wpi_first_hal_simulation_NotifierDataJNI + * Class: org_wpilib_hardware_hal_simulation_NotifierDataJNI * Method: getNextTimeout * Signature: ()J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_hal_simulation_NotifierDataJNI_getNextTimeout +Java_org_wpilib_hardware_hal_simulation_NotifierDataJNI_getNextTimeout (JNIEnv*, jclass) { return HALSIM_GetNextNotifierTimeout(); } /* - * Class: edu_wpi_first_hal_simulation_NotifierDataJNI + * Class: org_wpilib_hardware_hal_simulation_NotifierDataJNI * Method: getNumNotifiers * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_NotifierDataJNI_getNumNotifiers +Java_org_wpilib_hardware_hal_simulation_NotifierDataJNI_getNumNotifiers (JNIEnv*, jclass) { return HALSIM_GetNumNotifiers(); diff --git a/hal/src/main/native/cpp/jni/simulation/PWMDataJNI.cpp b/hal/src/main/native/cpp/jni/simulation/PWMDataJNI.cpp index ffab4aa512..e947039f30 100644 --- a/hal/src/main/native/cpp/jni/simulation/PWMDataJNI.cpp +++ b/hal/src/main/native/cpp/jni/simulation/PWMDataJNI.cpp @@ -5,7 +5,7 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_simulation_PWMDataJNI.h" +#include "org_wpilib_hardware_hal_simulation_PWMDataJNI.h" #include "hal/simulation/PWMData.h" using namespace hal; @@ -13,12 +13,12 @@ using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_simulation_PWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_PWMDataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_PWMDataJNI_registerInitializedCallback +Java_org_wpilib_hardware_hal_simulation_PWMDataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -26,12 +26,12 @@ Java_edu_wpi_first_hal_simulation_PWMDataJNI_registerInitializedCallback } /* - * Class: edu_wpi_first_hal_simulation_PWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_PWMDataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_PWMDataJNI_cancelInitializedCallback +Java_org_wpilib_hardware_hal_simulation_PWMDataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -39,36 +39,36 @@ Java_edu_wpi_first_hal_simulation_PWMDataJNI_cancelInitializedCallback } /* - * Class: edu_wpi_first_hal_simulation_PWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_PWMDataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_PWMDataJNI_getInitialized +Java_org_wpilib_hardware_hal_simulation_PWMDataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetPWMInitialized(index); } /* - * Class: edu_wpi_first_hal_simulation_PWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_PWMDataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_PWMDataJNI_setInitialized +Java_org_wpilib_hardware_hal_simulation_PWMDataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetPWMInitialized(index, value); } /* - * Class: edu_wpi_first_hal_simulation_PWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_PWMDataJNI * Method: registerPulseMicrosecondCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_PWMDataJNI_registerPulseMicrosecondCallback +Java_org_wpilib_hardware_hal_simulation_PWMDataJNI_registerPulseMicrosecondCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -76,12 +76,12 @@ Java_edu_wpi_first_hal_simulation_PWMDataJNI_registerPulseMicrosecondCallback } /* - * Class: edu_wpi_first_hal_simulation_PWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_PWMDataJNI * Method: cancelPulseMicrosecondCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_PWMDataJNI_cancelPulseMicrosecondCallback +Java_org_wpilib_hardware_hal_simulation_PWMDataJNI_cancelPulseMicrosecondCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -89,36 +89,36 @@ Java_edu_wpi_first_hal_simulation_PWMDataJNI_cancelPulseMicrosecondCallback } /* - * Class: edu_wpi_first_hal_simulation_PWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_PWMDataJNI * Method: getPulseMicrosecond * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_PWMDataJNI_getPulseMicrosecond +Java_org_wpilib_hardware_hal_simulation_PWMDataJNI_getPulseMicrosecond (JNIEnv*, jclass, jint index) { return HALSIM_GetPWMPulseMicrosecond(index); } /* - * Class: edu_wpi_first_hal_simulation_PWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_PWMDataJNI * Method: setPulseMicrosecond * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_PWMDataJNI_setPulseMicrosecond +Java_org_wpilib_hardware_hal_simulation_PWMDataJNI_setPulseMicrosecond (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetPWMPulseMicrosecond(index, value); } /* - * Class: edu_wpi_first_hal_simulation_PWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_PWMDataJNI * Method: registerOutputPeriodCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_PWMDataJNI_registerOutputPeriodCallback +Java_org_wpilib_hardware_hal_simulation_PWMDataJNI_registerOutputPeriodCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -126,12 +126,12 @@ Java_edu_wpi_first_hal_simulation_PWMDataJNI_registerOutputPeriodCallback } /* - * Class: edu_wpi_first_hal_simulation_PWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_PWMDataJNI * Method: cancelOutputPeriodCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_PWMDataJNI_cancelOutputPeriodCallback +Java_org_wpilib_hardware_hal_simulation_PWMDataJNI_cancelOutputPeriodCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -139,36 +139,36 @@ Java_edu_wpi_first_hal_simulation_PWMDataJNI_cancelOutputPeriodCallback } /* - * Class: edu_wpi_first_hal_simulation_PWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_PWMDataJNI * Method: getOutputPeriod * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_PWMDataJNI_getOutputPeriod +Java_org_wpilib_hardware_hal_simulation_PWMDataJNI_getOutputPeriod (JNIEnv*, jclass, jint index) { return HALSIM_GetPWMOutputPeriod(index); } /* - * Class: edu_wpi_first_hal_simulation_PWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_PWMDataJNI * Method: setOutputPeriod * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_PWMDataJNI_setOutputPeriod +Java_org_wpilib_hardware_hal_simulation_PWMDataJNI_setOutputPeriod (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetPWMOutputPeriod(index, value); } /* - * Class: edu_wpi_first_hal_simulation_PWMDataJNI + * Class: org_wpilib_hardware_hal_simulation_PWMDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_PWMDataJNI_resetData +Java_org_wpilib_hardware_hal_simulation_PWMDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetPWMData(index); diff --git a/hal/src/main/native/cpp/jni/simulation/PowerDistributionDataJNI.cpp b/hal/src/main/native/cpp/jni/simulation/PowerDistributionDataJNI.cpp index 517dc09b91..85e162cfbb 100644 --- a/hal/src/main/native/cpp/jni/simulation/PowerDistributionDataJNI.cpp +++ b/hal/src/main/native/cpp/jni/simulation/PowerDistributionDataJNI.cpp @@ -5,7 +5,7 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_simulation_PowerDistributionDataJNI.h" +#include "org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI.h" #include "hal/simulation/PowerDistributionData.h" using namespace hal; @@ -13,12 +13,12 @@ using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_simulation_PowerDistributionDataJNI + * Class: org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_registerInitializedCallback +Java_org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback( @@ -27,12 +27,12 @@ Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_registerInitializedCa } /* - * Class: edu_wpi_first_hal_simulation_PowerDistributionDataJNI + * Class: org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_cancelInitializedCallback +Java_org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -40,36 +40,36 @@ Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_cancelInitializedCall } /* - * Class: edu_wpi_first_hal_simulation_PowerDistributionDataJNI + * Class: org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_getInitialized +Java_org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetPowerDistributionInitialized(index); } /* - * Class: edu_wpi_first_hal_simulation_PowerDistributionDataJNI + * Class: org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_setInitialized +Java_org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetPowerDistributionInitialized(index, value); } /* - * Class: edu_wpi_first_hal_simulation_PowerDistributionDataJNI + * Class: org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI * Method: registerTemperatureCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_registerTemperatureCallback +Java_org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI_registerTemperatureCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback( @@ -78,12 +78,12 @@ Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_registerTemperatureCa } /* - * Class: edu_wpi_first_hal_simulation_PowerDistributionDataJNI + * Class: org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI * Method: cancelTemperatureCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_cancelTemperatureCallback +Java_org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI_cancelTemperatureCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -91,36 +91,36 @@ Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_cancelTemperatureCall } /* - * Class: edu_wpi_first_hal_simulation_PowerDistributionDataJNI + * Class: org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI * Method: getTemperature * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_getTemperature +Java_org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI_getTemperature (JNIEnv*, jclass, jint index) { return HALSIM_GetPowerDistributionTemperature(index); } /* - * Class: edu_wpi_first_hal_simulation_PowerDistributionDataJNI + * Class: org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI * Method: setTemperature * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_setTemperature +Java_org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI_setTemperature (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetPowerDistributionTemperature(index, value); } /* - * Class: edu_wpi_first_hal_simulation_PowerDistributionDataJNI + * Class: org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI * Method: registerVoltageCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_registerVoltageCallback +Java_org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI_registerVoltageCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback( @@ -129,12 +129,12 @@ Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_registerVoltageCallba } /* - * Class: edu_wpi_first_hal_simulation_PowerDistributionDataJNI + * Class: org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI * Method: cancelVoltageCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_cancelVoltageCallback +Java_org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI_cancelVoltageCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -142,36 +142,36 @@ Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_cancelVoltageCallback } /* - * Class: edu_wpi_first_hal_simulation_PowerDistributionDataJNI + * Class: org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI * Method: getVoltage * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_getVoltage +Java_org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI_getVoltage (JNIEnv*, jclass, jint index) { return HALSIM_GetPowerDistributionVoltage(index); } /* - * Class: edu_wpi_first_hal_simulation_PowerDistributionDataJNI + * Class: org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI * Method: setVoltage * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_setVoltage +Java_org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI_setVoltage (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetPowerDistributionVoltage(index, value); } /* - * Class: edu_wpi_first_hal_simulation_PowerDistributionDataJNI + * Class: org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI * Method: registerCurrentCallback * Signature: (IILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_registerCurrentCallback +Java_org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI_registerCurrentCallback (JNIEnv* env, jclass, jint index, jint channel, jobject callback, jboolean initialNotify) { @@ -181,12 +181,12 @@ Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_registerCurrentCallba } /* - * Class: edu_wpi_first_hal_simulation_PowerDistributionDataJNI + * Class: org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI * Method: cancelCurrentCallback * Signature: (III)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_cancelCurrentCallback +Java_org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI_cancelCurrentCallback (JNIEnv* env, jclass, jint index, jint channel, jint handle) { return sim::FreeChannelCallback( @@ -195,36 +195,36 @@ Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_cancelCurrentCallback } /* - * Class: edu_wpi_first_hal_simulation_PowerDistributionDataJNI + * Class: org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI * Method: getCurrent * Signature: (II)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_getCurrent +Java_org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI_getCurrent (JNIEnv*, jclass, jint index, jint channel) { return HALSIM_GetPowerDistributionCurrent(index, channel); } /* - * Class: edu_wpi_first_hal_simulation_PowerDistributionDataJNI + * Class: org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI * Method: setCurrent * Signature: (IID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_setCurrent +Java_org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI_setCurrent (JNIEnv*, jclass, jint index, jint channel, jdouble value) { HALSIM_SetPowerDistributionCurrent(index, channel, value); } /* - * Class: edu_wpi_first_hal_simulation_PowerDistributionDataJNI + * Class: org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_PowerDistributionDataJNI_resetData +Java_org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetPowerDistributionData(index); diff --git a/hal/src/main/native/cpp/jni/simulation/REVPHDataJNI.cpp b/hal/src/main/native/cpp/jni/simulation/REVPHDataJNI.cpp index ca718f50c0..2e0ba063c0 100644 --- a/hal/src/main/native/cpp/jni/simulation/REVPHDataJNI.cpp +++ b/hal/src/main/native/cpp/jni/simulation/REVPHDataJNI.cpp @@ -5,7 +5,7 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_simulation_REVPHDataJNI.h" +#include "org_wpilib_hardware_hal_simulation_REVPHDataJNI.h" #include "hal/simulation/REVPHData.h" using namespace hal; @@ -13,12 +13,12 @@ using namespace hal; extern "C" { /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: registerInitializedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_registerInitializedCallback +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_registerInitializedCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -26,12 +26,12 @@ Java_edu_wpi_first_hal_simulation_REVPHDataJNI_registerInitializedCallback } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: cancelInitializedCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_cancelInitializedCallback +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_cancelInitializedCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -39,36 +39,36 @@ Java_edu_wpi_first_hal_simulation_REVPHDataJNI_cancelInitializedCallback } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: getInitialized * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_getInitialized +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_getInitialized (JNIEnv*, jclass, jint index) { return HALSIM_GetREVPHInitialized(index); } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: setInitialized * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_setInitialized +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_setInitialized (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetREVPHInitialized(index, value); } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: registerSolenoidOutputCallback * Signature: (IILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_registerSolenoidOutputCallback +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_registerSolenoidOutputCallback (JNIEnv* env, jclass, jint index, jint channel, jobject callback, jboolean initialNotify) { @@ -78,12 +78,12 @@ Java_edu_wpi_first_hal_simulation_REVPHDataJNI_registerSolenoidOutputCallback } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: cancelSolenoidOutputCallback * Signature: (III)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_cancelSolenoidOutputCallback +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_cancelSolenoidOutputCallback (JNIEnv* env, jclass, jint index, jint channel, jint handle) { return sim::FreeChannelCallback(env, handle, index, channel, @@ -91,36 +91,36 @@ Java_edu_wpi_first_hal_simulation_REVPHDataJNI_cancelSolenoidOutputCallback } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: getSolenoidOutput * Signature: (II)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_getSolenoidOutput +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_getSolenoidOutput (JNIEnv*, jclass, jint index, jint channel) { return HALSIM_GetREVPHSolenoidOutput(index, channel); } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: setSolenoidOutput * Signature: (IIZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_setSolenoidOutput +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_setSolenoidOutput (JNIEnv*, jclass, jint index, jint channel, jboolean value) { HALSIM_SetREVPHSolenoidOutput(index, channel, value); } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: registerCompressorOnCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_registerCompressorOnCallback +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_registerCompressorOnCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -128,12 +128,12 @@ Java_edu_wpi_first_hal_simulation_REVPHDataJNI_registerCompressorOnCallback } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: cancelCompressorOnCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_cancelCompressorOnCallback +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_cancelCompressorOnCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -141,36 +141,36 @@ Java_edu_wpi_first_hal_simulation_REVPHDataJNI_cancelCompressorOnCallback } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: getCompressorOn * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_getCompressorOn +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_getCompressorOn (JNIEnv*, jclass, jint index) { return HALSIM_GetREVPHCompressorOn(index); } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: setCompressorOn * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_setCompressorOn +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_setCompressorOn (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetREVPHCompressorOn(index, value); } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: registerCompressorConfigTypeCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_registerCompressorConfigTypeCallback +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_registerCompressorConfigTypeCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback( @@ -179,12 +179,12 @@ Java_edu_wpi_first_hal_simulation_REVPHDataJNI_registerCompressorConfigTypeCallb } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: cancelCompressorConfigTypeCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_cancelCompressorConfigTypeCallback +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_cancelCompressorConfigTypeCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -192,24 +192,24 @@ Java_edu_wpi_first_hal_simulation_REVPHDataJNI_cancelCompressorConfigTypeCallbac } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: getCompressorConfigType * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_getCompressorConfigType +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_getCompressorConfigType (JNIEnv*, jclass, jint index) { return static_cast(HALSIM_GetREVPHCompressorConfigType(index)); } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: setCompressorConfigType * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_setCompressorConfigType +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_setCompressorConfigType (JNIEnv*, jclass, jint index, jint value) { HALSIM_SetREVPHCompressorConfigType( @@ -217,12 +217,12 @@ Java_edu_wpi_first_hal_simulation_REVPHDataJNI_setCompressorConfigType } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: registerPressureSwitchCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_registerPressureSwitchCallback +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_registerPressureSwitchCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -230,12 +230,12 @@ Java_edu_wpi_first_hal_simulation_REVPHDataJNI_registerPressureSwitchCallback } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: cancelPressureSwitchCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_cancelPressureSwitchCallback +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_cancelPressureSwitchCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -243,36 +243,36 @@ Java_edu_wpi_first_hal_simulation_REVPHDataJNI_cancelPressureSwitchCallback } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: getPressureSwitch * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_getPressureSwitch +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_getPressureSwitch (JNIEnv*, jclass, jint index) { return HALSIM_GetREVPHPressureSwitch(index); } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: setPressureSwitch * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_setPressureSwitch +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_setPressureSwitch (JNIEnv*, jclass, jint index, jboolean value) { HALSIM_SetREVPHPressureSwitch(index, value); } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: registerCompressorCurrentCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_registerCompressorCurrentCallback +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_registerCompressorCurrentCallback (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { return sim::AllocateCallback(env, index, callback, initialNotify, @@ -280,12 +280,12 @@ Java_edu_wpi_first_hal_simulation_REVPHDataJNI_registerCompressorCurrentCallback } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: cancelCompressorCurrentCallback * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_cancelCompressorCurrentCallback +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_cancelCompressorCurrentCallback (JNIEnv* env, jclass, jint index, jint handle) { return sim::FreeCallback(env, handle, index, @@ -293,36 +293,36 @@ Java_edu_wpi_first_hal_simulation_REVPHDataJNI_cancelCompressorCurrentCallback } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: getCompressorCurrent * Signature: (I)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_getCompressorCurrent +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_getCompressorCurrent (JNIEnv*, jclass, jint index) { return HALSIM_GetREVPHCompressorCurrent(index); } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: setCompressorCurrent * Signature: (ID)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_setCompressorCurrent +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_setCompressorCurrent (JNIEnv*, jclass, jint index, jdouble value) { HALSIM_SetREVPHCompressorCurrent(index, value); } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: registerAllNonSolenoidCallbacks * Signature: (ILjava/lang/Object;Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_registerAllNonSolenoidCallbacks +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_registerAllNonSolenoidCallbacks (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify) { sim::AllocateCallback( @@ -334,12 +334,12 @@ Java_edu_wpi_first_hal_simulation_REVPHDataJNI_registerAllNonSolenoidCallbacks } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: registerAllSolenoidCallbacks * Signature: (IILjava/lang/Object;Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_registerAllSolenoidCallbacks +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_registerAllSolenoidCallbacks (JNIEnv* env, jclass, jint index, jint channel, jobject callback, jboolean initialNotify) { @@ -353,12 +353,12 @@ Java_edu_wpi_first_hal_simulation_REVPHDataJNI_registerAllSolenoidCallbacks } /* - * Class: edu_wpi_first_hal_simulation_REVPHDataJNI + * Class: org_wpilib_hardware_hal_simulation_REVPHDataJNI * Method: resetData * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_REVPHDataJNI_resetData +Java_org_wpilib_hardware_hal_simulation_REVPHDataJNI_resetData (JNIEnv*, jclass, jint index) { HALSIM_ResetREVPHData(index); diff --git a/hal/src/main/native/cpp/jni/simulation/RoboRioDataJNI.cpp b/hal/src/main/native/cpp/jni/simulation/RoboRioDataJNI.cpp index 5436f8ef70..0373f4d589 100644 --- a/hal/src/main/native/cpp/jni/simulation/RoboRioDataJNI.cpp +++ b/hal/src/main/native/cpp/jni/simulation/RoboRioDataJNI.cpp @@ -7,7 +7,7 @@ #include #include "CallbackStore.h" -#include "edu_wpi_first_hal_simulation_RoboRioDataJNI.h" +#include "org_wpilib_hardware_hal_simulation_RoboRioDataJNI.h" #include "hal/simulation/RoboRioData.h" using namespace hal; @@ -16,12 +16,12 @@ using namespace wpi::java; extern "C" { /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: registerVInVoltageCallback * Signature: (Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerVInVoltageCallback +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_registerVInVoltageCallback (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { return sim::AllocateCallbackNoIndex( @@ -29,12 +29,12 @@ Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerVInVoltageCallback } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: cancelVInVoltageCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelVInVoltageCallback +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_cancelVInVoltageCallback (JNIEnv* env, jclass, jint handle) { return sim::FreeCallbackNoIndex(env, handle, @@ -42,36 +42,36 @@ Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelVInVoltageCallback } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: getVInVoltage * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getVInVoltage +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_getVInVoltage (JNIEnv*, jclass) { return HALSIM_GetRoboRioVInVoltage(); } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: setVInVoltage * Signature: (D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setVInVoltage +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_setVInVoltage (JNIEnv*, jclass, jdouble value) { HALSIM_SetRoboRioVInVoltage(value); } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: registerUserVoltage3V3Callback * Signature: (Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserVoltage3V3Callback +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_registerUserVoltage3V3Callback (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { return sim::AllocateCallbackNoIndex( @@ -80,12 +80,12 @@ Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserVoltage3V3Callback } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: cancelUserVoltage3V3Callback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserVoltage3V3Callback +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_cancelUserVoltage3V3Callback (JNIEnv* env, jclass, jint handle) { return sim::FreeCallbackNoIndex(env, handle, @@ -93,36 +93,36 @@ Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserVoltage3V3Callback } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: getUserVoltage3V3 * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserVoltage3V3 +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_getUserVoltage3V3 (JNIEnv*, jclass) { return HALSIM_GetRoboRioUserVoltage3V3(); } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: setUserVoltage3V3 * Signature: (D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserVoltage3V3 +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_setUserVoltage3V3 (JNIEnv*, jclass, jdouble value) { HALSIM_SetRoboRioUserVoltage3V3(value); } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: registerUserCurrent3V3Callback * Signature: (Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserCurrent3V3Callback +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_registerUserCurrent3V3Callback (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { return sim::AllocateCallbackNoIndex( @@ -131,12 +131,12 @@ Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserCurrent3V3Callback } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: cancelUserCurrent3V3Callback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserCurrent3V3Callback +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_cancelUserCurrent3V3Callback (JNIEnv* env, jclass, jint handle) { return sim::FreeCallbackNoIndex(env, handle, @@ -144,36 +144,36 @@ Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserCurrent3V3Callback } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: getUserCurrent3V3 * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserCurrent3V3 +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_getUserCurrent3V3 (JNIEnv*, jclass) { return HALSIM_GetRoboRioUserCurrent3V3(); } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: setUserCurrent3V3 * Signature: (D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserCurrent3V3 +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_setUserCurrent3V3 (JNIEnv*, jclass, jdouble value) { HALSIM_SetRoboRioUserCurrent3V3(value); } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: registerUserActive3V3Callback * Signature: (Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserActive3V3Callback +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_registerUserActive3V3Callback (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { return sim::AllocateCallbackNoIndex( @@ -182,12 +182,12 @@ Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserActive3V3Callback } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: cancelUserActive3V3Callback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserActive3V3Callback +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_cancelUserActive3V3Callback (JNIEnv* env, jclass, jint handle) { return sim::FreeCallbackNoIndex(env, handle, @@ -195,36 +195,36 @@ Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserActive3V3Callback } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: getUserActive3V3 * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserActive3V3 +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_getUserActive3V3 (JNIEnv*, jclass) { return HALSIM_GetRoboRioUserActive3V3(); } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: setUserActive3V3 * Signature: (Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserActive3V3 +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_setUserActive3V3 (JNIEnv*, jclass, jboolean value) { HALSIM_SetRoboRioUserActive3V3(value); } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: registerUserFaults3V3Callback * Signature: (Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserFaults3V3Callback +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_registerUserFaults3V3Callback (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { return sim::AllocateCallbackNoIndex( @@ -233,12 +233,12 @@ Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserFaults3V3Callback } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: cancelUserFaults3V3Callback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserFaults3V3Callback +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_cancelUserFaults3V3Callback (JNIEnv* env, jclass, jint handle) { return sim::FreeCallbackNoIndex(env, handle, @@ -246,36 +246,36 @@ Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserFaults3V3Callback } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: getUserFaults3V3 * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserFaults3V3 +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_getUserFaults3V3 (JNIEnv*, jclass) { return HALSIM_GetRoboRioUserFaults3V3(); } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: setUserFaults3V3 * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserFaults3V3 +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_setUserFaults3V3 (JNIEnv*, jclass, jint value) { HALSIM_SetRoboRioUserFaults3V3(value); } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: registerBrownoutVoltageCallback * Signature: (Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerBrownoutVoltageCallback +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_registerBrownoutVoltageCallback (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { return sim::AllocateCallbackNoIndex( @@ -284,12 +284,12 @@ Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerBrownoutVoltageCallback } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: cancelBrownoutVoltageCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelBrownoutVoltageCallback +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_cancelBrownoutVoltageCallback (JNIEnv* env, jclass, jint handle) { return sim::FreeCallbackNoIndex(env, handle, @@ -297,36 +297,36 @@ Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelBrownoutVoltageCallback } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: getBrownoutVoltage * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getBrownoutVoltage +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_getBrownoutVoltage (JNIEnv*, jclass) { return HALSIM_GetRoboRioBrownoutVoltage(); } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: setBrownoutVoltage * Signature: (D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setBrownoutVoltage +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_setBrownoutVoltage (JNIEnv*, jclass, jdouble value) { HALSIM_SetRoboRioBrownoutVoltage(value); } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: registerCPUTempCallback * Signature: (Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerCPUTempCallback +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_registerCPUTempCallback (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { return sim::AllocateCallbackNoIndex(env, callback, initialNotify, @@ -334,12 +334,12 @@ Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerCPUTempCallback } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: cancelCPUTempCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelCPUTempCallback +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_cancelCPUTempCallback (JNIEnv* env, jclass, jint handle) { return sim::FreeCallbackNoIndex(env, handle, @@ -347,36 +347,36 @@ Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelCPUTempCallback } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: getCPUTemp * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getCPUTemp +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_getCPUTemp (JNIEnv*, jclass) { return HALSIM_GetRoboRioCPUTemp(); } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: setCPUTemp * Signature: (D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setCPUTemp +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_setCPUTemp (JNIEnv*, jclass, jdouble cpuTemp) { HALSIM_SetRoboRioCPUTemp(cpuTemp); } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: registerTeamNumberCallback * Signature: (Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerTeamNumberCallback +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_registerTeamNumberCallback (JNIEnv* env, jclass, jobject callback, jboolean initialNotify) { return sim::AllocateCallbackNoIndex( @@ -384,12 +384,12 @@ Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerTeamNumberCallback } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: cancelTeamNumberCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelTeamNumberCallback +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_cancelTeamNumberCallback (JNIEnv* env, jclass, jint handle) { return sim::FreeCallbackNoIndex(env, handle, @@ -397,36 +397,36 @@ Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelTeamNumberCallback } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: getTeamNumber * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getTeamNumber +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_getTeamNumber (JNIEnv*, jclass) { return HALSIM_GetRoboRioTeamNumber(); } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: setTeamNumber * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setTeamNumber +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_setTeamNumber (JNIEnv*, jclass, jint value) { HALSIM_SetRoboRioTeamNumber(value); } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: getSerialNumber * Signature: ()Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getSerialNumber +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_getSerialNumber (JNIEnv* env, jclass) { WPI_String str; @@ -437,12 +437,12 @@ Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getSerialNumber } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: setSerialNumber * Signature: (Ljava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setSerialNumber +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_setSerialNumber (JNIEnv* env, jclass, jstring serialNumber) { JStringRef serialNumberJString{env, serialNumber}; @@ -451,12 +451,12 @@ Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setSerialNumber } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: getComments * Signature: ()Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getComments +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_getComments (JNIEnv* env, jclass) { WPI_String str; @@ -467,12 +467,12 @@ Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getComments } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: setComments * Signature: (Ljava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setComments +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_setComments (JNIEnv* env, jclass, jstring comments) { JStringRef commentsJString{env, comments}; @@ -481,12 +481,12 @@ Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setComments } /* - * Class: edu_wpi_first_hal_simulation_RoboRioDataJNI + * Class: org_wpilib_hardware_hal_simulation_RoboRioDataJNI * Method: resetData * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_resetData +Java_org_wpilib_hardware_hal_simulation_RoboRioDataJNI_resetData (JNIEnv*, jclass) { HALSIM_ResetRoboRioData(); diff --git a/hal/src/main/native/cpp/jni/simulation/SimDeviceDataJNI.cpp b/hal/src/main/native/cpp/jni/simulation/SimDeviceDataJNI.cpp index 3d9e2cb146..036249283c 100644 --- a/hal/src/main/native/cpp/jni/simulation/SimDeviceDataJNI.cpp +++ b/hal/src/main/native/cpp/jni/simulation/SimDeviceDataJNI.cpp @@ -15,7 +15,7 @@ #include #include "SimulatorJNI.h" -#include "edu_wpi_first_hal_simulation_SimDeviceDataJNI.h" +#include "org_wpilib_hardware_hal_simulation_SimDeviceDataJNI.h" #include "hal/handles/UnlimitedHandleResource.h" #include "hal/simulation/SimDeviceData.h" @@ -312,19 +312,19 @@ namespace hal::sim { bool InitializeSimDeviceDataJNI(JNIEnv* env) { simDeviceInfoCls = JClass( - env, "edu/wpi/first/hal/simulation/SimDeviceDataJNI$SimDeviceInfo"); + env, "org/wpilib/hardware/hal/simulation/SimDeviceDataJNI$SimDeviceInfo"); if (!simDeviceInfoCls) { return false; } simValueInfoCls = - JClass(env, "edu/wpi/first/hal/simulation/SimDeviceDataJNI$SimValueInfo"); + JClass(env, "org/wpilib/hardware/hal/simulation/SimDeviceDataJNI$SimValueInfo"); if (!simValueInfoCls) { return false; } simDeviceCallbackCls = - JClass(env, "edu/wpi/first/hal/simulation/SimDeviceCallback"); + JClass(env, "org/wpilib/hardware/hal/simulation/SimDeviceCallback"); if (!simDeviceCallbackCls) { return false; } @@ -336,7 +336,7 @@ bool InitializeSimDeviceDataJNI(JNIEnv* env) { } simValueCallbackCls = - JClass(env, "edu/wpi/first/hal/simulation/SimValueCallback"); + JClass(env, "org/wpilib/hardware/hal/simulation/SimValueCallback"); if (!simValueCallbackCls) { return false; } @@ -372,36 +372,36 @@ void FreeSimDeviceDataJNI(JNIEnv* env) { extern "C" { /* - * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI + * Class: org_wpilib_hardware_hal_simulation_SimDeviceDataJNI * Method: setSimDeviceEnabled * Signature: (Ljava/lang/String;Z)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_setSimDeviceEnabled +Java_org_wpilib_hardware_hal_simulation_SimDeviceDataJNI_setSimDeviceEnabled (JNIEnv* env, jclass, jstring prefix, jboolean enabled) { HALSIM_SetSimDeviceEnabled(JStringRef{env, prefix}.c_str(), enabled); } /* - * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI + * Class: org_wpilib_hardware_hal_simulation_SimDeviceDataJNI * Method: isSimDeviceEnabled * Signature: (Ljava/lang/String;)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_isSimDeviceEnabled +Java_org_wpilib_hardware_hal_simulation_SimDeviceDataJNI_isSimDeviceEnabled (JNIEnv* env, jclass, jstring name) { return HALSIM_IsSimDeviceEnabled(JStringRef{env, name}.c_str()); } /* - * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI + * Class: org_wpilib_hardware_hal_simulation_SimDeviceDataJNI * Method: registerSimDeviceCreatedCallback * Signature: (Ljava/lang/String;Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_registerSimDeviceCreatedCallback +Java_org_wpilib_hardware_hal_simulation_SimDeviceDataJNI_registerSimDeviceCreatedCallback (JNIEnv* env, jclass, jstring prefix, jobject callback, jboolean initialNotify) { @@ -411,24 +411,24 @@ Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_registerSimDeviceCreatedCallb } /* - * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI + * Class: org_wpilib_hardware_hal_simulation_SimDeviceDataJNI * Method: cancelSimDeviceCreatedCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_cancelSimDeviceCreatedCallback +Java_org_wpilib_hardware_hal_simulation_SimDeviceDataJNI_cancelSimDeviceCreatedCallback (JNIEnv* env, jclass, jint uid) { FreeDeviceCallback(env, uid, &HALSIM_CancelSimDeviceCreatedCallback); } /* - * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI + * Class: org_wpilib_hardware_hal_simulation_SimDeviceDataJNI * Method: registerSimDeviceFreedCallback * Signature: (Ljava/lang/String;Ljava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_registerSimDeviceFreedCallback +Java_org_wpilib_hardware_hal_simulation_SimDeviceDataJNI_registerSimDeviceFreedCallback (JNIEnv* env, jclass, jstring prefix, jobject callback, jboolean initialNotify) { @@ -438,36 +438,36 @@ Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_registerSimDeviceFreedCallbac } /* - * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI + * Class: org_wpilib_hardware_hal_simulation_SimDeviceDataJNI * Method: cancelSimDeviceFreedCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_cancelSimDeviceFreedCallback +Java_org_wpilib_hardware_hal_simulation_SimDeviceDataJNI_cancelSimDeviceFreedCallback (JNIEnv* env, jclass, jint uid) { FreeDeviceCallback(env, uid, &HALSIM_CancelSimDeviceFreedCallback); } /* - * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI + * Class: org_wpilib_hardware_hal_simulation_SimDeviceDataJNI * Method: getSimDeviceHandle * Signature: (Ljava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_getSimDeviceHandle +Java_org_wpilib_hardware_hal_simulation_SimDeviceDataJNI_getSimDeviceHandle (JNIEnv* env, jclass, jstring name) { return HALSIM_GetSimDeviceHandle(JStringRef{env, name}.c_str()); } /* - * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI + * Class: org_wpilib_hardware_hal_simulation_SimDeviceDataJNI * Method: getSimDeviceName * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_getSimDeviceName +Java_org_wpilib_hardware_hal_simulation_SimDeviceDataJNI_getSimDeviceName (JNIEnv* env, jclass, jint handle) { const char* name = HALSIM_GetSimDeviceName(handle); @@ -478,24 +478,24 @@ Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_getSimDeviceName } /* - * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI + * Class: org_wpilib_hardware_hal_simulation_SimDeviceDataJNI * Method: getSimValueDeviceHandle * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_getSimValueDeviceHandle +Java_org_wpilib_hardware_hal_simulation_SimDeviceDataJNI_getSimValueDeviceHandle (JNIEnv*, jclass, jint handle) { return HALSIM_GetSimValueDeviceHandle(handle); } /* - * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI + * Class: org_wpilib_hardware_hal_simulation_SimDeviceDataJNI * Method: enumerateSimDevices * Signature: (Ljava/lang/String;)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_enumerateSimDevices +Java_org_wpilib_hardware_hal_simulation_SimDeviceDataJNI_enumerateSimDevices (JNIEnv* env, jclass, jstring prefix) { // get values @@ -522,12 +522,12 @@ Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_enumerateSimDevices } /* - * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI + * Class: org_wpilib_hardware_hal_simulation_SimDeviceDataJNI * Method: registerSimValueCreatedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_registerSimValueCreatedCallback +Java_org_wpilib_hardware_hal_simulation_SimDeviceDataJNI_registerSimValueCreatedCallback (JNIEnv* env, jclass, jint device, jobject callback, jboolean initialNotify) { return AllocateValueCallback(env, static_cast(device), @@ -536,24 +536,24 @@ Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_registerSimValueCreatedCallba } /* - * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI + * Class: org_wpilib_hardware_hal_simulation_SimDeviceDataJNI * Method: cancelSimValueCreatedCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_cancelSimValueCreatedCallback +Java_org_wpilib_hardware_hal_simulation_SimDeviceDataJNI_cancelSimValueCreatedCallback (JNIEnv* env, jclass, jint uid) { FreeValueCallback(env, uid, &HALSIM_CancelSimValueCreatedCallback); } /* - * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI + * Class: org_wpilib_hardware_hal_simulation_SimDeviceDataJNI * Method: registerSimValueChangedCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_registerSimValueChangedCallback +Java_org_wpilib_hardware_hal_simulation_SimDeviceDataJNI_registerSimValueChangedCallback (JNIEnv* env, jclass, jint handle, jobject callback, jboolean initialNotify) { return AllocateValueCallback(env, static_cast(handle), @@ -562,24 +562,24 @@ Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_registerSimValueChangedCallba } /* - * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI + * Class: org_wpilib_hardware_hal_simulation_SimDeviceDataJNI * Method: cancelSimValueChangedCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_cancelSimValueChangedCallback +Java_org_wpilib_hardware_hal_simulation_SimDeviceDataJNI_cancelSimValueChangedCallback (JNIEnv* env, jclass, jint uid) { FreeValueCallback(env, uid, &HALSIM_CancelSimValueChangedCallback); } /* - * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI + * Class: org_wpilib_hardware_hal_simulation_SimDeviceDataJNI * Method: registerSimValueResetCallback * Signature: (ILjava/lang/Object;Z)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_registerSimValueResetCallback +Java_org_wpilib_hardware_hal_simulation_SimDeviceDataJNI_registerSimValueResetCallback (JNIEnv* env, jclass, jint handle, jobject callback, jboolean initialNotify) { return AllocateValueCallback(env, static_cast(handle), @@ -588,36 +588,36 @@ Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_registerSimValueResetCallback } /* - * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI + * Class: org_wpilib_hardware_hal_simulation_SimDeviceDataJNI * Method: cancelSimValueResetCallback * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_cancelSimValueResetCallback +Java_org_wpilib_hardware_hal_simulation_SimDeviceDataJNI_cancelSimValueResetCallback (JNIEnv* env, jclass, jint uid) { FreeValueCallback(env, uid, &HALSIM_CancelSimValueResetCallback); } /* - * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI + * Class: org_wpilib_hardware_hal_simulation_SimDeviceDataJNI * Method: getSimValueHandle * Signature: (ILjava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_getSimValueHandle +Java_org_wpilib_hardware_hal_simulation_SimDeviceDataJNI_getSimValueHandle (JNIEnv* env, jclass, jint device, jstring name) { return HALSIM_GetSimValueHandle(device, JStringRef{env, name}.c_str()); } /* - * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI + * Class: org_wpilib_hardware_hal_simulation_SimDeviceDataJNI * Method: enumerateSimValues * Signature: (I)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_enumerateSimValues +Java_org_wpilib_hardware_hal_simulation_SimDeviceDataJNI_enumerateSimValues (JNIEnv* env, jclass, jint device) { // get values @@ -644,12 +644,12 @@ Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_enumerateSimValues } /* - * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI + * Class: org_wpilib_hardware_hal_simulation_SimDeviceDataJNI * Method: getSimValueEnumOptions * Signature: (I)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_getSimValueEnumOptions +Java_org_wpilib_hardware_hal_simulation_SimDeviceDataJNI_getSimValueEnumOptions (JNIEnv* env, jclass, jint handle) { static JClass stringCls{env, "java/lang/String"}; @@ -670,12 +670,12 @@ Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_getSimValueEnumOptions } /* - * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI + * Class: org_wpilib_hardware_hal_simulation_SimDeviceDataJNI * Method: getSimValueEnumDoubleValues * Signature: (I)[D */ JNIEXPORT jdoubleArray JNICALL -Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_getSimValueEnumDoubleValues +Java_org_wpilib_hardware_hal_simulation_SimDeviceDataJNI_getSimValueEnumDoubleValues (JNIEnv* env, jclass, jint handle) { int32_t numElems = 0; @@ -684,12 +684,12 @@ Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_getSimValueEnumDoubleValues } /* - * Class: edu_wpi_first_hal_simulation_SimDeviceDataJNI + * Class: org_wpilib_hardware_hal_simulation_SimDeviceDataJNI * Method: resetSimDeviceData * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_SimDeviceDataJNI_resetSimDeviceData +Java_org_wpilib_hardware_hal_simulation_SimDeviceDataJNI_resetSimDeviceData (JNIEnv*, jclass) { HALSIM_ResetSimDeviceData(); diff --git a/hal/src/main/native/cpp/jni/simulation/SimulatorJNI.cpp b/hal/src/main/native/cpp/jni/simulation/SimulatorJNI.cpp index 84dded1d34..bb213a32ab 100644 --- a/hal/src/main/native/cpp/jni/simulation/SimulatorJNI.cpp +++ b/hal/src/main/native/cpp/jni/simulation/SimulatorJNI.cpp @@ -10,7 +10,7 @@ #include "CallbackStore.h" #include "ConstBufferCallbackStore.h" #include "SimDeviceDataJNI.h" -#include "edu_wpi_first_hal_simulation_SimulatorJNI.h" +#include "org_wpilib_hardware_hal_simulation_SimulatorJNI.h" #include "hal/HAL.h" #include "hal/handles/HandlesInternal.h" #include "hal/simulation/MockHooks.h" @@ -35,7 +35,7 @@ jint SimOnLoad(JavaVM* vm, void* reserved) { } notifyCallbackCls = - JClass(env, "edu/wpi/first/hal/simulation/NotifyCallback"); + JClass(env, "org/wpilib/hardware/hal/simulation/NotifyCallback"); if (!notifyCallbackCls) { return JNI_ERR; } @@ -47,7 +47,7 @@ jint SimOnLoad(JavaVM* vm, void* reserved) { } bufferCallbackCls = - JClass(env, "edu/wpi/first/hal/simulation/BufferCallback"); + JClass(env, "org/wpilib/hardware/hal/simulation/BufferCallback"); if (!bufferCallbackCls) { return JNI_ERR; } @@ -59,7 +59,7 @@ jint SimOnLoad(JavaVM* vm, void* reserved) { } constBufferCallbackCls = - JClass(env, "edu/wpi/first/hal/simulation/ConstBufferCallback"); + JClass(env, "org/wpilib/hardware/hal/simulation/ConstBufferCallback"); if (!constBufferCallbackCls) { return JNI_ERR; } @@ -113,132 +113,132 @@ jmethodID GetConstBufferCallback() { extern "C" { /* - * Class: edu_wpi_first_hal_simulation_SimulatorJNI + * Class: org_wpilib_hardware_hal_simulation_SimulatorJNI * Method: setRuntimeType * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_SimulatorJNI_setRuntimeType +Java_org_wpilib_hardware_hal_simulation_SimulatorJNI_setRuntimeType (JNIEnv*, jclass, jint type) { HALSIM_SetRuntimeType(static_cast(type)); } /* - * Class: edu_wpi_first_hal_simulation_SimulatorJNI + * Class: org_wpilib_hardware_hal_simulation_SimulatorJNI * Method: waitForProgramStart * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_SimulatorJNI_waitForProgramStart +Java_org_wpilib_hardware_hal_simulation_SimulatorJNI_waitForProgramStart (JNIEnv*, jclass) { HALSIM_WaitForProgramStart(); } /* - * Class: edu_wpi_first_hal_simulation_SimulatorJNI + * Class: org_wpilib_hardware_hal_simulation_SimulatorJNI * Method: setProgramStarted * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_SimulatorJNI_setProgramStarted +Java_org_wpilib_hardware_hal_simulation_SimulatorJNI_setProgramStarted (JNIEnv*, jclass) { HALSIM_SetProgramStarted(); } /* - * Class: edu_wpi_first_hal_simulation_SimulatorJNI + * Class: org_wpilib_hardware_hal_simulation_SimulatorJNI * Method: getProgramStarted * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_SimulatorJNI_getProgramStarted +Java_org_wpilib_hardware_hal_simulation_SimulatorJNI_getProgramStarted (JNIEnv*, jclass) { return HALSIM_GetProgramStarted(); } /* - * Class: edu_wpi_first_hal_simulation_SimulatorJNI + * Class: org_wpilib_hardware_hal_simulation_SimulatorJNI * Method: restartTiming * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_SimulatorJNI_restartTiming +Java_org_wpilib_hardware_hal_simulation_SimulatorJNI_restartTiming (JNIEnv*, jclass) { HALSIM_RestartTiming(); } /* - * Class: edu_wpi_first_hal_simulation_SimulatorJNI + * Class: org_wpilib_hardware_hal_simulation_SimulatorJNI * Method: pauseTiming * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_SimulatorJNI_pauseTiming +Java_org_wpilib_hardware_hal_simulation_SimulatorJNI_pauseTiming (JNIEnv*, jclass) { HALSIM_PauseTiming(); } /* - * Class: edu_wpi_first_hal_simulation_SimulatorJNI + * Class: org_wpilib_hardware_hal_simulation_SimulatorJNI * Method: resumeTiming * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_SimulatorJNI_resumeTiming +Java_org_wpilib_hardware_hal_simulation_SimulatorJNI_resumeTiming (JNIEnv*, jclass) { HALSIM_ResumeTiming(); } /* - * Class: edu_wpi_first_hal_simulation_SimulatorJNI + * Class: org_wpilib_hardware_hal_simulation_SimulatorJNI * Method: isTimingPaused * Signature: ()Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_hal_simulation_SimulatorJNI_isTimingPaused +Java_org_wpilib_hardware_hal_simulation_SimulatorJNI_isTimingPaused (JNIEnv*, jclass) { return HALSIM_IsTimingPaused(); } /* - * Class: edu_wpi_first_hal_simulation_SimulatorJNI + * Class: org_wpilib_hardware_hal_simulation_SimulatorJNI * Method: stepTiming * Signature: (J)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_SimulatorJNI_stepTiming +Java_org_wpilib_hardware_hal_simulation_SimulatorJNI_stepTiming (JNIEnv*, jclass, jlong delta) { HALSIM_StepTiming(delta); } /* - * Class: edu_wpi_first_hal_simulation_SimulatorJNI + * Class: org_wpilib_hardware_hal_simulation_SimulatorJNI * Method: stepTimingAsync * Signature: (J)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_SimulatorJNI_stepTimingAsync +Java_org_wpilib_hardware_hal_simulation_SimulatorJNI_stepTimingAsync (JNIEnv*, jclass, jlong delta) { HALSIM_StepTimingAsync(delta); } /* - * Class: edu_wpi_first_hal_simulation_SimulatorJNI + * Class: org_wpilib_hardware_hal_simulation_SimulatorJNI * Method: resetHandles * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_hal_simulation_SimulatorJNI_resetHandles +Java_org_wpilib_hardware_hal_simulation_SimulatorJNI_resetHandles (JNIEnv*, jclass) { hal::HandleBase::ResetGlobalHandles(); diff --git a/hal/src/test/java/org/wpilib/hardware/hal/JNITest.java b/hal/src/test/java/org/wpilib/hardware/hal/JNITest.java index 49e201d326..c08e00792a 100644 --- a/hal/src/test/java/org/wpilib/hardware/hal/JNITest.java +++ b/hal/src/test/java/org/wpilib/hardware/hal/JNITest.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 edu.wpi.first.hal; +package org.wpilib.hardware.hal; import org.junit.jupiter.api.Test; diff --git a/javacPlugin/src/main/java/org/wpilib/javacplugin/CoroutineBasedDetector.java b/javacPlugin/src/main/java/org/wpilib/javacplugin/CoroutineBasedDetector.java index 8506b9a2c0..254bfeb04d 100644 --- a/javacPlugin/src/main/java/org/wpilib/javacplugin/CoroutineBasedDetector.java +++ b/javacPlugin/src/main/java/org/wpilib/javacplugin/CoroutineBasedDetector.java @@ -50,7 +50,7 @@ public abstract class CoroutineBasedDetector implements TaskListener { protected abstract TreeScanner createScanner(CompilationUnitTree compilationUnit); private TypeMirror getCoroutineType() { - var te = m_task.getElements().getTypeElement("org.wpilib.commands3.Coroutine"); + var te = m_task.getElements().getTypeElement("org.wpilib.command3.Coroutine"); return te == null ? null : te.asType(); } } diff --git a/javacPlugin/src/test/java/org/wpilib/javacplugin/CodeAfterCoroutineParkDetectorTest.java b/javacPlugin/src/test/java/org/wpilib/javacplugin/CodeAfterCoroutineParkDetectorTest.java index 9fbba05c6a..313e8ea712 100644 --- a/javacPlugin/src/test/java/org/wpilib/javacplugin/CodeAfterCoroutineParkDetectorTest.java +++ b/javacPlugin/src/test/java/org/wpilib/javacplugin/CodeAfterCoroutineParkDetectorTest.java @@ -17,7 +17,7 @@ import org.junit.jupiter.api.Test; class CodeAfterCoroutineParkDetectorTest { private static final String kCoroutineSource = """ - package org.wpilib.commands3; + package org.wpilib.command3; public interface Coroutine { void park(); @@ -31,7 +31,7 @@ class CodeAfterCoroutineParkDetectorTest { package frc.robot; import java.util.function.Consumer; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; class Example { Consumer lambda = coroutine -> { @@ -44,7 +44,7 @@ class CodeAfterCoroutineParkDetectorTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); @@ -57,7 +57,7 @@ class CodeAfterCoroutineParkDetectorTest { package frc.robot; import java.util.function.Consumer; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; class Example { Consumer lambda = coroutine -> { @@ -72,7 +72,7 @@ class CodeAfterCoroutineParkDetectorTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).failed(); @@ -90,7 +90,7 @@ class CodeAfterCoroutineParkDetectorTest { package frc.robot; import java.util.function.Consumer; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; class Example { Consumer lambda = coroutine -> { @@ -108,7 +108,7 @@ class CodeAfterCoroutineParkDetectorTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); @@ -121,7 +121,7 @@ class CodeAfterCoroutineParkDetectorTest { package frc.robot; import java.util.function.Consumer; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; class Example { Consumer lambda = coroutine -> { @@ -136,7 +136,7 @@ class CodeAfterCoroutineParkDetectorTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).failed(); @@ -154,7 +154,7 @@ class CodeAfterCoroutineParkDetectorTest { package frc.robot; import java.util.function.Consumer; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; class Example { Consumer lambda = coroutine -> { @@ -169,7 +169,7 @@ class CodeAfterCoroutineParkDetectorTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).failed(); @@ -187,7 +187,7 @@ class CodeAfterCoroutineParkDetectorTest { package frc.robot; import java.util.function.Consumer; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; class Example { Consumer lambda = coroutine -> { @@ -200,7 +200,7 @@ class CodeAfterCoroutineParkDetectorTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); @@ -213,7 +213,7 @@ class CodeAfterCoroutineParkDetectorTest { package frc.robot; import java.util.function.Consumer; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; class Example { Consumer lambda = coroutine -> { @@ -227,7 +227,7 @@ class CodeAfterCoroutineParkDetectorTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).failed(); diff --git a/javacPlugin/src/test/java/org/wpilib/javacplugin/CoroutineInLoopListenerTest.java b/javacPlugin/src/test/java/org/wpilib/javacplugin/CoroutineInLoopListenerTest.java index f01df7f910..4f379d43dd 100644 --- a/javacPlugin/src/test/java/org/wpilib/javacplugin/CoroutineInLoopListenerTest.java +++ b/javacPlugin/src/test/java/org/wpilib/javacplugin/CoroutineInLoopListenerTest.java @@ -16,7 +16,7 @@ import org.junit.jupiter.api.Test; class CoroutineInLoopListenerTest { private static final String kCoroutineSource = """ - package org.wpilib.commands3; + package org.wpilib.command3; public interface Coroutine { void yield(); @@ -52,7 +52,7 @@ class CoroutineInLoopListenerTest { package frc.robot; import java.util.function.Consumer; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; class Example { Consumer lambda = coroutine -> { @@ -67,7 +67,7 @@ class CoroutineInLoopListenerTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); @@ -80,7 +80,7 @@ class CoroutineInLoopListenerTest { package frc.robot; import java.util.function.Consumer; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; class Example { void useCoroutine(Coroutine coroutine) { @@ -95,7 +95,7 @@ class CoroutineInLoopListenerTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); @@ -108,7 +108,7 @@ class CoroutineInLoopListenerTest { package frc.robot; import java.util.function.Consumer; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; class Example { Consumer lambda = coroutine -> { @@ -123,7 +123,7 @@ class CoroutineInLoopListenerTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).failed(); @@ -139,7 +139,7 @@ class CoroutineInLoopListenerTest { package frc.robot; import java.util.function.Consumer; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; class Example { Consumer lambda = coroutine -> { @@ -156,7 +156,7 @@ class CoroutineInLoopListenerTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); // TODO: Should we make it an error to yield (or invoke any methods on) a captured coroutine? @@ -170,7 +170,7 @@ class CoroutineInLoopListenerTest { package frc.robot; import java.util.function.Consumer; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; class Example { void manyCoroutineParams( @@ -189,7 +189,7 @@ class CoroutineInLoopListenerTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).failed(); @@ -211,7 +211,7 @@ class CoroutineInLoopListenerTest { package frc.robot; import java.util.function.Consumer; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; class Example { Consumer lambda = coroutine -> { @@ -228,7 +228,7 @@ class CoroutineInLoopListenerTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).failed(); @@ -244,7 +244,7 @@ class CoroutineInLoopListenerTest { package frc.robot; import java.util.function.Consumer; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; class Example { Consumer lambda = outerCoroutine -> { @@ -261,7 +261,7 @@ class CoroutineInLoopListenerTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).failed(); @@ -280,7 +280,7 @@ class CoroutineInLoopListenerTest { package frc.robot; import java.util.function.Consumer; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; class Example { Consumer lambda = coroutine -> { @@ -298,7 +298,7 @@ class CoroutineInLoopListenerTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).failed(); @@ -320,7 +320,7 @@ class CoroutineInLoopListenerTest { package frc.robot; import java.util.function.Consumer; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; class Example { Consumer lambda = coroutine -> { @@ -338,7 +338,7 @@ class CoroutineInLoopListenerTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).failed(); @@ -355,7 +355,7 @@ class CoroutineInLoopListenerTest { package frc.robot; import java.util.function.Consumer; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; class Example { Consumer lambda = coroutine -> { @@ -373,7 +373,7 @@ class CoroutineInLoopListenerTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).failed(); @@ -390,7 +390,7 @@ class CoroutineInLoopListenerTest { package frc.robot; import java.util.function.Consumer; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; class Example { Consumer lambda = coroutine -> { @@ -419,7 +419,7 @@ class CoroutineInLoopListenerTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).failed(); diff --git a/javacPlugin/src/test/java/org/wpilib/javacplugin/IncorrectCoroutineUseDetectorTest.java b/javacPlugin/src/test/java/org/wpilib/javacplugin/IncorrectCoroutineUseDetectorTest.java index 56ee704f87..8f34ff9a3f 100644 --- a/javacPlugin/src/test/java/org/wpilib/javacplugin/IncorrectCoroutineUseDetectorTest.java +++ b/javacPlugin/src/test/java/org/wpilib/javacplugin/IncorrectCoroutineUseDetectorTest.java @@ -17,7 +17,7 @@ import org.junit.jupiter.api.Test; class IncorrectCoroutineUseDetectorTest { private static final String kCoroutineSource = """ - package org.wpilib.commands3; + package org.wpilib.command3; public interface Coroutine { void yield(); @@ -30,7 +30,7 @@ class IncorrectCoroutineUseDetectorTest { """ package frc.robot; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; import java.util.function.Consumer; class Example { @@ -46,7 +46,7 @@ class IncorrectCoroutineUseDetectorTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).failed(); @@ -63,7 +63,7 @@ class IncorrectCoroutineUseDetectorTest { """ package frc.robot; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; import java.util.function.Consumer; class Example { @@ -81,7 +81,7 @@ class IncorrectCoroutineUseDetectorTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).failed(); @@ -98,7 +98,7 @@ class IncorrectCoroutineUseDetectorTest { """ package frc.robot; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; import java.util.function.BiConsumer; import java.util.function.Consumer; @@ -117,7 +117,7 @@ class IncorrectCoroutineUseDetectorTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).failed(); @@ -134,7 +134,7 @@ class IncorrectCoroutineUseDetectorTest { """ package frc.robot; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; import java.util.function.Consumer; @FunctionalInterface @@ -157,7 +157,7 @@ class IncorrectCoroutineUseDetectorTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).failed(); @@ -174,7 +174,7 @@ class IncorrectCoroutineUseDetectorTest { """ package frc.robot; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; import java.util.function.Consumer; class Example { @@ -190,7 +190,7 @@ class IncorrectCoroutineUseDetectorTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).failed(); @@ -205,7 +205,7 @@ class IncorrectCoroutineUseDetectorTest { """ package frc.robot; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; import java.util.function.Consumer; class Example { @@ -224,7 +224,7 @@ class IncorrectCoroutineUseDetectorTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).failed(); @@ -247,7 +247,7 @@ class IncorrectCoroutineUseDetectorTest { """ package frc.robot; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; import java.util.function.Consumer; class Example { @@ -261,7 +261,7 @@ class IncorrectCoroutineUseDetectorTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); @@ -275,7 +275,7 @@ class IncorrectCoroutineUseDetectorTest { """ package frc.robot; - import org.wpilib.commands3.Coroutine; + import org.wpilib.command3.Coroutine; import java.util.function.Consumer; class Example { @@ -295,7 +295,7 @@ class IncorrectCoroutineUseDetectorTest { javac() .withOptions(kJavaVersionOptions) .compile( - JavaFileObjects.forSourceString("org.wpilib.commands3.Coroutine", kCoroutineSource), + JavaFileObjects.forSourceString("org.wpilib.command3.Coroutine", kCoroutineSource), JavaFileObjects.forSourceString("frc.robot.Example", source)); assertThat(compilation).succeededWithoutWarnings(); diff --git a/javacPlugin/src/test/java/org/wpilib/javacplugin/ReturnValueUsedListenerTest.java b/javacPlugin/src/test/java/org/wpilib/javacplugin/ReturnValueUsedListenerTest.java index b03aa90217..48abec7d3e 100644 --- a/javacPlugin/src/test/java/org/wpilib/javacplugin/ReturnValueUsedListenerTest.java +++ b/javacPlugin/src/test/java/org/wpilib/javacplugin/ReturnValueUsedListenerTest.java @@ -459,8 +459,8 @@ class ReturnValueUsedListenerTest { """ package frc.robot; - import edu.wpi.first.wpilibj2.command.Command; - import edu.wpi.first.wpilibj2.command.Commands; + import org.wpilib.command2.Command; + import org.wpilib.command2.Commands; import org.wpilib.annotation.NoDiscard; class Example { @@ -488,8 +488,8 @@ class ReturnValueUsedListenerTest { """ package frc.robot; - import edu.wpi.first.wpilibj2.command.Command; - import edu.wpi.first.wpilibj2.command.Commands; + import org.wpilib.command2.Command; + import org.wpilib.command2.Commands; import org.wpilib.annotation.NoDiscard; class Example { @@ -517,8 +517,8 @@ class ReturnValueUsedListenerTest { """ package frc.robot; - import edu.wpi.first.wpilibj2.command.Command; - import edu.wpi.first.wpilibj2.command.Commands; + import org.wpilib.command2.Command; + import org.wpilib.command2.Commands; import org.wpilib.annotation.NoDiscard; class Example { @@ -546,8 +546,8 @@ class ReturnValueUsedListenerTest { """ package frc.robot; - import edu.wpi.first.wpilibj2.command.Command; - import edu.wpi.first.wpilibj2.command.Commands; + import org.wpilib.command2.Command; + import org.wpilib.command2.Commands; import org.wpilib.annotation.NoDiscard; class Example { @@ -579,8 +579,8 @@ class ReturnValueUsedListenerTest { """ package frc.robot; - import edu.wpi.first.wpilibj2.command.Command; - import edu.wpi.first.wpilibj2.command.Commands; + import org.wpilib.command2.Command; + import org.wpilib.command2.Commands; import org.wpilib.annotation.NoDiscard; class Example { @@ -612,9 +612,9 @@ class ReturnValueUsedListenerTest { """ package frc.robot; - import edu.wpi.first.wpilibj2.command.Command; - import edu.wpi.first.wpilibj2.command.Commands; - import edu.wpi.first.wpilibj2.command.WaitCommand; + import org.wpilib.command2.Command; + import org.wpilib.command2.Commands; + import org.wpilib.command2.WaitCommand; import org.wpilib.annotation.NoDiscard; class Example { diff --git a/ntcore/src/dev/java/edu/wpi/first/ntcore/DevMain.java b/ntcore/src/dev/java/edu/wpi/first/ntcore/DevMain.java index 6d5e971193..8d998e9b1d 100644 --- a/ntcore/src/dev/java/edu/wpi/first/ntcore/DevMain.java +++ b/ntcore/src/dev/java/edu/wpi/first/ntcore/DevMain.java @@ -4,8 +4,8 @@ package edu.wpi.first.ntcore; -import edu.wpi.first.networktables.NetworkTablesJNI; -import edu.wpi.first.util.CombinedRuntimeLoader; +import org.wpilib.networktables.NetworkTablesJNI; +import org.wpilib.util.runtime.CombinedRuntimeLoader; public final class DevMain { /** Main method. */ diff --git a/ntcore/src/generate/main/java/Entry.java.jinja b/ntcore/src/generate/main/java/Entry.java.jinja index 43c424f713..5978b84101 100644 --- a/ntcore/src/generate/main/java/Entry.java.jinja +++ b/ntcore/src/generate/main/java/Entry.java.jinja @@ -4,7 +4,7 @@ // THIS FILE WAS AUTO-GENERATED BY ./ntcore/generate_topics.py. DO NOT MODIFY -package edu.wpi.first.networktables; +package org.wpilib.networktables; /** * NetworkTables {{ TypeName }} entry. diff --git a/ntcore/src/generate/main/java/EntryImpl.java.jinja b/ntcore/src/generate/main/java/EntryImpl.java.jinja index e022bd8ac9..17385a693f 100644 --- a/ntcore/src/generate/main/java/EntryImpl.java.jinja +++ b/ntcore/src/generate/main/java/EntryImpl.java.jinja @@ -4,7 +4,7 @@ // THIS FILE WAS AUTO-GENERATED BY ./ntcore/generate_topics.py. DO NOT MODIFY -package edu.wpi.first.networktables; +package org.wpilib.networktables; {% if TypeName == "Raw" %} import java.nio.ByteBuffer; {% endif %} diff --git a/ntcore/src/generate/main/java/GenericEntryImpl.java.jinja b/ntcore/src/generate/main/java/GenericEntryImpl.java.jinja index 0bc4fed246..11ddaaa248 100644 --- a/ntcore/src/generate/main/java/GenericEntryImpl.java.jinja +++ b/ntcore/src/generate/main/java/GenericEntryImpl.java.jinja @@ -4,7 +4,7 @@ // THIS FILE WAS AUTO-GENERATED BY ./ntcore/generate_topics.py. DO NOT MODIFY -package edu.wpi.first.networktables; +package org.wpilib.networktables; import java.nio.ByteBuffer; diff --git a/ntcore/src/generate/main/java/GenericPublisher.java.jinja b/ntcore/src/generate/main/java/GenericPublisher.java.jinja index 5af0d3b3e2..85242993af 100644 --- a/ntcore/src/generate/main/java/GenericPublisher.java.jinja +++ b/ntcore/src/generate/main/java/GenericPublisher.java.jinja @@ -4,7 +4,7 @@ // THIS FILE WAS AUTO-GENERATED BY ./ntcore/generate_topics.py. DO NOT MODIFY -package edu.wpi.first.networktables; +package org.wpilib.networktables; import java.nio.ByteBuffer; import java.util.function.Consumer; diff --git a/ntcore/src/generate/main/java/GenericSubscriber.java.jinja b/ntcore/src/generate/main/java/GenericSubscriber.java.jinja index 883d20ecb9..5c92c98dc7 100644 --- a/ntcore/src/generate/main/java/GenericSubscriber.java.jinja +++ b/ntcore/src/generate/main/java/GenericSubscriber.java.jinja @@ -4,7 +4,7 @@ // THIS FILE WAS AUTO-GENERATED BY ./ntcore/generate_topics.py. DO NOT MODIFY -package edu.wpi.first.networktables; +package org.wpilib.networktables; import java.util.function.Supplier; diff --git a/ntcore/src/generate/main/java/NetworkTableEntry.java.jinja b/ntcore/src/generate/main/java/NetworkTableEntry.java.jinja index ba6de81abe..a162d7b970 100644 --- a/ntcore/src/generate/main/java/NetworkTableEntry.java.jinja +++ b/ntcore/src/generate/main/java/NetworkTableEntry.java.jinja @@ -4,7 +4,7 @@ // THIS FILE WAS AUTO-GENERATED BY ./ntcore/generate_topics.py. DO NOT MODIFY -package edu.wpi.first.networktables; +package org.wpilib.networktables; import java.nio.ByteBuffer; diff --git a/ntcore/src/generate/main/java/NetworkTableInstance.java.jinja b/ntcore/src/generate/main/java/NetworkTableInstance.java.jinja index 28f8687cb9..d5db12af22 100644 --- a/ntcore/src/generate/main/java/NetworkTableInstance.java.jinja +++ b/ntcore/src/generate/main/java/NetworkTableInstance.java.jinja @@ -4,13 +4,13 @@ // THIS FILE WAS AUTO-GENERATED BY ./ntcore/generate_topics.py. DO NOT MODIFY -package edu.wpi.first.networktables; +package org.wpilib.networktables; -import edu.wpi.first.datalog.DataLog; -import edu.wpi.first.util.WPIUtilJNI; -import edu.wpi.first.util.concurrent.Event; -import edu.wpi.first.util.protobuf.Protobuf; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.datalog.DataLog; +import org.wpilib.util.WPIUtilJNI; +import org.wpilib.util.concurrent.Event; +import org.wpilib.util.protobuf.Protobuf; +import org.wpilib.util.struct.Struct; import java.nio.charset.StandardCharsets; import java.util.EnumSet; import java.util.HashMap; diff --git a/ntcore/src/generate/main/java/NetworkTableValue.java.jinja b/ntcore/src/generate/main/java/NetworkTableValue.java.jinja index 8b0baf1a83..ff07bc4b80 100644 --- a/ntcore/src/generate/main/java/NetworkTableValue.java.jinja +++ b/ntcore/src/generate/main/java/NetworkTableValue.java.jinja @@ -4,7 +4,7 @@ // THIS FILE WAS AUTO-GENERATED BY ./ntcore/generate_topics.py. DO NOT MODIFY -package edu.wpi.first.networktables; +package org.wpilib.networktables; import java.util.Objects; diff --git a/ntcore/src/generate/main/java/NetworkTablesJNI.java.jinja b/ntcore/src/generate/main/java/NetworkTablesJNI.java.jinja index 06f69e292f..56bb920887 100644 --- a/ntcore/src/generate/main/java/NetworkTablesJNI.java.jinja +++ b/ntcore/src/generate/main/java/NetworkTablesJNI.java.jinja @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./ntcore/generate_topics.py. DO NOT MODIFY -package edu.wpi.first.networktables; +package org.wpilib.networktables; -import edu.wpi.first.datalog.DataLog; -import edu.wpi.first.util.RuntimeLoader; +import org.wpilib.datalog.DataLog; +import org.wpilib.util.runtime.RuntimeLoader; import java.io.IOException; import java.nio.ByteBuffer; import java.util.EnumSet; diff --git a/ntcore/src/generate/main/java/Publisher.java.jinja b/ntcore/src/generate/main/java/Publisher.java.jinja index d35c941311..3f84cf1b37 100644 --- a/ntcore/src/generate/main/java/Publisher.java.jinja +++ b/ntcore/src/generate/main/java/Publisher.java.jinja @@ -4,7 +4,7 @@ // THIS FILE WAS AUTO-GENERATED BY ./ntcore/generate_topics.py. DO NOT MODIFY -package edu.wpi.first.networktables; +package org.wpilib.networktables; {% if TypeName == "Raw" %} import java.nio.ByteBuffer; diff --git a/ntcore/src/generate/main/java/Subscriber.java.jinja b/ntcore/src/generate/main/java/Subscriber.java.jinja index c3531068c7..9d7bd9a6e7 100644 --- a/ntcore/src/generate/main/java/Subscriber.java.jinja +++ b/ntcore/src/generate/main/java/Subscriber.java.jinja @@ -4,7 +4,7 @@ // THIS FILE WAS AUTO-GENERATED BY ./ntcore/generate_topics.py. DO NOT MODIFY -package edu.wpi.first.networktables; +package org.wpilib.networktables; import {{ java.SupplierFunctionPackage|default('java.util.function') }}.{{ java.FunctionTypePrefix }}Supplier; diff --git a/ntcore/src/generate/main/java/Timestamped.java.jinja b/ntcore/src/generate/main/java/Timestamped.java.jinja index 0bbd74774e..144cc5023d 100644 --- a/ntcore/src/generate/main/java/Timestamped.java.jinja +++ b/ntcore/src/generate/main/java/Timestamped.java.jinja @@ -4,7 +4,7 @@ // THIS FILE WAS AUTO-GENERATED BY ./ntcore/generate_topics.py. DO NOT MODIFY -package edu.wpi.first.networktables; +package org.wpilib.networktables; /** NetworkTables timestamped {{ TypeName }}. */ public final class Timestamped{{ TypeName }} { diff --git a/ntcore/src/generate/main/java/Topic.java.jinja b/ntcore/src/generate/main/java/Topic.java.jinja index 6407a4b18e..9ddfd501fc 100644 --- a/ntcore/src/generate/main/java/Topic.java.jinja +++ b/ntcore/src/generate/main/java/Topic.java.jinja @@ -4,7 +4,7 @@ // THIS FILE WAS AUTO-GENERATED BY ./ntcore/generate_topics.py. DO NOT MODIFY -package edu.wpi.first.networktables; +package org.wpilib.networktables; /** NetworkTables {{ TypeName }} topic. */ public final class {{ TypeName }}Topic extends Topic { diff --git a/ntcore/src/generate/main/native/cpp/jni/types_jni.cpp.jinja b/ntcore/src/generate/main/native/cpp/jni/types_jni.cpp.jinja index fc811f54cd..7768fed4ee 100644 --- a/ntcore/src/generate/main/native/cpp/jni/types_jni.cpp.jinja +++ b/ntcore/src/generate/main/native/cpp/jni/types_jni.cpp.jinja @@ -8,7 +8,7 @@ #include -#include "edu_wpi_first_networktables_NetworkTablesJNI.h" +#include "org_wpilib_networktables_NetworkTablesJNI.h" #include "ntcore.h" using namespace wpi::java; @@ -30,7 +30,7 @@ static JException nullPointerEx; static const JClassInit classes[] = { {%- for t in types %} - {"edu/wpi/first/networktables/Timestamped{{ t.TypeName }}", ×tamped{{ t.TypeName }}Cls}, + {"org/wpilib/networktables/Timestamped{{ t.TypeName }}", ×tamped{{ t.TypeName }}Cls}, {%- endfor %} {%- for t in types %} {%- if t.jni.ToJavaArray == "MakeJObjectArray" %} @@ -160,48 +160,48 @@ static jobjectArray MakeJObjectArray(JNIEnv* env, std::span -#include "edu_wpi_first_networktables_NetworkTablesJNI.h" +#include "org_wpilib_networktables_NetworkTablesJNI.h" #include "ntcore.h" using namespace wpi::java; @@ -39,17 +39,17 @@ static JException indexOobEx; static JException nullPointerEx; static const JClassInit classes[] = { - {"edu/wpi/first/networktables/TimestampedBoolean", ×tampedBooleanCls}, - {"edu/wpi/first/networktables/TimestampedInteger", ×tampedIntegerCls}, - {"edu/wpi/first/networktables/TimestampedFloat", ×tampedFloatCls}, - {"edu/wpi/first/networktables/TimestampedDouble", ×tampedDoubleCls}, - {"edu/wpi/first/networktables/TimestampedString", ×tampedStringCls}, - {"edu/wpi/first/networktables/TimestampedRaw", ×tampedRawCls}, - {"edu/wpi/first/networktables/TimestampedBooleanArray", ×tampedBooleanArrayCls}, - {"edu/wpi/first/networktables/TimestampedIntegerArray", ×tampedIntegerArrayCls}, - {"edu/wpi/first/networktables/TimestampedFloatArray", ×tampedFloatArrayCls}, - {"edu/wpi/first/networktables/TimestampedDoubleArray", ×tampedDoubleArrayCls}, - {"edu/wpi/first/networktables/TimestampedStringArray", ×tampedStringArrayCls}, + {"org/wpilib/networktables/TimestampedBoolean", ×tampedBooleanCls}, + {"org/wpilib/networktables/TimestampedInteger", ×tampedIntegerCls}, + {"org/wpilib/networktables/TimestampedFloat", ×tampedFloatCls}, + {"org/wpilib/networktables/TimestampedDouble", ×tampedDoubleCls}, + {"org/wpilib/networktables/TimestampedString", ×tampedStringCls}, + {"org/wpilib/networktables/TimestampedRaw", ×tampedRawCls}, + {"org/wpilib/networktables/TimestampedBooleanArray", ×tampedBooleanArrayCls}, + {"org/wpilib/networktables/TimestampedIntegerArray", ×tampedIntegerArrayCls}, + {"org/wpilib/networktables/TimestampedFloatArray", ×tampedFloatArrayCls}, + {"org/wpilib/networktables/TimestampedDoubleArray", ×tampedDoubleArrayCls}, + {"org/wpilib/networktables/TimestampedStringArray", ×tampedStringArrayCls}, {"[B", &jbyteArrayCls}, {"[Z", &jbooleanArrayCls}, {"[J", &jlongArrayCls}, @@ -463,72 +463,72 @@ static jobjectArray MakeJObjectArray(JNIEnv* env, std::span{env, defaultValue}.uarray())); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: readQueueRaw - * Signature: (I)[Ledu/wpi/first/networktables/TimestampedRaw; + * Signature: (I)[Lorg/wpilib/networktables/TimestampedRaw; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_readQueueRaw +Java_org_wpilib_networktables_NetworkTablesJNI_readQueueRaw (JNIEnv* env, jclass, jint subentry) { return MakeJObject(env, nt::ReadQueueRaw(subentry)); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: readQueueValuesRaw * Signature: (I)[[B */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_readQueueValuesRaw +Java_org_wpilib_networktables_NetworkTablesJNI_readQueueValuesRaw (JNIEnv* env, jclass, jint subentry) { return MakeJObjectArray(env, nt::ReadQueueValuesRaw(subentry)); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: setRaw * Signature: (IJ[BII)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_setRaw +Java_org_wpilib_networktables_NetworkTablesJNI_setRaw (JNIEnv* env, jclass, jint entry, jlong time, jbyteArray value, jint start, jint len) { if (!value) { @@ -905,12 +905,12 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_setRaw } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: setRawBuffer * Signature: (IJLjava/nio/ByteBuffer;II)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_setRawBuffer +Java_org_wpilib_networktables_NetworkTablesJNI_setRawBuffer (JNIEnv* env, jclass, jint entry, jlong time, jobject value, jint start, jint len) { if (!value) { @@ -934,12 +934,12 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_setRawBuffer } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getRaw * Signature: (I[B)[B */ JNIEXPORT jbyteArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getRaw +Java_org_wpilib_networktables_NetworkTablesJNI_getRaw (JNIEnv* env, jclass, jint entry, jbyteArray defaultValue) { auto val = nt::GetEntryValue(entry); @@ -950,12 +950,12 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_getRaw } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: setDefaultRaw * Signature: (IJ[BII)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_setDefaultRaw +Java_org_wpilib_networktables_NetworkTablesJNI_setDefaultRaw (JNIEnv* env, jclass, jint entry, jlong, jbyteArray defaultValue, jint start, jint len) { if (!defaultValue) { @@ -979,12 +979,12 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_setDefaultRaw } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: setDefaultRawBuffer * Signature: (IJLjava/nio/ByteBuffer;II)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_setDefaultRawBuffer +Java_org_wpilib_networktables_NetworkTablesJNI_setDefaultRawBuffer (JNIEnv* env, jclass, jint entry, jlong, jobject defaultValue, jint start, jint len) { if (!defaultValue) { @@ -1009,48 +1009,48 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_setDefaultRawBuffer /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getAtomicBooleanArray - * Signature: (I[Z)Ledu/wpi/first/networktables/TimestampedBooleanArray; + * Signature: (I[Z)Lorg/wpilib/networktables/TimestampedBooleanArray; */ JNIEXPORT jobject JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getAtomicBooleanArray +Java_org_wpilib_networktables_NetworkTablesJNI_getAtomicBooleanArray (JNIEnv* env, jclass, jint subentry, jbooleanArray defaultValue) { return MakeJObject(env, nt::GetAtomicBooleanArray(subentry, FromJavaBooleanArray(env, defaultValue))); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: readQueueBooleanArray - * Signature: (I)[Ledu/wpi/first/networktables/TimestampedBooleanArray; + * Signature: (I)[Lorg/wpilib/networktables/TimestampedBooleanArray; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_readQueueBooleanArray +Java_org_wpilib_networktables_NetworkTablesJNI_readQueueBooleanArray (JNIEnv* env, jclass, jint subentry) { return MakeJObject(env, nt::ReadQueueBooleanArray(subentry)); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: readQueueValuesBooleanArray * Signature: (I)[[Z */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_readQueueValuesBooleanArray +Java_org_wpilib_networktables_NetworkTablesJNI_readQueueValuesBooleanArray (JNIEnv* env, jclass, jint subentry) { return MakeJObjectArray(env, nt::ReadQueueValuesBooleanArray(subentry)); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: setBooleanArray * Signature: (IJ[Z)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_setBooleanArray +Java_org_wpilib_networktables_NetworkTablesJNI_setBooleanArray (JNIEnv* env, jclass, jint entry, jlong time, jbooleanArray value) { if (!value) { @@ -1061,12 +1061,12 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_setBooleanArray } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getBooleanArray * Signature: (I[Z)[Z */ JNIEXPORT jbooleanArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getBooleanArray +Java_org_wpilib_networktables_NetworkTablesJNI_getBooleanArray (JNIEnv* env, jclass, jint entry, jbooleanArray defaultValue) { auto val = nt::GetEntryValue(entry); @@ -1077,12 +1077,12 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_getBooleanArray } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: setDefaultBooleanArray * Signature: (IJ[Z)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_setDefaultBooleanArray +Java_org_wpilib_networktables_NetworkTablesJNI_setDefaultBooleanArray (JNIEnv* env, jclass, jint entry, jlong, jbooleanArray defaultValue) { if (!defaultValue) { @@ -1094,48 +1094,48 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_setDefaultBooleanArray /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getAtomicIntegerArray - * Signature: (I[J)Ledu/wpi/first/networktables/TimestampedIntegerArray; + * Signature: (I[J)Lorg/wpilib/networktables/TimestampedIntegerArray; */ JNIEXPORT jobject JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getAtomicIntegerArray +Java_org_wpilib_networktables_NetworkTablesJNI_getAtomicIntegerArray (JNIEnv* env, jclass, jint subentry, jlongArray defaultValue) { return MakeJObject(env, nt::GetAtomicIntegerArray(subentry, CriticalJSpan{env, defaultValue})); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: readQueueIntegerArray - * Signature: (I)[Ledu/wpi/first/networktables/TimestampedIntegerArray; + * Signature: (I)[Lorg/wpilib/networktables/TimestampedIntegerArray; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_readQueueIntegerArray +Java_org_wpilib_networktables_NetworkTablesJNI_readQueueIntegerArray (JNIEnv* env, jclass, jint subentry) { return MakeJObject(env, nt::ReadQueueIntegerArray(subentry)); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: readQueueValuesIntegerArray * Signature: (I)[[J */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_readQueueValuesIntegerArray +Java_org_wpilib_networktables_NetworkTablesJNI_readQueueValuesIntegerArray (JNIEnv* env, jclass, jint subentry) { return MakeJObjectArray(env, nt::ReadQueueValuesIntegerArray(subentry)); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: setIntegerArray * Signature: (IJ[J)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_setIntegerArray +Java_org_wpilib_networktables_NetworkTablesJNI_setIntegerArray (JNIEnv* env, jclass, jint entry, jlong time, jlongArray value) { if (!value) { @@ -1146,12 +1146,12 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_setIntegerArray } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getIntegerArray * Signature: (I[J)[J */ JNIEXPORT jlongArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getIntegerArray +Java_org_wpilib_networktables_NetworkTablesJNI_getIntegerArray (JNIEnv* env, jclass, jint entry, jlongArray defaultValue) { auto val = nt::GetEntryValue(entry); @@ -1162,12 +1162,12 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_getIntegerArray } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: setDefaultIntegerArray * Signature: (IJ[J)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_setDefaultIntegerArray +Java_org_wpilib_networktables_NetworkTablesJNI_setDefaultIntegerArray (JNIEnv* env, jclass, jint entry, jlong, jlongArray defaultValue) { if (!defaultValue) { @@ -1179,48 +1179,48 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_setDefaultIntegerArray /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getAtomicFloatArray - * Signature: (I[F)Ledu/wpi/first/networktables/TimestampedFloatArray; + * Signature: (I[F)Lorg/wpilib/networktables/TimestampedFloatArray; */ JNIEXPORT jobject JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getAtomicFloatArray +Java_org_wpilib_networktables_NetworkTablesJNI_getAtomicFloatArray (JNIEnv* env, jclass, jint subentry, jfloatArray defaultValue) { return MakeJObject(env, nt::GetAtomicFloatArray(subentry, CriticalJSpan{env, defaultValue})); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: readQueueFloatArray - * Signature: (I)[Ledu/wpi/first/networktables/TimestampedFloatArray; + * Signature: (I)[Lorg/wpilib/networktables/TimestampedFloatArray; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_readQueueFloatArray +Java_org_wpilib_networktables_NetworkTablesJNI_readQueueFloatArray (JNIEnv* env, jclass, jint subentry) { return MakeJObject(env, nt::ReadQueueFloatArray(subentry)); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: readQueueValuesFloatArray * Signature: (I)[[F */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_readQueueValuesFloatArray +Java_org_wpilib_networktables_NetworkTablesJNI_readQueueValuesFloatArray (JNIEnv* env, jclass, jint subentry) { return MakeJObjectArray(env, nt::ReadQueueValuesFloatArray(subentry)); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: setFloatArray * Signature: (IJ[F)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_setFloatArray +Java_org_wpilib_networktables_NetworkTablesJNI_setFloatArray (JNIEnv* env, jclass, jint entry, jlong time, jfloatArray value) { if (!value) { @@ -1231,12 +1231,12 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_setFloatArray } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getFloatArray * Signature: (I[F)[F */ JNIEXPORT jfloatArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getFloatArray +Java_org_wpilib_networktables_NetworkTablesJNI_getFloatArray (JNIEnv* env, jclass, jint entry, jfloatArray defaultValue) { auto val = nt::GetEntryValue(entry); @@ -1247,12 +1247,12 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_getFloatArray } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: setDefaultFloatArray * Signature: (IJ[F)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_setDefaultFloatArray +Java_org_wpilib_networktables_NetworkTablesJNI_setDefaultFloatArray (JNIEnv* env, jclass, jint entry, jlong, jfloatArray defaultValue) { if (!defaultValue) { @@ -1264,48 +1264,48 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_setDefaultFloatArray /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getAtomicDoubleArray - * Signature: (I[D)Ledu/wpi/first/networktables/TimestampedDoubleArray; + * Signature: (I[D)Lorg/wpilib/networktables/TimestampedDoubleArray; */ JNIEXPORT jobject JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getAtomicDoubleArray +Java_org_wpilib_networktables_NetworkTablesJNI_getAtomicDoubleArray (JNIEnv* env, jclass, jint subentry, jdoubleArray defaultValue) { return MakeJObject(env, nt::GetAtomicDoubleArray(subentry, CriticalJSpan{env, defaultValue})); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: readQueueDoubleArray - * Signature: (I)[Ledu/wpi/first/networktables/TimestampedDoubleArray; + * Signature: (I)[Lorg/wpilib/networktables/TimestampedDoubleArray; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_readQueueDoubleArray +Java_org_wpilib_networktables_NetworkTablesJNI_readQueueDoubleArray (JNIEnv* env, jclass, jint subentry) { return MakeJObject(env, nt::ReadQueueDoubleArray(subentry)); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: readQueueValuesDoubleArray * Signature: (I)[[D */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_readQueueValuesDoubleArray +Java_org_wpilib_networktables_NetworkTablesJNI_readQueueValuesDoubleArray (JNIEnv* env, jclass, jint subentry) { return MakeJObjectArray(env, nt::ReadQueueValuesDoubleArray(subentry)); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: setDoubleArray * Signature: (IJ[D)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_setDoubleArray +Java_org_wpilib_networktables_NetworkTablesJNI_setDoubleArray (JNIEnv* env, jclass, jint entry, jlong time, jdoubleArray value) { if (!value) { @@ -1316,12 +1316,12 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_setDoubleArray } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getDoubleArray * Signature: (I[D)[D */ JNIEXPORT jdoubleArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getDoubleArray +Java_org_wpilib_networktables_NetworkTablesJNI_getDoubleArray (JNIEnv* env, jclass, jint entry, jdoubleArray defaultValue) { auto val = nt::GetEntryValue(entry); @@ -1332,12 +1332,12 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_getDoubleArray } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: setDefaultDoubleArray * Signature: (IJ[D)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_setDefaultDoubleArray +Java_org_wpilib_networktables_NetworkTablesJNI_setDefaultDoubleArray (JNIEnv* env, jclass, jint entry, jlong, jdoubleArray defaultValue) { if (!defaultValue) { @@ -1349,48 +1349,48 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_setDefaultDoubleArray /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getAtomicStringArray - * Signature: (I[Ljava/lang/Object;)Ledu/wpi/first/networktables/TimestampedStringArray; + * Signature: (I[Ljava/lang/Object;)Lorg/wpilib/networktables/TimestampedStringArray; */ JNIEXPORT jobject JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getAtomicStringArray +Java_org_wpilib_networktables_NetworkTablesJNI_getAtomicStringArray (JNIEnv* env, jclass, jint subentry, jobjectArray defaultValue) { return MakeJObject(env, nt::GetAtomicStringArray(subentry, FromJavaStringArray(env, defaultValue))); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: readQueueStringArray - * Signature: (I)[Ledu/wpi/first/networktables/TimestampedStringArray; + * Signature: (I)[Lorg/wpilib/networktables/TimestampedStringArray; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_readQueueStringArray +Java_org_wpilib_networktables_NetworkTablesJNI_readQueueStringArray (JNIEnv* env, jclass, jint subentry) { return MakeJObject(env, nt::ReadQueueStringArray(subentry)); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: readQueueValuesStringArray * Signature: (I)[[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_readQueueValuesStringArray +Java_org_wpilib_networktables_NetworkTablesJNI_readQueueValuesStringArray (JNIEnv* env, jclass, jint subentry) { return MakeJObjectArray(env, nt::ReadQueueValuesStringArray(subentry)); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: setStringArray * Signature: (IJ[Ljava/lang/Object;)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_setStringArray +Java_org_wpilib_networktables_NetworkTablesJNI_setStringArray (JNIEnv* env, jclass, jint entry, jlong time, jobjectArray value) { if (!value) { @@ -1401,12 +1401,12 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_setStringArray } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getStringArray * Signature: (I[Ljava/lang/Object;)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getStringArray +Java_org_wpilib_networktables_NetworkTablesJNI_getStringArray (JNIEnv* env, jclass, jint entry, jobjectArray defaultValue) { auto val = nt::GetEntryValue(entry); @@ -1417,12 +1417,12 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_getStringArray } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: setDefaultStringArray * Signature: (IJ[Ljava/lang/Object;)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_setDefaultStringArray +Java_org_wpilib_networktables_NetworkTablesJNI_setDefaultStringArray (JNIEnv* env, jclass, jint entry, jlong, jobjectArray defaultValue) { if (!defaultValue) { diff --git a/ntcore/src/main/java/org/wpilib/networktables/ConnectionInfo.java b/ntcore/src/main/java/org/wpilib/networktables/ConnectionInfo.java index 1881190540..33ef2525db 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/ConnectionInfo.java +++ b/ntcore/src/main/java/org/wpilib/networktables/ConnectionInfo.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 edu.wpi.first.networktables; +package org.wpilib.networktables; /** NetworkTables Connection information. */ @SuppressWarnings("MemberName") diff --git a/ntcore/src/main/java/org/wpilib/networktables/EntryBase.java b/ntcore/src/main/java/org/wpilib/networktables/EntryBase.java index 2083423d93..9e60c32490 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/EntryBase.java +++ b/ntcore/src/main/java/org/wpilib/networktables/EntryBase.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 edu.wpi.first.networktables; +package org.wpilib.networktables; /** NetworkTables entry base implementation. */ public abstract class EntryBase implements Subscriber, Publisher { diff --git a/ntcore/src/main/java/org/wpilib/networktables/GenericEntry.java b/ntcore/src/main/java/org/wpilib/networktables/GenericEntry.java index 77e7502a63..25507dd3c9 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/GenericEntry.java +++ b/ntcore/src/main/java/org/wpilib/networktables/GenericEntry.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 edu.wpi.first.networktables; +package org.wpilib.networktables; /** * NetworkTables generic entry. diff --git a/ntcore/src/main/java/org/wpilib/networktables/LogMessage.java b/ntcore/src/main/java/org/wpilib/networktables/LogMessage.java index 3f268405b6..ab4e13ea72 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/LogMessage.java +++ b/ntcore/src/main/java/org/wpilib/networktables/LogMessage.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 edu.wpi.first.networktables; +package org.wpilib.networktables; /** NetworkTables log message. */ @SuppressWarnings("MemberName") diff --git a/ntcore/src/main/java/org/wpilib/networktables/MultiSubscriber.java b/ntcore/src/main/java/org/wpilib/networktables/MultiSubscriber.java index 203299676f..9ad55617db 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/MultiSubscriber.java +++ b/ntcore/src/main/java/org/wpilib/networktables/MultiSubscriber.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 edu.wpi.first.networktables; +package org.wpilib.networktables; /** * Subscribe to multiple topics based on one or more topic name prefixes. Can be used in combination diff --git a/ntcore/src/main/java/org/wpilib/networktables/NTSendable.java b/ntcore/src/main/java/org/wpilib/networktables/NTSendable.java index 992cfffe7e..18a6ead78e 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/NTSendable.java +++ b/ntcore/src/main/java/org/wpilib/networktables/NTSendable.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.networktables; +package org.wpilib.networktables; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; /** Interface for NetworkTable Sendable objects. */ @SuppressWarnings("PMD.ImplicitFunctionalInterface") diff --git a/ntcore/src/main/java/org/wpilib/networktables/NTSendableBuilder.java b/ntcore/src/main/java/org/wpilib/networktables/NTSendableBuilder.java index ce09d693de..fd92dc6f44 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/NTSendableBuilder.java +++ b/ntcore/src/main/java/org/wpilib/networktables/NTSendableBuilder.java @@ -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. -package edu.wpi.first.networktables; +package org.wpilib.networktables; -import edu.wpi.first.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableBuilder; /** Helper class for building Sendable dashboard representations for NetworkTables. */ public interface NTSendableBuilder extends SendableBuilder { diff --git a/ntcore/src/main/java/org/wpilib/networktables/NetworkTable.java b/ntcore/src/main/java/org/wpilib/networktables/NetworkTable.java index e3e3b258fa..eb27b6d922 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/NetworkTable.java +++ b/ntcore/src/main/java/org/wpilib/networktables/NetworkTable.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.networktables; +package org.wpilib.networktables; -import edu.wpi.first.util.protobuf.Protobuf; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.util.protobuf.Protobuf; +import org.wpilib.util.struct.Struct; import java.util.ArrayList; import java.util.EnumSet; import java.util.HashSet; diff --git a/ntcore/src/main/java/org/wpilib/networktables/NetworkTableEvent.java b/ntcore/src/main/java/org/wpilib/networktables/NetworkTableEvent.java index 55f040c96a..6a3e036c00 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/NetworkTableEvent.java +++ b/ntcore/src/main/java/org/wpilib/networktables/NetworkTableEvent.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 edu.wpi.first.networktables; +package org.wpilib.networktables; /** * NetworkTables event. diff --git a/ntcore/src/main/java/org/wpilib/networktables/NetworkTableListener.java b/ntcore/src/main/java/org/wpilib/networktables/NetworkTableListener.java index c34cd58cb9..d34b1ab72f 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/NetworkTableListener.java +++ b/ntcore/src/main/java/org/wpilib/networktables/NetworkTableListener.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 edu.wpi.first.networktables; +package org.wpilib.networktables; import java.util.EnumSet; import java.util.function.Consumer; diff --git a/ntcore/src/main/java/org/wpilib/networktables/NetworkTableListenerPoller.java b/ntcore/src/main/java/org/wpilib/networktables/NetworkTableListenerPoller.java index 3a504f3bf0..e39aa68cfe 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/NetworkTableListenerPoller.java +++ b/ntcore/src/main/java/org/wpilib/networktables/NetworkTableListenerPoller.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 edu.wpi.first.networktables; +package org.wpilib.networktables; import java.util.EnumSet; diff --git a/ntcore/src/main/java/org/wpilib/networktables/NetworkTableType.java b/ntcore/src/main/java/org/wpilib/networktables/NetworkTableType.java index f84ab4e384..b554ccb80c 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/NetworkTableType.java +++ b/ntcore/src/main/java/org/wpilib/networktables/NetworkTableType.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 edu.wpi.first.networktables; +package org.wpilib.networktables; /** Network table data types. */ public enum NetworkTableType { diff --git a/ntcore/src/main/java/org/wpilib/networktables/ProtobufEntry.java b/ntcore/src/main/java/org/wpilib/networktables/ProtobufEntry.java index 3f82c7ace4..c2814c36d3 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/ProtobufEntry.java +++ b/ntcore/src/main/java/org/wpilib/networktables/ProtobufEntry.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 edu.wpi.first.networktables; +package org.wpilib.networktables; /** * NetworkTables protobuf-encoded value entry. diff --git a/ntcore/src/main/java/org/wpilib/networktables/ProtobufEntryImpl.java b/ntcore/src/main/java/org/wpilib/networktables/ProtobufEntryImpl.java index 6d891c4516..67ba79fd9d 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/ProtobufEntryImpl.java +++ b/ntcore/src/main/java/org/wpilib/networktables/ProtobufEntryImpl.java @@ -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. -package edu.wpi.first.networktables; +package org.wpilib.networktables; -import edu.wpi.first.util.protobuf.ProtobufBuffer; +import org.wpilib.util.protobuf.ProtobufBuffer; import java.io.IOException; import java.lang.reflect.Array; import java.nio.ByteBuffer; diff --git a/ntcore/src/main/java/org/wpilib/networktables/ProtobufPublisher.java b/ntcore/src/main/java/org/wpilib/networktables/ProtobufPublisher.java index ab22b86d13..01221e6869 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/ProtobufPublisher.java +++ b/ntcore/src/main/java/org/wpilib/networktables/ProtobufPublisher.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 edu.wpi.first.networktables; +package org.wpilib.networktables; import java.util.function.Consumer; diff --git a/ntcore/src/main/java/org/wpilib/networktables/ProtobufSubscriber.java b/ntcore/src/main/java/org/wpilib/networktables/ProtobufSubscriber.java index 2236ce9a32..d66f313747 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/ProtobufSubscriber.java +++ b/ntcore/src/main/java/org/wpilib/networktables/ProtobufSubscriber.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 edu.wpi.first.networktables; +package org.wpilib.networktables; import java.util.function.Supplier; diff --git a/ntcore/src/main/java/org/wpilib/networktables/ProtobufTopic.java b/ntcore/src/main/java/org/wpilib/networktables/ProtobufTopic.java index d707ca2641..1f5375cb8e 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/ProtobufTopic.java +++ b/ntcore/src/main/java/org/wpilib/networktables/ProtobufTopic.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.networktables; +package org.wpilib.networktables; -import edu.wpi.first.util.protobuf.Protobuf; -import edu.wpi.first.util.protobuf.ProtobufBuffer; +import org.wpilib.util.protobuf.Protobuf; +import org.wpilib.util.protobuf.ProtobufBuffer; /** * NetworkTables protobuf-encoded value topic. diff --git a/ntcore/src/main/java/org/wpilib/networktables/PubSub.java b/ntcore/src/main/java/org/wpilib/networktables/PubSub.java index 7beaf9ed25..a4db3bc95d 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/PubSub.java +++ b/ntcore/src/main/java/org/wpilib/networktables/PubSub.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 edu.wpi.first.networktables; +package org.wpilib.networktables; /** NetworkTables publisher or subscriber. */ public interface PubSub extends AutoCloseable { diff --git a/ntcore/src/main/java/org/wpilib/networktables/PubSubOption.java b/ntcore/src/main/java/org/wpilib/networktables/PubSubOption.java index b9d885533e..606e6bb9db 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/PubSubOption.java +++ b/ntcore/src/main/java/org/wpilib/networktables/PubSubOption.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 edu.wpi.first.networktables; +package org.wpilib.networktables; /** NetworkTables publish/subscribe option. */ public class PubSubOption { diff --git a/ntcore/src/main/java/org/wpilib/networktables/PubSubOptions.java b/ntcore/src/main/java/org/wpilib/networktables/PubSubOptions.java index 3adf9e6731..b0bbdbbae0 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/PubSubOptions.java +++ b/ntcore/src/main/java/org/wpilib/networktables/PubSubOptions.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 edu.wpi.first.networktables; +package org.wpilib.networktables; /** NetworkTables publish/subscribe options. */ @SuppressWarnings("MemberName") diff --git a/ntcore/src/main/java/org/wpilib/networktables/Publisher.java b/ntcore/src/main/java/org/wpilib/networktables/Publisher.java index 616c7ab2a8..cc2dd9419f 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/Publisher.java +++ b/ntcore/src/main/java/org/wpilib/networktables/Publisher.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 edu.wpi.first.networktables; +package org.wpilib.networktables; /** NetworkTables publisher. */ public interface Publisher extends PubSub {} diff --git a/ntcore/src/main/java/org/wpilib/networktables/StructArrayEntry.java b/ntcore/src/main/java/org/wpilib/networktables/StructArrayEntry.java index 4cc9e8593d..09c52478e5 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/StructArrayEntry.java +++ b/ntcore/src/main/java/org/wpilib/networktables/StructArrayEntry.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 edu.wpi.first.networktables; +package org.wpilib.networktables; /** * NetworkTables struct-encoded array value entry. diff --git a/ntcore/src/main/java/org/wpilib/networktables/StructArrayEntryImpl.java b/ntcore/src/main/java/org/wpilib/networktables/StructArrayEntryImpl.java index 1e6b69ec0f..e98b35bfe9 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/StructArrayEntryImpl.java +++ b/ntcore/src/main/java/org/wpilib/networktables/StructArrayEntryImpl.java @@ -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. -package edu.wpi.first.networktables; +package org.wpilib.networktables; -import edu.wpi.first.util.struct.StructBuffer; +import org.wpilib.util.struct.StructBuffer; import java.lang.reflect.Array; import java.nio.ByteBuffer; diff --git a/ntcore/src/main/java/org/wpilib/networktables/StructArrayPublisher.java b/ntcore/src/main/java/org/wpilib/networktables/StructArrayPublisher.java index aa291e9d49..9b2f5498e5 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/StructArrayPublisher.java +++ b/ntcore/src/main/java/org/wpilib/networktables/StructArrayPublisher.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 edu.wpi.first.networktables; +package org.wpilib.networktables; import java.util.function.Consumer; diff --git a/ntcore/src/main/java/org/wpilib/networktables/StructArraySubscriber.java b/ntcore/src/main/java/org/wpilib/networktables/StructArraySubscriber.java index b4755e6d1c..a12d341691 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/StructArraySubscriber.java +++ b/ntcore/src/main/java/org/wpilib/networktables/StructArraySubscriber.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 edu.wpi.first.networktables; +package org.wpilib.networktables; import java.util.function.Supplier; diff --git a/ntcore/src/main/java/org/wpilib/networktables/StructArrayTopic.java b/ntcore/src/main/java/org/wpilib/networktables/StructArrayTopic.java index fb0516c1d3..e273c1e163 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/StructArrayTopic.java +++ b/ntcore/src/main/java/org/wpilib/networktables/StructArrayTopic.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.networktables; +package org.wpilib.networktables; -import edu.wpi.first.util.struct.Struct; -import edu.wpi.first.util.struct.StructBuffer; +import org.wpilib.util.struct.Struct; +import org.wpilib.util.struct.StructBuffer; /** * NetworkTables struct-encoded array value topic. diff --git a/ntcore/src/main/java/org/wpilib/networktables/StructEntry.java b/ntcore/src/main/java/org/wpilib/networktables/StructEntry.java index e687fdb452..edc81182a9 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/StructEntry.java +++ b/ntcore/src/main/java/org/wpilib/networktables/StructEntry.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 edu.wpi.first.networktables; +package org.wpilib.networktables; /** * NetworkTables struct-encoded value entry. diff --git a/ntcore/src/main/java/org/wpilib/networktables/StructEntryImpl.java b/ntcore/src/main/java/org/wpilib/networktables/StructEntryImpl.java index 5d37765707..f5c5abbba6 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/StructEntryImpl.java +++ b/ntcore/src/main/java/org/wpilib/networktables/StructEntryImpl.java @@ -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. -package edu.wpi.first.networktables; +package org.wpilib.networktables; -import edu.wpi.first.util.struct.StructBuffer; +import org.wpilib.util.struct.StructBuffer; import java.lang.reflect.Array; import java.nio.ByteBuffer; diff --git a/ntcore/src/main/java/org/wpilib/networktables/StructPublisher.java b/ntcore/src/main/java/org/wpilib/networktables/StructPublisher.java index ec766e4775..d78382434d 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/StructPublisher.java +++ b/ntcore/src/main/java/org/wpilib/networktables/StructPublisher.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 edu.wpi.first.networktables; +package org.wpilib.networktables; import java.util.function.Consumer; diff --git a/ntcore/src/main/java/org/wpilib/networktables/StructSubscriber.java b/ntcore/src/main/java/org/wpilib/networktables/StructSubscriber.java index b537b5cfc3..7c3118feeb 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/StructSubscriber.java +++ b/ntcore/src/main/java/org/wpilib/networktables/StructSubscriber.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 edu.wpi.first.networktables; +package org.wpilib.networktables; import java.util.function.Supplier; diff --git a/ntcore/src/main/java/org/wpilib/networktables/StructTopic.java b/ntcore/src/main/java/org/wpilib/networktables/StructTopic.java index 2395d64201..f73cfe2e5c 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/StructTopic.java +++ b/ntcore/src/main/java/org/wpilib/networktables/StructTopic.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.networktables; +package org.wpilib.networktables; -import edu.wpi.first.util.struct.Struct; -import edu.wpi.first.util.struct.StructBuffer; +import org.wpilib.util.struct.Struct; +import org.wpilib.util.struct.StructBuffer; /** * NetworkTables struct-encoded value topic. diff --git a/ntcore/src/main/java/org/wpilib/networktables/Subscriber.java b/ntcore/src/main/java/org/wpilib/networktables/Subscriber.java index 08f825d09c..b1dbcbaf5c 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/Subscriber.java +++ b/ntcore/src/main/java/org/wpilib/networktables/Subscriber.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 edu.wpi.first.networktables; +package org.wpilib.networktables; /** NetworkTables subscriber. */ public interface Subscriber extends PubSub { diff --git a/ntcore/src/main/java/org/wpilib/networktables/TableListener.java b/ntcore/src/main/java/org/wpilib/networktables/TableListener.java index 24fae2debe..ff02e1e553 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/TableListener.java +++ b/ntcore/src/main/java/org/wpilib/networktables/TableListener.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 edu.wpi.first.networktables; +package org.wpilib.networktables; /** A listener that listens to new tables in a {@link NetworkTable}. */ @FunctionalInterface diff --git a/ntcore/src/main/java/org/wpilib/networktables/TimeSyncEventData.java b/ntcore/src/main/java/org/wpilib/networktables/TimeSyncEventData.java index f8710ad1c8..bc3d96f8ed 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/TimeSyncEventData.java +++ b/ntcore/src/main/java/org/wpilib/networktables/TimeSyncEventData.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 edu.wpi.first.networktables; +package org.wpilib.networktables; /** NetworkTables time sync event data. */ @SuppressWarnings("MemberName") diff --git a/ntcore/src/main/java/org/wpilib/networktables/TimestampedObject.java b/ntcore/src/main/java/org/wpilib/networktables/TimestampedObject.java index 896ec795a3..7ecc94d09e 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/TimestampedObject.java +++ b/ntcore/src/main/java/org/wpilib/networktables/TimestampedObject.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 edu.wpi.first.networktables; +package org.wpilib.networktables; /** * NetworkTables timestamped object. diff --git a/ntcore/src/main/java/org/wpilib/networktables/Topic.java b/ntcore/src/main/java/org/wpilib/networktables/Topic.java index ae548c52ae..268ab494d6 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/Topic.java +++ b/ntcore/src/main/java/org/wpilib/networktables/Topic.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 edu.wpi.first.networktables; +package org.wpilib.networktables; /** NetworkTables Topic. */ public class Topic { diff --git a/ntcore/src/main/java/org/wpilib/networktables/TopicInfo.java b/ntcore/src/main/java/org/wpilib/networktables/TopicInfo.java index abd8c2af79..754ec4d67f 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/TopicInfo.java +++ b/ntcore/src/main/java/org/wpilib/networktables/TopicInfo.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 edu.wpi.first.networktables; +package org.wpilib.networktables; /** NetworkTables topic information. */ @SuppressWarnings("MemberName") diff --git a/ntcore/src/main/java/org/wpilib/networktables/ValueEventData.java b/ntcore/src/main/java/org/wpilib/networktables/ValueEventData.java index 511bb669b0..ba381f58e1 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/ValueEventData.java +++ b/ntcore/src/main/java/org/wpilib/networktables/ValueEventData.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 edu.wpi.first.networktables; +package org.wpilib.networktables; /** NetworkTables value event data. */ @SuppressWarnings("MemberName") diff --git a/ntcore/src/main/native/cpp/jni/NetworkTablesJNI.cpp b/ntcore/src/main/native/cpp/jni/NetworkTablesJNI.cpp index 0c3d60d775..a1f0447ea8 100644 --- a/ntcore/src/main/native/cpp/jni/NetworkTablesJNI.cpp +++ b/ntcore/src/main/native/cpp/jni/NetworkTablesJNI.cpp @@ -14,7 +14,7 @@ #include #include -#include "edu_wpi_first_networktables_NetworkTablesJNI.h" +#include "org_wpilib_networktables_NetworkTablesJNI.h" #include "ntcore.h" #include "ntcore_cpp.h" @@ -53,18 +53,18 @@ static JException nullPointerEx; static const JClassInit classes[] = { {"java/lang/Boolean", &booleanCls}, - {"edu/wpi/first/networktables/ConnectionInfo", &connectionInfoCls}, + {"org/wpilib/networktables/ConnectionInfo", &connectionInfoCls}, {"java/lang/Double", &doubleCls}, - {"edu/wpi/first/networktables/NetworkTableEvent", &eventCls}, + {"org/wpilib/networktables/NetworkTableEvent", &eventCls}, {"java/lang/Float", &floatCls}, - {"edu/wpi/first/networktables/LogMessage", &logMessageCls}, + {"org/wpilib/networktables/LogMessage", &logMessageCls}, {"java/lang/Long", &longCls}, {"java/util/OptionalLong", &optionalLongCls}, - {"edu/wpi/first/networktables/PubSubOptions", &pubSubOptionsCls}, - {"edu/wpi/first/networktables/TimeSyncEventData", &timeSyncEventDataCls}, - {"edu/wpi/first/networktables/TopicInfo", &topicInfoCls}, - {"edu/wpi/first/networktables/NetworkTableValue", &valueCls}, - {"edu/wpi/first/networktables/ValueEventData", &valueEventDataCls}}; + {"org/wpilib/networktables/PubSubOptions", &pubSubOptionsCls}, + {"org/wpilib/networktables/TimeSyncEventData", &timeSyncEventDataCls}, + {"org/wpilib/networktables/TopicInfo", &topicInfoCls}, + {"org/wpilib/networktables/NetworkTableValue", &valueCls}, + {"org/wpilib/networktables/ValueEventData", &valueEventDataCls}}; static const JExceptionInit exceptions[] = { {"java/lang/IllegalArgumentException", &illegalArgEx}, @@ -278,7 +278,7 @@ static jobject MakeJObject(JNIEnv* env, jobject inst, const nt::TopicInfo& info) { static jmethodID constructor = env->GetMethodID( topicInfoCls, "", - "(Ledu/wpi/first/networktables/" + "(Lorg/wpilib/networktables/" "NetworkTableInstance;ILjava/lang/String;ILjava/lang/String;)V"); JLocal name{env, MakeJString(env, info.name)}; JLocal typeStr{env, MakeJString(env, info.type_str)}; @@ -291,8 +291,8 @@ static jobject MakeJObject(JNIEnv* env, jobject inst, const nt::ValueEventData& data) { static jmethodID constructor = env->GetMethodID(valueEventDataCls, "", - "(Ledu/wpi/first/networktables/NetworkTableInstance;II" - "Ledu/wpi/first/networktables/NetworkTableValue;)V"); + "(Lorg/wpilib/networktables/NetworkTableInstance;II" + "Lorg/wpilib/networktables/NetworkTableValue;)V"); JLocal value{env, MakeJValue(env, data.value)}; return env->NewObject(valueEventDataCls, constructor, inst, static_cast(data.topic), @@ -311,12 +311,12 @@ static jobject MakeJObject(JNIEnv* env, const nt::TimeSyncEventData& data) { static jobject MakeJObject(JNIEnv* env, jobject inst, const nt::Event& event) { static jmethodID constructor = env->GetMethodID(eventCls, "", - "(Ledu/wpi/first/networktables/NetworkTableInstance;II" - "Ledu/wpi/first/networktables/ConnectionInfo;" - "Ledu/wpi/first/networktables/TopicInfo;" - "Ledu/wpi/first/networktables/ValueEventData;" - "Ledu/wpi/first/networktables/LogMessage;" - "Ledu/wpi/first/networktables/TimeSyncEventData;)V"); + "(Lorg/wpilib/networktables/NetworkTableInstance;II" + "Lorg/wpilib/networktables/ConnectionInfo;" + "Lorg/wpilib/networktables/TopicInfo;" + "Lorg/wpilib/networktables/ValueEventData;" + "Lorg/wpilib/networktables/LogMessage;" + "Lorg/wpilib/networktables/TimeSyncEventData;)V"); JLocal connInfo{env, nullptr}; JLocal topicInfo{env, nullptr}; JLocal valueData{env, nullptr}; @@ -367,60 +367,60 @@ static jobjectArray MakeJObject(JNIEnv* env, jobject inst, extern "C" { /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getDefaultInstance * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getDefaultInstance +Java_org_wpilib_networktables_NetworkTablesJNI_getDefaultInstance (JNIEnv*, jclass) { return nt::GetDefaultInstance(); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: createInstance * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_createInstance +Java_org_wpilib_networktables_NetworkTablesJNI_createInstance (JNIEnv*, jclass) { return nt::CreateInstance(); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: destroyInstance * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_destroyInstance +Java_org_wpilib_networktables_NetworkTablesJNI_destroyInstance (JNIEnv*, jclass, jint inst) { nt::DestroyInstance(inst); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getInstanceFromHandle * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getInstanceFromHandle +Java_org_wpilib_networktables_NetworkTablesJNI_getInstanceFromHandle (JNIEnv*, jclass, jint handle) { return nt::GetInstanceFromHandle(handle); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getEntry * Signature: (ILjava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getEntry +Java_org_wpilib_networktables_NetworkTablesJNI_getEntry (JNIEnv* env, jclass, jint inst, jstring key) { if (!key) { @@ -431,48 +431,48 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_getEntry } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getEntryName * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getEntryName +Java_org_wpilib_networktables_NetworkTablesJNI_getEntryName (JNIEnv* env, jclass, jint entry) { return MakeJString(env, nt::GetEntryName(entry)); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getEntryLastChange * Signature: (I)J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getEntryLastChange +Java_org_wpilib_networktables_NetworkTablesJNI_getEntryLastChange (JNIEnv*, jclass, jint entry) { return nt::GetEntryLastChange(entry); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getType * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getType +Java_org_wpilib_networktables_NetworkTablesJNI_getType (JNIEnv*, jclass, jint entry) { return nt::GetEntryType(entry); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getTopics * Signature: (ILjava/lang/String;I)[I */ JNIEXPORT jintArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getTopics +Java_org_wpilib_networktables_NetworkTablesJNI_getTopics (JNIEnv* env, jclass, jint inst, jstring prefix, jint types) { if (!prefix) { @@ -484,12 +484,12 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_getTopics } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getTopicsStr * Signature: (ILjava/lang/String;[Ljava/lang/Object;)[I */ JNIEXPORT jintArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getTopicsStr +Java_org_wpilib_networktables_NetworkTablesJNI_getTopicsStr (JNIEnv* env, jclass, jint inst, jstring prefix, jobjectArray types) { if (!prefix) { @@ -521,12 +521,12 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_getTopicsStr } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getTopicInfos * Signature: (Ljava/lang/Object;ILjava/lang/String;I)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getTopicInfos +Java_org_wpilib_networktables_NetworkTablesJNI_getTopicInfos (JNIEnv* env, jclass, jobject instObject, jint inst, jstring prefix, jint types) { @@ -547,12 +547,12 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_getTopicInfos } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getTopicInfosStr * Signature: (Ljava/lang/Object;ILjava/lang/String;[Ljava/lang/Object;)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getTopicInfosStr +Java_org_wpilib_networktables_NetworkTablesJNI_getTopicInfosStr (JNIEnv* env, jclass, jobject instObject, jint inst, jstring prefix, jobjectArray types) { @@ -593,144 +593,144 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_getTopicInfosStr } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getTopic * Signature: (ILjava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getTopic +Java_org_wpilib_networktables_NetworkTablesJNI_getTopic (JNIEnv* env, jclass, jint inst, jstring name) { return nt::GetTopic(inst, JStringRef{env, name}); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getTopicName * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getTopicName +Java_org_wpilib_networktables_NetworkTablesJNI_getTopicName (JNIEnv* env, jclass, jint topic) { return MakeJString(env, nt::GetTopicName(topic)); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getTopicType * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getTopicType +Java_org_wpilib_networktables_NetworkTablesJNI_getTopicType (JNIEnv*, jclass, jint topic) { return nt::GetTopicType(topic); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: setTopicPersistent * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_setTopicPersistent +Java_org_wpilib_networktables_NetworkTablesJNI_setTopicPersistent (JNIEnv*, jclass, jint topic, jboolean value) { nt::SetTopicPersistent(topic, value); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getTopicPersistent * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getTopicPersistent +Java_org_wpilib_networktables_NetworkTablesJNI_getTopicPersistent (JNIEnv*, jclass, jint topic) { return nt::GetTopicPersistent(topic); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: setTopicRetained * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_setTopicRetained +Java_org_wpilib_networktables_NetworkTablesJNI_setTopicRetained (JNIEnv*, jclass, jint topic, jboolean value) { nt::SetTopicRetained(topic, value); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getTopicRetained * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getTopicRetained +Java_org_wpilib_networktables_NetworkTablesJNI_getTopicRetained (JNIEnv*, jclass, jint topic) { return nt::GetTopicRetained(topic); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: setTopicCached * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_setTopicCached +Java_org_wpilib_networktables_NetworkTablesJNI_setTopicCached (JNIEnv*, jclass, jint topic, jboolean value) { nt::SetTopicCached(topic, value); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getTopicCached * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getTopicCached +Java_org_wpilib_networktables_NetworkTablesJNI_getTopicCached (JNIEnv*, jclass, jint topic) { return nt::GetTopicCached(topic); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getTopicTypeString * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getTopicTypeString +Java_org_wpilib_networktables_NetworkTablesJNI_getTopicTypeString (JNIEnv* env, jclass, jint topic) { return MakeJString(env, nt::GetTopicTypeString(topic)); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getTopicExists * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getTopicExists +Java_org_wpilib_networktables_NetworkTablesJNI_getTopicExists (JNIEnv*, jclass, jint topic) { return nt::GetTopicExists(topic); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getTopicProperty * Signature: (ILjava/lang/String;)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getTopicProperty +Java_org_wpilib_networktables_NetworkTablesJNI_getTopicProperty (JNIEnv* env, jclass, jint topic, jstring name) { return MakeJString(env, @@ -738,12 +738,12 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_getTopicProperty } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: setTopicProperty * Signature: (ILjava/lang/String;Ljava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_setTopicProperty +Java_org_wpilib_networktables_NetworkTablesJNI_setTopicProperty (JNIEnv* env, jclass, jint topic, jstring name, jstring value) { wpi::json j; @@ -758,36 +758,36 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_setTopicProperty } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: deleteTopicProperty * Signature: (ILjava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_deleteTopicProperty +Java_org_wpilib_networktables_NetworkTablesJNI_deleteTopicProperty (JNIEnv* env, jclass, jint topic, jstring name) { nt::DeleteTopicProperty(topic, JStringRef{env, name}); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getTopicProperties * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getTopicProperties +Java_org_wpilib_networktables_NetworkTablesJNI_getTopicProperties (JNIEnv* env, jclass, jint topic) { return MakeJString(env, nt::GetTopicProperties(topic).dump()); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: setTopicProperties * Signature: (ILjava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_setTopicProperties +Java_org_wpilib_networktables_NetworkTablesJNI_setTopicProperties (JNIEnv* env, jclass, jint topic, jstring properties) { wpi::json j; @@ -806,12 +806,12 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_setTopicProperties } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: subscribe * Signature: (IILjava/lang/String;Ljava/lang/Object;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_subscribe +Java_org_wpilib_networktables_NetworkTablesJNI_subscribe (JNIEnv* env, jclass, jint topic, jint type, jstring typeStr, jobject options) { return nt::Subscribe(topic, static_cast(type), @@ -820,24 +820,24 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_subscribe } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: unsubscribe * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_unsubscribe +Java_org_wpilib_networktables_NetworkTablesJNI_unsubscribe (JNIEnv*, jclass, jint sub) { nt::Unsubscribe(sub); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: publish * Signature: (IILjava/lang/String;Ljava/lang/Object;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_publish +Java_org_wpilib_networktables_NetworkTablesJNI_publish (JNIEnv* env, jclass, jint topic, jint type, jstring typeStr, jobject options) { return nt::Publish(topic, static_cast(type), @@ -846,12 +846,12 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_publish } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: publishEx * Signature: (IILjava/lang/String;Ljava/lang/String;Ljava/lang/Object;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_publishEx +Java_org_wpilib_networktables_NetworkTablesJNI_publishEx (JNIEnv* env, jclass, jint topic, jint type, jstring typeStr, jstring properties, jobject options) { @@ -873,24 +873,24 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_publishEx } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: unpublish * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_unpublish +Java_org_wpilib_networktables_NetworkTablesJNI_unpublish (JNIEnv*, jclass, jint pubentry) { nt::Unpublish(pubentry); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getEntryImpl * Signature: (IILjava/lang/String;Ljava/lang/Object;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getEntryImpl +Java_org_wpilib_networktables_NetworkTablesJNI_getEntryImpl (JNIEnv* env, jclass, jint topic, jint type, jstring typeStr, jobject options) { return nt::GetEntry(topic, static_cast(type), @@ -899,48 +899,48 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_getEntryImpl } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: releaseEntry * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_releaseEntry +Java_org_wpilib_networktables_NetworkTablesJNI_releaseEntry (JNIEnv*, jclass, jint entry) { nt::ReleaseEntry(entry); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: release * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_release +Java_org_wpilib_networktables_NetworkTablesJNI_release (JNIEnv*, jclass, jint pubsubentry) { nt::Release(pubsubentry); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getTopicFromHandle * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getTopicFromHandle +Java_org_wpilib_networktables_NetworkTablesJNI_getTopicFromHandle (JNIEnv*, jclass, jint pubsubentry) { return nt::GetTopicFromHandle(pubsubentry); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: subscribeMultiple * Signature: (I[Ljava/lang/Object;Ljava/lang/Object;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_subscribeMultiple +Java_org_wpilib_networktables_NetworkTablesJNI_subscribeMultiple (JNIEnv* env, jclass, jint inst, jobjectArray prefixes, jobject options) { if (!prefixes) { @@ -969,108 +969,108 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_subscribeMultiple } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: unsubscribeMultiple * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_unsubscribeMultiple +Java_org_wpilib_networktables_NetworkTablesJNI_unsubscribeMultiple (JNIEnv*, jclass, jint sub) { nt::UnsubscribeMultiple(sub); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: readQueueValue * Signature: (I)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_readQueueValue +Java_org_wpilib_networktables_NetworkTablesJNI_readQueueValue (JNIEnv* env, jclass, jint subentry) { return MakeJObject(env, nt::ReadQueueValue(subentry)); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getValue * Signature: (I)Ljava/lang/Object; */ JNIEXPORT jobject JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getValue +Java_org_wpilib_networktables_NetworkTablesJNI_getValue (JNIEnv* env, jclass, jint entry) { return MakeJValue(env, nt::GetEntryValue(entry)); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: setEntryFlags * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_setEntryFlags +Java_org_wpilib_networktables_NetworkTablesJNI_setEntryFlags (JNIEnv*, jclass, jint entry, jint flags) { nt::SetEntryFlags(entry, flags); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getEntryFlags * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getEntryFlags +Java_org_wpilib_networktables_NetworkTablesJNI_getEntryFlags (JNIEnv*, jclass, jint entry) { return nt::GetEntryFlags(entry); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getTopicInfo * Signature: (Ljava/lang/Object;I)Ljava/lang/Object; */ JNIEXPORT jobject JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getTopicInfo +Java_org_wpilib_networktables_NetworkTablesJNI_getTopicInfo (JNIEnv* env, jclass, jobject inst, jint topic) { return MakeJObject(env, inst, nt::GetTopicInfo(topic)); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: createListenerPoller * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_createListenerPoller +Java_org_wpilib_networktables_NetworkTablesJNI_createListenerPoller (JNIEnv*, jclass, jint inst) { return nt::CreateListenerPoller(inst); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: destroyListenerPoller * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_destroyListenerPoller +Java_org_wpilib_networktables_NetworkTablesJNI_destroyListenerPoller (JNIEnv*, jclass, jint poller) { nt::DestroyListenerPoller(poller); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: addListener * Signature: (I[Ljava/lang/Object;I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_addListener__I_3Ljava_lang_String_2I +Java_org_wpilib_networktables_NetworkTablesJNI_addListener__I_3Ljava_lang_String_2I (JNIEnv* env, jclass, jint poller, jobjectArray prefixes, jint flags) { if (!prefixes) { @@ -1099,84 +1099,84 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_addListener__I_3Ljava_lang_Str } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: addListener * Signature: (III)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_addListener__III +Java_org_wpilib_networktables_NetworkTablesJNI_addListener__III (JNIEnv* env, jclass, jint poller, jint handle, jint flags) { return nt::AddPolledListener(poller, handle, flags); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: readListenerQueue * Signature: (Ljava/lang/Object;I)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_readListenerQueue +Java_org_wpilib_networktables_NetworkTablesJNI_readListenerQueue (JNIEnv* env, jclass, jobject inst, jint poller) { return MakeJObject(env, inst, nt::ReadListenerQueue(poller)); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: removeListener * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_removeListener +Java_org_wpilib_networktables_NetworkTablesJNI_removeListener (JNIEnv*, jclass, jint topicListener) { nt::RemoveListener(topicListener); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getNetworkMode * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getNetworkMode +Java_org_wpilib_networktables_NetworkTablesJNI_getNetworkMode (JNIEnv*, jclass, jint inst) { return nt::GetNetworkMode(inst); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: startLocal * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_startLocal +Java_org_wpilib_networktables_NetworkTablesJNI_startLocal (JNIEnv*, jclass, jint inst) { nt::StartLocal(inst); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: stopLocal * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_stopLocal +Java_org_wpilib_networktables_NetworkTablesJNI_stopLocal (JNIEnv*, jclass, jint inst) { nt::StopLocal(inst); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: startServer * Signature: (ILjava/lang/String;Ljava/lang/String;I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_startServer +Java_org_wpilib_networktables_NetworkTablesJNI_startServer (JNIEnv* env, jclass, jint inst, jstring persistFilename, jstring listenAddress, jint port) { @@ -1193,24 +1193,24 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_startServer } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: stopServer * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_stopServer +Java_org_wpilib_networktables_NetworkTablesJNI_stopServer (JNIEnv*, jclass, jint inst) { nt::StopServer(inst); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: startClient * Signature: (ILjava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_startClient +Java_org_wpilib_networktables_NetworkTablesJNI_startClient (JNIEnv* env, jclass, jint inst, jstring identity) { if (!identity) { @@ -1221,24 +1221,24 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_startClient } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: stopClient * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_stopClient +Java_org_wpilib_networktables_NetworkTablesJNI_stopClient (JNIEnv*, jclass, jint inst) { nt::StopClient(inst); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: setServer * Signature: (ILjava/lang/String;I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_setServer__ILjava_lang_String_2I +Java_org_wpilib_networktables_NetworkTablesJNI_setServer__ILjava_lang_String_2I (JNIEnv* env, jclass, jint inst, jstring serverName, jint port) { if (!serverName) { @@ -1249,12 +1249,12 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_setServer__ILjava_lang_String_ } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: setServer * Signature: (I[Ljava/lang/Object;[I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_setServer__I_3Ljava_lang_String_2_3I +Java_org_wpilib_networktables_NetworkTablesJNI_setServer__I_3Ljava_lang_String_2_3I (JNIEnv* env, jclass, jint inst, jobjectArray serverNames, jintArray ports) { if (!serverNames) { @@ -1295,84 +1295,84 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_setServer__I_3Ljava_lang_Strin } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: setServerTeam * Signature: (III)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_setServerTeam +Java_org_wpilib_networktables_NetworkTablesJNI_setServerTeam (JNIEnv* env, jclass, jint inst, jint team, jint port) { nt::SetServerTeam(inst, team, port); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: disconnect * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_disconnect +Java_org_wpilib_networktables_NetworkTablesJNI_disconnect (JNIEnv* env, jclass, jint inst) { nt::Disconnect(inst); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: startDSClient * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_startDSClient +Java_org_wpilib_networktables_NetworkTablesJNI_startDSClient (JNIEnv*, jclass, jint inst, jint port) { nt::StartDSClient(inst, port); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: stopDSClient * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_stopDSClient +Java_org_wpilib_networktables_NetworkTablesJNI_stopDSClient (JNIEnv*, jclass, jint inst) { nt::StopDSClient(inst); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: flushLocal * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_flushLocal +Java_org_wpilib_networktables_NetworkTablesJNI_flushLocal (JNIEnv*, jclass, jint inst) { nt::FlushLocal(inst); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: flush * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_flush +Java_org_wpilib_networktables_NetworkTablesJNI_flush (JNIEnv*, jclass, jint inst) { nt::Flush(inst); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getConnections * Signature: (I)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getConnections +Java_org_wpilib_networktables_NetworkTablesJNI_getConnections (JNIEnv* env, jclass, jint inst) { auto arr = nt::GetConnections(inst); @@ -1389,48 +1389,48 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_getConnections } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: isConnected * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_isConnected +Java_org_wpilib_networktables_NetworkTablesJNI_isConnected (JNIEnv*, jclass, jint inst) { return nt::IsConnected(inst); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: getServerTimeOffset * Signature: (I)Ljava/lang/Object; */ JNIEXPORT jobject JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_getServerTimeOffset +Java_org_wpilib_networktables_NetworkTablesJNI_getServerTimeOffset (JNIEnv* env, jclass, jint inst) { return MakeJObject(env, nt::GetServerTimeOffset(inst)); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: now * Signature: ()J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_now +Java_org_wpilib_networktables_NetworkTablesJNI_now (JNIEnv*, jclass) { return nt::Now(); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: startEntryDataLog * Signature: (IJLjava/lang/String;Ljava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_startEntryDataLog +Java_org_wpilib_networktables_NetworkTablesJNI_startEntryDataLog (JNIEnv* env, jclass, jint inst, jlong log, jstring prefix, jstring logPrefix) { return nt::StartEntryDataLog(inst, *reinterpret_cast(log), @@ -1439,24 +1439,24 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_startEntryDataLog } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: stopEntryDataLog * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_stopEntryDataLog +Java_org_wpilib_networktables_NetworkTablesJNI_stopEntryDataLog (JNIEnv*, jclass, jint logger) { nt::StopEntryDataLog(logger); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: startConnectionDataLog * Signature: (IJLjava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_startConnectionDataLog +Java_org_wpilib_networktables_NetworkTablesJNI_startConnectionDataLog (JNIEnv* env, jclass, jint inst, jlong log, jstring name) { return nt::StartConnectionDataLog( @@ -1464,24 +1464,24 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_startConnectionDataLog } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: stopConnectionDataLog * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_stopConnectionDataLog +Java_org_wpilib_networktables_NetworkTablesJNI_stopConnectionDataLog (JNIEnv*, jclass, jint logger) { nt::StopConnectionDataLog(logger); } /* - * Class: edu_wpi_first_networktables_NetworkTablesJNI + * Class: org_wpilib_networktables_NetworkTablesJNI * Method: addLogger * Signature: (III)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_networktables_NetworkTablesJNI_addLogger +Java_org_wpilib_networktables_NetworkTablesJNI_addLogger (JNIEnv*, jclass, jint poller, jint minLevel, jint maxLevel) { return nt::AddPolledLogger(poller, minLevel, maxLevel); diff --git a/ntcore/src/test/java/org/wpilib/networktables/ConnectionListenerTest.java b/ntcore/src/test/java/org/wpilib/networktables/ConnectionListenerTest.java index bd386c0dca..c6fb4f016a 100644 --- a/ntcore/src/test/java/org/wpilib/networktables/ConnectionListenerTest.java +++ b/ntcore/src/test/java/org/wpilib/networktables/ConnectionListenerTest.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 edu.wpi.first.networktables; +package org.wpilib.networktables; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -11,7 +11,7 @@ import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import edu.wpi.first.util.WPIUtilJNI; +import org.wpilib.util.WPIUtilJNI; import java.util.ArrayList; import java.util.EnumSet; import java.util.List; diff --git a/ntcore/src/test/java/org/wpilib/networktables/JNITest.java b/ntcore/src/test/java/org/wpilib/networktables/JNITest.java index 3eb522b9e3..298c47a4cc 100644 --- a/ntcore/src/test/java/org/wpilib/networktables/JNITest.java +++ b/ntcore/src/test/java/org/wpilib/networktables/JNITest.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 edu.wpi.first.networktables; +package org.wpilib.networktables; import org.junit.jupiter.api.Test; diff --git a/ntcore/src/test/java/org/wpilib/networktables/LoggerTest.java b/ntcore/src/test/java/org/wpilib/networktables/LoggerTest.java index 052ac6c11e..727d1f3375 100644 --- a/ntcore/src/test/java/org/wpilib/networktables/LoggerTest.java +++ b/ntcore/src/test/java/org/wpilib/networktables/LoggerTest.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 edu.wpi.first.networktables; +package org.wpilib.networktables; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.fail; diff --git a/ntcore/src/test/java/org/wpilib/networktables/NetworkTableTest.java b/ntcore/src/test/java/org/wpilib/networktables/NetworkTableTest.java index bca694b990..8a319afb76 100644 --- a/ntcore/src/test/java/org/wpilib/networktables/NetworkTableTest.java +++ b/ntcore/src/test/java/org/wpilib/networktables/NetworkTableTest.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 edu.wpi.first.networktables; +package org.wpilib.networktables; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ntcore/src/test/java/org/wpilib/networktables/RawTest.java b/ntcore/src/test/java/org/wpilib/networktables/RawTest.java index 871f6b0672..b5558c4c86 100644 --- a/ntcore/src/test/java/org/wpilib/networktables/RawTest.java +++ b/ntcore/src/test/java/org/wpilib/networktables/RawTest.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 edu.wpi.first.networktables; +package org.wpilib.networktables; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/ntcore/src/test/java/org/wpilib/networktables/TableListenerTest.java b/ntcore/src/test/java/org/wpilib/networktables/TableListenerTest.java index d59e174f2e..4401f3168a 100644 --- a/ntcore/src/test/java/org/wpilib/networktables/TableListenerTest.java +++ b/ntcore/src/test/java/org/wpilib/networktables/TableListenerTest.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 edu.wpi.first.networktables; +package org.wpilib.networktables; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ntcore/src/test/java/org/wpilib/networktables/TimeSyncTest.java b/ntcore/src/test/java/org/wpilib/networktables/TimeSyncTest.java index 70c95ccd5a..f0d97cbd0d 100644 --- a/ntcore/src/test/java/org/wpilib/networktables/TimeSyncTest.java +++ b/ntcore/src/test/java/org/wpilib/networktables/TimeSyncTest.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 edu.wpi.first.networktables; +package org.wpilib.networktables; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/ntcore/src/test/java/org/wpilib/networktables/TopicListenerTest.java b/ntcore/src/test/java/org/wpilib/networktables/TopicListenerTest.java index 3038c356d3..091bfd107b 100644 --- a/ntcore/src/test/java/org/wpilib/networktables/TopicListenerTest.java +++ b/ntcore/src/test/java/org/wpilib/networktables/TopicListenerTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.networktables; +package org.wpilib.networktables; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import edu.wpi.first.util.WPIUtilJNI; +import org.wpilib.util.WPIUtilJNI; import java.util.EnumSet; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/romiVendordep/src/dev/java/org/wpilib/romi/DevMain.java b/romiVendordep/src/dev/java/org/wpilib/romi/DevMain.java index aaad3f1898..4412287991 100644 --- a/romiVendordep/src/dev/java/org/wpilib/romi/DevMain.java +++ b/romiVendordep/src/dev/java/org/wpilib/romi/DevMain.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.romi; +package org.wpilib.romi; -import edu.wpi.first.hal.HALUtil; -import edu.wpi.first.networktables.NetworkTablesJNI; -import edu.wpi.first.util.CombinedRuntimeLoader; +import org.wpilib.hardware.hal.HALUtil; +import org.wpilib.networktables.NetworkTablesJNI; +import org.wpilib.util.runtime.CombinedRuntimeLoader; public final class DevMain { /** Main entry point. */ diff --git a/romiVendordep/src/main/java/org/wpilib/romi/OnBoardIO.java b/romiVendordep/src/main/java/org/wpilib/romi/OnBoardIO.java index 06591556a8..ac92228870 100644 --- a/romiVendordep/src/main/java/org/wpilib/romi/OnBoardIO.java +++ b/romiVendordep/src/main/java/org/wpilib/romi/OnBoardIO.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.romi; +package org.wpilib.romi; -import edu.wpi.first.wpilibj.DigitalInput; -import edu.wpi.first.wpilibj.DigitalOutput; -import edu.wpi.first.wpilibj.DriverStation; -import edu.wpi.first.wpilibj.Timer; +import org.wpilib.hardware.discrete.DigitalInput; +import org.wpilib.hardware.discrete.DigitalOutput; +import org.wpilib.driverstation.DriverStation; +import org.wpilib.system.Timer; /** * This class represents the onboard IO of the Romi reference robot. This includes the pushbuttons diff --git a/romiVendordep/src/main/java/org/wpilib/romi/RomiGyro.java b/romiVendordep/src/main/java/org/wpilib/romi/RomiGyro.java index 439c2402ad..0e796f1e49 100644 --- a/romiVendordep/src/main/java/org/wpilib/romi/RomiGyro.java +++ b/romiVendordep/src/main/java/org/wpilib/romi/RomiGyro.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.romi; +package org.wpilib.romi; -import edu.wpi.first.hal.SimDevice; -import edu.wpi.first.hal.SimDevice.Direction; -import edu.wpi.first.hal.SimDouble; +import org.wpilib.hardware.hal.SimDevice; +import org.wpilib.hardware.hal.SimDevice.Direction; +import org.wpilib.hardware.hal.SimDouble; /** * Use a rate gyro to return the robots heading relative to a starting position. diff --git a/romiVendordep/src/main/java/org/wpilib/romi/RomiMotor.java b/romiVendordep/src/main/java/org/wpilib/romi/RomiMotor.java index c2bc8b0f1a..f1465373f3 100644 --- a/romiVendordep/src/main/java/org/wpilib/romi/RomiMotor.java +++ b/romiVendordep/src/main/java/org/wpilib/romi/RomiMotor.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.romi; +package org.wpilib.romi; -import edu.wpi.first.wpilibj.PWM; -import edu.wpi.first.wpilibj.motorcontrol.PWMMotorController; +import org.wpilib.hardware.discrete.PWM; +import org.wpilib.hardware.motor.PWMMotorController; /** * RomiMotor. diff --git a/styleguide/spotbugs-exclude.xml b/styleguide/spotbugs-exclude.xml index 57b016a7b7..bb218bcc45 100644 --- a/styleguide/spotbugs-exclude.xml +++ b/styleguide/spotbugs-exclude.xml @@ -2,50 +2,50 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -58,7 +58,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -90,69 +90,69 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -168,43 +168,43 @@ - + - + - + - + - + - + - + - + - + diff --git a/wpilibj/CMakeLists.txt b/wpilibj/CMakeLists.txt index e27bbbb21f..9cb11761dc 100644 --- a/wpilibj/CMakeLists.txt +++ b/wpilibj/CMakeLists.txt @@ -19,7 +19,7 @@ if(WITH_JAVA) configure_file( src/generate/WPILibVersion.java.in - generated/main/java/edu/wpi/first/wpilibj/WPILibVersion.java + generated/main/java/org/wpilib/WPILibVersion.java ) file(GLOB_RECURSE JAVA_SOURCES src/main/java/*.java src/generated/main/java/*.java) @@ -29,7 +29,7 @@ if(WITH_JAVA) add_jar( wpilibj_jar ${JAVA_SOURCES} - ${CMAKE_CURRENT_BINARY_DIR}/generated/main/java/edu/wpi/first/wpilibj/WPILibVersion.java + ${CMAKE_CURRENT_BINARY_DIR}/generated/main/java/org/wpilib/WPILibVersion.java INCLUDE_JARS hal_jar ntcore_jar @@ -60,7 +60,7 @@ if(WITH_JAVA_SOURCE) if(NOT WITH_JAVA) configure_file( src/generate/WPILibVersion.java.in - generated/main/java/edu/wpi/first/wpilibj/WPILibVersion.java + generated/main/java/org/wpilib/WPILibVersion.java ) endif() add_source_jar( diff --git a/wpilibj/src/dev/java/org/wpilib/DevMain.java b/wpilibj/src/dev/java/org/wpilib/DevMain.java index 2a73e48138..26e3ec4ef4 100644 --- a/wpilibj/src/dev/java/org/wpilib/DevMain.java +++ b/wpilibj/src/dev/java/org/wpilib/DevMain.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib; -import edu.wpi.first.hal.HALUtil; -import edu.wpi.first.networktables.NetworkTablesJNI; -import edu.wpi.first.util.CombinedRuntimeLoader; +import org.wpilib.hardware.hal.HALUtil; +import org.wpilib.networktables.NetworkTablesJNI; +import org.wpilib.util.runtime.CombinedRuntimeLoader; public final class DevMain { /** Main entry point. */ diff --git a/wpilibj/src/generate/main/java/hid.java.jinja b/wpilibj/src/generate/main/java/hid.java.jinja index 2abb5d3a40..6b27b3ee7e 100644 --- a/wpilibj/src/generate/main/java/hid.java.jinja +++ b/wpilibj/src/generate/main/java/hid.java.jinja @@ -6,13 +6,13 @@ {% macro capitalize_first(string) -%} {{ string[0]|capitalize + string[1:] }} {%- endmacro %} -package edu.wpi.first.wpilibj; +package org.wpilib; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.wpilibj.event.BooleanEvent; -import edu.wpi.first.wpilibj.event.EventLoop; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.event.BooleanEvent; +import org.wpilib.event.EventLoop; /** * Handle input from {{ ConsoleName }} controllers connected to the Driver Station. diff --git a/wpilibj/src/generate/main/java/hidsim.java.jinja b/wpilibj/src/generate/main/java/hidsim.java.jinja index 0fb21c8bd2..5274eafc40 100644 --- a/wpilibj/src/generate/main/java/hidsim.java.jinja +++ b/wpilibj/src/generate/main/java/hidsim.java.jinja @@ -6,9 +6,9 @@ {% macro capitalize_first(string) -%} {{ string[0]|capitalize + string[1:] }} {%- endmacro %} -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.wpilibj.{{ ConsoleName }}Controller; +import org.wpilib.{{ ConsoleName }}Controller; /** Class to control a simulated {{ ConsoleName }} controller. */ public class {{ ConsoleName }}ControllerSim extends GenericHIDSim { diff --git a/wpilibj/src/generate/main/java/pwm_motor_controller.java.jinja b/wpilibj/src/generate/main/java/pwm_motor_controller.java.jinja index 26d17682b8..b1136b1497 100644 --- a/wpilibj/src/generate/main/java/pwm_motor_controller.java.jinja +++ b/wpilibj/src/generate/main/java/pwm_motor_controller.java.jinja @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpilibj/generate_pwm_motor_controllers.py. DO NOT MODIFY -package edu.wpi.first.wpilibj.motorcontrol; +package org.wpilib.motorcontrol; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.PWM; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.discrete.PWM; /** * {{ Manufacturer }} {{ DisplayName }} Motor Controller. diff --git a/wpilibj/src/generated/main/java/org/wpilib/driverstation/PS4Controller.java b/wpilibj/src/generated/main/java/org/wpilib/driverstation/PS4Controller.java index 2487953caa..5e0780e3e7 100644 --- a/wpilibj/src/generated/main/java/org/wpilib/driverstation/PS4Controller.java +++ b/wpilibj/src/generated/main/java/org/wpilib/driverstation/PS4Controller.java @@ -4,13 +4,13 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpilibj/generate_hids.py. DO NOT MODIFY -package edu.wpi.first.wpilibj; +package org.wpilib.driverstation; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.wpilibj.event.BooleanEvent; -import edu.wpi.first.wpilibj.event.EventLoop; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.event.BooleanEvent; +import org.wpilib.event.EventLoop; /** * Handle input from PS4 controllers connected to the Driver Station. diff --git a/wpilibj/src/generated/main/java/org/wpilib/driverstation/PS5Controller.java b/wpilibj/src/generated/main/java/org/wpilib/driverstation/PS5Controller.java index 6b323c37d7..310b8ec8c3 100644 --- a/wpilibj/src/generated/main/java/org/wpilib/driverstation/PS5Controller.java +++ b/wpilibj/src/generated/main/java/org/wpilib/driverstation/PS5Controller.java @@ -4,13 +4,13 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpilibj/generate_hids.py. DO NOT MODIFY -package edu.wpi.first.wpilibj; +package org.wpilib.driverstation; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.wpilibj.event.BooleanEvent; -import edu.wpi.first.wpilibj.event.EventLoop; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.event.BooleanEvent; +import org.wpilib.event.EventLoop; /** * Handle input from PS5 controllers connected to the Driver Station. diff --git a/wpilibj/src/generated/main/java/org/wpilib/driverstation/StadiaController.java b/wpilibj/src/generated/main/java/org/wpilib/driverstation/StadiaController.java index b6e89b3fa5..48577ae3b7 100644 --- a/wpilibj/src/generated/main/java/org/wpilib/driverstation/StadiaController.java +++ b/wpilibj/src/generated/main/java/org/wpilib/driverstation/StadiaController.java @@ -4,13 +4,13 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpilibj/generate_hids.py. DO NOT MODIFY -package edu.wpi.first.wpilibj; +package org.wpilib.driverstation; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.wpilibj.event.BooleanEvent; -import edu.wpi.first.wpilibj.event.EventLoop; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.event.BooleanEvent; +import org.wpilib.event.EventLoop; /** * Handle input from Stadia controllers connected to the Driver Station. diff --git a/wpilibj/src/generated/main/java/org/wpilib/driverstation/XboxController.java b/wpilibj/src/generated/main/java/org/wpilib/driverstation/XboxController.java index cd046da504..2dd08b34ae 100644 --- a/wpilibj/src/generated/main/java/org/wpilib/driverstation/XboxController.java +++ b/wpilibj/src/generated/main/java/org/wpilib/driverstation/XboxController.java @@ -4,13 +4,13 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpilibj/generate_hids.py. DO NOT MODIFY -package edu.wpi.first.wpilibj; +package org.wpilib.driverstation; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.wpilibj.event.BooleanEvent; -import edu.wpi.first.wpilibj.event.EventLoop; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.event.BooleanEvent; +import org.wpilib.event.EventLoop; /** * Handle input from Xbox controllers connected to the Driver Station. diff --git a/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/Koors40.java b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/Koors40.java index 245c9b1ed5..6abe84fea2 100644 --- a/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/Koors40.java +++ b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/Koors40.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpilibj/generate_pwm_motor_controllers.py. DO NOT MODIFY -package edu.wpi.first.wpilibj.motorcontrol; +package org.wpilib.hardware.motor; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.PWM; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.discrete.PWM; /** * AndyMark Koors40 Motor Controller. diff --git a/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMSparkFlex.java b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMSparkFlex.java index d6d043aafe..3d7902a310 100644 --- a/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMSparkFlex.java +++ b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMSparkFlex.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpilibj/generate_pwm_motor_controllers.py. DO NOT MODIFY -package edu.wpi.first.wpilibj.motorcontrol; +package org.wpilib.hardware.motor; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.PWM; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.discrete.PWM; /** * REV Robotics SPARK Flex Motor Controller. diff --git a/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMSparkMax.java b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMSparkMax.java index e72d3a9cdf..cf04f0b7b2 100644 --- a/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMSparkMax.java +++ b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMSparkMax.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpilibj/generate_pwm_motor_controllers.py. DO NOT MODIFY -package edu.wpi.first.wpilibj.motorcontrol; +package org.wpilib.hardware.motor; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.PWM; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.discrete.PWM; /** * REV Robotics SPARK MAX Motor Controller. diff --git a/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMTalonFX.java b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMTalonFX.java index f3c280f663..8a27d87cc5 100644 --- a/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMTalonFX.java +++ b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMTalonFX.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpilibj/generate_pwm_motor_controllers.py. DO NOT MODIFY -package edu.wpi.first.wpilibj.motorcontrol; +package org.wpilib.hardware.motor; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.PWM; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.discrete.PWM; /** * Cross the Road Electronics (CTRE) Talon FX Motor Controller. diff --git a/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMTalonSRX.java b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMTalonSRX.java index 393d1e6ec0..e0c8ff3561 100644 --- a/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMTalonSRX.java +++ b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMTalonSRX.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpilibj/generate_pwm_motor_controllers.py. DO NOT MODIFY -package edu.wpi.first.wpilibj.motorcontrol; +package org.wpilib.hardware.motor; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.PWM; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.discrete.PWM; /** * Cross the Road Electronics (CTRE) Talon SRX Motor Controller. diff --git a/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMVenom.java b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMVenom.java index 2ff8875981..8430ba40cb 100644 --- a/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMVenom.java +++ b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMVenom.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpilibj/generate_pwm_motor_controllers.py. DO NOT MODIFY -package edu.wpi.first.wpilibj.motorcontrol; +package org.wpilib.hardware.motor; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.PWM; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.discrete.PWM; /** * Playing with Fusion Venom Motor Controller. diff --git a/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMVictorSPX.java b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMVictorSPX.java index 1fd95f5403..87600d5704 100644 --- a/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMVictorSPX.java +++ b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/PWMVictorSPX.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpilibj/generate_pwm_motor_controllers.py. DO NOT MODIFY -package edu.wpi.first.wpilibj.motorcontrol; +package org.wpilib.hardware.motor; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.PWM; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.discrete.PWM; /** * Cross the Road Electronics (CTRE) Victor SPX Motor Controller. diff --git a/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/Spark.java b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/Spark.java index 350383a524..ace4f58546 100644 --- a/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/Spark.java +++ b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/Spark.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpilibj/generate_pwm_motor_controllers.py. DO NOT MODIFY -package edu.wpi.first.wpilibj.motorcontrol; +package org.wpilib.hardware.motor; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.PWM; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.discrete.PWM; /** * REV Robotics SPARK Motor Controller. diff --git a/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/SparkMini.java b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/SparkMini.java index bcba92871c..43ac8b0717 100644 --- a/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/SparkMini.java +++ b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/SparkMini.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpilibj/generate_pwm_motor_controllers.py. DO NOT MODIFY -package edu.wpi.first.wpilibj.motorcontrol; +package org.wpilib.hardware.motor; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.PWM; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.discrete.PWM; /** * REV Robotics SPARKMini Motor Controller. diff --git a/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/Talon.java b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/Talon.java index 7e73c17352..ed2f487cfa 100644 --- a/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/Talon.java +++ b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/Talon.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpilibj/generate_pwm_motor_controllers.py. DO NOT MODIFY -package edu.wpi.first.wpilibj.motorcontrol; +package org.wpilib.hardware.motor; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.PWM; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.discrete.PWM; /** * Cross the Road Electronics (CTRE) Talon Motor Controller. diff --git a/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/VictorSP.java b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/VictorSP.java index 4123ea84ef..db83aea498 100644 --- a/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/VictorSP.java +++ b/wpilibj/src/generated/main/java/org/wpilib/hardware/motor/VictorSP.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpilibj/generate_pwm_motor_controllers.py. DO NOT MODIFY -package edu.wpi.first.wpilibj.motorcontrol; +package org.wpilib.hardware.motor; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.PWM; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.discrete.PWM; /** * Vex Robotics Victor SP Motor Controller. diff --git a/wpilibj/src/generated/main/java/org/wpilib/simulation/PS4ControllerSim.java b/wpilibj/src/generated/main/java/org/wpilib/simulation/PS4ControllerSim.java index 6e23f0510c..36f2c13498 100644 --- a/wpilibj/src/generated/main/java/org/wpilib/simulation/PS4ControllerSim.java +++ b/wpilibj/src/generated/main/java/org/wpilib/simulation/PS4ControllerSim.java @@ -4,9 +4,9 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpilibj/generate_hids.py. DO NOT MODIFY -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.wpilibj.PS4Controller; +import org.wpilib.driverstation.PS4Controller; /** Class to control a simulated PS4 controller. */ public class PS4ControllerSim extends GenericHIDSim { diff --git a/wpilibj/src/generated/main/java/org/wpilib/simulation/PS5ControllerSim.java b/wpilibj/src/generated/main/java/org/wpilib/simulation/PS5ControllerSim.java index 32c85a4088..59a11eb4e3 100644 --- a/wpilibj/src/generated/main/java/org/wpilib/simulation/PS5ControllerSim.java +++ b/wpilibj/src/generated/main/java/org/wpilib/simulation/PS5ControllerSim.java @@ -4,9 +4,9 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpilibj/generate_hids.py. DO NOT MODIFY -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.wpilibj.PS5Controller; +import org.wpilib.driverstation.PS5Controller; /** Class to control a simulated PS5 controller. */ public class PS5ControllerSim extends GenericHIDSim { diff --git a/wpilibj/src/generated/main/java/org/wpilib/simulation/StadiaControllerSim.java b/wpilibj/src/generated/main/java/org/wpilib/simulation/StadiaControllerSim.java index b6665e16d9..c6c5485347 100644 --- a/wpilibj/src/generated/main/java/org/wpilib/simulation/StadiaControllerSim.java +++ b/wpilibj/src/generated/main/java/org/wpilib/simulation/StadiaControllerSim.java @@ -4,9 +4,9 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpilibj/generate_hids.py. DO NOT MODIFY -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.wpilibj.StadiaController; +import org.wpilib.driverstation.StadiaController; /** Class to control a simulated Stadia controller. */ public class StadiaControllerSim extends GenericHIDSim { diff --git a/wpilibj/src/generated/main/java/org/wpilib/simulation/XboxControllerSim.java b/wpilibj/src/generated/main/java/org/wpilib/simulation/XboxControllerSim.java index f04d70d745..efd02ff584 100644 --- a/wpilibj/src/generated/main/java/org/wpilib/simulation/XboxControllerSim.java +++ b/wpilibj/src/generated/main/java/org/wpilib/simulation/XboxControllerSim.java @@ -4,9 +4,9 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpilibj/generate_hids.py. DO NOT MODIFY -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.wpilibj.XboxController; +import org.wpilib.driverstation.XboxController; /** Class to control a simulated Xbox controller. */ public class XboxControllerSim extends GenericHIDSim { diff --git a/wpilibj/src/main/java/org/wpilib/ExpansionHub.java b/wpilibj/src/main/java/org/wpilib/ExpansionHub.java index 563dbc5701..d99003566d 100644 --- a/wpilibj/src/main/java/org/wpilib/ExpansionHub.java +++ b/wpilibj/src/main/java/org/wpilib/ExpansionHub.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.networktables.BooleanSubscriber; -import edu.wpi.first.networktables.NetworkTableInstance; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.networktables.BooleanSubscriber; +import org.wpilib.networktables.NetworkTableInstance; /** This class controls a REV ExpansionHub plugged in over USB to Systemcore. */ public class ExpansionHub implements AutoCloseable { diff --git a/wpilibj/src/main/java/org/wpilib/ExpansionHubMotor.java b/wpilibj/src/main/java/org/wpilib/ExpansionHubMotor.java index d9d27ab8e7..95a90f025a 100644 --- a/wpilibj/src/main/java/org/wpilib/ExpansionHubMotor.java +++ b/wpilibj/src/main/java/org/wpilib/ExpansionHubMotor.java @@ -2,21 +2,21 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib; -import static edu.wpi.first.units.Units.Amps; -import static edu.wpi.first.units.Units.Volts; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.units.Units.Amps; +import static org.wpilib.units.Units.Volts; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.hal.util.AllocationException; -import edu.wpi.first.networktables.BooleanPublisher; -import edu.wpi.first.networktables.DoublePublisher; -import edu.wpi.first.networktables.DoubleSubscriber; -import edu.wpi.first.networktables.IntegerPublisher; -import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.networktables.PubSubOption; -import edu.wpi.first.units.measure.Current; -import edu.wpi.first.units.measure.Voltage; +import org.wpilib.hardware.hal.util.AllocationException; +import org.wpilib.networktables.BooleanPublisher; +import org.wpilib.networktables.DoublePublisher; +import org.wpilib.networktables.DoubleSubscriber; +import org.wpilib.networktables.IntegerPublisher; +import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.networktables.PubSubOption; +import org.wpilib.units.measure.Current; +import org.wpilib.units.measure.Voltage; /** This class controls a specific motor and encoder hooked up to an ExpansionHub. */ public class ExpansionHubMotor implements AutoCloseable { diff --git a/wpilibj/src/main/java/org/wpilib/ExpansionHubPidConstants.java b/wpilibj/src/main/java/org/wpilib/ExpansionHubPidConstants.java index 968d45b9c6..c95faecd92 100644 --- a/wpilibj/src/main/java/org/wpilib/ExpansionHubPidConstants.java +++ b/wpilibj/src/main/java/org/wpilib/ExpansionHubPidConstants.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib; -import edu.wpi.first.networktables.BooleanPublisher; -import edu.wpi.first.networktables.DoublePublisher; -import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.networktables.PubSubOption; +import org.wpilib.networktables.BooleanPublisher; +import org.wpilib.networktables.DoublePublisher; +import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.networktables.PubSubOption; /** This class contains PID constants for an ExpansionHub motor. */ public class ExpansionHubPidConstants { diff --git a/wpilibj/src/main/java/org/wpilib/ExpansionHubServo.java b/wpilibj/src/main/java/org/wpilib/ExpansionHubServo.java index 013778dfa1..59aec0cc36 100644 --- a/wpilibj/src/main/java/org/wpilib/ExpansionHubServo.java +++ b/wpilibj/src/main/java/org/wpilib/ExpansionHubServo.java @@ -2,18 +2,18 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib; -import static edu.wpi.first.units.Units.Degrees; -import static edu.wpi.first.units.Units.Microseconds; +import static org.wpilib.units.Units.Degrees; +import static org.wpilib.units.Units.Microseconds; -import edu.wpi.first.hal.util.AllocationException; -import edu.wpi.first.networktables.BooleanPublisher; -import edu.wpi.first.networktables.IntegerPublisher; -import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.networktables.PubSubOption; -import edu.wpi.first.units.measure.Angle; -import edu.wpi.first.units.measure.Time; +import org.wpilib.hardware.hal.util.AllocationException; +import org.wpilib.networktables.BooleanPublisher; +import org.wpilib.networktables.IntegerPublisher; +import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.networktables.PubSubOption; +import org.wpilib.units.measure.Angle; +import org.wpilib.units.measure.Time; /** This class controls a specific servo hooked up to an ExpansionHub. */ public class ExpansionHubServo implements AutoCloseable { diff --git a/wpilibj/src/main/java/org/wpilib/counter/EdgeConfiguration.java b/wpilibj/src/main/java/org/wpilib/counter/EdgeConfiguration.java index 1da6c775fc..1ff9c3285f 100644 --- a/wpilibj/src/main/java/org/wpilib/counter/EdgeConfiguration.java +++ b/wpilibj/src/main/java/org/wpilib/counter/EdgeConfiguration.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 edu.wpi.first.wpilibj.counter; +package org.wpilib.counter; /** Edge configuration. */ public enum EdgeConfiguration { diff --git a/wpilibj/src/main/java/org/wpilib/counter/Tachometer.java b/wpilibj/src/main/java/org/wpilib/counter/Tachometer.java index 7ac2b936d1..181aec232c 100644 --- a/wpilibj/src/main/java/org/wpilib/counter/Tachometer.java +++ b/wpilibj/src/main/java/org/wpilib/counter/Tachometer.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.counter; +package org.wpilib.counter; -import edu.wpi.first.hal.CounterJNI; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.hardware.hal.CounterJNI; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; /** * Tachometer. diff --git a/wpilibj/src/main/java/org/wpilib/counter/UpDownCounter.java b/wpilibj/src/main/java/org/wpilib/counter/UpDownCounter.java index 4fd25d8405..8d5f1ddb8b 100644 --- a/wpilibj/src/main/java/org/wpilib/counter/UpDownCounter.java +++ b/wpilibj/src/main/java/org/wpilib/counter/UpDownCounter.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.counter; +package org.wpilib.counter; -import edu.wpi.first.hal.CounterJNI; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.hardware.hal.CounterJNI; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; /** * Up Down Counter. diff --git a/wpilibj/src/main/java/org/wpilib/drive/DifferentialDrive.java b/wpilibj/src/main/java/org/wpilib/drive/DifferentialDrive.java index 9a63b395c9..281c579bae 100644 --- a/wpilibj/src/main/java/org/wpilib/drive/DifferentialDrive.java +++ b/wpilibj/src/main/java/org/wpilib/drive/DifferentialDrive.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.wpilibj.drive; +package org.wpilib.drive; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.math.MathUtil; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; -import edu.wpi.first.wpilibj.motorcontrol.MotorController; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.math.util.MathUtil; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; +import org.wpilib.hardware.motor.MotorController; import java.util.function.DoubleConsumer; /** @@ -21,7 +21,7 @@ import java.util.function.DoubleConsumer; *

These drive bases typically have drop-center / skid-steer with two or more wheels per side * (e.g., 6WD or 8WD). This class takes a setter per side. For four and six motor drivetrains, use * CAN motor controller followers or {@link - * edu.wpi.first.wpilibj.motorcontrol.PWMMotorController#addFollower(PWMMotorController)}. + * org.wpilib.hardware.motor.PWMMotorController#addFollower(PWMMotorController)}. * *

A differential drive robot has left and right wheels separated by an arbitrary width. * @@ -43,11 +43,11 @@ import java.util.function.DoubleConsumer; * positive Z axis points up. Rotations follow the right-hand rule, so counterclockwise rotation * around the Z axis is positive. * - *

Inputs smaller then {@value edu.wpi.first.wpilibj.drive.RobotDriveBase#kDefaultDeadband} will + *

Inputs smaller then {@value org.wpilib.drive.RobotDriveBase#kDefaultDeadband} will * be set to 0, and larger values will be scaled so that the full range is still used. This deadband * value can be changed with {@link #setDeadband}. * - *

{@link edu.wpi.first.wpilibj.MotorSafety} is enabled by default. The tankDrive, arcadeDrive, + *

{@link org.wpilib.hardware.motor.MotorSafety} is enabled by default. The tankDrive, arcadeDrive, * or curvatureDrive methods should be called periodically to avoid Motor Safety timeouts. */ public class DifferentialDrive extends RobotDriveBase implements Sendable, AutoCloseable { @@ -94,7 +94,7 @@ public class DifferentialDrive extends RobotDriveBase implements Sendable, AutoC * Construct a DifferentialDrive. * *

To pass multiple motors per side, use CAN motor controller followers or {@link - * edu.wpi.first.wpilibj.motorcontrol.PWMMotorController#addFollower(PWMMotorController)}. If a + * org.wpilib.hardware.motor.PWMMotorController#addFollower(PWMMotorController)}. If a * motor needs to be inverted, do so before passing it in. * * @param leftMotor Left motor. @@ -111,7 +111,7 @@ public class DifferentialDrive extends RobotDriveBase implements Sendable, AutoC * Construct a DifferentialDrive. * *

To pass multiple motors per side, use CAN motor controller followers or {@link - * edu.wpi.first.wpilibj.motorcontrol.PWMMotorController#addFollower(PWMMotorController)}. If a + * org.wpilib.hardware.motor.PWMMotorController#addFollower(PWMMotorController)}. If a * motor needs to be inverted, do so before passing it in. * * @param leftMotor Left motor setter. diff --git a/wpilibj/src/main/java/org/wpilib/drive/MecanumDrive.java b/wpilibj/src/main/java/org/wpilib/drive/MecanumDrive.java index 0e0b3134f1..46597ddab9 100644 --- a/wpilibj/src/main/java/org/wpilib/drive/MecanumDrive.java +++ b/wpilibj/src/main/java/org/wpilib/drive/MecanumDrive.java @@ -2,18 +2,18 @@ // 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 edu.wpi.first.wpilibj.drive; +package org.wpilib.drive; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.math.MathUtil; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; -import edu.wpi.first.wpilibj.motorcontrol.MotorController; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.math.util.MathUtil; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; +import org.wpilib.hardware.motor.MotorController; import java.util.function.DoubleConsumer; /** @@ -42,11 +42,11 @@ import java.util.function.DoubleConsumer; * positive Z axis points up. Rotations follow the right-hand rule, so counterclockwise rotation * around the Z axis is positive. * - *

Inputs smaller then {@value edu.wpi.first.wpilibj.drive.RobotDriveBase#kDefaultDeadband} will + *

Inputs smaller then {@value org.wpilib.drive.RobotDriveBase#kDefaultDeadband} will * be set to 0, and larger values will be scaled so that the full range is still used. This deadband * value can be changed with {@link #setDeadband}. * - *

{@link edu.wpi.first.wpilibj.MotorSafety} is enabled by default. The driveCartesian or + *

{@link org.wpilib.hardware.motor.MotorSafety} is enabled by default. The driveCartesian or * drivePolar methods should be called periodically to avoid Motor Safety timeouts. */ public class MecanumDrive extends RobotDriveBase implements Sendable, AutoCloseable { diff --git a/wpilibj/src/main/java/org/wpilib/drive/RobotDriveBase.java b/wpilibj/src/main/java/org/wpilib/drive/RobotDriveBase.java index 5250d321e6..df014e6f28 100644 --- a/wpilibj/src/main/java/org/wpilib/drive/RobotDriveBase.java +++ b/wpilibj/src/main/java/org/wpilib/drive/RobotDriveBase.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj.drive; +package org.wpilib.drive; -import edu.wpi.first.wpilibj.MotorSafety; +import org.wpilib.hardware.motor.MotorSafety; /** * Common base class for drive platforms. * - *

{@link edu.wpi.first.wpilibj.MotorSafety} is enabled by default. + *

{@link org.wpilib.hardware.motor.MotorSafety} is enabled by default. */ public abstract class RobotDriveBase extends MotorSafety { /** Default input deadband. */ @@ -60,7 +60,7 @@ public abstract class RobotDriveBase extends MotorSafety { * *

The default value is {@value #kDefaultDeadband}. Inputs smaller than the deadband are set to * 0.0 while inputs larger than the deadband are scaled from 0.0 to 1.0. See {@link - * edu.wpi.first.math.MathUtil#applyDeadband}. + * org.wpilib.math.util.MathUtil#applyDeadband}. * * @param deadband The deadband to set. */ diff --git a/wpilibj/src/main/java/org/wpilib/driverstation/DSControlWord.java b/wpilibj/src/main/java/org/wpilib/driverstation/DSControlWord.java index a656d9c700..0b68001c0f 100644 --- a/wpilibj/src/main/java/org/wpilib/driverstation/DSControlWord.java +++ b/wpilibj/src/main/java/org/wpilib/driverstation/DSControlWord.java @@ -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. -package edu.wpi.first.wpilibj; +package org.wpilib.driverstation; -import edu.wpi.first.hal.ControlWord; +import org.wpilib.hardware.hal.ControlWord; /** A wrapper around Driver Station control word. */ public class DSControlWord { diff --git a/wpilibj/src/main/java/org/wpilib/driverstation/DriverStation.java b/wpilibj/src/main/java/org/wpilib/driverstation/DriverStation.java index 39877bf596..e78fd086eb 100644 --- a/wpilibj/src/main/java/org/wpilib/driverstation/DriverStation.java +++ b/wpilibj/src/main/java/org/wpilib/driverstation/DriverStation.java @@ -2,26 +2,26 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.driverstation; -import edu.wpi.first.datalog.BooleanArrayLogEntry; -import edu.wpi.first.datalog.BooleanLogEntry; -import edu.wpi.first.datalog.DataLog; -import edu.wpi.first.datalog.FloatArrayLogEntry; -import edu.wpi.first.datalog.IntegerArrayLogEntry; -import edu.wpi.first.hal.AllianceStationID; -import edu.wpi.first.hal.ControlWord; -import edu.wpi.first.hal.DriverStationJNI; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.MatchInfoData; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.networktables.BooleanPublisher; -import edu.wpi.first.networktables.IntegerPublisher; -import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.networktables.StringPublisher; -import edu.wpi.first.networktables.StringTopic; -import edu.wpi.first.util.EventVector; -import edu.wpi.first.util.WPIUtilJNI; +import org.wpilib.datalog.BooleanArrayLogEntry; +import org.wpilib.datalog.BooleanLogEntry; +import org.wpilib.datalog.DataLog; +import org.wpilib.datalog.FloatArrayLogEntry; +import org.wpilib.datalog.IntegerArrayLogEntry; +import org.wpilib.hardware.hal.AllianceStationID; +import org.wpilib.hardware.hal.ControlWord; +import org.wpilib.hardware.hal.DriverStationJNI; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.hal.MatchInfoData; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.networktables.BooleanPublisher; +import org.wpilib.networktables.IntegerPublisher; +import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.networktables.StringPublisher; +import org.wpilib.networktables.StringTopic; +import org.wpilib.util.concurrent.EventVector; +import org.wpilib.util.WPIUtilJNI; import java.util.Map; import java.util.Optional; import java.util.OptionalDouble; diff --git a/wpilibj/src/main/java/org/wpilib/driverstation/Gamepad.java b/wpilibj/src/main/java/org/wpilib/driverstation/Gamepad.java index 853f8cb59f..d53036f28d 100644 --- a/wpilibj/src/main/java/org/wpilib/driverstation/Gamepad.java +++ b/wpilibj/src/main/java/org/wpilib/driverstation/Gamepad.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.driverstation; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.wpilibj.event.BooleanEvent; -import edu.wpi.first.wpilibj.event.EventLoop; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.event.BooleanEvent; +import org.wpilib.event.EventLoop; /** * Handle input from Gamepad controllers connected to the Driver Station. diff --git a/wpilibj/src/main/java/org/wpilib/driverstation/GenericHID.java b/wpilibj/src/main/java/org/wpilib/driverstation/GenericHID.java index 475842b533..e2f289ebf8 100644 --- a/wpilibj/src/main/java/org/wpilib/driverstation/GenericHID.java +++ b/wpilibj/src/main/java/org/wpilib/driverstation/GenericHID.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.driverstation; -import edu.wpi.first.hal.DriverStationJNI; -import edu.wpi.first.math.Pair; -import edu.wpi.first.wpilibj.DriverStation.POVDirection; -import edu.wpi.first.wpilibj.event.BooleanEvent; -import edu.wpi.first.wpilibj.event.EventLoop; +import org.wpilib.hardware.hal.DriverStationJNI; +import org.wpilib.math.util.Pair; +import org.wpilib.driverstation.DriverStation.POVDirection; +import org.wpilib.event.BooleanEvent; +import org.wpilib.event.EventLoop; import java.util.HashMap; import java.util.Map; diff --git a/wpilibj/src/main/java/org/wpilib/driverstation/Joystick.java b/wpilibj/src/main/java/org/wpilib/driverstation/Joystick.java index 44cf56d946..413dc39546 100644 --- a/wpilibj/src/main/java/org/wpilib/driverstation/Joystick.java +++ b/wpilibj/src/main/java/org/wpilib/driverstation/Joystick.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.driverstation; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.event.BooleanEvent; -import edu.wpi.first.wpilibj.event.EventLoop; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.event.BooleanEvent; +import org.wpilib.event.EventLoop; /** * Handle input from Flight Joysticks connected to the Driver Station. diff --git a/wpilibj/src/main/java/org/wpilib/event/BooleanEvent.java b/wpilibj/src/main/java/org/wpilib/event/BooleanEvent.java index 01c0b8ee3b..5aeaddc700 100644 --- a/wpilibj/src/main/java/org/wpilib/event/BooleanEvent.java +++ b/wpilibj/src/main/java/org/wpilib/event/BooleanEvent.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.event; +package org.wpilib.event; -import static edu.wpi.first.units.Units.Seconds; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.units.Units.Seconds; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.math.filter.Debouncer; -import edu.wpi.first.units.measure.Time; +import org.wpilib.math.filter.Debouncer; +import org.wpilib.units.measure.Time; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.BiFunction; import java.util.function.BooleanSupplier; diff --git a/wpilibj/src/main/java/org/wpilib/event/EventLoop.java b/wpilibj/src/main/java/org/wpilib/event/EventLoop.java index 2cbb3afd68..b87f1ae390 100644 --- a/wpilibj/src/main/java/org/wpilib/event/EventLoop.java +++ b/wpilibj/src/main/java/org/wpilib/event/EventLoop.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 edu.wpi.first.wpilibj.event; +package org.wpilib.event; import java.util.Collection; import java.util.ConcurrentModificationException; diff --git a/wpilibj/src/main/java/org/wpilib/event/NetworkBooleanEvent.java b/wpilibj/src/main/java/org/wpilib/event/NetworkBooleanEvent.java index a322883092..070e91d980 100644 --- a/wpilibj/src/main/java/org/wpilib/event/NetworkBooleanEvent.java +++ b/wpilibj/src/main/java/org/wpilib/event/NetworkBooleanEvent.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj.event; +package org.wpilib.event; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.networktables.BooleanSubscriber; -import edu.wpi.first.networktables.BooleanTopic; -import edu.wpi.first.networktables.NetworkTable; -import edu.wpi.first.networktables.NetworkTableInstance; +import org.wpilib.networktables.BooleanSubscriber; +import org.wpilib.networktables.BooleanTopic; +import org.wpilib.networktables.NetworkTable; +import org.wpilib.networktables.NetworkTableInstance; /** This class provides an easy way to link NetworkTables boolean topics to callback actions. */ public class NetworkBooleanEvent extends BooleanEvent { diff --git a/wpilibj/src/main/java/org/wpilib/hardware/accelerometer/ADXL345_I2C.java b/wpilibj/src/main/java/org/wpilib/hardware/accelerometer/ADXL345_I2C.java index 35d8af9b59..ccb36cee51 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/accelerometer/ADXL345_I2C.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/accelerometer/ADXL345_I2C.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.hardware.accelerometer; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.SimDevice; -import edu.wpi.first.hal.SimDouble; -import edu.wpi.first.hal.SimEnum; -import edu.wpi.first.networktables.DoublePublisher; -import edu.wpi.first.networktables.DoubleTopic; -import edu.wpi.first.networktables.NTSendable; -import edu.wpi.first.networktables.NTSendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.hal.SimDevice; +import org.wpilib.hardware.hal.SimDouble; +import org.wpilib.hardware.hal.SimEnum; +import org.wpilib.networktables.DoublePublisher; +import org.wpilib.networktables.DoubleTopic; +import org.wpilib.networktables.NTSendable; +import org.wpilib.networktables.NTSendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/wpilibj/src/main/java/org/wpilib/hardware/accelerometer/AnalogAccelerometer.java b/wpilibj/src/main/java/org/wpilib/hardware/accelerometer/AnalogAccelerometer.java index 7ff0afa76f..30a6a78fe8 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/accelerometer/AnalogAccelerometer.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/accelerometer/AnalogAccelerometer.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.hardware.accelerometer; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; /** * Handle operation of an analog accelerometer. The accelerometer reads acceleration directly diff --git a/wpilibj/src/main/java/org/wpilib/hardware/bus/CAN.java b/wpilibj/src/main/java/org/wpilib/hardware/bus/CAN.java index 086e870be0..fd78cbce7a 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/bus/CAN.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/bus/CAN.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.hardware.bus; -import edu.wpi.first.hal.CANAPIJNI; -import edu.wpi.first.hal.CANAPITypes; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.can.CANReceiveMessage; +import org.wpilib.hardware.hal.CANAPIJNI; +import org.wpilib.hardware.hal.CANAPITypes; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.hal.can.CANReceiveMessage; import java.io.Closeable; /** diff --git a/wpilibj/src/main/java/org/wpilib/hardware/bus/I2C.java b/wpilibj/src/main/java/org/wpilib/hardware/bus/I2C.java index cc790023d5..590eb1f2e0 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/bus/I2C.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/bus/I2C.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.hardware.bus; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.I2CJNI; -import edu.wpi.first.hal.util.BoundaryException; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.hal.I2CJNI; +import org.wpilib.hardware.hal.util.BoundaryException; import java.nio.ByteBuffer; /** diff --git a/wpilibj/src/main/java/org/wpilib/hardware/bus/SerialPort.java b/wpilibj/src/main/java/org/wpilib/hardware/bus/SerialPort.java index e025cc66e5..6766cade20 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/bus/SerialPort.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/bus/SerialPort.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.hardware.bus; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.SerialPortJNI; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.hal.SerialPortJNI; import java.nio.charset.StandardCharsets; /** Driver for the serial ports (USB, MXP, Onboard) on the roboRIO. */ diff --git a/wpilibj/src/main/java/org/wpilib/hardware/discrete/AnalogInput.java b/wpilibj/src/main/java/org/wpilib/hardware/discrete/AnalogInput.java index b91ccc1704..63bec0f6b0 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/discrete/AnalogInput.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/discrete/AnalogInput.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.hardware.discrete; -import edu.wpi.first.hal.AnalogJNI; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.SimDevice; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.hardware.hal.AnalogJNI; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.hal.SimDevice; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; /** * Analog channel class. diff --git a/wpilibj/src/main/java/org/wpilib/hardware/discrete/CounterBase.java b/wpilibj/src/main/java/org/wpilib/hardware/discrete/CounterBase.java index 6e03b72356..bacad2caa3 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/discrete/CounterBase.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/discrete/CounterBase.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 edu.wpi.first.wpilibj; +package org.wpilib.hardware.discrete; /** * Interface for counting the number of ticks on a digital input channel. Encoders, Gear tooth diff --git a/wpilibj/src/main/java/org/wpilib/hardware/discrete/DigitalInput.java b/wpilibj/src/main/java/org/wpilib/hardware/discrete/DigitalInput.java index ea334567f9..5438273e82 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/discrete/DigitalInput.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/discrete/DigitalInput.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.hardware.discrete; -import edu.wpi.first.hal.DIOJNI; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.SimDevice; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.hardware.hal.DIOJNI; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.hal.SimDevice; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; /** * Class to read a digital input. This class will read digital inputs and return the current value diff --git a/wpilibj/src/main/java/org/wpilib/hardware/discrete/DigitalOutput.java b/wpilibj/src/main/java/org/wpilib/hardware/discrete/DigitalOutput.java index c848c0a37e..73b017d904 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/discrete/DigitalOutput.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/discrete/DigitalOutput.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.hardware.discrete; -import edu.wpi.first.hal.DIOJNI; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.SimDevice; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.hardware.hal.DIOJNI; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.hal.SimDevice; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; /** * Class to write digital outputs. This class will write digital outputs. Other devices that are diff --git a/wpilibj/src/main/java/org/wpilib/hardware/discrete/PWM.java b/wpilibj/src/main/java/org/wpilib/hardware/discrete/PWM.java index 20550ed930..6b3df259e5 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/discrete/PWM.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/discrete/PWM.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.hardware.discrete; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.PWMJNI; -import edu.wpi.first.hal.SimDevice; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.hal.PWMJNI; +import org.wpilib.hardware.hal.SimDevice; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; /** * Class implements the PWM generation in the FPGA. diff --git a/wpilibj/src/main/java/org/wpilib/hardware/imu/OnboardIMU.java b/wpilibj/src/main/java/org/wpilib/hardware/imu/OnboardIMU.java index a1f2bfc508..bef61971e9 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/imu/OnboardIMU.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/imu/OnboardIMU.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.hardware.imu; -import edu.wpi.first.hal.IMUJNI; -import edu.wpi.first.math.geometry.Quaternion; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Rotation3d; +import org.wpilib.hardware.hal.IMUJNI; +import org.wpilib.math.geometry.Quaternion; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Rotation3d; /** SystemCore onboard IMU. */ public class OnboardIMU { diff --git a/wpilibj/src/main/java/org/wpilib/hardware/led/AddressableLED.java b/wpilibj/src/main/java/org/wpilib/hardware/led/AddressableLED.java index ad83f5390b..6acb73f999 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/led/AddressableLED.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/led/AddressableLED.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.hardware.led; -import edu.wpi.first.hal.AddressableLEDJNI; -import edu.wpi.first.hal.HAL; +import org.wpilib.hardware.hal.AddressableLEDJNI; +import org.wpilib.hardware.hal.HAL; /** * A class for driving addressable LEDs, such as WS2812B, WS2815, and NeoPixels. diff --git a/wpilibj/src/main/java/org/wpilib/hardware/led/AddressableLEDBuffer.java b/wpilibj/src/main/java/org/wpilib/hardware/led/AddressableLEDBuffer.java index a95a74a0c9..641e10b7cc 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/led/AddressableLEDBuffer.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/led/AddressableLEDBuffer.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 edu.wpi.first.wpilibj; +package org.wpilib.hardware.led; /** Buffer storage for Addressable LEDs. */ public class AddressableLEDBuffer implements LEDReader, LEDWriter { diff --git a/wpilibj/src/main/java/org/wpilib/hardware/led/AddressableLEDBufferView.java b/wpilibj/src/main/java/org/wpilib/hardware/led/AddressableLEDBufferView.java index 6737b75594..565de70244 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/led/AddressableLEDBufferView.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/led/AddressableLEDBufferView.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.hardware.led; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.wpilibj.util.Color; -import edu.wpi.first.wpilibj.util.Color8Bit; +import org.wpilib.util.Color; +import org.wpilib.util.Color8Bit; /** * A view of another addressable LED buffer. Views CANNOT be written directly to an LED strip; the diff --git a/wpilibj/src/main/java/org/wpilib/hardware/led/LEDPattern.java b/wpilibj/src/main/java/org/wpilib/hardware/led/LEDPattern.java index 0d5ece345e..f6adb95ef6 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/led/LEDPattern.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/led/LEDPattern.java @@ -2,21 +2,21 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.hardware.led; -import static edu.wpi.first.units.Units.Meters; -import static edu.wpi.first.units.Units.Microsecond; -import static edu.wpi.first.units.Units.Microseconds; -import static edu.wpi.first.units.Units.Value; +import static org.wpilib.units.Units.Meters; +import static org.wpilib.units.Units.Microsecond; +import static org.wpilib.units.Units.Microseconds; +import static org.wpilib.units.Units.Value; -import edu.wpi.first.units.collections.LongToObjectHashMap; -import edu.wpi.first.units.measure.Dimensionless; -import edu.wpi.first.units.measure.Distance; -import edu.wpi.first.units.measure.Frequency; -import edu.wpi.first.units.measure.LinearVelocity; -import edu.wpi.first.units.measure.Time; -import edu.wpi.first.util.WPIUtilJNI; -import edu.wpi.first.wpilibj.util.Color; +import org.wpilib.units.collections.LongToObjectHashMap; +import org.wpilib.units.measure.Dimensionless; +import org.wpilib.units.measure.Distance; +import org.wpilib.units.measure.Frequency; +import org.wpilib.units.measure.LinearVelocity; +import org.wpilib.units.measure.Time; +import org.wpilib.util.WPIUtilJNI; +import org.wpilib.util.Color; import java.util.Map; import java.util.Objects; import java.util.function.BooleanSupplier; diff --git a/wpilibj/src/main/java/org/wpilib/hardware/led/LEDReader.java b/wpilibj/src/main/java/org/wpilib/hardware/led/LEDReader.java index 176884a922..15fbdaca2f 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/led/LEDReader.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/led/LEDReader.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.hardware.led; -import edu.wpi.first.wpilibj.util.Color; -import edu.wpi.first.wpilibj.util.Color8Bit; +import org.wpilib.util.Color; +import org.wpilib.util.Color8Bit; /** Generic interface for reading data from an LED buffer. */ public interface LEDReader { diff --git a/wpilibj/src/main/java/org/wpilib/hardware/led/LEDWriter.java b/wpilibj/src/main/java/org/wpilib/hardware/led/LEDWriter.java index 076291d770..49a155a8cf 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/led/LEDWriter.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/led/LEDWriter.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.hardware.led; -import edu.wpi.first.wpilibj.util.Color; -import edu.wpi.first.wpilibj.util.Color8Bit; +import org.wpilib.util.Color; +import org.wpilib.util.Color8Bit; /** Generic interface for writing data to an LED buffer. */ @FunctionalInterface diff --git a/wpilibj/src/main/java/org/wpilib/hardware/motor/MotorController.java b/wpilibj/src/main/java/org/wpilib/hardware/motor/MotorController.java index 7c77f8afac..bd8cd68b1f 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/motor/MotorController.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/motor/MotorController.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.motorcontrol; +package org.wpilib.hardware.motor; -import static edu.wpi.first.units.Units.Volts; +import static org.wpilib.units.Units.Volts; -import edu.wpi.first.units.measure.Voltage; -import edu.wpi.first.wpilibj.RobotController; +import org.wpilib.units.measure.Voltage; +import org.wpilib.system.RobotController; /** Interface for motor controlling devices. */ public interface MotorController { diff --git a/wpilibj/src/main/java/org/wpilib/hardware/motor/MotorControllerGroup.java b/wpilibj/src/main/java/org/wpilib/hardware/motor/MotorControllerGroup.java index d0322ead83..ca955fe21b 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/motor/MotorControllerGroup.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/motor/MotorControllerGroup.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.motorcontrol; +package org.wpilib.hardware.motor; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; import java.util.Arrays; /** 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 dc969a9c96..8c69bcbccf 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/motor/MotorSafety.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/motor/MotorSafety.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.hardware.motor; -import edu.wpi.first.hal.ControlWord; -import edu.wpi.first.hal.DriverStationJNI; -import edu.wpi.first.util.WPIUtilJNI; +import org.wpilib.hardware.hal.ControlWord; +import org.wpilib.hardware.hal.DriverStationJNI; +import org.wpilib.util.WPIUtilJNI; import java.util.LinkedHashSet; import java.util.Set; diff --git a/wpilibj/src/main/java/org/wpilib/hardware/motor/PWMMotorController.java b/wpilibj/src/main/java/org/wpilib/hardware/motor/PWMMotorController.java index 511921c855..5fd3b6d665 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/motor/PWMMotorController.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/motor/PWMMotorController.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.wpilibj.motorcontrol; +package org.wpilib.hardware.motor; -import edu.wpi.first.hal.SimDevice; -import edu.wpi.first.hal.SimDevice.Direction; -import edu.wpi.first.hal.SimDouble; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; -import edu.wpi.first.wpilibj.MotorSafety; -import edu.wpi.first.wpilibj.PWM; -import edu.wpi.first.wpilibj.RobotController; +import org.wpilib.hardware.hal.SimDevice; +import org.wpilib.hardware.hal.SimDevice.Direction; +import org.wpilib.hardware.hal.SimDouble; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; +import org.wpilib.hardware.motor.MotorSafety; +import org.wpilib.hardware.discrete.PWM; +import org.wpilib.system.RobotController; import java.util.ArrayList; /** Common base class for all PWM Motor Controllers. */ diff --git a/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/Compressor.java b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/Compressor.java index 882aed2d0b..8dbf6162d0 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/Compressor.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/Compressor.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.hardware.pneumatic; -import edu.wpi.first.hal.util.AllocationException; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.hardware.hal.util.AllocationException; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; /** * Class for operating a compressor connected to a pneumatics module. The module will automatically diff --git a/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/CompressorConfigType.java b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/CompressorConfigType.java index be7847b6c1..4ab5b9b91e 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/CompressorConfigType.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/CompressorConfigType.java @@ -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. -package edu.wpi.first.wpilibj; +package org.wpilib.hardware.pneumatic; -import edu.wpi.first.hal.REVPHJNI; +import org.wpilib.hardware.hal.REVPHJNI; /** Compressor config type. */ public enum CompressorConfigType { diff --git a/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/DoubleSolenoid.java b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/DoubleSolenoid.java index b01030f1b7..67c5a19b70 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/DoubleSolenoid.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/DoubleSolenoid.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.hardware.pneumatic; -import edu.wpi.first.hal.util.AllocationException; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.hardware.hal.util.AllocationException; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; /** * DoubleSolenoid class for running 2 channels of high voltage Digital Output on the pneumatics diff --git a/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticHub.java b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticHub.java index afd2b0f5a0..119b77155a 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticHub.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticHub.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.hardware.pneumatic; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.PortsJNI; -import edu.wpi.first.hal.REVPHFaults; -import edu.wpi.first.hal.REVPHJNI; -import edu.wpi.first.hal.REVPHStickyFaults; -import edu.wpi.first.hal.REVPHVersion; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.hal.PortsJNI; +import org.wpilib.hardware.hal.REVPHFaults; +import org.wpilib.hardware.hal.REVPHJNI; +import org.wpilib.hardware.hal.REVPHStickyFaults; +import org.wpilib.hardware.hal.REVPHVersion; import java.util.HashMap; import java.util.Map; diff --git a/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsBase.java b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsBase.java index 25bc4ec6bc..238d829bf0 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsBase.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsBase.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 edu.wpi.first.wpilibj; +package org.wpilib.hardware.pneumatic; /** Interface for pneumatics devices. */ public interface PneumaticsBase extends AutoCloseable { diff --git a/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsControlModule.java b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsControlModule.java index a0b0d5751b..18cdced328 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsControlModule.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsControlModule.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.hardware.pneumatic; -import edu.wpi.first.hal.CTREPCMJNI; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.PortsJNI; +import org.wpilib.hardware.hal.CTREPCMJNI; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.hal.PortsJNI; import java.util.HashMap; import java.util.Map; diff --git a/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsModuleType.java b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsModuleType.java index e1525c39e2..62a2629f78 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsModuleType.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsModuleType.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 edu.wpi.first.wpilibj; +package org.wpilib.hardware.pneumatic; /** Pneumatics module type. */ public enum PneumaticsModuleType { diff --git a/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/Solenoid.java b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/Solenoid.java index bf7f0b18c1..e8fe41c8e3 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/Solenoid.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/pneumatic/Solenoid.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.hardware.pneumatic; -import edu.wpi.first.hal.util.AllocationException; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.hardware.hal.util.AllocationException; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; /** * Solenoid class for running high voltage Digital Output on a pneumatics module. diff --git a/wpilibj/src/main/java/org/wpilib/hardware/power/PowerDistribution.java b/wpilibj/src/main/java/org/wpilib/hardware/power/PowerDistribution.java index d4be6f6d98..39c045fa69 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/power/PowerDistribution.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/power/PowerDistribution.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.hardware.power; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.PowerDistributionFaults; -import edu.wpi.first.hal.PowerDistributionJNI; -import edu.wpi.first.hal.PowerDistributionStickyFaults; -import edu.wpi.first.hal.PowerDistributionVersion; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.hal.PowerDistributionFaults; +import org.wpilib.hardware.hal.PowerDistributionJNI; +import org.wpilib.hardware.hal.PowerDistributionStickyFaults; +import org.wpilib.hardware.hal.PowerDistributionVersion; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; /** * Class for getting voltage, current, temperature, power and energy from the CTRE Power diff --git a/wpilibj/src/main/java/org/wpilib/hardware/range/SharpIR.java b/wpilibj/src/main/java/org/wpilib/hardware/range/SharpIR.java index 0b86fe3dab..2ff50acad5 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/range/SharpIR.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/range/SharpIR.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.hardware.range; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.SimDevice; -import edu.wpi.first.hal.SimDevice.Direction; -import edu.wpi.first.hal.SimDouble; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.hal.SimDevice; +import org.wpilib.hardware.hal.SimDevice.Direction; +import org.wpilib.hardware.hal.SimDouble; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; /** * SharpIR analog distance sensor class. These distance measuring sensors output an analog voltage diff --git a/wpilibj/src/main/java/org/wpilib/hardware/rotation/AnalogEncoder.java b/wpilibj/src/main/java/org/wpilib/hardware/rotation/AnalogEncoder.java index e0e061a707..5c3cd834c1 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/rotation/AnalogEncoder.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/rotation/AnalogEncoder.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.hardware.rotation; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.SimDevice; -import edu.wpi.first.hal.SimDevice.Direction; -import edu.wpi.first.hal.SimDouble; -import edu.wpi.first.math.MathUtil; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.hal.SimDevice; +import org.wpilib.hardware.hal.SimDevice.Direction; +import org.wpilib.hardware.hal.SimDouble; +import org.wpilib.math.util.MathUtil; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; /** Class for supporting continuous analog encoders, such as the US Digital MA3. */ public class AnalogEncoder implements Sendable, AutoCloseable { diff --git a/wpilibj/src/main/java/org/wpilib/hardware/rotation/AnalogPotentiometer.java b/wpilibj/src/main/java/org/wpilib/hardware/rotation/AnalogPotentiometer.java index 57debffd77..1dc366d9dc 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/rotation/AnalogPotentiometer.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/rotation/AnalogPotentiometer.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.hardware.rotation; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; /** * Class for reading analog potentiometers. Analog potentiometers read in an analog voltage that diff --git a/wpilibj/src/main/java/org/wpilib/hardware/rotation/DutyCycle.java b/wpilibj/src/main/java/org/wpilib/hardware/rotation/DutyCycle.java index d37e767639..e485a1d910 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/rotation/DutyCycle.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/rotation/DutyCycle.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.hardware.rotation; -import edu.wpi.first.hal.DutyCycleJNI; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.hardware.hal.DutyCycleJNI; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; /** * Class to read a duty cycle PWM input. diff --git a/wpilibj/src/main/java/org/wpilib/hardware/rotation/DutyCycleEncoder.java b/wpilibj/src/main/java/org/wpilib/hardware/rotation/DutyCycleEncoder.java index f18ab988c6..48004b7b88 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/rotation/DutyCycleEncoder.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/rotation/DutyCycleEncoder.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.hardware.rotation; -import edu.wpi.first.hal.SimBoolean; -import edu.wpi.first.hal.SimDevice; -import edu.wpi.first.hal.SimDouble; -import edu.wpi.first.math.MathUtil; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.hardware.hal.SimBoolean; +import org.wpilib.hardware.hal.SimDevice; +import org.wpilib.hardware.hal.SimDouble; +import org.wpilib.math.util.MathUtil; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; /** * Class for supporting duty cycle/PWM encoders, such as the US Digital MA3 with PWM Output, the diff --git a/wpilibj/src/main/java/org/wpilib/hardware/rotation/Encoder.java b/wpilibj/src/main/java/org/wpilib/hardware/rotation/Encoder.java index 59091b6b1b..11b690f3ae 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/rotation/Encoder.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/rotation/Encoder.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.hardware.rotation; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.hal.EncoderJNI; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.SimDevice; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.hardware.hal.EncoderJNI; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.hal.SimDevice; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; /** * Class to read quadrature encoders. diff --git a/wpilibj/src/main/java/org/wpilib/internal/DriverStationModeThread.java b/wpilibj/src/main/java/org/wpilib/internal/DriverStationModeThread.java index 57c6bf7ddf..dc40d44435 100644 --- a/wpilibj/src/main/java/org/wpilib/internal/DriverStationModeThread.java +++ b/wpilibj/src/main/java/org/wpilib/internal/DriverStationModeThread.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.internal; +package org.wpilib.internal; -import edu.wpi.first.hal.DriverStationJNI; -import edu.wpi.first.util.WPIUtilJNI; -import edu.wpi.first.wpilibj.DriverStation; +import org.wpilib.hardware.hal.DriverStationJNI; +import org.wpilib.util.WPIUtilJNI; +import org.wpilib.driverstation.DriverStation; import java.util.concurrent.atomic.AtomicBoolean; /** For internal use only. */ diff --git a/wpilibj/src/main/java/org/wpilib/opmode/IterativeRobotBase.java b/wpilibj/src/main/java/org/wpilib/opmode/IterativeRobotBase.java index 1bd28928ad..b39912323d 100644 --- a/wpilibj/src/main/java/org/wpilib/opmode/IterativeRobotBase.java +++ b/wpilibj/src/main/java/org/wpilib/opmode/IterativeRobotBase.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.opmode; -import edu.wpi.first.hal.DriverStationJNI; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; +import org.wpilib.hardware.hal.DriverStationJNI; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.smartdashboard.SmartDashboard; /** * IterativeRobotBase implements a specific type of robot program framework, extending the RobotBase diff --git a/wpilibj/src/main/java/org/wpilib/opmode/RobotBase.java b/wpilibj/src/main/java/org/wpilib/opmode/RobotBase.java index 61c96bd6a6..2cf19c6005 100644 --- a/wpilibj/src/main/java/org/wpilib/opmode/RobotBase.java +++ b/wpilibj/src/main/java/org/wpilib/opmode/RobotBase.java @@ -2,19 +2,19 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.opmode; -import edu.wpi.first.cameraserver.CameraServerShared; -import edu.wpi.first.cameraserver.CameraServerSharedStore; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.HALUtil; -import edu.wpi.first.math.MathShared; -import edu.wpi.first.math.MathSharedStore; -import edu.wpi.first.networktables.MultiSubscriber; -import edu.wpi.first.networktables.NetworkTableEvent; -import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.util.WPIUtilJNI; -import edu.wpi.first.wpilibj.util.WPILibVersion; +import org.wpilib.vision.stream.CameraServerShared; +import org.wpilib.vision.stream.CameraServerSharedStore; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.hal.HALUtil; +import org.wpilib.math.util.MathShared; +import org.wpilib.math.util.MathSharedStore; +import org.wpilib.networktables.MultiSubscriber; +import org.wpilib.networktables.NetworkTableEvent; +import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.util.WPIUtilJNI; +import org.wpilib.util.WPILibVersion; 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/opmode/RobotState.java index 405dfc4bc3..978ed5bf22 100644 --- a/wpilibj/src/main/java/org/wpilib/opmode/RobotState.java +++ b/wpilibj/src/main/java/org/wpilib/opmode/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 edu.wpi.first.wpilibj; +package org.wpilib.opmode; /** Robot state utility functions. */ public final class RobotState { diff --git a/wpilibj/src/main/java/org/wpilib/opmode/TimedRobot.java b/wpilibj/src/main/java/org/wpilib/opmode/TimedRobot.java index 494a6d4371..eb7ba305fa 100644 --- a/wpilibj/src/main/java/org/wpilib/opmode/TimedRobot.java +++ b/wpilibj/src/main/java/org/wpilib/opmode/TimedRobot.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.opmode; -import static edu.wpi.first.units.Units.Seconds; +import static org.wpilib.units.Units.Seconds; -import edu.wpi.first.hal.DriverStationJNI; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.NotifierJNI; -import edu.wpi.first.units.measure.Frequency; -import edu.wpi.first.units.measure.Time; +import org.wpilib.hardware.hal.DriverStationJNI; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.hal.NotifierJNI; +import org.wpilib.units.measure.Frequency; +import org.wpilib.units.measure.Time; import java.util.PriorityQueue; /** diff --git a/wpilibj/src/main/java/org/wpilib/opmode/TimesliceRobot.java b/wpilibj/src/main/java/org/wpilib/opmode/TimesliceRobot.java index 5d10bb57eb..d9c79d24ac 100644 --- a/wpilibj/src/main/java/org/wpilib/opmode/TimesliceRobot.java +++ b/wpilibj/src/main/java/org/wpilib/opmode/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 edu.wpi.first.wpilibj; +package org.wpilib.opmode; /** * TimesliceRobot extends the TimedRobot robot program framework to provide timeslice scheduling of diff --git a/wpilibj/src/main/java/org/wpilib/simulation/ADXL345Sim.java b/wpilibj/src/main/java/org/wpilib/simulation/ADXL345Sim.java index 8a7e99e56d..0bf7433245 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/ADXL345Sim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/ADXL345Sim.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.hal.SimDouble; -import edu.wpi.first.wpilibj.ADXL345_I2C; +import org.wpilib.hardware.hal.SimDouble; +import org.wpilib.hardware.accelerometer.ADXL345_I2C; import java.util.Objects; /** Class to control a simulated ADXL345. */ diff --git a/wpilibj/src/main/java/org/wpilib/simulation/AddressableLEDSim.java b/wpilibj/src/main/java/org/wpilib/simulation/AddressableLEDSim.java index 3069093d45..ed014d8c22 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/AddressableLEDSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/AddressableLEDSim.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.hal.simulation.AddressableLEDDataJNI; -import edu.wpi.first.hal.simulation.ConstBufferCallback; -import edu.wpi.first.hal.simulation.NotifyCallback; -import edu.wpi.first.wpilibj.AddressableLED; +import org.wpilib.hardware.hal.simulation.AddressableLEDDataJNI; +import org.wpilib.hardware.hal.simulation.ConstBufferCallback; +import org.wpilib.hardware.hal.simulation.NotifyCallback; +import org.wpilib.hardware.led.AddressableLED; /** Class to control a simulated addressable LED. */ public class AddressableLEDSim { diff --git a/wpilibj/src/main/java/org/wpilib/simulation/AnalogEncoderSim.java b/wpilibj/src/main/java/org/wpilib/simulation/AnalogEncoderSim.java index b4a85f0e8c..fb0286fb16 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/AnalogEncoderSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/AnalogEncoderSim.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.hal.SimDouble; -import edu.wpi.first.wpilibj.AnalogEncoder; +import org.wpilib.hardware.hal.SimDouble; +import org.wpilib.hardware.rotation.AnalogEncoder; /** Class to control a simulated analog encoder. */ public class AnalogEncoderSim { diff --git a/wpilibj/src/main/java/org/wpilib/simulation/AnalogInputSim.java b/wpilibj/src/main/java/org/wpilib/simulation/AnalogInputSim.java index 7c98386df2..07af2753ae 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/AnalogInputSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/AnalogInputSim.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.hal.simulation.AnalogInDataJNI; -import edu.wpi.first.hal.simulation.NotifyCallback; -import edu.wpi.first.wpilibj.AnalogInput; +import org.wpilib.hardware.hal.simulation.AnalogInDataJNI; +import org.wpilib.hardware.hal.simulation.NotifyCallback; +import org.wpilib.hardware.discrete.AnalogInput; /** Class to control a simulated analog input. */ public class AnalogInputSim { diff --git a/wpilibj/src/main/java/org/wpilib/simulation/BatterySim.java b/wpilibj/src/main/java/org/wpilib/simulation/BatterySim.java index fcee31bdb3..f238d0d36b 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/BatterySim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/BatterySim.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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; /** A utility class to simulate the robot battery. */ public final class BatterySim { @@ -13,7 +13,7 @@ public final class BatterySim { /** * Calculate the loaded battery voltage. Use this with {@link RoboRioSim#setVInVoltage(double)} to * set the simulated battery voltage, which can then be retrieved with the {@link - * edu.wpi.first.wpilibj.RobotController#getBatteryVoltage()} method. + * org.wpilib.system.RobotController#getBatteryVoltage()} method. * * @param nominalVoltage The nominal battery voltage. Usually 12v. * @param resistanceOhms The forward resistance of the battery. Most batteries are at or below 20 @@ -33,7 +33,7 @@ public final class BatterySim { /** * Calculate the loaded battery voltage. Use this with {@link RoboRioSim#setVInVoltage(double)} to * set the simulated battery voltage, which can then be retrieved with the {@link - * edu.wpi.first.wpilibj.RobotController#getBatteryVoltage()} method. This function assumes a + * org.wpilib.system.RobotController#getBatteryVoltage()} method. This function assumes a * nominal voltage of 12v and a resistance of 20 milliohms (0.020 ohms) * * @param currents The currents drawn from the battery. diff --git a/wpilibj/src/main/java/org/wpilib/simulation/CTREPCMSim.java b/wpilibj/src/main/java/org/wpilib/simulation/CTREPCMSim.java index d5d2c4a4e8..007640e60b 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/CTREPCMSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/CTREPCMSim.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.hal.simulation.CTREPCMDataJNI; -import edu.wpi.first.hal.simulation.NotifyCallback; -import edu.wpi.first.wpilibj.PneumaticsControlModule; -import edu.wpi.first.wpilibj.SensorUtil; +import org.wpilib.hardware.hal.simulation.CTREPCMDataJNI; +import org.wpilib.hardware.hal.simulation.NotifyCallback; +import org.wpilib.hardware.pneumatic.PneumaticsControlModule; +import org.wpilib.system.SensorUtil; /** Class to control a simulated Pneumatic Control Module (PCM). */ public class CTREPCMSim extends PneumaticsBaseSim { diff --git a/wpilibj/src/main/java/org/wpilib/simulation/CallbackStore.java b/wpilibj/src/main/java/org/wpilib/simulation/CallbackStore.java index c6ea362a44..982f0177d2 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/CallbackStore.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/CallbackStore.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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; /** Manages simulation callbacks; each object is associated with a callback. */ public class CallbackStore implements AutoCloseable { diff --git a/wpilibj/src/main/java/org/wpilib/simulation/DCMotorSim.java b/wpilibj/src/main/java/org/wpilib/simulation/DCMotorSim.java index bb90d336bf..48788b25ef 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/DCMotorSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/DCMotorSim.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.system.LinearSystem; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.wpilibj.RobotController; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.system.LinearSystem; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.system.RobotController; /** Represents a simulated DC motor mechanism. */ public class DCMotorSim extends LinearSystemSim { @@ -26,10 +26,10 @@ public class DCMotorSim extends LinearSystemSim { * Creates a simulated DC motor mechanism. * * @param plant The linear system representing the DC motor. This system can be created with - * {@link edu.wpi.first.math.system.plant.LinearSystemId#createDCMotorSystem(DCMotor, double, + * {@link org.wpilib.math.system.plant.LinearSystemId#createDCMotorSystem(DCMotor, double, * double)} or {@link - * edu.wpi.first.math.system.plant.LinearSystemId#createDCMotorSystem(double, double)}. If - * {@link edu.wpi.first.math.system.plant.LinearSystemId#createDCMotorSystem(double, double)} + * org.wpilib.math.system.plant.LinearSystemId#createDCMotorSystem(double, double)}. If + * {@link org.wpilib.math.system.plant.LinearSystemId#createDCMotorSystem(double, double)} * is used, the distance unit must be radians. * @param gearbox The type of and number of motors in the DC motor gearbox. * @param measurementStdDevs The standard deviations of the measurements. Can be omitted if no diff --git a/wpilibj/src/main/java/org/wpilib/simulation/DIOSim.java b/wpilibj/src/main/java/org/wpilib/simulation/DIOSim.java index ed8ca9bbc5..4f7fe5048b 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/DIOSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/DIOSim.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.hal.simulation.DIODataJNI; -import edu.wpi.first.hal.simulation.NotifyCallback; -import edu.wpi.first.wpilibj.DigitalInput; -import edu.wpi.first.wpilibj.DigitalOutput; +import org.wpilib.hardware.hal.simulation.DIODataJNI; +import org.wpilib.hardware.hal.simulation.NotifyCallback; +import org.wpilib.hardware.discrete.DigitalInput; +import org.wpilib.hardware.discrete.DigitalOutput; /** Class to control a simulated digital input or output. */ public class DIOSim { diff --git a/wpilibj/src/main/java/org/wpilib/simulation/DifferentialDrivetrainSim.java b/wpilibj/src/main/java/org/wpilib/simulation/DifferentialDrivetrainSim.java index 5ecfd55fca..df5d34de65 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/DifferentialDrivetrainSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/DifferentialDrivetrainSim.java @@ -2,29 +2,29 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.StateSpaceUtil; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.numbers.N7; -import edu.wpi.first.math.system.LinearSystem; -import edu.wpi.first.math.system.NumericalIntegration; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.system.plant.LinearSystemId; -import edu.wpi.first.math.util.Units; -import edu.wpi.first.wpilibj.RobotController; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.StateSpaceUtil; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.numbers.N7; +import org.wpilib.math.system.LinearSystem; +import org.wpilib.math.system.NumericalIntegration; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.math.system.plant.LinearSystemId; +import org.wpilib.math.util.Units; +import org.wpilib.system.RobotController; /** * This class simulates the state of the drivetrain. In simulationPeriodic, users should first set * inputs from motors with {@link #setInputs(double, double)}, call {@link #update(double)} to * update the simulation, and set estimated encoder and gyro positions, as well as estimated - * odometry pose. Teams can use {@link edu.wpi.first.wpilibj.smartdashboard.Field2d} to visualize + * odometry pose. Teams can use {@link org.wpilib.smartdashboard.Field2d} to visualize * their robot on the Sim GUI's field. * *

Our state-space system is: @@ -90,9 +90,9 @@ public class DifferentialDrivetrainSim { * * @param plant The {@link LinearSystem} representing the robot's drivetrain. This system can be * created with {@link - * edu.wpi.first.math.system.plant.LinearSystemId#createDrivetrainVelocitySystem(DCMotor, + * org.wpilib.math.system.plant.LinearSystemId#createDrivetrainVelocitySystem(DCMotor, * double, double, double, double, double)} or {@link - * edu.wpi.first.math.system.plant.LinearSystemId#identifyDrivetrainSystem(double, double, + * org.wpilib.math.system.plant.LinearSystemId#identifyDrivetrainSystem(double, double, * double, double)}. * @param driveMotor A {@link DCMotor} representing the drivetrain. * @param gearing The gearingRatio ratio of the robot, as output over input. This must be the same diff --git a/wpilibj/src/main/java/org/wpilib/simulation/DigitalPWMSim.java b/wpilibj/src/main/java/org/wpilib/simulation/DigitalPWMSim.java index 14a95639e3..690f17cd02 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/DigitalPWMSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/DigitalPWMSim.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.hal.simulation.DigitalPWMDataJNI; -import edu.wpi.first.hal.simulation.NotifyCallback; -import edu.wpi.first.wpilibj.DigitalOutput; +import org.wpilib.hardware.hal.simulation.DigitalPWMDataJNI; +import org.wpilib.hardware.hal.simulation.NotifyCallback; +import org.wpilib.hardware.discrete.DigitalOutput; import java.util.NoSuchElementException; /** diff --git a/wpilibj/src/main/java/org/wpilib/simulation/DoubleSolenoidSim.java b/wpilibj/src/main/java/org/wpilib/simulation/DoubleSolenoidSim.java index baf3b0235b..dd650d297b 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/DoubleSolenoidSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/DoubleSolenoidSim.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.wpilibj.DoubleSolenoid; -import edu.wpi.first.wpilibj.PneumaticsBase; -import edu.wpi.first.wpilibj.PneumaticsModuleType; +import org.wpilib.hardware.pneumatic.DoubleSolenoid; +import org.wpilib.hardware.pneumatic.PneumaticsBase; +import org.wpilib.hardware.pneumatic.PneumaticsModuleType; -/** Class to control a simulated {@link edu.wpi.first.wpilibj.DoubleSolenoid}. */ +/** Class to control a simulated {@link org.wpilib.hardware.pneumatic.DoubleSolenoid}. */ public class DoubleSolenoidSim { private final PneumaticsBaseSim m_module; private final int m_fwd; diff --git a/wpilibj/src/main/java/org/wpilib/simulation/DriverStationSim.java b/wpilibj/src/main/java/org/wpilib/simulation/DriverStationSim.java index ded2776cb4..01d224c00b 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/DriverStationSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/DriverStationSim.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.hal.AllianceStationID; -import edu.wpi.first.hal.DriverStationJNI; -import edu.wpi.first.hal.simulation.DriverStationDataJNI; -import edu.wpi.first.hal.simulation.NotifyCallback; -import edu.wpi.first.util.WPIUtilJNI; -import edu.wpi.first.wpilibj.DriverStation; +import org.wpilib.hardware.hal.AllianceStationID; +import org.wpilib.hardware.hal.DriverStationJNI; +import org.wpilib.hardware.hal.simulation.DriverStationDataJNI; +import org.wpilib.hardware.hal.simulation.NotifyCallback; +import org.wpilib.util.WPIUtilJNI; +import org.wpilib.driverstation.DriverStation; /** Class to control a simulated driver station. */ public final class DriverStationSim { diff --git a/wpilibj/src/main/java/org/wpilib/simulation/DutyCycleEncoderSim.java b/wpilibj/src/main/java/org/wpilib/simulation/DutyCycleEncoderSim.java index e836618855..9c7db60ccb 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/DutyCycleEncoderSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/DutyCycleEncoderSim.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.hal.SimBoolean; -import edu.wpi.first.hal.SimDouble; -import edu.wpi.first.wpilibj.DutyCycleEncoder; +import org.wpilib.hardware.hal.SimBoolean; +import org.wpilib.hardware.hal.SimDouble; +import org.wpilib.hardware.rotation.DutyCycleEncoder; /** Class to control a simulated duty cycle encoder. */ public class DutyCycleEncoderSim { diff --git a/wpilibj/src/main/java/org/wpilib/simulation/DutyCycleSim.java b/wpilibj/src/main/java/org/wpilib/simulation/DutyCycleSim.java index 2b9155d333..837cd42cd8 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/DutyCycleSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/DutyCycleSim.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.hal.simulation.DutyCycleDataJNI; -import edu.wpi.first.hal.simulation.NotifyCallback; -import edu.wpi.first.wpilibj.DutyCycle; +import org.wpilib.hardware.hal.simulation.DutyCycleDataJNI; +import org.wpilib.hardware.hal.simulation.NotifyCallback; +import org.wpilib.hardware.rotation.DutyCycle; /** Class to control a simulated duty cycle digital input. */ public class DutyCycleSim { diff --git a/wpilibj/src/main/java/org/wpilib/simulation/ElevatorSim.java b/wpilibj/src/main/java/org/wpilib/simulation/ElevatorSim.java index 20f1b67643..f679ab04a9 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/ElevatorSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/ElevatorSim.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.system.LinearSystem; -import edu.wpi.first.math.system.NumericalIntegration; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.system.plant.LinearSystemId; -import edu.wpi.first.wpilibj.RobotController; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.system.LinearSystem; +import org.wpilib.math.system.NumericalIntegration; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.math.system.plant.LinearSystemId; +import org.wpilib.system.RobotController; /** Represents a simulated elevator mechanism. */ public class ElevatorSim extends LinearSystemSim { @@ -32,7 +32,7 @@ public class ElevatorSim extends LinearSystemSim { * Creates a simulated elevator mechanism. * * @param plant The linear system that represents the elevator. This system can be created with - * {@link edu.wpi.first.math.system.plant.LinearSystemId#createElevatorSystem(DCMotor, double, + * {@link org.wpilib.math.system.plant.LinearSystemId#createElevatorSystem(DCMotor, double, * double, double)}. * @param gearbox The type of and number of motors in the elevator gearbox. * @param minHeight The min allowable height of the elevator in meters. diff --git a/wpilibj/src/main/java/org/wpilib/simulation/EncoderSim.java b/wpilibj/src/main/java/org/wpilib/simulation/EncoderSim.java index 85f34f56d9..2a8e772062 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/EncoderSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/EncoderSim.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.hal.simulation.EncoderDataJNI; -import edu.wpi.first.hal.simulation.NotifyCallback; -import edu.wpi.first.wpilibj.Encoder; +import org.wpilib.hardware.hal.simulation.EncoderDataJNI; +import org.wpilib.hardware.hal.simulation.NotifyCallback; +import org.wpilib.hardware.rotation.Encoder; import java.util.NoSuchElementException; /** Class to control a simulated encoder. */ diff --git a/wpilibj/src/main/java/org/wpilib/simulation/FlywheelSim.java b/wpilibj/src/main/java/org/wpilib/simulation/FlywheelSim.java index e9e72b0894..84e4b159de 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/FlywheelSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/FlywheelSim.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.system.LinearSystem; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.system.plant.LinearSystemId; -import edu.wpi.first.wpilibj.RobotController; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.system.LinearSystem; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.math.system.plant.LinearSystemId; +import org.wpilib.system.RobotController; /** Represents a simulated flywheel mechanism. */ public class FlywheelSim extends LinearSystemSim { diff --git a/wpilibj/src/main/java/org/wpilib/simulation/GamepadSim.java b/wpilibj/src/main/java/org/wpilib/simulation/GamepadSim.java index d5681c5679..896de2cf8e 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/GamepadSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/GamepadSim.java @@ -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. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.wpilibj.Gamepad; +import org.wpilib.driverstation.Gamepad; /** Class to control a simulated Gamepad controller. */ public class GamepadSim extends GenericHIDSim { diff --git a/wpilibj/src/main/java/org/wpilib/simulation/GenericHIDSim.java b/wpilibj/src/main/java/org/wpilib/simulation/GenericHIDSim.java index a37d383e75..354a8e80e9 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/GenericHIDSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/GenericHIDSim.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.wpilibj.DriverStation; -import edu.wpi.first.wpilibj.GenericHID; +import org.wpilib.driverstation.DriverStation; +import org.wpilib.driverstation.GenericHID; /** Class to control a simulated generic joystick. */ public class GenericHIDSim { diff --git a/wpilibj/src/main/java/org/wpilib/simulation/I2CSim.java b/wpilibj/src/main/java/org/wpilib/simulation/I2CSim.java index 7e76e5c07c..2a0befd8e8 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/I2CSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/I2CSim.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.hal.simulation.BufferCallback; -import edu.wpi.first.hal.simulation.ConstBufferCallback; -import edu.wpi.first.hal.simulation.I2CDataJNI; -import edu.wpi.first.hal.simulation.NotifyCallback; +import org.wpilib.hardware.hal.simulation.BufferCallback; +import org.wpilib.hardware.hal.simulation.ConstBufferCallback; +import org.wpilib.hardware.hal.simulation.I2CDataJNI; +import org.wpilib.hardware.hal.simulation.NotifyCallback; /** A class to control a simulated I2C device. */ public class I2CSim { diff --git a/wpilibj/src/main/java/org/wpilib/simulation/JoystickSim.java b/wpilibj/src/main/java/org/wpilib/simulation/JoystickSim.java index 7db8009e2b..eaf57c8610 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/JoystickSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/JoystickSim.java @@ -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. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.wpilibj.Joystick; +import org.wpilib.driverstation.Joystick; /** Class to control a simulated joystick. */ public class JoystickSim extends GenericHIDSim { diff --git a/wpilibj/src/main/java/org/wpilib/simulation/LinearSystemSim.java b/wpilibj/src/main/java/org/wpilib/simulation/LinearSystemSim.java index 99620daa79..338c650e40 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/LinearSystemSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/LinearSystemSim.java @@ -2,19 +2,19 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.StateSpaceUtil; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.system.LinearSystem; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Num; +import org.wpilib.math.util.StateSpaceUtil; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.system.LinearSystem; import org.ejml.MatrixDimensionException; import org.ejml.simple.SimpleMatrix; /** * This class helps simulate linear systems. To use this class, do the following in the {@link - * edu.wpi.first.wpilibj.IterativeRobotBase#simulationPeriodic} method. + * org.wpilib.opmode.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/NotifierSim.java b/wpilibj/src/main/java/org/wpilib/simulation/NotifierSim.java index a5be97f5e7..e6f556f001 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/NotifierSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/NotifierSim.java @@ -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. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.hal.simulation.NotifierDataJNI; +import org.wpilib.hardware.hal.simulation.NotifierDataJNI; /** Class to control simulated notifiers. */ public final class NotifierSim { diff --git a/wpilibj/src/main/java/org/wpilib/simulation/PDPSim.java b/wpilibj/src/main/java/org/wpilib/simulation/PDPSim.java index 8a0f2c0ade..fd64b123de 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/PDPSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/PDPSim.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.hal.simulation.NotifyCallback; -import edu.wpi.first.hal.simulation.PowerDistributionDataJNI; -import edu.wpi.first.wpilibj.PowerDistribution; +import org.wpilib.hardware.hal.simulation.NotifyCallback; +import org.wpilib.hardware.hal.simulation.PowerDistributionDataJNI; +import org.wpilib.hardware.power.PowerDistribution; /** Class to control a simulated Power Distribution Panel (PDP). */ public class PDPSim { diff --git a/wpilibj/src/main/java/org/wpilib/simulation/PWMMotorControllerSim.java b/wpilibj/src/main/java/org/wpilib/simulation/PWMMotorControllerSim.java index 648e1c6095..6430e0805b 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/PWMMotorControllerSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/PWMMotorControllerSim.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.hal.SimDouble; -import edu.wpi.first.wpilibj.motorcontrol.PWMMotorController; +import org.wpilib.hardware.hal.SimDouble; +import org.wpilib.hardware.motor.PWMMotorController; /** Class to control a simulated PWM motor controller. */ public class PWMMotorControllerSim { diff --git a/wpilibj/src/main/java/org/wpilib/simulation/PWMSim.java b/wpilibj/src/main/java/org/wpilib/simulation/PWMSim.java index 13c9dedd62..3eca39c9fb 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/PWMSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/PWMSim.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.hal.simulation.NotifyCallback; -import edu.wpi.first.hal.simulation.PWMDataJNI; -import edu.wpi.first.wpilibj.PWM; +import org.wpilib.hardware.hal.simulation.NotifyCallback; +import org.wpilib.hardware.hal.simulation.PWMDataJNI; +import org.wpilib.hardware.discrete.PWM; /** Class to control a simulated PWM output. */ public class PWMSim { diff --git a/wpilibj/src/main/java/org/wpilib/simulation/PneumaticsBaseSim.java b/wpilibj/src/main/java/org/wpilib/simulation/PneumaticsBaseSim.java index 4b993f9b47..3b5931b780 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/PneumaticsBaseSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/PneumaticsBaseSim.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.hal.simulation.NotifyCallback; -import edu.wpi.first.wpilibj.PneumaticsBase; -import edu.wpi.first.wpilibj.PneumaticsModuleType; +import org.wpilib.hardware.hal.simulation.NotifyCallback; +import org.wpilib.hardware.pneumatic.PneumaticsBase; +import org.wpilib.hardware.pneumatic.PneumaticsModuleType; /** Common base class for pneumatics module simulation classes. */ public abstract class PneumaticsBaseSim { diff --git a/wpilibj/src/main/java/org/wpilib/simulation/REVPHSim.java b/wpilibj/src/main/java/org/wpilib/simulation/REVPHSim.java index 26e2c6712e..d7c8fd9e34 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/REVPHSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/REVPHSim.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.hal.simulation.NotifyCallback; -import edu.wpi.first.hal.simulation.REVPHDataJNI; -import edu.wpi.first.wpilibj.PneumaticHub; -import edu.wpi.first.wpilibj.SensorUtil; +import org.wpilib.hardware.hal.simulation.NotifyCallback; +import org.wpilib.hardware.hal.simulation.REVPHDataJNI; +import org.wpilib.hardware.pneumatic.PneumaticHub; +import org.wpilib.system.SensorUtil; /** Class to control a simulated PneumaticHub (PH). */ public class REVPHSim extends PneumaticsBaseSim { diff --git a/wpilibj/src/main/java/org/wpilib/simulation/RoboRioSim.java b/wpilibj/src/main/java/org/wpilib/simulation/RoboRioSim.java index f5475a8733..645aade099 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/RoboRioSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/RoboRioSim.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.hal.simulation.NotifyCallback; -import edu.wpi.first.hal.simulation.RoboRioDataJNI; +import org.wpilib.hardware.hal.simulation.NotifyCallback; +import org.wpilib.hardware.hal.simulation.RoboRioDataJNI; /** A utility class to control a simulated RoboRIO. */ public final class RoboRioSim { diff --git a/wpilibj/src/main/java/org/wpilib/simulation/SendableChooserSim.java b/wpilibj/src/main/java/org/wpilib/simulation/SendableChooserSim.java index 81422c99bc..ec6017180b 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/SendableChooserSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/SendableChooserSim.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.networktables.StringPublisher; -import edu.wpi.first.wpilibj.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/simulation/SharpIRSim.java b/wpilibj/src/main/java/org/wpilib/simulation/SharpIRSim.java index 4d90f2c5c0..a9f7e23600 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/SharpIRSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/SharpIRSim.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.hal.SimDouble; -import edu.wpi.first.wpilibj.SharpIR; +import org.wpilib.hardware.hal.SimDouble; +import org.wpilib.hardware.range.SharpIR; /** Simulation class for Sharp IR sensors. */ public class SharpIRSim { diff --git a/wpilibj/src/main/java/org/wpilib/simulation/SimDeviceSim.java b/wpilibj/src/main/java/org/wpilib/simulation/SimDeviceSim.java index 32620d8f26..262ebd59e6 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/SimDeviceSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/SimDeviceSim.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.hal.SimBoolean; -import edu.wpi.first.hal.SimDouble; -import edu.wpi.first.hal.SimEnum; -import edu.wpi.first.hal.SimInt; -import edu.wpi.first.hal.SimLong; -import edu.wpi.first.hal.SimValue; -import edu.wpi.first.hal.simulation.SimDeviceCallback; -import edu.wpi.first.hal.simulation.SimDeviceDataJNI; -import edu.wpi.first.hal.simulation.SimValueCallback; +import org.wpilib.hardware.hal.SimBoolean; +import org.wpilib.hardware.hal.SimDouble; +import org.wpilib.hardware.hal.SimEnum; +import org.wpilib.hardware.hal.SimInt; +import org.wpilib.hardware.hal.SimLong; +import org.wpilib.hardware.hal.SimValue; +import org.wpilib.hardware.hal.simulation.SimDeviceCallback; +import org.wpilib.hardware.hal.simulation.SimDeviceDataJNI; +import org.wpilib.hardware.hal.simulation.SimValueCallback; /** Class to control the simulation side of a SimDevice. */ public class SimDeviceSim { @@ -235,7 +235,7 @@ public class SimDeviceSim { } /** - * Register a callback to be run every time a new {@link edu.wpi.first.hal.SimDevice} is created. + * Register a callback to be run every time a new {@link org.wpilib.hardware.hal.SimDevice} is created. * * @param prefix the prefix to filter sim devices * @param callback the callback @@ -249,7 +249,7 @@ public class SimDeviceSim { } /** - * Register a callback to be run every time a {@link edu.wpi.first.hal.SimDevice} is + * Register a callback to be run every time a {@link org.wpilib.hardware.hal.SimDevice} is * freed/destroyed. * * @param prefix the prefix to filter sim devices diff --git a/wpilibj/src/main/java/org/wpilib/simulation/SimHooks.java b/wpilibj/src/main/java/org/wpilib/simulation/SimHooks.java index 4cf35ab426..842f7a6d1c 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/SimHooks.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/SimHooks.java @@ -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. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.hal.simulation.SimulatorJNI; +import org.wpilib.hardware.hal.simulation.SimulatorJNI; /** Simulation hooks. */ public final class SimHooks { diff --git a/wpilibj/src/main/java/org/wpilib/simulation/SingleJointedArmSim.java b/wpilibj/src/main/java/org/wpilib/simulation/SingleJointedArmSim.java index 18a8d0fce8..cbfd1e84b9 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/SingleJointedArmSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/SingleJointedArmSim.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.system.LinearSystem; -import edu.wpi.first.math.system.NumericalIntegration; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.system.plant.LinearSystemId; -import edu.wpi.first.wpilibj.RobotController; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.system.LinearSystem; +import org.wpilib.math.system.NumericalIntegration; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.math.system.plant.LinearSystemId; +import org.wpilib.system.RobotController; /** Represents a simulated single jointed arm mechanism. */ public class SingleJointedArmSim extends LinearSystemSim { @@ -38,7 +38,7 @@ public class SingleJointedArmSim extends LinearSystemSim { * Creates a simulated arm mechanism. * * @param plant The linear system that represents the arm. This system can be created with {@link - * edu.wpi.first.math.system.plant.LinearSystemId#createSingleJointedArmSystem(DCMotor, + * org.wpilib.math.system.plant.LinearSystemId#createSingleJointedArmSystem(DCMotor, * double, double)}. * @param gearbox The type of and number of motors in the arm gearbox. * @param gearing The gearing of the arm (numbers greater than 1 represent reductions). diff --git a/wpilibj/src/main/java/org/wpilib/simulation/SolenoidSim.java b/wpilibj/src/main/java/org/wpilib/simulation/SolenoidSim.java index af767d211e..988f7cd13e 100644 --- a/wpilibj/src/main/java/org/wpilib/simulation/SolenoidSim.java +++ b/wpilibj/src/main/java/org/wpilib/simulation/SolenoidSim.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; -import edu.wpi.first.hal.simulation.NotifyCallback; -import edu.wpi.first.wpilibj.PneumaticsBase; -import edu.wpi.first.wpilibj.PneumaticsModuleType; +import org.wpilib.hardware.hal.simulation.NotifyCallback; +import org.wpilib.hardware.pneumatic.PneumaticsBase; +import org.wpilib.hardware.pneumatic.PneumaticsModuleType; -/** Class to control a simulated {@link edu.wpi.first.wpilibj.Solenoid}. */ +/** Class to control a simulated {@link org.wpilib.hardware.pneumatic.Solenoid}. */ public class SolenoidSim { private final PneumaticsBaseSim m_module; private final int m_channel; diff --git a/wpilibj/src/main/java/org/wpilib/smartdashboard/Field2d.java b/wpilibj/src/main/java/org/wpilib/smartdashboard/Field2d.java index 4a056c0fd4..63eedeceb7 100644 --- a/wpilibj/src/main/java/org/wpilib/smartdashboard/Field2d.java +++ b/wpilibj/src/main/java/org/wpilib/smartdashboard/Field2d.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.wpilibj.smartdashboard; +package org.wpilib.smartdashboard; -import static edu.wpi.first.units.Units.Meters; +import static org.wpilib.units.Units.Meters; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.networktables.NTSendable; -import edu.wpi.first.networktables.NTSendableBuilder; -import edu.wpi.first.networktables.NetworkTable; -import edu.wpi.first.units.measure.Distance; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.networktables.NTSendable; +import org.wpilib.networktables.NTSendableBuilder; +import org.wpilib.networktables.NetworkTable; +import org.wpilib.units.measure.Distance; +import org.wpilib.util.sendable.SendableRegistry; import java.util.ArrayList; import java.util.List; diff --git a/wpilibj/src/main/java/org/wpilib/smartdashboard/FieldObject2d.java b/wpilibj/src/main/java/org/wpilib/smartdashboard/FieldObject2d.java index d508afed2c..a7b39902a5 100644 --- a/wpilibj/src/main/java/org/wpilib/smartdashboard/FieldObject2d.java +++ b/wpilibj/src/main/java/org/wpilib/smartdashboard/FieldObject2d.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.wpilibj.smartdashboard; +package org.wpilib.smartdashboard; -import static edu.wpi.first.units.Units.Meters; +import static org.wpilib.units.Units.Meters; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.trajectory.Trajectory; -import edu.wpi.first.networktables.DoubleArrayEntry; -import edu.wpi.first.units.measure.Distance; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.trajectory.Trajectory; +import org.wpilib.networktables.DoubleArrayEntry; +import org.wpilib.units.measure.Distance; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/wpilibj/src/main/java/org/wpilib/smartdashboard/ListenerExecutor.java b/wpilibj/src/main/java/org/wpilib/smartdashboard/ListenerExecutor.java index 9d0efa24f2..2d07029549 100644 --- a/wpilibj/src/main/java/org/wpilib/smartdashboard/ListenerExecutor.java +++ b/wpilibj/src/main/java/org/wpilib/smartdashboard/ListenerExecutor.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj.smartdashboard; +package org.wpilib.smartdashboard; import java.util.ArrayList; import java.util.Collection; import java.util.concurrent.Executor; /** - * An executor for running listener tasks posted by {@link edu.wpi.first.wpilibj.Sendable} listeners + * An executor for running listener tasks posted by {@link org.wpilib.Sendable} listeners * synchronously from the main application thread. */ class ListenerExecutor implements Executor { diff --git a/wpilibj/src/main/java/org/wpilib/smartdashboard/Mechanism2d.java b/wpilibj/src/main/java/org/wpilib/smartdashboard/Mechanism2d.java index d368d35b1e..69c49be595 100644 --- a/wpilibj/src/main/java/org/wpilib/smartdashboard/Mechanism2d.java +++ b/wpilibj/src/main/java/org/wpilib/smartdashboard/Mechanism2d.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj.smartdashboard; +package org.wpilib.smartdashboard; -import edu.wpi.first.networktables.DoubleArrayPublisher; -import edu.wpi.first.networktables.NTSendable; -import edu.wpi.first.networktables.NTSendableBuilder; -import edu.wpi.first.networktables.NetworkTable; -import edu.wpi.first.networktables.StringPublisher; -import edu.wpi.first.wpilibj.util.Color8Bit; +import org.wpilib.networktables.DoubleArrayPublisher; +import org.wpilib.networktables.NTSendable; +import org.wpilib.networktables.NTSendableBuilder; +import org.wpilib.networktables.NetworkTable; +import org.wpilib.networktables.StringPublisher; +import org.wpilib.util.Color8Bit; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; diff --git a/wpilibj/src/main/java/org/wpilib/smartdashboard/MechanismLigament2d.java b/wpilibj/src/main/java/org/wpilib/smartdashboard/MechanismLigament2d.java index 7d8671faa1..9f68668f38 100644 --- a/wpilibj/src/main/java/org/wpilib/smartdashboard/MechanismLigament2d.java +++ b/wpilibj/src/main/java/org/wpilib/smartdashboard/MechanismLigament2d.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.smartdashboard; +package org.wpilib.smartdashboard; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.networktables.DoubleEntry; -import edu.wpi.first.networktables.NetworkTable; -import edu.wpi.first.networktables.StringEntry; -import edu.wpi.first.networktables.StringPublisher; -import edu.wpi.first.networktables.StringTopic; -import edu.wpi.first.wpilibj.util.Color8Bit; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.networktables.DoubleEntry; +import org.wpilib.networktables.NetworkTable; +import org.wpilib.networktables.StringEntry; +import org.wpilib.networktables.StringPublisher; +import org.wpilib.networktables.StringTopic; +import org.wpilib.util.Color8Bit; /** * Ligament node on a Mechanism2d. A ligament can have its length changed (like an elevator) or diff --git a/wpilibj/src/main/java/org/wpilib/smartdashboard/MechanismObject2d.java b/wpilibj/src/main/java/org/wpilib/smartdashboard/MechanismObject2d.java index 3dbcf5c11c..f656fafef0 100644 --- a/wpilibj/src/main/java/org/wpilib/smartdashboard/MechanismObject2d.java +++ b/wpilibj/src/main/java/org/wpilib/smartdashboard/MechanismObject2d.java @@ -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. -package edu.wpi.first.wpilibj.smartdashboard; +package org.wpilib.smartdashboard; -import edu.wpi.first.networktables.NetworkTable; +import org.wpilib.networktables.NetworkTable; import java.util.HashMap; import java.util.Map; diff --git a/wpilibj/src/main/java/org/wpilib/smartdashboard/MechanismRoot2d.java b/wpilibj/src/main/java/org/wpilib/smartdashboard/MechanismRoot2d.java index 5339cf4bbc..2109c226a0 100644 --- a/wpilibj/src/main/java/org/wpilib/smartdashboard/MechanismRoot2d.java +++ b/wpilibj/src/main/java/org/wpilib/smartdashboard/MechanismRoot2d.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.smartdashboard; +package org.wpilib.smartdashboard; -import edu.wpi.first.networktables.DoublePublisher; -import edu.wpi.first.networktables.NetworkTable; +import org.wpilib.networktables.DoublePublisher; +import org.wpilib.networktables.NetworkTable; /** * Root Mechanism2d node. diff --git a/wpilibj/src/main/java/org/wpilib/smartdashboard/SendableBuilderImpl.java b/wpilibj/src/main/java/org/wpilib/smartdashboard/SendableBuilderImpl.java index 8246c352a7..ddf4284baa 100644 --- a/wpilibj/src/main/java/org/wpilib/smartdashboard/SendableBuilderImpl.java +++ b/wpilibj/src/main/java/org/wpilib/smartdashboard/SendableBuilderImpl.java @@ -2,51 +2,51 @@ // 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 edu.wpi.first.wpilibj.smartdashboard; +package org.wpilib.smartdashboard; -import edu.wpi.first.networktables.BooleanArrayPublisher; -import edu.wpi.first.networktables.BooleanArraySubscriber; -import edu.wpi.first.networktables.BooleanArrayTopic; -import edu.wpi.first.networktables.BooleanPublisher; -import edu.wpi.first.networktables.BooleanSubscriber; -import edu.wpi.first.networktables.BooleanTopic; -import edu.wpi.first.networktables.DoubleArrayPublisher; -import edu.wpi.first.networktables.DoubleArraySubscriber; -import edu.wpi.first.networktables.DoubleArrayTopic; -import edu.wpi.first.networktables.DoublePublisher; -import edu.wpi.first.networktables.DoubleSubscriber; -import edu.wpi.first.networktables.DoubleTopic; -import edu.wpi.first.networktables.FloatArrayPublisher; -import edu.wpi.first.networktables.FloatArraySubscriber; -import edu.wpi.first.networktables.FloatArrayTopic; -import edu.wpi.first.networktables.FloatPublisher; -import edu.wpi.first.networktables.FloatSubscriber; -import edu.wpi.first.networktables.FloatTopic; -import edu.wpi.first.networktables.IntegerArrayPublisher; -import edu.wpi.first.networktables.IntegerArraySubscriber; -import edu.wpi.first.networktables.IntegerArrayTopic; -import edu.wpi.first.networktables.IntegerPublisher; -import edu.wpi.first.networktables.IntegerSubscriber; -import edu.wpi.first.networktables.IntegerTopic; -import edu.wpi.first.networktables.NTSendableBuilder; -import edu.wpi.first.networktables.NetworkTable; -import edu.wpi.first.networktables.PubSubOption; -import edu.wpi.first.networktables.Publisher; -import edu.wpi.first.networktables.RawPublisher; -import edu.wpi.first.networktables.RawSubscriber; -import edu.wpi.first.networktables.RawTopic; -import edu.wpi.first.networktables.StringArrayPublisher; -import edu.wpi.first.networktables.StringArraySubscriber; -import edu.wpi.first.networktables.StringArrayTopic; -import edu.wpi.first.networktables.StringPublisher; -import edu.wpi.first.networktables.StringSubscriber; -import edu.wpi.first.networktables.StringTopic; -import edu.wpi.first.networktables.Subscriber; -import edu.wpi.first.networktables.Topic; -import edu.wpi.first.util.function.BooleanConsumer; -import edu.wpi.first.util.function.FloatConsumer; -import edu.wpi.first.util.function.FloatSupplier; -import edu.wpi.first.wpilibj.RobotController; +import org.wpilib.networktables.BooleanArrayPublisher; +import org.wpilib.networktables.BooleanArraySubscriber; +import org.wpilib.networktables.BooleanArrayTopic; +import org.wpilib.networktables.BooleanPublisher; +import org.wpilib.networktables.BooleanSubscriber; +import org.wpilib.networktables.BooleanTopic; +import org.wpilib.networktables.DoubleArrayPublisher; +import org.wpilib.networktables.DoubleArraySubscriber; +import org.wpilib.networktables.DoubleArrayTopic; +import org.wpilib.networktables.DoublePublisher; +import org.wpilib.networktables.DoubleSubscriber; +import org.wpilib.networktables.DoubleTopic; +import org.wpilib.networktables.FloatArrayPublisher; +import org.wpilib.networktables.FloatArraySubscriber; +import org.wpilib.networktables.FloatArrayTopic; +import org.wpilib.networktables.FloatPublisher; +import org.wpilib.networktables.FloatSubscriber; +import org.wpilib.networktables.FloatTopic; +import org.wpilib.networktables.IntegerArrayPublisher; +import org.wpilib.networktables.IntegerArraySubscriber; +import org.wpilib.networktables.IntegerArrayTopic; +import org.wpilib.networktables.IntegerPublisher; +import org.wpilib.networktables.IntegerSubscriber; +import org.wpilib.networktables.IntegerTopic; +import org.wpilib.networktables.NTSendableBuilder; +import org.wpilib.networktables.NetworkTable; +import org.wpilib.networktables.PubSubOption; +import org.wpilib.networktables.Publisher; +import org.wpilib.networktables.RawPublisher; +import org.wpilib.networktables.RawSubscriber; +import org.wpilib.networktables.RawTopic; +import org.wpilib.networktables.StringArrayPublisher; +import org.wpilib.networktables.StringArraySubscriber; +import org.wpilib.networktables.StringArrayTopic; +import org.wpilib.networktables.StringPublisher; +import org.wpilib.networktables.StringSubscriber; +import org.wpilib.networktables.StringTopic; +import org.wpilib.networktables.Subscriber; +import org.wpilib.networktables.Topic; +import org.wpilib.util.function.BooleanConsumer; +import org.wpilib.util.function.FloatConsumer; +import org.wpilib.util.function.FloatSupplier; +import org.wpilib.system.RobotController; import java.util.ArrayList; import java.util.List; import java.util.function.BooleanSupplier; diff --git a/wpilibj/src/main/java/org/wpilib/smartdashboard/SendableChooser.java b/wpilibj/src/main/java/org/wpilib/smartdashboard/SendableChooser.java index e905ebc635..899a11e8e9 100644 --- a/wpilibj/src/main/java/org/wpilib/smartdashboard/SendableChooser.java +++ b/wpilibj/src/main/java/org/wpilib/smartdashboard/SendableChooser.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.smartdashboard; +package org.wpilib.smartdashboard; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; import java.util.LinkedHashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; diff --git a/wpilibj/src/main/java/org/wpilib/smartdashboard/SmartDashboard.java b/wpilibj/src/main/java/org/wpilib/smartdashboard/SmartDashboard.java index 4e8a3fad7b..3e3338b483 100644 --- a/wpilibj/src/main/java/org/wpilib/smartdashboard/SmartDashboard.java +++ b/wpilibj/src/main/java/org/wpilib/smartdashboard/SmartDashboard.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj.smartdashboard; +package org.wpilib.smartdashboard; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.networktables.NetworkTable; -import edu.wpi.first.networktables.NetworkTableEntry; -import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.networktables.NetworkTable; +import org.wpilib.networktables.NetworkTableEntry; +import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableRegistry; import java.util.HashMap; import java.util.Map; import java.util.Set; diff --git a/wpilibj/src/main/java/org/wpilib/sysid/SysIdRoutineLog.java b/wpilibj/src/main/java/org/wpilib/sysid/SysIdRoutineLog.java index f80332a26b..a7c53fbd7a 100644 --- a/wpilibj/src/main/java/org/wpilib/sysid/SysIdRoutineLog.java +++ b/wpilibj/src/main/java/org/wpilib/sysid/SysIdRoutineLog.java @@ -2,27 +2,27 @@ // 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 edu.wpi.first.wpilibj.sysid; +package org.wpilib.sysid; -import static edu.wpi.first.units.Units.Amps; -import static edu.wpi.first.units.Units.Meters; -import static edu.wpi.first.units.Units.MetersPerSecond; -import static edu.wpi.first.units.Units.Rotations; -import static edu.wpi.first.units.Units.RotationsPerSecond; -import static edu.wpi.first.units.Units.Second; -import static edu.wpi.first.units.Units.Volts; +import static org.wpilib.units.Units.Amps; +import static org.wpilib.units.Units.Meters; +import static org.wpilib.units.Units.MetersPerSecond; +import static org.wpilib.units.Units.Rotations; +import static org.wpilib.units.Units.RotationsPerSecond; +import static org.wpilib.units.Units.Second; +import static org.wpilib.units.Units.Volts; -import edu.wpi.first.datalog.DoubleLogEntry; -import edu.wpi.first.datalog.StringLogEntry; -import edu.wpi.first.units.measure.Angle; -import edu.wpi.first.units.measure.AngularAcceleration; -import edu.wpi.first.units.measure.AngularVelocity; -import edu.wpi.first.units.measure.Current; -import edu.wpi.first.units.measure.Distance; -import edu.wpi.first.units.measure.LinearAcceleration; -import edu.wpi.first.units.measure.LinearVelocity; -import edu.wpi.first.units.measure.Voltage; -import edu.wpi.first.wpilibj.DataLogManager; +import org.wpilib.datalog.DoubleLogEntry; +import org.wpilib.datalog.StringLogEntry; +import org.wpilib.units.measure.Angle; +import org.wpilib.units.measure.AngularAcceleration; +import org.wpilib.units.measure.AngularVelocity; +import org.wpilib.units.measure.Current; +import org.wpilib.units.measure.Distance; +import org.wpilib.units.measure.LinearAcceleration; +import org.wpilib.units.measure.LinearVelocity; +import org.wpilib.units.measure.Voltage; +import org.wpilib.system.DataLogManager; import java.util.HashMap; import java.util.Map; diff --git a/wpilibj/src/main/java/org/wpilib/system/DataLogManager.java b/wpilibj/src/main/java/org/wpilib/system/DataLogManager.java index 03e059dada..c6d844661c 100644 --- a/wpilibj/src/main/java/org/wpilib/system/DataLogManager.java +++ b/wpilibj/src/main/java/org/wpilib/system/DataLogManager.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.system; -import edu.wpi.first.datalog.DataLog; -import edu.wpi.first.datalog.DataLogBackgroundWriter; -import edu.wpi.first.datalog.FileLogger; -import edu.wpi.first.datalog.IntegerLogEntry; -import edu.wpi.first.datalog.StringLogEntry; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.util.WPIUtilJNI; -import edu.wpi.first.util.concurrent.Event; +import org.wpilib.datalog.DataLog; +import org.wpilib.datalog.DataLogBackgroundWriter; +import org.wpilib.datalog.FileLogger; +import org.wpilib.datalog.IntegerLogEntry; +import org.wpilib.datalog.StringLogEntry; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.util.WPIUtilJNI; +import org.wpilib.util.concurrent.Event; import java.io.File; import java.io.IOException; import java.nio.file.Files; diff --git a/wpilibj/src/main/java/org/wpilib/system/Filesystem.java b/wpilibj/src/main/java/org/wpilib/system/Filesystem.java index 205d2f6ce8..f413d3764c 100644 --- a/wpilibj/src/main/java/org/wpilib/system/Filesystem.java +++ b/wpilibj/src/main/java/org/wpilib/system/Filesystem.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 edu.wpi.first.wpilibj; +package org.wpilib.system; import java.io.File; diff --git a/wpilibj/src/main/java/org/wpilib/system/Notifier.java b/wpilibj/src/main/java/org/wpilib/system/Notifier.java index 663611d3f2..54e147b56d 100644 --- a/wpilibj/src/main/java/org/wpilib/system/Notifier.java +++ b/wpilibj/src/main/java/org/wpilib/system/Notifier.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.system; -import static edu.wpi.first.units.Units.Seconds; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.units.Units.Seconds; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.hal.NotifierJNI; -import edu.wpi.first.units.measure.Frequency; -import edu.wpi.first.units.measure.Time; +import org.wpilib.hardware.hal.NotifierJNI; +import org.wpilib.units.measure.Frequency; +import org.wpilib.units.measure.Time; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantLock; diff --git a/wpilibj/src/main/java/org/wpilib/system/Resource.java b/wpilibj/src/main/java/org/wpilib/system/Resource.java index ba97ca4d70..10d8c6d6b4 100644 --- a/wpilibj/src/main/java/org/wpilib/system/Resource.java +++ b/wpilibj/src/main/java/org/wpilib/system/Resource.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.system; -import edu.wpi.first.hal.util.AllocationException; -import edu.wpi.first.hal.util.CheckedAllocationException; +import org.wpilib.hardware.hal.util.AllocationException; +import org.wpilib.hardware.hal.util.CheckedAllocationException; /** * Track resources in the program. The Resource class is a convenient way of keeping track of diff --git a/wpilibj/src/main/java/org/wpilib/system/RobotController.java b/wpilibj/src/main/java/org/wpilib/system/RobotController.java index 78905d21d7..c51036dee2 100644 --- a/wpilibj/src/main/java/org/wpilib/system/RobotController.java +++ b/wpilibj/src/main/java/org/wpilib/system/RobotController.java @@ -2,22 +2,22 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.system; -import static edu.wpi.first.units.Units.Amps; -import static edu.wpi.first.units.Units.Celsius; -import static edu.wpi.first.units.Units.Microseconds; -import static edu.wpi.first.units.Units.Volts; +import static org.wpilib.units.Units.Amps; +import static org.wpilib.units.Units.Celsius; +import static org.wpilib.units.Units.Microseconds; +import static org.wpilib.units.Units.Volts; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.HALUtil; -import edu.wpi.first.hal.PowerJNI; -import edu.wpi.first.hal.can.CANJNI; -import edu.wpi.first.hal.can.CANStatus; -import edu.wpi.first.units.measure.Current; -import edu.wpi.first.units.measure.Temperature; -import edu.wpi.first.units.measure.Time; -import edu.wpi.first.units.measure.Voltage; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.hal.HALUtil; +import org.wpilib.hardware.hal.PowerJNI; +import org.wpilib.hardware.hal.can.CANJNI; +import org.wpilib.hardware.hal.can.CANStatus; +import org.wpilib.units.measure.Current; +import org.wpilib.units.measure.Temperature; +import org.wpilib.units.measure.Time; +import org.wpilib.units.measure.Voltage; import java.util.function.LongSupplier; /** Contains functions for roboRIO functionality. */ diff --git a/wpilibj/src/main/java/org/wpilib/system/RuntimeType.java b/wpilibj/src/main/java/org/wpilib/system/RuntimeType.java index d10b54247f..02fe797aee 100644 --- a/wpilibj/src/main/java/org/wpilib/system/RuntimeType.java +++ b/wpilibj/src/main/java/org/wpilib/system/RuntimeType.java @@ -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. -package edu.wpi.first.wpilibj; +package org.wpilib.system; -import edu.wpi.first.hal.HALUtil; +import org.wpilib.hardware.hal.HALUtil; /** Runtime type. */ public enum RuntimeType { diff --git a/wpilibj/src/main/java/org/wpilib/system/SensorUtil.java b/wpilibj/src/main/java/org/wpilib/system/SensorUtil.java index 1e3df9fa1d..48ac140149 100644 --- a/wpilibj/src/main/java/org/wpilib/system/SensorUtil.java +++ b/wpilibj/src/main/java/org/wpilib/system/SensorUtil.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.system; -import edu.wpi.first.hal.AnalogJNI; -import edu.wpi.first.hal.ConstantsJNI; -import edu.wpi.first.hal.DIOJNI; -import edu.wpi.first.hal.PWMJNI; -import edu.wpi.first.hal.PortsJNI; +import org.wpilib.hardware.hal.AnalogJNI; +import org.wpilib.hardware.hal.ConstantsJNI; +import org.wpilib.hardware.hal.DIOJNI; +import org.wpilib.hardware.hal.PWMJNI; +import org.wpilib.hardware.hal.PortsJNI; /** * Stores most recent status information as well as containing utility functions for checking diff --git a/wpilibj/src/main/java/org/wpilib/system/SystemServer.java b/wpilibj/src/main/java/org/wpilib/system/SystemServer.java index aa47afdf15..7b811393c1 100644 --- a/wpilibj/src/main/java/org/wpilib/system/SystemServer.java +++ b/wpilibj/src/main/java/org/wpilib/system/SystemServer.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.system; -import edu.wpi.first.hal.SystemServerJNI; -import edu.wpi.first.networktables.NetworkTableInstance; +import org.wpilib.hardware.hal.SystemServerJNI; +import org.wpilib.networktables.NetworkTableInstance; /** Class to get system server NT instance. */ public final class SystemServer { diff --git a/wpilibj/src/main/java/org/wpilib/system/Threads.java b/wpilibj/src/main/java/org/wpilib/system/Threads.java index 5ff0540dbf..cad90e7d8b 100644 --- a/wpilibj/src/main/java/org/wpilib/system/Threads.java +++ b/wpilibj/src/main/java/org/wpilib/system/Threads.java @@ -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. -package edu.wpi.first.wpilibj; +package org.wpilib.system; -import edu.wpi.first.hal.ThreadsJNI; +import org.wpilib.hardware.hal.ThreadsJNI; /** Thread utility functions. */ public final class Threads { diff --git a/wpilibj/src/main/java/org/wpilib/system/Timer.java b/wpilibj/src/main/java/org/wpilib/system/Timer.java index af55a43208..d583347dfd 100644 --- a/wpilibj/src/main/java/org/wpilib/system/Timer.java +++ b/wpilibj/src/main/java/org/wpilib/system/Timer.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.system; -import static edu.wpi.first.units.Units.Seconds; +import static org.wpilib.units.Units.Seconds; -import edu.wpi.first.units.measure.Time; +import org.wpilib.units.measure.Time; /** * A timer class. diff --git a/wpilibj/src/main/java/org/wpilib/system/Tracer.java b/wpilibj/src/main/java/org/wpilib/system/Tracer.java index 15ca7fff81..234d85104f 100644 --- a/wpilibj/src/main/java/org/wpilib/system/Tracer.java +++ b/wpilibj/src/main/java/org/wpilib/system/Tracer.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 edu.wpi.first.wpilibj; +package org.wpilib.system; import java.util.HashMap; import java.util.Map; diff --git a/wpilibj/src/main/java/org/wpilib/system/Watchdog.java b/wpilibj/src/main/java/org/wpilib/system/Watchdog.java index 00b9085331..568c4e3452 100644 --- a/wpilibj/src/main/java/org/wpilib/system/Watchdog.java +++ b/wpilibj/src/main/java/org/wpilib/system/Watchdog.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.system; -import static edu.wpi.first.units.Units.Seconds; +import static org.wpilib.units.Units.Seconds; -import edu.wpi.first.hal.NotifierJNI; -import edu.wpi.first.units.measure.Time; +import org.wpilib.hardware.hal.NotifierJNI; +import org.wpilib.units.measure.Time; import java.io.Closeable; import java.util.PriorityQueue; import java.util.concurrent.locks.ReentrantLock; diff --git a/wpilibj/src/main/java/org/wpilib/util/Alert.java b/wpilibj/src/main/java/org/wpilib/util/Alert.java index ae791573e4..f38a478da6 100644 --- a/wpilibj/src/main/java/org/wpilib/util/Alert.java +++ b/wpilibj/src/main/java/org/wpilib/util/Alert.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.util; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.smartdashboard.SmartDashboard; import java.util.Comparator; import java.util.EnumMap; import java.util.HashMap; @@ -17,7 +17,7 @@ import java.util.TreeSet; /** * Persistent alert to be sent via NetworkTables. Alerts are tagged with a type of {@code kError}, * {@code kWarning}, or {@code kInfo} to denote urgency. See {@link - * edu.wpi.first.wpilibj.Alert.AlertType AlertType} for suggested usage of each type. Alerts can be + * org.wpilib.util.Alert.AlertType AlertType} for suggested usage of each type. Alerts can be * displayed on supported dashboards, and are shown in a priority order based on type and recency of * activation, with newly activated alerts first. * diff --git a/wpilibj/src/main/java/org/wpilib/util/Color.java b/wpilibj/src/main/java/org/wpilib/util/Color.java index 36d570b886..5eeefbc0c8 100644 --- a/wpilibj/src/main/java/org/wpilib/util/Color.java +++ b/wpilibj/src/main/java/org/wpilib/util/Color.java @@ -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. -package edu.wpi.first.wpilibj.util; +package org.wpilib.util; -import edu.wpi.first.math.MathUtil; +import org.wpilib.math.util.MathUtil; import java.util.Objects; /** diff --git a/wpilibj/src/main/java/org/wpilib/util/Color8Bit.java b/wpilibj/src/main/java/org/wpilib/util/Color8Bit.java index 7f70def3e0..d33ca81f34 100644 --- a/wpilibj/src/main/java/org/wpilib/util/Color8Bit.java +++ b/wpilibj/src/main/java/org/wpilib/util/Color8Bit.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 edu.wpi.first.wpilibj.util; +package org.wpilib.util; import java.util.Objects; diff --git a/wpilibj/src/main/java/org/wpilib/util/Preferences.java b/wpilibj/src/main/java/org/wpilib/util/Preferences.java index 3e3889e747..367924ac4c 100644 --- a/wpilibj/src/main/java/org/wpilib/util/Preferences.java +++ b/wpilibj/src/main/java/org/wpilib/util/Preferences.java @@ -2,20 +2,20 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.util; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.networktables.MultiSubscriber; -import edu.wpi.first.networktables.NetworkTable; -import edu.wpi.first.networktables.NetworkTableEntry; -import edu.wpi.first.networktables.NetworkTableEvent; -import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.networktables.NetworkTableListener; -import edu.wpi.first.networktables.StringPublisher; -import edu.wpi.first.networktables.StringTopic; -import edu.wpi.first.networktables.Topic; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.networktables.MultiSubscriber; +import org.wpilib.networktables.NetworkTable; +import org.wpilib.networktables.NetworkTableEntry; +import org.wpilib.networktables.NetworkTableEvent; +import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.networktables.NetworkTableListener; +import org.wpilib.networktables.StringPublisher; +import org.wpilib.networktables.StringTopic; +import org.wpilib.networktables.Topic; import java.util.Collection; import java.util.EnumSet; diff --git a/wpilibj/src/test/java/edu/wpi/first/math/util/ColorTest.java b/wpilibj/src/test/java/edu/wpi/first/math/util/ColorTest.java index 668531427d..da6b3139a3 100644 --- a/wpilibj/src/test/java/edu/wpi/first/math/util/ColorTest.java +++ b/wpilibj/src/test/java/edu/wpi/first/math/util/ColorTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.util; +package org.wpilib.math.util; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.params.provider.Arguments.arguments; -import edu.wpi.first.wpilibj.util.Color; +import org.wpilib.util.Color; import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/wpilibj/src/test/java/org/wpilib/MockHardwareExtension.java b/wpilibj/src/test/java/org/wpilib/MockHardwareExtension.java index e70f182a3b..14fb576e7a 100644 --- a/wpilibj/src/test/java/org/wpilib/MockHardwareExtension.java +++ b/wpilibj/src/test/java/org/wpilib/MockHardwareExtension.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.simulation.DriverStationSim; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.simulation.DriverStationSim; import org.junit.jupiter.api.extension.BeforeAllCallback; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ExtensionContext.Namespace; diff --git a/wpilibj/src/test/java/org/wpilib/UtilityClassTest.java b/wpilibj/src/test/java/org/wpilib/UtilityClassTest.java index 0501f6d8b0..9bb7c5f321 100644 --- a/wpilibj/src/test/java/org/wpilib/UtilityClassTest.java +++ b/wpilibj/src/test/java/org/wpilib/UtilityClassTest.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 edu.wpi.first.wpilibj; +package org.wpilib; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -24,7 +24,7 @@ import org.junit.jupiter.api.TestFactory; // // org.junit.jupiter.api.extension.ParameterResolutionException: No ParameterResolver registered // for parameter [java.lang.Class arg0] in constructor [protected -// edu.wpi.first.wpilibj.UtilityClassTest(java.lang.Class)]. +// org.wpilib.UtilityClassTest(java.lang.Class)]. @SuppressWarnings("PMD.AbstractClassWithoutAbstractMethod") public abstract class UtilityClassTest { private final Class m_clazz; diff --git a/wpilibj/src/test/java/org/wpilib/can/CANStatusTest.java b/wpilibj/src/test/java/org/wpilib/can/CANStatusTest.java index 0d4efa6138..3eccb09481 100644 --- a/wpilibj/src/test/java/org/wpilib/can/CANStatusTest.java +++ b/wpilibj/src/test/java/org/wpilib/can/CANStatusTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.can; +package org.wpilib.can; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.can.CANJNI; -import edu.wpi.first.hal.can.CANStatus; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.hal.can.CANJNI; +import org.wpilib.hardware.hal.can.CANStatus; import org.junit.jupiter.api.Test; class CANStatusTest { diff --git a/wpilibj/src/test/java/org/wpilib/drive/DifferentialDriveTest.java b/wpilibj/src/test/java/org/wpilib/drive/DifferentialDriveTest.java index 0546a4ce89..38f51d00d0 100644 --- a/wpilibj/src/test/java/org/wpilib/drive/DifferentialDriveTest.java +++ b/wpilibj/src/test/java/org/wpilib/drive/DifferentialDriveTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.drive; +package org.wpilib.drive; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.wpilibj.motorcontrol.MockPWMMotorController; +import org.wpilib.hardware.motor.MockPWMMotorController; import org.junit.jupiter.api.Test; @SuppressWarnings("resource") diff --git a/wpilibj/src/test/java/org/wpilib/drive/MecanumDriveTest.java b/wpilibj/src/test/java/org/wpilib/drive/MecanumDriveTest.java index 8236693446..525f9c02b8 100644 --- a/wpilibj/src/test/java/org/wpilib/drive/MecanumDriveTest.java +++ b/wpilibj/src/test/java/org/wpilib/drive/MecanumDriveTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.drive; +package org.wpilib.drive; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.wpilibj.motorcontrol.MockPWMMotorController; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.hardware.motor.MockPWMMotorController; import org.junit.jupiter.api.Test; @SuppressWarnings("resource") diff --git a/wpilibj/src/test/java/org/wpilib/driverstation/DriverStationTest.java b/wpilibj/src/test/java/org/wpilib/driverstation/DriverStationTest.java index c60ece5e8a..8684fcdc0c 100644 --- a/wpilibj/src/test/java/org/wpilib/driverstation/DriverStationTest.java +++ b/wpilibj/src/test/java/org/wpilib/driverstation/DriverStationTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.driverstation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.params.provider.Arguments.arguments; -import edu.wpi.first.wpilibj.simulation.DriverStationSim; +import org.wpilib.simulation.DriverStationSim; import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/wpilibj/src/test/java/org/wpilib/driverstation/GenericHIDTest.java b/wpilibj/src/test/java/org/wpilib/driverstation/GenericHIDTest.java index c22037668d..f4b561325f 100644 --- a/wpilibj/src/test/java/org/wpilib/driverstation/GenericHIDTest.java +++ b/wpilibj/src/test/java/org/wpilib/driverstation/GenericHIDTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.driverstation; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.wpilibj.GenericHID.RumbleType; -import edu.wpi.first.wpilibj.simulation.GenericHIDSim; +import org.wpilib.driverstation.GenericHID.RumbleType; +import org.wpilib.simulation.GenericHIDSim; import org.junit.jupiter.api.Test; class GenericHIDTest { diff --git a/wpilibj/src/test/java/org/wpilib/driverstation/JoystickTest.java b/wpilibj/src/test/java/org/wpilib/driverstation/JoystickTest.java index bc79d0d351..be3fdde308 100644 --- a/wpilibj/src/test/java/org/wpilib/driverstation/JoystickTest.java +++ b/wpilibj/src/test/java/org/wpilib/driverstation/JoystickTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.driverstation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.simulation.JoystickSim; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.simulation.JoystickSim; import org.junit.jupiter.api.Test; class JoystickTest { diff --git a/wpilibj/src/test/java/org/wpilib/driverstation/PS4ControllerTest.java b/wpilibj/src/test/java/org/wpilib/driverstation/PS4ControllerTest.java index 31277a3ba2..05ab1c1d3c 100644 --- a/wpilibj/src/test/java/org/wpilib/driverstation/PS4ControllerTest.java +++ b/wpilibj/src/test/java/org/wpilib/driverstation/PS4ControllerTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.driverstation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.simulation.PS4ControllerSim; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.simulation.PS4ControllerSim; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import org.junit.jupiter.params.ParameterizedTest; diff --git a/wpilibj/src/test/java/org/wpilib/driverstation/PS5ControllerTest.java b/wpilibj/src/test/java/org/wpilib/driverstation/PS5ControllerTest.java index cb24fbf74e..3df2715edc 100644 --- a/wpilibj/src/test/java/org/wpilib/driverstation/PS5ControllerTest.java +++ b/wpilibj/src/test/java/org/wpilib/driverstation/PS5ControllerTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.driverstation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.simulation.PS5ControllerSim; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.simulation.PS5ControllerSim; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import org.junit.jupiter.params.ParameterizedTest; diff --git a/wpilibj/src/test/java/org/wpilib/driverstation/XboxControllerTest.java b/wpilibj/src/test/java/org/wpilib/driverstation/XboxControllerTest.java index b724bf4e63..1129e11848 100644 --- a/wpilibj/src/test/java/org/wpilib/driverstation/XboxControllerTest.java +++ b/wpilibj/src/test/java/org/wpilib/driverstation/XboxControllerTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.driverstation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.simulation.XboxControllerSim; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.simulation.XboxControllerSim; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import org.junit.jupiter.params.ParameterizedTest; diff --git a/wpilibj/src/test/java/org/wpilib/event/BooleanEventTest.java b/wpilibj/src/test/java/org/wpilib/event/BooleanEventTest.java index 834a0ef3f2..65b1ab0ef0 100644 --- a/wpilibj/src/test/java/org/wpilib/event/BooleanEventTest.java +++ b/wpilibj/src/test/java/org/wpilib/event/BooleanEventTest.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 edu.wpi.first.wpilibj.event; +package org.wpilib.event; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/wpilibj/src/test/java/org/wpilib/event/EventLoopTest.java b/wpilibj/src/test/java/org/wpilib/event/EventLoopTest.java index 644c18e15e..6dd6618a34 100644 --- a/wpilibj/src/test/java/org/wpilib/event/EventLoopTest.java +++ b/wpilibj/src/test/java/org/wpilib/event/EventLoopTest.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 edu.wpi.first.wpilibj.event; +package org.wpilib.event; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/wpilibj/src/test/java/org/wpilib/event/NetworkBooleanEventTest.java b/wpilibj/src/test/java/org/wpilib/event/NetworkBooleanEventTest.java index 045e05a2f3..f176ccea0e 100644 --- a/wpilibj/src/test/java/org/wpilib/event/NetworkBooleanEventTest.java +++ b/wpilibj/src/test/java/org/wpilib/event/NetworkBooleanEventTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.event; +package org.wpilib.event; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.networktables.NetworkTableInstance; +import org.wpilib.networktables.NetworkTableInstance; import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/wpilibj/src/test/java/org/wpilib/hal/JNITest.java b/wpilibj/src/test/java/org/wpilib/hal/JNITest.java index 083e82c602..cd86b3722e 100644 --- a/wpilibj/src/test/java/org/wpilib/hal/JNITest.java +++ b/wpilibj/src/test/java/org/wpilib/hal/JNITest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.hal; +package org.wpilib.hal; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.HALUtil; -import edu.wpi.first.networktables.NetworkTablesJNI; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.hal.HALUtil; +import org.wpilib.networktables.NetworkTablesJNI; import org.junit.jupiter.api.Test; class JNITest { diff --git a/wpilibj/src/test/java/org/wpilib/hal/MatchInfoDataTest.java b/wpilibj/src/test/java/org/wpilib/hal/MatchInfoDataTest.java index d5e464f309..538eb423ff 100644 --- a/wpilibj/src/test/java/org/wpilib/hal/MatchInfoDataTest.java +++ b/wpilibj/src/test/java/org/wpilib/hal/MatchInfoDataTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.wpilibj.hal; +package org.wpilib.hal; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.hal.DriverStationJNI; -import edu.wpi.first.hal.MatchInfoData; -import edu.wpi.first.hal.simulation.DriverStationDataJNI; -import edu.wpi.first.wpilibj.DriverStation.MatchType; -import edu.wpi.first.wpilibj.simulation.DriverStationSim; +import org.wpilib.hardware.hal.DriverStationJNI; +import org.wpilib.hardware.hal.MatchInfoData; +import org.wpilib.hardware.hal.simulation.DriverStationDataJNI; +import org.wpilib.driverstation.DriverStation.MatchType; +import org.wpilib.simulation.DriverStationSim; import org.junit.jupiter.api.Test; class MatchInfoDataTest { diff --git a/wpilibj/src/test/java/org/wpilib/hardware/discrete/DigitalOutputTest.java b/wpilibj/src/test/java/org/wpilib/hardware/discrete/DigitalOutputTest.java index 027af16d59..e02a60af96 100644 --- a/wpilibj/src/test/java/org/wpilib/hardware/discrete/DigitalOutputTest.java +++ b/wpilibj/src/test/java/org/wpilib/hardware/discrete/DigitalOutputTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.hardware.discrete; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.simulation.DIOSim; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.simulation.DIOSim; import org.junit.jupiter.api.Test; class DigitalOutputTest { diff --git a/wpilibj/src/test/java/org/wpilib/hardware/led/AddressableLEDBufferTest.java b/wpilibj/src/test/java/org/wpilib/hardware/led/AddressableLEDBufferTest.java index e8ca5a5965..212096f756 100644 --- a/wpilibj/src/test/java/org/wpilib/hardware/led/AddressableLEDBufferTest.java +++ b/wpilibj/src/test/java/org/wpilib/hardware/led/AddressableLEDBufferTest.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.hardware.led; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.params.provider.Arguments.arguments; -import edu.wpi.first.wpilibj.util.Color; -import edu.wpi.first.wpilibj.util.Color8Bit; +import org.wpilib.util.Color; +import org.wpilib.util.Color8Bit; import java.util.stream.Stream; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/wpilibj/src/test/java/org/wpilib/hardware/led/AddressableLEDBufferViewTest.java b/wpilibj/src/test/java/org/wpilib/hardware/led/AddressableLEDBufferViewTest.java index 9ec78fdc6f..117b7eaa69 100644 --- a/wpilibj/src/test/java/org/wpilib/hardware/led/AddressableLEDBufferViewTest.java +++ b/wpilibj/src/test/java/org/wpilib/hardware/led/AddressableLEDBufferViewTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.hardware.led; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.wpilibj.util.Color; +import org.wpilib.util.Color; import org.junit.jupiter.api.Test; class AddressableLEDBufferViewTest { diff --git a/wpilibj/src/test/java/org/wpilib/hardware/led/LEDPatternTest.java b/wpilibj/src/test/java/org/wpilib/hardware/led/LEDPatternTest.java index a3c7084913..e1da19afd1 100644 --- a/wpilibj/src/test/java/org/wpilib/hardware/led/LEDPatternTest.java +++ b/wpilibj/src/test/java/org/wpilib/hardware/led/LEDPatternTest.java @@ -2,33 +2,33 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.hardware.led; -import static edu.wpi.first.units.Units.Centimeters; -import static edu.wpi.first.units.Units.Meters; -import static edu.wpi.first.units.Units.MetersPerSecond; -import static edu.wpi.first.units.Units.Microsecond; -import static edu.wpi.first.units.Units.Microseconds; -import static edu.wpi.first.units.Units.Percent; -import static edu.wpi.first.units.Units.Seconds; -import static edu.wpi.first.units.Units.Value; -import static edu.wpi.first.wpilibj.LEDPattern.GradientType.kContinuous; -import static edu.wpi.first.wpilibj.LEDPattern.GradientType.kDiscontinuous; -import static edu.wpi.first.wpilibj.util.Color.kBlack; -import static edu.wpi.first.wpilibj.util.Color.kBlue; -import static edu.wpi.first.wpilibj.util.Color.kGreen; -import static edu.wpi.first.wpilibj.util.Color.kLime; -import static edu.wpi.first.wpilibj.util.Color.kMagenta; -import static edu.wpi.first.wpilibj.util.Color.kMidnightBlue; -import static edu.wpi.first.wpilibj.util.Color.kPurple; -import static edu.wpi.first.wpilibj.util.Color.kRed; -import static edu.wpi.first.wpilibj.util.Color.kWhite; -import static edu.wpi.first.wpilibj.util.Color.kYellow; +import static org.wpilib.units.Units.Centimeters; +import static org.wpilib.units.Units.Meters; +import static org.wpilib.units.Units.MetersPerSecond; +import static org.wpilib.units.Units.Microsecond; +import static org.wpilib.units.Units.Microseconds; +import static org.wpilib.units.Units.Percent; +import static org.wpilib.units.Units.Seconds; +import static org.wpilib.units.Units.Value; +import static org.wpilib.hardware.led.LEDPattern.GradientType.kContinuous; +import static org.wpilib.hardware.led.LEDPattern.GradientType.kDiscontinuous; +import static org.wpilib.util.Color.kBlack; +import static org.wpilib.util.Color.kBlue; +import static org.wpilib.util.Color.kGreen; +import static org.wpilib.util.Color.kLime; +import static org.wpilib.util.Color.kMagenta; +import static org.wpilib.util.Color.kMidnightBlue; +import static org.wpilib.util.Color.kPurple; +import static org.wpilib.util.Color.kRed; +import static org.wpilib.util.Color.kWhite; +import static org.wpilib.util.Color.kYellow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; -import edu.wpi.first.wpilibj.util.Color; -import edu.wpi.first.wpilibj.util.Color8Bit; +import org.wpilib.util.Color; +import org.wpilib.util.Color8Bit; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; diff --git a/wpilibj/src/test/java/org/wpilib/hardware/motor/MockMotorController.java b/wpilibj/src/test/java/org/wpilib/hardware/motor/MockMotorController.java index 4ac3dc8f56..6b485ee940 100644 --- a/wpilibj/src/test/java/org/wpilib/hardware/motor/MockMotorController.java +++ b/wpilibj/src/test/java/org/wpilib/hardware/motor/MockMotorController.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 edu.wpi.first.wpilibj.motorcontrol; +package org.wpilib.hardware.motor; @SuppressWarnings("removal") public class MockMotorController implements MotorController { diff --git a/wpilibj/src/test/java/org/wpilib/hardware/motor/MockPWMMotorController.java b/wpilibj/src/test/java/org/wpilib/hardware/motor/MockPWMMotorController.java index bf2c287f69..4e2c65e0ae 100644 --- a/wpilibj/src/test/java/org/wpilib/hardware/motor/MockPWMMotorController.java +++ b/wpilibj/src/test/java/org/wpilib/hardware/motor/MockPWMMotorController.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 edu.wpi.first.wpilibj.motorcontrol; +package org.wpilib.hardware.motor; public class MockPWMMotorController { private double m_speed; diff --git a/wpilibj/src/test/java/org/wpilib/hardware/motor/MotorControllerGroupTest.java b/wpilibj/src/test/java/org/wpilib/hardware/motor/MotorControllerGroupTest.java index a8f71f6b6a..a9bf69be18 100644 --- a/wpilibj/src/test/java/org/wpilib/hardware/motor/MotorControllerGroupTest.java +++ b/wpilibj/src/test/java/org/wpilib/hardware/motor/MotorControllerGroupTest.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 edu.wpi.first.wpilibj.motorcontrol; +package org.wpilib.hardware.motor; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/wpilibj/src/test/java/org/wpilib/hardware/pneumatic/DoubleSolenoidTestCTRE.java b/wpilibj/src/test/java/org/wpilib/hardware/pneumatic/DoubleSolenoidTestCTRE.java index 4a1e4ba6d4..d0af33c23d 100644 --- a/wpilibj/src/test/java/org/wpilib/hardware/pneumatic/DoubleSolenoidTestCTRE.java +++ b/wpilibj/src/test/java/org/wpilib/hardware/pneumatic/DoubleSolenoidTestCTRE.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.hardware.pneumatic; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import edu.wpi.first.hal.util.AllocationException; +import org.wpilib.hardware.hal.util.AllocationException; import org.junit.jupiter.api.Test; class DoubleSolenoidTestCTRE { diff --git a/wpilibj/src/test/java/org/wpilib/hardware/pneumatic/DoubleSolenoidTestREV.java b/wpilibj/src/test/java/org/wpilib/hardware/pneumatic/DoubleSolenoidTestREV.java index c8480e3c6b..3385391c89 100644 --- a/wpilibj/src/test/java/org/wpilib/hardware/pneumatic/DoubleSolenoidTestREV.java +++ b/wpilibj/src/test/java/org/wpilib/hardware/pneumatic/DoubleSolenoidTestREV.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.hardware.pneumatic; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import edu.wpi.first.hal.util.AllocationException; +import org.wpilib.hardware.hal.util.AllocationException; import org.junit.jupiter.api.Test; class DoubleSolenoidTestREV { diff --git a/wpilibj/src/test/java/org/wpilib/hardware/pneumatic/SolenoidTestCTRE.java b/wpilibj/src/test/java/org/wpilib/hardware/pneumatic/SolenoidTestCTRE.java index 8c712a5fb2..d236aaa37b 100644 --- a/wpilibj/src/test/java/org/wpilib/hardware/pneumatic/SolenoidTestCTRE.java +++ b/wpilibj/src/test/java/org/wpilib/hardware/pneumatic/SolenoidTestCTRE.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.hardware.pneumatic; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.util.AllocationException; +import org.wpilib.hardware.hal.util.AllocationException; import org.junit.jupiter.api.Test; class SolenoidTestCTRE { diff --git a/wpilibj/src/test/java/org/wpilib/hardware/pneumatic/SolenoidTestREV.java b/wpilibj/src/test/java/org/wpilib/hardware/pneumatic/SolenoidTestREV.java index b0d80ad3f7..21d155851e 100644 --- a/wpilibj/src/test/java/org/wpilib/hardware/pneumatic/SolenoidTestREV.java +++ b/wpilibj/src/test/java/org/wpilib/hardware/pneumatic/SolenoidTestREV.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.hardware.pneumatic; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.util.AllocationException; +import org.wpilib.hardware.hal.util.AllocationException; import org.junit.jupiter.api.Test; class SolenoidTestREV { diff --git a/wpilibj/src/test/java/org/wpilib/hardware/power/PowerDistributionTest.java b/wpilibj/src/test/java/org/wpilib/hardware/power/PowerDistributionTest.java index 86866c9630..7ccc086e44 100644 --- a/wpilibj/src/test/java/org/wpilib/hardware/power/PowerDistributionTest.java +++ b/wpilibj/src/test/java/org/wpilib/hardware/power/PowerDistributionTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.hardware.power; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.PowerDistribution.ModuleType; -import edu.wpi.first.wpilibj.simulation.PDPSim; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.power.PowerDistribution.ModuleType; +import org.wpilib.simulation.PDPSim; import org.junit.jupiter.api.Test; class PowerDistributionTest { diff --git a/wpilibj/src/test/java/org/wpilib/hardware/range/SharpIRTest.java b/wpilibj/src/test/java/org/wpilib/hardware/range/SharpIRTest.java index 4049dc805a..e7b145c422 100644 --- a/wpilibj/src/test/java/org/wpilib/hardware/range/SharpIRTest.java +++ b/wpilibj/src/test/java/org/wpilib/hardware/range/SharpIRTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.hardware.range; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.wpilibj.simulation.SharpIRSim; +import org.wpilib.simulation.SharpIRSim; import org.junit.jupiter.api.Test; class SharpIRTest { diff --git a/wpilibj/src/test/java/org/wpilib/hardware/rotation/AnalogPotentiometerTest.java b/wpilibj/src/test/java/org/wpilib/hardware/rotation/AnalogPotentiometerTest.java index 29eebfc025..d28de281b9 100644 --- a/wpilibj/src/test/java/org/wpilib/hardware/rotation/AnalogPotentiometerTest.java +++ b/wpilibj/src/test/java/org/wpilib/hardware/rotation/AnalogPotentiometerTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.hardware.rotation; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.simulation.AnalogInputSim; -import edu.wpi.first.wpilibj.simulation.RoboRioSim; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.simulation.AnalogInputSim; +import org.wpilib.simulation.RoboRioSim; import org.junit.jupiter.api.Test; class AnalogPotentiometerTest { diff --git a/wpilibj/src/test/java/org/wpilib/opmode/TimedRobotTest.java b/wpilibj/src/test/java/org/wpilib/opmode/TimedRobotTest.java index d92383d63c..89df8bd036 100644 --- a/wpilibj/src/test/java/org/wpilib/opmode/TimedRobotTest.java +++ b/wpilibj/src/test/java/org/wpilib/opmode/TimedRobotTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.opmode; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.wpilibj.simulation.DriverStationSim; -import edu.wpi.first.wpilibj.simulation.SimHooks; +import org.wpilib.simulation.DriverStationSim; +import org.wpilib.simulation.SimHooks; import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/wpilibj/src/test/java/org/wpilib/opmode/TimesliceRobotTest.java b/wpilibj/src/test/java/org/wpilib/opmode/TimesliceRobotTest.java index 5cff0d0dc9..e86bfdea11 100644 --- a/wpilibj/src/test/java/org/wpilib/opmode/TimesliceRobotTest.java +++ b/wpilibj/src/test/java/org/wpilib/opmode/TimesliceRobotTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.opmode; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import edu.wpi.first.wpilibj.simulation.DriverStationSim; -import edu.wpi.first.wpilibj.simulation.SimHooks; +import org.wpilib.simulation.DriverStationSim; +import org.wpilib.simulation.SimHooks; import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/wpilibj/src/test/java/org/wpilib/simulation/ADXL345SimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/ADXL345SimTest.java index cda2650717..ced857d00a 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/ADXL345SimTest.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/ADXL345SimTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.ADXL345_I2C; -import edu.wpi.first.wpilibj.I2C; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.accelerometer.ADXL345_I2C; +import org.wpilib.hardware.bus.I2C; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; diff --git a/wpilibj/src/test/java/org/wpilib/simulation/AddressableLEDSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/AddressableLEDSimTest.java index d8fcc4c729..a92e30c724 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/AddressableLEDSimTest.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/AddressableLEDSimTest.java @@ -2,18 +2,18 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.AddressableLED; -import edu.wpi.first.wpilibj.AddressableLEDBuffer; -import edu.wpi.first.wpilibj.simulation.testutils.BooleanCallback; -import edu.wpi.first.wpilibj.simulation.testutils.BufferCallback; -import edu.wpi.first.wpilibj.simulation.testutils.IntCallback; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.led.AddressableLED; +import org.wpilib.hardware.led.AddressableLEDBuffer; +import org.wpilib.simulation.testutils.BooleanCallback; +import org.wpilib.simulation.testutils.BufferCallback; +import org.wpilib.simulation.testutils.IntCallback; import java.util.Arrays; import org.junit.jupiter.api.Test; diff --git a/wpilibj/src/test/java/org/wpilib/simulation/AnalogEncoderSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/AnalogEncoderSimTest.java index ea5edaafcf..f429fbd79d 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/AnalogEncoderSimTest.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/AnalogEncoderSimTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.wpilibj.AnalogEncoder; -import edu.wpi.first.wpilibj.AnalogInput; +import org.wpilib.hardware.rotation.AnalogEncoder; +import org.wpilib.hardware.discrete.AnalogInput; import org.junit.jupiter.api.Test; class AnalogEncoderSimTest { diff --git a/wpilibj/src/test/java/org/wpilib/simulation/AnalogInputSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/AnalogInputSimTest.java index f87cf82756..e4e22d18d5 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/AnalogInputSimTest.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/AnalogInputSimTest.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.AnalogInput; -import edu.wpi.first.wpilibj.simulation.testutils.BooleanCallback; -import edu.wpi.first.wpilibj.simulation.testutils.DoubleCallback; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.discrete.AnalogInput; +import org.wpilib.simulation.testutils.BooleanCallback; +import org.wpilib.simulation.testutils.DoubleCallback; import org.junit.jupiter.api.Test; class AnalogInputSimTest { diff --git a/wpilibj/src/test/java/org/wpilib/simulation/CTREPCMSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/CTREPCMSimTest.java index f58f7c741a..6739e07720 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/CTREPCMSimTest.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/CTREPCMSimTest.java @@ -2,20 +2,20 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.CompressorConfigType; -import edu.wpi.first.wpilibj.DoubleSolenoid; -import edu.wpi.first.wpilibj.PneumaticsControlModule; -import edu.wpi.first.wpilibj.PneumaticsModuleType; -import edu.wpi.first.wpilibj.simulation.testutils.BooleanCallback; -import edu.wpi.first.wpilibj.simulation.testutils.DoubleCallback; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.pneumatic.CompressorConfigType; +import org.wpilib.hardware.pneumatic.DoubleSolenoid; +import org.wpilib.hardware.pneumatic.PneumaticsControlModule; +import org.wpilib.hardware.pneumatic.PneumaticsModuleType; +import org.wpilib.simulation.testutils.BooleanCallback; +import org.wpilib.simulation.testutils.DoubleCallback; import org.junit.jupiter.api.Test; class CTREPCMSimTest { diff --git a/wpilibj/src/test/java/org/wpilib/simulation/DCMotorSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/DCMotorSimTest.java index d7f141eb56..5c5d754401 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/DCMotorSimTest.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/DCMotorSimTest.java @@ -2,19 +2,19 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.controller.PIDController; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.system.LinearSystem; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.system.plant.LinearSystemId; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.RobotController; -import edu.wpi.first.wpilibj.motorcontrol.PWMVictorSPX; +import org.wpilib.math.controller.PIDController; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.system.LinearSystem; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.math.system.plant.LinearSystemId; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.system.RobotController; +import org.wpilib.hardware.motor.PWMVictorSPX; import org.junit.jupiter.api.Test; class DCMotorSimTest { diff --git a/wpilibj/src/test/java/org/wpilib/simulation/DIOSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/DIOSimTest.java index dff078cee7..789ec40eb7 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/DIOSimTest.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/DIOSimTest.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.DigitalInput; -import edu.wpi.first.wpilibj.DigitalOutput; -import edu.wpi.first.wpilibj.simulation.testutils.BooleanCallback; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.discrete.DigitalInput; +import org.wpilib.hardware.discrete.DigitalOutput; +import org.wpilib.simulation.testutils.BooleanCallback; import org.junit.jupiter.api.Test; class DIOSimTest { diff --git a/wpilibj/src/test/java/org/wpilib/simulation/DifferentialDrivetrainSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/DifferentialDrivetrainSimTest.java index 9d767dee21..0fae10c7a3 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/DifferentialDrivetrainSimTest.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/DifferentialDrivetrainSimTest.java @@ -2,29 +2,29 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.Vector; -import edu.wpi.first.math.controller.LTVUnicycleController; -import edu.wpi.first.math.controller.LinearPlantInversionFeedforward; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.kinematics.DifferentialDriveKinematics; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N7; -import edu.wpi.first.math.system.NumericalIntegration; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.system.plant.LinearSystemId; -import edu.wpi.first.math.trajectory.TrajectoryConfig; -import edu.wpi.first.math.trajectory.TrajectoryGenerator; -import edu.wpi.first.math.trajectory.constraint.DifferentialDriveKinematicsConstraint; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.linalg.Vector; +import org.wpilib.math.controller.LTVUnicycleController; +import org.wpilib.math.controller.LinearPlantInversionFeedforward; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.kinematics.DifferentialDriveKinematics; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N7; +import org.wpilib.math.system.NumericalIntegration; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.math.system.plant.LinearSystemId; +import org.wpilib.math.trajectory.TrajectoryConfig; +import org.wpilib.math.trajectory.TrajectoryGenerator; +import org.wpilib.math.trajectory.constraint.DifferentialDriveKinematicsConstraint; +import org.wpilib.math.util.Units; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/wpilibj/src/test/java/org/wpilib/simulation/DigitalPWMSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/DigitalPWMSimTest.java index 8a0fc7cad4..772c85fb4d 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/DigitalPWMSimTest.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/DigitalPWMSimTest.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.DigitalOutput; -import edu.wpi.first.wpilibj.simulation.testutils.BooleanCallback; -import edu.wpi.first.wpilibj.simulation.testutils.DoubleCallback; -import edu.wpi.first.wpilibj.simulation.testutils.IntCallback; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.discrete.DigitalOutput; +import org.wpilib.simulation.testutils.BooleanCallback; +import org.wpilib.simulation.testutils.DoubleCallback; +import org.wpilib.simulation.testutils.IntCallback; import org.junit.jupiter.api.Test; class DigitalPWMSimTest { diff --git a/wpilibj/src/test/java/org/wpilib/simulation/DriverStationSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/DriverStationSimTest.java index 54699e0036..185f687392 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/DriverStationSimTest.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/DriverStationSimTest.java @@ -2,18 +2,18 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.AllianceStationID; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.DriverStation; -import edu.wpi.first.wpilibj.simulation.testutils.BooleanCallback; -import edu.wpi.first.wpilibj.simulation.testutils.DoubleCallback; -import edu.wpi.first.wpilibj.simulation.testutils.EnumCallback; +import org.wpilib.hardware.hal.AllianceStationID; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.driverstation.DriverStation; +import org.wpilib.simulation.testutils.BooleanCallback; +import org.wpilib.simulation.testutils.DoubleCallback; +import org.wpilib.simulation.testutils.EnumCallback; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; diff --git a/wpilibj/src/test/java/org/wpilib/simulation/DutyCycleEncoderSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/DutyCycleEncoderSimTest.java index 3ccc05e7ac..b78baccf26 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/DutyCycleEncoderSimTest.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/DutyCycleEncoderSimTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.DutyCycleEncoder; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.rotation.DutyCycleEncoder; import org.junit.jupiter.api.Test; class DutyCycleEncoderSimTest { diff --git a/wpilibj/src/test/java/org/wpilib/simulation/DutyCycleSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/DutyCycleSimTest.java index eda97e9aac..2a69097dd7 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/DutyCycleSimTest.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/DutyCycleSimTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.DutyCycle; -import edu.wpi.first.wpilibj.simulation.testutils.BooleanCallback; -import edu.wpi.first.wpilibj.simulation.testutils.DoubleCallback; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.rotation.DutyCycle; +import org.wpilib.simulation.testutils.BooleanCallback; +import org.wpilib.simulation.testutils.DoubleCallback; import org.junit.jupiter.api.Test; class DutyCycleSimTest { diff --git a/wpilibj/src/test/java/org/wpilib/simulation/ElevatorSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/ElevatorSimTest.java index aa49dcbbc7..80f0002f47 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/ElevatorSimTest.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/ElevatorSimTest.java @@ -2,19 +2,19 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.controller.PIDController; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.system.plant.LinearSystemId; -import edu.wpi.first.math.util.Units; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.RobotController; -import edu.wpi.first.wpilibj.motorcontrol.PWMVictorSPX; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.controller.PIDController; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.math.system.plant.LinearSystemId; +import org.wpilib.math.util.Units; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.system.RobotController; +import org.wpilib.hardware.motor.PWMVictorSPX; import org.junit.jupiter.api.Test; class ElevatorSimTest { diff --git a/wpilibj/src/test/java/org/wpilib/simulation/EncoderSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/EncoderSimTest.java index 7d3fe73b64..37fe2c875c 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/EncoderSimTest.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/EncoderSimTest.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.simulation.testutils.DoubleCallback; -import edu.wpi.first.wpilibj.simulation.testutils.IntCallback; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.simulation.testutils.DoubleCallback; +import org.wpilib.simulation.testutils.IntCallback; import org.junit.jupiter.api.Test; class EncoderSimTest { diff --git a/wpilibj/src/test/java/org/wpilib/simulation/PWMMotorControllerSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/PWMMotorControllerSimTest.java index d76386bcf2..c77effd6a2 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/PWMMotorControllerSimTest.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/PWMMotorControllerSimTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.motorcontrol.Spark; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.motor.Spark; import org.junit.jupiter.api.Test; class PWMMotorControllerSimTest { diff --git a/wpilibj/src/test/java/org/wpilib/simulation/PWMSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/PWMSimTest.java index 8513b94c3f..ec92cb1c48 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/PWMSimTest.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/PWMSimTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.PWM; -import edu.wpi.first.wpilibj.simulation.testutils.BooleanCallback; -import edu.wpi.first.wpilibj.simulation.testutils.IntCallback; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.discrete.PWM; +import org.wpilib.simulation.testutils.BooleanCallback; +import org.wpilib.simulation.testutils.IntCallback; import org.junit.jupiter.api.Test; class PWMSimTest { diff --git a/wpilibj/src/test/java/org/wpilib/simulation/REVPHSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/REVPHSimTest.java index c3c790181b..209c58808a 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/REVPHSimTest.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/REVPHSimTest.java @@ -2,21 +2,21 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.CompressorConfigType; -import edu.wpi.first.wpilibj.DoubleSolenoid; -import edu.wpi.first.wpilibj.PneumaticHub; -import edu.wpi.first.wpilibj.PneumaticsModuleType; -import edu.wpi.first.wpilibj.simulation.testutils.BooleanCallback; -import edu.wpi.first.wpilibj.simulation.testutils.DoubleCallback; -import edu.wpi.first.wpilibj.simulation.testutils.EnumCallback; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.pneumatic.CompressorConfigType; +import org.wpilib.hardware.pneumatic.DoubleSolenoid; +import org.wpilib.hardware.pneumatic.PneumaticHub; +import org.wpilib.hardware.pneumatic.PneumaticsModuleType; +import org.wpilib.simulation.testutils.BooleanCallback; +import org.wpilib.simulation.testutils.DoubleCallback; +import org.wpilib.simulation.testutils.EnumCallback; import org.junit.jupiter.api.Test; class REVPHSimTest { diff --git a/wpilibj/src/test/java/org/wpilib/simulation/RoboRioSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/RoboRioSimTest.java index ecd52faf2a..97cec602da 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/RoboRioSimTest.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/RoboRioSimTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.wpilibj.RobotController; -import edu.wpi.first.wpilibj.simulation.testutils.BooleanCallback; -import edu.wpi.first.wpilibj.simulation.testutils.DoubleCallback; -import edu.wpi.first.wpilibj.simulation.testutils.IntCallback; +import org.wpilib.system.RobotController; +import org.wpilib.simulation.testutils.BooleanCallback; +import org.wpilib.simulation.testutils.DoubleCallback; +import org.wpilib.simulation.testutils.IntCallback; import org.junit.jupiter.api.Test; class RoboRioSimTest { diff --git a/wpilibj/src/test/java/org/wpilib/simulation/SimDeviceSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/SimDeviceSimTest.java index 89b4333e60..9252727a91 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/SimDeviceSimTest.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/SimDeviceSimTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.SimBoolean; -import edu.wpi.first.hal.SimDevice; -import edu.wpi.first.hal.SimDevice.Direction; -import edu.wpi.first.hal.SimValue; +import org.wpilib.hardware.hal.SimBoolean; +import org.wpilib.hardware.hal.SimDevice; +import org.wpilib.hardware.hal.SimDevice.Direction; +import org.wpilib.hardware.hal.SimValue; import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.Test; diff --git a/wpilibj/src/test/java/org/wpilib/simulation/SingleJointedArmSimTest.java b/wpilibj/src/test/java/org/wpilib/simulation/SingleJointedArmSimTest.java index 0842119d7e..a12f058e2d 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/SingleJointedArmSimTest.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/SingleJointedArmSimTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.simulation; +package org.wpilib.simulation; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.math.util.Units; import org.junit.jupiter.api.Test; class SingleJointedArmSimTest { diff --git a/wpilibj/src/test/java/org/wpilib/simulation/testutils/BooleanCallback.java b/wpilibj/src/test/java/org/wpilib/simulation/testutils/BooleanCallback.java index f368d7fb29..756c910234 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/testutils/BooleanCallback.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/testutils/BooleanCallback.java @@ -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. -package edu.wpi.first.wpilibj.simulation.testutils; +package org.wpilib.simulation.testutils; -import edu.wpi.first.hal.HALValue; +import org.wpilib.hardware.hal.HALValue; public class BooleanCallback extends CallbackHelperBase { @Override diff --git a/wpilibj/src/test/java/org/wpilib/simulation/testutils/BufferCallback.java b/wpilibj/src/test/java/org/wpilib/simulation/testutils/BufferCallback.java index fdd8c06f04..7ebc8ec6eb 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/testutils/BufferCallback.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/testutils/BufferCallback.java @@ -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. -package edu.wpi.first.wpilibj.simulation.testutils; +package org.wpilib.simulation.testutils; -import edu.wpi.first.hal.simulation.ConstBufferCallback; +import org.wpilib.hardware.hal.simulation.ConstBufferCallback; import java.util.Arrays; public class BufferCallback implements ConstBufferCallback { diff --git a/wpilibj/src/test/java/org/wpilib/simulation/testutils/CallbackHelperBase.java b/wpilibj/src/test/java/org/wpilib/simulation/testutils/CallbackHelperBase.java index 4fb455e5e9..2951f0d750 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/testutils/CallbackHelperBase.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/testutils/CallbackHelperBase.java @@ -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. -package edu.wpi.first.wpilibj.simulation.testutils; +package org.wpilib.simulation.testutils; -import edu.wpi.first.hal.simulation.NotifyCallback; +import org.wpilib.hardware.hal.simulation.NotifyCallback; public abstract class CallbackHelperBase implements NotifyCallback { protected boolean m_wasTriggered; diff --git a/wpilibj/src/test/java/org/wpilib/simulation/testutils/DoubleCallback.java b/wpilibj/src/test/java/org/wpilib/simulation/testutils/DoubleCallback.java index ccf53f361e..355b2d66f1 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/testutils/DoubleCallback.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/testutils/DoubleCallback.java @@ -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. -package edu.wpi.first.wpilibj.simulation.testutils; +package org.wpilib.simulation.testutils; -import edu.wpi.first.hal.HALValue; +import org.wpilib.hardware.hal.HALValue; public class DoubleCallback extends CallbackHelperBase { @Override diff --git a/wpilibj/src/test/java/org/wpilib/simulation/testutils/EnumCallback.java b/wpilibj/src/test/java/org/wpilib/simulation/testutils/EnumCallback.java index 2c585ac8c6..c40a23672a 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/testutils/EnumCallback.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/testutils/EnumCallback.java @@ -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. -package edu.wpi.first.wpilibj.simulation.testutils; +package org.wpilib.simulation.testutils; -import edu.wpi.first.hal.HALValue; +import org.wpilib.hardware.hal.HALValue; public class EnumCallback extends CallbackHelperBase { @Override diff --git a/wpilibj/src/test/java/org/wpilib/simulation/testutils/IntCallback.java b/wpilibj/src/test/java/org/wpilib/simulation/testutils/IntCallback.java index a1f65c4c47..874f9cac09 100644 --- a/wpilibj/src/test/java/org/wpilib/simulation/testutils/IntCallback.java +++ b/wpilibj/src/test/java/org/wpilib/simulation/testutils/IntCallback.java @@ -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. -package edu.wpi.first.wpilibj.simulation.testutils; +package org.wpilib.simulation.testutils; -import edu.wpi.first.hal.HALValue; +import org.wpilib.hardware.hal.HALValue; public class IntCallback extends CallbackHelperBase { @Override diff --git a/wpilibj/src/test/java/org/wpilib/smartdashboard/Mechanism2dTest.java b/wpilibj/src/test/java/org/wpilib/smartdashboard/Mechanism2dTest.java index c946b0888f..b80694f4d1 100644 --- a/wpilibj/src/test/java/org/wpilib/smartdashboard/Mechanism2dTest.java +++ b/wpilibj/src/test/java/org/wpilib/smartdashboard/Mechanism2dTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.smartdashboard; +package org.wpilib.smartdashboard; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.wpilibj.util.Color8Bit; +import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.util.Color8Bit; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/wpilibj/src/test/java/org/wpilib/smartdashboard/SendableChooserTest.java b/wpilibj/src/test/java/org/wpilib/smartdashboard/SendableChooserTest.java index d8e3f8fbb9..daaf865dd6 100644 --- a/wpilibj/src/test/java/org/wpilib/smartdashboard/SendableChooserTest.java +++ b/wpilibj/src/test/java/org/wpilib/smartdashboard/SendableChooserTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.smartdashboard; +package org.wpilib.smartdashboard; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; -import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.wpilibj.simulation.SendableChooserSim; +import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.simulation.SendableChooserSim; import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/wpilibj/src/test/java/org/wpilib/smartdashboard/SmartDashboardTest.java b/wpilibj/src/test/java/org/wpilib/smartdashboard/SmartDashboardTest.java index 9d2b87c3ef..b37f2c3ddc 100644 --- a/wpilibj/src/test/java/org/wpilib/smartdashboard/SmartDashboardTest.java +++ b/wpilibj/src/test/java/org/wpilib/smartdashboard/SmartDashboardTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj.smartdashboard; +package org.wpilib.smartdashboard; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import edu.wpi.first.networktables.NetworkTable; -import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.wpilibj.UtilityClassTest; +import org.wpilib.networktables.NetworkTable; +import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.UtilityClassTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/wpilibj/src/test/java/org/wpilib/system/NotifierTest.java b/wpilibj/src/test/java/org/wpilib/system/NotifierTest.java index d6e16b634b..db53346ff0 100644 --- a/wpilibj/src/test/java/org/wpilib/system/NotifierTest.java +++ b/wpilibj/src/test/java/org/wpilib/system/NotifierTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj; +package org.wpilib.system; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.simulation.SimHooks; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.simulation.SimHooks; import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/wpilibj/src/test/java/org/wpilib/system/RobotControllerTest.java b/wpilibj/src/test/java/org/wpilib/system/RobotControllerTest.java index cdc27c70e3..4b297ec720 100644 --- a/wpilibj/src/test/java/org/wpilib/system/RobotControllerTest.java +++ b/wpilibj/src/test/java/org/wpilib/system/RobotControllerTest.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 edu.wpi.first.wpilibj; +package org.wpilib.system; @SuppressWarnings("PMD.TestClassWithoutTestCases") class RobotControllerTest extends UtilityClassTest { diff --git a/wpilibj/src/test/java/org/wpilib/system/SensorUtilTest.java b/wpilibj/src/test/java/org/wpilib/system/SensorUtilTest.java index 531a52185d..b02a871643 100644 --- a/wpilibj/src/test/java/org/wpilib/system/SensorUtilTest.java +++ b/wpilibj/src/test/java/org/wpilib/system/SensorUtilTest.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 edu.wpi.first.wpilibj; +package org.wpilib.system; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/wpilibj/src/test/java/org/wpilib/system/TimerTest.java b/wpilibj/src/test/java/org/wpilib/system/TimerTest.java index aa64c6d097..77db9e8191 100644 --- a/wpilibj/src/test/java/org/wpilib/system/TimerTest.java +++ b/wpilibj/src/test/java/org/wpilib/system/TimerTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.system; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.simulation.SimHooks; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.simulation.SimHooks; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/wpilibj/src/test/java/org/wpilib/system/WatchdogTest.java b/wpilibj/src/test/java/org/wpilib/system/WatchdogTest.java index 5e9e122941..deea38d4f4 100644 --- a/wpilibj/src/test/java/org/wpilib/system/WatchdogTest.java +++ b/wpilibj/src/test/java/org/wpilib/system/WatchdogTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.system; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.simulation.SimHooks; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.simulation.SimHooks; import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/wpilibj/src/test/java/org/wpilib/util/AlertTest.java b/wpilibj/src/test/java/org/wpilib/util/AlertTest.java index 39625b4927..53f70199df 100644 --- a/wpilibj/src/test/java/org/wpilib/util/AlertTest.java +++ b/wpilibj/src/test/java/org/wpilib/util/AlertTest.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.wpilibj; +package org.wpilib.util; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.networktables.StringArraySubscriber; -import edu.wpi.first.wpilibj.Alert.AlertType; -import edu.wpi.first.wpilibj.simulation.SimHooks; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; +import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.networktables.StringArraySubscriber; +import org.wpilib.util.Alert.AlertType; +import org.wpilib.simulation.SimHooks; +import org.wpilib.smartdashboard.SmartDashboard; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/wpilibj/src/test/java/org/wpilib/util/Color8BitTest.java b/wpilibj/src/test/java/org/wpilib/util/Color8BitTest.java index 499ecbde80..4429f84fd3 100644 --- a/wpilibj/src/test/java/org/wpilib/util/Color8BitTest.java +++ b/wpilibj/src/test/java/org/wpilib/util/Color8BitTest.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 edu.wpi.first.wpilibj.util; +package org.wpilib.util; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/wpilibj/src/test/java/org/wpilib/util/ColorTest.java b/wpilibj/src/test/java/org/wpilib/util/ColorTest.java index 76901c2f40..5e6a8c5af4 100644 --- a/wpilibj/src/test/java/org/wpilib/util/ColorTest.java +++ b/wpilibj/src/test/java/org/wpilib/util/ColorTest.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 edu.wpi.first.wpilibj.util; +package org.wpilib.util; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/wpilibj/src/test/java/org/wpilib/util/PreferencesTest.java b/wpilibj/src/test/java/org/wpilib/util/PreferencesTest.java index 6375178ce8..231bb8f46c 100644 --- a/wpilibj/src/test/java/org/wpilib/util/PreferencesTest.java +++ b/wpilibj/src/test/java/org/wpilib/util/PreferencesTest.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 edu.wpi.first.wpilibj; +package org.wpilib.util; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -11,9 +11,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD; -import edu.wpi.first.networktables.NetworkTable; -import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.networktables.Topic; +import org.wpilib.networktables.NetworkTable; +import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.networktables.Topic; import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; diff --git a/wpilibj/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/wpilibj/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension index f6d7b988d3..c4262fb18f 100644 --- a/wpilibj/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension +++ b/wpilibj/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension @@ -1 +1 @@ -edu.wpi.first.wpilibj.MockHardwareExtension +org.wpilib.MockHardwareExtension diff --git a/wpilibjExamples/src/main/java/org/wpilib/commands/command2/ReplaceMeCommand.java b/wpilibjExamples/src/main/java/org/wpilib/commands/command2/ReplaceMeCommand.java index 0c309d9f4d..c6842c1ae9 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/commands/command2/ReplaceMeCommand.java +++ b/wpilibjExamples/src/main/java/org/wpilib/commands/command2/ReplaceMeCommand.java @@ -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. -package edu.wpi.first.wpilibj.commands.command2; +package org.wpilib.commands.command2; -import edu.wpi.first.wpilibj2.command.Command; +import org.wpilib.command2.Command; /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */ public class ReplaceMeCommand extends Command { diff --git a/wpilibjExamples/src/main/java/org/wpilib/commands/emptyclass/ReplaceMeEmptyClass.java b/wpilibjExamples/src/main/java/org/wpilib/commands/emptyclass/ReplaceMeEmptyClass.java index 2e8a5fff9c..81520079e7 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/commands/emptyclass/ReplaceMeEmptyClass.java +++ b/wpilibjExamples/src/main/java/org/wpilib/commands/emptyclass/ReplaceMeEmptyClass.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 edu.wpi.first.wpilibj.commands.emptyclass; +package org.wpilib.commands.emptyclass; /** Add your docs here. */ public class ReplaceMeEmptyClass {} diff --git a/wpilibjExamples/src/main/java/org/wpilib/commands/instantcommand/ReplaceMeInstantCommand.java b/wpilibjExamples/src/main/java/org/wpilib/commands/instantcommand/ReplaceMeInstantCommand.java index fe7fe9bb44..ddd880d233 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/commands/instantcommand/ReplaceMeInstantCommand.java +++ b/wpilibjExamples/src/main/java/org/wpilib/commands/instantcommand/ReplaceMeInstantCommand.java @@ -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. -package edu.wpi.first.wpilibj.commands.instantcommand; +package org.wpilib.commands.instantcommand; -import edu.wpi.first.wpilibj2.command.InstantCommand; +import org.wpilib.command2.InstantCommand; // NOTE: Consider using this command inline, rather than writing a subclass. For more // information, see: diff --git a/wpilibjExamples/src/main/java/org/wpilib/commands/parallelcommandgroup/ReplaceMeParallelCommandGroup.java b/wpilibjExamples/src/main/java/org/wpilib/commands/parallelcommandgroup/ReplaceMeParallelCommandGroup.java index ab4d0cc183..3a752b68b2 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/commands/parallelcommandgroup/ReplaceMeParallelCommandGroup.java +++ b/wpilibjExamples/src/main/java/org/wpilib/commands/parallelcommandgroup/ReplaceMeParallelCommandGroup.java @@ -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. -package edu.wpi.first.wpilibj.commands.parallelcommandgroup; +package org.wpilib.commands.parallelcommandgroup; -import edu.wpi.first.wpilibj2.command.ParallelCommandGroup; +import org.wpilib.command2.ParallelCommandGroup; // NOTE: Consider using this command inline, rather than writing a subclass. For more // information, see: diff --git a/wpilibjExamples/src/main/java/org/wpilib/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.java b/wpilibjExamples/src/main/java/org/wpilib/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.java index 95c902dab8..ea15667441 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.java +++ b/wpilibjExamples/src/main/java/org/wpilib/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.commands.paralleldeadlinegroup; +package org.wpilib.commands.paralleldeadlinegroup; -import edu.wpi.first.wpilibj2.command.InstantCommand; -import edu.wpi.first.wpilibj2.command.ParallelDeadlineGroup; +import org.wpilib.command2.InstantCommand; +import org.wpilib.command2.ParallelDeadlineGroup; // NOTE: Consider using this command inline, rather than writing a subclass. For more // information, see: diff --git a/wpilibjExamples/src/main/java/org/wpilib/commands/parallelracegroup/ReplaceMeParallelRaceGroup.java b/wpilibjExamples/src/main/java/org/wpilib/commands/parallelracegroup/ReplaceMeParallelRaceGroup.java index 3de0c7f654..3b2f45f6bf 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/commands/parallelracegroup/ReplaceMeParallelRaceGroup.java +++ b/wpilibjExamples/src/main/java/org/wpilib/commands/parallelracegroup/ReplaceMeParallelRaceGroup.java @@ -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. -package edu.wpi.first.wpilibj.commands.parallelracegroup; +package org.wpilib.commands.parallelracegroup; -import edu.wpi.first.wpilibj2.command.ParallelRaceGroup; +import org.wpilib.command2.ParallelRaceGroup; // NOTE: Consider using this command inline, rather than writing a subclass. For more // information, see: diff --git a/wpilibjExamples/src/main/java/org/wpilib/commands/sequentialcommandgroup/ReplaceMeSequentialCommandGroup.java b/wpilibjExamples/src/main/java/org/wpilib/commands/sequentialcommandgroup/ReplaceMeSequentialCommandGroup.java index ca4488b5ed..68e2527e41 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/commands/sequentialcommandgroup/ReplaceMeSequentialCommandGroup.java +++ b/wpilibjExamples/src/main/java/org/wpilib/commands/sequentialcommandgroup/ReplaceMeSequentialCommandGroup.java @@ -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. -package edu.wpi.first.wpilibj.commands.sequentialcommandgroup; +package org.wpilib.commands.sequentialcommandgroup; -import edu.wpi.first.wpilibj2.command.SequentialCommandGroup; +import org.wpilib.command2.SequentialCommandGroup; // NOTE: Consider using this command inline, rather than writing a subclass. For more // information, see: diff --git a/wpilibjExamples/src/main/java/org/wpilib/commands/subsystem2/ReplaceMeSubsystem.java b/wpilibjExamples/src/main/java/org/wpilib/commands/subsystem2/ReplaceMeSubsystem.java index f72539d712..d44d92ca27 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/commands/subsystem2/ReplaceMeSubsystem.java +++ b/wpilibjExamples/src/main/java/org/wpilib/commands/subsystem2/ReplaceMeSubsystem.java @@ -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. -package edu.wpi.first.wpilibj.commands.subsystem2; +package org.wpilib.commands.subsystem2; -import edu.wpi.first.wpilibj2.command.SubsystemBase; +import org.wpilib.command2.SubsystemBase; public class ReplaceMeSubsystem extends SubsystemBase { /** Creates a new ReplaceMeSubsystem. */ 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 be4ecffa99..447bfbe92a 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/addressableled/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/addressableled/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.addressableled; +package org.wpilib.examples.addressableled; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 1f01f4a590..2db52960a1 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/addressableled/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/addressableled/Robot.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.wpilibj.examples.addressableled; +package org.wpilib.examples.addressableled; -import static edu.wpi.first.units.Units.Meters; -import static edu.wpi.first.units.Units.MetersPerSecond; +import static org.wpilib.units.Units.Meters; +import static org.wpilib.units.Units.MetersPerSecond; -import edu.wpi.first.units.measure.Distance; -import edu.wpi.first.wpilibj.AddressableLED; -import edu.wpi.first.wpilibj.AddressableLEDBuffer; -import edu.wpi.first.wpilibj.LEDPattern; -import edu.wpi.first.wpilibj.TimedRobot; +import org.wpilib.units.measure.Distance; +import org.wpilib.hardware.led.AddressableLED; +import org.wpilib.hardware.led.AddressableLEDBuffer; +import org.wpilib.hardware.led.LEDPattern; +import org.wpilib.opmode.TimedRobot; public class Robot extends TimedRobot { private final AddressableLED m_led; 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 0bb625158b..9b7212fdf3 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/apriltagsvision/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/apriltagsvision/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.apriltagsvision; +package org.wpilib.examples.apriltagsvision; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 fa827d9afe..aca0c7440c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/apriltagsvision/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/apriltagsvision/Robot.java @@ -2,21 +2,21 @@ // 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 edu.wpi.first.wpilibj.examples.apriltagsvision; +package org.wpilib.examples.apriltagsvision; -import edu.wpi.first.apriltag.AprilTagDetection; -import edu.wpi.first.apriltag.AprilTagDetector; -import edu.wpi.first.apriltag.AprilTagPoseEstimator; -import edu.wpi.first.cameraserver.CameraServer; -import edu.wpi.first.cscore.CvSink; -import edu.wpi.first.cscore.CvSource; -import edu.wpi.first.cscore.UsbCamera; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Transform3d; -import edu.wpi.first.networktables.IntegerArrayPublisher; -import edu.wpi.first.networktables.NetworkTable; -import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.wpilibj.TimedRobot; +import org.wpilib.vision.apriltag.AprilTagDetection; +import org.wpilib.vision.apriltag.AprilTagDetector; +import org.wpilib.vision.apriltag.AprilTagPoseEstimator; +import org.wpilib.vision.stream.CameraServer; +import org.wpilib.vision.camera.CvSink; +import org.wpilib.vision.camera.CvSource; +import org.wpilib.vision.camera.UsbCamera; +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 java.util.ArrayList; import org.opencv.core.Mat; import org.opencv.core.Point; 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 b451bc3f4b..fa3edaf586 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrive/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrive/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.arcadedrive; +package org.wpilib.examples.arcadedrive; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 43fca7a0bc..6702ceb533 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrive/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrive/Robot.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.examples.arcadedrive; +package org.wpilib.examples.arcadedrive; -import edu.wpi.first.util.sendable.SendableRegistry; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.drive.DifferentialDrive; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; +import org.wpilib.util.sendable.SendableRegistry; +import org.wpilib.driverstation.Joystick; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.drive.DifferentialDrive; +import org.wpilib.hardware.motor.PWMSparkMax; /** * This is a demo program showing the use of the DifferentialDrive class. Runs the motors with 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 2088c7b04f..547b2be178 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrivexboxcontroller/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrivexboxcontroller/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.arcadedrivexboxcontroller; +package org.wpilib.examples.arcadedrivexboxcontroller; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 f4a99c7fb8..732e88abed 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrivexboxcontroller/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/arcadedrivexboxcontroller/Robot.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.examples.arcadedrivexboxcontroller; +package org.wpilib.examples.arcadedrivexboxcontroller; -import edu.wpi.first.util.sendable.SendableRegistry; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.XboxController; -import edu.wpi.first.wpilibj.drive.DifferentialDrive; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; +import org.wpilib.util.sendable.SendableRegistry; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.driverstation.XboxController; +import org.wpilib.drive.DifferentialDrive; +import org.wpilib.hardware.motor.PWMSparkMax; /** * This is a demo program showing the use of the DifferentialDrive class. Runs the motors with split diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/Constants.java index 68f82858ec..82f88a3060 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/Constants.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/Constants.java @@ -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. -package edu.wpi.first.wpilibj.examples.armsimulation; +package org.wpilib.examples.armsimulation; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.util.Units; public class Constants { public static final int kMotorPort = 0; 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 b980695d33..152acaae60 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.armsimulation; +package org.wpilib.examples.armsimulation; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 761e37b2e1..5afeeb1c30 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.armsimulation; +package org.wpilib.examples.armsimulation; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.examples.armsimulation.subsystems.Arm; +import org.wpilib.driverstation.Joystick; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.examples.armsimulation.subsystems.Arm; /** 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/armsimulation/subsystems/Arm.java b/wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/subsystems/Arm.java index 33613a995b..45d5e5c565 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/subsystems/Arm.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/subsystems/Arm.java @@ -2,26 +2,26 @@ // 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 edu.wpi.first.wpilibj.examples.armsimulation.subsystems; +package org.wpilib.examples.armsimulation.subsystems; -import edu.wpi.first.math.controller.PIDController; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.util.Units; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.Preferences; -import edu.wpi.first.wpilibj.RobotController; -import edu.wpi.first.wpilibj.examples.armsimulation.Constants; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; -import edu.wpi.first.wpilibj.simulation.BatterySim; -import edu.wpi.first.wpilibj.simulation.EncoderSim; -import edu.wpi.first.wpilibj.simulation.RoboRioSim; -import edu.wpi.first.wpilibj.simulation.SingleJointedArmSim; -import edu.wpi.first.wpilibj.smartdashboard.Mechanism2d; -import edu.wpi.first.wpilibj.smartdashboard.MechanismLigament2d; -import edu.wpi.first.wpilibj.smartdashboard.MechanismRoot2d; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; -import edu.wpi.first.wpilibj.util.Color; -import edu.wpi.first.wpilibj.util.Color8Bit; +import org.wpilib.math.controller.PIDController; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.math.util.Units; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.util.Preferences; +import org.wpilib.system.RobotController; +import org.wpilib.examples.armsimulation.Constants; +import org.wpilib.hardware.motor.PWMSparkMax; +import org.wpilib.simulation.BatterySim; +import org.wpilib.simulation.EncoderSim; +import org.wpilib.simulation.RoboRioSim; +import org.wpilib.simulation.SingleJointedArmSim; +import org.wpilib.smartdashboard.Mechanism2d; +import org.wpilib.smartdashboard.MechanismLigament2d; +import org.wpilib.smartdashboard.MechanismRoot2d; +import org.wpilib.smartdashboard.SmartDashboard; +import org.wpilib.util.Color; +import org.wpilib.util.Color8Bit; public class Arm implements AutoCloseable { // The P gain for the PID controller that drives this arm. 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 bafb3afbaa..3b4d0ae59c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/canpdp/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/canpdp/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.canpdp; +package org.wpilib.examples.canpdp; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 fd25d96b07..02f7909c9d 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/canpdp/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/canpdp/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.canpdp; +package org.wpilib.examples.canpdp; -import edu.wpi.first.wpilibj.PowerDistribution; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; +import org.wpilib.hardware.power.PowerDistribution; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.smartdashboard.SmartDashboard; /** * This is a sample program showing how to retrieve information from the Power Distribution Panel diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdrivebot/Drivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdrivebot/Drivetrain.java index bf7662feee..580ae1e569 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdrivebot/Drivetrain.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdrivebot/Drivetrain.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.wpilibj.examples.differentialdrivebot; +package org.wpilib.examples.differentialdrivebot; -import edu.wpi.first.math.controller.PIDController; -import edu.wpi.first.math.controller.SimpleMotorFeedforward; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.math.kinematics.DifferentialDriveKinematics; -import edu.wpi.first.math.kinematics.DifferentialDriveOdometry; -import edu.wpi.first.math.kinematics.DifferentialDriveWheelSpeeds; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.OnboardIMU; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; +import org.wpilib.math.controller.PIDController; +import org.wpilib.math.controller.SimpleMotorFeedforward; +import org.wpilib.math.kinematics.ChassisSpeeds; +import org.wpilib.math.kinematics.DifferentialDriveKinematics; +import org.wpilib.math.kinematics.DifferentialDriveOdometry; +import org.wpilib.math.kinematics.DifferentialDriveWheelSpeeds; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.hardware.imu.OnboardIMU; +import org.wpilib.hardware.motor.PWMSparkMax; /** Represents a differential drive style drivetrain. */ public class Drivetrain { 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 89f8dae9db..f8561fe710 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdrivebot/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdrivebot/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.differentialdrivebot; +package org.wpilib.examples.differentialdrivebot; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 8cd5022cb8..fee605b71d 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdrivebot/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdrivebot/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.differentialdrivebot; +package org.wpilib.examples.differentialdrivebot; -import edu.wpi.first.math.filter.SlewRateLimiter; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.XboxController; +import org.wpilib.math.filter.SlewRateLimiter; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.driverstation.XboxController; public class Robot extends TimedRobot { private final XboxController m_controller = new XboxController(0); diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/Drivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/Drivetrain.java index 9e6d372b04..e24c25978a 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/Drivetrain.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/Drivetrain.java @@ -2,40 +2,40 @@ // 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 edu.wpi.first.wpilibj.examples.differentialdriveposeestimator; +package org.wpilib.examples.differentialdriveposeestimator; -import edu.wpi.first.apriltag.AprilTagFieldLayout; -import edu.wpi.first.apriltag.AprilTagFields; -import edu.wpi.first.math.ComputerVisionUtil; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.controller.PIDController; -import edu.wpi.first.math.controller.SimpleMotorFeedforward; -import edu.wpi.first.math.estimator.DifferentialDrivePoseEstimator; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Quaternion; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Transform3d; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.math.kinematics.DifferentialDriveKinematics; -import edu.wpi.first.math.kinematics.DifferentialDriveWheelSpeeds; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.system.LinearSystem; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.system.plant.LinearSystemId; -import edu.wpi.first.math.util.Units; -import edu.wpi.first.networktables.DoubleArrayEntry; -import edu.wpi.first.networktables.DoubleArrayTopic; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.OnboardIMU; -import edu.wpi.first.wpilibj.RobotController; -import edu.wpi.first.wpilibj.Timer; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; -import edu.wpi.first.wpilibj.simulation.DifferentialDrivetrainSim; -import edu.wpi.first.wpilibj.simulation.EncoderSim; -import edu.wpi.first.wpilibj.smartdashboard.Field2d; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; +import org.wpilib.vision.apriltag.AprilTagFieldLayout; +import org.wpilib.vision.apriltag.AprilTagFields; +import org.wpilib.math.util.ComputerVisionUtil; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.controller.PIDController; +import org.wpilib.math.controller.SimpleMotorFeedforward; +import org.wpilib.math.estimator.DifferentialDrivePoseEstimator; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Quaternion; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Transform3d; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.math.kinematics.ChassisSpeeds; +import org.wpilib.math.kinematics.DifferentialDriveKinematics; +import org.wpilib.math.kinematics.DifferentialDriveWheelSpeeds; +import org.wpilib.math.numbers.N2; +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.networktables.DoubleArrayEntry; +import org.wpilib.networktables.DoubleArrayTopic; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.hardware.imu.OnboardIMU; +import org.wpilib.system.RobotController; +import org.wpilib.system.Timer; +import org.wpilib.hardware.motor.PWMSparkMax; +import org.wpilib.simulation.DifferentialDrivetrainSim; +import org.wpilib.simulation.EncoderSim; +import org.wpilib.smartdashboard.Field2d; +import org.wpilib.smartdashboard.SmartDashboard; /** Represents a differential drive style drivetrain. */ public class Drivetrain { diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/ExampleGlobalMeasurementSensor.java b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/ExampleGlobalMeasurementSensor.java index 4697bbad84..bd973af11e 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/ExampleGlobalMeasurementSensor.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/ExampleGlobalMeasurementSensor.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.examples.differentialdriveposeestimator; +package org.wpilib.examples.differentialdriveposeestimator; -import edu.wpi.first.math.StateSpaceUtil; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.util.StateSpaceUtil; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.util.Units; /** This dummy class represents a global measurement sensor, such as a computer vision solution. */ public final class ExampleGlobalMeasurementSensor { 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 046c01a72b..bb4442fb7e 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.differentialdriveposeestimator; +package org.wpilib.examples.differentialdriveposeestimator; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 56b13bd04e..6ac8cdd900 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/differentialdriveposeestimator/Robot.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.examples.differentialdriveposeestimator; +package org.wpilib.examples.differentialdriveposeestimator; -import edu.wpi.first.math.filter.SlewRateLimiter; -import edu.wpi.first.networktables.DoubleArrayTopic; -import edu.wpi.first.networktables.NetworkTableInstance; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.XboxController; +import org.wpilib.math.filter.SlewRateLimiter; +import org.wpilib.networktables.DoubleArrayTopic; +import org.wpilib.networktables.NetworkTableInstance; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.driverstation.XboxController; 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 8338aca3c7..89dbca7a43 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/digitalcommunication/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/digitalcommunication/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.digitalcommunication; +package org.wpilib.examples.digitalcommunication; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 7efa441564..2683bc7617 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/digitalcommunication/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/digitalcommunication/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.digitalcommunication; +package org.wpilib.examples.digitalcommunication; -import edu.wpi.first.wpilibj.DigitalOutput; -import edu.wpi.first.wpilibj.DriverStation; -import edu.wpi.first.wpilibj.TimedRobot; +import org.wpilib.hardware.discrete.DigitalOutput; +import org.wpilib.driverstation.DriverStation; +import org.wpilib.opmode.TimedRobot; import java.util.Optional; /** diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/Constants.java index c19622510e..3688f31a36 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/Constants.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/Constants.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.drivedistanceoffboard; +package org.wpilib.examples.drivedistanceoffboard; /** * The Constants class provides a convenient place for teams to hold robot-wide numerical or boolean diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/ExampleSmartMotorController.java b/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/ExampleSmartMotorController.java index 12c51ab441..52490b6588 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/ExampleSmartMotorController.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/ExampleSmartMotorController.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 edu.wpi.first.wpilibj.examples.drivedistanceoffboard; +package org.wpilib.examples.drivedistanceoffboard; /** * A simplified stub class that simulates the API of a common "smart" motor controller. 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 3566c19967..9c51b21f59 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.drivedistanceoffboard; +package org.wpilib.examples.drivedistanceoffboard; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 0525a1d4f6..b21c3b31d6 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.drivedistanceoffboard; +package org.wpilib.examples.drivedistanceoffboard; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.CommandScheduler; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.command2.Command; +import org.wpilib.command2.CommandScheduler; /** * 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/drivedistanceoffboard/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/RobotContainer.java index afdc53174a..08100518c3 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/RobotContainer.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/RobotContainer.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj.examples.drivedistanceoffboard; +package org.wpilib.examples.drivedistanceoffboard; -import edu.wpi.first.wpilibj.XboxController; -import edu.wpi.first.wpilibj.examples.drivedistanceoffboard.Constants.OIConstants; -import edu.wpi.first.wpilibj.examples.drivedistanceoffboard.subsystems.DriveSubsystem; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.Commands; -import edu.wpi.first.wpilibj2.command.button.CommandXboxController; +import org.wpilib.driverstation.XboxController; +import org.wpilib.examples.drivedistanceoffboard.Constants.OIConstants; +import org.wpilib.examples.drivedistanceoffboard.subsystems.DriveSubsystem; +import org.wpilib.command2.Command; +import org.wpilib.command2.Commands; +import org.wpilib.command2.button.CommandXboxController; /** * This class is where the bulk of the robot should be declared. Since Command-based is a @@ -48,9 +48,9 @@ public class RobotContainer { /** * Use this method to define your button->command mappings. Buttons can be created by - * instantiating a {@link edu.wpi.first.wpilibj.GenericHID} or one of its subclasses ({@link - * edu.wpi.first.wpilibj.Joystick} or {@link XboxController}), and then passing it to a {@link - * edu.wpi.first.wpilibj2.command.button.JoystickButton}. + * instantiating a {@link org.wpilib.driverstation.GenericHID} or one of its subclasses ({@link + * org.wpilib.driverstation.Joystick} or {@link XboxController}), and then passing it to a {@link + * org.wpilib.command2.button.JoystickButton}. */ private void configureButtonBindings() { // Drive at half speed when the bumper is held diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/subsystems/DriveSubsystem.java b/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/subsystems/DriveSubsystem.java index 19959a6136..e762c012e2 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/subsystems/DriveSubsystem.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/drivedistanceoffboard/subsystems/DriveSubsystem.java @@ -2,19 +2,19 @@ // 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 edu.wpi.first.wpilibj.examples.drivedistanceoffboard.subsystems; +package org.wpilib.examples.drivedistanceoffboard.subsystems; -import edu.wpi.first.math.controller.SimpleMotorFeedforward; -import edu.wpi.first.math.trajectory.TrapezoidProfile; -import edu.wpi.first.math.trajectory.TrapezoidProfile.State; -import edu.wpi.first.util.sendable.SendableRegistry; -import edu.wpi.first.wpilibj.RobotController; -import edu.wpi.first.wpilibj.Timer; -import edu.wpi.first.wpilibj.drive.DifferentialDrive; -import edu.wpi.first.wpilibj.examples.drivedistanceoffboard.Constants.DriveConstants; -import edu.wpi.first.wpilibj.examples.drivedistanceoffboard.ExampleSmartMotorController; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.SubsystemBase; +import org.wpilib.math.controller.SimpleMotorFeedforward; +import org.wpilib.math.trajectory.TrapezoidProfile; +import org.wpilib.math.trajectory.TrapezoidProfile.State; +import org.wpilib.util.sendable.SendableRegistry; +import org.wpilib.system.RobotController; +import org.wpilib.system.Timer; +import org.wpilib.drive.DifferentialDrive; +import org.wpilib.examples.drivedistanceoffboard.Constants.DriveConstants; +import org.wpilib.examples.drivedistanceoffboard.ExampleSmartMotorController; +import org.wpilib.command2.Command; +import org.wpilib.command2.SubsystemBase; public class DriveSubsystem extends SubsystemBase { // The motors on the left side of the drive. 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 1ba73f5029..be3c133e54 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleencoder/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleencoder/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.dutycycleencoder; +package org.wpilib.examples.dutycycleencoder; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 d9baccc07b..f221ef047d 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleencoder/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleencoder/Robot.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.dutycycleencoder; +package org.wpilib.examples.dutycycleencoder; -import edu.wpi.first.math.MathUtil; -import edu.wpi.first.wpilibj.DutyCycleEncoder; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; +import org.wpilib.math.util.MathUtil; +import org.wpilib.hardware.rotation.DutyCycleEncoder; +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. */ public class Robot extends TimedRobot { 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 4558281a11..128d1e18ad 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleinput/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleinput/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.dutycycleinput; +package org.wpilib.examples.dutycycleinput; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 9a22771477..0eeba79884 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleinput/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/dutycycleinput/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.dutycycleinput; +package org.wpilib.examples.dutycycleinput; -import edu.wpi.first.wpilibj.DutyCycle; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; +import org.wpilib.hardware.rotation.DutyCycle; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.smartdashboard.SmartDashboard; public class Robot extends TimedRobot { private final DutyCycle m_dutyCycle; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialprofile/ExampleSmartMotorController.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialprofile/ExampleSmartMotorController.java index 2b37b96789..3af5692ece 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialprofile/ExampleSmartMotorController.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialprofile/ExampleSmartMotorController.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 edu.wpi.first.wpilibj.examples.elevatorexponentialprofile; +package org.wpilib.examples.elevatorexponentialprofile; /** * A simplified stub class that simulates the API of a common "smart" motor controller. 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 7d89388684..b02bc58e79 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialprofile/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialprofile/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.elevatorexponentialprofile; +package org.wpilib.examples.elevatorexponentialprofile; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 373485923c..810a68070a 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialprofile/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialprofile/Robot.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.elevatorexponentialprofile; +package org.wpilib.examples.elevatorexponentialprofile; -import edu.wpi.first.math.controller.SimpleMotorFeedforward; -import edu.wpi.first.math.trajectory.ExponentialProfile; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.TimedRobot; +import org.wpilib.math.controller.SimpleMotorFeedforward; +import org.wpilib.math.trajectory.ExponentialProfile; +import org.wpilib.driverstation.Joystick; +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/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/Constants.java index d0ec6bf51c..317a64ce21 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/Constants.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/Constants.java @@ -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. -package edu.wpi.first.wpilibj.examples.elevatorexponentialsimulation; +package org.wpilib.examples.elevatorexponentialsimulation; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.util.Units; public class Constants { public static final int kMotorPort = 0; 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 cfd4b9f071..e630d2adc5 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.elevatorexponentialsimulation; +package org.wpilib.examples.elevatorexponentialsimulation; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 ef72be7f90..e3295ce6b0 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.elevatorexponentialsimulation; +package org.wpilib.examples.elevatorexponentialsimulation; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.examples.elevatorexponentialsimulation.subsystems.Elevator; +import org.wpilib.driverstation.Joystick; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.examples.elevatorexponentialsimulation.subsystems.Elevator; /** 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/elevatorexponentialsimulation/subsystems/Elevator.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/subsystems/Elevator.java index 873d4e6ca0..0f8d7ad06d 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/subsystems/Elevator.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/subsystems/Elevator.java @@ -2,26 +2,26 @@ // 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 edu.wpi.first.wpilibj.examples.elevatorexponentialsimulation.subsystems; +package org.wpilib.examples.elevatorexponentialsimulation.subsystems; -import edu.wpi.first.math.controller.ElevatorFeedforward; -import edu.wpi.first.math.controller.PIDController; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.trajectory.ExponentialProfile; -import edu.wpi.first.math.util.Units; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.RobotController; -import edu.wpi.first.wpilibj.examples.elevatorexponentialsimulation.Constants; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; -import edu.wpi.first.wpilibj.simulation.BatterySim; -import edu.wpi.first.wpilibj.simulation.ElevatorSim; -import edu.wpi.first.wpilibj.simulation.EncoderSim; -import edu.wpi.first.wpilibj.simulation.PWMMotorControllerSim; -import edu.wpi.first.wpilibj.simulation.RoboRioSim; -import edu.wpi.first.wpilibj.smartdashboard.Mechanism2d; -import edu.wpi.first.wpilibj.smartdashboard.MechanismLigament2d; -import edu.wpi.first.wpilibj.smartdashboard.MechanismRoot2d; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; +import org.wpilib.math.controller.ElevatorFeedforward; +import org.wpilib.math.controller.PIDController; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.math.trajectory.ExponentialProfile; +import org.wpilib.math.util.Units; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.system.RobotController; +import org.wpilib.examples.elevatorexponentialsimulation.Constants; +import org.wpilib.hardware.motor.PWMSparkMax; +import org.wpilib.simulation.BatterySim; +import org.wpilib.simulation.ElevatorSim; +import org.wpilib.simulation.EncoderSim; +import org.wpilib.simulation.PWMMotorControllerSim; +import org.wpilib.simulation.RoboRioSim; +import org.wpilib.smartdashboard.Mechanism2d; +import org.wpilib.smartdashboard.MechanismLigament2d; +import org.wpilib.smartdashboard.MechanismRoot2d; +import org.wpilib.smartdashboard.SmartDashboard; public class Elevator implements AutoCloseable { // This gearbox represents a gearbox containing 4 Vex 775pro motors. 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 223b40d6a1..9f275d35ac 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorprofiledpid/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorprofiledpid/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.elevatorprofiledpid; +package org.wpilib.examples.elevatorprofiledpid; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 df4b71b6ce..602f700107 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorprofiledpid/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorprofiledpid/Robot.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.elevatorprofiledpid; +package org.wpilib.examples.elevatorprofiledpid; -import edu.wpi.first.math.controller.ElevatorFeedforward; -import edu.wpi.first.math.controller.ProfiledPIDController; -import edu.wpi.first.math.trajectory.TrapezoidProfile; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; +import org.wpilib.math.controller.ElevatorFeedforward; +import org.wpilib.math.controller.ProfiledPIDController; +import org.wpilib.math.trajectory.TrapezoidProfile; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.driverstation.Joystick; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.hardware.motor.PWMSparkMax; public class Robot extends TimedRobot { private static double kDt = 0.02; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/Constants.java index 7fd6332bed..be6448bc4d 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/Constants.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/Constants.java @@ -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. -package edu.wpi.first.wpilibj.examples.elevatorsimulation; +package org.wpilib.examples.elevatorsimulation; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.util.Units; public class Constants { public static final int kMotorPort = 0; 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 ab930d309d..9d93b12dee 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.elevatorsimulation; +package org.wpilib.examples.elevatorsimulation; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 96f36b58df..b9e09a36b5 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.elevatorsimulation; +package org.wpilib.examples.elevatorsimulation; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.examples.elevatorsimulation.subsystems.Elevator; +import org.wpilib.driverstation.Joystick; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.examples.elevatorsimulation.subsystems.Elevator; /** 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/elevatorsimulation/subsystems/Elevator.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/subsystems/Elevator.java index ba23148f20..e661c3941d 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/subsystems/Elevator.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/subsystems/Elevator.java @@ -2,25 +2,25 @@ // 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 edu.wpi.first.wpilibj.examples.elevatorsimulation.subsystems; +package org.wpilib.examples.elevatorsimulation.subsystems; -import edu.wpi.first.math.controller.ElevatorFeedforward; -import edu.wpi.first.math.controller.ProfiledPIDController; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.trajectory.TrapezoidProfile; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.RobotController; -import edu.wpi.first.wpilibj.examples.elevatorsimulation.Constants; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; -import edu.wpi.first.wpilibj.simulation.BatterySim; -import edu.wpi.first.wpilibj.simulation.ElevatorSim; -import edu.wpi.first.wpilibj.simulation.EncoderSim; -import edu.wpi.first.wpilibj.simulation.PWMMotorControllerSim; -import edu.wpi.first.wpilibj.simulation.RoboRioSim; -import edu.wpi.first.wpilibj.smartdashboard.Mechanism2d; -import edu.wpi.first.wpilibj.smartdashboard.MechanismLigament2d; -import edu.wpi.first.wpilibj.smartdashboard.MechanismRoot2d; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; +import org.wpilib.math.controller.ElevatorFeedforward; +import org.wpilib.math.controller.ProfiledPIDController; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.math.trajectory.TrapezoidProfile; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.system.RobotController; +import org.wpilib.examples.elevatorsimulation.Constants; +import org.wpilib.hardware.motor.PWMSparkMax; +import org.wpilib.simulation.BatterySim; +import org.wpilib.simulation.ElevatorSim; +import org.wpilib.simulation.EncoderSim; +import org.wpilib.simulation.PWMMotorControllerSim; +import org.wpilib.simulation.RoboRioSim; +import org.wpilib.smartdashboard.Mechanism2d; +import org.wpilib.smartdashboard.MechanismLigament2d; +import org.wpilib.smartdashboard.MechanismRoot2d; +import org.wpilib.smartdashboard.SmartDashboard; public class Elevator implements AutoCloseable { // This gearbox represents a gearbox containing 4 Vex 775pro motors. diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatortrapezoidprofile/ExampleSmartMotorController.java b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatortrapezoidprofile/ExampleSmartMotorController.java index 6d9ac23743..c46e8397a6 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatortrapezoidprofile/ExampleSmartMotorController.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatortrapezoidprofile/ExampleSmartMotorController.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 edu.wpi.first.wpilibj.examples.elevatortrapezoidprofile; +package org.wpilib.examples.elevatortrapezoidprofile; /** * A simplified stub class that simulates the API of a common "smart" motor controller. 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 5428143430..3d7794593b 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatortrapezoidprofile/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatortrapezoidprofile/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.elevatortrapezoidprofile; +package org.wpilib.examples.elevatortrapezoidprofile; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 2ab9560dcb..bfc4333431 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/elevatortrapezoidprofile/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/elevatortrapezoidprofile/Robot.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.elevatortrapezoidprofile; +package org.wpilib.examples.elevatortrapezoidprofile; -import edu.wpi.first.math.controller.SimpleMotorFeedforward; -import edu.wpi.first.math.trajectory.TrapezoidProfile; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.TimedRobot; +import org.wpilib.math.controller.SimpleMotorFeedforward; +import org.wpilib.math.trajectory.TrapezoidProfile; +import org.wpilib.driverstation.Joystick; +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 4f723cc52c..18e095cb00 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/encoder/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/encoder/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.encoder; +package org.wpilib.examples.encoder; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 68837135b3..6a0a045cb1 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/encoder/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/encoder/Robot.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.encoder; +package org.wpilib.examples.encoder; -import edu.wpi.first.wpilibj.CounterBase; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; +import org.wpilib.hardware.discrete.CounterBase; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.smartdashboard.SmartDashboard; /** * Sample program displaying the value of a quadrature encoder on the SmartDashboard. Quadrature 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 23a49cb2e1..b27ad0a914 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/eventloop/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/eventloop/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.eventloop; +package org.wpilib.examples.eventloop; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 63eceb7370..a51faafe43 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/eventloop/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/eventloop/Robot.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.wpilibj.examples.eventloop; +package org.wpilib.examples.eventloop; -import edu.wpi.first.math.controller.PIDController; -import edu.wpi.first.math.controller.SimpleMotorFeedforward; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.event.BooleanEvent; -import edu.wpi.first.wpilibj.event.EventLoop; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; +import org.wpilib.math.controller.PIDController; +import org.wpilib.math.controller.SimpleMotorFeedforward; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.driverstation.Joystick; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.event.BooleanEvent; +import org.wpilib.event.EventLoop; +import org.wpilib.hardware.motor.PWMSparkMax; 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 d114f8ba57..17aa0eb11c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/flywheelbangbangcontroller/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/flywheelbangbangcontroller/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.flywheelbangbangcontroller; +package org.wpilib.examples.flywheelbangbangcontroller; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 9dae80f329..9d559229fc 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/flywheelbangbangcontroller/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/flywheelbangbangcontroller/Robot.java @@ -2,23 +2,23 @@ // 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 edu.wpi.first.wpilibj.examples.flywheelbangbangcontroller; +package org.wpilib.examples.flywheelbangbangcontroller; -import edu.wpi.first.math.controller.BangBangController; -import edu.wpi.first.math.controller.SimpleMotorFeedforward; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.system.LinearSystem; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.system.plant.LinearSystemId; -import edu.wpi.first.math.util.Units; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.RobotController; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; -import edu.wpi.first.wpilibj.simulation.EncoderSim; -import edu.wpi.first.wpilibj.simulation.FlywheelSim; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; +import org.wpilib.math.controller.BangBangController; +import org.wpilib.math.controller.SimpleMotorFeedforward; +import org.wpilib.math.numbers.N1; +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.hardware.rotation.Encoder; +import org.wpilib.driverstation.Joystick; +import org.wpilib.system.RobotController; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.hardware.motor.PWMSparkMax; +import org.wpilib.simulation.EncoderSim; +import org.wpilib.simulation.FlywheelSim; +import org.wpilib.smartdashboard.SmartDashboard; /** * This is a sample program to demonstrate the use of a BangBangController with a flywheel to 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 dd467ee827..ade2b88127 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/gettingstarted/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/gettingstarted/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.gettingstarted; +package org.wpilib.examples.gettingstarted; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 b31981252b..c9367539fd 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/gettingstarted/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/gettingstarted/Robot.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj.examples.gettingstarted; +package org.wpilib.examples.gettingstarted; -import edu.wpi.first.util.sendable.SendableRegistry; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.Timer; -import edu.wpi.first.wpilibj.XboxController; -import edu.wpi.first.wpilibj.drive.DifferentialDrive; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; +import org.wpilib.util.sendable.SendableRegistry; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.system.Timer; +import org.wpilib.driverstation.XboxController; +import org.wpilib.drive.DifferentialDrive; +import org.wpilib.hardware.motor.PWMSparkMax; /** * 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/gyro/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/gyro/Main.java index e8f2df6f2f..cf5cad7b1a 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/gyro/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/gyro/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.gyro; +package org.wpilib.examples.gyro; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 f68b1abff2..28933ae14d 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/gyro/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/gyro/Robot.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj.examples.gyro; +package org.wpilib.examples.gyro; -import edu.wpi.first.util.sendable.SendableRegistry; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.OnboardIMU; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.drive.DifferentialDrive; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; +import org.wpilib.util.sendable.SendableRegistry; +import org.wpilib.driverstation.Joystick; +import org.wpilib.hardware.imu.OnboardIMU; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.drive.DifferentialDrive; +import org.wpilib.hardware.motor.PWMSparkMax; /** * This is a sample program to demonstrate how to use a gyro sensor to make a robot drive straight. 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 8c952f1f1b..83f8bd5579 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/gyromecanum/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/gyromecanum/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.gyromecanum; +package org.wpilib.examples.gyromecanum; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 120c7f67f0..1eb8f902ba 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/gyromecanum/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/gyromecanum/Robot.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj.examples.gyromecanum; +package org.wpilib.examples.gyromecanum; -import edu.wpi.first.util.sendable.SendableRegistry; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.OnboardIMU; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.drive.MecanumDrive; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; +import org.wpilib.util.sendable.SendableRegistry; +import org.wpilib.driverstation.Joystick; +import org.wpilib.hardware.imu.OnboardIMU; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.drive.MecanumDrive; +import org.wpilib.hardware.motor.PWMSparkMax; /** * This is a sample program that uses mecanum drive with a gyro sensor to maintain rotation vectors diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Constants.java index 68468f6d07..22c2bb67cb 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Constants.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Constants.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.hatchbotinlined; +package org.wpilib.examples.hatchbotinlined; /** * The Constants class provides a convenient place for teams to hold robot-wide numerical or boolean diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Main.java index 114bc1442d..2960407c82 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.hatchbotinlined; +package org.wpilib.examples.hatchbotinlined; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 faaa97ffd4..2f34474d3c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/Robot.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.examples.hatchbotinlined; +package org.wpilib.examples.hatchbotinlined; -import edu.wpi.first.wpilibj.DataLogManager; -import edu.wpi.first.wpilibj.DriverStation; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.CommandScheduler; +import org.wpilib.system.DataLogManager; +import org.wpilib.driverstation.DriverStation; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.command2.Command; +import org.wpilib.command2.CommandScheduler; /** * 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/hatchbotinlined/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/RobotContainer.java index f4454aa2de..6eb1db876e 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/RobotContainer.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/RobotContainer.java @@ -2,18 +2,18 @@ // 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 edu.wpi.first.wpilibj.examples.hatchbotinlined; +package org.wpilib.examples.hatchbotinlined; -import edu.wpi.first.wpilibj.PS4Controller; -import edu.wpi.first.wpilibj.examples.hatchbotinlined.Constants.OIConstants; -import edu.wpi.first.wpilibj.examples.hatchbotinlined.commands.Autos; -import edu.wpi.first.wpilibj.examples.hatchbotinlined.subsystems.DriveSubsystem; -import edu.wpi.first.wpilibj.examples.hatchbotinlined.subsystems.HatchSubsystem; -import edu.wpi.first.wpilibj.smartdashboard.SendableChooser; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.Commands; -import edu.wpi.first.wpilibj2.command.button.CommandPS4Controller; +import org.wpilib.driverstation.PS4Controller; +import org.wpilib.examples.hatchbotinlined.Constants.OIConstants; +import org.wpilib.examples.hatchbotinlined.commands.Autos; +import org.wpilib.examples.hatchbotinlined.subsystems.DriveSubsystem; +import org.wpilib.examples.hatchbotinlined.subsystems.HatchSubsystem; +import org.wpilib.smartdashboard.SendableChooser; +import org.wpilib.smartdashboard.SmartDashboard; +import org.wpilib.command2.Command; +import org.wpilib.command2.Commands; +import org.wpilib.command2.button.CommandPS4Controller; /** * This class is where the bulk of the robot should be declared. Since Command-based is a @@ -71,9 +71,9 @@ public class RobotContainer { /** * Use this method to define your button->command mappings. Buttons can be created by - * instantiating a {@link edu.wpi.first.wpilibj.GenericHID} or one of its subclasses ({@link - * edu.wpi.first.wpilibj.Joystick} or {@link PS4Controller}), and then passing it to a {@link - * edu.wpi.first.wpilibj2.command.button.JoystickButton}. + * instantiating a {@link org.wpilib.driverstation.GenericHID} or one of its subclasses ({@link + * org.wpilib.driverstation.Joystick} or {@link PS4Controller}), and then passing it to a {@link + * org.wpilib.command2.button.JoystickButton}. */ private void configureButtonBindings() { // Grab the hatch when the Circle button is pressed. diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/commands/Autos.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/commands/Autos.java index 8af2735357..a815f6d348 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/commands/Autos.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/commands/Autos.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj.examples.hatchbotinlined.commands; +package org.wpilib.examples.hatchbotinlined.commands; -import edu.wpi.first.wpilibj.examples.hatchbotinlined.Constants.AutoConstants; -import edu.wpi.first.wpilibj.examples.hatchbotinlined.subsystems.DriveSubsystem; -import edu.wpi.first.wpilibj.examples.hatchbotinlined.subsystems.HatchSubsystem; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.Commands; -import edu.wpi.first.wpilibj2.command.FunctionalCommand; +import org.wpilib.examples.hatchbotinlined.Constants.AutoConstants; +import org.wpilib.examples.hatchbotinlined.subsystems.DriveSubsystem; +import org.wpilib.examples.hatchbotinlined.subsystems.HatchSubsystem; +import org.wpilib.command2.Command; +import org.wpilib.command2.Commands; +import org.wpilib.command2.FunctionalCommand; /** Container for auto command factories. */ public final class Autos { diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/subsystems/DriveSubsystem.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/subsystems/DriveSubsystem.java index 8de4a90c29..e7ba51f571 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/subsystems/DriveSubsystem.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/subsystems/DriveSubsystem.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.hatchbotinlined.subsystems; +package org.wpilib.examples.hatchbotinlined.subsystems; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.drive.DifferentialDrive; -import edu.wpi.first.wpilibj.examples.hatchbotinlined.Constants.DriveConstants; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; -import edu.wpi.first.wpilibj2.command.SubsystemBase; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.drive.DifferentialDrive; +import org.wpilib.examples.hatchbotinlined.Constants.DriveConstants; +import org.wpilib.hardware.motor.PWMSparkMax; +import org.wpilib.command2.SubsystemBase; public class DriveSubsystem extends SubsystemBase { // The motors on the left side of the drive. diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/subsystems/HatchSubsystem.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/subsystems/HatchSubsystem.java index b149a60958..17ad5e82ac 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/subsystems/HatchSubsystem.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbotinlined/subsystems/HatchSubsystem.java @@ -2,19 +2,19 @@ // 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 edu.wpi.first.wpilibj.examples.hatchbotinlined.subsystems; +package org.wpilib.examples.hatchbotinlined.subsystems; -import static edu.wpi.first.wpilibj.DoubleSolenoid.Value.kForward; -import static edu.wpi.first.wpilibj.DoubleSolenoid.Value.kReverse; +import static org.wpilib.hardware.pneumatic.DoubleSolenoid.Value.kForward; +import static org.wpilib.hardware.pneumatic.DoubleSolenoid.Value.kReverse; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.wpilibj.DoubleSolenoid; -import edu.wpi.first.wpilibj.PneumaticsModuleType; -import edu.wpi.first.wpilibj.examples.hatchbotinlined.Constants.HatchConstants; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.SubsystemBase; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.hardware.pneumatic.DoubleSolenoid; +import org.wpilib.hardware.pneumatic.PneumaticsModuleType; +import org.wpilib.examples.hatchbotinlined.Constants.HatchConstants; +import org.wpilib.command2.Command; +import org.wpilib.command2.SubsystemBase; -/** A hatch mechanism actuated by a single {@link edu.wpi.first.wpilibj.DoubleSolenoid}. */ +/** A hatch mechanism actuated by a single {@link org.wpilib.hardware.pneumatic.DoubleSolenoid}. */ public class HatchSubsystem extends SubsystemBase { private final DoubleSolenoid m_hatchSolenoid = new DoubleSolenoid( diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Constants.java index 87b06e1965..6b6efa70ed 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Constants.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Constants.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.hatchbottraditional; +package org.wpilib.examples.hatchbottraditional; /** * The Constants class provides a convenient place for teams to hold robot-wide numerical or boolean diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Main.java index 0d084c3bc7..7073de07ad 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.hatchbottraditional; +package org.wpilib.examples.hatchbottraditional; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 720316874b..a071c23cc4 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/Robot.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.examples.hatchbottraditional; +package org.wpilib.examples.hatchbottraditional; -import edu.wpi.first.wpilibj.DataLogManager; -import edu.wpi.first.wpilibj.DriverStation; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.CommandScheduler; +import org.wpilib.system.DataLogManager; +import org.wpilib.driverstation.DriverStation; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.command2.Command; +import org.wpilib.command2.CommandScheduler; /** * 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/hatchbottraditional/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/RobotContainer.java index 24af4abc2f..df06985259 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/RobotContainer.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/RobotContainer.java @@ -2,25 +2,25 @@ // 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 edu.wpi.first.wpilibj.examples.hatchbottraditional; +package org.wpilib.examples.hatchbottraditional; -import static edu.wpi.first.wpilibj.XboxController.Button; +import static org.wpilib.driverstation.XboxController.Button; -import edu.wpi.first.wpilibj.XboxController; -import edu.wpi.first.wpilibj.examples.hatchbottraditional.Constants.AutoConstants; -import edu.wpi.first.wpilibj.examples.hatchbottraditional.Constants.OIConstants; -import edu.wpi.first.wpilibj.examples.hatchbottraditional.commands.ComplexAuto; -import edu.wpi.first.wpilibj.examples.hatchbottraditional.commands.DefaultDrive; -import edu.wpi.first.wpilibj.examples.hatchbottraditional.commands.DriveDistance; -import edu.wpi.first.wpilibj.examples.hatchbottraditional.commands.GrabHatch; -import edu.wpi.first.wpilibj.examples.hatchbottraditional.commands.HalveDriveSpeed; -import edu.wpi.first.wpilibj.examples.hatchbottraditional.commands.ReleaseHatch; -import edu.wpi.first.wpilibj.examples.hatchbottraditional.subsystems.DriveSubsystem; -import edu.wpi.first.wpilibj.examples.hatchbottraditional.subsystems.HatchSubsystem; -import edu.wpi.first.wpilibj.smartdashboard.SendableChooser; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.button.JoystickButton; +import org.wpilib.driverstation.XboxController; +import org.wpilib.examples.hatchbottraditional.Constants.AutoConstants; +import org.wpilib.examples.hatchbottraditional.Constants.OIConstants; +import org.wpilib.examples.hatchbottraditional.commands.ComplexAuto; +import org.wpilib.examples.hatchbottraditional.commands.DefaultDrive; +import org.wpilib.examples.hatchbottraditional.commands.DriveDistance; +import org.wpilib.examples.hatchbottraditional.commands.GrabHatch; +import org.wpilib.examples.hatchbottraditional.commands.HalveDriveSpeed; +import org.wpilib.examples.hatchbottraditional.commands.ReleaseHatch; +import org.wpilib.examples.hatchbottraditional.subsystems.DriveSubsystem; +import org.wpilib.examples.hatchbottraditional.subsystems.HatchSubsystem; +import org.wpilib.smartdashboard.SendableChooser; +import org.wpilib.smartdashboard.SmartDashboard; +import org.wpilib.command2.Command; +import org.wpilib.command2.button.JoystickButton; /** * This class is where the bulk of the robot should be declared. Since Command-based is a @@ -77,9 +77,9 @@ public class RobotContainer { /** * Use this method to define your button->command mappings. Buttons can be created by - * instantiating a {@link edu.wpi.first.wpilibj.GenericHID} or one of its subclasses ({@link - * edu.wpi.first.wpilibj.Joystick} or {@link XboxController}), and then passing it to a {@link - * edu.wpi.first.wpilibj2.command.button.JoystickButton}. + * instantiating a {@link org.wpilib.driverstation.GenericHID} or one of its subclasses ({@link + * org.wpilib.driverstation.Joystick} or {@link XboxController}), and then passing it to a {@link + * org.wpilib.command2.button.JoystickButton}. */ private void configureButtonBindings() { // Grab the hatch when the 'A' button is pressed. diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/ComplexAuto.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/ComplexAuto.java index 736a8d9756..5ce24bd90d 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/ComplexAuto.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/ComplexAuto.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.hatchbottraditional.commands; +package org.wpilib.examples.hatchbottraditional.commands; -import edu.wpi.first.wpilibj.examples.hatchbottraditional.Constants.AutoConstants; -import edu.wpi.first.wpilibj.examples.hatchbottraditional.subsystems.DriveSubsystem; -import edu.wpi.first.wpilibj.examples.hatchbottraditional.subsystems.HatchSubsystem; -import edu.wpi.first.wpilibj2.command.SequentialCommandGroup; +import org.wpilib.examples.hatchbottraditional.Constants.AutoConstants; +import org.wpilib.examples.hatchbottraditional.subsystems.DriveSubsystem; +import org.wpilib.examples.hatchbottraditional.subsystems.HatchSubsystem; +import org.wpilib.command2.SequentialCommandGroup; /** A complex auto command that drives forward, releases a hatch, and then drives backward. */ public class ComplexAuto extends SequentialCommandGroup { diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/DefaultDrive.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/DefaultDrive.java index 72364264f1..12f7bf341f 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/DefaultDrive.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/DefaultDrive.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.wpilibj.examples.hatchbottraditional.commands; +package org.wpilib.examples.hatchbottraditional.commands; -import edu.wpi.first.wpilibj.examples.hatchbottraditional.subsystems.DriveSubsystem; -import edu.wpi.first.wpilibj2.command.Command; +import org.wpilib.examples.hatchbottraditional.subsystems.DriveSubsystem; +import org.wpilib.command2.Command; import java.util.function.DoubleSupplier; /** * A command to drive the robot with joystick input (passed in as {@link DoubleSupplier}s). Written * explicitly for pedagogical purposes - actual code should inline a command this simple with {@link - * edu.wpi.first.wpilibj2.command.RunCommand}. + * org.wpilib.command2.RunCommand}. */ public class DefaultDrive extends Command { private final DriveSubsystem m_drive; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/DriveDistance.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/DriveDistance.java index a766f809a3..ddf97d5770 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/DriveDistance.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/DriveDistance.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.hatchbottraditional.commands; +package org.wpilib.examples.hatchbottraditional.commands; -import edu.wpi.first.wpilibj.examples.hatchbottraditional.subsystems.DriveSubsystem; -import edu.wpi.first.wpilibj2.command.Command; +import org.wpilib.examples.hatchbottraditional.subsystems.DriveSubsystem; +import org.wpilib.command2.Command; public class DriveDistance extends Command { private final DriveSubsystem m_drive; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/GrabHatch.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/GrabHatch.java index e5175af200..448a84f88d 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/GrabHatch.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/GrabHatch.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.hatchbottraditional.commands; +package org.wpilib.examples.hatchbottraditional.commands; -import edu.wpi.first.wpilibj.examples.hatchbottraditional.subsystems.HatchSubsystem; -import edu.wpi.first.wpilibj2.command.Command; +import org.wpilib.examples.hatchbottraditional.subsystems.HatchSubsystem; +import org.wpilib.command2.Command; /** * A simple command that grabs a hatch with the {@link HatchSubsystem}. Written explicitly for * pedagogical purposes. Actual code should inline a command this simple with {@link - * edu.wpi.first.wpilibj2.command.InstantCommand}. + * org.wpilib.command2.InstantCommand}. */ public class GrabHatch extends Command { // The subsystem the command runs on diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/HalveDriveSpeed.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/HalveDriveSpeed.java index efaa2857de..6dd6e49e65 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/HalveDriveSpeed.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/HalveDriveSpeed.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.hatchbottraditional.commands; +package org.wpilib.examples.hatchbottraditional.commands; -import edu.wpi.first.wpilibj.examples.hatchbottraditional.subsystems.DriveSubsystem; -import edu.wpi.first.wpilibj2.command.Command; +import org.wpilib.examples.hatchbottraditional.subsystems.DriveSubsystem; +import org.wpilib.command2.Command; public class HalveDriveSpeed extends Command { private final DriveSubsystem m_drive; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/ReleaseHatch.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/ReleaseHatch.java index 6320486243..b8cda78958 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/ReleaseHatch.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/commands/ReleaseHatch.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.hatchbottraditional.commands; +package org.wpilib.examples.hatchbottraditional.commands; -import edu.wpi.first.wpilibj.examples.hatchbottraditional.subsystems.HatchSubsystem; -import edu.wpi.first.wpilibj2.command.InstantCommand; +import org.wpilib.examples.hatchbottraditional.subsystems.HatchSubsystem; +import org.wpilib.command2.InstantCommand; /** A command that releases the hatch. */ public class ReleaseHatch extends InstantCommand { diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/subsystems/DriveSubsystem.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/subsystems/DriveSubsystem.java index 8942b41ca9..663bf8eb46 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/subsystems/DriveSubsystem.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/subsystems/DriveSubsystem.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.hatchbottraditional.subsystems; +package org.wpilib.examples.hatchbottraditional.subsystems; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.drive.DifferentialDrive; -import edu.wpi.first.wpilibj.examples.hatchbottraditional.Constants.DriveConstants; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; -import edu.wpi.first.wpilibj2.command.SubsystemBase; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.drive.DifferentialDrive; +import org.wpilib.examples.hatchbottraditional.Constants.DriveConstants; +import org.wpilib.hardware.motor.PWMSparkMax; +import org.wpilib.command2.SubsystemBase; public class DriveSubsystem extends SubsystemBase { // The motors on the left side of the drive. diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/subsystems/HatchSubsystem.java b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/subsystems/HatchSubsystem.java index b515ff6bf1..00d7de8a8e 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/subsystems/HatchSubsystem.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hatchbottraditional/subsystems/HatchSubsystem.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.wpilibj.examples.hatchbottraditional.subsystems; +package org.wpilib.examples.hatchbottraditional.subsystems; -import static edu.wpi.first.wpilibj.DoubleSolenoid.Value.kForward; -import static edu.wpi.first.wpilibj.DoubleSolenoid.Value.kReverse; +import static org.wpilib.hardware.pneumatic.DoubleSolenoid.Value.kForward; +import static org.wpilib.hardware.pneumatic.DoubleSolenoid.Value.kReverse; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.wpilibj.DoubleSolenoid; -import edu.wpi.first.wpilibj.PneumaticsModuleType; -import edu.wpi.first.wpilibj.examples.hatchbottraditional.Constants.HatchConstants; -import edu.wpi.first.wpilibj2.command.SubsystemBase; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.hardware.pneumatic.DoubleSolenoid; +import org.wpilib.hardware.pneumatic.PneumaticsModuleType; +import org.wpilib.examples.hatchbottraditional.Constants.HatchConstants; +import org.wpilib.command2.SubsystemBase; /** A hatch mechanism actuated by a single {@link DoubleSolenoid}. */ public class HatchSubsystem extends SubsystemBase { 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 5d139ca30f..b4416b981b 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hidrumble/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hidrumble/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.hidrumble; +package org.wpilib.examples.hidrumble; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 1c07516885..43f02b3ca5 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/hidrumble/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/hidrumble/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.hidrumble; +package org.wpilib.examples.hidrumble; -import edu.wpi.first.wpilibj.GenericHID.RumbleType; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.XboxController; +import org.wpilib.driverstation.GenericHID.RumbleType; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.driverstation.XboxController; /** 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 9af9e7d068..87b60de882 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/httpcamera/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/httpcamera/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.httpcamera; +package org.wpilib.examples.httpcamera; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 0657499dd4..37d6a8a327 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/httpcamera/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/httpcamera/Robot.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.examples.httpcamera; +package org.wpilib.examples.httpcamera; -import edu.wpi.first.cameraserver.CameraServer; -import edu.wpi.first.cscore.CvSink; -import edu.wpi.first.cscore.CvSource; -import edu.wpi.first.cscore.HttpCamera; -import edu.wpi.first.wpilibj.TimedRobot; +import org.wpilib.vision.stream.CameraServer; +import org.wpilib.vision.camera.CvSink; +import org.wpilib.vision.camera.CvSource; +import org.wpilib.vision.camera.HttpCamera; +import org.wpilib.opmode.TimedRobot; import org.opencv.core.Mat; import org.opencv.core.Point; import org.opencv.core.Scalar; 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 f981aeb9f3..d83ce16ab7 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/i2ccommunication/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/i2ccommunication/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.i2ccommunication; +package org.wpilib.examples.i2ccommunication; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 1a99d9937e..6780a9c6b5 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/i2ccommunication/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/i2ccommunication/Robot.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.i2ccommunication; +package org.wpilib.examples.i2ccommunication; -import edu.wpi.first.wpilibj.DriverStation; -import edu.wpi.first.wpilibj.I2C; -import edu.wpi.first.wpilibj.I2C.Port; -import edu.wpi.first.wpilibj.TimedRobot; +import org.wpilib.driverstation.DriverStation; +import org.wpilib.hardware.bus.I2C; +import org.wpilib.hardware.bus.I2C.Port; +import org.wpilib.opmode.TimedRobot; import java.util.Optional; /** 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 f2fb11fafd..8fa2dc6a04 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/intermediatevision/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/intermediatevision/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.intermediatevision; +package org.wpilib.examples.intermediatevision; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 f50c8a33e4..cf41bffb28 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/intermediatevision/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/intermediatevision/Robot.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.examples.intermediatevision; +package org.wpilib.examples.intermediatevision; -import edu.wpi.first.cameraserver.CameraServer; -import edu.wpi.first.cscore.CvSink; -import edu.wpi.first.cscore.CvSource; -import edu.wpi.first.cscore.UsbCamera; -import edu.wpi.first.wpilibj.TimedRobot; +import org.wpilib.vision.stream.CameraServer; +import org.wpilib.vision.camera.CvSink; +import org.wpilib.vision.camera.CvSource; +import org.wpilib.vision.camera.UsbCamera; +import org.wpilib.opmode.TimedRobot; import org.opencv.core.Mat; import org.opencv.core.Point; import org.opencv.core.Scalar; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumbot/Drivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumbot/Drivetrain.java index 811d6bc843..332dc16584 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumbot/Drivetrain.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumbot/Drivetrain.java @@ -2,19 +2,19 @@ // 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 edu.wpi.first.wpilibj.examples.mecanumbot; +package org.wpilib.examples.mecanumbot; -import edu.wpi.first.math.controller.PIDController; -import edu.wpi.first.math.controller.SimpleMotorFeedforward; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.math.kinematics.MecanumDriveKinematics; -import edu.wpi.first.math.kinematics.MecanumDriveOdometry; -import edu.wpi.first.math.kinematics.MecanumDriveWheelPositions; -import edu.wpi.first.math.kinematics.MecanumDriveWheelSpeeds; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.OnboardIMU; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; +import org.wpilib.math.controller.PIDController; +import org.wpilib.math.controller.SimpleMotorFeedforward; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.kinematics.ChassisSpeeds; +import org.wpilib.math.kinematics.MecanumDriveKinematics; +import org.wpilib.math.kinematics.MecanumDriveOdometry; +import org.wpilib.math.kinematics.MecanumDriveWheelPositions; +import org.wpilib.math.kinematics.MecanumDriveWheelSpeeds; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.hardware.imu.OnboardIMU; +import org.wpilib.hardware.motor.PWMSparkMax; /** Represents a mecanum drive style drivetrain. */ public class Drivetrain { 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 338365e1ef..bda4bd124f 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumbot/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumbot/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.mecanumbot; +package org.wpilib.examples.mecanumbot; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 77f55d6f75..51a6fc2576 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumbot/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumbot/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.mecanumbot; +package org.wpilib.examples.mecanumbot; -import edu.wpi.first.math.filter.SlewRateLimiter; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.XboxController; +import org.wpilib.math.filter.SlewRateLimiter; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.driverstation.XboxController; 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 b44186cb81..517ea9dcb0 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdrive/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdrive/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.mecanumdrive; +package org.wpilib.examples.mecanumdrive; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 871ce1e2bc..bf4d7f5eb3 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdrive/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdrive/Robot.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.examples.mecanumdrive; +package org.wpilib.examples.mecanumdrive; -import edu.wpi.first.util.sendable.SendableRegistry; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.drive.MecanumDrive; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; +import org.wpilib.util.sendable.SendableRegistry; +import org.wpilib.driverstation.Joystick; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.drive.MecanumDrive; +import org.wpilib.hardware.motor.PWMSparkMax; /** This is a demo program showing how to use Mecanum control with the MecanumDrive class. */ public class Robot extends TimedRobot { diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/Drivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/Drivetrain.java index 8f72611864..1c86d09c82 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/Drivetrain.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/Drivetrain.java @@ -2,23 +2,23 @@ // 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 edu.wpi.first.wpilibj.examples.mecanumdriveposeestimator; +package org.wpilib.examples.mecanumdriveposeestimator; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.controller.PIDController; -import edu.wpi.first.math.controller.SimpleMotorFeedforward; -import edu.wpi.first.math.estimator.MecanumDrivePoseEstimator; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.math.kinematics.MecanumDriveKinematics; -import edu.wpi.first.math.kinematics.MecanumDriveWheelPositions; -import edu.wpi.first.math.kinematics.MecanumDriveWheelSpeeds; -import edu.wpi.first.math.util.Units; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.OnboardIMU; -import edu.wpi.first.wpilibj.Timer; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.controller.PIDController; +import org.wpilib.math.controller.SimpleMotorFeedforward; +import org.wpilib.math.estimator.MecanumDrivePoseEstimator; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.kinematics.ChassisSpeeds; +import org.wpilib.math.kinematics.MecanumDriveKinematics; +import org.wpilib.math.kinematics.MecanumDriveWheelPositions; +import org.wpilib.math.kinematics.MecanumDriveWheelSpeeds; +import org.wpilib.math.util.Units; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.hardware.imu.OnboardIMU; +import org.wpilib.system.Timer; +import org.wpilib.hardware.motor.PWMSparkMax; /** Represents a mecanum drive style drivetrain. */ public class Drivetrain { diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/ExampleGlobalMeasurementSensor.java b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/ExampleGlobalMeasurementSensor.java index 8b7a635d4c..fe5e86c776 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/ExampleGlobalMeasurementSensor.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/ExampleGlobalMeasurementSensor.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.examples.mecanumdriveposeestimator; +package org.wpilib.examples.mecanumdriveposeestimator; -import edu.wpi.first.math.StateSpaceUtil; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.util.StateSpaceUtil; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.util.Units; /** This dummy class represents a global measurement sensor, such as a computer vision solution. */ public final class ExampleGlobalMeasurementSensor { 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 a6c5ccce67..1ec708498a 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.mecanumdriveposeestimator; +package org.wpilib.examples.mecanumdriveposeestimator; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 581f744d8b..6cc375dbc2 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/mecanumdriveposeestimator/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.mecanumdriveposeestimator; +package org.wpilib.examples.mecanumdriveposeestimator; -import edu.wpi.first.math.filter.SlewRateLimiter; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.XboxController; +import org.wpilib.math.filter.SlewRateLimiter; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.driverstation.XboxController; 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 a477a03490..c4c1ad2203 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/mechanism2d/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/mechanism2d/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.mechanism2d; +package org.wpilib.examples.mechanism2d; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 034db298c6..c48019b334 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/mechanism2d/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/mechanism2d/Robot.java @@ -2,19 +2,19 @@ // 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 edu.wpi.first.wpilibj.examples.mechanism2d; +package org.wpilib.examples.mechanism2d; -import edu.wpi.first.wpilibj.AnalogPotentiometer; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; -import edu.wpi.first.wpilibj.smartdashboard.Mechanism2d; -import edu.wpi.first.wpilibj.smartdashboard.MechanismLigament2d; -import edu.wpi.first.wpilibj.smartdashboard.MechanismRoot2d; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; -import edu.wpi.first.wpilibj.util.Color; -import edu.wpi.first.wpilibj.util.Color8Bit; +import org.wpilib.hardware.rotation.AnalogPotentiometer; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.driverstation.Joystick; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.hardware.motor.PWMSparkMax; +import org.wpilib.smartdashboard.Mechanism2d; +import org.wpilib.smartdashboard.MechanismLigament2d; +import org.wpilib.smartdashboard.MechanismRoot2d; +import org.wpilib.smartdashboard.SmartDashboard; +import org.wpilib.util.Color; +import org.wpilib.util.Color8Bit; /** * This sample program shows how to use Mechanism2d - a visual representation of arms, elevators, 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 abd3c945a8..7295c8ca62 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/motorcontrol/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/motorcontrol/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.motorcontrol; +package org.wpilib.examples.motorcontrol; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 db79f6d5c7..d986aba04b 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/motorcontrol/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/motorcontrol/Robot.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.examples.motorcontrol; +package org.wpilib.examples.motorcontrol; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.driverstation.Joystick; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.hardware.motor.PWMSparkMax; +import org.wpilib.smartdashboard.SmartDashboard; /** * This sample program shows how to control a motor using a joystick. In the operator control part 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 21bcb5ff3c..a0abbdcc6b 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/potentiometerpid/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/potentiometerpid/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.potentiometerpid; +package org.wpilib.examples.potentiometerpid; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 560e18f36b..b942429bd1 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/potentiometerpid/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/potentiometerpid/Robot.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.examples.potentiometerpid; +package org.wpilib.examples.potentiometerpid; -import edu.wpi.first.math.controller.PIDController; -import edu.wpi.first.wpilibj.AnalogPotentiometer; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; +import org.wpilib.math.controller.PIDController; +import org.wpilib.hardware.rotation.AnalogPotentiometer; +import org.wpilib.driverstation.Joystick; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.hardware.motor.PWMSparkMax; /** * 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 f3925a079e..69c63e0950 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/quickvision/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/quickvision/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.quickvision; +package org.wpilib.examples.quickvision; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 982e88bc5f..affb79ccb3 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/quickvision/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/quickvision/Robot.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.quickvision; +package org.wpilib.examples.quickvision; -import edu.wpi.first.cameraserver.CameraServer; -import edu.wpi.first.wpilibj.TimedRobot; +import org.wpilib.vision.stream.CameraServer; +import org.wpilib.opmode.TimedRobot; /** * Uses the CameraServer class to automatically capture video from a USB webcam and send it to the diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Constants.java index 40dc0f9289..9f36e9bc96 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Constants.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Constants.java @@ -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. -package edu.wpi.first.wpilibj.examples.rapidreactcommandbot; +package org.wpilib.examples.rapidreactcommandbot; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.util.Units; /** * The Constants class provides a convenient place for teams to hold robot-wide numerical or boolean diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Main.java index b72cd916c8..7cb0fc9078 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.rapidreactcommandbot; +package org.wpilib.examples.rapidreactcommandbot; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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/RapidReactCommandBot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/RapidReactCommandBot.java index 750279b0d2..f550a00c2e 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/RapidReactCommandBot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/RapidReactCommandBot.java @@ -2,22 +2,22 @@ // 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 edu.wpi.first.wpilibj.examples.rapidreactcommandbot; +package org.wpilib.examples.rapidreactcommandbot; -import static edu.wpi.first.wpilibj2.command.Commands.parallel; +import static org.wpilib.command2.Commands.parallel; -import edu.wpi.first.epilogue.Logged; -import edu.wpi.first.wpilibj.examples.rapidreactcommandbot.Constants.AutoConstants; -import edu.wpi.first.wpilibj.examples.rapidreactcommandbot.Constants.OIConstants; -import edu.wpi.first.wpilibj.examples.rapidreactcommandbot.Constants.ShooterConstants; -import edu.wpi.first.wpilibj.examples.rapidreactcommandbot.subsystems.Drive; -import edu.wpi.first.wpilibj.examples.rapidreactcommandbot.subsystems.Intake; -import edu.wpi.first.wpilibj.examples.rapidreactcommandbot.subsystems.Pneumatics; -import edu.wpi.first.wpilibj.examples.rapidreactcommandbot.subsystems.Shooter; -import edu.wpi.first.wpilibj.examples.rapidreactcommandbot.subsystems.Storage; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.button.CommandXboxController; -import edu.wpi.first.wpilibj2.command.button.Trigger; +import org.wpilib.epilogue.Logged; +import org.wpilib.examples.rapidreactcommandbot.Constants.AutoConstants; +import org.wpilib.examples.rapidreactcommandbot.Constants.OIConstants; +import org.wpilib.examples.rapidreactcommandbot.Constants.ShooterConstants; +import org.wpilib.examples.rapidreactcommandbot.subsystems.Drive; +import org.wpilib.examples.rapidreactcommandbot.subsystems.Intake; +import org.wpilib.examples.rapidreactcommandbot.subsystems.Pneumatics; +import org.wpilib.examples.rapidreactcommandbot.subsystems.Shooter; +import org.wpilib.examples.rapidreactcommandbot.subsystems.Storage; +import org.wpilib.command2.Command; +import org.wpilib.command2.button.CommandXboxController; +import org.wpilib.command2.button.Trigger; /** * This class is where the bulk of the robot should be declared. Since Command-based is a diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Robot.java index c90dd0d18b..23b2bfe1e8 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/Robot.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj.examples.rapidreactcommandbot; +package org.wpilib.examples.rapidreactcommandbot; -import edu.wpi.first.epilogue.Epilogue; -import edu.wpi.first.epilogue.Logged; -import edu.wpi.first.wpilibj.DataLogManager; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.CommandScheduler; +import org.wpilib.epilogue.Epilogue; +import org.wpilib.epilogue.Logged; +import org.wpilib.system.DataLogManager; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.command2.Command; +import org.wpilib.command2.CommandScheduler; /** * 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/rapidreactcommandbot/subsystems/Drive.java b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Drive.java index 18fa35aa1a..cba4ab8fc1 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Drive.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Drive.java @@ -2,22 +2,22 @@ // 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 edu.wpi.first.wpilibj.examples.rapidreactcommandbot.subsystems; +package org.wpilib.examples.rapidreactcommandbot.subsystems; -import edu.wpi.first.epilogue.Logged; -import edu.wpi.first.epilogue.NotLogged; -import edu.wpi.first.math.controller.ProfiledPIDController; -import edu.wpi.first.math.controller.SimpleMotorFeedforward; -import edu.wpi.first.math.trajectory.TrapezoidProfile; -import edu.wpi.first.util.sendable.SendableRegistry; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.OnboardIMU; -import edu.wpi.first.wpilibj.RobotController; -import edu.wpi.first.wpilibj.drive.DifferentialDrive; -import edu.wpi.first.wpilibj.examples.rapidreactcommandbot.Constants.DriveConstants; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.SubsystemBase; +import org.wpilib.epilogue.Logged; +import org.wpilib.epilogue.NotLogged; +import org.wpilib.math.controller.ProfiledPIDController; +import org.wpilib.math.controller.SimpleMotorFeedforward; +import org.wpilib.math.trajectory.TrapezoidProfile; +import org.wpilib.util.sendable.SendableRegistry; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.hardware.imu.OnboardIMU; +import org.wpilib.system.RobotController; +import org.wpilib.drive.DifferentialDrive; +import org.wpilib.examples.rapidreactcommandbot.Constants.DriveConstants; +import org.wpilib.hardware.motor.PWMSparkMax; +import org.wpilib.command2.Command; +import org.wpilib.command2.SubsystemBase; import java.util.function.DoubleSupplier; @Logged diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Intake.java b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Intake.java index 5fa19a14aa..74e753c175 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Intake.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Intake.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.wpilibj.examples.rapidreactcommandbot.subsystems; +package org.wpilib.examples.rapidreactcommandbot.subsystems; -import static edu.wpi.first.wpilibj.examples.rapidreactcommandbot.Constants.IntakeConstants; +import static org.wpilib.examples.rapidreactcommandbot.Constants.IntakeConstants; -import edu.wpi.first.epilogue.Logged; -import edu.wpi.first.wpilibj.DoubleSolenoid; -import edu.wpi.first.wpilibj.PneumaticsModuleType; -import edu.wpi.first.wpilibj.examples.rapidreactcommandbot.Constants.IntakeConstants; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.SubsystemBase; +import org.wpilib.epilogue.Logged; +import org.wpilib.hardware.pneumatic.DoubleSolenoid; +import org.wpilib.hardware.pneumatic.PneumaticsModuleType; +import org.wpilib.examples.rapidreactcommandbot.Constants.IntakeConstants; +import org.wpilib.hardware.motor.PWMSparkMax; +import org.wpilib.command2.Command; +import org.wpilib.command2.SubsystemBase; @Logged public class Intake extends SubsystemBase { diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Pneumatics.java b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Pneumatics.java index b71ae0c3d5..30441f7ff7 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Pneumatics.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Pneumatics.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj.examples.rapidreactcommandbot.subsystems; +package org.wpilib.examples.rapidreactcommandbot.subsystems; -import edu.wpi.first.epilogue.Logged; -import edu.wpi.first.wpilibj.AnalogPotentiometer; -import edu.wpi.first.wpilibj.Compressor; -import edu.wpi.first.wpilibj.PneumaticsModuleType; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.SubsystemBase; +import org.wpilib.epilogue.Logged; +import org.wpilib.hardware.rotation.AnalogPotentiometer; +import org.wpilib.hardware.pneumatic.Compressor; +import org.wpilib.hardware.pneumatic.PneumaticsModuleType; +import org.wpilib.command2.Command; +import org.wpilib.command2.SubsystemBase; /** Subsystem for managing the compressor, pressure sensor, etc. */ @Logged diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Shooter.java b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Shooter.java index 5689341b37..46b87823f2 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Shooter.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Shooter.java @@ -2,19 +2,19 @@ // 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 edu.wpi.first.wpilibj.examples.rapidreactcommandbot.subsystems; +package org.wpilib.examples.rapidreactcommandbot.subsystems; -import static edu.wpi.first.wpilibj2.command.Commands.parallel; -import static edu.wpi.first.wpilibj2.command.Commands.waitUntil; +import static org.wpilib.command2.Commands.parallel; +import static org.wpilib.command2.Commands.waitUntil; -import edu.wpi.first.epilogue.Logged; -import edu.wpi.first.math.controller.PIDController; -import edu.wpi.first.math.controller.SimpleMotorFeedforward; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.examples.rapidreactcommandbot.Constants.ShooterConstants; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.SubsystemBase; +import org.wpilib.epilogue.Logged; +import org.wpilib.math.controller.PIDController; +import org.wpilib.math.controller.SimpleMotorFeedforward; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.examples.rapidreactcommandbot.Constants.ShooterConstants; +import org.wpilib.hardware.motor.PWMSparkMax; +import org.wpilib.command2.Command; +import org.wpilib.command2.SubsystemBase; @Logged public class Shooter extends SubsystemBase { diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Storage.java b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Storage.java index db4611e5e8..5c719f6918 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Storage.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/rapidreactcommandbot/subsystems/Storage.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.wpilibj.examples.rapidreactcommandbot.subsystems; +package org.wpilib.examples.rapidreactcommandbot.subsystems; -import edu.wpi.first.epilogue.Logged; -import edu.wpi.first.epilogue.NotLogged; -import edu.wpi.first.wpilibj.DigitalInput; -import edu.wpi.first.wpilibj.examples.rapidreactcommandbot.Constants.StorageConstants; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.SubsystemBase; -import edu.wpi.first.wpilibj2.command.button.Trigger; +import org.wpilib.epilogue.Logged; +import org.wpilib.epilogue.NotLogged; +import org.wpilib.hardware.discrete.DigitalInput; +import org.wpilib.examples.rapidreactcommandbot.Constants.StorageConstants; +import org.wpilib.hardware.motor.PWMSparkMax; +import org.wpilib.command2.Command; +import org.wpilib.command2.SubsystemBase; +import org.wpilib.command2.button.Trigger; @Logged public class Storage extends SubsystemBase { diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Constants.java index 2ebfb922bf..a7152b72fa 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Constants.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Constants.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.romireference; +package org.wpilib.examples.romireference; /** * The Constants class provides a convenient place for teams to hold robot-wide numerical or boolean diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Main.java index aa21a587c6..fc474eb255 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.romireference; +package org.wpilib.examples.romireference; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 337a478264..493438a229 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.romireference; +package org.wpilib.examples.romireference; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.CommandScheduler; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.command2.Command; +import org.wpilib.command2.CommandScheduler; /** * 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/romireference/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/RobotContainer.java index 39c1a36afd..343fd5b190 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/RobotContainer.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/RobotContainer.java @@ -2,22 +2,22 @@ // 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 edu.wpi.first.wpilibj.examples.romireference; +package org.wpilib.examples.romireference; -import edu.wpi.first.wpilibj.GenericHID; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.XboxController; -import edu.wpi.first.wpilibj.examples.romireference.commands.ArcadeDrive; -import edu.wpi.first.wpilibj.examples.romireference.commands.AutonomousDistance; -import edu.wpi.first.wpilibj.examples.romireference.commands.AutonomousTime; -import edu.wpi.first.wpilibj.examples.romireference.subsystems.Drivetrain; -import edu.wpi.first.wpilibj.romi.OnBoardIO; -import edu.wpi.first.wpilibj.romi.OnBoardIO.ChannelMode; -import edu.wpi.first.wpilibj.smartdashboard.SendableChooser; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.PrintCommand; -import edu.wpi.first.wpilibj2.command.button.Trigger; +import org.wpilib.driverstation.GenericHID; +import org.wpilib.driverstation.Joystick; +import org.wpilib.driverstation.XboxController; +import org.wpilib.examples.romireference.commands.ArcadeDrive; +import org.wpilib.examples.romireference.commands.AutonomousDistance; +import org.wpilib.examples.romireference.commands.AutonomousTime; +import org.wpilib.examples.romireference.subsystems.Drivetrain; +import org.wpilib.romi.OnBoardIO; +import org.wpilib.romi.OnBoardIO.ChannelMode; +import org.wpilib.smartdashboard.SendableChooser; +import org.wpilib.smartdashboard.SmartDashboard; +import org.wpilib.command2.Command; +import org.wpilib.command2.PrintCommand; +import org.wpilib.command2.button.Trigger; /** * This class is where the bulk of the robot should be declared. Since Command-based is a @@ -56,8 +56,8 @@ public class RobotContainer { /** * Use this method to define your button->command mappings. Buttons can be created by * instantiating a {@link GenericHID} or one of its subclasses ({@link - * edu.wpi.first.wpilibj.Joystick} or {@link XboxController}), and then passing it to a {@link - * edu.wpi.first.wpilibj2.command.button.JoystickButton}. + * org.wpilib.driverstation.Joystick} or {@link XboxController}), and then passing it to a {@link + * org.wpilib.command2.button.JoystickButton}. */ private void configureButtonBindings() { // Default command is arcade drive. This will run unless another command diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/ArcadeDrive.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/ArcadeDrive.java index 295a6f9bb2..29e7c3c2c0 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/ArcadeDrive.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/ArcadeDrive.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.romireference.commands; +package org.wpilib.examples.romireference.commands; -import edu.wpi.first.wpilibj.examples.romireference.subsystems.Drivetrain; -import edu.wpi.first.wpilibj2.command.Command; +import org.wpilib.examples.romireference.subsystems.Drivetrain; +import org.wpilib.command2.Command; import java.util.function.Supplier; public class ArcadeDrive extends Command { diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/AutonomousDistance.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/AutonomousDistance.java index d48b2b4637..aa42204d52 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/AutonomousDistance.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/AutonomousDistance.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.romireference.commands; +package org.wpilib.examples.romireference.commands; -import edu.wpi.first.wpilibj.examples.romireference.subsystems.Drivetrain; -import edu.wpi.first.wpilibj2.command.SequentialCommandGroup; +import org.wpilib.examples.romireference.subsystems.Drivetrain; +import org.wpilib.command2.SequentialCommandGroup; public class AutonomousDistance extends SequentialCommandGroup { /** diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/AutonomousTime.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/AutonomousTime.java index 4cc9afa513..e9b4c904fc 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/AutonomousTime.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/AutonomousTime.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.romireference.commands; +package org.wpilib.examples.romireference.commands; -import edu.wpi.first.wpilibj.examples.romireference.subsystems.Drivetrain; -import edu.wpi.first.wpilibj2.command.SequentialCommandGroup; +import org.wpilib.examples.romireference.subsystems.Drivetrain; +import org.wpilib.command2.SequentialCommandGroup; public class AutonomousTime extends SequentialCommandGroup { /** diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/DriveDistance.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/DriveDistance.java index d9c306b9d3..da3ea45e5e 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/DriveDistance.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/DriveDistance.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.romireference.commands; +package org.wpilib.examples.romireference.commands; -import edu.wpi.first.wpilibj.examples.romireference.subsystems.Drivetrain; -import edu.wpi.first.wpilibj2.command.Command; +import org.wpilib.examples.romireference.subsystems.Drivetrain; +import org.wpilib.command2.Command; public class DriveDistance extends Command { private final Drivetrain m_drive; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/DriveTime.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/DriveTime.java index 7fac2b876c..e2c73744ac 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/DriveTime.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/DriveTime.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.romireference.commands; +package org.wpilib.examples.romireference.commands; -import edu.wpi.first.wpilibj.examples.romireference.subsystems.Drivetrain; -import edu.wpi.first.wpilibj2.command.Command; +import org.wpilib.examples.romireference.subsystems.Drivetrain; +import org.wpilib.command2.Command; public class DriveTime extends Command { private final double m_duration; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/TurnDegrees.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/TurnDegrees.java index a438f0141e..d38d248658 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/TurnDegrees.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/TurnDegrees.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.romireference.commands; +package org.wpilib.examples.romireference.commands; -import edu.wpi.first.wpilibj.examples.romireference.subsystems.Drivetrain; -import edu.wpi.first.wpilibj2.command.Command; +import org.wpilib.examples.romireference.subsystems.Drivetrain; +import org.wpilib.command2.Command; public class TurnDegrees extends Command { private final Drivetrain m_drive; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/TurnTime.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/TurnTime.java index f3a6aa7fe2..6cbd4f9e6d 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/TurnTime.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/commands/TurnTime.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.romireference.commands; +package org.wpilib.examples.romireference.commands; -import edu.wpi.first.wpilibj.examples.romireference.subsystems.Drivetrain; -import edu.wpi.first.wpilibj2.command.Command; +import org.wpilib.examples.romireference.subsystems.Drivetrain; +import org.wpilib.command2.Command; /* * Creates a new TurnTime command. This command will turn your robot for a diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/subsystems/Drivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/subsystems/Drivetrain.java index 2d2b757df5..9c9ab2e708 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/subsystems/Drivetrain.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/romireference/subsystems/Drivetrain.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj.examples.romireference.subsystems; +package org.wpilib.examples.romireference.subsystems; -import edu.wpi.first.util.sendable.SendableRegistry; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.drive.DifferentialDrive; -import edu.wpi.first.wpilibj.motorcontrol.Spark; -import edu.wpi.first.wpilibj.romi.RomiGyro; -import edu.wpi.first.wpilibj2.command.SubsystemBase; +import org.wpilib.util.sendable.SendableRegistry; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.drive.DifferentialDrive; +import org.wpilib.hardware.motor.Spark; +import org.wpilib.romi.RomiGyro; +import org.wpilib.command2.SubsystemBase; public class Drivetrain extends SubsystemBase { private static final double kCountsPerRevolution = 1440.0; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Constants.java index 5a76db66ac..b0a9ba61bb 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Constants.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Constants.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.selectcommand; +package org.wpilib.examples.selectcommand; /** * The Constants class provides a convenient place for teams to hold robot-wide numerical or boolean diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Main.java index 1ad2aff0a9..da53b02401 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.selectcommand; +package org.wpilib.examples.selectcommand; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 0e00fa479e..d01db97773 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.selectcommand; +package org.wpilib.examples.selectcommand; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.CommandScheduler; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.command2.Command; +import org.wpilib.command2.CommandScheduler; /** * 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/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/RobotContainer.java index bd3e6772c3..b435655d91 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/RobotContainer.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/selectcommand/RobotContainer.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.examples.selectcommand; +package org.wpilib.examples.selectcommand; -import edu.wpi.first.wpilibj.GenericHID; -import edu.wpi.first.wpilibj.XboxController; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.PrintCommand; -import edu.wpi.first.wpilibj2.command.SelectCommand; +import org.wpilib.driverstation.GenericHID; +import org.wpilib.driverstation.XboxController; +import org.wpilib.command2.Command; +import org.wpilib.command2.PrintCommand; +import org.wpilib.command2.SelectCommand; import java.util.Map; /** @@ -52,8 +52,8 @@ public class RobotContainer { /** * Use this method to define your button->command mappings. Buttons can be created by * instantiating a {@link GenericHID} or one of its subclasses ({@link - * edu.wpi.first.wpilibj.Joystick} or {@link XboxController}), and then calling passing it to a - * {@link edu.wpi.first.wpilibj2.command.button.JoystickButton}. + * org.wpilib.driverstation.Joystick} or {@link XboxController}), and then calling passing it to a + * {@link org.wpilib.command2.button.JoystickButton}. */ private void configureButtonBindings() {} diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/simpledifferentialdrivesimulation/Drivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/examples/simpledifferentialdrivesimulation/Drivetrain.java index 1ed91764d5..152d4f7a68 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/simpledifferentialdrivesimulation/Drivetrain.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/simpledifferentialdrivesimulation/Drivetrain.java @@ -2,27 +2,27 @@ // 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 edu.wpi.first.wpilibj.examples.simpledifferentialdrivesimulation; +package org.wpilib.examples.simpledifferentialdrivesimulation; -import edu.wpi.first.math.controller.PIDController; -import edu.wpi.first.math.controller.SimpleMotorFeedforward; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.math.kinematics.DifferentialDriveKinematics; -import edu.wpi.first.math.kinematics.DifferentialDriveOdometry; -import edu.wpi.first.math.kinematics.DifferentialDriveWheelSpeeds; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.system.LinearSystem; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.system.plant.LinearSystemId; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.OnboardIMU; -import edu.wpi.first.wpilibj.RobotController; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; -import edu.wpi.first.wpilibj.simulation.DifferentialDrivetrainSim; -import edu.wpi.first.wpilibj.simulation.EncoderSim; -import edu.wpi.first.wpilibj.smartdashboard.Field2d; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; +import org.wpilib.math.controller.PIDController; +import org.wpilib.math.controller.SimpleMotorFeedforward; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.kinematics.ChassisSpeeds; +import org.wpilib.math.kinematics.DifferentialDriveKinematics; +import org.wpilib.math.kinematics.DifferentialDriveOdometry; +import org.wpilib.math.kinematics.DifferentialDriveWheelSpeeds; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.system.LinearSystem; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.math.system.plant.LinearSystemId; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.hardware.imu.OnboardIMU; +import org.wpilib.system.RobotController; +import org.wpilib.hardware.motor.PWMSparkMax; +import org.wpilib.simulation.DifferentialDrivetrainSim; +import org.wpilib.simulation.EncoderSim; +import org.wpilib.smartdashboard.Field2d; +import org.wpilib.smartdashboard.SmartDashboard; public class Drivetrain { // 3 meters per second. 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 576b2d3745..b14477ec2a 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/simpledifferentialdrivesimulation/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/simpledifferentialdrivesimulation/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.simpledifferentialdrivesimulation; +package org.wpilib.examples.simpledifferentialdrivesimulation; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 d8471b2c49..6c080700df 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/simpledifferentialdrivesimulation/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/simpledifferentialdrivesimulation/Robot.java @@ -2,19 +2,19 @@ // 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 edu.wpi.first.wpilibj.examples.simpledifferentialdrivesimulation; +package org.wpilib.examples.simpledifferentialdrivesimulation; -import edu.wpi.first.math.controller.LTVUnicycleController; -import edu.wpi.first.math.filter.SlewRateLimiter; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.math.trajectory.Trajectory; -import edu.wpi.first.math.trajectory.TrajectoryConfig; -import edu.wpi.first.math.trajectory.TrajectoryGenerator; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.Timer; -import edu.wpi.first.wpilibj.XboxController; +import org.wpilib.math.controller.LTVUnicycleController; +import org.wpilib.math.filter.SlewRateLimiter; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +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; +import org.wpilib.driverstation.XboxController; import java.util.List; 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 78218ad13b..3f156797c0 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/solenoid/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/solenoid/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.solenoid; +package org.wpilib.examples.solenoid; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 2f22836af1..0533f1edc3 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/solenoid/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/solenoid/Robot.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.solenoid; +package org.wpilib.examples.solenoid; -import edu.wpi.first.wpilibj.Compressor; -import edu.wpi.first.wpilibj.DoubleSolenoid; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.PneumaticsModuleType; -import edu.wpi.first.wpilibj.Solenoid; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; +import org.wpilib.hardware.pneumatic.Compressor; +import org.wpilib.hardware.pneumatic.DoubleSolenoid; +import org.wpilib.driverstation.Joystick; +import org.wpilib.hardware.pneumatic.PneumaticsModuleType; +import org.wpilib.hardware.pneumatic.Solenoid; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.smartdashboard.SmartDashboard; /** * This is a sample program showing the use of the solenoid classes during operator control. Three 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 204e8e3845..41b1642863 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/statespacearm/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/statespacearm/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.statespacearm; +package org.wpilib.examples.statespacearm; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 7725107935..bb53bf9c56 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/statespacearm/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/statespacearm/Robot.java @@ -2,24 +2,24 @@ // 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 edu.wpi.first.wpilibj.examples.statespacearm; +package org.wpilib.examples.statespacearm; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.controller.LinearQuadraticRegulator; -import edu.wpi.first.math.estimator.KalmanFilter; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.system.LinearSystem; -import edu.wpi.first.math.system.LinearSystemLoop; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.system.plant.LinearSystemId; -import edu.wpi.first.math.trajectory.TrapezoidProfile; -import edu.wpi.first.math.util.Units; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.controller.LinearQuadraticRegulator; +import org.wpilib.math.estimator.KalmanFilter; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.system.LinearSystem; +import org.wpilib.math.system.LinearSystemLoop; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.math.system.plant.LinearSystemId; +import org.wpilib.math.trajectory.TrapezoidProfile; +import org.wpilib.math.util.Units; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.driverstation.Joystick; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.hardware.motor.PWMSparkMax; /** * 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 a4bad42618..b7e40499e5 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceelevator/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceelevator/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.statespaceelevator; +package org.wpilib.examples.statespaceelevator; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 f9bd7bf360..01319c46f3 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceelevator/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceelevator/Robot.java @@ -2,24 +2,24 @@ // 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 edu.wpi.first.wpilibj.examples.statespaceelevator; +package org.wpilib.examples.statespaceelevator; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.controller.LinearQuadraticRegulator; -import edu.wpi.first.math.estimator.KalmanFilter; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.system.LinearSystem; -import edu.wpi.first.math.system.LinearSystemLoop; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.system.plant.LinearSystemId; -import edu.wpi.first.math.trajectory.TrapezoidProfile; -import edu.wpi.first.math.util.Units; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.controller.LinearQuadraticRegulator; +import org.wpilib.math.estimator.KalmanFilter; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.system.LinearSystem; +import org.wpilib.math.system.LinearSystemLoop; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.math.system.plant.LinearSystemId; +import org.wpilib.math.trajectory.TrapezoidProfile; +import org.wpilib.math.util.Units; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.driverstation.Joystick; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.hardware.motor.PWMSparkMax; /** * 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 9e48d52e79..36979d7cf2 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheel/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheel/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.statespaceflywheel; +package org.wpilib.examples.statespaceflywheel; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 73226a6af0..84314a4cf5 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheel/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheel/Robot.java @@ -2,22 +2,22 @@ // 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 edu.wpi.first.wpilibj.examples.statespaceflywheel; +package org.wpilib.examples.statespaceflywheel; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.controller.LinearQuadraticRegulator; -import edu.wpi.first.math.estimator.KalmanFilter; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.system.LinearSystem; -import edu.wpi.first.math.system.LinearSystemLoop; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.system.plant.LinearSystemId; -import edu.wpi.first.math.util.Units; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.controller.LinearQuadraticRegulator; +import org.wpilib.math.estimator.KalmanFilter; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.system.LinearSystem; +import org.wpilib.math.system.LinearSystemLoop; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.math.system.plant.LinearSystemId; +import org.wpilib.math.util.Units; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.driverstation.Joystick; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.hardware.motor.PWMSparkMax; /** * 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 67941f699b..e0cdd68add 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheelsysid/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheelsysid/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.statespaceflywheelsysid; +package org.wpilib.examples.statespaceflywheelsysid; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 2a9d8f2afa..ce42242af2 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheelsysid/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/statespaceflywheelsysid/Robot.java @@ -2,21 +2,21 @@ // 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 edu.wpi.first.wpilibj.examples.statespaceflywheelsysid; +package org.wpilib.examples.statespaceflywheelsysid; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.controller.LinearQuadraticRegulator; -import edu.wpi.first.math.estimator.KalmanFilter; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.system.LinearSystem; -import edu.wpi.first.math.system.LinearSystemLoop; -import edu.wpi.first.math.system.plant.LinearSystemId; -import edu.wpi.first.math.util.Units; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.controller.LinearQuadraticRegulator; +import org.wpilib.math.estimator.KalmanFilter; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.system.LinearSystem; +import org.wpilib.math.system.LinearSystemLoop; +import org.wpilib.math.system.plant.LinearSystemId; +import org.wpilib.math.util.Units; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.driverstation.Joystick; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.hardware.motor.PWMSparkMax; /** * 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/Drivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/Drivetrain.java index ac460f22b1..178e9277fe 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/Drivetrain.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/Drivetrain.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj.examples.swervebot; +package org.wpilib.examples.swervebot; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.math.kinematics.SwerveDriveKinematics; -import edu.wpi.first.math.kinematics.SwerveDriveOdometry; -import edu.wpi.first.math.kinematics.SwerveModulePosition; -import edu.wpi.first.wpilibj.OnboardIMU; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.kinematics.ChassisSpeeds; +import org.wpilib.math.kinematics.SwerveDriveKinematics; +import org.wpilib.math.kinematics.SwerveDriveOdometry; +import org.wpilib.math.kinematics.SwerveModulePosition; +import org.wpilib.hardware.imu.OnboardIMU; /** Represents a swerve drive style drivetrain. */ public class Drivetrain { 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 31707aa30e..77881e765b 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.swervebot; +package org.wpilib.examples.swervebot; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 774c654ea8..f61691ea80 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/Robot.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.swervebot; +package org.wpilib.examples.swervebot; -import edu.wpi.first.math.MathUtil; -import edu.wpi.first.math.filter.SlewRateLimiter; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.XboxController; +import org.wpilib.math.util.MathUtil; +import org.wpilib.math.filter.SlewRateLimiter; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.driverstation.XboxController; public class Robot extends TimedRobot { private final XboxController m_controller = new XboxController(0); diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/SwerveModule.java b/wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/SwerveModule.java index 1590dfaa80..adb4b8d3b4 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/SwerveModule.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/swervebot/SwerveModule.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.wpilibj.examples.swervebot; +package org.wpilib.examples.swervebot; -import edu.wpi.first.math.controller.PIDController; -import edu.wpi.first.math.controller.ProfiledPIDController; -import edu.wpi.first.math.controller.SimpleMotorFeedforward; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.kinematics.SwerveModulePosition; -import edu.wpi.first.math.kinematics.SwerveModuleState; -import edu.wpi.first.math.trajectory.TrapezoidProfile; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; +import org.wpilib.math.controller.PIDController; +import org.wpilib.math.controller.ProfiledPIDController; +import org.wpilib.math.controller.SimpleMotorFeedforward; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.kinematics.SwerveModulePosition; +import org.wpilib.math.kinematics.SwerveModuleState; +import org.wpilib.math.trajectory.TrapezoidProfile; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.hardware.motor.PWMSparkMax; public class SwerveModule { private static final double kWheelRadius = 0.0508; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/Drivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/Drivetrain.java index 409351322e..6e14211b65 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/Drivetrain.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/Drivetrain.java @@ -2,18 +2,18 @@ // 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 edu.wpi.first.wpilibj.examples.swervedriveposeestimator; +package org.wpilib.examples.swervedriveposeestimator; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.estimator.SwerveDrivePoseEstimator; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.math.kinematics.SwerveDriveKinematics; -import edu.wpi.first.math.kinematics.SwerveModulePosition; -import edu.wpi.first.math.util.Units; -import edu.wpi.first.wpilibj.OnboardIMU; -import edu.wpi.first.wpilibj.Timer; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.estimator.SwerveDrivePoseEstimator; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.kinematics.ChassisSpeeds; +import org.wpilib.math.kinematics.SwerveDriveKinematics; +import org.wpilib.math.kinematics.SwerveModulePosition; +import org.wpilib.math.util.Units; +import org.wpilib.hardware.imu.OnboardIMU; +import org.wpilib.system.Timer; /** Represents a swerve drive style drivetrain. */ public class Drivetrain { diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/ExampleGlobalMeasurementSensor.java b/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/ExampleGlobalMeasurementSensor.java index a92a4fe9bf..ce59718563 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/ExampleGlobalMeasurementSensor.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/ExampleGlobalMeasurementSensor.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.examples.swervedriveposeestimator; +package org.wpilib.examples.swervedriveposeestimator; -import edu.wpi.first.math.StateSpaceUtil; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.util.StateSpaceUtil; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.util.Units; /** This dummy class represents a global measurement sensor, such as a computer vision solution. */ public final class ExampleGlobalMeasurementSensor { 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 2221f14c5e..24a028a637 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.swervedriveposeestimator; +package org.wpilib.examples.swervedriveposeestimator; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 bb3a596913..f6d143a8b8 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.swervedriveposeestimator; +package org.wpilib.examples.swervedriveposeestimator; -import edu.wpi.first.math.filter.SlewRateLimiter; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.XboxController; +import org.wpilib.math.filter.SlewRateLimiter; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.driverstation.XboxController; public class Robot extends TimedRobot { private final XboxController m_controller = new XboxController(0); diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/SwerveModule.java b/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/SwerveModule.java index 45111f1275..8d6f5ba5fa 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/SwerveModule.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/swervedriveposeestimator/SwerveModule.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.wpilibj.examples.swervedriveposeestimator; +package org.wpilib.examples.swervedriveposeestimator; -import edu.wpi.first.math.controller.PIDController; -import edu.wpi.first.math.controller.ProfiledPIDController; -import edu.wpi.first.math.controller.SimpleMotorFeedforward; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.kinematics.SwerveModulePosition; -import edu.wpi.first.math.kinematics.SwerveModuleState; -import edu.wpi.first.math.trajectory.TrapezoidProfile; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; +import org.wpilib.math.controller.PIDController; +import org.wpilib.math.controller.ProfiledPIDController; +import org.wpilib.math.controller.SimpleMotorFeedforward; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.kinematics.SwerveModulePosition; +import org.wpilib.math.kinematics.SwerveModuleState; +import org.wpilib.math.trajectory.TrapezoidProfile; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.hardware.motor.PWMSparkMax; public class SwerveModule { private static final double kWheelRadius = 0.0508; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Constants.java index 62ae403b9e..d237366777 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Constants.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Constants.java @@ -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. -package edu.wpi.first.wpilibj.examples.sysidroutine; +package org.wpilib.examples.sysidroutine; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.util.Units; /** * The Constants class provides a convenient place for teams to hold robot-wide numerical or boolean diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Main.java index 8c9ee5ed13..06d4b23df3 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.sysidroutine; +package org.wpilib.examples.sysidroutine; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 1ce1d49946..69d59824a7 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.sysidroutine; +package org.wpilib.examples.sysidroutine; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.CommandScheduler; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.command2.Command; +import org.wpilib.command2.CommandScheduler; /** * 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/sysidroutine/SysIdRoutineBot.java b/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/SysIdRoutineBot.java index afdf3400a8..d35afeafd4 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/SysIdRoutineBot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/SysIdRoutineBot.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.sysidroutine; +package org.wpilib.examples.sysidroutine; -import edu.wpi.first.wpilibj.examples.sysidroutine.Constants.OIConstants; -import edu.wpi.first.wpilibj.examples.sysidroutine.subsystems.Drive; -import edu.wpi.first.wpilibj.examples.sysidroutine.subsystems.Shooter; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.button.CommandXboxController; -import edu.wpi.first.wpilibj2.command.button.Trigger; -import edu.wpi.first.wpilibj2.command.sysid.SysIdRoutine; +import org.wpilib.examples.sysidroutine.Constants.OIConstants; +import org.wpilib.examples.sysidroutine.subsystems.Drive; +import org.wpilib.examples.sysidroutine.subsystems.Shooter; +import org.wpilib.command2.Command; +import org.wpilib.command2.button.CommandXboxController; +import org.wpilib.command2.button.Trigger; +import org.wpilib.command2.sysid.SysIdRoutine; /** * This class is where the bulk of the robot should be declared. Since Command-based is a diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/subsystems/Drive.java b/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/subsystems/Drive.java index 735b8bba0b..c4786d02b4 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/subsystems/Drive.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/subsystems/Drive.java @@ -2,20 +2,20 @@ // 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 edu.wpi.first.wpilibj.examples.sysidroutine.subsystems; +package org.wpilib.examples.sysidroutine.subsystems; -import static edu.wpi.first.units.Units.Meters; -import static edu.wpi.first.units.Units.MetersPerSecond; -import static edu.wpi.first.units.Units.Volts; +import static org.wpilib.units.Units.Meters; +import static org.wpilib.units.Units.MetersPerSecond; +import static org.wpilib.units.Units.Volts; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.RobotController; -import edu.wpi.first.wpilibj.drive.DifferentialDrive; -import edu.wpi.first.wpilibj.examples.sysidroutine.Constants.DriveConstants; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.SubsystemBase; -import edu.wpi.first.wpilibj2.command.sysid.SysIdRoutine; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.system.RobotController; +import org.wpilib.drive.DifferentialDrive; +import org.wpilib.examples.sysidroutine.Constants.DriveConstants; +import org.wpilib.hardware.motor.PWMSparkMax; +import org.wpilib.command2.Command; +import org.wpilib.command2.SubsystemBase; +import org.wpilib.command2.sysid.SysIdRoutine; import java.util.function.DoubleSupplier; public class Drive extends SubsystemBase { diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/subsystems/Shooter.java b/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/subsystems/Shooter.java index e7815f9b19..ec88719993 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/subsystems/Shooter.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/sysidroutine/subsystems/Shooter.java @@ -2,21 +2,21 @@ // 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 edu.wpi.first.wpilibj.examples.sysidroutine.subsystems; +package org.wpilib.examples.sysidroutine.subsystems; -import static edu.wpi.first.units.Units.Rotations; -import static edu.wpi.first.units.Units.RotationsPerSecond; -import static edu.wpi.first.units.Units.Volts; +import static org.wpilib.units.Units.Rotations; +import static org.wpilib.units.Units.RotationsPerSecond; +import static org.wpilib.units.Units.Volts; -import edu.wpi.first.math.controller.PIDController; -import edu.wpi.first.math.controller.SimpleMotorFeedforward; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.RobotController; -import edu.wpi.first.wpilibj.examples.sysidroutine.Constants.ShooterConstants; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.SubsystemBase; -import edu.wpi.first.wpilibj2.command.sysid.SysIdRoutine; +import org.wpilib.math.controller.PIDController; +import org.wpilib.math.controller.SimpleMotorFeedforward; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.system.RobotController; +import org.wpilib.examples.sysidroutine.Constants.ShooterConstants; +import org.wpilib.hardware.motor.PWMSparkMax; +import org.wpilib.command2.Command; +import org.wpilib.command2.SubsystemBase; +import org.wpilib.command2.sysid.SysIdRoutine; import java.util.function.DoubleSupplier; public class Shooter extends SubsystemBase { 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 404d96b509..cb5c3e763a 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrive/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrive/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.tankdrive; +package org.wpilib.examples.tankdrive; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 0e9143df89..aef19b363d 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrive/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrive/Robot.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.examples.tankdrive; +package org.wpilib.examples.tankdrive; -import edu.wpi.first.util.sendable.SendableRegistry; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.drive.DifferentialDrive; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; +import org.wpilib.util.sendable.SendableRegistry; +import org.wpilib.driverstation.Joystick; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.drive.DifferentialDrive; +import org.wpilib.hardware.motor.PWMSparkMax; /** * This is a demo program showing the use of the DifferentialDrive class, specifically it contains 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 ada70f269c..984c844a4d 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrivexboxcontroller/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrivexboxcontroller/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.tankdrivexboxcontroller; +package org.wpilib.examples.tankdrivexboxcontroller; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 6ed1ae1dfc..981e81d648 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrivexboxcontroller/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/tankdrivexboxcontroller/Robot.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.examples.tankdrivexboxcontroller; +package org.wpilib.examples.tankdrivexboxcontroller; -import edu.wpi.first.util.sendable.SendableRegistry; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.XboxController; -import edu.wpi.first.wpilibj.drive.DifferentialDrive; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; +import org.wpilib.util.sendable.SendableRegistry; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.driverstation.XboxController; +import org.wpilib.drive.DifferentialDrive; +import org.wpilib.hardware.motor.PWMSparkMax; /** * This is a demo program showing the use of the DifferentialDrive class. Runs the motors with tank diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Constants.java index cdcfb9d4f6..dd6ae771f3 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Constants.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Constants.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.unittest; +package org.wpilib.examples.unittest; /** * The Constants class provides a convenient place for teams to hold robot-wide numerical or boolean diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Main.java index 4434f47a62..0e0f57443d 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.unittest; +package org.wpilib.examples.unittest; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 292586c80e..4a0da7087f 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/Robot.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.unittest; +package org.wpilib.examples.unittest; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.examples.unittest.Constants.IntakeConstants; -import edu.wpi.first.wpilibj.examples.unittest.subsystems.Intake; +import org.wpilib.driverstation.Joystick; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.examples.unittest.Constants.IntakeConstants; +import org.wpilib.examples.unittest.subsystems.Intake; /** * 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/unittest/subsystems/Intake.java b/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/subsystems/Intake.java index d4d571b170..a6095cb58c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/subsystems/Intake.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/unittest/subsystems/Intake.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.unittest.subsystems; +package org.wpilib.examples.unittest.subsystems; -import edu.wpi.first.wpilibj.DoubleSolenoid; -import edu.wpi.first.wpilibj.PneumaticsModuleType; -import edu.wpi.first.wpilibj.examples.unittest.Constants.IntakeConstants; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; +import org.wpilib.hardware.pneumatic.DoubleSolenoid; +import org.wpilib.hardware.pneumatic.PneumaticsModuleType; +import org.wpilib.examples.unittest.Constants.IntakeConstants; +import org.wpilib.hardware.motor.PWMSparkMax; public class Intake implements AutoCloseable { private final PWMSparkMax m_motor; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Constants.java index 026efdd4c1..7c0bded704 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Constants.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Constants.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.xrpreference; +package org.wpilib.examples.xrpreference; /** * The Constants class provides a convenient place for teams to hold robot-wide numerical or boolean diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Main.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Main.java index 125996d191..457221fb7a 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Main.java @@ -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. -package edu.wpi.first.wpilibj.examples.xrpreference; +package org.wpilib.examples.xrpreference; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 9bb81b3374..bc133390b2 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.xrpreference; +package org.wpilib.examples.xrpreference; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.CommandScheduler; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.command2.Command; +import org.wpilib.command2.CommandScheduler; /** * 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/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/RobotContainer.java index 8c2746bf59..e1595b9d4b 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/RobotContainer.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/RobotContainer.java @@ -2,24 +2,24 @@ // 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 edu.wpi.first.wpilibj.examples.xrpreference; +package org.wpilib.examples.xrpreference; -import edu.wpi.first.wpilibj.GenericHID; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.XboxController; -import edu.wpi.first.wpilibj.examples.xrpreference.commands.ArcadeDrive; -import edu.wpi.first.wpilibj.examples.xrpreference.commands.AutonomousDistance; -import edu.wpi.first.wpilibj.examples.xrpreference.commands.AutonomousTime; -import edu.wpi.first.wpilibj.examples.xrpreference.subsystems.Arm; -import edu.wpi.first.wpilibj.examples.xrpreference.subsystems.Drivetrain; -import edu.wpi.first.wpilibj.smartdashboard.SendableChooser; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; -import edu.wpi.first.wpilibj.xrp.XRPOnBoardIO; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.InstantCommand; -import edu.wpi.first.wpilibj2.command.PrintCommand; -import edu.wpi.first.wpilibj2.command.button.JoystickButton; -import edu.wpi.first.wpilibj2.command.button.Trigger; +import org.wpilib.driverstation.GenericHID; +import org.wpilib.driverstation.Joystick; +import org.wpilib.driverstation.XboxController; +import org.wpilib.examples.xrpreference.commands.ArcadeDrive; +import org.wpilib.examples.xrpreference.commands.AutonomousDistance; +import org.wpilib.examples.xrpreference.commands.AutonomousTime; +import org.wpilib.examples.xrpreference.subsystems.Arm; +import org.wpilib.examples.xrpreference.subsystems.Drivetrain; +import org.wpilib.smartdashboard.SendableChooser; +import org.wpilib.smartdashboard.SmartDashboard; +import org.wpilib.xrp.XRPOnBoardIO; +import org.wpilib.command2.Command; +import org.wpilib.command2.InstantCommand; +import org.wpilib.command2.PrintCommand; +import org.wpilib.command2.button.JoystickButton; +import org.wpilib.command2.button.Trigger; /** * This class is where the bulk of the robot should be declared. Since Command-based is a @@ -48,8 +48,8 @@ public class RobotContainer { /** * Use this method to define your button->command mappings. Buttons can be created by * instantiating a {@link GenericHID} or one of its subclasses ({@link - * edu.wpi.first.wpilibj.Joystick} or {@link XboxController}), and then passing it to a {@link - * edu.wpi.first.wpilibj2.command.button.JoystickButton}. + * org.wpilib.driverstation.Joystick} or {@link XboxController}), and then passing it to a {@link + * org.wpilib.command2.button.JoystickButton}. */ private void configureButtonBindings() { // Default command is arcade drive. This will run unless another command diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/ArcadeDrive.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/ArcadeDrive.java index 0269817aef..09fd616b87 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/ArcadeDrive.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/ArcadeDrive.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.xrpreference.commands; +package org.wpilib.examples.xrpreference.commands; -import edu.wpi.first.wpilibj.examples.xrpreference.subsystems.Drivetrain; -import edu.wpi.first.wpilibj2.command.Command; +import org.wpilib.examples.xrpreference.subsystems.Drivetrain; +import org.wpilib.command2.Command; import java.util.function.Supplier; public class ArcadeDrive extends Command { diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/AutonomousDistance.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/AutonomousDistance.java index 8b8af83e7b..e1dd8bcb04 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/AutonomousDistance.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/AutonomousDistance.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.xrpreference.commands; +package org.wpilib.examples.xrpreference.commands; -import edu.wpi.first.wpilibj.examples.xrpreference.subsystems.Drivetrain; -import edu.wpi.first.wpilibj2.command.SequentialCommandGroup; +import org.wpilib.examples.xrpreference.subsystems.Drivetrain; +import org.wpilib.command2.SequentialCommandGroup; public class AutonomousDistance extends SequentialCommandGroup { /** diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/AutonomousTime.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/AutonomousTime.java index 4fb20d9607..8b7dd0afe7 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/AutonomousTime.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/AutonomousTime.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.xrpreference.commands; +package org.wpilib.examples.xrpreference.commands; -import edu.wpi.first.wpilibj.examples.xrpreference.subsystems.Drivetrain; -import edu.wpi.first.wpilibj2.command.SequentialCommandGroup; +import org.wpilib.examples.xrpreference.subsystems.Drivetrain; +import org.wpilib.command2.SequentialCommandGroup; public class AutonomousTime extends SequentialCommandGroup { /** diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/DriveDistance.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/DriveDistance.java index b7d9640b4a..3776dc55cd 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/DriveDistance.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/DriveDistance.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.xrpreference.commands; +package org.wpilib.examples.xrpreference.commands; -import edu.wpi.first.wpilibj.examples.xrpreference.subsystems.Drivetrain; -import edu.wpi.first.wpilibj2.command.Command; +import org.wpilib.examples.xrpreference.subsystems.Drivetrain; +import org.wpilib.command2.Command; public class DriveDistance extends Command { private final Drivetrain m_drive; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/DriveTime.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/DriveTime.java index 5608c0f8f3..c9312c00cd 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/DriveTime.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/DriveTime.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.xrpreference.commands; +package org.wpilib.examples.xrpreference.commands; -import edu.wpi.first.wpilibj.examples.xrpreference.subsystems.Drivetrain; -import edu.wpi.first.wpilibj2.command.Command; +import org.wpilib.examples.xrpreference.subsystems.Drivetrain; +import org.wpilib.command2.Command; public class DriveTime extends Command { private final double m_duration; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/TurnDegrees.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/TurnDegrees.java index dfee189260..a592f7e0ae 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/TurnDegrees.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/TurnDegrees.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.xrpreference.commands; +package org.wpilib.examples.xrpreference.commands; -import edu.wpi.first.wpilibj.examples.xrpreference.subsystems.Drivetrain; -import edu.wpi.first.wpilibj2.command.Command; +import org.wpilib.examples.xrpreference.subsystems.Drivetrain; +import org.wpilib.command2.Command; public class TurnDegrees extends Command { private final Drivetrain m_drive; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/TurnTime.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/TurnTime.java index 030981ec3c..1f8e0d3956 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/TurnTime.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/commands/TurnTime.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.xrpreference.commands; +package org.wpilib.examples.xrpreference.commands; -import edu.wpi.first.wpilibj.examples.xrpreference.subsystems.Drivetrain; -import edu.wpi.first.wpilibj2.command.Command; +import org.wpilib.examples.xrpreference.subsystems.Drivetrain; +import org.wpilib.command2.Command; /* * Creates a new TurnTime command. This command will turn your robot for a diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/subsystems/Arm.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/subsystems/Arm.java index ecf88b0884..9722c59fc6 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/subsystems/Arm.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/subsystems/Arm.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.examples.xrpreference.subsystems; +package org.wpilib.examples.xrpreference.subsystems; -import edu.wpi.first.wpilibj.xrp.XRPServo; -import edu.wpi.first.wpilibj2.command.SubsystemBase; +import org.wpilib.xrp.XRPServo; +import org.wpilib.command2.SubsystemBase; public class Arm extends SubsystemBase { private final XRPServo m_armServo; diff --git a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/subsystems/Drivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/subsystems/Drivetrain.java index e596b92905..9e4f8a66dd 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/subsystems/Drivetrain.java +++ b/wpilibjExamples/src/main/java/org/wpilib/examples/xrpreference/subsystems/Drivetrain.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj.examples.xrpreference.subsystems; +package org.wpilib.examples.xrpreference.subsystems; -import edu.wpi.first.util.sendable.SendableRegistry; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.drive.DifferentialDrive; -import edu.wpi.first.wpilibj.xrp.XRPGyro; -import edu.wpi.first.wpilibj.xrp.XRPMotor; -import edu.wpi.first.wpilibj2.command.SubsystemBase; +import org.wpilib.util.sendable.SendableRegistry; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.drive.DifferentialDrive; +import org.wpilib.xrp.XRPGyro; +import org.wpilib.xrp.XRPMotor; +import org.wpilib.command2.SubsystemBase; public class Drivetrain extends SubsystemBase { private static final double kGearRatio = 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 66cda16a11..7681fffbd9 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometercollision/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometercollision/Main.java @@ -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. -package edu.wpi.first.wpilibj.snippets.accelerometercollision; +package org.wpilib.snippets.accelerometercollision; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 acdecf9119..dfab2fa1d2 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometercollision/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometercollision/Robot.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.snippets.accelerometercollision; +package org.wpilib.snippets.accelerometercollision; -import edu.wpi.first.wpilibj.OnboardIMU; -import edu.wpi.first.wpilibj.OnboardIMU.MountOrientation; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; +import org.wpilib.hardware.imu.OnboardIMU; +import org.wpilib.hardware.imu.OnboardIMU.MountOrientation; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.smartdashboard.SmartDashboard; /** * Collision detection snippets for frc-docs. 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 149c542bb2..8b5ac4b12a 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometerfilter/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometerfilter/Main.java @@ -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. -package edu.wpi.first.wpilibj.snippets.accelerometerfilter; +package org.wpilib.snippets.accelerometerfilter; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 7e3d99819e..632b23a2fa 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometerfilter/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/accelerometerfilter/Robot.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.snippets.accelerometerfilter; +package org.wpilib.snippets.accelerometerfilter; -import edu.wpi.first.math.filter.LinearFilter; -import edu.wpi.first.wpilibj.OnboardIMU; -import edu.wpi.first.wpilibj.OnboardIMU.MountOrientation; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; +import org.wpilib.math.filter.LinearFilter; +import org.wpilib.hardware.imu.OnboardIMU; +import org.wpilib.hardware.imu.OnboardIMU.MountOrientation; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.smartdashboard.SmartDashboard; /** * Accelerometer filtering snippets for frc-docs. 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 ea62717693..26af8398d1 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/adxlaccelerometers/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/adxlaccelerometers/Main.java @@ -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. -package edu.wpi.first.wpilibj.snippets.adxlaccelerometers; +package org.wpilib.snippets.adxlaccelerometers; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 562ff548cb..7c9597c72f 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/adxlaccelerometers/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/adxlaccelerometers/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.snippets.adxlaccelerometers; +package org.wpilib.snippets.adxlaccelerometers; -import edu.wpi.first.wpilibj.ADXL345_I2C; -import edu.wpi.first.wpilibj.I2C; -import edu.wpi.first.wpilibj.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 fdce111b55..a520408e4c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/analogaccelerometer/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogaccelerometer/Main.java @@ -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. -package edu.wpi.first.wpilibj.snippets.analogaccelerometer; +package org.wpilib.snippets.analogaccelerometer; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 adbb5bee35..2dbed7d781 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/analogaccelerometer/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogaccelerometer/Robot.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.snippets.analogaccelerometer; +package org.wpilib.snippets.analogaccelerometer; -import edu.wpi.first.wpilibj.AnalogAccelerometer; -import edu.wpi.first.wpilibj.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 0e074925d0..c4ec1cd01a 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/analogencoder/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogencoder/Main.java @@ -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. -package edu.wpi.first.wpilibj.snippets.analogencoder; +package org.wpilib.snippets.analogencoder; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 aa09daf933..e065839bd2 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/analogencoder/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogencoder/Robot.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.snippets.analogencoder; +package org.wpilib.snippets.analogencoder; -import edu.wpi.first.wpilibj.AnalogEncoder; -import edu.wpi.first.wpilibj.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 767b0c3bce..aa0a3d3296 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/analoginput/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/analoginput/Main.java @@ -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. -package edu.wpi.first.wpilibj.snippets.analoginput; +package org.wpilib.snippets.analoginput; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 b59e103a56..20cc09c639 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/analoginput/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/analoginput/Robot.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.snippets.analoginput; +package org.wpilib.snippets.analoginput; -import edu.wpi.first.wpilibj.AnalogInput; -import edu.wpi.first.wpilibj.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 b64b880a95..0ecf2e72bf 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/analogpotentiometer/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogpotentiometer/Main.java @@ -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. -package edu.wpi.first.wpilibj.snippets.analogpotentiometer; +package org.wpilib.snippets.analogpotentiometer; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 cbb836cec7..391cdae366 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/analogpotentiometer/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/analogpotentiometer/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.snippets.analogpotentiometer; +package org.wpilib.snippets.analogpotentiometer; -import edu.wpi.first.wpilibj.AnalogInput; -import edu.wpi.first.wpilibj.AnalogPotentiometer; -import edu.wpi.first.wpilibj.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 fb52ad8ae6..bb9649c3f3 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/digitalinput/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/digitalinput/Main.java @@ -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. -package edu.wpi.first.wpilibj.snippets.digitalinput; +package org.wpilib.snippets.digitalinput; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 999c72821f..db91fc44f4 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/digitalinput/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/digitalinput/Robot.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.snippets.digitalinput; +package org.wpilib.snippets.digitalinput; -import edu.wpi.first.wpilibj.DigitalInput; -import edu.wpi.first.wpilibj.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 add47abd4d..b9f5887a42 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/dutycycleencoder/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/dutycycleencoder/Main.java @@ -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. -package edu.wpi.first.wpilibj.snippets.dutycycleencoder; +package org.wpilib.snippets.dutycycleencoder; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 ed7e3fe89b..66884c45d0 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/dutycycleencoder/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/dutycycleencoder/Robot.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.snippets.dutycycleencoder; +package org.wpilib.snippets.dutycycleencoder; -import edu.wpi.first.wpilibj.DutyCycleEncoder; -import edu.wpi.first.wpilibj.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 4fef5feb29..bc96c509e6 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/encoder/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoder/Main.java @@ -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. -package edu.wpi.first.wpilibj.snippets.encoder; +package org.wpilib.snippets.encoder; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 de1511bd55..7f33b41c9a 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/encoder/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoder/Robot.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.snippets.encoder; +package org.wpilib.snippets.encoder; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.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 e351e54948..0f7d3ba1f7 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderdrive/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderdrive/Main.java @@ -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. -package edu.wpi.first.wpilibj.snippets.encoderdrive; +package org.wpilib.snippets.encoderdrive; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 de41a19102..9dfdc69de6 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderdrive/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderdrive/Robot.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.snippets.encoderdrive; +package org.wpilib.snippets.encoderdrive; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.drive.DifferentialDrive; -import edu.wpi.first.wpilibj.motorcontrol.Spark; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.drive.DifferentialDrive; +import org.wpilib.hardware.motor.Spark; /** * 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 f014009221..c991d24e41 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderhoming/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderhoming/Main.java @@ -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. -package edu.wpi.first.wpilibj.snippets.encoderhoming; +package org.wpilib.snippets.encoderhoming; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 34e60d1b5b..eb9d149177 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderhoming/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/encoderhoming/Robot.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.snippets.encoderhoming; +package org.wpilib.snippets.encoderhoming; -import edu.wpi.first.wpilibj.DigitalInput; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.motorcontrol.Spark; +import org.wpilib.hardware.discrete.DigitalInput; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.hardware.motor.Spark; /** * 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 19c1da0b45..b379c6afbd 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/limitswitch/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/limitswitch/Main.java @@ -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. -package edu.wpi.first.wpilibj.snippets.limitswitch; +package org.wpilib.snippets.limitswitch; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 73c2b6c398..7d7811e504 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/limitswitch/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/limitswitch/Robot.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.snippets.limitswitch; +package org.wpilib.snippets.limitswitch; -import edu.wpi.first.wpilibj.DigitalInput; -import edu.wpi.first.wpilibj.Joystick; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.motorcontrol.PWMVictorSPX; +import org.wpilib.hardware.discrete.DigitalInput; +import org.wpilib.driverstation.Joystick; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.hardware.motor.PWMVictorSPX; /** * 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 bc9b0a7b6f..ac0bf1250b 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/onboardimu/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/onboardimu/Main.java @@ -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. -package edu.wpi.first.wpilibj.snippets.onboardimu; +package org.wpilib.snippets.onboardimu; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 ab29b57e4f..07ad66d4af 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/onboardimu/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/onboardimu/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.snippets.onboardimu; +package org.wpilib.snippets.onboardimu; -import edu.wpi.first.wpilibj.OnboardIMU; -import edu.wpi.first.wpilibj.OnboardIMU.MountOrientation; -import edu.wpi.first.wpilibj.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 1fc6c2ec2b..95af619f0d 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/profiledpidfeedforward/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/profiledpidfeedforward/Main.java @@ -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. -package edu.wpi.first.wpilibj.snippets.profiledpidfeedforward; +package org.wpilib.snippets.profiledpidfeedforward; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 4c60a509d7..a94ee9022f 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/snippets/profiledpidfeedforward/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/snippets/profiledpidfeedforward/Robot.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.wpilibj.snippets.profiledpidfeedforward; +package org.wpilib.snippets.profiledpidfeedforward; -import edu.wpi.first.math.controller.ProfiledPIDController; -import edu.wpi.first.math.controller.SimpleMotorFeedforward; -import edu.wpi.first.math.trajectory.TrapezoidProfile; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.motorcontrol.PWMSparkMax; +import org.wpilib.math.controller.ProfiledPIDController; +import org.wpilib.math.controller.SimpleMotorFeedforward; +import org.wpilib.math.trajectory.TrapezoidProfile; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.hardware.motor.PWMSparkMax; /** * ProfiledPIDController with feedforward snippets for frc-docs. diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Constants.java index 0c958be1b0..f0a5e72b89 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Constants.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Constants.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.commandbased; +package org.wpilib.templates.commandbased; /** * The Constants class provides a convenient place for teams to hold robot-wide numerical or boolean diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Main.java index 7fa438b5b3..df61e0d095 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Main.java @@ -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. -package edu.wpi.first.wpilibj.templates.commandbased; +package org.wpilib.templates.commandbased; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 053bd402fc..1c6c50eabe 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.commandbased; +package org.wpilib.templates.commandbased; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.CommandScheduler; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.command2.Command; +import org.wpilib.command2.CommandScheduler; /** * 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/commandbased/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/RobotContainer.java index c29ad382cd..cc36306ecf 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/RobotContainer.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/RobotContainer.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.commandbased; +package org.wpilib.templates.commandbased; -import edu.wpi.first.wpilibj.templates.commandbased.Constants.OperatorConstants; -import edu.wpi.first.wpilibj.templates.commandbased.commands.Autos; -import edu.wpi.first.wpilibj.templates.commandbased.commands.ExampleCommand; -import edu.wpi.first.wpilibj.templates.commandbased.subsystems.ExampleSubsystem; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.button.CommandXboxController; -import edu.wpi.first.wpilibj2.command.button.Trigger; +import org.wpilib.templates.commandbased.Constants.OperatorConstants; +import org.wpilib.templates.commandbased.commands.Autos; +import org.wpilib.templates.commandbased.commands.ExampleCommand; +import org.wpilib.templates.commandbased.subsystems.ExampleSubsystem; +import org.wpilib.command2.Command; +import org.wpilib.command2.button.CommandXboxController; +import org.wpilib.command2.button.Trigger; /** * This class is where the bulk of the robot should be declared. Since Command-based is a @@ -36,9 +36,9 @@ public class RobotContainer { * Use this method to define your trigger->command mappings. Triggers can be created via the * {@link Trigger#Trigger(java.util.function.BooleanSupplier)} constructor with an arbitrary * predicate, or via the named factories in {@link - * edu.wpi.first.wpilibj2.command.button.CommandGenericHID}'s subclasses for {@link - * CommandXboxController Xbox}/{@link edu.wpi.first.wpilibj2.command.button.CommandPS4Controller - * PS4} controllers or {@link edu.wpi.first.wpilibj2.command.button.CommandJoystick Flight + * org.wpilib.command2.button.CommandGenericHID}'s subclasses for {@link + * CommandXboxController Xbox}/{@link org.wpilib.command2.button.CommandPS4Controller + * PS4} controllers or {@link org.wpilib.command2.button.CommandJoystick Flight * joysticks}. */ private void configureBindings() { diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/commands/Autos.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/commands/Autos.java index 1126d8dbb6..26125b002b 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/commands/Autos.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/commands/Autos.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.commandbased.commands; +package org.wpilib.templates.commandbased.commands; -import edu.wpi.first.wpilibj.templates.commandbased.subsystems.ExampleSubsystem; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.Commands; +import org.wpilib.templates.commandbased.subsystems.ExampleSubsystem; +import org.wpilib.command2.Command; +import org.wpilib.command2.Commands; public final class Autos { /** Example static factory for an autonomous command. */ diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/commands/ExampleCommand.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/commands/ExampleCommand.java index 36f57ccabb..0f25557aa6 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/commands/ExampleCommand.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/commands/ExampleCommand.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.commandbased.commands; +package org.wpilib.templates.commandbased.commands; -import edu.wpi.first.wpilibj.templates.commandbased.subsystems.ExampleSubsystem; -import edu.wpi.first.wpilibj2.command.Command; +import org.wpilib.templates.commandbased.subsystems.ExampleSubsystem; +import org.wpilib.command2.Command; /** An example command that uses an example subsystem. */ public class ExampleCommand extends Command { diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/subsystems/ExampleSubsystem.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/subsystems/ExampleSubsystem.java index 1c62fdbef2..ccfe59b523 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/subsystems/ExampleSubsystem.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbased/subsystems/ExampleSubsystem.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.commandbased.subsystems; +package org.wpilib.templates.commandbased.subsystems; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.SubsystemBase; +import org.wpilib.command2.Command; +import org.wpilib.command2.SubsystemBase; public class ExampleSubsystem extends SubsystemBase { /** Creates a new ExampleSubsystem. */ 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 efa0c2e716..608bb4a3f1 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/Main.java @@ -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. -package edu.wpi.first.wpilibj.templates.commandbasedskeleton; +package org.wpilib.templates.commandbasedskeleton; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 45dc6fc8f2..14ca304894 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.commandbasedskeleton; +package org.wpilib.templates.commandbasedskeleton; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.CommandScheduler; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.command2.Command; +import org.wpilib.command2.CommandScheduler; public class Robot extends TimedRobot { private Command m_autonomousCommand; diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/RobotContainer.java index d6e4d256a6..1b785388c2 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/RobotContainer.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/commandbasedskeleton/RobotContainer.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.commandbasedskeleton; +package org.wpilib.templates.commandbasedskeleton; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.Commands; +import org.wpilib.command2.Command; +import org.wpilib.command2.Commands; public class RobotContainer { public RobotContainer() { 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 29c4022dec..95aa9e30fd 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/educational/EducationalRobot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/educational/EducationalRobot.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.templates.educational; +package org.wpilib.templates.educational; -import edu.wpi.first.hal.DriverStationJNI; -import edu.wpi.first.util.WPIUtilJNI; -import edu.wpi.first.wpilibj.DriverStation; -import edu.wpi.first.wpilibj.RobotBase; -import edu.wpi.first.wpilibj.internal.DriverStationModeThread; +import org.wpilib.hardware.hal.DriverStationJNI; +import org.wpilib.util.WPIUtilJNI; +import org.wpilib.driverstation.DriverStation; +import org.wpilib.opmode.RobotBase; +import org.wpilib.internal.DriverStationModeThread; /** Educational robot base class. */ public class EducationalRobot extends RobotBase { 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 80b9bc9d02..8bc985fd46 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/educational/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/educational/Main.java @@ -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. -package edu.wpi.first.wpilibj.templates.educational; +package org.wpilib.templates.educational; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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/educational/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/educational/Robot.java index 8c55e34f5e..6f57a763ad 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/educational/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/educational/Robot.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.educational; +package org.wpilib.templates.educational; /** * The run() function is called automatically when the robot is enabled. If you change the name of 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 e465d47d85..f9969a2aaf 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/robotbaseskeleton/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/robotbaseskeleton/Main.java @@ -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. -package edu.wpi.first.wpilibj.templates.robotbaseskeleton; +package org.wpilib.templates.robotbaseskeleton; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 dfad4caf1e..50f37157b7 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/robotbaseskeleton/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/robotbaseskeleton/Robot.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.templates.robotbaseskeleton; +package org.wpilib.templates.robotbaseskeleton; -import edu.wpi.first.hal.DriverStationJNI; -import edu.wpi.first.util.WPIUtilJNI; -import edu.wpi.first.wpilibj.DriverStation; -import edu.wpi.first.wpilibj.RobotBase; -import edu.wpi.first.wpilibj.internal.DriverStationModeThread; +import org.wpilib.hardware.hal.DriverStationJNI; +import org.wpilib.util.WPIUtilJNI; +import org.wpilib.driverstation.DriverStation; +import org.wpilib.opmode.RobotBase; +import org.wpilib.internal.DriverStationModeThread; /** * This class is run automatically. If you change the name of this class or the package after diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Constants.java index 9a1ab69257..9565d0cc25 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Constants.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Constants.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.romicommandbased; +package org.wpilib.templates.romicommandbased; /** * The Constants class provides a convenient place for teams to hold robot-wide numerical or boolean diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Main.java index b73f963300..0a05cedbf3 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Main.java @@ -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. -package edu.wpi.first.wpilibj.templates.romicommandbased; +package org.wpilib.templates.romicommandbased; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 6831a89e26..f042806525 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.romicommandbased; +package org.wpilib.templates.romicommandbased; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.CommandScheduler; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.command2.Command; +import org.wpilib.command2.CommandScheduler; /** * 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/romicommandbased/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/RobotContainer.java index 11596a5262..ceaeb39a74 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/RobotContainer.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/RobotContainer.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.romicommandbased; +package org.wpilib.templates.romicommandbased; -import edu.wpi.first.wpilibj.XboxController; -import edu.wpi.first.wpilibj.templates.romicommandbased.commands.ExampleCommand; -import edu.wpi.first.wpilibj.templates.romicommandbased.subsystems.RomiDrivetrain; -import edu.wpi.first.wpilibj2.command.Command; +import org.wpilib.driverstation.XboxController; +import org.wpilib.templates.romicommandbased.commands.ExampleCommand; +import org.wpilib.templates.romicommandbased.subsystems.RomiDrivetrain; +import org.wpilib.command2.Command; /** * This class is where the bulk of the robot should be declared. Since Command-based is a @@ -29,9 +29,9 @@ public class RobotContainer { /** * Use this method to define your button->command mappings. Buttons can be created by - * instantiating a {@link edu.wpi.first.wpilibj.GenericHID} or one of its subclasses ({@link - * edu.wpi.first.wpilibj.Joystick} or {@link XboxController}), and then passing it to a {@link - * edu.wpi.first.wpilibj2.command.button.JoystickButton}. + * instantiating a {@link org.wpilib.driverstation.GenericHID} or one of its subclasses ({@link + * org.wpilib.driverstation.Joystick} or {@link XboxController}), and then passing it to a {@link + * org.wpilib.command2.button.JoystickButton}. */ private void configureButtonBindings() {} diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/commands/ExampleCommand.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/commands/ExampleCommand.java index 62e8d0ca73..01832951b2 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/commands/ExampleCommand.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/commands/ExampleCommand.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.romicommandbased.commands; +package org.wpilib.templates.romicommandbased.commands; -import edu.wpi.first.wpilibj.templates.romicommandbased.subsystems.RomiDrivetrain; -import edu.wpi.first.wpilibj2.command.Command; +import org.wpilib.templates.romicommandbased.subsystems.RomiDrivetrain; +import org.wpilib.command2.Command; /** An example command that uses an example subsystem. */ public class ExampleCommand extends Command { diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/subsystems/RomiDrivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/subsystems/RomiDrivetrain.java index c1cfac1f32..69ab60b888 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/subsystems/RomiDrivetrain.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romicommandbased/subsystems/RomiDrivetrain.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.romicommandbased.subsystems; +package org.wpilib.templates.romicommandbased.subsystems; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.drive.DifferentialDrive; -import edu.wpi.first.wpilibj.motorcontrol.Spark; -import edu.wpi.first.wpilibj2.command.SubsystemBase; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.drive.DifferentialDrive; +import org.wpilib.hardware.motor.Spark; +import org.wpilib.command2.SubsystemBase; public class RomiDrivetrain extends SubsystemBase { private static final double kCountsPerRevolution = 1440.0; 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 a9a777e42a..b4333987ce 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/EducationalRobot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/EducationalRobot.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.templates.romieducational; +package org.wpilib.templates.romieducational; -import edu.wpi.first.hal.DriverStationJNI; -import edu.wpi.first.util.WPIUtilJNI; -import edu.wpi.first.wpilibj.DriverStation; -import edu.wpi.first.wpilibj.RobotBase; -import edu.wpi.first.wpilibj.internal.DriverStationModeThread; +import org.wpilib.hardware.hal.DriverStationJNI; +import org.wpilib.util.WPIUtilJNI; +import org.wpilib.driverstation.DriverStation; +import org.wpilib.opmode.RobotBase; +import org.wpilib.internal.DriverStationModeThread; /** Educational robot base class. */ public class EducationalRobot extends RobotBase { 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 091543ec0f..79f12f01d5 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/Main.java @@ -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. -package edu.wpi.first.wpilibj.templates.romieducational; +package org.wpilib.templates.romieducational; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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/romieducational/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/Robot.java index 4edc5615d7..81db287a12 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/Robot.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.romieducational; +package org.wpilib.templates.romieducational; /** * The run() function is called automatically when the robot is enabled. If you change the name of diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/RomiDrivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/RomiDrivetrain.java index 7d2a4381cb..ca59573988 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/RomiDrivetrain.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romieducational/RomiDrivetrain.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.romieducational; +package org.wpilib.templates.romieducational; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.drive.DifferentialDrive; -import edu.wpi.first.wpilibj.motorcontrol.Spark; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.drive.DifferentialDrive; +import org.wpilib.hardware.motor.Spark; public class RomiDrivetrain { private static final double kCountsPerRevolution = 1440.0; 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 69c9ced687..c7c89f7b05 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romitimed/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romitimed/Main.java @@ -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. -package edu.wpi.first.wpilibj.templates.romitimed; +package org.wpilib.templates.romitimed; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 e1237c4b62..ba8cd30d7d 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romitimed/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romitimed/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.romitimed; +package org.wpilib.templates.romitimed; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.smartdashboard.SendableChooser; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.smartdashboard.SendableChooser; +import org.wpilib.smartdashboard.SmartDashboard; /** * 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/romitimed/RomiDrivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/templates/romitimed/RomiDrivetrain.java index a0f4f47b38..ee293e0e92 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/romitimed/RomiDrivetrain.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/romitimed/RomiDrivetrain.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.romitimed; +package org.wpilib.templates.romitimed; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.drive.DifferentialDrive; -import edu.wpi.first.wpilibj.motorcontrol.Spark; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.drive.DifferentialDrive; +import org.wpilib.hardware.motor.Spark; public class RomiDrivetrain { private static final double kCountsPerRevolution = 1440.0; 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 9a3f9c7d72..4c976aa523 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/timed/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/timed/Main.java @@ -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. -package edu.wpi.first.wpilibj.templates.timed; +package org.wpilib.templates.timed; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 fcd961f81b..ed2e64666a 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/timed/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/timed/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.timed; +package org.wpilib.templates.timed; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.smartdashboard.SendableChooser; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.smartdashboard.SendableChooser; +import org.wpilib.smartdashboard.SmartDashboard; /** * 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/timedskeleton/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/timedskeleton/Main.java index ebe7ba4a71..59887747b3 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/timedskeleton/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/timedskeleton/Main.java @@ -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. -package edu.wpi.first.wpilibj.templates.timedskeleton; +package org.wpilib.templates.timedskeleton; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 5dc930077f..b0c9adb4c7 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/timedskeleton/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/timedskeleton/Robot.java @@ -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. -package edu.wpi.first.wpilibj.templates.timedskeleton; +package org.wpilib.templates.timedskeleton; -import edu.wpi.first.wpilibj.TimedRobot; +import org.wpilib.opmode.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 313d179309..a3eb1d9234 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/timeslice/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/timeslice/Main.java @@ -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. -package edu.wpi.first.wpilibj.templates.timeslice; +package org.wpilib.templates.timeslice; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 be7221f7a7..9949d1f355 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/timeslice/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/timeslice/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.timeslice; +package org.wpilib.templates.timeslice; -import edu.wpi.first.wpilibj.TimesliceRobot; -import edu.wpi.first.wpilibj.smartdashboard.SendableChooser; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; +import org.wpilib.opmode.TimesliceRobot; +import org.wpilib.smartdashboard.SendableChooser; +import org.wpilib.smartdashboard.SmartDashboard; /** * 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/timesliceskeleton/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/timesliceskeleton/Main.java index bc92fc4436..eb760c8f8a 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/timesliceskeleton/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/timesliceskeleton/Main.java @@ -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. -package edu.wpi.first.wpilibj.templates.timesliceskeleton; +package org.wpilib.templates.timesliceskeleton; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 665018ebc4..7c34555766 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/timesliceskeleton/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/timesliceskeleton/Robot.java @@ -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. -package edu.wpi.first.wpilibj.templates.timesliceskeleton; +package org.wpilib.templates.timesliceskeleton; -import edu.wpi.first.wpilibj.TimesliceRobot; +import org.wpilib.opmode.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/Constants.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Constants.java index cd72c67ef5..a43a8ab35c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Constants.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Constants.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.xrpcommandbased; +package org.wpilib.templates.xrpcommandbased; /** * The Constants class provides a convenient place for teams to hold robot-wide numerical or boolean diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Main.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Main.java index babb187530..767447b89c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Main.java @@ -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. -package edu.wpi.first.wpilibj.templates.xrpcommandbased; +package org.wpilib.templates.xrpcommandbased; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 4196c275e2..09a93f81d2 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.xrpcommandbased; +package org.wpilib.templates.xrpcommandbased; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.CommandScheduler; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.command2.Command; +import org.wpilib.command2.CommandScheduler; /** * 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/RobotContainer.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/RobotContainer.java index e6059ca473..ed49b8cf44 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/RobotContainer.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/RobotContainer.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.xrpcommandbased; +package org.wpilib.templates.xrpcommandbased; -import edu.wpi.first.wpilibj.XboxController; -import edu.wpi.first.wpilibj.templates.xrpcommandbased.commands.ExampleCommand; -import edu.wpi.first.wpilibj.templates.xrpcommandbased.subsystems.XRPDrivetrain; -import edu.wpi.first.wpilibj2.command.Command; +import org.wpilib.driverstation.XboxController; +import org.wpilib.templates.xrpcommandbased.commands.ExampleCommand; +import org.wpilib.templates.xrpcommandbased.subsystems.XRPDrivetrain; +import org.wpilib.command2.Command; /** * This class is where the bulk of the robot should be declared. Since Command-based is a @@ -29,9 +29,9 @@ public class RobotContainer { /** * Use this method to define your button->command mappings. Buttons can be created by - * instantiating a {@link edu.wpi.first.wpilibj.GenericHID} or one of its subclasses ({@link - * edu.wpi.first.wpilibj.Joystick} or {@link XboxController}), and then passing it to a {@link - * edu.wpi.first.wpilibj2.command.button.JoystickButton}. + * instantiating a {@link org.wpilib.driverstation.GenericHID} or one of its subclasses ({@link + * org.wpilib.driverstation.Joystick} or {@link XboxController}), and then passing it to a {@link + * org.wpilib.command2.button.JoystickButton}. */ private void configureButtonBindings() {} diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/commands/ExampleCommand.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/commands/ExampleCommand.java index 6b352b939e..b1b1eac02e 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/commands/ExampleCommand.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/commands/ExampleCommand.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.xrpcommandbased.commands; +package org.wpilib.templates.xrpcommandbased.commands; -import edu.wpi.first.wpilibj.templates.xrpcommandbased.subsystems.XRPDrivetrain; -import edu.wpi.first.wpilibj2.command.Command; +import org.wpilib.templates.xrpcommandbased.subsystems.XRPDrivetrain; +import org.wpilib.command2.Command; /** An example command that uses an example subsystem. */ public class ExampleCommand extends Command { diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/subsystems/XRPDrivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/subsystems/XRPDrivetrain.java index 85febbed59..5a9f15aa5b 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/subsystems/XRPDrivetrain.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpcommandbased/subsystems/XRPDrivetrain.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.xrpcommandbased.subsystems; +package org.wpilib.templates.xrpcommandbased.subsystems; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.drive.DifferentialDrive; -import edu.wpi.first.wpilibj.xrp.XRPMotor; -import edu.wpi.first.wpilibj2.command.SubsystemBase; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.drive.DifferentialDrive; +import org.wpilib.xrp.XRPMotor; +import org.wpilib.command2.SubsystemBase; public class XRPDrivetrain extends SubsystemBase { private static final double kGearRatio = 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 0a6245c089..f9c42d52d9 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/EducationalRobot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/EducationalRobot.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.templates.xrpeducational; +package org.wpilib.templates.xrpeducational; -import edu.wpi.first.hal.DriverStationJNI; -import edu.wpi.first.util.WPIUtilJNI; -import edu.wpi.first.wpilibj.DriverStation; -import edu.wpi.first.wpilibj.RobotBase; -import edu.wpi.first.wpilibj.internal.DriverStationModeThread; +import org.wpilib.hardware.hal.DriverStationJNI; +import org.wpilib.util.WPIUtilJNI; +import org.wpilib.driverstation.DriverStation; +import org.wpilib.opmode.RobotBase; +import org.wpilib.internal.DriverStationModeThread; /** Educational robot base class. */ public class EducationalRobot extends RobotBase { 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 dbb4d81e24..466037c548 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/Main.java @@ -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. -package edu.wpi.first.wpilibj.templates.xrpeducational; +package org.wpilib.templates.xrpeducational; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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/xrpeducational/Robot.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/Robot.java index 16f05ab11b..5155d86a1f 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/Robot.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.xrpeducational; +package org.wpilib.templates.xrpeducational; /** * The run() function is called automatically when the robot is enabled. If you change the name of diff --git a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/XRPDrivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/XRPDrivetrain.java index a245955805..f47ec06669 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/XRPDrivetrain.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrpeducational/XRPDrivetrain.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.xrpeducational; +package org.wpilib.templates.xrpeducational; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.drive.DifferentialDrive; -import edu.wpi.first.wpilibj.xrp.XRPMotor; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.drive.DifferentialDrive; +import org.wpilib.xrp.XRPMotor; public class XRPDrivetrain { private static final double kGearRatio = 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 6405cdc843..d6ef3ec01c 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrptimed/Main.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrptimed/Main.java @@ -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. -package edu.wpi.first.wpilibj.templates.xrptimed; +package org.wpilib.templates.xrptimed; -import edu.wpi.first.wpilibj.RobotBase; +import org.wpilib.opmode.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 855ba2444a..60b2885556 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrptimed/Robot.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrptimed/Robot.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.xrptimed; +package org.wpilib.templates.xrptimed; -import edu.wpi.first.wpilibj.TimedRobot; -import edu.wpi.first.wpilibj.smartdashboard.SendableChooser; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; +import org.wpilib.opmode.TimedRobot; +import org.wpilib.smartdashboard.SendableChooser; +import org.wpilib.smartdashboard.SmartDashboard; /** * 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/xrptimed/XRPDrivetrain.java b/wpilibjExamples/src/main/java/org/wpilib/templates/xrptimed/XRPDrivetrain.java index 790acc7801..68cd4f2179 100644 --- a/wpilibjExamples/src/main/java/org/wpilib/templates/xrptimed/XRPDrivetrain.java +++ b/wpilibjExamples/src/main/java/org/wpilib/templates/xrptimed/XRPDrivetrain.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.templates.xrptimed; +package org.wpilib.templates.xrptimed; -import edu.wpi.first.wpilibj.Encoder; -import edu.wpi.first.wpilibj.drive.DifferentialDrive; -import edu.wpi.first.wpilibj.xrp.XRPMotor; +import org.wpilib.hardware.rotation.Encoder; +import org.wpilib.drive.DifferentialDrive; +import org.wpilib.xrp.XRPMotor; public class XRPDrivetrain { private static final double kGearRatio = diff --git a/wpilibjExamples/src/test/java/org/wpilib/examples/armsimulation/ArmSimulationTest.java b/wpilibjExamples/src/test/java/org/wpilib/examples/armsimulation/ArmSimulationTest.java index 1a0fdee5e6..54bcdaf9ec 100644 --- a/wpilibjExamples/src/test/java/org/wpilib/examples/armsimulation/ArmSimulationTest.java +++ b/wpilibjExamples/src/test/java/org/wpilib/examples/armsimulation/ArmSimulationTest.java @@ -2,20 +2,20 @@ // 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 edu.wpi.first.wpilibj.examples.armsimulation; +package org.wpilib.examples.armsimulation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.math.util.Units; -import edu.wpi.first.wpilibj.Preferences; -import edu.wpi.first.wpilibj.simulation.DriverStationSim; -import edu.wpi.first.wpilibj.simulation.EncoderSim; -import edu.wpi.first.wpilibj.simulation.JoystickSim; -import edu.wpi.first.wpilibj.simulation.PWMMotorControllerSim; -import edu.wpi.first.wpilibj.simulation.RoboRioSim; -import edu.wpi.first.wpilibj.simulation.SimHooks; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.math.util.Units; +import org.wpilib.util.Preferences; +import org.wpilib.simulation.DriverStationSim; +import org.wpilib.simulation.EncoderSim; +import org.wpilib.simulation.JoystickSim; +import org.wpilib.simulation.PWMMotorControllerSim; +import org.wpilib.simulation.RoboRioSim; +import org.wpilib.simulation.SimHooks; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.parallel.ResourceLock; diff --git a/wpilibjExamples/src/test/java/org/wpilib/examples/digitalcommunication/DigitalCommunicationTest.java b/wpilibjExamples/src/test/java/org/wpilib/examples/digitalcommunication/DigitalCommunicationTest.java index 9f11dc9e3c..8a5e1af4ce 100644 --- a/wpilibjExamples/src/test/java/org/wpilib/examples/digitalcommunication/DigitalCommunicationTest.java +++ b/wpilibjExamples/src/test/java/org/wpilib/examples/digitalcommunication/DigitalCommunicationTest.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.wpilibj.examples.digitalcommunication; +package org.wpilib.examples.digitalcommunication; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.AllianceStationID; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.simulation.DIOSim; -import edu.wpi.first.wpilibj.simulation.DriverStationSim; -import edu.wpi.first.wpilibj.simulation.SimHooks; +import org.wpilib.hardware.hal.AllianceStationID; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.simulation.DIOSim; +import org.wpilib.simulation.DriverStationSim; +import org.wpilib.simulation.SimHooks; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.parallel.ResourceLock; diff --git a/wpilibjExamples/src/test/java/org/wpilib/examples/elevatorsimulation/ElevatorSimulationTest.java b/wpilibjExamples/src/test/java/org/wpilib/examples/elevatorsimulation/ElevatorSimulationTest.java index ac53b2ba9c..eee7f1d1e0 100644 --- a/wpilibjExamples/src/test/java/org/wpilib/examples/elevatorsimulation/ElevatorSimulationTest.java +++ b/wpilibjExamples/src/test/java/org/wpilib/examples/elevatorsimulation/ElevatorSimulationTest.java @@ -2,18 +2,18 @@ // 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 edu.wpi.first.wpilibj.examples.elevatorsimulation; +package org.wpilib.examples.elevatorsimulation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.simulation.DriverStationSim; -import edu.wpi.first.wpilibj.simulation.EncoderSim; -import edu.wpi.first.wpilibj.simulation.JoystickSim; -import edu.wpi.first.wpilibj.simulation.PWMMotorControllerSim; -import edu.wpi.first.wpilibj.simulation.RoboRioSim; -import edu.wpi.first.wpilibj.simulation.SimHooks; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.simulation.DriverStationSim; +import org.wpilib.simulation.EncoderSim; +import org.wpilib.simulation.JoystickSim; +import org.wpilib.simulation.PWMMotorControllerSim; +import org.wpilib.simulation.RoboRioSim; +import org.wpilib.simulation.SimHooks; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/wpilibjExamples/src/test/java/org/wpilib/examples/i2ccommunication/I2CCommunicationTest.java b/wpilibjExamples/src/test/java/org/wpilib/examples/i2ccommunication/I2CCommunicationTest.java index 278f97f9d8..e4733758ca 100644 --- a/wpilibjExamples/src/test/java/org/wpilib/examples/i2ccommunication/I2CCommunicationTest.java +++ b/wpilibjExamples/src/test/java/org/wpilib/examples/i2ccommunication/I2CCommunicationTest.java @@ -2,19 +2,19 @@ // 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 edu.wpi.first.wpilibj.examples.i2ccommunication; +package org.wpilib.examples.i2ccommunication; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.AllianceStationID; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.DriverStation; -import edu.wpi.first.wpilibj.simulation.CallbackStore; -import edu.wpi.first.wpilibj.simulation.DriverStationSim; -import edu.wpi.first.wpilibj.simulation.I2CSim; -import edu.wpi.first.wpilibj.simulation.SimHooks; +import org.wpilib.hardware.hal.AllianceStationID; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.driverstation.DriverStation; +import org.wpilib.simulation.CallbackStore; +import org.wpilib.simulation.DriverStationSim; +import org.wpilib.simulation.I2CSim; +import org.wpilib.simulation.SimHooks; import java.time.Duration; import java.util.concurrent.CompletableFuture; import org.junit.jupiter.api.AfterEach; diff --git a/wpilibjExamples/src/test/java/org/wpilib/examples/potentiometerpid/PotentiometerPIDTest.java b/wpilibjExamples/src/test/java/org/wpilib/examples/potentiometerpid/PotentiometerPIDTest.java index 51570e7635..2263bdaf80 100644 --- a/wpilibjExamples/src/test/java/org/wpilib/examples/potentiometerpid/PotentiometerPIDTest.java +++ b/wpilibjExamples/src/test/java/org/wpilib/examples/potentiometerpid/PotentiometerPIDTest.java @@ -2,22 +2,22 @@ // 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 edu.wpi.first.wpilibj.examples.potentiometerpid; +package org.wpilib.examples.potentiometerpid; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.hal.HAL.SimPeriodicBeforeCallback; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.util.Units; -import edu.wpi.first.wpilibj.RobotController; -import edu.wpi.first.wpilibj.simulation.AnalogInputSim; -import edu.wpi.first.wpilibj.simulation.DriverStationSim; -import edu.wpi.first.wpilibj.simulation.ElevatorSim; -import edu.wpi.first.wpilibj.simulation.JoystickSim; -import edu.wpi.first.wpilibj.simulation.PWMMotorControllerSim; -import edu.wpi.first.wpilibj.simulation.SimHooks; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.hal.HAL.SimPeriodicBeforeCallback; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.math.util.Units; +import org.wpilib.system.RobotController; +import org.wpilib.simulation.AnalogInputSim; +import org.wpilib.simulation.DriverStationSim; +import org.wpilib.simulation.ElevatorSim; +import org.wpilib.simulation.JoystickSim; +import org.wpilib.simulation.PWMMotorControllerSim; +import org.wpilib.simulation.SimHooks; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/wpilibjExamples/src/test/java/org/wpilib/examples/unittest/subsystems/IntakeTest.java b/wpilibjExamples/src/test/java/org/wpilib/examples/unittest/subsystems/IntakeTest.java index b4049ef8e3..c24a955277 100644 --- a/wpilibjExamples/src/test/java/org/wpilib/examples/unittest/subsystems/IntakeTest.java +++ b/wpilibjExamples/src/test/java/org/wpilib/examples/unittest/subsystems/IntakeTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.wpilibj.examples.unittest.subsystems; +package org.wpilib.examples.unittest.subsystems; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.hal.HAL; -import edu.wpi.first.wpilibj.DoubleSolenoid; -import edu.wpi.first.wpilibj.PneumaticsModuleType; -import edu.wpi.first.wpilibj.examples.unittest.Constants.IntakeConstants; -import edu.wpi.first.wpilibj.simulation.DoubleSolenoidSim; -import edu.wpi.first.wpilibj.simulation.PWMMotorControllerSim; +import org.wpilib.hardware.hal.HAL; +import org.wpilib.hardware.pneumatic.DoubleSolenoid; +import org.wpilib.hardware.pneumatic.PneumaticsModuleType; +import org.wpilib.examples.unittest.Constants.IntakeConstants; +import org.wpilib.simulation.DoubleSolenoidSim; +import org.wpilib.simulation.PWMMotorControllerSim; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/wpimath/.styleguide b/wpimath/.styleguide index 1ef7b426ef..9da1a35166 100644 --- a/wpimath/.styleguide +++ b/wpimath/.styleguide @@ -19,7 +19,7 @@ generatedFileExclude { src/main/native/include/unsupported/ src/main/native/thirdparty/ src/test/native/cpp/UnitsTest\.cpp$ - src/generated/main/java/edu/wpi/first/math/proto + src/generated/main/java/org/wpilib/math/proto src/generated/main/native/cpp src/main/python/ diff --git a/wpimath/src/dev/java/org/wpilib/math/DevMain.java b/wpimath/src/dev/java/org/wpilib/math/DevMain.java index c7b779e007..78f2f9edb8 100644 --- a/wpimath/src/dev/java/org/wpilib/math/DevMain.java +++ b/wpimath/src/dev/java/org/wpilib/math/DevMain.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 edu.wpi.first.math; +package org.wpilib.math; public final class DevMain { /** Main entry point. */ diff --git a/wpimath/src/generate/main/java/GenericNumber.java.jinja b/wpimath/src/generate/main/java/GenericNumber.java.jinja index 2bd940b628..b8b7099ff4 100644 --- a/wpimath/src/generate/main/java/GenericNumber.java.jinja +++ b/wpimath/src/generate/main/java/GenericNumber.java.jinja @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math.numbers; +package org.wpilib.math.numbers; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; /** A class representing the number {{ num }}. */ public final class N{{ num }} extends Num implements Nat { diff --git a/wpimath/src/generate/main/java/Nat.java.jinja b/wpimath/src/generate/main/java/Nat.java.jinja index a65c3c912a..db0f07b34f 100644 --- a/wpimath/src/generate/main/java/Nat.java.jinja +++ b/wpimath/src/generate/main/java/Nat.java.jinja @@ -4,11 +4,11 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math; +package org.wpilib.math; // CHECKSTYLE.OFF: ImportOrder {% for num in nums %} -import edu.wpi.first.math.numbers.N{{ num }}; +import org.wpilib.math.numbers.N{{ num }}; {%- endfor %} // CHECKSTYLE.ON diff --git a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N0.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N0.java index 85065f75f2..bf1c972521 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N0.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N0.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math.numbers; +package org.wpilib.math.numbers; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; /** A class representing the number 0. */ public final class N0 extends Num implements Nat { diff --git a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N1.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N1.java index 8977a7ae80..83ea193d1d 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N1.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N1.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math.numbers; +package org.wpilib.math.numbers; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; /** A class representing the number 1. */ public final class N1 extends Num implements Nat { diff --git a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N10.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N10.java index 540f1d3653..edcc135ebf 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N10.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N10.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math.numbers; +package org.wpilib.math.numbers; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; /** A class representing the number 10. */ public final class N10 extends Num implements Nat { diff --git a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N11.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N11.java index 45113c9b4f..f071c37716 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N11.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N11.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math.numbers; +package org.wpilib.math.numbers; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; /** A class representing the number 11. */ public final class N11 extends Num implements Nat { diff --git a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N12.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N12.java index 6a86c80ac6..eae1186b2f 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N12.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N12.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math.numbers; +package org.wpilib.math.numbers; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; /** A class representing the number 12. */ public final class N12 extends Num implements Nat { diff --git a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N13.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N13.java index 7ae2ca1490..42db5ee3ce 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N13.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N13.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math.numbers; +package org.wpilib.math.numbers; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; /** A class representing the number 13. */ public final class N13 extends Num implements Nat { diff --git a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N14.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N14.java index 58a4192679..b26622ba7a 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N14.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N14.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math.numbers; +package org.wpilib.math.numbers; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; /** A class representing the number 14. */ public final class N14 extends Num implements Nat { diff --git a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N15.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N15.java index 5794daca03..840b940cf5 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N15.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N15.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math.numbers; +package org.wpilib.math.numbers; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; /** A class representing the number 15. */ public final class N15 extends Num implements Nat { diff --git a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N16.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N16.java index 3727463868..50bdbc880f 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N16.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N16.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math.numbers; +package org.wpilib.math.numbers; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; /** A class representing the number 16. */ public final class N16 extends Num implements Nat { diff --git a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N17.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N17.java index e2968d7672..d9ae2fcc5d 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N17.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N17.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math.numbers; +package org.wpilib.math.numbers; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; /** A class representing the number 17. */ public final class N17 extends Num implements Nat { diff --git a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N18.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N18.java index 031089395e..063d896236 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N18.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N18.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math.numbers; +package org.wpilib.math.numbers; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; /** A class representing the number 18. */ public final class N18 extends Num implements Nat { diff --git a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N19.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N19.java index 8c5d48d026..0450eef467 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N19.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N19.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math.numbers; +package org.wpilib.math.numbers; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; /** A class representing the number 19. */ public final class N19 extends Num implements Nat { diff --git a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N2.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N2.java index 27f3257135..3de1498683 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N2.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N2.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math.numbers; +package org.wpilib.math.numbers; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; /** A class representing the number 2. */ public final class N2 extends Num implements Nat { diff --git a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N20.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N20.java index fefbfe6810..2250bdbd34 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N20.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N20.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math.numbers; +package org.wpilib.math.numbers; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; /** A class representing the number 20. */ public final class N20 extends Num implements Nat { diff --git a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N3.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N3.java index 1e10c907b7..b0dfc55bd8 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N3.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N3.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math.numbers; +package org.wpilib.math.numbers; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; /** A class representing the number 3. */ public final class N3 extends Num implements Nat { diff --git a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N4.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N4.java index f7fe57e275..d97ae10bab 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N4.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N4.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math.numbers; +package org.wpilib.math.numbers; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; /** A class representing the number 4. */ public final class N4 extends Num implements Nat { diff --git a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N5.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N5.java index ec5deb504b..3ac33690d9 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N5.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N5.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math.numbers; +package org.wpilib.math.numbers; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; /** A class representing the number 5. */ public final class N5 extends Num implements Nat { diff --git a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N6.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N6.java index fe94f08c60..ea5a5d9468 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N6.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N6.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math.numbers; +package org.wpilib.math.numbers; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; /** A class representing the number 6. */ public final class N6 extends Num implements Nat { diff --git a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N7.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N7.java index 241c992548..6dc34eb2e2 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N7.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N7.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math.numbers; +package org.wpilib.math.numbers; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; /** A class representing the number 7. */ public final class N7 extends Num implements Nat { diff --git a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N8.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N8.java index 4930b00975..8814bbb874 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N8.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N8.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math.numbers; +package org.wpilib.math.numbers; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; /** A class representing the number 8. */ public final class N8 extends Num implements Nat { diff --git a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N9.java b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N9.java index 2c6e4eed95..b2b3b4dbb4 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/numbers/N9.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/numbers/N9.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math.numbers; +package org.wpilib.math.numbers; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; /** A class representing the number 9. */ public final class N9 extends Num implements Nat { diff --git a/wpimath/src/generated/main/java/org/wpilib/math/proto/Controller.java b/wpimath/src/generated/main/java/org/wpilib/math/proto/Controller.java index 4a0866f8b3..a25858de56 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/proto/Controller.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/proto/Controller.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. // Code generated by protocol buffer compiler. Do not edit! -package edu.wpi.first.math.proto; +package org.wpilib.math.proto; import java.io.IOException; import us.hebi.quickbuf.Descriptors; diff --git a/wpimath/src/generated/main/java/org/wpilib/math/proto/Geometry2D.java b/wpimath/src/generated/main/java/org/wpilib/math/proto/Geometry2D.java index c0dc337008..9ab4daffd7 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/proto/Geometry2D.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/proto/Geometry2D.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. // Code generated by protocol buffer compiler. Do not edit! -package edu.wpi.first.math.proto; +package org.wpilib.math.proto; import java.io.IOException; import us.hebi.quickbuf.Descriptors; diff --git a/wpimath/src/generated/main/java/org/wpilib/math/proto/Geometry3D.java b/wpimath/src/generated/main/java/org/wpilib/math/proto/Geometry3D.java index 404d7b0719..a8f1041946 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/proto/Geometry3D.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/proto/Geometry3D.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. // Code generated by protocol buffer compiler. Do not edit! -package edu.wpi.first.math.proto; +package org.wpilib.math.proto; import java.io.IOException; import us.hebi.quickbuf.Descriptors; diff --git a/wpimath/src/generated/main/java/org/wpilib/math/proto/Kinematics.java b/wpimath/src/generated/main/java/org/wpilib/math/proto/Kinematics.java index 76b95da39c..0aeb1b0be6 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/proto/Kinematics.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/proto/Kinematics.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. // Code generated by protocol buffer compiler. Do not edit! -package edu.wpi.first.math.proto; +package org.wpilib.math.proto; import java.io.IOException; import us.hebi.quickbuf.Descriptors; diff --git a/wpimath/src/generated/main/java/org/wpilib/math/proto/Plant.java b/wpimath/src/generated/main/java/org/wpilib/math/proto/Plant.java index 61b758fd12..0b8189e1a4 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/proto/Plant.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/proto/Plant.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. // Code generated by protocol buffer compiler. Do not edit! -package edu.wpi.first.math.proto; +package org.wpilib.math.proto; import java.io.IOException; import us.hebi.quickbuf.Descriptors; diff --git a/wpimath/src/generated/main/java/org/wpilib/math/proto/Spline.java b/wpimath/src/generated/main/java/org/wpilib/math/proto/Spline.java index accdecb07a..c05fdd5654 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/proto/Spline.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/proto/Spline.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. // Code generated by protocol buffer compiler. Do not edit! -package edu.wpi.first.math.proto; +package org.wpilib.math.proto; import java.io.IOException; import us.hebi.quickbuf.Descriptors; diff --git a/wpimath/src/generated/main/java/org/wpilib/math/proto/System.java b/wpimath/src/generated/main/java/org/wpilib/math/proto/System.java index 09ea3b529d..1d7c3873e9 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/proto/System.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/proto/System.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. // Code generated by protocol buffer compiler. Do not edit! -package edu.wpi.first.math.proto; +package org.wpilib.math.proto; import java.io.IOException; import us.hebi.quickbuf.Descriptors; diff --git a/wpimath/src/generated/main/java/org/wpilib/math/proto/Trajectory.java b/wpimath/src/generated/main/java/org/wpilib/math/proto/Trajectory.java index 3ec96f8276..da6bbccfc1 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/proto/Trajectory.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/proto/Trajectory.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. // Code generated by protocol buffer compiler. Do not edit! -package edu.wpi.first.math.proto; +package org.wpilib.math.proto; import java.io.IOException; import us.hebi.quickbuf.Descriptors; diff --git a/wpimath/src/generated/main/java/org/wpilib/math/proto/Wpimath.java b/wpimath/src/generated/main/java/org/wpilib/math/proto/Wpimath.java index ce964a2795..609c514032 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/proto/Wpimath.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/proto/Wpimath.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. // Code generated by protocol buffer compiler. Do not edit! -package edu.wpi.first.math.proto; +package org.wpilib.math.proto; import java.io.IOException; import us.hebi.quickbuf.Descriptors; diff --git a/wpimath/src/generated/main/java/org/wpilib/math/util/Nat.java b/wpimath/src/generated/main/java/org/wpilib/math/util/Nat.java index f2647738a5..7f99956848 100644 --- a/wpimath/src/generated/main/java/org/wpilib/math/util/Nat.java +++ b/wpimath/src/generated/main/java/org/wpilib/math/util/Nat.java @@ -4,31 +4,31 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpimath/generate_numbers.py. DO NOT MODIFY -package edu.wpi.first.math; +package org.wpilib.math.util; // CHECKSTYLE.OFF: ImportOrder -import edu.wpi.first.math.numbers.N0; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.numbers.N3; -import edu.wpi.first.math.numbers.N4; -import edu.wpi.first.math.numbers.N5; -import edu.wpi.first.math.numbers.N6; -import edu.wpi.first.math.numbers.N7; -import edu.wpi.first.math.numbers.N8; -import edu.wpi.first.math.numbers.N9; -import edu.wpi.first.math.numbers.N10; -import edu.wpi.first.math.numbers.N11; -import edu.wpi.first.math.numbers.N12; -import edu.wpi.first.math.numbers.N13; -import edu.wpi.first.math.numbers.N14; -import edu.wpi.first.math.numbers.N15; -import edu.wpi.first.math.numbers.N16; -import edu.wpi.first.math.numbers.N17; -import edu.wpi.first.math.numbers.N18; -import edu.wpi.first.math.numbers.N19; -import edu.wpi.first.math.numbers.N20; +import org.wpilib.math.numbers.N0; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.numbers.N3; +import org.wpilib.math.numbers.N4; +import org.wpilib.math.numbers.N5; +import org.wpilib.math.numbers.N6; +import org.wpilib.math.numbers.N7; +import org.wpilib.math.numbers.N8; +import org.wpilib.math.numbers.N9; +import org.wpilib.math.numbers.N10; +import org.wpilib.math.numbers.N11; +import org.wpilib.math.numbers.N12; +import org.wpilib.math.numbers.N13; +import org.wpilib.math.numbers.N14; +import org.wpilib.math.numbers.N15; +import org.wpilib.math.numbers.N16; +import org.wpilib.math.numbers.N17; +import org.wpilib.math.numbers.N18; +import org.wpilib.math.numbers.N19; +import org.wpilib.math.numbers.N20; // CHECKSTYLE.ON /** diff --git a/wpimath/src/main/java/org/wpilib/math/controller/ArmFeedforward.java b/wpimath/src/main/java/org/wpilib/math/controller/ArmFeedforward.java index 91ebab06c2..637af8f1cc 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/ArmFeedforward.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/ArmFeedforward.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; -import edu.wpi.first.math.controller.proto.ArmFeedforwardProto; -import edu.wpi.first.math.controller.struct.ArmFeedforwardStruct; -import edu.wpi.first.math.jni.ArmFeedforwardJNI; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.controller.proto.ArmFeedforwardProto; +import org.wpilib.math.controller.struct.ArmFeedforwardStruct; +import org.wpilib.math.jni.ArmFeedforwardJNI; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; /** * A helper class that computes feedforward outputs for a simple arm (modeled as a motor acting diff --git a/wpimath/src/main/java/org/wpilib/math/controller/BangBangController.java b/wpimath/src/main/java/org/wpilib/math/controller/BangBangController.java index 2bc6a2d4b9..d25c43843c 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/BangBangController.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/BangBangController.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller; +package org.wpilib.math.controller; -import edu.wpi.first.math.MathSharedStore; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.math.util.MathSharedStore; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; /** * Implements a bang-bang controller, which outputs either 0 or 1 depending on whether the diff --git a/wpimath/src/main/java/org/wpilib/math/controller/ControlAffinePlantInversionFeedforward.java b/wpimath/src/main/java/org/wpilib/math/controller/ControlAffinePlantInversionFeedforward.java index ca541b103a..f9d325e2fe 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/ControlAffinePlantInversionFeedforward.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/ControlAffinePlantInversionFeedforward.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.system.NumericalJacobian; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.system.NumericalJacobian; import java.util.function.BiFunction; import java.util.function.Function; diff --git a/wpimath/src/main/java/org/wpilib/math/controller/DifferentialDriveAccelerationLimiter.java b/wpimath/src/main/java/org/wpilib/math/controller/DifferentialDriveAccelerationLimiter.java index d2ef273bbe..7f3f623be5 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/DifferentialDriveAccelerationLimiter.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/DifferentialDriveAccelerationLimiter.java @@ -2,21 +2,21 @@ // 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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.system.LinearSystem; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.system.LinearSystem; /** * Filters the provided voltages to limit a differential drive's linear and angular acceleration. * *

The differential drive model can be created via the functions in {@link - * edu.wpi.first.math.system.plant.LinearSystemId}. + * org.wpilib.math.system.plant.LinearSystemId}. */ public class DifferentialDriveAccelerationLimiter { private final LinearSystem m_system; diff --git a/wpimath/src/main/java/org/wpilib/math/controller/DifferentialDriveFeedforward.java b/wpimath/src/main/java/org/wpilib/math/controller/DifferentialDriveFeedforward.java index 549adbd4a2..466b746686 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/DifferentialDriveFeedforward.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/DifferentialDriveFeedforward.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.controller.proto.DifferentialDriveFeedforwardProto; -import edu.wpi.first.math.controller.struct.DifferentialDriveFeedforwardStruct; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.system.LinearSystem; -import edu.wpi.first.math.system.plant.LinearSystemId; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.controller.proto.DifferentialDriveFeedforwardProto; +import org.wpilib.math.controller.struct.DifferentialDriveFeedforwardStruct; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.system.LinearSystem; +import org.wpilib.math.system.plant.LinearSystemId; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; /** A helper class which computes the feedforward outputs for a differential drive drivetrain. */ public class DifferentialDriveFeedforward implements ProtobufSerializable, StructSerializable { diff --git a/wpimath/src/main/java/org/wpilib/math/controller/DifferentialDriveWheelVoltages.java b/wpimath/src/main/java/org/wpilib/math/controller/DifferentialDriveWheelVoltages.java index 1569be0685..817d8136ed 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/DifferentialDriveWheelVoltages.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/DifferentialDriveWheelVoltages.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller; +package org.wpilib.math.controller; -import edu.wpi.first.math.controller.proto.DifferentialDriveWheelVoltagesProto; -import edu.wpi.first.math.controller.struct.DifferentialDriveWheelVoltagesStruct; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.controller.proto.DifferentialDriveWheelVoltagesProto; +import org.wpilib.math.controller.struct.DifferentialDriveWheelVoltagesStruct; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; /** Motor voltages for a differential drive. */ public class DifferentialDriveWheelVoltages implements ProtobufSerializable, StructSerializable { diff --git a/wpimath/src/main/java/org/wpilib/math/controller/ElevatorFeedforward.java b/wpimath/src/main/java/org/wpilib/math/controller/ElevatorFeedforward.java index f8ffb4be56..712d2c0dcb 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/ElevatorFeedforward.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/ElevatorFeedforward.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller; +package org.wpilib.math.controller; -import edu.wpi.first.math.controller.proto.ElevatorFeedforwardProto; -import edu.wpi.first.math.controller.struct.ElevatorFeedforwardStruct; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.controller.proto.ElevatorFeedforwardProto; +import org.wpilib.math.controller.struct.ElevatorFeedforwardStruct; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; /** * A helper class that computes feedforward outputs for a simple elevator (modeled as a motor acting diff --git a/wpimath/src/main/java/org/wpilib/math/controller/ImplicitModelFollower.java b/wpimath/src/main/java/org/wpilib/math/controller/ImplicitModelFollower.java index 29bf0a02be..5213e8b883 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/ImplicitModelFollower.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/ImplicitModelFollower.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller; +package org.wpilib.math.controller; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.system.LinearSystem; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Num; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.system.LinearSystem; import org.ejml.simple.SimpleMatrix; /** diff --git a/wpimath/src/main/java/org/wpilib/math/controller/LTVDifferentialDriveController.java b/wpimath/src/main/java/org/wpilib/math/controller/LTVDifferentialDriveController.java index 6e212780d2..a0d28a2f0a 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/LTVDifferentialDriveController.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/LTVDifferentialDriveController.java @@ -2,23 +2,23 @@ // 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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; -import edu.wpi.first.math.DARE; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.MathUtil; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.StateSpaceUtil; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.Vector; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.numbers.N5; -import edu.wpi.first.math.system.Discretization; -import edu.wpi.first.math.system.LinearSystem; -import edu.wpi.first.math.trajectory.Trajectory; +import org.wpilib.math.linalg.DARE; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.util.MathUtil; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.StateSpaceUtil; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.linalg.Vector; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.numbers.N5; +import org.wpilib.math.system.Discretization; +import org.wpilib.math.system.LinearSystem; +import org.wpilib.math.trajectory.Trajectory; /** * The linear time-varying differential drive controller has a similar form to the LQR, but the diff --git a/wpimath/src/main/java/org/wpilib/math/controller/LTVUnicycleController.java b/wpimath/src/main/java/org/wpilib/math/controller/LTVUnicycleController.java index d51c8602a7..90f9c934eb 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/LTVUnicycleController.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/LTVUnicycleController.java @@ -2,21 +2,21 @@ // 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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; -import edu.wpi.first.math.DARE; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.StateSpaceUtil; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.Vector; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.numbers.N3; -import edu.wpi.first.math.system.Discretization; -import edu.wpi.first.math.trajectory.Trajectory; +import org.wpilib.math.linalg.DARE; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.StateSpaceUtil; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.linalg.Vector; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.kinematics.ChassisSpeeds; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.numbers.N3; +import org.wpilib.math.system.Discretization; +import org.wpilib.math.trajectory.Trajectory; /** * The linear time-varying unicycle controller has a similar form to the LQR, but the model used to diff --git a/wpimath/src/main/java/org/wpilib/math/controller/LinearPlantInversionFeedforward.java b/wpimath/src/main/java/org/wpilib/math/controller/LinearPlantInversionFeedforward.java index cba235d571..b87f0d3dc6 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/LinearPlantInversionFeedforward.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/LinearPlantInversionFeedforward.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.system.Discretization; -import edu.wpi.first.math.system.LinearSystem; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Num; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.system.Discretization; +import org.wpilib.math.system.LinearSystem; import org.ejml.simple.SimpleMatrix; /** diff --git a/wpimath/src/main/java/org/wpilib/math/controller/LinearQuadraticRegulator.java b/wpimath/src/main/java/org/wpilib/math/controller/LinearQuadraticRegulator.java index 8092e9e2ce..c50692b9e0 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/LinearQuadraticRegulator.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/LinearQuadraticRegulator.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; -import edu.wpi.first.math.DARE; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.StateSpaceUtil; -import edu.wpi.first.math.Vector; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.system.Discretization; -import edu.wpi.first.math.system.LinearSystem; +import org.wpilib.math.linalg.DARE; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Num; +import org.wpilib.math.util.StateSpaceUtil; +import org.wpilib.math.linalg.Vector; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.system.Discretization; +import org.wpilib.math.system.LinearSystem; import org.ejml.simple.SimpleMatrix; /** diff --git a/wpimath/src/main/java/org/wpilib/math/controller/PIDController.java b/wpimath/src/main/java/org/wpilib/math/controller/PIDController.java index d1cb1c7be8..27d0ed16bb 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/PIDController.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/PIDController.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; -import edu.wpi.first.math.MathSharedStore; -import edu.wpi.first.math.MathUtil; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.math.util.MathSharedStore; +import org.wpilib.math.util.MathUtil; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; /** Implements a PID control loop. */ public class PIDController implements Sendable, AutoCloseable { diff --git a/wpimath/src/main/java/org/wpilib/math/controller/ProfiledPIDController.java b/wpimath/src/main/java/org/wpilib/math/controller/ProfiledPIDController.java index f7f8554d61..21e7a13472 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/ProfiledPIDController.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/ProfiledPIDController.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; -import edu.wpi.first.math.MathSharedStore; -import edu.wpi.first.math.MathUtil; -import edu.wpi.first.math.trajectory.TrapezoidProfile; -import edu.wpi.first.util.sendable.Sendable; -import edu.wpi.first.util.sendable.SendableBuilder; -import edu.wpi.first.util.sendable.SendableRegistry; +import org.wpilib.math.util.MathSharedStore; +import org.wpilib.math.util.MathUtil; +import org.wpilib.math.trajectory.TrapezoidProfile; +import org.wpilib.util.sendable.Sendable; +import org.wpilib.util.sendable.SendableBuilder; +import org.wpilib.util.sendable.SendableRegistry; /** * Implements a PID control loop whose setpoint is constrained by a trapezoid profile. Users should diff --git a/wpimath/src/main/java/org/wpilib/math/controller/SimpleMotorFeedforward.java b/wpimath/src/main/java/org/wpilib/math/controller/SimpleMotorFeedforward.java index 12aae3f91d..c2150bdaee 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/SimpleMotorFeedforward.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/SimpleMotorFeedforward.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller; +package org.wpilib.math.controller; -import edu.wpi.first.math.controller.proto.SimpleMotorFeedforwardProto; -import edu.wpi.first.math.controller.struct.SimpleMotorFeedforwardStruct; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.controller.proto.SimpleMotorFeedforwardProto; +import org.wpilib.math.controller.struct.SimpleMotorFeedforwardStruct; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; /** A helper class that computes feedforward outputs for a simple permanent-magnet DC motor. */ public class SimpleMotorFeedforward implements ProtobufSerializable, StructSerializable { diff --git a/wpimath/src/main/java/org/wpilib/math/controller/proto/ArmFeedforwardProto.java b/wpimath/src/main/java/org/wpilib/math/controller/proto/ArmFeedforwardProto.java index eb4e520805..e32d3d8e29 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/proto/ArmFeedforwardProto.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/proto/ArmFeedforwardProto.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller.proto; +package org.wpilib.math.controller.proto; -import edu.wpi.first.math.controller.ArmFeedforward; -import edu.wpi.first.math.proto.Controller.ProtobufArmFeedforward; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.controller.ArmFeedforward; +import org.wpilib.math.proto.Controller.ProtobufArmFeedforward; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class ArmFeedforwardProto implements Protobuf { diff --git a/wpimath/src/main/java/org/wpilib/math/controller/proto/DifferentialDriveFeedforwardProto.java b/wpimath/src/main/java/org/wpilib/math/controller/proto/DifferentialDriveFeedforwardProto.java index 6daee8b3fd..55a1396029 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/proto/DifferentialDriveFeedforwardProto.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/proto/DifferentialDriveFeedforwardProto.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller.proto; +package org.wpilib.math.controller.proto; -import edu.wpi.first.math.controller.DifferentialDriveFeedforward; -import edu.wpi.first.math.proto.Controller.ProtobufDifferentialDriveFeedforward; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.controller.DifferentialDriveFeedforward; +import org.wpilib.math.proto.Controller.ProtobufDifferentialDriveFeedforward; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public final class DifferentialDriveFeedforwardProto diff --git a/wpimath/src/main/java/org/wpilib/math/controller/proto/DifferentialDriveWheelVoltagesProto.java b/wpimath/src/main/java/org/wpilib/math/controller/proto/DifferentialDriveWheelVoltagesProto.java index c22db5d107..cb7cc7ca49 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/proto/DifferentialDriveWheelVoltagesProto.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/proto/DifferentialDriveWheelVoltagesProto.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller.proto; +package org.wpilib.math.controller.proto; -import edu.wpi.first.math.controller.DifferentialDriveWheelVoltages; -import edu.wpi.first.math.proto.Controller.ProtobufDifferentialDriveWheelVoltages; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.controller.DifferentialDriveWheelVoltages; +import org.wpilib.math.proto.Controller.ProtobufDifferentialDriveWheelVoltages; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class DifferentialDriveWheelVoltagesProto diff --git a/wpimath/src/main/java/org/wpilib/math/controller/proto/ElevatorFeedforwardProto.java b/wpimath/src/main/java/org/wpilib/math/controller/proto/ElevatorFeedforwardProto.java index dbaafef6b4..9028e51149 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/proto/ElevatorFeedforwardProto.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/proto/ElevatorFeedforwardProto.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller.proto; +package org.wpilib.math.controller.proto; -import edu.wpi.first.math.controller.ElevatorFeedforward; -import edu.wpi.first.math.proto.Controller.ProtobufElevatorFeedforward; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.controller.ElevatorFeedforward; +import org.wpilib.math.proto.Controller.ProtobufElevatorFeedforward; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class ElevatorFeedforwardProto diff --git a/wpimath/src/main/java/org/wpilib/math/controller/proto/SimpleMotorFeedforwardProto.java b/wpimath/src/main/java/org/wpilib/math/controller/proto/SimpleMotorFeedforwardProto.java index cdd8c137e0..54879e5d32 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/proto/SimpleMotorFeedforwardProto.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/proto/SimpleMotorFeedforwardProto.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller.proto; +package org.wpilib.math.controller.proto; -import edu.wpi.first.math.controller.SimpleMotorFeedforward; -import edu.wpi.first.math.proto.Controller.ProtobufSimpleMotorFeedforward; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.controller.SimpleMotorFeedforward; +import org.wpilib.math.proto.Controller.ProtobufSimpleMotorFeedforward; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public final class SimpleMotorFeedforwardProto diff --git a/wpimath/src/main/java/org/wpilib/math/controller/struct/ArmFeedforwardStruct.java b/wpimath/src/main/java/org/wpilib/math/controller/struct/ArmFeedforwardStruct.java index 2bb80de153..9e47293b33 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/struct/ArmFeedforwardStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/struct/ArmFeedforwardStruct.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller.struct; +package org.wpilib.math.controller.struct; -import edu.wpi.first.math.controller.ArmFeedforward; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.controller.ArmFeedforward; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class ArmFeedforwardStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/controller/struct/DifferentialDriveFeedforwardStruct.java b/wpimath/src/main/java/org/wpilib/math/controller/struct/DifferentialDriveFeedforwardStruct.java index 1e3e86c3a0..5780a65695 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/struct/DifferentialDriveFeedforwardStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/struct/DifferentialDriveFeedforwardStruct.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller.struct; +package org.wpilib.math.controller.struct; -import edu.wpi.first.math.controller.DifferentialDriveFeedforward; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.controller.DifferentialDriveFeedforward; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public final class DifferentialDriveFeedforwardStruct diff --git a/wpimath/src/main/java/org/wpilib/math/controller/struct/DifferentialDriveWheelVoltagesStruct.java b/wpimath/src/main/java/org/wpilib/math/controller/struct/DifferentialDriveWheelVoltagesStruct.java index fd34b8086b..147ba123da 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/struct/DifferentialDriveWheelVoltagesStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/struct/DifferentialDriveWheelVoltagesStruct.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller.struct; +package org.wpilib.math.controller.struct; -import edu.wpi.first.math.controller.DifferentialDriveWheelVoltages; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.controller.DifferentialDriveWheelVoltages; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class DifferentialDriveWheelVoltagesStruct diff --git a/wpimath/src/main/java/org/wpilib/math/controller/struct/ElevatorFeedforwardStruct.java b/wpimath/src/main/java/org/wpilib/math/controller/struct/ElevatorFeedforwardStruct.java index 1a0e8b77e6..a8546dd7db 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/struct/ElevatorFeedforwardStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/struct/ElevatorFeedforwardStruct.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller.struct; +package org.wpilib.math.controller.struct; -import edu.wpi.first.math.controller.ElevatorFeedforward; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.controller.ElevatorFeedforward; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class ElevatorFeedforwardStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/controller/struct/SimpleMotorFeedforwardStruct.java b/wpimath/src/main/java/org/wpilib/math/controller/struct/SimpleMotorFeedforwardStruct.java index 36ec630e42..8eab4c2f37 100644 --- a/wpimath/src/main/java/org/wpilib/math/controller/struct/SimpleMotorFeedforwardStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/controller/struct/SimpleMotorFeedforwardStruct.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller.struct; +package org.wpilib.math.controller.struct; -import edu.wpi.first.math.controller.SimpleMotorFeedforward; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.controller.SimpleMotorFeedforward; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public final class SimpleMotorFeedforwardStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/estimator/AngleStatistics.java b/wpimath/src/main/java/org/wpilib/math/estimator/AngleStatistics.java index 8a61526e8a..f77cfc06d4 100644 --- a/wpimath/src/main/java/org/wpilib/math/estimator/AngleStatistics.java +++ b/wpimath/src/main/java/org/wpilib/math/estimator/AngleStatistics.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; -import edu.wpi.first.math.MathUtil; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.numbers.N1; +import org.wpilib.math.util.MathUtil; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Num; +import org.wpilib.math.numbers.N1; import java.util.function.BiFunction; import org.ejml.simple.SimpleMatrix; diff --git a/wpimath/src/main/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimator.java b/wpimath/src/main/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimator.java index 0d0ccccee1..d5ef5db39f 100644 --- a/wpimath/src/main/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimator.java +++ b/wpimath/src/main/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimator.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.kinematics.DifferentialDriveKinematics; -import edu.wpi.first.math.kinematics.DifferentialDriveOdometry; -import edu.wpi.first.math.kinematics.DifferentialDriveWheelPositions; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N3; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.kinematics.DifferentialDriveKinematics; +import org.wpilib.math.kinematics.DifferentialDriveOdometry; +import org.wpilib.math.kinematics.DifferentialDriveWheelPositions; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N3; /** * This class wraps {@link DifferentialDriveOdometry Differential Drive Odometry} to fuse diff --git a/wpimath/src/main/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimator3d.java b/wpimath/src/main/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimator3d.java index 0c437296cb..ef613771c4 100644 --- a/wpimath/src/main/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimator3d.java +++ b/wpimath/src/main/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimator3d.java @@ -2,21 +2,21 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.math.kinematics.DifferentialDriveKinematics; -import edu.wpi.first.math.kinematics.DifferentialDriveOdometry3d; -import edu.wpi.first.math.kinematics.DifferentialDriveWheelPositions; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N4; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.math.kinematics.DifferentialDriveKinematics; +import org.wpilib.math.kinematics.DifferentialDriveOdometry3d; +import org.wpilib.math.kinematics.DifferentialDriveWheelPositions; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N4; /** * This class wraps {@link DifferentialDriveOdometry3d Differential Drive Odometry} to fuse diff --git a/wpimath/src/main/java/org/wpilib/math/estimator/ExtendedKalmanFilter.java b/wpimath/src/main/java/org/wpilib/math/estimator/ExtendedKalmanFilter.java index b142ae4064..ab1523018d 100644 --- a/wpimath/src/main/java/org/wpilib/math/estimator/ExtendedKalmanFilter.java +++ b/wpimath/src/main/java/org/wpilib/math/estimator/ExtendedKalmanFilter.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; -import edu.wpi.first.math.DARE; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.StateSpaceUtil; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.system.Discretization; -import edu.wpi.first.math.system.NumericalIntegration; -import edu.wpi.first.math.system.NumericalJacobian; +import org.wpilib.math.linalg.DARE; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; +import org.wpilib.math.util.StateSpaceUtil; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.system.Discretization; +import org.wpilib.math.system.NumericalIntegration; +import org.wpilib.math.system.NumericalJacobian; import java.util.function.BiFunction; /** diff --git a/wpimath/src/main/java/org/wpilib/math/estimator/KalmanFilter.java b/wpimath/src/main/java/org/wpilib/math/estimator/KalmanFilter.java index 7f03f86ac9..237ac758a7 100644 --- a/wpimath/src/main/java/org/wpilib/math/estimator/KalmanFilter.java +++ b/wpimath/src/main/java/org/wpilib/math/estimator/KalmanFilter.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; -import edu.wpi.first.math.DARE; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.StateSpaceUtil; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.system.Discretization; -import edu.wpi.first.math.system.LinearSystem; +import org.wpilib.math.linalg.DARE; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; +import org.wpilib.math.util.StateSpaceUtil; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.system.Discretization; +import org.wpilib.math.system.LinearSystem; /** * A Kalman filter combines predictions from a model and measurements to give an estimate of the diff --git a/wpimath/src/main/java/org/wpilib/math/estimator/KalmanFilterLatencyCompensator.java b/wpimath/src/main/java/org/wpilib/math/estimator/KalmanFilterLatencyCompensator.java index b3a16bad47..69e095d2d7 100644 --- a/wpimath/src/main/java/org/wpilib/math/estimator/KalmanFilterLatencyCompensator.java +++ b/wpimath/src/main/java/org/wpilib/math/estimator/KalmanFilterLatencyCompensator.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.numbers.N1; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; +import org.wpilib.math.numbers.N1; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/wpimath/src/main/java/org/wpilib/math/estimator/KalmanTypeFilter.java b/wpimath/src/main/java/org/wpilib/math/estimator/KalmanTypeFilter.java index e1dcf0dd2f..de0a14b76d 100644 --- a/wpimath/src/main/java/org/wpilib/math/estimator/KalmanTypeFilter.java +++ b/wpimath/src/main/java/org/wpilib/math/estimator/KalmanTypeFilter.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.numbers.N1; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Num; +import org.wpilib.math.numbers.N1; /** * Interface for Kalman filters for use with KalmanFilterLatencyCompensator. diff --git a/wpimath/src/main/java/org/wpilib/math/estimator/MecanumDrivePoseEstimator.java b/wpimath/src/main/java/org/wpilib/math/estimator/MecanumDrivePoseEstimator.java index cec0960f11..f4849cb8d9 100644 --- a/wpimath/src/main/java/org/wpilib/math/estimator/MecanumDrivePoseEstimator.java +++ b/wpimath/src/main/java/org/wpilib/math/estimator/MecanumDrivePoseEstimator.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.kinematics.MecanumDriveKinematics; -import edu.wpi.first.math.kinematics.MecanumDriveOdometry; -import edu.wpi.first.math.kinematics.MecanumDriveWheelPositions; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N3; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.kinematics.MecanumDriveKinematics; +import org.wpilib.math.kinematics.MecanumDriveOdometry; +import org.wpilib.math.kinematics.MecanumDriveWheelPositions; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N3; /** * This class wraps {@link MecanumDriveOdometry Mecanum Drive Odometry} to fuse latency-compensated diff --git a/wpimath/src/main/java/org/wpilib/math/estimator/MecanumDrivePoseEstimator3d.java b/wpimath/src/main/java/org/wpilib/math/estimator/MecanumDrivePoseEstimator3d.java index 306d06aa7d..98f11a40c3 100644 --- a/wpimath/src/main/java/org/wpilib/math/estimator/MecanumDrivePoseEstimator3d.java +++ b/wpimath/src/main/java/org/wpilib/math/estimator/MecanumDrivePoseEstimator3d.java @@ -2,21 +2,21 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.math.kinematics.MecanumDriveKinematics; -import edu.wpi.first.math.kinematics.MecanumDriveOdometry3d; -import edu.wpi.first.math.kinematics.MecanumDriveWheelPositions; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N4; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.math.kinematics.MecanumDriveKinematics; +import org.wpilib.math.kinematics.MecanumDriveOdometry3d; +import org.wpilib.math.kinematics.MecanumDriveWheelPositions; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N4; /** * This class wraps {@link MecanumDriveOdometry3d Mecanum Drive Odometry} to fuse diff --git a/wpimath/src/main/java/org/wpilib/math/estimator/MerweScaledSigmaPoints.java b/wpimath/src/main/java/org/wpilib/math/estimator/MerweScaledSigmaPoints.java index d159af5d19..6e5d41af90 100644 --- a/wpimath/src/main/java/org/wpilib/math/estimator/MerweScaledSigmaPoints.java +++ b/wpimath/src/main/java/org/wpilib/math/estimator/MerweScaledSigmaPoints.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.numbers.N1; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; +import org.wpilib.math.numbers.N1; import org.ejml.simple.SimpleMatrix; /** diff --git a/wpimath/src/main/java/org/wpilib/math/estimator/MerweUKF.java b/wpimath/src/main/java/org/wpilib/math/estimator/MerweUKF.java index d34ebe1ff9..c70c3fbffc 100644 --- a/wpimath/src/main/java/org/wpilib/math/estimator/MerweUKF.java +++ b/wpimath/src/main/java/org/wpilib/math/estimator/MerweUKF.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.numbers.N1; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; +import org.wpilib.math.numbers.N1; import java.util.function.BiFunction; /** diff --git a/wpimath/src/main/java/org/wpilib/math/estimator/PoseEstimator.java b/wpimath/src/main/java/org/wpilib/math/estimator/PoseEstimator.java index 09a43bf952..c30d70f122 100644 --- a/wpimath/src/main/java/org/wpilib/math/estimator/PoseEstimator.java +++ b/wpimath/src/main/java/org/wpilib/math/estimator/PoseEstimator.java @@ -2,21 +2,21 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; -import edu.wpi.first.math.MathSharedStore; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.geometry.Twist2d; -import edu.wpi.first.math.interpolation.TimeInterpolatableBuffer; -import edu.wpi.first.math.kinematics.Kinematics; -import edu.wpi.first.math.kinematics.Odometry; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N3; +import org.wpilib.math.util.MathSharedStore; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.geometry.Twist2d; +import org.wpilib.math.interpolation.TimeInterpolatableBuffer; +import org.wpilib.math.kinematics.Kinematics; +import org.wpilib.math.kinematics.Odometry; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N3; import java.util.NavigableMap; import java.util.Optional; import java.util.TreeMap; @@ -242,8 +242,8 @@ public class PoseEstimator { * your own time source by calling {@link * PoseEstimator#updateWithTime(double,Rotation2d,Object)} then you must use a timestamp with * an epoch since FPGA startup (i.e., the epoch of this timestamp is the same epoch as {@link - * edu.wpi.first.wpilibj.Timer#getFPGATimestamp()}.) This means that you should use {@link - * edu.wpi.first.wpilibj.Timer#getFPGATimestamp()} as your time source or sync the epochs. + * org.wpilib.system.Timer#getFPGATimestamp()}.) This means that you should use {@link + * org.wpilib.system.Timer#getFPGATimestamp()} as your time source or sync the epochs. */ public void addVisionMeasurement(Pose2d visionRobotPose, double timestamp) { // Step 0: If this measurement is old enough to be outside the pose buffer's timespan, skip. @@ -313,8 +313,8 @@ public class PoseEstimator { * @param timestamp The timestamp of the vision measurement in seconds. Note that if you don't use * your own time source by calling {@link #updateWithTime}, then you must use a timestamp with * an epoch since FPGA startup (i.e., the epoch of this timestamp is the same epoch as {@link - * edu.wpi.first.wpilibj.Timer#getFPGATimestamp()}). This means that you should use {@link - * edu.wpi.first.wpilibj.Timer#getFPGATimestamp()} as your time source in this case. + * org.wpilib.system.Timer#getFPGATimestamp()}). This means that you should use {@link + * org.wpilib.system.Timer#getFPGATimestamp()} as your time source in this case. * @param visionMeasurementStdDevs Standard deviations of the vision pose measurement (x position * in meters, y position in meters, and heading in radians). Increase these numbers to trust * the vision pose measurement less. diff --git a/wpimath/src/main/java/org/wpilib/math/estimator/PoseEstimator3d.java b/wpimath/src/main/java/org/wpilib/math/estimator/PoseEstimator3d.java index 124ca35105..53a71004e9 100644 --- a/wpimath/src/main/java/org/wpilib/math/estimator/PoseEstimator3d.java +++ b/wpimath/src/main/java/org/wpilib/math/estimator/PoseEstimator3d.java @@ -2,25 +2,25 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; -import edu.wpi.first.math.MathSharedStore; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.math.geometry.Twist3d; -import edu.wpi.first.math.interpolation.TimeInterpolatableBuffer; -import edu.wpi.first.math.kinematics.Kinematics; -import edu.wpi.first.math.kinematics.Odometry3d; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N4; -import edu.wpi.first.math.numbers.N6; +import org.wpilib.math.util.MathSharedStore; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.math.geometry.Twist3d; +import org.wpilib.math.interpolation.TimeInterpolatableBuffer; +import org.wpilib.math.kinematics.Kinematics; +import org.wpilib.math.kinematics.Odometry3d; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N4; +import org.wpilib.math.numbers.N6; import java.util.NavigableMap; import java.util.Optional; import java.util.TreeMap; @@ -254,8 +254,8 @@ public class PoseEstimator3d { * your own time source by calling {@link * PoseEstimator3d#updateWithTime(double,Rotation3d,Object)} then you must use a timestamp * with an epoch since FPGA startup (i.e., the epoch of this timestamp is the same epoch as - * {@link edu.wpi.first.wpilibj.Timer#getFPGATimestamp()}.) This means that you should use - * {@link edu.wpi.first.wpilibj.Timer#getFPGATimestamp()} as your time source or sync the + * {@link org.wpilib.system.Timer#getFPGATimestamp()}.) This means that you should use + * {@link org.wpilib.system.Timer#getFPGATimestamp()} as your time source or sync the * epochs. */ public void addVisionMeasurement(Pose3d visionRobotPose, double timestamp) { @@ -334,8 +334,8 @@ public class PoseEstimator3d { * @param timestamp The timestamp of the vision measurement in seconds. Note that if you don't use * your own time source by calling {@link #updateWithTime}, then you must use a timestamp with * an epoch since FPGA startup (i.e., the epoch of this timestamp is the same epoch as {@link - * edu.wpi.first.wpilibj.Timer#getFPGATimestamp()}). This means that you should use {@link - * edu.wpi.first.wpilibj.Timer#getFPGATimestamp()} as your time source in this case. + * org.wpilib.system.Timer#getFPGATimestamp()}). This means that you should use {@link + * org.wpilib.system.Timer#getFPGATimestamp()} as your time source in this case. * @param visionMeasurementStdDevs Standard deviations of the vision pose measurement (x position * in meters, y position in meters, z position in meters, and angle in radians). Increase * these numbers to trust the vision pose measurement less. diff --git a/wpimath/src/main/java/org/wpilib/math/estimator/S3SigmaPoints.java b/wpimath/src/main/java/org/wpilib/math/estimator/S3SigmaPoints.java index 430296e109..beebd7148c 100644 --- a/wpimath/src/main/java/org/wpilib/math/estimator/S3SigmaPoints.java +++ b/wpimath/src/main/java/org/wpilib/math/estimator/S3SigmaPoints.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.numbers.N1; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; +import org.wpilib.math.numbers.N1; import org.ejml.simple.SimpleMatrix; /** diff --git a/wpimath/src/main/java/org/wpilib/math/estimator/S3UKF.java b/wpimath/src/main/java/org/wpilib/math/estimator/S3UKF.java index 4de46faee3..724f48ec7b 100644 --- a/wpimath/src/main/java/org/wpilib/math/estimator/S3UKF.java +++ b/wpimath/src/main/java/org/wpilib/math/estimator/S3UKF.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.numbers.N1; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; +import org.wpilib.math.numbers.N1; import java.util.function.BiFunction; /** diff --git a/wpimath/src/main/java/org/wpilib/math/estimator/SigmaPoints.java b/wpimath/src/main/java/org/wpilib/math/estimator/SigmaPoints.java index cb0ca2334b..246c2ea4e7 100644 --- a/wpimath/src/main/java/org/wpilib/math/estimator/SigmaPoints.java +++ b/wpimath/src/main/java/org/wpilib/math/estimator/SigmaPoints.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.numbers.N1; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Num; +import org.wpilib.math.numbers.N1; /** * A sigma points generator for the UnscentedKalmanFilter class. diff --git a/wpimath/src/main/java/org/wpilib/math/estimator/SteadyStateKalmanFilter.java b/wpimath/src/main/java/org/wpilib/math/estimator/SteadyStateKalmanFilter.java index a2db490316..9411246e2c 100644 --- a/wpimath/src/main/java/org/wpilib/math/estimator/SteadyStateKalmanFilter.java +++ b/wpimath/src/main/java/org/wpilib/math/estimator/SteadyStateKalmanFilter.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; -import edu.wpi.first.math.DARE; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.StateSpaceUtil; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.system.Discretization; -import edu.wpi.first.math.system.LinearSystem; +import org.wpilib.math.linalg.DARE; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; +import org.wpilib.math.util.StateSpaceUtil; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.system.Discretization; +import org.wpilib.math.system.LinearSystem; /** * A Kalman filter combines predictions from a model and measurements to give an estimate of the diff --git a/wpimath/src/main/java/org/wpilib/math/estimator/SwerveDrivePoseEstimator.java b/wpimath/src/main/java/org/wpilib/math/estimator/SwerveDrivePoseEstimator.java index 6c51f346d2..3665e8191b 100644 --- a/wpimath/src/main/java/org/wpilib/math/estimator/SwerveDrivePoseEstimator.java +++ b/wpimath/src/main/java/org/wpilib/math/estimator/SwerveDrivePoseEstimator.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.kinematics.SwerveDriveKinematics; -import edu.wpi.first.math.kinematics.SwerveDriveOdometry; -import edu.wpi.first.math.kinematics.SwerveModulePosition; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N3; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.kinematics.SwerveDriveKinematics; +import org.wpilib.math.kinematics.SwerveDriveOdometry; +import org.wpilib.math.kinematics.SwerveModulePosition; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N3; /** * This class wraps {@link SwerveDriveOdometry Swerve Drive Odometry} to fuse latency-compensated diff --git a/wpimath/src/main/java/org/wpilib/math/estimator/SwerveDrivePoseEstimator3d.java b/wpimath/src/main/java/org/wpilib/math/estimator/SwerveDrivePoseEstimator3d.java index 8016a092cd..95f2260893 100644 --- a/wpimath/src/main/java/org/wpilib/math/estimator/SwerveDrivePoseEstimator3d.java +++ b/wpimath/src/main/java/org/wpilib/math/estimator/SwerveDrivePoseEstimator3d.java @@ -2,21 +2,21 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.math.kinematics.SwerveDriveKinematics; -import edu.wpi.first.math.kinematics.SwerveDriveOdometry3d; -import edu.wpi.first.math.kinematics.SwerveModulePosition; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N4; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.math.kinematics.SwerveDriveKinematics; +import org.wpilib.math.kinematics.SwerveDriveOdometry3d; +import org.wpilib.math.kinematics.SwerveModulePosition; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N4; /** * This class wraps {@link SwerveDriveOdometry3d Swerve Drive Odometry} to fuse latency-compensated diff --git a/wpimath/src/main/java/org/wpilib/math/estimator/UnscentedKalmanFilter.java b/wpimath/src/main/java/org/wpilib/math/estimator/UnscentedKalmanFilter.java index 455cd67d46..e3196826e1 100644 --- a/wpimath/src/main/java/org/wpilib/math/estimator/UnscentedKalmanFilter.java +++ b/wpimath/src/main/java/org/wpilib/math/estimator/UnscentedKalmanFilter.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.Pair; -import edu.wpi.first.math.StateSpaceUtil; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.system.Discretization; -import edu.wpi.first.math.system.NumericalIntegration; -import edu.wpi.first.math.system.NumericalJacobian; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; +import org.wpilib.math.util.Pair; +import org.wpilib.math.util.StateSpaceUtil; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.system.Discretization; +import org.wpilib.math.system.NumericalIntegration; +import org.wpilib.math.system.NumericalJacobian; import java.util.function.BiFunction; import org.ejml.dense.row.decomposition.qr.QRDecompositionHouseholder_DDRM; import org.ejml.simple.SimpleMatrix; diff --git a/wpimath/src/main/java/org/wpilib/math/filter/Debouncer.java b/wpimath/src/main/java/org/wpilib/math/filter/Debouncer.java index 7919f0607a..8d7494cc10 100644 --- a/wpimath/src/main/java/org/wpilib/math/filter/Debouncer.java +++ b/wpimath/src/main/java/org/wpilib/math/filter/Debouncer.java @@ -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. -package edu.wpi.first.math.filter; +package org.wpilib.math.filter; -import edu.wpi.first.math.MathSharedStore; +import org.wpilib.math.util.MathSharedStore; /** * A simple debounce filter for boolean streams. Requires that the boolean change value from diff --git a/wpimath/src/main/java/org/wpilib/math/filter/LinearFilter.java b/wpimath/src/main/java/org/wpilib/math/filter/LinearFilter.java index dc738d0a7b..8bacd9da0c 100644 --- a/wpimath/src/main/java/org/wpilib/math/filter/LinearFilter.java +++ b/wpimath/src/main/java/org/wpilib/math/filter/LinearFilter.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.filter; +package org.wpilib.math.filter; -import edu.wpi.first.math.MathSharedStore; -import edu.wpi.first.util.DoubleCircularBuffer; +import org.wpilib.math.util.MathSharedStore; +import org.wpilib.util.container.DoubleCircularBuffer; import java.util.Arrays; import org.ejml.simple.SimpleMatrix; diff --git a/wpimath/src/main/java/org/wpilib/math/filter/MedianFilter.java b/wpimath/src/main/java/org/wpilib/math/filter/MedianFilter.java index d1d67b5b52..c10a093586 100644 --- a/wpimath/src/main/java/org/wpilib/math/filter/MedianFilter.java +++ b/wpimath/src/main/java/org/wpilib/math/filter/MedianFilter.java @@ -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. -package edu.wpi.first.math.filter; +package org.wpilib.math.filter; -import edu.wpi.first.util.DoubleCircularBuffer; +import org.wpilib.util.container.DoubleCircularBuffer; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/wpimath/src/main/java/org/wpilib/math/filter/SlewRateLimiter.java b/wpimath/src/main/java/org/wpilib/math/filter/SlewRateLimiter.java index f963b43f85..58a78b76c9 100644 --- a/wpimath/src/main/java/org/wpilib/math/filter/SlewRateLimiter.java +++ b/wpimath/src/main/java/org/wpilib/math/filter/SlewRateLimiter.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.filter; +package org.wpilib.math.filter; -import edu.wpi.first.math.MathSharedStore; +import org.wpilib.math.util.MathSharedStore; /** * A class that limits the rate of change of an input value. Useful for implementing voltage, * setpoint, and/or output ramps. A slew-rate limit is most appropriate when the quantity being * controlled is a velocity or a voltage; when controlling a position, consider using a {@link - * edu.wpi.first.math.trajectory.TrapezoidProfile} instead. + * org.wpilib.math.trajectory.TrapezoidProfile} instead. */ public class SlewRateLimiter { private final double m_positiveRateLimit; diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/CoordinateAxis.java b/wpimath/src/main/java/org/wpilib/math/geometry/CoordinateAxis.java index d6033f861f..7bddc949e8 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/CoordinateAxis.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/CoordinateAxis.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.Vector; -import edu.wpi.first.math.numbers.N3; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.linalg.Vector; +import org.wpilib.math.numbers.N3; /** A class representing a coordinate system axis within the NWU coordinate system. */ public class CoordinateAxis { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/CoordinateSystem.java b/wpimath/src/main/java/org/wpilib/math/geometry/CoordinateSystem.java index 9e827c3e48..f16da87aa7 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/CoordinateSystem.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/CoordinateSystem.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; /** A helper class that converts Pose3d objects between different standard coordinate frames. */ public class CoordinateSystem { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/Ellipse2d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Ellipse2d.java index ee9c302763..eefd6aa076 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/Ellipse2d.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/Ellipse2d.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; -import static edu.wpi.first.units.Units.Meters; +import static org.wpilib.units.Units.Meters; -import edu.wpi.first.math.Pair; -import edu.wpi.first.math.geometry.proto.Ellipse2dProto; -import edu.wpi.first.math.geometry.struct.Ellipse2dStruct; -import edu.wpi.first.math.jni.Ellipse2dJNI; -import edu.wpi.first.units.measure.Distance; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.util.Pair; +import org.wpilib.math.geometry.proto.Ellipse2dProto; +import org.wpilib.math.geometry.struct.Ellipse2dStruct; +import org.wpilib.math.jni.Ellipse2dJNI; +import org.wpilib.units.measure.Distance; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; import java.util.Objects; /** Represents a 2d ellipse space containing translational, rotational, and scaling components. */ diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/Pose2d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Pose2d.java index 7ee7fc6fc7..5f7d14ce77 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/Pose2d.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/Pose2d.java @@ -2,24 +2,24 @@ // 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 edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; -import static edu.wpi.first.units.Units.Meters; +import static org.wpilib.units.Units.Meters; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.geometry.proto.Pose2dProto; -import edu.wpi.first.math.geometry.struct.Pose2dStruct; -import edu.wpi.first.math.interpolation.Interpolatable; -import edu.wpi.first.math.numbers.N3; -import edu.wpi.first.units.measure.Distance; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.geometry.proto.Pose2dProto; +import org.wpilib.math.geometry.struct.Pose2dStruct; +import org.wpilib.math.interpolation.Interpolatable; +import org.wpilib.math.numbers.N3; +import org.wpilib.units.measure.Distance; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; import java.util.Collection; import java.util.Collections; import java.util.Comparator; diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/Pose3d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Pose3d.java index a723d63e10..6ef2a86753 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/Pose3d.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/Pose3d.java @@ -2,24 +2,24 @@ // 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 edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; -import static edu.wpi.first.units.Units.Meters; +import static org.wpilib.units.Units.Meters; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.geometry.proto.Pose3dProto; -import edu.wpi.first.math.geometry.struct.Pose3dStruct; -import edu.wpi.first.math.interpolation.Interpolatable; -import edu.wpi.first.math.numbers.N4; -import edu.wpi.first.units.measure.Distance; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.geometry.proto.Pose3dProto; +import org.wpilib.math.geometry.struct.Pose3dStruct; +import org.wpilib.math.interpolation.Interpolatable; +import org.wpilib.math.numbers.N4; +import org.wpilib.units.measure.Distance; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; import java.util.Collection; import java.util.Collections; import java.util.Comparator; diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/Quaternion.java b/wpimath/src/main/java/org/wpilib/math/geometry/Quaternion.java index 6044e90737..f18529b720 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/Quaternion.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/Quaternion.java @@ -2,19 +2,19 @@ // 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 edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.Vector; -import edu.wpi.first.math.geometry.proto.QuaternionProto; -import edu.wpi.first.math.geometry.struct.QuaternionStruct; -import edu.wpi.first.math.numbers.N3; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.linalg.Vector; +import org.wpilib.math.geometry.proto.QuaternionProto; +import org.wpilib.math.geometry.struct.QuaternionStruct; +import org.wpilib.math.numbers.N3; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; import java.util.Objects; /** Represents a quaternion. */ diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/Rectangle2d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Rectangle2d.java index 14183681c6..04b623af02 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/Rectangle2d.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/Rectangle2d.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; -import static edu.wpi.first.units.Units.Meters; +import static org.wpilib.units.Units.Meters; -import edu.wpi.first.math.geometry.proto.Rectangle2dProto; -import edu.wpi.first.math.geometry.struct.Rectangle2dStruct; -import edu.wpi.first.units.measure.Distance; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.geometry.proto.Rectangle2dProto; +import org.wpilib.math.geometry.struct.Rectangle2dStruct; +import org.wpilib.units.measure.Distance; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; import java.util.Objects; /** diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/Rotation2d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Rotation2d.java index fce505581f..769710b845 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/Rotation2d.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/Rotation2d.java @@ -2,26 +2,26 @@ // 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 edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; -import static edu.wpi.first.units.Units.Radians; +import static org.wpilib.units.Units.Radians; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.MathSharedStore; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.geometry.proto.Rotation2dProto; -import edu.wpi.first.math.geometry.struct.Rotation2dStruct; -import edu.wpi.first.math.interpolation.Interpolatable; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.util.Units; -import edu.wpi.first.units.measure.Angle; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.util.MathSharedStore; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.geometry.proto.Rotation2dProto; +import org.wpilib.math.geometry.struct.Rotation2dStruct; +import org.wpilib.math.interpolation.Interpolatable; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.util.Units; +import org.wpilib.units.measure.Angle; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; import java.util.Objects; /** diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/Rotation3d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Rotation3d.java index b0a32e2465..55e2d5d1d8 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/Rotation3d.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/Rotation3d.java @@ -2,27 +2,27 @@ // 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 edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; -import static edu.wpi.first.units.Units.Radians; +import static org.wpilib.units.Units.Radians; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.MathSharedStore; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.Vector; -import edu.wpi.first.math.geometry.proto.Rotation3dProto; -import edu.wpi.first.math.geometry.struct.Rotation3dStruct; -import edu.wpi.first.math.interpolation.Interpolatable; -import edu.wpi.first.math.numbers.N3; -import edu.wpi.first.units.measure.Angle; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.util.MathSharedStore; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.linalg.Vector; +import org.wpilib.math.geometry.proto.Rotation3dProto; +import org.wpilib.math.geometry.struct.Rotation3dStruct; +import org.wpilib.math.interpolation.Interpolatable; +import org.wpilib.math.numbers.N3; +import org.wpilib.units.measure.Angle; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; import java.util.Objects; /** A rotation in a 3D coordinate frame represented by a quaternion. */ diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/Transform2d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Transform2d.java index 475f037b1a..625bd709a1 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/Transform2d.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/Transform2d.java @@ -2,19 +2,19 @@ // 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 edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; -import static edu.wpi.first.units.Units.Meters; +import static org.wpilib.units.Units.Meters; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.geometry.proto.Transform2dProto; -import edu.wpi.first.math.geometry.struct.Transform2dStruct; -import edu.wpi.first.math.numbers.N3; -import edu.wpi.first.units.measure.Distance; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.geometry.proto.Transform2dProto; +import org.wpilib.math.geometry.struct.Transform2dStruct; +import org.wpilib.math.numbers.N3; +import org.wpilib.units.measure.Distance; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; import java.util.Objects; /** Represents a transformation for a Pose2d in the pose's frame. */ diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/Transform3d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Transform3d.java index dc893d1279..e17307ff58 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/Transform3d.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/Transform3d.java @@ -2,20 +2,20 @@ // 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 edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; -import static edu.wpi.first.units.Units.Meters; +import static org.wpilib.units.Units.Meters; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.geometry.proto.Transform3dProto; -import edu.wpi.first.math.geometry.struct.Transform3dStruct; -import edu.wpi.first.math.jni.Transform3dJNI; -import edu.wpi.first.math.numbers.N4; -import edu.wpi.first.units.measure.Distance; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.geometry.proto.Transform3dProto; +import org.wpilib.math.geometry.struct.Transform3dStruct; +import org.wpilib.math.jni.Transform3dJNI; +import org.wpilib.math.numbers.N4; +import org.wpilib.units.measure.Distance; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; import java.util.Objects; /** Represents a transformation for a Pose3d in the pose's frame. */ diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/Translation2d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Translation2d.java index 767c3b81a0..8aee771a37 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/Translation2d.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/Translation2d.java @@ -2,24 +2,24 @@ // 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 edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; -import static edu.wpi.first.units.Units.Meters; +import static org.wpilib.units.Units.Meters; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import edu.wpi.first.math.MathUtil; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.Vector; -import edu.wpi.first.math.geometry.proto.Translation2dProto; -import edu.wpi.first.math.geometry.struct.Translation2dStruct; -import edu.wpi.first.math.interpolation.Interpolatable; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.units.measure.Distance; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.util.MathUtil; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.linalg.Vector; +import org.wpilib.math.geometry.proto.Translation2dProto; +import org.wpilib.math.geometry.struct.Translation2dStruct; +import org.wpilib.math.interpolation.Interpolatable; +import org.wpilib.math.numbers.N2; +import org.wpilib.units.measure.Distance; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; import java.util.Collection; import java.util.Collections; import java.util.Comparator; diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/Translation3d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Translation3d.java index 3a4bc5fad2..0963240b5d 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/Translation3d.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/Translation3d.java @@ -2,24 +2,24 @@ // 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 edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; -import static edu.wpi.first.units.Units.Meters; +import static org.wpilib.units.Units.Meters; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import edu.wpi.first.math.MathUtil; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.Vector; -import edu.wpi.first.math.geometry.proto.Translation3dProto; -import edu.wpi.first.math.geometry.struct.Translation3dStruct; -import edu.wpi.first.math.interpolation.Interpolatable; -import edu.wpi.first.math.numbers.N3; -import edu.wpi.first.units.measure.Distance; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.util.MathUtil; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.linalg.Vector; +import org.wpilib.math.geometry.proto.Translation3dProto; +import org.wpilib.math.geometry.struct.Translation3dStruct; +import org.wpilib.math.interpolation.Interpolatable; +import org.wpilib.math.numbers.N3; +import org.wpilib.units.measure.Distance; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; import java.util.Collection; import java.util.Collections; import java.util.Comparator; diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/Twist2d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Twist2d.java index 36edd569c6..b5ecb6dfac 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/Twist2d.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/Twist2d.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; -import edu.wpi.first.math.geometry.proto.Twist2dProto; -import edu.wpi.first.math.geometry.struct.Twist2dStruct; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.geometry.proto.Twist2dProto; +import org.wpilib.math.geometry.struct.Twist2dStruct; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; import java.util.Objects; /** diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/Twist3d.java b/wpimath/src/main/java/org/wpilib/math/geometry/Twist3d.java index 64274dfb24..25e4721e69 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/Twist3d.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/Twist3d.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; -import edu.wpi.first.math.geometry.proto.Twist3dProto; -import edu.wpi.first.math.geometry.struct.Twist3dStruct; -import edu.wpi.first.math.jni.Twist3dJNI; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.geometry.proto.Twist3dProto; +import org.wpilib.math.geometry.struct.Twist3dStruct; +import org.wpilib.math.jni.Twist3dJNI; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; import java.util.Objects; /** diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Ellipse2dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Ellipse2dProto.java index 8fd99359d9..5a0d2db26d 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Ellipse2dProto.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Ellipse2dProto.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; -import edu.wpi.first.math.geometry.Ellipse2d; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.proto.Geometry2D.ProtobufEllipse2d; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.geometry.Ellipse2d; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.proto.Geometry2D.ProtobufEllipse2d; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class Ellipse2dProto implements Protobuf { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Pose2dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Pose2dProto.java index 4c0098409c..fa38663e8f 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Pose2dProto.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Pose2dProto.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.proto.Geometry2D.ProtobufPose2d; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.proto.Geometry2D.ProtobufPose2d; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class Pose2dProto implements Protobuf { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Pose3dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Pose3dProto.java index 671f2b83cc..107fabea2c 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Pose3dProto.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Pose3dProto.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.math.proto.Geometry3D.ProtobufPose3d; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.math.proto.Geometry3D.ProtobufPose3d; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class Pose3dProto implements Protobuf { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/proto/QuaternionProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/QuaternionProto.java index 51cd3d95e1..7a6e848216 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/proto/QuaternionProto.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/proto/QuaternionProto.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; -import edu.wpi.first.math.geometry.Quaternion; -import edu.wpi.first.math.proto.Geometry3D.ProtobufQuaternion; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.geometry.Quaternion; +import org.wpilib.math.proto.Geometry3D.ProtobufQuaternion; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class QuaternionProto implements Protobuf { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Rectangle2dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Rectangle2dProto.java index f730b1671f..5a8aed7a54 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Rectangle2dProto.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Rectangle2dProto.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rectangle2d; -import edu.wpi.first.math.proto.Geometry2D.ProtobufRectangle2d; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rectangle2d; +import org.wpilib.math.proto.Geometry2D.ProtobufRectangle2d; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class Rectangle2dProto implements Protobuf { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Rotation2dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Rotation2dProto.java index e0b168a171..d672879406 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Rotation2dProto.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Rotation2dProto.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.proto.Geometry2D.ProtobufRotation2d; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.proto.Geometry2D.ProtobufRotation2d; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class Rotation2dProto implements Protobuf { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Rotation3dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Rotation3dProto.java index af841550d0..20ec4fe755 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Rotation3dProto.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Rotation3dProto.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; -import edu.wpi.first.math.geometry.Quaternion; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.proto.Geometry3D.ProtobufRotation3d; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.geometry.Quaternion; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.proto.Geometry3D.ProtobufRotation3d; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class Rotation3dProto implements Protobuf { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Transform2dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Transform2dProto.java index 5536ba4c16..17da5b4be4 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Transform2dProto.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Transform2dProto.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Transform2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.proto.Geometry2D.ProtobufTransform2d; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Transform2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.proto.Geometry2D.ProtobufTransform2d; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class Transform2dProto implements Protobuf { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Transform3dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Transform3dProto.java index d824ce6ebc..54d9b263bd 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Transform3dProto.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Transform3dProto.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Transform3d; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.math.proto.Geometry3D.ProtobufTransform3d; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Transform3d; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.math.proto.Geometry3D.ProtobufTransform3d; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class Transform3dProto implements Protobuf { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Translation2dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Translation2dProto.java index 8a411fb58c..e4941868a4 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Translation2dProto.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Translation2dProto.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.proto.Geometry2D.ProtobufTranslation2d; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.proto.Geometry2D.ProtobufTranslation2d; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class Translation2dProto implements Protobuf { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Translation3dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Translation3dProto.java index 4e80f2c881..8fcdb0ec1c 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Translation3dProto.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Translation3dProto.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.math.proto.Geometry3D.ProtobufTranslation3d; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.math.proto.Geometry3D.ProtobufTranslation3d; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class Translation3dProto implements Protobuf { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Twist2dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Twist2dProto.java index bc9da6b341..5ab5b66812 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Twist2dProto.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Twist2dProto.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; -import edu.wpi.first.math.geometry.Twist2d; -import edu.wpi.first.math.proto.Geometry2D.ProtobufTwist2d; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.geometry.Twist2d; +import org.wpilib.math.proto.Geometry2D.ProtobufTwist2d; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class Twist2dProto implements Protobuf { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Twist3dProto.java b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Twist3dProto.java index 356c18f7a1..8193821d36 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/proto/Twist3dProto.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/proto/Twist3dProto.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; -import edu.wpi.first.math.geometry.Twist3d; -import edu.wpi.first.math.proto.Geometry3D.ProtobufTwist3d; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.geometry.Twist3d; +import org.wpilib.math.proto.Geometry3D.ProtobufTwist3d; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class Twist3dProto implements Protobuf { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Ellipse2dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Ellipse2dStruct.java index 31a045356b..a5aa6c3e7d 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Ellipse2dStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Ellipse2dStruct.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; -import edu.wpi.first.math.geometry.Ellipse2d; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.geometry.Ellipse2d; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class Ellipse2dStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Pose2dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Pose2dStruct.java index 027a0a3300..620468cdde 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Pose2dStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Pose2dStruct.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class Pose2dStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Pose3dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Pose3dStruct.java index 7ff6f77a63..7427673b7e 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Pose3dStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Pose3dStruct.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class Pose3dStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/struct/QuaternionStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/QuaternionStruct.java index be80cc5e89..9119690fb5 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/struct/QuaternionStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/struct/QuaternionStruct.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; -import edu.wpi.first.math.geometry.Quaternion; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.geometry.Quaternion; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class QuaternionStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Rectangle2dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Rectangle2dStruct.java index 57cde1b3cb..3a4ba5aa49 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Rectangle2dStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Rectangle2dStruct.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rectangle2d; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rectangle2d; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class Rectangle2dStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Rotation2dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Rotation2dStruct.java index 1f348d73a0..45afd629e0 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Rotation2dStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Rotation2dStruct.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class Rotation2dStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Rotation3dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Rotation3dStruct.java index ec44c603d0..369c896da5 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Rotation3dStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Rotation3dStruct.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; -import edu.wpi.first.math.geometry.Quaternion; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.geometry.Quaternion; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class Rotation3dStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Transform2dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Transform2dStruct.java index 188ab07051..b0c50cc88b 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Transform2dStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Transform2dStruct.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Transform2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Transform2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class Transform2dStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Transform3dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Transform3dStruct.java index 5bdf788118..e69f26bd7e 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Transform3dStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Transform3dStruct.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Transform3d; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Transform3d; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class Transform3dStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Translation2dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Translation2dStruct.java index dfa925a8fa..8477d8e26b 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Translation2dStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Translation2dStruct.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class Translation2dStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Translation3dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Translation3dStruct.java index dd58afb2c1..7efcf3f41b 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Translation3dStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Translation3dStruct.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class Translation3dStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Twist2dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Twist2dStruct.java index 43b7a117f7..3f33fa46c0 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Twist2dStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Twist2dStruct.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; -import edu.wpi.first.math.geometry.Twist2d; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.geometry.Twist2d; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class Twist2dStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Twist3dStruct.java b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Twist3dStruct.java index 435e06a30a..ce3c6619a3 100644 --- a/wpimath/src/main/java/org/wpilib/math/geometry/struct/Twist3dStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/geometry/struct/Twist3dStruct.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; -import edu.wpi.first.math.geometry.Twist3d; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.geometry.Twist3d; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class Twist3dStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/interpolation/Interpolatable.java b/wpimath/src/main/java/org/wpilib/math/interpolation/Interpolatable.java index 186ed41841..4bf7f0a328 100644 --- a/wpimath/src/main/java/org/wpilib/math/interpolation/Interpolatable.java +++ b/wpimath/src/main/java/org/wpilib/math/interpolation/Interpolatable.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 edu.wpi.first.math.interpolation; +package org.wpilib.math.interpolation; /** * An object should extend interpolatable if you wish to interpolate between a lower and upper diff --git a/wpimath/src/main/java/org/wpilib/math/interpolation/InterpolatingDoubleTreeMap.java b/wpimath/src/main/java/org/wpilib/math/interpolation/InterpolatingDoubleTreeMap.java index bfc28dbacd..c28573f96a 100644 --- a/wpimath/src/main/java/org/wpilib/math/interpolation/InterpolatingDoubleTreeMap.java +++ b/wpimath/src/main/java/org/wpilib/math/interpolation/InterpolatingDoubleTreeMap.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 edu.wpi.first.math.interpolation; +package org.wpilib.math.interpolation; import java.util.Map; diff --git a/wpimath/src/main/java/org/wpilib/math/interpolation/InterpolatingMatrixTreeMap.java b/wpimath/src/main/java/org/wpilib/math/interpolation/InterpolatingMatrixTreeMap.java index a0aedef2dc..88ed520c85 100644 --- a/wpimath/src/main/java/org/wpilib/math/interpolation/InterpolatingMatrixTreeMap.java +++ b/wpimath/src/main/java/org/wpilib/math/interpolation/InterpolatingMatrixTreeMap.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 edu.wpi.first.math; +package org.wpilib.math.interpolation; import java.util.TreeMap; diff --git a/wpimath/src/main/java/org/wpilib/math/interpolation/InterpolatingTreeMap.java b/wpimath/src/main/java/org/wpilib/math/interpolation/InterpolatingTreeMap.java index 22eb2326d9..4fb610732e 100644 --- a/wpimath/src/main/java/org/wpilib/math/interpolation/InterpolatingTreeMap.java +++ b/wpimath/src/main/java/org/wpilib/math/interpolation/InterpolatingTreeMap.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 edu.wpi.first.math.interpolation; +package org.wpilib.math.interpolation; import java.util.Comparator; import java.util.TreeMap; diff --git a/wpimath/src/main/java/org/wpilib/math/interpolation/Interpolator.java b/wpimath/src/main/java/org/wpilib/math/interpolation/Interpolator.java index 37192cf9ec..128bb56d6a 100644 --- a/wpimath/src/main/java/org/wpilib/math/interpolation/Interpolator.java +++ b/wpimath/src/main/java/org/wpilib/math/interpolation/Interpolator.java @@ -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. -package edu.wpi.first.math.interpolation; +package org.wpilib.math.interpolation; -import edu.wpi.first.math.MathUtil; +import org.wpilib.math.util.MathUtil; /** * An interpolation function that returns a value interpolated between an upper and lower bound. diff --git a/wpimath/src/main/java/org/wpilib/math/interpolation/InverseInterpolator.java b/wpimath/src/main/java/org/wpilib/math/interpolation/InverseInterpolator.java index 92f33e7de9..12d2631c5e 100644 --- a/wpimath/src/main/java/org/wpilib/math/interpolation/InverseInterpolator.java +++ b/wpimath/src/main/java/org/wpilib/math/interpolation/InverseInterpolator.java @@ -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. -package edu.wpi.first.math.interpolation; +package org.wpilib.math.interpolation; -import edu.wpi.first.math.MathUtil; +import org.wpilib.math.util.MathUtil; /** * An inverse interpolation function which determines where within an interpolation range an object diff --git a/wpimath/src/main/java/org/wpilib/math/interpolation/TimeInterpolatableBuffer.java b/wpimath/src/main/java/org/wpilib/math/interpolation/TimeInterpolatableBuffer.java index 3d4c4b8a13..7bf885323c 100644 --- a/wpimath/src/main/java/org/wpilib/math/interpolation/TimeInterpolatableBuffer.java +++ b/wpimath/src/main/java/org/wpilib/math/interpolation/TimeInterpolatableBuffer.java @@ -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. -package edu.wpi.first.math.interpolation; +package org.wpilib.math.interpolation; -import edu.wpi.first.math.MathUtil; +import org.wpilib.math.util.MathUtil; import java.util.NavigableMap; import java.util.Optional; import java.util.TreeMap; diff --git a/wpimath/src/main/java/org/wpilib/math/jni/ArmFeedforwardJNI.java b/wpimath/src/main/java/org/wpilib/math/jni/ArmFeedforwardJNI.java index b72c7539f7..9b315de857 100644 --- a/wpimath/src/main/java/org/wpilib/math/jni/ArmFeedforwardJNI.java +++ b/wpimath/src/main/java/org/wpilib/math/jni/ArmFeedforwardJNI.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 edu.wpi.first.math.jni; +package org.wpilib.math.jni; /** ArmFeedforward JNI. */ public final class ArmFeedforwardJNI extends WPIMathJNI { diff --git a/wpimath/src/main/java/org/wpilib/math/jni/DAREJNI.java b/wpimath/src/main/java/org/wpilib/math/jni/DAREJNI.java index 7794309b86..16a2d54164 100644 --- a/wpimath/src/main/java/org/wpilib/math/jni/DAREJNI.java +++ b/wpimath/src/main/java/org/wpilib/math/jni/DAREJNI.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 edu.wpi.first.math.jni; +package org.wpilib.math.jni; /** DARE JNI. */ public final class DAREJNI extends WPIMathJNI { diff --git a/wpimath/src/main/java/org/wpilib/math/jni/EigenJNI.java b/wpimath/src/main/java/org/wpilib/math/jni/EigenJNI.java index 1a673ed86c..d134ef3689 100644 --- a/wpimath/src/main/java/org/wpilib/math/jni/EigenJNI.java +++ b/wpimath/src/main/java/org/wpilib/math/jni/EigenJNI.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 edu.wpi.first.math.jni; +package org.wpilib.math.jni; /** Eigen JNI. */ public final class EigenJNI extends WPIMathJNI { diff --git a/wpimath/src/main/java/org/wpilib/math/jni/Ellipse2dJNI.java b/wpimath/src/main/java/org/wpilib/math/jni/Ellipse2dJNI.java index 895caa2bc5..d766ddbf63 100644 --- a/wpimath/src/main/java/org/wpilib/math/jni/Ellipse2dJNI.java +++ b/wpimath/src/main/java/org/wpilib/math/jni/Ellipse2dJNI.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 edu.wpi.first.math.jni; +package org.wpilib.math.jni; /** Ellipse2d JNI. */ public final class Ellipse2dJNI extends WPIMathJNI { diff --git a/wpimath/src/main/java/org/wpilib/math/jni/StateSpaceUtilJNI.java b/wpimath/src/main/java/org/wpilib/math/jni/StateSpaceUtilJNI.java index b590e4ce15..9863bf431b 100644 --- a/wpimath/src/main/java/org/wpilib/math/jni/StateSpaceUtilJNI.java +++ b/wpimath/src/main/java/org/wpilib/math/jni/StateSpaceUtilJNI.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 edu.wpi.first.math.jni; +package org.wpilib.math.jni; /** StateSpaceUtil JNI. */ public final class StateSpaceUtilJNI extends WPIMathJNI { diff --git a/wpimath/src/main/java/org/wpilib/math/jni/Transform3dJNI.java b/wpimath/src/main/java/org/wpilib/math/jni/Transform3dJNI.java index 22fff99fe8..d3cb657a20 100644 --- a/wpimath/src/main/java/org/wpilib/math/jni/Transform3dJNI.java +++ b/wpimath/src/main/java/org/wpilib/math/jni/Transform3dJNI.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 edu.wpi.first.math.jni; +package org.wpilib.math.jni; /** Transform3d JNI. */ public final class Transform3dJNI extends WPIMathJNI { diff --git a/wpimath/src/main/java/org/wpilib/math/jni/Twist3dJNI.java b/wpimath/src/main/java/org/wpilib/math/jni/Twist3dJNI.java index d594c0cafc..db66946080 100644 --- a/wpimath/src/main/java/org/wpilib/math/jni/Twist3dJNI.java +++ b/wpimath/src/main/java/org/wpilib/math/jni/Twist3dJNI.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 edu.wpi.first.math.jni; +package org.wpilib.math.jni; /** Twist3d JNI. */ public final class Twist3dJNI extends WPIMathJNI { diff --git a/wpimath/src/main/java/org/wpilib/math/jni/WPIMathJNI.java b/wpimath/src/main/java/org/wpilib/math/jni/WPIMathJNI.java index 8b16e7a189..db2c80ba1b 100644 --- a/wpimath/src/main/java/org/wpilib/math/jni/WPIMathJNI.java +++ b/wpimath/src/main/java/org/wpilib/math/jni/WPIMathJNI.java @@ -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. -package edu.wpi.first.math.jni; +package org.wpilib.math.jni; -import edu.wpi.first.util.RuntimeLoader; +import org.wpilib.util.runtime.RuntimeLoader; import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/ChassisSpeeds.java b/wpimath/src/main/java/org/wpilib/math/kinematics/ChassisSpeeds.java index 913a66a784..1c044ddd69 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/ChassisSpeeds.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/ChassisSpeeds.java @@ -2,21 +2,21 @@ // 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 edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; -import static edu.wpi.first.units.Units.MetersPerSecond; -import static edu.wpi.first.units.Units.RadiansPerSecond; +import static org.wpilib.units.Units.MetersPerSecond; +import static org.wpilib.units.Units.RadiansPerSecond; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Transform2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.geometry.Twist2d; -import edu.wpi.first.math.kinematics.proto.ChassisSpeedsProto; -import edu.wpi.first.math.kinematics.struct.ChassisSpeedsStruct; -import edu.wpi.first.units.measure.AngularVelocity; -import edu.wpi.first.units.measure.LinearVelocity; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Transform2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.geometry.Twist2d; +import org.wpilib.math.kinematics.proto.ChassisSpeedsProto; +import org.wpilib.math.kinematics.struct.ChassisSpeedsStruct; +import org.wpilib.units.measure.AngularVelocity; +import org.wpilib.units.measure.LinearVelocity; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; import java.util.Objects; /** diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveKinematics.java b/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveKinematics.java index eced997b24..0a2bd46e81 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveKinematics.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveKinematics.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; -import static edu.wpi.first.units.Units.Meters; +import static org.wpilib.units.Units.Meters; -import edu.wpi.first.math.MathSharedStore; -import edu.wpi.first.math.geometry.Twist2d; -import edu.wpi.first.math.kinematics.proto.DifferentialDriveKinematicsProto; -import edu.wpi.first.math.kinematics.struct.DifferentialDriveKinematicsStruct; -import edu.wpi.first.units.measure.Distance; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.util.MathSharedStore; +import org.wpilib.math.geometry.Twist2d; +import org.wpilib.math.kinematics.proto.DifferentialDriveKinematicsProto; +import org.wpilib.math.kinematics.struct.DifferentialDriveKinematicsStruct; +import org.wpilib.units.measure.Distance; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; /** * Helper class that converts a chassis velocity (dx and dtheta components) to left and right wheel diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveOdometry.java b/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveOdometry.java index 14b77b1eed..d907c403ac 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveOdometry.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveOdometry.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; -import static edu.wpi.first.units.Units.Meters; +import static org.wpilib.units.Units.Meters; -import edu.wpi.first.math.MathSharedStore; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.units.measure.Distance; +import org.wpilib.math.util.MathSharedStore; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.units.measure.Distance; /** * Class for differential drive odometry. Odometry allows you to track the robot's position on the diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveOdometry3d.java b/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveOdometry3d.java index 029d6069ec..614f9a83bd 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveOdometry3d.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveOdometry3d.java @@ -2,18 +2,18 @@ // 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 edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; -import static edu.wpi.first.units.Units.Meters; +import static org.wpilib.units.Units.Meters; -import edu.wpi.first.math.MathSharedStore; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.units.measure.Distance; +import org.wpilib.math.util.MathSharedStore; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.units.measure.Distance; /** * Class for differential drive odometry. Odometry allows you to track the robot's position on the diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveWheelPositions.java b/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveWheelPositions.java index 82b761ca0e..ca81dbf44e 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveWheelPositions.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveWheelPositions.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; -import static edu.wpi.first.units.Units.Meters; +import static org.wpilib.units.Units.Meters; -import edu.wpi.first.math.MathUtil; -import edu.wpi.first.math.interpolation.Interpolatable; -import edu.wpi.first.math.kinematics.proto.DifferentialDriveWheelPositionsProto; -import edu.wpi.first.math.kinematics.struct.DifferentialDriveWheelPositionsStruct; -import edu.wpi.first.units.measure.Distance; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.util.MathUtil; +import org.wpilib.math.interpolation.Interpolatable; +import org.wpilib.math.kinematics.proto.DifferentialDriveWheelPositionsProto; +import org.wpilib.math.kinematics.struct.DifferentialDriveWheelPositionsStruct; +import org.wpilib.units.measure.Distance; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; import java.util.Objects; /** Represents the wheel positions for a differential drive drivetrain. */ diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveWheelSpeeds.java b/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveWheelSpeeds.java index 60b3bca8f3..7ada1bda2c 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveWheelSpeeds.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/DifferentialDriveWheelSpeeds.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; -import static edu.wpi.first.units.Units.MetersPerSecond; +import static org.wpilib.units.Units.MetersPerSecond; -import edu.wpi.first.math.kinematics.proto.DifferentialDriveWheelSpeedsProto; -import edu.wpi.first.math.kinematics.struct.DifferentialDriveWheelSpeedsStruct; -import edu.wpi.first.units.measure.LinearVelocity; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.kinematics.proto.DifferentialDriveWheelSpeedsProto; +import org.wpilib.math.kinematics.struct.DifferentialDriveWheelSpeedsStruct; +import org.wpilib.units.measure.LinearVelocity; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; /** Represents the wheel speeds for a differential drive drivetrain. */ public class DifferentialDriveWheelSpeeds implements ProtobufSerializable, StructSerializable { diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/Kinematics.java b/wpimath/src/main/java/org/wpilib/math/kinematics/Kinematics.java index 307999d655..444b4dd94a 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/Kinematics.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/Kinematics.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; -import edu.wpi.first.math.geometry.Twist2d; -import edu.wpi.first.math.interpolation.Interpolator; +import org.wpilib.math.geometry.Twist2d; +import org.wpilib.math.interpolation.Interpolator; /** * Helper class that converts a chassis velocity (dx and dtheta components) into wheel speeds. Robot diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveKinematics.java b/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveKinematics.java index 1217f02dd4..cad2877dff 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveKinematics.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveKinematics.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; -import edu.wpi.first.math.MathSharedStore; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.geometry.Twist2d; -import edu.wpi.first.math.kinematics.proto.MecanumDriveKinematicsProto; -import edu.wpi.first.math.kinematics.struct.MecanumDriveKinematicsStruct; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.util.MathSharedStore; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.geometry.Twist2d; +import org.wpilib.math.kinematics.proto.MecanumDriveKinematicsProto; +import org.wpilib.math.kinematics.struct.MecanumDriveKinematicsStruct; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; import org.ejml.simple.SimpleMatrix; /** diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveOdometry.java b/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveOdometry.java index b7b0a68d75..2ea20ce06c 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveOdometry.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveOdometry.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; -import edu.wpi.first.math.MathSharedStore; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; +import org.wpilib.math.util.MathSharedStore; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; /** * Class for mecanum drive odometry. Odometry allows you to track the robot's position on the field diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveOdometry3d.java b/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveOdometry3d.java index 2fe249117e..40990d61b4 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveOdometry3d.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveOdometry3d.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; -import edu.wpi.first.math.MathSharedStore; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.geometry.Translation3d; +import org.wpilib.math.util.MathSharedStore; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.geometry.Translation3d; /** * Class for mecanum drive odometry. Odometry allows you to track the robot's position on the field diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveWheelPositions.java b/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveWheelPositions.java index 663c8a9e77..c807bb7369 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveWheelPositions.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveWheelPositions.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; -import static edu.wpi.first.units.Units.Meters; +import static org.wpilib.units.Units.Meters; -import edu.wpi.first.math.MathUtil; -import edu.wpi.first.math.interpolation.Interpolatable; -import edu.wpi.first.math.kinematics.proto.MecanumDriveWheelPositionsProto; -import edu.wpi.first.math.kinematics.struct.MecanumDriveWheelPositionsStruct; -import edu.wpi.first.units.measure.Distance; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.util.MathUtil; +import org.wpilib.math.interpolation.Interpolatable; +import org.wpilib.math.kinematics.proto.MecanumDriveWheelPositionsProto; +import org.wpilib.math.kinematics.struct.MecanumDriveWheelPositionsStruct; +import org.wpilib.units.measure.Distance; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; import java.util.Objects; /** Represents the wheel positions for a mecanum drive drivetrain. */ diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveWheelSpeeds.java b/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveWheelSpeeds.java index 11c05c0bd4..e95e96d2e3 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveWheelSpeeds.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/MecanumDriveWheelSpeeds.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; -import static edu.wpi.first.units.Units.MetersPerSecond; +import static org.wpilib.units.Units.MetersPerSecond; -import edu.wpi.first.math.kinematics.proto.MecanumDriveWheelSpeedsProto; -import edu.wpi.first.math.kinematics.struct.MecanumDriveWheelSpeedsStruct; -import edu.wpi.first.units.measure.LinearVelocity; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.kinematics.proto.MecanumDriveWheelSpeedsProto; +import org.wpilib.math.kinematics.struct.MecanumDriveWheelSpeedsStruct; +import org.wpilib.units.measure.LinearVelocity; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; /** Represents the wheel speeds for a mecanum drive drivetrain. */ public class MecanumDriveWheelSpeeds implements ProtobufSerializable, StructSerializable { diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/Odometry.java b/wpimath/src/main/java/org/wpilib/math/kinematics/Odometry.java index c5fee7ebfc..d6a6fe5629 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/Odometry.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/Odometry.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Translation2d; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Translation2d; /** * Class for odometry. Robot code should not use this directly- Instead, use the particular type for diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/Odometry3d.java b/wpimath/src/main/java/org/wpilib/math/kinematics/Odometry3d.java index 12211f721a..bcdd4a6ab7 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/Odometry3d.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/Odometry3d.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.math.geometry.Twist3d; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.math.geometry.Twist3d; /** * Class for odometry. Robot code should not use this directly- Instead, use the particular type for diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveDriveKinematics.java b/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveDriveKinematics.java index 2e69777af8..4acc3af00d 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveDriveKinematics.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveDriveKinematics.java @@ -2,22 +2,22 @@ // 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 edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; -import static edu.wpi.first.units.Units.MetersPerSecond; -import static edu.wpi.first.units.Units.RadiansPerSecond; +import static org.wpilib.units.Units.MetersPerSecond; +import static org.wpilib.units.Units.RadiansPerSecond; -import edu.wpi.first.math.MathSharedStore; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.geometry.Twist2d; -import edu.wpi.first.math.kinematics.proto.SwerveDriveKinematicsProto; -import edu.wpi.first.math.kinematics.struct.SwerveDriveKinematicsStruct; -import edu.wpi.first.units.measure.AngularVelocity; -import edu.wpi.first.units.measure.LinearVelocity; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.Struct; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.util.MathSharedStore; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.geometry.Twist2d; +import org.wpilib.math.kinematics.proto.SwerveDriveKinematicsProto; +import org.wpilib.math.kinematics.struct.SwerveDriveKinematicsStruct; +import org.wpilib.units.measure.AngularVelocity; +import org.wpilib.units.measure.LinearVelocity; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.Struct; +import org.wpilib.util.struct.StructSerializable; import java.util.Arrays; import org.ejml.simple.SimpleMatrix; diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveDriveOdometry.java b/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveDriveOdometry.java index ff909b34c2..2c70296633 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveDriveOdometry.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveDriveOdometry.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; -import edu.wpi.first.math.MathSharedStore; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; +import org.wpilib.math.util.MathSharedStore; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; /** * Class for swerve drive odometry. Odometry allows you to track the robot's position on the field diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveDriveOdometry3d.java b/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveDriveOdometry3d.java index 2e21a4fb3a..9418f61b7b 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveDriveOdometry3d.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveDriveOdometry3d.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; -import edu.wpi.first.math.MathSharedStore; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.geometry.Translation3d; +import org.wpilib.math.util.MathSharedStore; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.geometry.Translation3d; /** * Class for swerve drive odometry. Odometry allows you to track the robot's position on the field diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveModulePosition.java b/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveModulePosition.java index 10ddb4aba7..17dff4f185 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveModulePosition.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveModulePosition.java @@ -2,18 +2,18 @@ // 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 edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; -import static edu.wpi.first.units.Units.Meters; +import static org.wpilib.units.Units.Meters; -import edu.wpi.first.math.MathUtil; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.interpolation.Interpolatable; -import edu.wpi.first.math.kinematics.proto.SwerveModulePositionProto; -import edu.wpi.first.math.kinematics.struct.SwerveModulePositionStruct; -import edu.wpi.first.units.measure.Distance; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.util.MathUtil; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.interpolation.Interpolatable; +import org.wpilib.math.kinematics.proto.SwerveModulePositionProto; +import org.wpilib.math.kinematics.struct.SwerveModulePositionStruct; +import org.wpilib.units.measure.Distance; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; import java.util.Objects; /** Represents the state of one swerve module. */ diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveModuleState.java b/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveModuleState.java index 8855f980be..4e859f615d 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveModuleState.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/SwerveModuleState.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; -import static edu.wpi.first.units.Units.MetersPerSecond; +import static org.wpilib.units.Units.MetersPerSecond; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.kinematics.proto.SwerveModuleStateProto; -import edu.wpi.first.math.kinematics.struct.SwerveModuleStateStruct; -import edu.wpi.first.units.measure.LinearVelocity; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.kinematics.proto.SwerveModuleStateProto; +import org.wpilib.math.kinematics.struct.SwerveModuleStateStruct; +import org.wpilib.units.measure.LinearVelocity; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; import java.util.Objects; /** Represents the state of one swerve module. */ diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/proto/ChassisSpeedsProto.java b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/ChassisSpeedsProto.java index 8a83b41678..80c99d43f7 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/proto/ChassisSpeedsProto.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/ChassisSpeedsProto.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.proto; +package org.wpilib.math.kinematics.proto; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.math.proto.Kinematics.ProtobufChassisSpeeds; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.kinematics.ChassisSpeeds; +import org.wpilib.math.proto.Kinematics.ProtobufChassisSpeeds; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class ChassisSpeedsProto implements Protobuf { diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/proto/DifferentialDriveKinematicsProto.java b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/DifferentialDriveKinematicsProto.java index 311b4d8057..e6cb1d8552 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/proto/DifferentialDriveKinematicsProto.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/DifferentialDriveKinematicsProto.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.proto; +package org.wpilib.math.kinematics.proto; -import edu.wpi.first.math.kinematics.DifferentialDriveKinematics; -import edu.wpi.first.math.proto.Kinematics.ProtobufDifferentialDriveKinematics; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.kinematics.DifferentialDriveKinematics; +import org.wpilib.math.proto.Kinematics.ProtobufDifferentialDriveKinematics; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class DifferentialDriveKinematicsProto diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/proto/DifferentialDriveWheelPositionsProto.java b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/DifferentialDriveWheelPositionsProto.java index 23a7039383..f27c9dcc2d 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/proto/DifferentialDriveWheelPositionsProto.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/DifferentialDriveWheelPositionsProto.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.proto; +package org.wpilib.math.kinematics.proto; -import edu.wpi.first.math.kinematics.DifferentialDriveWheelPositions; -import edu.wpi.first.math.proto.Kinematics.ProtobufDifferentialDriveWheelPositions; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.kinematics.DifferentialDriveWheelPositions; +import org.wpilib.math.proto.Kinematics.ProtobufDifferentialDriveWheelPositions; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class DifferentialDriveWheelPositionsProto diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/proto/DifferentialDriveWheelSpeedsProto.java b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/DifferentialDriveWheelSpeedsProto.java index c6023ac761..8fbf754c76 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/proto/DifferentialDriveWheelSpeedsProto.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/DifferentialDriveWheelSpeedsProto.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.proto; +package org.wpilib.math.kinematics.proto; -import edu.wpi.first.math.kinematics.DifferentialDriveWheelSpeeds; -import edu.wpi.first.math.proto.Kinematics.ProtobufDifferentialDriveWheelSpeeds; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.kinematics.DifferentialDriveWheelSpeeds; +import org.wpilib.math.proto.Kinematics.ProtobufDifferentialDriveWheelSpeeds; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class DifferentialDriveWheelSpeedsProto diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/proto/MecanumDriveKinematicsProto.java b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/MecanumDriveKinematicsProto.java index 504b8f8567..8feaa81ac4 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/proto/MecanumDriveKinematicsProto.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/MecanumDriveKinematicsProto.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.proto; +package org.wpilib.math.kinematics.proto; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.kinematics.MecanumDriveKinematics; -import edu.wpi.first.math.proto.Kinematics.ProtobufMecanumDriveKinematics; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.kinematics.MecanumDriveKinematics; +import org.wpilib.math.proto.Kinematics.ProtobufMecanumDriveKinematics; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class MecanumDriveKinematicsProto diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelPositionsProto.java b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelPositionsProto.java index 6469657f9d..559b336352 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelPositionsProto.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelPositionsProto.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.proto; +package org.wpilib.math.kinematics.proto; -import edu.wpi.first.math.kinematics.MecanumDriveWheelPositions; -import edu.wpi.first.math.proto.Kinematics.ProtobufMecanumDriveWheelPositions; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.kinematics.MecanumDriveWheelPositions; +import org.wpilib.math.proto.Kinematics.ProtobufMecanumDriveWheelPositions; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class MecanumDriveWheelPositionsProto diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelSpeedsProto.java b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelSpeedsProto.java index dffa38bcc7..e2aa1fca8b 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelSpeedsProto.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelSpeedsProto.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.proto; +package org.wpilib.math.kinematics.proto; -import edu.wpi.first.math.kinematics.MecanumDriveWheelSpeeds; -import edu.wpi.first.math.proto.Kinematics.ProtobufMecanumDriveWheelSpeeds; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.kinematics.MecanumDriveWheelSpeeds; +import org.wpilib.math.proto.Kinematics.ProtobufMecanumDriveWheelSpeeds; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class MecanumDriveWheelSpeedsProto diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/proto/SwerveDriveKinematicsProto.java b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/SwerveDriveKinematicsProto.java index 21e7fdc667..33cceb3fc6 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/proto/SwerveDriveKinematicsProto.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/SwerveDriveKinematicsProto.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.proto; +package org.wpilib.math.kinematics.proto; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.kinematics.SwerveDriveKinematics; -import edu.wpi.first.math.proto.Kinematics.ProtobufSwerveDriveKinematics; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.kinematics.SwerveDriveKinematics; +import org.wpilib.math.proto.Kinematics.ProtobufSwerveDriveKinematics; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public final class SwerveDriveKinematicsProto diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/proto/SwerveModulePositionProto.java b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/SwerveModulePositionProto.java index a445c7b05f..06eaeac19b 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/proto/SwerveModulePositionProto.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/SwerveModulePositionProto.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.proto; +package org.wpilib.math.kinematics.proto; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.kinematics.SwerveModulePosition; -import edu.wpi.first.math.proto.Kinematics.ProtobufSwerveModulePosition; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.kinematics.SwerveModulePosition; +import org.wpilib.math.proto.Kinematics.ProtobufSwerveModulePosition; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class SwerveModulePositionProto diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/proto/SwerveModuleStateProto.java b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/SwerveModuleStateProto.java index f8de137520..bb68b930d7 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/proto/SwerveModuleStateProto.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/proto/SwerveModuleStateProto.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.proto; +package org.wpilib.math.kinematics.proto; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.kinematics.SwerveModuleState; -import edu.wpi.first.math.proto.Kinematics.ProtobufSwerveModuleState; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.kinematics.SwerveModuleState; +import org.wpilib.math.proto.Kinematics.ProtobufSwerveModuleState; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class SwerveModuleStateProto diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/struct/ChassisSpeedsStruct.java b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/ChassisSpeedsStruct.java index 14d2030389..56e09ef96f 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/struct/ChassisSpeedsStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/ChassisSpeedsStruct.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.struct; +package org.wpilib.math.kinematics.struct; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.kinematics.ChassisSpeeds; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class ChassisSpeedsStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/struct/DifferentialDriveKinematicsStruct.java b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/DifferentialDriveKinematicsStruct.java index 621af5741a..1fc6fd232c 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/struct/DifferentialDriveKinematicsStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/DifferentialDriveKinematicsStruct.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.struct; +package org.wpilib.math.kinematics.struct; -import edu.wpi.first.math.kinematics.DifferentialDriveKinematics; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.kinematics.DifferentialDriveKinematics; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class DifferentialDriveKinematicsStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelPositionsStruct.java b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelPositionsStruct.java index 8b2aeaf0bb..891da97e24 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelPositionsStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelPositionsStruct.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.struct; +package org.wpilib.math.kinematics.struct; -import edu.wpi.first.math.kinematics.DifferentialDriveWheelPositions; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.kinematics.DifferentialDriveWheelPositions; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class DifferentialDriveWheelPositionsStruct diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelSpeedsStruct.java b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelSpeedsStruct.java index dca590766d..4206f7c65f 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelSpeedsStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelSpeedsStruct.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.struct; +package org.wpilib.math.kinematics.struct; -import edu.wpi.first.math.kinematics.DifferentialDriveWheelSpeeds; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.kinematics.DifferentialDriveWheelSpeeds; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class DifferentialDriveWheelSpeedsStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/struct/MecanumDriveKinematicsStruct.java b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/MecanumDriveKinematicsStruct.java index 100881ffff..a4c17009ab 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/struct/MecanumDriveKinematicsStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/MecanumDriveKinematicsStruct.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.struct; +package org.wpilib.math.kinematics.struct; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.kinematics.MecanumDriveKinematics; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.kinematics.MecanumDriveKinematics; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class MecanumDriveKinematicsStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelPositionsStruct.java b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelPositionsStruct.java index 5974282996..7ed9d1c7c3 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelPositionsStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelPositionsStruct.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.struct; +package org.wpilib.math.kinematics.struct; -import edu.wpi.first.math.kinematics.MecanumDriveWheelPositions; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.kinematics.MecanumDriveWheelPositions; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class MecanumDriveWheelPositionsStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelSpeedsStruct.java b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelSpeedsStruct.java index 8d2f6382bc..3767ed7fbf 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelSpeedsStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelSpeedsStruct.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.struct; +package org.wpilib.math.kinematics.struct; -import edu.wpi.first.math.kinematics.MecanumDriveWheelSpeeds; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.kinematics.MecanumDriveWheelSpeeds; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class MecanumDriveWheelSpeedsStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/struct/SwerveDriveKinematicsStruct.java b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/SwerveDriveKinematicsStruct.java index 2f1cbc0cbe..b0bb3c360f 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/struct/SwerveDriveKinematicsStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/SwerveDriveKinematicsStruct.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.struct; +package org.wpilib.math.kinematics.struct; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.kinematics.SwerveDriveKinematics; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.kinematics.SwerveDriveKinematics; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public final class SwerveDriveKinematicsStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/struct/SwerveModulePositionStruct.java b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/SwerveModulePositionStruct.java index 85ebdc47c3..d8e31dec6e 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/struct/SwerveModulePositionStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/SwerveModulePositionStruct.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.struct; +package org.wpilib.math.kinematics.struct; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.kinematics.SwerveModulePosition; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.kinematics.SwerveModulePosition; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class SwerveModulePositionStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/kinematics/struct/SwerveModuleStateStruct.java b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/SwerveModuleStateStruct.java index 90c538221d..69f0f20ac5 100644 --- a/wpimath/src/main/java/org/wpilib/math/kinematics/struct/SwerveModuleStateStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/kinematics/struct/SwerveModuleStateStruct.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.struct; +package org.wpilib.math.kinematics.struct; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.kinematics.SwerveModuleState; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.kinematics.SwerveModuleState; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class SwerveModuleStateStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/linalg/DARE.java b/wpimath/src/main/java/org/wpilib/math/linalg/DARE.java index 00ca8a0cae..6edaa64fca 100644 --- a/wpimath/src/main/java/org/wpilib/math/linalg/DARE.java +++ b/wpimath/src/main/java/org/wpilib/math/linalg/DARE.java @@ -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. -package edu.wpi.first.math; +package org.wpilib.math.linalg; -import edu.wpi.first.math.jni.DAREJNI; +import org.wpilib.math.jni.DAREJNI; import org.ejml.simple.SimpleMatrix; /** DARE solver utility functions. */ diff --git a/wpimath/src/main/java/org/wpilib/math/linalg/MatBuilder.java b/wpimath/src/main/java/org/wpilib/math/linalg/MatBuilder.java index 68c1c8dd42..75c619e1d6 100644 --- a/wpimath/src/main/java/org/wpilib/math/linalg/MatBuilder.java +++ b/wpimath/src/main/java/org/wpilib/math/linalg/MatBuilder.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 edu.wpi.first.math; +package org.wpilib.math.linalg; import java.util.Objects; import org.ejml.simple.SimpleMatrix; diff --git a/wpimath/src/main/java/org/wpilib/math/linalg/Matrix.java b/wpimath/src/main/java/org/wpilib/math/linalg/Matrix.java index 250603bfcf..c2c7e77db0 100644 --- a/wpimath/src/main/java/org/wpilib/math/linalg/Matrix.java +++ b/wpimath/src/main/java/org/wpilib/math/linalg/Matrix.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.math; +package org.wpilib.math.linalg; -import edu.wpi.first.math.jni.EigenJNI; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.proto.MatrixProto; -import edu.wpi.first.math.struct.MatrixStruct; -import edu.wpi.first.util.protobuf.Protobuf; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.Struct; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.jni.EigenJNI; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.linalg.proto.MatrixProto; +import org.wpilib.math.linalg.struct.MatrixStruct; +import org.wpilib.util.protobuf.Protobuf; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.Struct; +import org.wpilib.util.struct.StructSerializable; import java.util.Objects; import org.ejml.MatrixDimensionException; import org.ejml.data.DMatrixRMaj; diff --git a/wpimath/src/main/java/org/wpilib/math/linalg/VecBuilder.java b/wpimath/src/main/java/org/wpilib/math/linalg/VecBuilder.java index 0e47ae3533..e0290c35c2 100644 --- a/wpimath/src/main/java/org/wpilib/math/linalg/VecBuilder.java +++ b/wpimath/src/main/java/org/wpilib/math/linalg/VecBuilder.java @@ -2,18 +2,18 @@ // 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 edu.wpi.first.math; +package org.wpilib.math.linalg; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N10; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.numbers.N3; -import edu.wpi.first.math.numbers.N4; -import edu.wpi.first.math.numbers.N5; -import edu.wpi.first.math.numbers.N6; -import edu.wpi.first.math.numbers.N7; -import edu.wpi.first.math.numbers.N8; -import edu.wpi.first.math.numbers.N9; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N10; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.numbers.N3; +import org.wpilib.math.numbers.N4; +import org.wpilib.math.numbers.N5; +import org.wpilib.math.numbers.N6; +import org.wpilib.math.numbers.N7; +import org.wpilib.math.numbers.N8; +import org.wpilib.math.numbers.N9; import java.util.Objects; import org.ejml.simple.SimpleMatrix; diff --git a/wpimath/src/main/java/org/wpilib/math/linalg/Vector.java b/wpimath/src/main/java/org/wpilib/math/linalg/Vector.java index 69e019dc8a..364cfcbd2f 100644 --- a/wpimath/src/main/java/org/wpilib/math/linalg/Vector.java +++ b/wpimath/src/main/java/org/wpilib/math/linalg/Vector.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.math; +package org.wpilib.math.linalg; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N3; -import edu.wpi.first.math.proto.VectorProto; -import edu.wpi.first.math.struct.VectorStruct; -import edu.wpi.first.util.protobuf.Protobuf; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.Struct; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N3; +import org.wpilib.math.linalg.proto.VectorProto; +import org.wpilib.math.linalg.struct.VectorStruct; +import org.wpilib.util.protobuf.Protobuf; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.Struct; +import org.wpilib.util.struct.StructSerializable; import java.util.Objects; import org.ejml.simple.SimpleMatrix; diff --git a/wpimath/src/main/java/org/wpilib/math/linalg/proto/MatrixProto.java b/wpimath/src/main/java/org/wpilib/math/linalg/proto/MatrixProto.java index 37d75a9d23..0d5fa5e08d 100644 --- a/wpimath/src/main/java/org/wpilib/math/linalg/proto/MatrixProto.java +++ b/wpimath/src/main/java/org/wpilib/math/linalg/proto/MatrixProto.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.math.proto; +package org.wpilib.math.linalg.proto; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.proto.Wpimath.ProtobufMatrix; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; +import org.wpilib.math.proto.Wpimath.ProtobufMatrix; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class MatrixProto diff --git a/wpimath/src/main/java/org/wpilib/math/linalg/proto/VectorProto.java b/wpimath/src/main/java/org/wpilib/math/linalg/proto/VectorProto.java index 9fe68e5ee5..061b785e44 100644 --- a/wpimath/src/main/java/org/wpilib/math/linalg/proto/VectorProto.java +++ b/wpimath/src/main/java/org/wpilib/math/linalg/proto/VectorProto.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.proto; +package org.wpilib.math.linalg.proto; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.Vector; -import edu.wpi.first.math.proto.Wpimath.ProtobufVector; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; +import org.wpilib.math.linalg.Vector; +import org.wpilib.math.proto.Wpimath.ProtobufVector; +import org.wpilib.util.protobuf.Protobuf; import org.ejml.simple.SimpleMatrix; import us.hebi.quickbuf.Descriptors.Descriptor; diff --git a/wpimath/src/main/java/org/wpilib/math/linalg/struct/MatrixStruct.java b/wpimath/src/main/java/org/wpilib/math/linalg/struct/MatrixStruct.java index 3fb2eb822a..78e9f53362 100644 --- a/wpimath/src/main/java/org/wpilib/math/linalg/struct/MatrixStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/linalg/struct/MatrixStruct.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.struct; +package org.wpilib.math.linalg.struct; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public final class MatrixStruct implements Struct> { diff --git a/wpimath/src/main/java/org/wpilib/math/linalg/struct/VectorStruct.java b/wpimath/src/main/java/org/wpilib/math/linalg/struct/VectorStruct.java index 3dd19156f3..c531607e60 100644 --- a/wpimath/src/main/java/org/wpilib/math/linalg/struct/VectorStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/linalg/struct/VectorStruct.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.struct; +package org.wpilib.math.linalg.struct; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.Vector; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; +import org.wpilib.math.linalg.Vector; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; import org.ejml.simple.SimpleMatrix; diff --git a/wpimath/src/main/java/org/wpilib/math/optimization/SimulatedAnnealing.java b/wpimath/src/main/java/org/wpilib/math/optimization/SimulatedAnnealing.java index f0ead5b459..803fd9d30f 100644 --- a/wpimath/src/main/java/org/wpilib/math/optimization/SimulatedAnnealing.java +++ b/wpimath/src/main/java/org/wpilib/math/optimization/SimulatedAnnealing.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 edu.wpi.first.math.optimization; +package org.wpilib.math.optimization; import java.util.function.Function; import java.util.function.ToDoubleFunction; @@ -14,7 +14,7 @@ import java.util.function.ToDoubleFunction; * cost function. Simulated annealing is good for solving optimization problems with many local * minima and a very large search space (it’s a heuristic solver rather than an exact solver like, * say, SQP or interior-point method). Simulated annealing is a popular choice for solving the - * traveling salesman problem (see {@link edu.wpi.first.math.path.TravelingSalesman}). + * traveling salesman problem (see {@link org.wpilib.math.path.TravelingSalesman}). * * @see https://en.wikipedia.org/wiki/Simulated_annealing diff --git a/wpimath/src/main/java/org/wpilib/math/path/TravelingSalesman.java b/wpimath/src/main/java/org/wpilib/math/path/TravelingSalesman.java index b81db2036b..721cc53c08 100644 --- a/wpimath/src/main/java/org/wpilib/math/path/TravelingSalesman.java +++ b/wpimath/src/main/java/org/wpilib/math/path/TravelingSalesman.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.path; +package org.wpilib.math.path; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.Vector; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.optimization.SimulatedAnnealing; +import org.wpilib.math.util.Num; +import org.wpilib.math.linalg.Vector; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.optimization.SimulatedAnnealing; import java.util.Arrays; import java.util.Collections; import java.util.function.ToDoubleBiFunction; diff --git a/wpimath/src/main/java/org/wpilib/math/spline/CubicHermiteSpline.java b/wpimath/src/main/java/org/wpilib/math/spline/CubicHermiteSpline.java index bbe01b004b..cb88e92c1d 100644 --- a/wpimath/src/main/java/org/wpilib/math/spline/CubicHermiteSpline.java +++ b/wpimath/src/main/java/org/wpilib/math/spline/CubicHermiteSpline.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.spline; +package org.wpilib.math.spline; -import edu.wpi.first.math.spline.proto.CubicHermiteSplineProto; -import edu.wpi.first.math.spline.struct.CubicHermiteSplineStruct; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.spline.proto.CubicHermiteSplineProto; +import org.wpilib.math.spline.struct.CubicHermiteSplineStruct; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; import org.ejml.simple.SimpleMatrix; /** Represents a hermite spline of degree 3. */ diff --git a/wpimath/src/main/java/org/wpilib/math/spline/PoseWithCurvature.java b/wpimath/src/main/java/org/wpilib/math/spline/PoseWithCurvature.java index c51ef56c1f..071e5e3843 100644 --- a/wpimath/src/main/java/org/wpilib/math/spline/PoseWithCurvature.java +++ b/wpimath/src/main/java/org/wpilib/math/spline/PoseWithCurvature.java @@ -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. -package edu.wpi.first.math.spline; +package org.wpilib.math.spline; -import edu.wpi.first.math.geometry.Pose2d; +import org.wpilib.math.geometry.Pose2d; /** Represents a pair of a pose and a curvature. */ public class PoseWithCurvature { diff --git a/wpimath/src/main/java/org/wpilib/math/spline/QuinticHermiteSpline.java b/wpimath/src/main/java/org/wpilib/math/spline/QuinticHermiteSpline.java index c119c026a3..8e99b516e2 100644 --- a/wpimath/src/main/java/org/wpilib/math/spline/QuinticHermiteSpline.java +++ b/wpimath/src/main/java/org/wpilib/math/spline/QuinticHermiteSpline.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.spline; +package org.wpilib.math.spline; -import edu.wpi.first.math.spline.proto.QuinticHermiteSplineProto; -import edu.wpi.first.math.spline.struct.QuinticHermiteSplineStruct; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.spline.proto.QuinticHermiteSplineProto; +import org.wpilib.math.spline.struct.QuinticHermiteSplineStruct; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; import org.ejml.simple.SimpleMatrix; /** Represents a hermite spline of degree 5. */ diff --git a/wpimath/src/main/java/org/wpilib/math/spline/Spline.java b/wpimath/src/main/java/org/wpilib/math/spline/Spline.java index 80db954380..a758712ace 100644 --- a/wpimath/src/main/java/org/wpilib/math/spline/Spline.java +++ b/wpimath/src/main/java/org/wpilib/math/spline/Spline.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.spline; +package org.wpilib.math.spline; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; import java.util.Arrays; import java.util.Optional; import org.ejml.simple.SimpleMatrix; diff --git a/wpimath/src/main/java/org/wpilib/math/spline/SplineHelper.java b/wpimath/src/main/java/org/wpilib/math/spline/SplineHelper.java index 44f4fee85b..9df327a9c4 100644 --- a/wpimath/src/main/java/org/wpilib/math/spline/SplineHelper.java +++ b/wpimath/src/main/java/org/wpilib/math/spline/SplineHelper.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.spline; +package org.wpilib.math.spline; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Translation2d; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Translation2d; import java.util.Arrays; import java.util.List; import org.ejml.simple.SimpleMatrix; diff --git a/wpimath/src/main/java/org/wpilib/math/spline/SplineParameterizer.java b/wpimath/src/main/java/org/wpilib/math/spline/SplineParameterizer.java index 35d526e8d0..1d06e09330 100644 --- a/wpimath/src/main/java/org/wpilib/math/spline/SplineParameterizer.java +++ b/wpimath/src/main/java/org/wpilib/math/spline/SplineParameterizer.java @@ -26,7 +26,7 @@ * SOFTWARE. */ -package edu.wpi.first.math.spline; +package org.wpilib.math.spline; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/wpimath/src/main/java/org/wpilib/math/spline/proto/CubicHermiteSplineProto.java b/wpimath/src/main/java/org/wpilib/math/spline/proto/CubicHermiteSplineProto.java index a969e5b288..3708571cc0 100644 --- a/wpimath/src/main/java/org/wpilib/math/spline/proto/CubicHermiteSplineProto.java +++ b/wpimath/src/main/java/org/wpilib/math/spline/proto/CubicHermiteSplineProto.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.spline.proto; +package org.wpilib.math.spline.proto; -import edu.wpi.first.math.proto.Spline.ProtobufCubicHermiteSpline; -import edu.wpi.first.math.spline.CubicHermiteSpline; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.proto.Spline.ProtobufCubicHermiteSpline; +import org.wpilib.math.spline.CubicHermiteSpline; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public final class CubicHermiteSplineProto diff --git a/wpimath/src/main/java/org/wpilib/math/spline/proto/QuinticHermiteSplineProto.java b/wpimath/src/main/java/org/wpilib/math/spline/proto/QuinticHermiteSplineProto.java index 93f042214b..44c5658705 100644 --- a/wpimath/src/main/java/org/wpilib/math/spline/proto/QuinticHermiteSplineProto.java +++ b/wpimath/src/main/java/org/wpilib/math/spline/proto/QuinticHermiteSplineProto.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.spline.proto; +package org.wpilib.math.spline.proto; -import edu.wpi.first.math.proto.Spline.ProtobufQuinticHermiteSpline; -import edu.wpi.first.math.spline.QuinticHermiteSpline; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.proto.Spline.ProtobufQuinticHermiteSpline; +import org.wpilib.math.spline.QuinticHermiteSpline; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public final class QuinticHermiteSplineProto diff --git a/wpimath/src/main/java/org/wpilib/math/spline/struct/CubicHermiteSplineStruct.java b/wpimath/src/main/java/org/wpilib/math/spline/struct/CubicHermiteSplineStruct.java index 9c60642aca..ba2ff376a2 100644 --- a/wpimath/src/main/java/org/wpilib/math/spline/struct/CubicHermiteSplineStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/spline/struct/CubicHermiteSplineStruct.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.spline.struct; +package org.wpilib.math.spline.struct; -import edu.wpi.first.math.spline.CubicHermiteSpline; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.spline.CubicHermiteSpline; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public final class CubicHermiteSplineStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/spline/struct/QuinticHermiteSplineStruct.java b/wpimath/src/main/java/org/wpilib/math/spline/struct/QuinticHermiteSplineStruct.java index 304cd6d8cf..eabf263ca2 100644 --- a/wpimath/src/main/java/org/wpilib/math/spline/struct/QuinticHermiteSplineStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/spline/struct/QuinticHermiteSplineStruct.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.spline.struct; +package org.wpilib.math.spline.struct; -import edu.wpi.first.math.spline.QuinticHermiteSpline; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.spline.QuinticHermiteSpline; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public final class QuinticHermiteSplineStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/system/Discretization.java b/wpimath/src/main/java/org/wpilib/math/system/Discretization.java index 978a2f3c11..a1167bdd65 100644 --- a/wpimath/src/main/java/org/wpilib/math/system/Discretization.java +++ b/wpimath/src/main/java/org/wpilib/math/system/Discretization.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.system; +package org.wpilib.math.system; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.Pair; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Num; +import org.wpilib.math.util.Pair; import org.ejml.simple.SimpleMatrix; /** Discretization helper functions. */ diff --git a/wpimath/src/main/java/org/wpilib/math/system/LinearSystem.java b/wpimath/src/main/java/org/wpilib/math/system/LinearSystem.java index 00989e79d6..702b180e58 100644 --- a/wpimath/src/main/java/org/wpilib/math/system/LinearSystem.java +++ b/wpimath/src/main/java/org/wpilib/math/system/LinearSystem.java @@ -2,37 +2,37 @@ // 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 edu.wpi.first.math.system; +package org.wpilib.math.system; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N10; -import edu.wpi.first.math.numbers.N11; -import edu.wpi.first.math.numbers.N12; -import edu.wpi.first.math.numbers.N13; -import edu.wpi.first.math.numbers.N14; -import edu.wpi.first.math.numbers.N15; -import edu.wpi.first.math.numbers.N16; -import edu.wpi.first.math.numbers.N17; -import edu.wpi.first.math.numbers.N18; -import edu.wpi.first.math.numbers.N19; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.numbers.N20; -import edu.wpi.first.math.numbers.N3; -import edu.wpi.first.math.numbers.N4; -import edu.wpi.first.math.numbers.N5; -import edu.wpi.first.math.numbers.N6; -import edu.wpi.first.math.numbers.N7; -import edu.wpi.first.math.numbers.N8; -import edu.wpi.first.math.numbers.N9; -import edu.wpi.first.math.system.proto.LinearSystemProto; -import edu.wpi.first.math.system.struct.LinearSystemStruct; -import edu.wpi.first.util.protobuf.Protobuf; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.Struct; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N10; +import org.wpilib.math.numbers.N11; +import org.wpilib.math.numbers.N12; +import org.wpilib.math.numbers.N13; +import org.wpilib.math.numbers.N14; +import org.wpilib.math.numbers.N15; +import org.wpilib.math.numbers.N16; +import org.wpilib.math.numbers.N17; +import org.wpilib.math.numbers.N18; +import org.wpilib.math.numbers.N19; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.numbers.N20; +import org.wpilib.math.numbers.N3; +import org.wpilib.math.numbers.N4; +import org.wpilib.math.numbers.N5; +import org.wpilib.math.numbers.N6; +import org.wpilib.math.numbers.N7; +import org.wpilib.math.numbers.N8; +import org.wpilib.math.numbers.N9; +import org.wpilib.math.system.proto.LinearSystemProto; +import org.wpilib.math.system.struct.LinearSystemStruct; +import org.wpilib.util.protobuf.Protobuf; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.Struct; +import org.wpilib.util.struct.StructSerializable; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/wpimath/src/main/java/org/wpilib/math/system/LinearSystemLoop.java b/wpimath/src/main/java/org/wpilib/math/system/LinearSystemLoop.java index 08448c2d97..ab3646bbbe 100644 --- a/wpimath/src/main/java/org/wpilib/math/system/LinearSystemLoop.java +++ b/wpimath/src/main/java/org/wpilib/math/system/LinearSystemLoop.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.system; +package org.wpilib.math.system; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.StateSpaceUtil; -import edu.wpi.first.math.controller.LinearPlantInversionFeedforward; -import edu.wpi.first.math.controller.LinearQuadraticRegulator; -import edu.wpi.first.math.estimator.KalmanFilter; -import edu.wpi.first.math.numbers.N1; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Num; +import org.wpilib.math.util.StateSpaceUtil; +import org.wpilib.math.controller.LinearPlantInversionFeedforward; +import org.wpilib.math.controller.LinearQuadraticRegulator; +import org.wpilib.math.estimator.KalmanFilter; +import org.wpilib.math.numbers.N1; import java.util.function.Function; import org.ejml.MatrixDimensionException; import org.ejml.simple.SimpleMatrix; diff --git a/wpimath/src/main/java/org/wpilib/math/system/NumericalIntegration.java b/wpimath/src/main/java/org/wpilib/math/system/NumericalIntegration.java index 8a9396df85..e03defac4f 100644 --- a/wpimath/src/main/java/org/wpilib/math/system/NumericalIntegration.java +++ b/wpimath/src/main/java/org/wpilib/math/system/NumericalIntegration.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.system; +package org.wpilib.math.system; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.numbers.N1; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Num; +import org.wpilib.math.numbers.N1; import java.util.function.BiFunction; import java.util.function.DoubleBinaryOperator; import java.util.function.DoubleUnaryOperator; diff --git a/wpimath/src/main/java/org/wpilib/math/system/NumericalJacobian.java b/wpimath/src/main/java/org/wpilib/math/system/NumericalJacobian.java index 1be22a8fca..55a3f64f0f 100644 --- a/wpimath/src/main/java/org/wpilib/math/system/NumericalJacobian.java +++ b/wpimath/src/main/java/org/wpilib/math/system/NumericalJacobian.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.system; +package org.wpilib.math.system; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.numbers.N1; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; +import org.wpilib.math.numbers.N1; import java.util.function.BiFunction; import java.util.function.Function; diff --git a/wpimath/src/main/java/org/wpilib/math/system/plant/DCMotor.java b/wpimath/src/main/java/org/wpilib/math/system/plant/DCMotor.java index 6de79523a0..5eb7fecd3e 100644 --- a/wpimath/src/main/java/org/wpilib/math/system/plant/DCMotor.java +++ b/wpimath/src/main/java/org/wpilib/math/system/plant/DCMotor.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.system.plant; +package org.wpilib.math.system.plant; -import edu.wpi.first.math.system.plant.proto.DCMotorProto; -import edu.wpi.first.math.system.plant.struct.DCMotorStruct; -import edu.wpi.first.math.util.Units; -import edu.wpi.first.util.protobuf.ProtobufSerializable; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.system.plant.proto.DCMotorProto; +import org.wpilib.math.system.plant.struct.DCMotorStruct; +import org.wpilib.math.util.Units; +import org.wpilib.util.protobuf.ProtobufSerializable; +import org.wpilib.util.struct.StructSerializable; /** Holds the constants for a DC motor. */ public class DCMotor implements ProtobufSerializable, StructSerializable { diff --git a/wpimath/src/main/java/org/wpilib/math/system/plant/LinearSystemId.java b/wpimath/src/main/java/org/wpilib/math/system/plant/LinearSystemId.java index e771d7c866..fa10f372c8 100644 --- a/wpimath/src/main/java/org/wpilib/math/system/plant/LinearSystemId.java +++ b/wpimath/src/main/java/org/wpilib/math/system/plant/LinearSystemId.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.system.plant; +package org.wpilib.math.system.plant; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.system.LinearSystem; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.system.LinearSystem; /** Linear system ID utility functions. */ public final class LinearSystemId { @@ -114,7 +114,7 @@ public final class LinearSystemId { * [position, velocity]ᵀ, inputs are [voltage], and outputs are [position]. * *

The distance unit you choose MUST be an SI unit (i.e. meters or radians). You can use the - * {@link edu.wpi.first.math.util.Units} class for converting between unit types. + * {@link org.wpilib.math.util.Units} class for converting between unit types. * *

The parameters provided by the user are from this feedforward model: * @@ -226,7 +226,7 @@ public final class LinearSystemId { * [velocity], inputs are [voltage], and outputs are [velocity]. * *

The distance unit you choose MUST be an SI unit (i.e. meters or radians). You can use the - * {@link edu.wpi.first.math.util.Units} class for converting between unit types. + * {@link org.wpilib.math.util.Units} class for converting between unit types. * *

The parameters provided by the user are from this feedforward model: * @@ -260,7 +260,7 @@ public final class LinearSystemId { * [position, velocity]áµ€, inputs are [voltage], and outputs are [position, velocity]áµ€. * *

The distance unit you choose MUST be an SI unit (i.e. meters or radians). You can use the - * {@link edu.wpi.first.math.util.Units} class for converting between unit types. + * {@link org.wpilib.math.util.Units} class for converting between unit types. * *

The parameters provided by the user are from this feedforward model: * diff --git a/wpimath/src/main/java/org/wpilib/math/system/plant/proto/DCMotorProto.java b/wpimath/src/main/java/org/wpilib/math/system/plant/proto/DCMotorProto.java index 39de80743c..ec596a1b25 100644 --- a/wpimath/src/main/java/org/wpilib/math/system/plant/proto/DCMotorProto.java +++ b/wpimath/src/main/java/org/wpilib/math/system/plant/proto/DCMotorProto.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.system.plant.proto; +package org.wpilib.math.system.plant.proto; -import edu.wpi.first.math.proto.Plant.ProtobufDCMotor; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.proto.Plant.ProtobufDCMotor; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class DCMotorProto implements Protobuf { diff --git a/wpimath/src/main/java/org/wpilib/math/system/plant/struct/DCMotorStruct.java b/wpimath/src/main/java/org/wpilib/math/system/plant/struct/DCMotorStruct.java index 649a3cabae..0cf73819e3 100644 --- a/wpimath/src/main/java/org/wpilib/math/system/plant/struct/DCMotorStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/system/plant/struct/DCMotorStruct.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.system.plant.struct; +package org.wpilib.math.system.plant.struct; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class DCMotorStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/system/proto/LinearSystemProto.java b/wpimath/src/main/java/org/wpilib/math/system/proto/LinearSystemProto.java index aaf11fec06..7678b7c398 100644 --- a/wpimath/src/main/java/org/wpilib/math/system/proto/LinearSystemProto.java +++ b/wpimath/src/main/java/org/wpilib/math/system/proto/LinearSystemProto.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.system.proto; +package org.wpilib.math.system.proto; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.proto.System.ProtobufLinearSystem; -import edu.wpi.first.math.proto.Wpimath.ProtobufMatrix; -import edu.wpi.first.math.system.LinearSystem; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; +import org.wpilib.math.proto.System.ProtobufLinearSystem; +import org.wpilib.math.proto.Wpimath.ProtobufMatrix; +import org.wpilib.math.system.LinearSystem; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public final class LinearSystemProto diff --git a/wpimath/src/main/java/org/wpilib/math/system/struct/LinearSystemStruct.java b/wpimath/src/main/java/org/wpilib/math/system/struct/LinearSystemStruct.java index cf675ac1ae..f4fecb47e6 100644 --- a/wpimath/src/main/java/org/wpilib/math/system/struct/LinearSystemStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/system/struct/LinearSystemStruct.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.math.system.struct; +package org.wpilib.math.system.struct; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.struct.MatrixStruct; -import edu.wpi.first.math.system.LinearSystem; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; +import org.wpilib.math.linalg.struct.MatrixStruct; +import org.wpilib.math.system.LinearSystem; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public final class LinearSystemStruct diff --git a/wpimath/src/main/java/org/wpilib/math/trajectory/ExponentialProfile.java b/wpimath/src/main/java/org/wpilib/math/trajectory/ExponentialProfile.java index abb811b781..972b11459f 100644 --- a/wpimath/src/main/java/org/wpilib/math/trajectory/ExponentialProfile.java +++ b/wpimath/src/main/java/org/wpilib/math/trajectory/ExponentialProfile.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.trajectory; +package org.wpilib.math.trajectory; -import edu.wpi.first.math.trajectory.struct.ExponentialProfileStateStruct; -import edu.wpi.first.util.struct.StructSerializable; +import org.wpilib.math.trajectory.struct.ExponentialProfileStateStruct; +import org.wpilib.util.struct.StructSerializable; import java.util.Objects; /** diff --git a/wpimath/src/main/java/org/wpilib/math/trajectory/Trajectory.java b/wpimath/src/main/java/org/wpilib/math/trajectory/Trajectory.java index df4b30bbda..9702c2e7c3 100644 --- a/wpimath/src/main/java/org/wpilib/math/trajectory/Trajectory.java +++ b/wpimath/src/main/java/org/wpilib/math/trajectory/Trajectory.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.trajectory; +package org.wpilib.math.trajectory; import com.fasterxml.jackson.annotation.JsonProperty; -import edu.wpi.first.math.MathUtil; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Transform2d; -import edu.wpi.first.math.trajectory.proto.TrajectoryProto; -import edu.wpi.first.math.trajectory.proto.TrajectoryStateProto; -import edu.wpi.first.util.protobuf.ProtobufSerializable; +import org.wpilib.math.util.MathUtil; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Transform2d; +import org.wpilib.math.trajectory.proto.TrajectoryProto; +import org.wpilib.math.trajectory.proto.TrajectoryStateProto; +import org.wpilib.util.protobuf.ProtobufSerializable; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/wpimath/src/main/java/org/wpilib/math/trajectory/TrajectoryConfig.java b/wpimath/src/main/java/org/wpilib/math/trajectory/TrajectoryConfig.java index c93330ede9..8348da8787 100644 --- a/wpimath/src/main/java/org/wpilib/math/trajectory/TrajectoryConfig.java +++ b/wpimath/src/main/java/org/wpilib/math/trajectory/TrajectoryConfig.java @@ -2,20 +2,20 @@ // 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 edu.wpi.first.math.trajectory; +package org.wpilib.math.trajectory; -import static edu.wpi.first.units.Units.MetersPerSecond; -import static edu.wpi.first.units.Units.MetersPerSecondPerSecond; +import static org.wpilib.units.Units.MetersPerSecond; +import static org.wpilib.units.Units.MetersPerSecondPerSecond; -import edu.wpi.first.math.kinematics.DifferentialDriveKinematics; -import edu.wpi.first.math.kinematics.MecanumDriveKinematics; -import edu.wpi.first.math.kinematics.SwerveDriveKinematics; -import edu.wpi.first.math.trajectory.constraint.DifferentialDriveKinematicsConstraint; -import edu.wpi.first.math.trajectory.constraint.MecanumDriveKinematicsConstraint; -import edu.wpi.first.math.trajectory.constraint.SwerveDriveKinematicsConstraint; -import edu.wpi.first.math.trajectory.constraint.TrajectoryConstraint; -import edu.wpi.first.units.measure.LinearAcceleration; -import edu.wpi.first.units.measure.LinearVelocity; +import org.wpilib.math.kinematics.DifferentialDriveKinematics; +import org.wpilib.math.kinematics.MecanumDriveKinematics; +import org.wpilib.math.kinematics.SwerveDriveKinematics; +import org.wpilib.math.trajectory.constraint.DifferentialDriveKinematicsConstraint; +import org.wpilib.math.trajectory.constraint.MecanumDriveKinematicsConstraint; +import org.wpilib.math.trajectory.constraint.SwerveDriveKinematicsConstraint; +import org.wpilib.math.trajectory.constraint.TrajectoryConstraint; +import org.wpilib.units.measure.LinearAcceleration; +import org.wpilib.units.measure.LinearVelocity; import java.util.ArrayList; import java.util.List; diff --git a/wpimath/src/main/java/org/wpilib/math/trajectory/TrajectoryGenerator.java b/wpimath/src/main/java/org/wpilib/math/trajectory/TrajectoryGenerator.java index 393e150f1d..40d2da4007 100644 --- a/wpimath/src/main/java/org/wpilib/math/trajectory/TrajectoryGenerator.java +++ b/wpimath/src/main/java/org/wpilib/math/trajectory/TrajectoryGenerator.java @@ -2,18 +2,18 @@ // 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 edu.wpi.first.math.trajectory; +package org.wpilib.math.trajectory; -import edu.wpi.first.math.MathSharedStore; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Transform2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.spline.PoseWithCurvature; -import edu.wpi.first.math.spline.Spline; -import edu.wpi.first.math.spline.SplineHelper; -import edu.wpi.first.math.spline.SplineParameterizer; -import edu.wpi.first.math.spline.SplineParameterizer.MalformedSplineException; +import org.wpilib.math.util.MathSharedStore; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Transform2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.spline.PoseWithCurvature; +import org.wpilib.math.spline.Spline; +import org.wpilib.math.spline.SplineHelper; +import org.wpilib.math.spline.SplineParameterizer; +import org.wpilib.math.spline.SplineParameterizer.MalformedSplineException; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/wpimath/src/main/java/org/wpilib/math/trajectory/TrajectoryParameterizer.java b/wpimath/src/main/java/org/wpilib/math/trajectory/TrajectoryParameterizer.java index 405f41e800..f3877bd37e 100644 --- a/wpimath/src/main/java/org/wpilib/math/trajectory/TrajectoryParameterizer.java +++ b/wpimath/src/main/java/org/wpilib/math/trajectory/TrajectoryParameterizer.java @@ -26,10 +26,10 @@ * SOFTWARE. */ -package edu.wpi.first.math.trajectory; +package org.wpilib.math.trajectory; -import edu.wpi.first.math.spline.PoseWithCurvature; -import edu.wpi.first.math.trajectory.constraint.TrajectoryConstraint; +import org.wpilib.math.spline.PoseWithCurvature; +import org.wpilib.math.trajectory.constraint.TrajectoryConstraint; import java.util.ArrayList; import java.util.List; diff --git a/wpimath/src/main/java/org/wpilib/math/trajectory/TrapezoidProfile.java b/wpimath/src/main/java/org/wpilib/math/trajectory/TrapezoidProfile.java index 0653fea02e..822f57734a 100644 --- a/wpimath/src/main/java/org/wpilib/math/trajectory/TrapezoidProfile.java +++ b/wpimath/src/main/java/org/wpilib/math/trajectory/TrapezoidProfile.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.trajectory; +package org.wpilib.math.trajectory; -import edu.wpi.first.math.MathSharedStore; -import edu.wpi.first.math.trajectory.struct.TrapezoidProfileStateStruct; +import org.wpilib.math.util.MathSharedStore; +import org.wpilib.math.trajectory.struct.TrapezoidProfileStateStruct; import java.util.Objects; /** diff --git a/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/CentripetalAccelerationConstraint.java b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/CentripetalAccelerationConstraint.java index 61e505c250..332291e715 100644 --- a/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/CentripetalAccelerationConstraint.java +++ b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/CentripetalAccelerationConstraint.java @@ -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. -package edu.wpi.first.math.trajectory.constraint; +package org.wpilib.math.trajectory.constraint; -import edu.wpi.first.math.geometry.Pose2d; +import org.wpilib.math.geometry.Pose2d; /** * A constraint on the maximum absolute centripetal acceleration allowed when traversing a diff --git a/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/DifferentialDriveKinematicsConstraint.java b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/DifferentialDriveKinematicsConstraint.java index ca7efe4993..d788ac1687 100644 --- a/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/DifferentialDriveKinematicsConstraint.java +++ b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/DifferentialDriveKinematicsConstraint.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.trajectory.constraint; +package org.wpilib.math.trajectory.constraint; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.math.kinematics.DifferentialDriveKinematics; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.kinematics.ChassisSpeeds; +import org.wpilib.math.kinematics.DifferentialDriveKinematics; /** * A class that enforces constraints on the differential drive kinematics. This can be used to diff --git a/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/DifferentialDriveVoltageConstraint.java b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/DifferentialDriveVoltageConstraint.java index 9927fc1f26..6985ddce9c 100644 --- a/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/DifferentialDriveVoltageConstraint.java +++ b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/DifferentialDriveVoltageConstraint.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.math.trajectory.constraint; +package org.wpilib.math.trajectory.constraint; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; -import edu.wpi.first.math.controller.SimpleMotorFeedforward; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.math.kinematics.DifferentialDriveKinematics; +import org.wpilib.math.controller.SimpleMotorFeedforward; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.kinematics.ChassisSpeeds; +import org.wpilib.math.kinematics.DifferentialDriveKinematics; /** * A class that enforces constraints on differential drive voltage expenditure based on the motor diff --git a/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/EllipticalRegionConstraint.java b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/EllipticalRegionConstraint.java index 9501e983ae..78a309ed0a 100644 --- a/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/EllipticalRegionConstraint.java +++ b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/EllipticalRegionConstraint.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.trajectory.constraint; +package org.wpilib.math.trajectory.constraint; -import edu.wpi.first.math.geometry.Ellipse2d; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Translation2d; +import org.wpilib.math.geometry.Ellipse2d; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Translation2d; /** Enforces a particular constraint only within an elliptical region. */ public class EllipticalRegionConstraint implements TrajectoryConstraint { diff --git a/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/MaxVelocityConstraint.java b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/MaxVelocityConstraint.java index 613f0aa49e..1d6d44cc46 100644 --- a/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/MaxVelocityConstraint.java +++ b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/MaxVelocityConstraint.java @@ -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. -package edu.wpi.first.math.trajectory.constraint; +package org.wpilib.math.trajectory.constraint; -import edu.wpi.first.math.geometry.Pose2d; +import org.wpilib.math.geometry.Pose2d; /** * Represents a constraint that enforces a max velocity. This can be composed with the {@link diff --git a/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/MecanumDriveKinematicsConstraint.java b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/MecanumDriveKinematicsConstraint.java index aca116ede7..cceb7f0c3f 100644 --- a/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/MecanumDriveKinematicsConstraint.java +++ b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/MecanumDriveKinematicsConstraint.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.trajectory.constraint; +package org.wpilib.math.trajectory.constraint; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.math.kinematics.MecanumDriveKinematics; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.kinematics.ChassisSpeeds; +import org.wpilib.math.kinematics.MecanumDriveKinematics; /** * A class that enforces constraints on the mecanum drive kinematics. This can be used to ensure diff --git a/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/RectangularRegionConstraint.java b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/RectangularRegionConstraint.java index f4ee23e32d..c1579bddb3 100644 --- a/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/RectangularRegionConstraint.java +++ b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/RectangularRegionConstraint.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.trajectory.constraint; +package org.wpilib.math.trajectory.constraint; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rectangle2d; -import edu.wpi.first.math.geometry.Translation2d; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rectangle2d; +import org.wpilib.math.geometry.Translation2d; /** Enforces a particular constraint only within a rectangular region. */ public class RectangularRegionConstraint implements TrajectoryConstraint { diff --git a/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/SwerveDriveKinematicsConstraint.java b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/SwerveDriveKinematicsConstraint.java index 0f3867de9b..a27550ea0c 100644 --- a/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/SwerveDriveKinematicsConstraint.java +++ b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/SwerveDriveKinematicsConstraint.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.trajectory.constraint; +package org.wpilib.math.trajectory.constraint; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.math.kinematics.SwerveDriveKinematics; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.kinematics.ChassisSpeeds; +import org.wpilib.math.kinematics.SwerveDriveKinematics; /** * A class that enforces constraints on the swerve drive kinematics. This can be used to ensure that diff --git a/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/TrajectoryConstraint.java b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/TrajectoryConstraint.java index 3dc689cff3..7a5fca3f98 100644 --- a/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/TrajectoryConstraint.java +++ b/wpimath/src/main/java/org/wpilib/math/trajectory/constraint/TrajectoryConstraint.java @@ -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. -package edu.wpi.first.math.trajectory.constraint; +package org.wpilib.math.trajectory.constraint; -import edu.wpi.first.math.geometry.Pose2d; +import org.wpilib.math.geometry.Pose2d; /** * An interface for defining user-defined velocity and acceleration constraints while generating diff --git a/wpimath/src/main/java/org/wpilib/math/trajectory/proto/TrajectoryProto.java b/wpimath/src/main/java/org/wpilib/math/trajectory/proto/TrajectoryProto.java index 10db1ab47e..e74874dc60 100644 --- a/wpimath/src/main/java/org/wpilib/math/trajectory/proto/TrajectoryProto.java +++ b/wpimath/src/main/java/org/wpilib/math/trajectory/proto/TrajectoryProto.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.trajectory.proto; +package org.wpilib.math.trajectory.proto; -import edu.wpi.first.math.proto.Trajectory.ProtobufTrajectory; -import edu.wpi.first.math.proto.Trajectory.ProtobufTrajectoryState; -import edu.wpi.first.math.trajectory.Trajectory; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.proto.Trajectory.ProtobufTrajectory; +import org.wpilib.math.proto.Trajectory.ProtobufTrajectoryState; +import org.wpilib.math.trajectory.Trajectory; +import org.wpilib.util.protobuf.Protobuf; import java.util.ArrayList; import us.hebi.quickbuf.Descriptors.Descriptor; diff --git a/wpimath/src/main/java/org/wpilib/math/trajectory/proto/TrajectoryStateProto.java b/wpimath/src/main/java/org/wpilib/math/trajectory/proto/TrajectoryStateProto.java index d0c3198307..f21efce3c7 100644 --- a/wpimath/src/main/java/org/wpilib/math/trajectory/proto/TrajectoryStateProto.java +++ b/wpimath/src/main/java/org/wpilib/math/trajectory/proto/TrajectoryStateProto.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.trajectory.proto; +package org.wpilib.math.trajectory.proto; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.proto.Trajectory.ProtobufTrajectoryState; -import edu.wpi.first.math.trajectory.Trajectory; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.proto.Trajectory.ProtobufTrajectoryState; +import org.wpilib.math.trajectory.Trajectory; +import org.wpilib.util.protobuf.Protobuf; import us.hebi.quickbuf.Descriptors.Descriptor; public class TrajectoryStateProto implements Protobuf { diff --git a/wpimath/src/main/java/org/wpilib/math/trajectory/struct/ExponentialProfileStateStruct.java b/wpimath/src/main/java/org/wpilib/math/trajectory/struct/ExponentialProfileStateStruct.java index 55e7557380..63962ab6d7 100644 --- a/wpimath/src/main/java/org/wpilib/math/trajectory/struct/ExponentialProfileStateStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/trajectory/struct/ExponentialProfileStateStruct.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.trajectory.struct; +package org.wpilib.math.trajectory.struct; -import edu.wpi.first.math.trajectory.ExponentialProfile; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.trajectory.ExponentialProfile; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class ExponentialProfileStateStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/trajectory/struct/TrapezoidProfileStateStruct.java b/wpimath/src/main/java/org/wpilib/math/trajectory/struct/TrapezoidProfileStateStruct.java index b952790af3..83c1154fdb 100644 --- a/wpimath/src/main/java/org/wpilib/math/trajectory/struct/TrapezoidProfileStateStruct.java +++ b/wpimath/src/main/java/org/wpilib/math/trajectory/struct/TrapezoidProfileStateStruct.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.trajectory.struct; +package org.wpilib.math.trajectory.struct; -import edu.wpi.first.math.trajectory.TrapezoidProfile; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.math.trajectory.TrapezoidProfile; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; public class TrapezoidProfileStateStruct implements Struct { diff --git a/wpimath/src/main/java/org/wpilib/math/util/ComputerVisionUtil.java b/wpimath/src/main/java/org/wpilib/math/util/ComputerVisionUtil.java index c288d7fb2d..bb4b4111b4 100644 --- a/wpimath/src/main/java/org/wpilib/math/util/ComputerVisionUtil.java +++ b/wpimath/src/main/java/org/wpilib/math/util/ComputerVisionUtil.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math; +package org.wpilib.math.util; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Transform3d; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Transform3d; /** Computer vision utility functions. */ public final class ComputerVisionUtil { diff --git a/wpimath/src/main/java/org/wpilib/math/util/MathShared.java b/wpimath/src/main/java/org/wpilib/math/util/MathShared.java index d30690e0a9..36c3bb5cea 100644 --- a/wpimath/src/main/java/org/wpilib/math/util/MathShared.java +++ b/wpimath/src/main/java/org/wpilib/math/util/MathShared.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 edu.wpi.first.math; +package org.wpilib.math.util; /** WPIMath utility functions. */ public interface MathShared { diff --git a/wpimath/src/main/java/org/wpilib/math/util/MathSharedStore.java b/wpimath/src/main/java/org/wpilib/math/util/MathSharedStore.java index 4fcb97c83c..b8f1fc8977 100644 --- a/wpimath/src/main/java/org/wpilib/math/util/MathSharedStore.java +++ b/wpimath/src/main/java/org/wpilib/math/util/MathSharedStore.java @@ -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. -package edu.wpi.first.math; +package org.wpilib.math.util; -import edu.wpi.first.util.WPIUtilJNI; +import org.wpilib.util.WPIUtilJNI; /** Storage for MathShared object. */ public final class MathSharedStore { diff --git a/wpimath/src/main/java/org/wpilib/math/util/MathUtil.java b/wpimath/src/main/java/org/wpilib/math/util/MathUtil.java index 43093d14b7..e9a1eb6459 100644 --- a/wpimath/src/main/java/org/wpilib/math/util/MathUtil.java +++ b/wpimath/src/main/java/org/wpilib/math/util/MathUtil.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math; +package org.wpilib.math.util; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.geometry.Translation3d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.geometry.Translation3d; /** Math utility functions. */ public final class MathUtil { diff --git a/wpimath/src/main/java/org/wpilib/math/util/Num.java b/wpimath/src/main/java/org/wpilib/math/util/Num.java index aa31dd7991..ee0323cf44 100644 --- a/wpimath/src/main/java/org/wpilib/math/util/Num.java +++ b/wpimath/src/main/java/org/wpilib/math/util/Num.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 edu.wpi.first.math; +package org.wpilib.math.util; /** A number expressed as a java class. */ public abstract class Num { diff --git a/wpimath/src/main/java/org/wpilib/math/util/Pair.java b/wpimath/src/main/java/org/wpilib/math/util/Pair.java index 9ec237c0aa..3e2543683d 100644 --- a/wpimath/src/main/java/org/wpilib/math/util/Pair.java +++ b/wpimath/src/main/java/org/wpilib/math/util/Pair.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 edu.wpi.first.math; +package org.wpilib.math.util; import java.util.Objects; diff --git a/wpimath/src/main/java/org/wpilib/math/util/StateSpaceUtil.java b/wpimath/src/main/java/org/wpilib/math/util/StateSpaceUtil.java index 0a9f9c5333..ddf239fae0 100644 --- a/wpimath/src/main/java/org/wpilib/math/util/StateSpaceUtil.java +++ b/wpimath/src/main/java/org/wpilib/math/util/StateSpaceUtil.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math; +package org.wpilib.math.util; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.jni.StateSpaceUtilJNI; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N3; -import edu.wpi.first.math.numbers.N4; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.jni.StateSpaceUtilJNI; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N3; +import org.wpilib.math.numbers.N4; import java.util.Random; import org.ejml.simple.SimpleMatrix; diff --git a/wpimath/src/main/java/org/wpilib/math/util/Units.java b/wpimath/src/main/java/org/wpilib/math/util/Units.java index 8c75dec626..53def5ffb3 100644 --- a/wpimath/src/main/java/org/wpilib/math/util/Units.java +++ b/wpimath/src/main/java/org/wpilib/math/util/Units.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 edu.wpi.first.math.util; +package org.wpilib.math.util; /** Utility class that converts between commonly used units in FRC. */ public final class Units { diff --git a/wpimath/src/main/native/cpp/jni/ArmFeedforwardJNI.cpp b/wpimath/src/main/native/cpp/jni/ArmFeedforwardJNI.cpp index 54748f151f..4f0a1c3f34 100644 --- a/wpimath/src/main/native/cpp/jni/ArmFeedforwardJNI.cpp +++ b/wpimath/src/main/native/cpp/jni/ArmFeedforwardJNI.cpp @@ -6,7 +6,7 @@ #include -#include "edu_wpi_first_math_jni_ArmFeedforwardJNI.h" +#include "org_wpilib_math_jni_ArmFeedforwardJNI.h" #include "frc/controller/ArmFeedforward.h" using namespace wpi::java; @@ -14,12 +14,12 @@ using namespace wpi::java; extern "C" { /* - * Class: edu_wpi_first_math_jni_ArmFeedforwardJNI + * Class: org_wpilib_math_jni_ArmFeedforwardJNI * Method: calculate * Signature: (DDDDDDDD)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_first_math_jni_ArmFeedforwardJNI_calculate +Java_org_wpilib_math_jni_ArmFeedforwardJNI_calculate (JNIEnv* env, jclass, jdouble ks, jdouble kv, jdouble ka, jdouble kg, jdouble currentAngle, jdouble currentVelocity, jdouble nextVelocity, jdouble dt) diff --git a/wpimath/src/main/native/cpp/jni/DAREJNI.cpp b/wpimath/src/main/native/cpp/jni/DAREJNI.cpp index b5d441dee7..ce4728fb6b 100644 --- a/wpimath/src/main/native/cpp/jni/DAREJNI.cpp +++ b/wpimath/src/main/native/cpp/jni/DAREJNI.cpp @@ -10,7 +10,7 @@ #include #include "Exceptions.h" -#include "edu_wpi_first_math_jni_DAREJNI.h" +#include "org_wpilib_math_jni_DAREJNI.h" #include "frc/DARE.h" #include "frc/fmt/Eigen.h" @@ -19,12 +19,12 @@ using namespace wpi::java; extern "C" { /* - * Class: edu_wpi_first_math_jni_DAREJNI + * Class: org_wpilib_math_jni_DAREJNI * Method: dareNoPrecondABQR * Signature: ([D[D[D[DII[D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_math_jni_DAREJNI_dareNoPrecondABQR +Java_org_wpilib_math_jni_DAREJNI_dareNoPrecondABQR (JNIEnv* env, jclass, jdoubleArray A, jdoubleArray B, jdoubleArray Q, jdoubleArray R, jint states, jint inputs, jdoubleArray S) { @@ -54,12 +54,12 @@ Java_edu_wpi_first_math_jni_DAREJNI_dareNoPrecondABQR } /* - * Class: edu_wpi_first_math_jni_DAREJNI + * Class: org_wpilib_math_jni_DAREJNI * Method: dareNoPrecondABQRN * Signature: ([D[D[D[D[DII[D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_math_jni_DAREJNI_dareNoPrecondABQRN +Java_org_wpilib_math_jni_DAREJNI_dareNoPrecondABQRN (JNIEnv* env, jclass, jdoubleArray A, jdoubleArray B, jdoubleArray Q, jdoubleArray R, jdoubleArray N, jint states, jint inputs, jdoubleArray S) { @@ -93,12 +93,12 @@ Java_edu_wpi_first_math_jni_DAREJNI_dareNoPrecondABQRN } /* - * Class: edu_wpi_first_math_jni_DAREJNI + * Class: org_wpilib_math_jni_DAREJNI * Method: dareABQR * Signature: ([D[D[D[DII[D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_math_jni_DAREJNI_dareABQR +Java_org_wpilib_math_jni_DAREJNI_dareABQR (JNIEnv* env, jclass, jdoubleArray A, jdoubleArray B, jdoubleArray Q, jdoubleArray R, jint states, jint inputs, jdoubleArray S) { @@ -142,12 +142,12 @@ Java_edu_wpi_first_math_jni_DAREJNI_dareABQR } /* - * Class: edu_wpi_first_math_jni_DAREJNI + * Class: org_wpilib_math_jni_DAREJNI * Method: dareABQRN * Signature: ([D[D[D[D[DII[D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_math_jni_DAREJNI_dareABQRN +Java_org_wpilib_math_jni_DAREJNI_dareABQRN (JNIEnv* env, jclass, jdoubleArray A, jdoubleArray B, jdoubleArray Q, jdoubleArray R, jdoubleArray N, jint states, jint inputs, jdoubleArray S) { diff --git a/wpimath/src/main/native/cpp/jni/EigenJNI.cpp b/wpimath/src/main/native/cpp/jni/EigenJNI.cpp index e024f994e7..b246407619 100644 --- a/wpimath/src/main/native/cpp/jni/EigenJNI.cpp +++ b/wpimath/src/main/native/cpp/jni/EigenJNI.cpp @@ -10,19 +10,19 @@ #include #include -#include "edu_wpi_first_math_jni_EigenJNI.h" +#include "org_wpilib_math_jni_EigenJNI.h" using namespace wpi::java; extern "C" { /* - * Class: edu_wpi_first_math_jni_EigenJNI + * Class: org_wpilib_math_jni_EigenJNI * Method: exp * Signature: ([DI[D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_math_jni_EigenJNI_exp +Java_org_wpilib_math_jni_EigenJNI_exp (JNIEnv* env, jclass, jdoubleArray src, jint rows, jdoubleArray dst) { JSpan arrayBody{env, src}; @@ -37,12 +37,12 @@ Java_edu_wpi_first_math_jni_EigenJNI_exp } /* - * Class: edu_wpi_first_math_jni_EigenJNI + * Class: org_wpilib_math_jni_EigenJNI * Method: pow * Signature: ([DID[D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_math_jni_EigenJNI_pow +Java_org_wpilib_math_jni_EigenJNI_pow (JNIEnv* env, jclass, jdoubleArray src, jint rows, jdouble exponent, jdoubleArray dst) { @@ -58,12 +58,12 @@ Java_edu_wpi_first_math_jni_EigenJNI_pow } /* - * Class: edu_wpi_first_math_jni_EigenJNI + * Class: org_wpilib_math_jni_EigenJNI * Method: rankUpdate * Signature: ([DI[DDZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_math_jni_EigenJNI_rankUpdate +Java_org_wpilib_math_jni_EigenJNI_rankUpdate (JNIEnv* env, jclass, jdoubleArray mat, jint rows, jdoubleArray vec, jdouble sigma, jboolean lowerTriangular) { @@ -84,12 +84,12 @@ Java_edu_wpi_first_math_jni_EigenJNI_rankUpdate } /* - * Class: edu_wpi_first_math_jni_EigenJNI + * Class: org_wpilib_math_jni_EigenJNI * Method: solveFullPivHouseholderQr * Signature: ([DII[DII[D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_math_jni_EigenJNI_solveFullPivHouseholderQr +Java_org_wpilib_math_jni_EigenJNI_solveFullPivHouseholderQr (JNIEnv* env, jclass, jdoubleArray A, jint Arows, jint Acols, jdoubleArray B, jint Brows, jint Bcols, jdoubleArray dst) { diff --git a/wpimath/src/main/native/cpp/jni/Ellipse2dJNI.cpp b/wpimath/src/main/native/cpp/jni/Ellipse2dJNI.cpp index 72538dc3f8..95398330ed 100644 --- a/wpimath/src/main/native/cpp/jni/Ellipse2dJNI.cpp +++ b/wpimath/src/main/native/cpp/jni/Ellipse2dJNI.cpp @@ -7,7 +7,7 @@ #include #include -#include "edu_wpi_first_math_jni_Ellipse2dJNI.h" +#include "org_wpilib_math_jni_Ellipse2dJNI.h" #include "frc/geometry/Ellipse2d.h" using namespace wpi::java; @@ -15,12 +15,12 @@ using namespace wpi::java; extern "C" { /* - * Class: edu_wpi_first_math_jni_Ellipse2dJNI + * Class: org_wpilib_math_jni_Ellipse2dJNI * Method: nearest * Signature: (DDDDDDD[D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_math_jni_Ellipse2dJNI_nearest +Java_org_wpilib_math_jni_Ellipse2dJNI_nearest (JNIEnv* env, jclass, jdouble centerX, jdouble centerY, jdouble centerHeading, jdouble xSemiAxis, jdouble ySemiAxis, jdouble pointX, jdouble pointY, jdoubleArray nearestPoint) diff --git a/wpimath/src/main/native/cpp/jni/StateSpaceUtilJNI.cpp b/wpimath/src/main/native/cpp/jni/StateSpaceUtilJNI.cpp index e13d659bf2..795b49eba2 100644 --- a/wpimath/src/main/native/cpp/jni/StateSpaceUtilJNI.cpp +++ b/wpimath/src/main/native/cpp/jni/StateSpaceUtilJNI.cpp @@ -7,7 +7,7 @@ #include #include -#include "edu_wpi_first_math_jni_StateSpaceUtilJNI.h" +#include "org_wpilib_math_jni_StateSpaceUtilJNI.h" #include "frc/StateSpaceUtil.h" using namespace wpi::java; @@ -15,12 +15,12 @@ using namespace wpi::java; extern "C" { /* - * Class: edu_wpi_first_math_jni_StateSpaceUtilJNI + * Class: org_wpilib_math_jni_StateSpaceUtilJNI * Method: isStabilizable * Signature: (II[D[D)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_math_jni_StateSpaceUtilJNI_isStabilizable +Java_org_wpilib_math_jni_StateSpaceUtilJNI_isStabilizable (JNIEnv* env, jclass, jint states, jint inputs, jdoubleArray aSrc, jdoubleArray bSrc) { diff --git a/wpimath/src/main/native/cpp/jni/Transform3dJNI.cpp b/wpimath/src/main/native/cpp/jni/Transform3dJNI.cpp index 893da08b00..1e8a1b6361 100644 --- a/wpimath/src/main/native/cpp/jni/Transform3dJNI.cpp +++ b/wpimath/src/main/native/cpp/jni/Transform3dJNI.cpp @@ -6,7 +6,7 @@ #include -#include "edu_wpi_first_math_jni_Transform3dJNI.h" +#include "org_wpilib_math_jni_Transform3dJNI.h" #include "frc/geometry/Quaternion.h" #include "frc/geometry/Rotation3d.h" #include "frc/geometry/Transform3d.h" @@ -19,12 +19,12 @@ using namespace wpi::java; extern "C" { /* - * Class: edu_wpi_first_math_jni_Transform3dJNI + * Class: org_wpilib_math_jni_Transform3dJNI * Method: log * Signature: (DDDDDDD)[D */ JNIEXPORT jdoubleArray JNICALL -Java_edu_wpi_first_math_jni_Transform3dJNI_log +Java_org_wpilib_math_jni_Transform3dJNI_log (JNIEnv* env, jclass, jdouble relX, jdouble relY, jdouble relZ, jdouble relQw, jdouble relQx, jdouble relQy, jdouble relQz) { diff --git a/wpimath/src/main/native/cpp/jni/Twist3dJNI.cpp b/wpimath/src/main/native/cpp/jni/Twist3dJNI.cpp index 4cf5afa367..1cd9d22dd9 100644 --- a/wpimath/src/main/native/cpp/jni/Twist3dJNI.cpp +++ b/wpimath/src/main/native/cpp/jni/Twist3dJNI.cpp @@ -6,7 +6,7 @@ #include -#include "edu_wpi_first_math_jni_Twist3dJNI.h" +#include "org_wpilib_math_jni_Twist3dJNI.h" #include "frc/geometry/Transform3d.h" #include "frc/geometry/Twist3d.h" #include "units/angle.h" @@ -17,12 +17,12 @@ using namespace wpi::java; extern "C" { /* - * Class: edu_wpi_first_math_jni_Twist3dJNI + * Class: org_wpilib_math_jni_Twist3dJNI * Method: exp * Signature: (DDDDDD)[D */ JNIEXPORT jdoubleArray JNICALL -Java_edu_wpi_first_math_jni_Twist3dJNI_exp +Java_org_wpilib_math_jni_Twist3dJNI_exp (JNIEnv* env, jclass, jdouble twistDx, jdouble twistDy, jdouble twistDz, jdouble twistRx, jdouble twistRy, jdouble twistRz) { diff --git a/wpimath/src/main/proto/controller.proto b/wpimath/src/main/proto/controller.proto index c5e53ea09f..3b2bb37578 100644 --- a/wpimath/src/main/proto/controller.proto +++ b/wpimath/src/main/proto/controller.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package wpi.proto; -option java_package = "edu.wpi.first.math.proto"; +option java_package = "org.wpilib.math.proto"; message ProtobufArmFeedforward { double ks = 1; diff --git a/wpimath/src/main/proto/geometry2d.proto b/wpimath/src/main/proto/geometry2d.proto index 1749c63bc2..c6d13764a3 100644 --- a/wpimath/src/main/proto/geometry2d.proto +++ b/wpimath/src/main/proto/geometry2d.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package wpi.proto; -option java_package = "edu.wpi.first.math.proto"; +option java_package = "org.wpilib.math.proto"; message ProtobufTranslation2d { double x = 1; diff --git a/wpimath/src/main/proto/geometry3d.proto b/wpimath/src/main/proto/geometry3d.proto index 23b4d6489c..27d256b881 100644 --- a/wpimath/src/main/proto/geometry3d.proto +++ b/wpimath/src/main/proto/geometry3d.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package wpi.proto; -option java_package = "edu.wpi.first.math.proto"; +option java_package = "org.wpilib.math.proto"; message ProtobufTranslation3d { double x = 1; diff --git a/wpimath/src/main/proto/kinematics.proto b/wpimath/src/main/proto/kinematics.proto index 2d25bd4ea4..4623f199ec 100644 --- a/wpimath/src/main/proto/kinematics.proto +++ b/wpimath/src/main/proto/kinematics.proto @@ -4,7 +4,7 @@ package wpi.proto; import "geometry2d.proto"; -option java_package = "edu.wpi.first.math.proto"; +option java_package = "org.wpilib.math.proto"; message ProtobufChassisSpeeds { double vx = 1; diff --git a/wpimath/src/main/proto/plant.proto b/wpimath/src/main/proto/plant.proto index 86200d13cf..db11c398e1 100644 --- a/wpimath/src/main/proto/plant.proto +++ b/wpimath/src/main/proto/plant.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package wpi.proto; -option java_package = "edu.wpi.first.math.proto"; +option java_package = "org.wpilib.math.proto"; message ProtobufDCMotor { double nominal_voltage = 1; diff --git a/wpimath/src/main/proto/spline.proto b/wpimath/src/main/proto/spline.proto index ef0a3c94da..b7b173a058 100644 --- a/wpimath/src/main/proto/spline.proto +++ b/wpimath/src/main/proto/spline.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package wpi.proto; -option java_package = "edu.wpi.first.math.proto"; +option java_package = "org.wpilib.math.proto"; message ProtobufCubicHermiteSpline { repeated double x_initial = 1; diff --git a/wpimath/src/main/proto/system.proto b/wpimath/src/main/proto/system.proto index 4818c198a3..8cdb6a20f6 100644 --- a/wpimath/src/main/proto/system.proto +++ b/wpimath/src/main/proto/system.proto @@ -4,7 +4,7 @@ package wpi.proto; import "wpimath.proto"; -option java_package = "edu.wpi.first.math.proto"; +option java_package = "org.wpilib.math.proto"; message ProtobufLinearSystem { uint32 num_states = 1; diff --git a/wpimath/src/main/proto/trajectory.proto b/wpimath/src/main/proto/trajectory.proto index 03ece13af3..ee8615c4e5 100644 --- a/wpimath/src/main/proto/trajectory.proto +++ b/wpimath/src/main/proto/trajectory.proto @@ -4,7 +4,7 @@ package wpi.proto; import "geometry2d.proto"; -option java_package = "edu.wpi.first.math.proto"; +option java_package = "org.wpilib.math.proto"; message ProtobufTrajectoryState { double time = 1; diff --git a/wpimath/src/main/proto/wpimath.proto b/wpimath/src/main/proto/wpimath.proto index 06b993aceb..3b5a19f4e7 100644 --- a/wpimath/src/main/proto/wpimath.proto +++ b/wpimath/src/main/proto/wpimath.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package wpi.proto; -option java_package = "edu.wpi.first.math.proto"; +option java_package = "org.wpilib.math.proto"; message ProtobufMatrix { uint32 num_rows = 1; diff --git a/wpimath/src/test/java/org/wpilib/ProtoTestBase.java b/wpimath/src/test/java/org/wpilib/ProtoTestBase.java index 36bbb6d651..4171a01b5e 100644 --- a/wpimath/src/test/java/org/wpilib/ProtoTestBase.java +++ b/wpimath/src/test/java/org/wpilib/ProtoTestBase.java @@ -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. -package edu.wpi.first.wpilibj; +package org.wpilib; -import edu.wpi.first.util.protobuf.Protobuf; +import org.wpilib.util.protobuf.Protobuf; import org.junit.jupiter.api.Test; import us.hebi.quickbuf.ProtoMessage; diff --git a/wpimath/src/test/java/org/wpilib/StructTestBase.java b/wpimath/src/test/java/org/wpilib/StructTestBase.java index 16c6093c38..d56a393309 100644 --- a/wpimath/src/test/java/org/wpilib/StructTestBase.java +++ b/wpimath/src/test/java/org/wpilib/StructTestBase.java @@ -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. -package edu.wpi.first.wpilibj; +package org.wpilib; -import edu.wpi.first.util.struct.Struct; +import org.wpilib.util.struct.Struct; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/UtilityClassTest.java b/wpimath/src/test/java/org/wpilib/UtilityClassTest.java index 0501f6d8b0..9bb7c5f321 100644 --- a/wpimath/src/test/java/org/wpilib/UtilityClassTest.java +++ b/wpimath/src/test/java/org/wpilib/UtilityClassTest.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 edu.wpi.first.wpilibj; +package org.wpilib; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -24,7 +24,7 @@ import org.junit.jupiter.api.TestFactory; // // org.junit.jupiter.api.extension.ParameterResolutionException: No ParameterResolver registered // for parameter [java.lang.Class arg0] in constructor [protected -// edu.wpi.first.wpilibj.UtilityClassTest(java.lang.Class)]. +// org.wpilib.UtilityClassTest(java.lang.Class)]. @SuppressWarnings("PMD.AbstractClassWithoutAbstractMethod") public abstract class UtilityClassTest { private final Class m_clazz; diff --git a/wpimath/src/test/java/org/wpilib/math/controller/ArmFeedforwardTest.java b/wpimath/src/test/java/org/wpilib/math/controller/ArmFeedforwardTest.java index 2ff1a0db86..c524a1ec2b 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/ArmFeedforwardTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/ArmFeedforwardTest.java @@ -2,18 +2,18 @@ // 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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.system.NumericalIntegration; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.system.NumericalIntegration; import java.util.function.BiFunction; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/controller/BangBangInputOutputTest.java b/wpimath/src/test/java/org/wpilib/math/controller/BangBangInputOutputTest.java index 3f68ab9342..4fa9c3ea58 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/BangBangInputOutputTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/BangBangInputOutputTest.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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/wpimath/src/test/java/org/wpilib/math/controller/BangBangToleranceTest.java b/wpimath/src/test/java/org/wpilib/math/controller/BangBangToleranceTest.java index 8bfcd900bd..44cf120635 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/BangBangToleranceTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/BangBangToleranceTest.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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/wpimath/src/test/java/org/wpilib/math/controller/ControlAffinePlantInversionFeedforwardTest.java b/wpimath/src/test/java/org/wpilib/math/controller/ControlAffinePlantInversionFeedforwardTest.java index b5e808a5ef..5fb8147cce 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/ControlAffinePlantInversionFeedforwardTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/ControlAffinePlantInversionFeedforwardTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; import org.junit.jupiter.api.Test; class ControlAffinePlantInversionFeedforwardTest { diff --git a/wpimath/src/test/java/org/wpilib/math/controller/DifferentialDriveAccelerationLimiterTest.java b/wpimath/src/test/java/org/wpilib/math/controller/DifferentialDriveAccelerationLimiterTest.java index f67136faed..5fc6c80362 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/DifferentialDriveAccelerationLimiterTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/DifferentialDriveAccelerationLimiterTest.java @@ -2,18 +2,18 @@ // 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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.system.plant.LinearSystemId; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.system.plant.LinearSystemId; import org.junit.jupiter.api.Test; class DifferentialDriveAccelerationLimiterTest { diff --git a/wpimath/src/test/java/org/wpilib/math/controller/DifferentialDriveFeedforwardTest.java b/wpimath/src/test/java/org/wpilib/math/controller/DifferentialDriveFeedforwardTest.java index 45498574f7..dbd7a873fb 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/DifferentialDriveFeedforwardTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/DifferentialDriveFeedforwardTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.system.LinearSystem; -import edu.wpi.first.math.system.plant.LinearSystemId; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.system.LinearSystem; +import org.wpilib.math.system.plant.LinearSystemId; import org.junit.jupiter.api.Test; class DifferentialDriveFeedforwardTest { diff --git a/wpimath/src/test/java/org/wpilib/math/controller/ElevatorFeedforwardTest.java b/wpimath/src/test/java/org/wpilib/math/controller/ElevatorFeedforwardTest.java index 2f28e01635..134b262e2b 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/ElevatorFeedforwardTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/ElevatorFeedforwardTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.numbers.N1; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.numbers.N1; import org.junit.jupiter.api.Test; class ElevatorFeedforwardTest { diff --git a/wpimath/src/test/java/org/wpilib/math/controller/ImplicitModelFollowerTest.java b/wpimath/src/test/java/org/wpilib/math/controller/ImplicitModelFollowerTest.java index 90f2127559..8b2255d5a4 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/ImplicitModelFollowerTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/ImplicitModelFollowerTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.system.plant.LinearSystemId; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.system.plant.LinearSystemId; import org.junit.jupiter.api.Test; class ImplicitModelFollowerTest { diff --git a/wpimath/src/test/java/org/wpilib/math/controller/LTVDifferentialDriveControllerTest.java b/wpimath/src/test/java/org/wpilib/math/controller/LTVDifferentialDriveControllerTest.java index 8740c67470..da7f1fc135 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/LTVDifferentialDriveControllerTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/LTVDifferentialDriveControllerTest.java @@ -2,26 +2,26 @@ // 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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.MathUtil; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.numbers.N5; -import edu.wpi.first.math.system.LinearSystem; -import edu.wpi.first.math.system.NumericalIntegration; -import edu.wpi.first.math.system.plant.LinearSystemId; -import edu.wpi.first.math.trajectory.TrajectoryConfig; -import edu.wpi.first.math.trajectory.TrajectoryGenerator; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.util.MathUtil; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.numbers.N5; +import org.wpilib.math.system.LinearSystem; +import org.wpilib.math.system.NumericalIntegration; +import org.wpilib.math.system.plant.LinearSystemId; +import org.wpilib.math.trajectory.TrajectoryConfig; +import org.wpilib.math.trajectory.TrajectoryGenerator; import java.util.ArrayList; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/controller/LTVUnicycleControllerTest.java b/wpimath/src/test/java/org/wpilib/math/controller/LTVUnicycleControllerTest.java index a52dc96e75..308a9c2635 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/LTVUnicycleControllerTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/LTVUnicycleControllerTest.java @@ -2,18 +2,18 @@ // 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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.MathUtil; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Twist2d; -import edu.wpi.first.math.trajectory.TrajectoryConfig; -import edu.wpi.first.math.trajectory.TrajectoryGenerator; +import org.wpilib.math.util.MathUtil; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Twist2d; +import org.wpilib.math.trajectory.TrajectoryConfig; +import org.wpilib.math.trajectory.TrajectoryGenerator; import java.util.ArrayList; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/controller/LinearPlantInversionFeedforwardTest.java b/wpimath/src/test/java/org/wpilib/math/controller/LinearPlantInversionFeedforwardTest.java index 8901330d13..e8122715f1 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/LinearPlantInversionFeedforwardTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/LinearPlantInversionFeedforwardTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; import org.junit.jupiter.api.Test; class LinearPlantInversionFeedforwardTest { diff --git a/wpimath/src/test/java/org/wpilib/math/controller/LinearQuadraticRegulatorTest.java b/wpimath/src/test/java/org/wpilib/math/controller/LinearQuadraticRegulatorTest.java index 5a53e9e892..61c56cc997 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/LinearQuadraticRegulatorTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/LinearQuadraticRegulatorTest.java @@ -2,18 +2,18 @@ // 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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.Num; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.system.Discretization; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.system.plant.LinearSystemId; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.Num; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.system.Discretization; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.math.system.plant.LinearSystemId; import org.junit.jupiter.api.Test; class LinearQuadraticRegulatorTest { diff --git a/wpimath/src/test/java/org/wpilib/math/controller/LinearSystemLoopTest.java b/wpimath/src/test/java/org/wpilib/math/controller/LinearSystemLoopTest.java index 4baaf2d551..2a61683c4b 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/LinearSystemLoopTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/LinearSystemLoopTest.java @@ -2,22 +2,22 @@ // 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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.estimator.KalmanFilter; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.system.LinearSystem; -import edu.wpi.first.math.system.LinearSystemLoop; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.system.plant.LinearSystemId; -import edu.wpi.first.math.trajectory.TrapezoidProfile; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.estimator.KalmanFilter; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.system.LinearSystem; +import org.wpilib.math.system.LinearSystemLoop; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.math.system.plant.LinearSystemId; +import org.wpilib.math.trajectory.TrapezoidProfile; import java.util.Random; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/controller/PIDInputOutputTest.java b/wpimath/src/test/java/org/wpilib/math/controller/PIDInputOutputTest.java index f7265eee5a..5a5a2dbad2 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/PIDInputOutputTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/PIDInputOutputTest.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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/wpimath/src/test/java/org/wpilib/math/controller/PIDToleranceTest.java b/wpimath/src/test/java/org/wpilib/math/controller/PIDToleranceTest.java index 73bd8c7a0f..c630b87f38 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/PIDToleranceTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/PIDToleranceTest.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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/wpimath/src/test/java/org/wpilib/math/controller/ProfiledPIDControllerTest.java b/wpimath/src/test/java/org/wpilib/math/controller/ProfiledPIDControllerTest.java index d87943ab6a..4827dfefcc 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/ProfiledPIDControllerTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/ProfiledPIDControllerTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller; +package org.wpilib.math.controller; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.trajectory.TrapezoidProfile; +import org.wpilib.math.trajectory.TrapezoidProfile; import org.junit.jupiter.api.Test; class ProfiledPIDControllerTest { diff --git a/wpimath/src/test/java/org/wpilib/math/controller/ProfiledPIDInputOutputTest.java b/wpimath/src/test/java/org/wpilib/math/controller/ProfiledPIDInputOutputTest.java index 8d5104f045..e6d56729ac 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/ProfiledPIDInputOutputTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/ProfiledPIDInputOutputTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller; +package org.wpilib.math.controller; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.trajectory.TrapezoidProfile; +import org.wpilib.math.trajectory.TrapezoidProfile; import org.junit.jupiter.api.Test; class ProfiledPIDInputOutputTest { diff --git a/wpimath/src/test/java/org/wpilib/math/controller/SimpleMotorFeedforwardTest.java b/wpimath/src/test/java/org/wpilib/math/controller/SimpleMotorFeedforwardTest.java index 799cfe8bac..3ffb7a03e7 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/SimpleMotorFeedforwardTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/SimpleMotorFeedforwardTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.math.controller; +package org.wpilib.math.controller; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.numbers.N1; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.numbers.N1; import org.junit.jupiter.api.Test; class SimpleMotorFeedforwardTest { diff --git a/wpimath/src/test/java/org/wpilib/math/controller/proto/ArmFeedforwardProtoTest.java b/wpimath/src/test/java/org/wpilib/math/controller/proto/ArmFeedforwardProtoTest.java index b3c151476f..0d48295507 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/proto/ArmFeedforwardProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/proto/ArmFeedforwardProtoTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller.proto; +package org.wpilib.math.controller.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.controller.ArmFeedforward; -import edu.wpi.first.math.proto.Controller.ProtobufArmFeedforward; +import org.wpilib.math.controller.ArmFeedforward; +import org.wpilib.math.proto.Controller.ProtobufArmFeedforward; import org.junit.jupiter.api.Test; class ArmFeedforwardProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/controller/proto/DifferentialDriveFeedforwardProtoTest.java b/wpimath/src/test/java/org/wpilib/math/controller/proto/DifferentialDriveFeedforwardProtoTest.java index 52b8adb77b..22fafe775f 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/proto/DifferentialDriveFeedforwardProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/proto/DifferentialDriveFeedforwardProtoTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.controller.proto; +package org.wpilib.math.controller.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.controller.DifferentialDriveFeedforward; -import edu.wpi.first.math.proto.Controller.ProtobufDifferentialDriveFeedforward; -import edu.wpi.first.wpilibj.ProtoTestBase; +import org.wpilib.math.controller.DifferentialDriveFeedforward; +import org.wpilib.math.proto.Controller.ProtobufDifferentialDriveFeedforward; +import org.wpilib.ProtoTestBase; @SuppressWarnings("PMD.TestClassWithoutTestCases") class DifferentialDriveFeedforwardProtoTest diff --git a/wpimath/src/test/java/org/wpilib/math/controller/proto/DifferentialDriveWheelVoltagesProtoTest.java b/wpimath/src/test/java/org/wpilib/math/controller/proto/DifferentialDriveWheelVoltagesProtoTest.java index c3bf58720f..7c0886e011 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/proto/DifferentialDriveWheelVoltagesProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/proto/DifferentialDriveWheelVoltagesProtoTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller.proto; +package org.wpilib.math.controller.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.controller.DifferentialDriveWheelVoltages; -import edu.wpi.first.math.proto.Controller.ProtobufDifferentialDriveWheelVoltages; +import org.wpilib.math.controller.DifferentialDriveWheelVoltages; +import org.wpilib.math.proto.Controller.ProtobufDifferentialDriveWheelVoltages; import org.junit.jupiter.api.Test; class DifferentialDriveWheelVoltagesProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/controller/proto/ElevatorFeedforwardProtoTest.java b/wpimath/src/test/java/org/wpilib/math/controller/proto/ElevatorFeedforwardProtoTest.java index fd2711935e..06f731e208 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/proto/ElevatorFeedforwardProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/proto/ElevatorFeedforwardProtoTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller.proto; +package org.wpilib.math.controller.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.controller.ElevatorFeedforward; -import edu.wpi.first.math.proto.Controller.ProtobufElevatorFeedforward; +import org.wpilib.math.controller.ElevatorFeedforward; +import org.wpilib.math.proto.Controller.ProtobufElevatorFeedforward; import org.junit.jupiter.api.Test; class ElevatorFeedforwardProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/controller/proto/SimpleMotorFeedforwardProtoTest.java b/wpimath/src/test/java/org/wpilib/math/controller/proto/SimpleMotorFeedforwardProtoTest.java index dfe8510da9..934ab1d0a0 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/proto/SimpleMotorFeedforwardProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/proto/SimpleMotorFeedforwardProtoTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.controller.proto; +package org.wpilib.math.controller.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.controller.SimpleMotorFeedforward; -import edu.wpi.first.math.proto.Controller.ProtobufSimpleMotorFeedforward; -import edu.wpi.first.wpilibj.ProtoTestBase; +import org.wpilib.math.controller.SimpleMotorFeedforward; +import org.wpilib.math.proto.Controller.ProtobufSimpleMotorFeedforward; +import org.wpilib.ProtoTestBase; @SuppressWarnings("PMD.TestClassWithoutTestCases") class SimpleMotorFeedforwardProtoTest diff --git a/wpimath/src/test/java/org/wpilib/math/controller/struct/ArmFeedforwardStructTest.java b/wpimath/src/test/java/org/wpilib/math/controller/struct/ArmFeedforwardStructTest.java index 256a78d241..fb38b7b984 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/struct/ArmFeedforwardStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/struct/ArmFeedforwardStructTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller.struct; +package org.wpilib.math.controller.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.controller.ArmFeedforward; +import org.wpilib.math.controller.ArmFeedforward; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/controller/struct/DifferentialDriveFeedforwardStructTest.java b/wpimath/src/test/java/org/wpilib/math/controller/struct/DifferentialDriveFeedforwardStructTest.java index 85beea9ce1..f342c03f0b 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/struct/DifferentialDriveFeedforwardStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/struct/DifferentialDriveFeedforwardStructTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller.struct; +package org.wpilib.math.controller.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.controller.DifferentialDriveFeedforward; -import edu.wpi.first.wpilibj.StructTestBase; +import org.wpilib.math.controller.DifferentialDriveFeedforward; +import org.wpilib.StructTestBase; @SuppressWarnings("PMD.TestClassWithoutTestCases") class DifferentialDriveFeedforwardStructTest extends StructTestBase { diff --git a/wpimath/src/test/java/org/wpilib/math/controller/struct/DifferentialDriveWheelVoltagesStructTest.java b/wpimath/src/test/java/org/wpilib/math/controller/struct/DifferentialDriveWheelVoltagesStructTest.java index 0c6ea66a5f..8354f3f978 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/struct/DifferentialDriveWheelVoltagesStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/struct/DifferentialDriveWheelVoltagesStructTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller.struct; +package org.wpilib.math.controller.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.controller.DifferentialDriveWheelVoltages; +import org.wpilib.math.controller.DifferentialDriveWheelVoltages; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/controller/struct/ElevatorFeedforwardStructTest.java b/wpimath/src/test/java/org/wpilib/math/controller/struct/ElevatorFeedforwardStructTest.java index 53de2d1daf..f4db99ea29 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/struct/ElevatorFeedforwardStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/struct/ElevatorFeedforwardStructTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller.struct; +package org.wpilib.math.controller.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.controller.ElevatorFeedforward; +import org.wpilib.math.controller.ElevatorFeedforward; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/controller/struct/SimpleMotorFeedforwardStructTest.java b/wpimath/src/test/java/org/wpilib/math/controller/struct/SimpleMotorFeedforwardStructTest.java index 9dba1295e2..d8f0b4d4cd 100644 --- a/wpimath/src/test/java/org/wpilib/math/controller/struct/SimpleMotorFeedforwardStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/controller/struct/SimpleMotorFeedforwardStructTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.controller.struct; +package org.wpilib.math.controller.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.controller.SimpleMotorFeedforward; -import edu.wpi.first.wpilibj.StructTestBase; +import org.wpilib.math.controller.SimpleMotorFeedforward; +import org.wpilib.StructTestBase; @SuppressWarnings("PMD.TestClassWithoutTestCases") class SimpleMotorFeedforwardStructTest extends StructTestBase { diff --git a/wpimath/src/test/java/org/wpilib/math/estimator/AngleStatisticsTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/AngleStatisticsTest.java index eb30e494cc..5c92c5e857 100644 --- a/wpimath/src/test/java/org/wpilib/math/estimator/AngleStatisticsTest.java +++ b/wpimath/src/test/java/org/wpilib/math/estimator/AngleStatisticsTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; import org.junit.jupiter.api.Test; class AngleStatisticsTest { diff --git a/wpimath/src/test/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimator3dTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimator3dTest.java index 9a89e32cec..4357fddac6 100644 --- a/wpimath/src/test/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimator3dTest.java +++ b/wpimath/src/test/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimator3dTest.java @@ -2,25 +2,25 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Transform2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.math.kinematics.DifferentialDriveKinematics; -import edu.wpi.first.math.trajectory.Trajectory; -import edu.wpi.first.math.trajectory.TrajectoryConfig; -import edu.wpi.first.math.trajectory.TrajectoryGenerator; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Transform2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.math.kinematics.ChassisSpeeds; +import org.wpilib.math.kinematics.DifferentialDriveKinematics; +import org.wpilib.math.trajectory.Trajectory; +import org.wpilib.math.trajectory.TrajectoryConfig; +import org.wpilib.math.trajectory.TrajectoryGenerator; import java.util.List; import java.util.Optional; import java.util.Random; diff --git a/wpimath/src/test/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimatorTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimatorTest.java index a22a0e3626..15b92bd1d4 100644 --- a/wpimath/src/test/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimatorTest.java +++ b/wpimath/src/test/java/org/wpilib/math/estimator/DifferentialDrivePoseEstimatorTest.java @@ -2,22 +2,22 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Transform2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.math.kinematics.DifferentialDriveKinematics; -import edu.wpi.first.math.trajectory.Trajectory; -import edu.wpi.first.math.trajectory.TrajectoryConfig; -import edu.wpi.first.math.trajectory.TrajectoryGenerator; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Transform2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.kinematics.ChassisSpeeds; +import org.wpilib.math.kinematics.DifferentialDriveKinematics; +import org.wpilib.math.trajectory.Trajectory; +import org.wpilib.math.trajectory.TrajectoryConfig; +import org.wpilib.math.trajectory.TrajectoryGenerator; import java.util.List; import java.util.Optional; import java.util.Random; diff --git a/wpimath/src/test/java/org/wpilib/math/estimator/ExtendedKalmanFilterTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/ExtendedKalmanFilterTest.java index 044effc4d9..c8cbdef3c0 100644 --- a/wpimath/src/test/java/org/wpilib/math/estimator/ExtendedKalmanFilterTest.java +++ b/wpimath/src/test/java/org/wpilib/math/estimator/ExtendedKalmanFilterTest.java @@ -2,26 +2,26 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.StateSpaceUtil; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.numbers.N3; -import edu.wpi.first.math.numbers.N5; -import edu.wpi.first.math.system.NumericalIntegration; -import edu.wpi.first.math.system.NumericalJacobian; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.trajectory.TrajectoryConfig; -import edu.wpi.first.math.trajectory.TrajectoryGenerator; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.StateSpaceUtil; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.numbers.N3; +import org.wpilib.math.numbers.N5; +import org.wpilib.math.system.NumericalIntegration; +import org.wpilib.math.system.NumericalJacobian; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.math.trajectory.TrajectoryConfig; +import org.wpilib.math.trajectory.TrajectoryGenerator; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/estimator/KalmanFilterTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/KalmanFilterTest.java index e124021daa..e573addc9b 100644 --- a/wpimath/src/test/java/org/wpilib/math/estimator/KalmanFilterTest.java +++ b/wpimath/src/test/java/org/wpilib/math/estimator/KalmanFilterTest.java @@ -2,26 +2,26 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.numbers.N3; -import edu.wpi.first.math.numbers.N6; -import edu.wpi.first.math.system.LinearSystem; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.system.plant.LinearSystemId; -import edu.wpi.first.math.trajectory.TrajectoryConfig; -import edu.wpi.first.math.trajectory.TrajectoryGenerator; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.numbers.N3; +import org.wpilib.math.numbers.N6; +import org.wpilib.math.system.LinearSystem; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.math.system.plant.LinearSystemId; +import org.wpilib.math.trajectory.TrajectoryConfig; +import org.wpilib.math.trajectory.TrajectoryGenerator; import java.util.List; import java.util.Random; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/estimator/MecanumDrivePoseEstimator3dTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/MecanumDrivePoseEstimator3dTest.java index f8894e1eff..c25f33d21e 100644 --- a/wpimath/src/test/java/org/wpilib/math/estimator/MecanumDrivePoseEstimator3dTest.java +++ b/wpimath/src/test/java/org/wpilib/math/estimator/MecanumDrivePoseEstimator3dTest.java @@ -2,26 +2,26 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Transform2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.math.kinematics.MecanumDriveKinematics; -import edu.wpi.first.math.kinematics.MecanumDriveWheelPositions; -import edu.wpi.first.math.trajectory.Trajectory; -import edu.wpi.first.math.trajectory.TrajectoryConfig; -import edu.wpi.first.math.trajectory.TrajectoryGenerator; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Transform2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.math.kinematics.ChassisSpeeds; +import org.wpilib.math.kinematics.MecanumDriveKinematics; +import org.wpilib.math.kinematics.MecanumDriveWheelPositions; +import org.wpilib.math.trajectory.Trajectory; +import org.wpilib.math.trajectory.TrajectoryConfig; +import org.wpilib.math.trajectory.TrajectoryGenerator; import java.util.List; import java.util.Optional; import java.util.Random; diff --git a/wpimath/src/test/java/org/wpilib/math/estimator/MecanumDrivePoseEstimatorTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/MecanumDrivePoseEstimatorTest.java index ef164c4ae3..240f6b9cac 100644 --- a/wpimath/src/test/java/org/wpilib/math/estimator/MecanumDrivePoseEstimatorTest.java +++ b/wpimath/src/test/java/org/wpilib/math/estimator/MecanumDrivePoseEstimatorTest.java @@ -2,23 +2,23 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Transform2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.math.kinematics.MecanumDriveKinematics; -import edu.wpi.first.math.kinematics.MecanumDriveWheelPositions; -import edu.wpi.first.math.trajectory.Trajectory; -import edu.wpi.first.math.trajectory.TrajectoryConfig; -import edu.wpi.first.math.trajectory.TrajectoryGenerator; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Transform2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.kinematics.ChassisSpeeds; +import org.wpilib.math.kinematics.MecanumDriveKinematics; +import org.wpilib.math.kinematics.MecanumDriveWheelPositions; +import org.wpilib.math.trajectory.Trajectory; +import org.wpilib.math.trajectory.TrajectoryConfig; +import org.wpilib.math.trajectory.TrajectoryGenerator; import java.util.List; import java.util.Optional; import java.util.Random; diff --git a/wpimath/src/test/java/org/wpilib/math/estimator/MerweScaledSigmaPointsTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/MerweScaledSigmaPointsTest.java index 468eb51360..09c3e5e48b 100644 --- a/wpimath/src/test/java/org/wpilib/math/estimator/MerweScaledSigmaPointsTest.java +++ b/wpimath/src/test/java/org/wpilib/math/estimator/MerweScaledSigmaPointsTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; import org.junit.jupiter.api.Test; class MerweScaledSigmaPointsTest { diff --git a/wpimath/src/test/java/org/wpilib/math/estimator/MerweUKFTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/MerweUKFTest.java index 7c3672d406..1dbdbd48e6 100644 --- a/wpimath/src/test/java/org/wpilib/math/estimator/MerweUKFTest.java +++ b/wpimath/src/test/java/org/wpilib/math/estimator/MerweUKFTest.java @@ -2,31 +2,31 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.StateSpaceUtil; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.numbers.N3; -import edu.wpi.first.math.numbers.N4; -import edu.wpi.first.math.numbers.N5; -import edu.wpi.first.math.system.Discretization; -import edu.wpi.first.math.system.NumericalIntegration; -import edu.wpi.first.math.system.NumericalJacobian; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.system.plant.LinearSystemId; -import edu.wpi.first.math.trajectory.TrajectoryConfig; -import edu.wpi.first.math.trajectory.TrajectoryGenerator; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.StateSpaceUtil; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.numbers.N3; +import org.wpilib.math.numbers.N4; +import org.wpilib.math.numbers.N5; +import org.wpilib.math.system.Discretization; +import org.wpilib.math.system.NumericalIntegration; +import org.wpilib.math.system.NumericalJacobian; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.math.system.plant.LinearSystemId; +import org.wpilib.math.trajectory.TrajectoryConfig; +import org.wpilib.math.trajectory.TrajectoryGenerator; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/wpimath/src/test/java/org/wpilib/math/estimator/S3SigmaPointsTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/S3SigmaPointsTest.java index b9c83cbfb8..86a4985d7f 100644 --- a/wpimath/src/test/java/org/wpilib/math/estimator/S3SigmaPointsTest.java +++ b/wpimath/src/test/java/org/wpilib/math/estimator/S3SigmaPointsTest.java @@ -2,18 +2,18 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.Vector; -import edu.wpi.first.math.numbers.N2; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.linalg.Vector; +import org.wpilib.math.numbers.N2; import org.junit.jupiter.api.Test; class S3SigmaPointsTest { diff --git a/wpimath/src/test/java/org/wpilib/math/estimator/S3UKFTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/S3UKFTest.java index df485a2cb9..f0d5d93a17 100644 --- a/wpimath/src/test/java/org/wpilib/math/estimator/S3UKFTest.java +++ b/wpimath/src/test/java/org/wpilib/math/estimator/S3UKFTest.java @@ -2,31 +2,31 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.StateSpaceUtil; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.numbers.N3; -import edu.wpi.first.math.numbers.N4; -import edu.wpi.first.math.numbers.N5; -import edu.wpi.first.math.system.Discretization; -import edu.wpi.first.math.system.NumericalIntegration; -import edu.wpi.first.math.system.NumericalJacobian; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.system.plant.LinearSystemId; -import edu.wpi.first.math.trajectory.TrajectoryConfig; -import edu.wpi.first.math.trajectory.TrajectoryGenerator; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.util.StateSpaceUtil; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.numbers.N3; +import org.wpilib.math.numbers.N4; +import org.wpilib.math.numbers.N5; +import org.wpilib.math.system.Discretization; +import org.wpilib.math.system.NumericalIntegration; +import org.wpilib.math.system.NumericalJacobian; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.math.system.plant.LinearSystemId; +import org.wpilib.math.trajectory.TrajectoryConfig; +import org.wpilib.math.trajectory.TrajectoryGenerator; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/wpimath/src/test/java/org/wpilib/math/estimator/SwerveDrivePoseEstimator3dTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/SwerveDrivePoseEstimator3dTest.java index 98c3c39fb2..71e03e6177 100644 --- a/wpimath/src/test/java/org/wpilib/math/estimator/SwerveDrivePoseEstimator3dTest.java +++ b/wpimath/src/test/java/org/wpilib/math/estimator/SwerveDrivePoseEstimator3dTest.java @@ -2,26 +2,26 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Transform2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.math.kinematics.SwerveDriveKinematics; -import edu.wpi.first.math.kinematics.SwerveModulePosition; -import edu.wpi.first.math.trajectory.Trajectory; -import edu.wpi.first.math.trajectory.TrajectoryConfig; -import edu.wpi.first.math.trajectory.TrajectoryGenerator; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Transform2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.math.kinematics.ChassisSpeeds; +import org.wpilib.math.kinematics.SwerveDriveKinematics; +import org.wpilib.math.kinematics.SwerveModulePosition; +import org.wpilib.math.trajectory.Trajectory; +import org.wpilib.math.trajectory.TrajectoryConfig; +import org.wpilib.math.trajectory.TrajectoryGenerator; import java.util.List; import java.util.Optional; import java.util.Random; diff --git a/wpimath/src/test/java/org/wpilib/math/estimator/SwerveDrivePoseEstimatorTest.java b/wpimath/src/test/java/org/wpilib/math/estimator/SwerveDrivePoseEstimatorTest.java index 719c90f476..cea2510080 100644 --- a/wpimath/src/test/java/org/wpilib/math/estimator/SwerveDrivePoseEstimatorTest.java +++ b/wpimath/src/test/java/org/wpilib/math/estimator/SwerveDrivePoseEstimatorTest.java @@ -2,23 +2,23 @@ // 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 edu.wpi.first.math.estimator; +package org.wpilib.math.estimator; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Transform2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.math.kinematics.SwerveDriveKinematics; -import edu.wpi.first.math.kinematics.SwerveModulePosition; -import edu.wpi.first.math.trajectory.Trajectory; -import edu.wpi.first.math.trajectory.TrajectoryConfig; -import edu.wpi.first.math.trajectory.TrajectoryGenerator; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Transform2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.kinematics.ChassisSpeeds; +import org.wpilib.math.kinematics.SwerveDriveKinematics; +import org.wpilib.math.kinematics.SwerveModulePosition; +import org.wpilib.math.trajectory.Trajectory; +import org.wpilib.math.trajectory.TrajectoryConfig; +import org.wpilib.math.trajectory.TrajectoryGenerator; import java.util.List; import java.util.Optional; import java.util.Random; diff --git a/wpimath/src/test/java/org/wpilib/math/filter/DebouncerTest.java b/wpimath/src/test/java/org/wpilib/math/filter/DebouncerTest.java index 726fda89d2..a13ec9dda0 100644 --- a/wpimath/src/test/java/org/wpilib/math/filter/DebouncerTest.java +++ b/wpimath/src/test/java/org/wpilib/math/filter/DebouncerTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.math.filter; +package org.wpilib.math.filter; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.util.WPIUtilJNI; +import org.wpilib.util.WPIUtilJNI; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/filter/LinearFilterTest.java b/wpimath/src/test/java/org/wpilib/math/filter/LinearFilterTest.java index 72ea1743f1..16feccb68b 100644 --- a/wpimath/src/test/java/org/wpilib/math/filter/LinearFilterTest.java +++ b/wpimath/src/test/java/org/wpilib/math/filter/LinearFilterTest.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 edu.wpi.first.math.filter; +package org.wpilib.math.filter; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/wpimath/src/test/java/org/wpilib/math/filter/MedianFilterTest.java b/wpimath/src/test/java/org/wpilib/math/filter/MedianFilterTest.java index 1d6e00837c..172d11776c 100644 --- a/wpimath/src/test/java/org/wpilib/math/filter/MedianFilterTest.java +++ b/wpimath/src/test/java/org/wpilib/math/filter/MedianFilterTest.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 edu.wpi.first.math.filter; +package org.wpilib.math.filter; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/wpimath/src/test/java/org/wpilib/math/filter/SlewRateLimiterTest.java b/wpimath/src/test/java/org/wpilib/math/filter/SlewRateLimiterTest.java index 6e94b3cce6..cf2615a336 100644 --- a/wpimath/src/test/java/org/wpilib/math/filter/SlewRateLimiterTest.java +++ b/wpimath/src/test/java/org/wpilib/math/filter/SlewRateLimiterTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.filter; +package org.wpilib.math.filter; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.util.WPIUtilJNI; +import org.wpilib.util.WPIUtilJNI; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/CoordinateSystemTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/CoordinateSystemTest.java index 5d25562da7..5680f3cf19 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/CoordinateSystemTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/CoordinateSystemTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.util.Units; import org.junit.jupiter.api.Test; class CoordinateSystemTest { diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/Ellipse2dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Ellipse2dTest.java index 016a1c70d5..dbe027ad7e 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/Ellipse2dTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/Ellipse2dTest.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 edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/Pose2dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Pose2dTest.java index 895c20de92..b810ba31be 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/Pose2dTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/Pose2dTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import edu.wpi.first.units.Units; +import org.wpilib.units.Units; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/Pose3dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Pose3dTest.java index 71e61ca6c5..7788f9d6e5 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/Pose3dTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/Pose3dTest.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.util.Units; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/QuaternionTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/QuaternionTest.java index 7e6159f573..7e9b953563 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/QuaternionTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/QuaternionTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.util.Units; import org.junit.jupiter.api.Test; class QuaternionTest { diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/Rectangle2dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Rectangle2dTest.java index 6705d9aecd..b194009415 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/Rectangle2dTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/Rectangle2dTest.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 edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/Rotation2dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Rotation2dTest.java index 63ff7a06b0..cfe0afadf5 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/Rotation2dTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/Rotation2dTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import edu.wpi.first.units.Units; +import org.wpilib.units.Units; import org.junit.jupiter.api.Test; class Rotation2dTest { diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/Rotation3dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Rotation3dTest.java index 3e96a1cb3d..03bea21c0d 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/Rotation3dTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/Rotation3dTest.java @@ -2,18 +2,18 @@ // 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 edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.util.Units; import org.junit.jupiter.api.Test; class Rotation3dTest { diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/Transform2dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Transform2dTest.java index 19d4b4f396..25eef41b36 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/Transform2dTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/Transform2dTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.units.Units; +import org.wpilib.units.Units; import org.junit.jupiter.api.Test; class Transform2dTest { diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/Transform3dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Transform3dTest.java index dc251512fd..fcee244f96 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/Transform3dTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/Transform3dTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.util.Units; import org.junit.jupiter.api.Test; class Transform3dTest { diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/Translation2dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Translation2dTest.java index 5514b90213..dcafa1f3d2 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/Translation2dTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/Translation2dTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import edu.wpi.first.math.VecBuilder; +import org.wpilib.math.linalg.VecBuilder; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/Translation3dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Translation3dTest.java index a8efcde086..1f643335a8 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/Translation3dTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/Translation3dTest.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; -import static edu.wpi.first.units.Units.Inches; +import static org.wpilib.units.Units.Inches; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.util.Units; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/Twist2dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Twist2dTest.java index 4c8a7c3a11..83444646cb 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/Twist2dTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/Twist2dTest.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 edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/Twist3dTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/Twist3dTest.java index 016205873f..4498c2f872 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/Twist3dTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/Twist3dTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.geometry; +package org.wpilib.math.geometry; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.util.Units; import org.junit.jupiter.api.Test; class Twist3dTest { diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Ellipse2dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Ellipse2dProtoTest.java index 92c5614d29..80a0859ac8 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Ellipse2dProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Ellipse2dProtoTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Ellipse2d; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.proto.Geometry2D.ProtobufEllipse2d; +import org.wpilib.math.geometry.Ellipse2d; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.proto.Geometry2D.ProtobufEllipse2d; import org.junit.jupiter.api.Test; class Ellipse2dProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Pose2dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Pose2dProtoTest.java index 05ba185cf7..0e2b74c6ce 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Pose2dProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Pose2dProtoTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.proto.Geometry2D.ProtobufPose2d; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.proto.Geometry2D.ProtobufPose2d; import org.junit.jupiter.api.Test; class Pose2dProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Pose3dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Pose3dProtoTest.java index 1043408c6c..063f1111aa 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Pose3dProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Pose3dProtoTest.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Quaternion; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.math.proto.Geometry3D.ProtobufPose3d; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Quaternion; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.math.proto.Geometry3D.ProtobufPose3d; import org.junit.jupiter.api.Test; class Pose3dProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/proto/QuaternionProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/QuaternionProtoTest.java index 9129c19e33..b0d6768452 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/proto/QuaternionProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/proto/QuaternionProtoTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Quaternion; -import edu.wpi.first.math.proto.Geometry3D.ProtobufQuaternion; +import org.wpilib.math.geometry.Quaternion; +import org.wpilib.math.proto.Geometry3D.ProtobufQuaternion; import org.junit.jupiter.api.Test; class QuaternionProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Rectangle2dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Rectangle2dProtoTest.java index e270c75cab..f3d9ebbc65 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Rectangle2dProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Rectangle2dProtoTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rectangle2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.proto.Geometry2D.ProtobufRectangle2d; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rectangle2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.proto.Geometry2D.ProtobufRectangle2d; import org.junit.jupiter.api.Test; class Rectangle2dProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Rotation2dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Rotation2dProtoTest.java index 6021ec0838..75a93596ca 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Rotation2dProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Rotation2dProtoTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.proto.Geometry2D.ProtobufRotation2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.proto.Geometry2D.ProtobufRotation2d; import org.junit.jupiter.api.Test; class Rotation2dProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Rotation3dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Rotation3dProtoTest.java index 5860114bf3..406728e4f4 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Rotation3dProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Rotation3dProtoTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Quaternion; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.proto.Geometry3D.ProtobufRotation3d; +import org.wpilib.math.geometry.Quaternion; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.proto.Geometry3D.ProtobufRotation3d; import org.junit.jupiter.api.Test; class Rotation3dProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Transform2dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Transform2dProtoTest.java index 78294a105f..1ed0b19052 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Transform2dProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Transform2dProtoTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Transform2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.proto.Geometry2D.ProtobufTransform2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Transform2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.proto.Geometry2D.ProtobufTransform2d; import org.junit.jupiter.api.Test; class Transform2dProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Transform3dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Transform3dProtoTest.java index fd72334520..3ec1adacf1 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Transform3dProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Transform3dProtoTest.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Quaternion; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Transform3d; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.math.proto.Geometry3D.ProtobufTransform3d; +import org.wpilib.math.geometry.Quaternion; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Transform3d; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.math.proto.Geometry3D.ProtobufTransform3d; import org.junit.jupiter.api.Test; class Transform3dProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Translation2dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Translation2dProtoTest.java index 07b9080194..3b55742dd5 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Translation2dProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Translation2dProtoTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.proto.Geometry2D.ProtobufTranslation2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.proto.Geometry2D.ProtobufTranslation2d; import org.junit.jupiter.api.Test; class Translation2dProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Translation3dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Translation3dProtoTest.java index d94e177009..f612b87d3c 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Translation3dProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Translation3dProtoTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.math.proto.Geometry3D.ProtobufTranslation3d; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.math.proto.Geometry3D.ProtobufTranslation3d; import org.junit.jupiter.api.Test; class Translation3dProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Twist2dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Twist2dProtoTest.java index e7a0631add..f9c6411df7 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Twist2dProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Twist2dProtoTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Twist2d; -import edu.wpi.first.math.proto.Geometry2D.ProtobufTwist2d; +import org.wpilib.math.geometry.Twist2d; +import org.wpilib.math.proto.Geometry2D.ProtobufTwist2d; import org.junit.jupiter.api.Test; class Twist2dProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Twist3dProtoTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Twist3dProtoTest.java index 70e0f07957..9fe888aebd 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/proto/Twist3dProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/proto/Twist3dProtoTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.proto; +package org.wpilib.math.geometry.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Twist3d; -import edu.wpi.first.math.proto.Geometry3D.ProtobufTwist3d; +import org.wpilib.math.geometry.Twist3d; +import org.wpilib.math.proto.Geometry3D.ProtobufTwist3d; import org.junit.jupiter.api.Test; class Twist3dProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Ellipse2dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Ellipse2dStructTest.java index 1bb4323423..c838b52a32 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Ellipse2dStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Ellipse2dStructTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Ellipse2d; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Ellipse2d; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Pose2dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Pose2dStructTest.java index 0a8c62ab28..e2c38c5801 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Pose2dStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Pose2dStructTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Translation2d; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Translation2d; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Pose3dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Pose3dStructTest.java index e2aac4631c..4a04cc9f3c 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Pose3dStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Pose3dStructTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Quaternion; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Translation3d; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Quaternion; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Translation3d; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/struct/QuaternionStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/QuaternionStructTest.java index 41d4604673..1a2c411960 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/struct/QuaternionStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/struct/QuaternionStructTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Quaternion; +import org.wpilib.math.geometry.Quaternion; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Rectangle2dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Rectangle2dStructTest.java index 506209bdc4..f3620a2820 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Rectangle2dStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Rectangle2dStructTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rectangle2d; -import edu.wpi.first.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rectangle2d; +import org.wpilib.math.geometry.Rotation2d; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Rotation2dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Rotation2dStructTest.java index 62569b57e1..7024b187f2 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Rotation2dStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Rotation2dStructTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Rotation2d; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Rotation3dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Rotation3dStructTest.java index 7f275e74e4..98af9d709e 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Rotation3dStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Rotation3dStructTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Quaternion; -import edu.wpi.first.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Quaternion; +import org.wpilib.math.geometry.Rotation3d; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Transform2dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Transform2dStructTest.java index cf583d4ce5..437203c147 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Transform2dStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Transform2dStructTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Transform2d; -import edu.wpi.first.math.geometry.Translation2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Transform2d; +import org.wpilib.math.geometry.Translation2d; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Transform3dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Transform3dStructTest.java index 10a5100d9c..10af1ea883 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Transform3dStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Transform3dStructTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Quaternion; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Transform3d; -import edu.wpi.first.math.geometry.Translation3d; +import org.wpilib.math.geometry.Quaternion; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Transform3d; +import org.wpilib.math.geometry.Translation3d; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Translation2dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Translation2dStructTest.java index 366df17657..71d1c0baef 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Translation2dStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Translation2dStructTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Translation2d; +import org.wpilib.math.geometry.Translation2d; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Translation3dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Translation3dStructTest.java index fc48981917..f73836aeb6 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Translation3dStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Translation3dStructTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Translation3d; +import org.wpilib.math.geometry.Translation3d; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Twist2dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Twist2dStructTest.java index 6d4d174c50..0897c9358c 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Twist2dStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Twist2dStructTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Twist2d; +import org.wpilib.math.geometry.Twist2d; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Twist3dStructTest.java b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Twist3dStructTest.java index 131eb2f6ac..eb7a6e11f4 100644 --- a/wpimath/src/test/java/org/wpilib/math/geometry/struct/Twist3dStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/geometry/struct/Twist3dStructTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.geometry.struct; +package org.wpilib.math.geometry.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Twist3d; +import org.wpilib.math.geometry.Twist3d; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/interpolation/InterpolatingDoubleTreeMapTest.java b/wpimath/src/test/java/org/wpilib/math/interpolation/InterpolatingDoubleTreeMapTest.java index fb74b92eb9..ec273f8f3d 100644 --- a/wpimath/src/test/java/org/wpilib/math/interpolation/InterpolatingDoubleTreeMapTest.java +++ b/wpimath/src/test/java/org/wpilib/math/interpolation/InterpolatingDoubleTreeMapTest.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 edu.wpi.first.math.interpolation; +package org.wpilib.math.interpolation; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/wpimath/src/test/java/org/wpilib/math/interpolation/InterpolatingTreeMapTest.java b/wpimath/src/test/java/org/wpilib/math/interpolation/InterpolatingTreeMapTest.java index b04b40ab3c..3f1869fc4f 100644 --- a/wpimath/src/test/java/org/wpilib/math/interpolation/InterpolatingTreeMapTest.java +++ b/wpimath/src/test/java/org/wpilib/math/interpolation/InterpolatingTreeMapTest.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 edu.wpi.first.math.interpolation; +package org.wpilib.math.interpolation; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/wpimath/src/test/java/org/wpilib/math/interpolation/TimeInterpolatableBufferTest.java b/wpimath/src/test/java/org/wpilib/math/interpolation/TimeInterpolatableBufferTest.java index 67742c7546..b80165f6d5 100644 --- a/wpimath/src/test/java/org/wpilib/math/interpolation/TimeInterpolatableBufferTest.java +++ b/wpimath/src/test/java/org/wpilib/math/interpolation/TimeInterpolatableBufferTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.interpolation; +package org.wpilib.math.interpolation; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; import org.junit.jupiter.api.Test; class TimeInterpolatableBufferTest { diff --git a/wpimath/src/test/java/org/wpilib/math/jni/ArmFeedforwardJNITest.java b/wpimath/src/test/java/org/wpilib/math/jni/ArmFeedforwardJNITest.java index 7fadaa2c40..fe227967d3 100644 --- a/wpimath/src/test/java/org/wpilib/math/jni/ArmFeedforwardJNITest.java +++ b/wpimath/src/test/java/org/wpilib/math/jni/ArmFeedforwardJNITest.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 edu.wpi.first.math.jni; +package org.wpilib.math.jni; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; diff --git a/wpimath/src/test/java/org/wpilib/math/jni/DAREJNITest.java b/wpimath/src/test/java/org/wpilib/math/jni/DAREJNITest.java index 88d0486554..8e0a076e6f 100644 --- a/wpimath/src/test/java/org/wpilib/math/jni/DAREJNITest.java +++ b/wpimath/src/test/java/org/wpilib/math/jni/DAREJNITest.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 edu.wpi.first.math.jni; +package org.wpilib.math.jni; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; diff --git a/wpimath/src/test/java/org/wpilib/math/jni/EigenJNITest.java b/wpimath/src/test/java/org/wpilib/math/jni/EigenJNITest.java index ad98fefbf5..a12721419c 100644 --- a/wpimath/src/test/java/org/wpilib/math/jni/EigenJNITest.java +++ b/wpimath/src/test/java/org/wpilib/math/jni/EigenJNITest.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 edu.wpi.first.math.jni; +package org.wpilib.math.jni; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; diff --git a/wpimath/src/test/java/org/wpilib/math/jni/Ellipse2dJNITest.java b/wpimath/src/test/java/org/wpilib/math/jni/Ellipse2dJNITest.java index dbdb97f7b8..61cb068cc4 100644 --- a/wpimath/src/test/java/org/wpilib/math/jni/Ellipse2dJNITest.java +++ b/wpimath/src/test/java/org/wpilib/math/jni/Ellipse2dJNITest.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 edu.wpi.first.math.jni; +package org.wpilib.math.jni; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; diff --git a/wpimath/src/test/java/org/wpilib/math/jni/StateSpaceUtilJNITest.java b/wpimath/src/test/java/org/wpilib/math/jni/StateSpaceUtilJNITest.java index a7d9cad06d..bc9298eff9 100644 --- a/wpimath/src/test/java/org/wpilib/math/jni/StateSpaceUtilJNITest.java +++ b/wpimath/src/test/java/org/wpilib/math/jni/StateSpaceUtilJNITest.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 edu.wpi.first.math.jni; +package org.wpilib.math.jni; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; diff --git a/wpimath/src/test/java/org/wpilib/math/jni/Transform3dJNITest.java b/wpimath/src/test/java/org/wpilib/math/jni/Transform3dJNITest.java index 0c4cad7e4a..6c1d096cf3 100644 --- a/wpimath/src/test/java/org/wpilib/math/jni/Transform3dJNITest.java +++ b/wpimath/src/test/java/org/wpilib/math/jni/Transform3dJNITest.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 edu.wpi.first.math.jni; +package org.wpilib.math.jni; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; diff --git a/wpimath/src/test/java/org/wpilib/math/jni/Twist3dJNITest.java b/wpimath/src/test/java/org/wpilib/math/jni/Twist3dJNITest.java index 391f11f2b4..1707318eff 100644 --- a/wpimath/src/test/java/org/wpilib/math/jni/Twist3dJNITest.java +++ b/wpimath/src/test/java/org/wpilib/math/jni/Twist3dJNITest.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 edu.wpi.first.math.jni; +package org.wpilib.math.jni; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/ChassisSpeedsTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/ChassisSpeedsTest.java index 1101da623d..1fc1706506 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/ChassisSpeedsTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/ChassisSpeedsTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; -import static edu.wpi.first.units.Units.InchesPerSecond; -import static edu.wpi.first.units.Units.RPM; +import static org.wpilib.units.Units.InchesPerSecond; +import static org.wpilib.units.Units.RPM; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Twist2d; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Twist2d; import org.junit.jupiter.api.Test; class ChassisSpeedsTest { diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveKinematicsTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveKinematicsTest.java index d6a4473e3f..a4472fa7dc 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveKinematicsTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveKinematicsTest.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 edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveOdometry3dTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveOdometry3dTest.java index 3c30ad6e1c..326b59e0f9 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveOdometry3dTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveOdometry3dTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.util.Units; import org.junit.jupiter.api.Test; class DifferentialDriveOdometry3dTest { diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveOdometryTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveOdometryTest.java index aaf7f4106a..f6469b596c 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveOdometryTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveOdometryTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; import org.junit.jupiter.api.Test; class DifferentialDriveOdometryTest { diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveWheelSpeedsTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveWheelSpeedsTest.java index d1716d9c67..9df3f3ba98 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveWheelSpeedsTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/DifferentialDriveWheelSpeedsTest.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 edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveKinematicsTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveKinematicsTest.java index 73e6f74a00..742dbfc4d2 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveKinematicsTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveKinematicsTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Translation2d; +import org.wpilib.math.geometry.Translation2d; import org.junit.jupiter.api.Test; class MecanumDriveKinematicsTest { diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveOdometry3dTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveOdometry3dTest.java index 25802a1d37..15f7f5c9f8 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveOdometry3dTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveOdometry3dTest.java @@ -2,20 +2,20 @@ // 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 edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.math.trajectory.TrajectoryConfig; -import edu.wpi.first.math.trajectory.TrajectoryGenerator; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.math.trajectory.TrajectoryConfig; +import org.wpilib.math.trajectory.TrajectoryGenerator; +import org.wpilib.math.util.Units; import java.util.List; import java.util.Random; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveOdometryTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveOdometryTest.java index e1fbe8e6d3..058f450194 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveOdometryTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveOdometryTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.trajectory.TrajectoryConfig; -import edu.wpi.first.math.trajectory.TrajectoryGenerator; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.trajectory.TrajectoryConfig; +import org.wpilib.math.trajectory.TrajectoryGenerator; import java.util.List; import java.util.Random; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveWheelSpeedsTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveWheelSpeedsTest.java index 6080bedb15..8570308da9 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveWheelSpeedsTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/MecanumDriveWheelSpeedsTest.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 edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/SwerveDriveKinematicsTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/SwerveDriveKinematicsTest.java index fc3921f52f..148420fd89 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/SwerveDriveKinematicsTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/SwerveDriveKinematicsTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Translation2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Translation2d; import org.junit.jupiter.api.Test; class SwerveDriveKinematicsTest { diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/SwerveDriveOdometry3dTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/SwerveDriveOdometry3dTest.java index 1eb97ae5ba..bf7167c61b 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/SwerveDriveOdometry3dTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/SwerveDriveOdometry3dTest.java @@ -2,20 +2,20 @@ // 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 edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.math.trajectory.TrajectoryConfig; -import edu.wpi.first.math.trajectory.TrajectoryGenerator; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.math.trajectory.TrajectoryConfig; +import org.wpilib.math.trajectory.TrajectoryGenerator; +import org.wpilib.math.util.Units; import java.util.List; import java.util.Random; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/SwerveDriveOdometryTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/SwerveDriveOdometryTest.java index c41a8b3fb3..108c8b6ee8 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/SwerveDriveOdometryTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/SwerveDriveOdometryTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.trajectory.TrajectoryConfig; -import edu.wpi.first.math.trajectory.TrajectoryGenerator; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.trajectory.TrajectoryConfig; +import org.wpilib.math.trajectory.TrajectoryGenerator; import java.util.List; import java.util.Random; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/SwerveModuleStateTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/SwerveModuleStateTest.java index fdccdccb08..f31cff298d 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/SwerveModuleStateTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/SwerveModuleStateTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics; +package org.wpilib.math.kinematics; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Rotation2d; import org.junit.jupiter.api.Test; class SwerveModuleStateTest { diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/proto/ChassisSpeedsProtoTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/ChassisSpeedsProtoTest.java index 963e0813fe..278c4e174b 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/proto/ChassisSpeedsProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/ChassisSpeedsProtoTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.proto; +package org.wpilib.math.kinematics.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.math.proto.Kinematics.ProtobufChassisSpeeds; +import org.wpilib.math.kinematics.ChassisSpeeds; +import org.wpilib.math.proto.Kinematics.ProtobufChassisSpeeds; import org.junit.jupiter.api.Test; class ChassisSpeedsProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/proto/DifferentialDriveKinematicsProtoTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/DifferentialDriveKinematicsProtoTest.java index a0e3c7fa22..3b80e4e321 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/proto/DifferentialDriveKinematicsProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/DifferentialDriveKinematicsProtoTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.proto; +package org.wpilib.math.kinematics.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.kinematics.DifferentialDriveKinematics; -import edu.wpi.first.math.proto.Kinematics.ProtobufDifferentialDriveKinematics; +import org.wpilib.math.kinematics.DifferentialDriveKinematics; +import org.wpilib.math.proto.Kinematics.ProtobufDifferentialDriveKinematics; import org.junit.jupiter.api.Test; class DifferentialDriveKinematicsProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/proto/DifferentialDriveWheelSpeedsProtoTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/DifferentialDriveWheelSpeedsProtoTest.java index af1c40017c..255294e56e 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/proto/DifferentialDriveWheelSpeedsProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/DifferentialDriveWheelSpeedsProtoTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.proto; +package org.wpilib.math.kinematics.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.kinematics.DifferentialDriveWheelSpeeds; -import edu.wpi.first.math.proto.Kinematics.ProtobufDifferentialDriveWheelSpeeds; +import org.wpilib.math.kinematics.DifferentialDriveWheelSpeeds; +import org.wpilib.math.proto.Kinematics.ProtobufDifferentialDriveWheelSpeeds; import org.junit.jupiter.api.Test; class DifferentialDriveWheelSpeedsProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/proto/MecanumDriveKinematicsProtoTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/MecanumDriveKinematicsProtoTest.java index a94cfab933..876cc06a79 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/proto/MecanumDriveKinematicsProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/MecanumDriveKinematicsProtoTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.kinematics.proto; +package org.wpilib.math.kinematics.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.kinematics.MecanumDriveKinematics; -import edu.wpi.first.math.proto.Kinematics.ProtobufMecanumDriveKinematics; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.kinematics.MecanumDriveKinematics; +import org.wpilib.math.proto.Kinematics.ProtobufMecanumDriveKinematics; import org.junit.jupiter.api.Test; class MecanumDriveKinematicsProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelPositionsProtoTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelPositionsProtoTest.java index 4f67312b01..d5bb4c03b1 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelPositionsProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelPositionsProtoTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.proto; +package org.wpilib.math.kinematics.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.kinematics.MecanumDriveWheelPositions; -import edu.wpi.first.math.proto.Kinematics.ProtobufMecanumDriveWheelPositions; +import org.wpilib.math.kinematics.MecanumDriveWheelPositions; +import org.wpilib.math.proto.Kinematics.ProtobufMecanumDriveWheelPositions; import org.junit.jupiter.api.Test; class MecanumDriveWheelPositionsProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelSpeedsProtoTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelSpeedsProtoTest.java index dcc4f8c258..31edc7dfb6 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelSpeedsProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/MecanumDriveWheelSpeedsProtoTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.proto; +package org.wpilib.math.kinematics.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.kinematics.MecanumDriveWheelSpeeds; -import edu.wpi.first.math.proto.Kinematics.ProtobufMecanumDriveWheelSpeeds; +import org.wpilib.math.kinematics.MecanumDriveWheelSpeeds; +import org.wpilib.math.proto.Kinematics.ProtobufMecanumDriveWheelSpeeds; import org.junit.jupiter.api.Test; class MecanumDriveWheelSpeedsProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/proto/SwerveDriveKinematicsProtoTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/SwerveDriveKinematicsProtoTest.java index 8304d467ea..ab09d2dcc7 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/proto/SwerveDriveKinematicsProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/SwerveDriveKinematicsProtoTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.math.kinematics.proto; +package org.wpilib.math.kinematics.proto; import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.kinematics.SwerveDriveKinematics; -import edu.wpi.first.math.proto.Kinematics.ProtobufSwerveDriveKinematics; -import edu.wpi.first.wpilibj.ProtoTestBase; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.kinematics.SwerveDriveKinematics; +import org.wpilib.math.proto.Kinematics.ProtobufSwerveDriveKinematics; +import org.wpilib.ProtoTestBase; @SuppressWarnings("PMD.TestClassWithoutTestCases") class SwerveDriveKinematicsProtoTest diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/proto/SwerveModulePositionProtoTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/SwerveModulePositionProtoTest.java index 108f85ad92..c5648aba5c 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/proto/SwerveModulePositionProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/SwerveModulePositionProtoTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.kinematics.proto; +package org.wpilib.math.kinematics.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.kinematics.SwerveModulePosition; -import edu.wpi.first.math.proto.Kinematics.ProtobufSwerveModulePosition; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.kinematics.SwerveModulePosition; +import org.wpilib.math.proto.Kinematics.ProtobufSwerveModulePosition; import org.junit.jupiter.api.Test; class SwerveModulePositionProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/proto/SwerveModuleStateProtoTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/SwerveModuleStateProtoTest.java index 3671a95360..6a34475f74 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/proto/SwerveModuleStateProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/proto/SwerveModuleStateProtoTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.kinematics.proto; +package org.wpilib.math.kinematics.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.kinematics.SwerveModuleState; -import edu.wpi.first.math.proto.Kinematics.ProtobufSwerveModuleState; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.kinematics.SwerveModuleState; +import org.wpilib.math.proto.Kinematics.ProtobufSwerveModuleState; import org.junit.jupiter.api.Test; class SwerveModuleStateProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/struct/ChassisSpeedsStructTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/ChassisSpeedsStructTest.java index 79916f7f95..d8338c98ab 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/struct/ChassisSpeedsStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/ChassisSpeedsStructTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.struct; +package org.wpilib.math.kinematics.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.kinematics.ChassisSpeeds; +import org.wpilib.math.kinematics.ChassisSpeeds; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/struct/DifferentialDriveKinematicsStructTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/DifferentialDriveKinematicsStructTest.java index 3a75e2c76c..b0f1977a9b 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/struct/DifferentialDriveKinematicsStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/DifferentialDriveKinematicsStructTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.struct; +package org.wpilib.math.kinematics.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.kinematics.DifferentialDriveKinematics; +import org.wpilib.math.kinematics.DifferentialDriveKinematics; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelPositionsStructTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelPositionsStructTest.java index eeaa7a40a4..15c2ea6c32 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelPositionsStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelPositionsStructTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.struct; +package org.wpilib.math.kinematics.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.kinematics.DifferentialDriveWheelPositions; +import org.wpilib.math.kinematics.DifferentialDriveWheelPositions; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelSpeedsStructTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelSpeedsStructTest.java index e23dc3a54b..59a9cfcf48 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelSpeedsStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/DifferentialDriveWheelSpeedsStructTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.struct; +package org.wpilib.math.kinematics.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.kinematics.DifferentialDriveWheelSpeeds; +import org.wpilib.math.kinematics.DifferentialDriveWheelSpeeds; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/struct/MecanumDriveKinematicsStructTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/MecanumDriveKinematicsStructTest.java index a8d36f6a20..fd629765ed 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/struct/MecanumDriveKinematicsStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/MecanumDriveKinematicsStructTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.struct; +package org.wpilib.math.kinematics.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.kinematics.MecanumDriveKinematics; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.kinematics.MecanumDriveKinematics; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelPositionsStructTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelPositionsStructTest.java index fb8409b9e4..a0f568b356 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelPositionsStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelPositionsStructTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.struct; +package org.wpilib.math.kinematics.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.kinematics.MecanumDriveWheelPositions; +import org.wpilib.math.kinematics.MecanumDriveWheelPositions; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelSpeedsStructTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelSpeedsStructTest.java index e3b2199909..e423e9e432 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelSpeedsStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/MecanumDriveWheelSpeedsStructTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.struct; +package org.wpilib.math.kinematics.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.kinematics.MecanumDriveWheelSpeeds; +import org.wpilib.math.kinematics.MecanumDriveWheelSpeeds; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/struct/SwerveDriveKinematicsStructTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/SwerveDriveKinematicsStructTest.java index 1e7c335fdb..c5b218e202 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/struct/SwerveDriveKinematicsStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/SwerveDriveKinematicsStructTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.kinematics.struct; +package org.wpilib.math.kinematics.struct; import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.kinematics.SwerveDriveKinematics; -import edu.wpi.first.wpilibj.StructTestBase; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.kinematics.SwerveDriveKinematics; +import org.wpilib.StructTestBase; @SuppressWarnings("PMD.TestClassWithoutTestCases") class SwerveDriveKinematicsStructTest extends StructTestBase { diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/struct/SwerveModulePositionStructTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/SwerveModulePositionStructTest.java index c45c1f0c3e..fe0f6f4320 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/struct/SwerveModulePositionStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/SwerveModulePositionStructTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.struct; +package org.wpilib.math.kinematics.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.kinematics.SwerveModulePosition; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.kinematics.SwerveModulePosition; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/kinematics/struct/SwerveModuleStateStructTest.java b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/SwerveModuleStateStructTest.java index 3473525cf4..a0b60d0061 100644 --- a/wpimath/src/test/java/org/wpilib/math/kinematics/struct/SwerveModuleStateStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/kinematics/struct/SwerveModuleStateStructTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.kinematics.struct; +package org.wpilib.math.kinematics.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.kinematics.SwerveModuleState; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.kinematics.SwerveModuleState; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/linalg/DARETest.java b/wpimath/src/test/java/org/wpilib/math/linalg/DARETest.java index 1f8f56e085..f0c2758488 100644 --- a/wpimath/src/test/java/org/wpilib/math/linalg/DARETest.java +++ b/wpimath/src/test/java/org/wpilib/math/linalg/DARETest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math; +package org.wpilib.math.linalg; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import edu.wpi.first.wpilibj.UtilityClassTest; +import org.wpilib.UtilityClassTest; import org.ejml.simple.SimpleMatrix; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/linalg/MatrixTest.java b/wpimath/src/test/java/org/wpilib/math/linalg/MatrixTest.java index d4bc0356b9..b54c82883a 100644 --- a/wpimath/src/test/java/org/wpilib/math/linalg/MatrixTest.java +++ b/wpimath/src/test/java/org/wpilib/math/linalg/MatrixTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.math; +package org.wpilib.math.linalg; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.numbers.N3; -import edu.wpi.first.math.numbers.N4; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.numbers.N3; +import org.wpilib.math.numbers.N4; import org.ejml.data.SingularMatrixException; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/linalg/VectorTest.java b/wpimath/src/test/java/org/wpilib/math/linalg/VectorTest.java index 7b6edefe66..a10264bd8c 100644 --- a/wpimath/src/test/java/org/wpilib/math/linalg/VectorTest.java +++ b/wpimath/src/test/java/org/wpilib/math/linalg/VectorTest.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 edu.wpi.first.math; +package org.wpilib.math.linalg; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/wpimath/src/test/java/org/wpilib/math/linalg/proto/MatrixProtoTest.java b/wpimath/src/test/java/org/wpilib/math/linalg/proto/MatrixProtoTest.java index 64c37d5bbf..245954bf1a 100644 --- a/wpimath/src/test/java/org/wpilib/math/linalg/proto/MatrixProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/linalg/proto/MatrixProtoTest.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.math.proto; +package org.wpilib.math.linalg.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.numbers.N3; -import edu.wpi.first.math.proto.Wpimath.ProtobufMatrix; -import edu.wpi.first.wpilibj.ProtoTestBase; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.numbers.N3; +import org.wpilib.math.proto.Wpimath.ProtobufMatrix; +import org.wpilib.ProtoTestBase; @SuppressWarnings("PMD.TestClassWithoutTestCases") class MatrixProtoTest extends ProtoTestBase, ProtobufMatrix> { diff --git a/wpimath/src/test/java/org/wpilib/math/linalg/proto/VectorProtoTest.java b/wpimath/src/test/java/org/wpilib/math/linalg/proto/VectorProtoTest.java index d3be6b62f5..cb45ce70d5 100644 --- a/wpimath/src/test/java/org/wpilib/math/linalg/proto/VectorProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/linalg/proto/VectorProtoTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.math.proto; +package org.wpilib.math.linalg.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.Vector; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.proto.Wpimath.ProtobufVector; -import edu.wpi.first.wpilibj.ProtoTestBase; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.linalg.Vector; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.proto.Wpimath.ProtobufVector; +import org.wpilib.ProtoTestBase; @SuppressWarnings("PMD.TestClassWithoutTestCases") class VectorProtoTest extends ProtoTestBase, ProtobufVector> { diff --git a/wpimath/src/test/java/org/wpilib/math/linalg/struct/MatrixStructTest.java b/wpimath/src/test/java/org/wpilib/math/linalg/struct/MatrixStructTest.java index 6a9e9bb58c..4b44b2dcfe 100644 --- a/wpimath/src/test/java/org/wpilib/math/linalg/struct/MatrixStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/linalg/struct/MatrixStructTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.math.struct; +package org.wpilib.math.linalg.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.numbers.N3; -import edu.wpi.first.wpilibj.StructTestBase; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.numbers.N3; +import org.wpilib.StructTestBase; @SuppressWarnings("PMD.TestClassWithoutTestCases") class MatrixStructTest extends StructTestBase> { diff --git a/wpimath/src/test/java/org/wpilib/math/linalg/struct/VectorStructTest.java b/wpimath/src/test/java/org/wpilib/math/linalg/struct/VectorStructTest.java index 9685945718..c155bc9f25 100644 --- a/wpimath/src/test/java/org/wpilib/math/linalg/struct/VectorStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/linalg/struct/VectorStructTest.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.struct; +package org.wpilib.math.linalg.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.Vector; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.wpilibj.StructTestBase; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.linalg.Vector; +import org.wpilib.math.numbers.N2; +import org.wpilib.StructTestBase; @SuppressWarnings("PMD.TestClassWithoutTestCases") class VectorStructTest extends StructTestBase> { diff --git a/wpimath/src/test/java/org/wpilib/math/optimization/SimulatedAnnealingTest.java b/wpimath/src/test/java/org/wpilib/math/optimization/SimulatedAnnealingTest.java index c66a8f388d..387ab2c45e 100644 --- a/wpimath/src/test/java/org/wpilib/math/optimization/SimulatedAnnealingTest.java +++ b/wpimath/src/test/java/org/wpilib/math/optimization/SimulatedAnnealingTest.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 edu.wpi.first.math.optimization; +package org.wpilib.math.optimization; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/wpimath/src/test/java/org/wpilib/math/path/TravelingSalesmanTest.java b/wpimath/src/test/java/org/wpilib/math/path/TravelingSalesmanTest.java index d44ea8b87b..040e40e857 100644 --- a/wpimath/src/test/java/org/wpilib/math/path/TravelingSalesmanTest.java +++ b/wpimath/src/test/java/org/wpilib/math/path/TravelingSalesmanTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.math.path; +package org.wpilib.math.path; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.util.CircularBuffer; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.util.container.CircularBuffer; import org.junit.jupiter.api.Test; class TravelingSalesmanTest { diff --git a/wpimath/src/test/java/org/wpilib/math/spline/CubicHermiteSplineTest.java b/wpimath/src/test/java/org/wpilib/math/spline/CubicHermiteSplineTest.java index e0d7ca3b60..a35441592d 100644 --- a/wpimath/src/test/java/org/wpilib/math/spline/CubicHermiteSplineTest.java +++ b/wpimath/src/test/java/org/wpilib/math/spline/CubicHermiteSplineTest.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.math.spline; +package org.wpilib.math.spline; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.spline.SplineParameterizer.MalformedSplineException; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.spline.SplineParameterizer.MalformedSplineException; import java.util.ArrayList; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/spline/QuinticHermiteSplineTest.java b/wpimath/src/test/java/org/wpilib/math/spline/QuinticHermiteSplineTest.java index d5c0559224..138a77ff33 100644 --- a/wpimath/src/test/java/org/wpilib/math/spline/QuinticHermiteSplineTest.java +++ b/wpimath/src/test/java/org/wpilib/math/spline/QuinticHermiteSplineTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.math.spline; +package org.wpilib.math.spline; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.spline.SplineParameterizer.MalformedSplineException; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.spline.SplineParameterizer.MalformedSplineException; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/spline/proto/CubicHermiteSplineProtoTest.java b/wpimath/src/test/java/org/wpilib/math/spline/proto/CubicHermiteSplineProtoTest.java index 36f6567349..7aaad29558 100644 --- a/wpimath/src/test/java/org/wpilib/math/spline/proto/CubicHermiteSplineProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/spline/proto/CubicHermiteSplineProtoTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.spline.proto; +package org.wpilib.math.spline.proto; import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import edu.wpi.first.math.proto.Spline.ProtobufCubicHermiteSpline; -import edu.wpi.first.math.spline.CubicHermiteSpline; -import edu.wpi.first.wpilibj.ProtoTestBase; +import org.wpilib.math.proto.Spline.ProtobufCubicHermiteSpline; +import org.wpilib.math.spline.CubicHermiteSpline; +import org.wpilib.ProtoTestBase; @SuppressWarnings("PMD.TestClassWithoutTestCases") class CubicHermiteSplineProtoTest diff --git a/wpimath/src/test/java/org/wpilib/math/spline/proto/QuinticHermiteSplineProtoTest.java b/wpimath/src/test/java/org/wpilib/math/spline/proto/QuinticHermiteSplineProtoTest.java index 6254bbb304..f42412d5ae 100644 --- a/wpimath/src/test/java/org/wpilib/math/spline/proto/QuinticHermiteSplineProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/spline/proto/QuinticHermiteSplineProtoTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.spline.proto; +package org.wpilib.math.spline.proto; import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import edu.wpi.first.math.proto.Spline.ProtobufQuinticHermiteSpline; -import edu.wpi.first.math.spline.QuinticHermiteSpline; -import edu.wpi.first.wpilibj.ProtoTestBase; +import org.wpilib.math.proto.Spline.ProtobufQuinticHermiteSpline; +import org.wpilib.math.spline.QuinticHermiteSpline; +import org.wpilib.ProtoTestBase; @SuppressWarnings("PMD.TestClassWithoutTestCases") class QuinticHermiteSplineProtoTest diff --git a/wpimath/src/test/java/org/wpilib/math/spline/struct/CubicHermiteSplineStructTest.java b/wpimath/src/test/java/org/wpilib/math/spline/struct/CubicHermiteSplineStructTest.java index 948bc4c03a..13d0ddd880 100644 --- a/wpimath/src/test/java/org/wpilib/math/spline/struct/CubicHermiteSplineStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/spline/struct/CubicHermiteSplineStructTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.spline.struct; +package org.wpilib.math.spline.struct; import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import edu.wpi.first.math.spline.CubicHermiteSpline; -import edu.wpi.first.wpilibj.StructTestBase; +import org.wpilib.math.spline.CubicHermiteSpline; +import org.wpilib.StructTestBase; @SuppressWarnings("PMD.TestClassWithoutTestCases") class CubicHermiteSplineStructTest extends StructTestBase { diff --git a/wpimath/src/test/java/org/wpilib/math/spline/struct/QuinticHermiteSplineStructTest.java b/wpimath/src/test/java/org/wpilib/math/spline/struct/QuinticHermiteSplineStructTest.java index 9305661746..3279e959b3 100644 --- a/wpimath/src/test/java/org/wpilib/math/spline/struct/QuinticHermiteSplineStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/spline/struct/QuinticHermiteSplineStructTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.spline.struct; +package org.wpilib.math.spline.struct; import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import edu.wpi.first.math.spline.QuinticHermiteSpline; -import edu.wpi.first.wpilibj.StructTestBase; +import org.wpilib.math.spline.QuinticHermiteSpline; +import org.wpilib.StructTestBase; @SuppressWarnings("PMD.TestClassWithoutTestCases") class QuinticHermiteSplineStructTest extends StructTestBase { diff --git a/wpimath/src/test/java/org/wpilib/math/system/DiscretizationTest.java b/wpimath/src/test/java/org/wpilib/math/system/DiscretizationTest.java index 696a549c7e..588bee4b7c 100644 --- a/wpimath/src/test/java/org/wpilib/math/system/DiscretizationTest.java +++ b/wpimath/src/test/java/org/wpilib/math/system/DiscretizationTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.math.system; +package org.wpilib.math.system; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.numbers.N2; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.numbers.N2; import org.junit.jupiter.api.Test; class DiscretizationTest { diff --git a/wpimath/src/test/java/org/wpilib/math/system/LinearSystemIDTest.java b/wpimath/src/test/java/org/wpilib/math/system/LinearSystemIDTest.java index 21ab6acf42..d5518fa779 100644 --- a/wpimath/src/test/java/org/wpilib/math/system/LinearSystemIDTest.java +++ b/wpimath/src/test/java/org/wpilib/math/system/LinearSystemIDTest.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.math.system; +package org.wpilib.math.system; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.system.plant.DCMotor; -import edu.wpi.first.math.system.plant.LinearSystemId; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.system.plant.DCMotor; +import org.wpilib.math.system.plant.LinearSystemId; import org.junit.jupiter.api.Test; class LinearSystemIDTest { diff --git a/wpimath/src/test/java/org/wpilib/math/system/NumericalIntegrationTest.java b/wpimath/src/test/java/org/wpilib/math/system/NumericalIntegrationTest.java index db7cf5c6d1..d0ffa4468e 100644 --- a/wpimath/src/test/java/org/wpilib/math/system/NumericalIntegrationTest.java +++ b/wpimath/src/test/java/org/wpilib/math/system/NumericalIntegrationTest.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.system; +package org.wpilib.math.system; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Matrix; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.VecBuilder; -import edu.wpi.first.math.numbers.N1; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.linalg.Matrix; +import org.wpilib.math.util.Nat; +import org.wpilib.math.linalg.VecBuilder; +import org.wpilib.math.numbers.N1; import org.junit.jupiter.api.Test; class NumericalIntegrationTest { diff --git a/wpimath/src/test/java/org/wpilib/math/system/plant/proto/DCMotorProtoTest.java b/wpimath/src/test/java/org/wpilib/math/system/plant/proto/DCMotorProtoTest.java index 885ed27eb2..9a016bc89d 100644 --- a/wpimath/src/test/java/org/wpilib/math/system/plant/proto/DCMotorProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/system/plant/proto/DCMotorProtoTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.system.plant.proto; +package org.wpilib.math.system.plant.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.proto.Plant.ProtobufDCMotor; -import edu.wpi.first.math.system.plant.DCMotor; +import org.wpilib.math.proto.Plant.ProtobufDCMotor; +import org.wpilib.math.system.plant.DCMotor; import org.junit.jupiter.api.Test; class DCMotorProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/system/plant/struct/DCMotorStructTest.java b/wpimath/src/test/java/org/wpilib/math/system/plant/struct/DCMotorStructTest.java index 74d47bd06c..d32cd5dfd0 100644 --- a/wpimath/src/test/java/org/wpilib/math/system/plant/struct/DCMotorStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/system/plant/struct/DCMotorStructTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.system.plant.struct; +package org.wpilib.math.system.plant.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.system.plant.DCMotor; +import org.wpilib.math.system.plant.DCMotor; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/system/proto/LinearSystemProtoTest.java b/wpimath/src/test/java/org/wpilib/math/system/proto/LinearSystemProtoTest.java index 3352f3c0d9..b0ed3d51b6 100644 --- a/wpimath/src/test/java/org/wpilib/math/system/proto/LinearSystemProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/system/proto/LinearSystemProtoTest.java @@ -2,18 +2,18 @@ // 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 edu.wpi.first.math.system.proto; +package org.wpilib.math.system.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.numbers.N3; -import edu.wpi.first.math.numbers.N4; -import edu.wpi.first.math.proto.System.ProtobufLinearSystem; -import edu.wpi.first.math.system.LinearSystem; -import edu.wpi.first.wpilibj.ProtoTestBase; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.util.Nat; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.numbers.N3; +import org.wpilib.math.numbers.N4; +import org.wpilib.math.proto.System.ProtobufLinearSystem; +import org.wpilib.math.system.LinearSystem; +import org.wpilib.ProtoTestBase; @SuppressWarnings("PMD.TestClassWithoutTestCases") class LinearSystemProtoTest extends ProtoTestBase, ProtobufLinearSystem> { diff --git a/wpimath/src/test/java/org/wpilib/math/system/struct/LinearSystemStructTest.java b/wpimath/src/test/java/org/wpilib/math/system/struct/LinearSystemStructTest.java index 4dc56dabc9..9c3292ff33 100644 --- a/wpimath/src/test/java/org/wpilib/math/system/struct/LinearSystemStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/system/struct/LinearSystemStructTest.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.math.system.struct; +package org.wpilib.math.system.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.MatBuilder; -import edu.wpi.first.math.Nat; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.math.numbers.N3; -import edu.wpi.first.math.numbers.N4; -import edu.wpi.first.math.system.LinearSystem; -import edu.wpi.first.wpilibj.StructTestBase; +import org.wpilib.math.linalg.MatBuilder; +import org.wpilib.math.util.Nat; +import org.wpilib.math.numbers.N2; +import org.wpilib.math.numbers.N3; +import org.wpilib.math.numbers.N4; +import org.wpilib.math.system.LinearSystem; +import org.wpilib.StructTestBase; @SuppressWarnings("PMD.TestClassWithoutTestCases") class LinearSystemStructTest extends StructTestBase> { diff --git a/wpimath/src/test/java/org/wpilib/math/trajectory/CentripetalAccelerationConstraintTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/CentripetalAccelerationConstraintTest.java index 2232d4ff55..1bdc8e8ffd 100644 --- a/wpimath/src/test/java/org/wpilib/math/trajectory/CentripetalAccelerationConstraintTest.java +++ b/wpimath/src/test/java/org/wpilib/math/trajectory/CentripetalAccelerationConstraintTest.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.trajectory; +package org.wpilib.math.trajectory; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.trajectory.constraint.CentripetalAccelerationConstraint; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.trajectory.constraint.CentripetalAccelerationConstraint; +import org.wpilib.math.util.Units; import java.util.Collections; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/trajectory/DifferentialDriveKinematicsConstraintTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/DifferentialDriveKinematicsConstraintTest.java index 54bed80b9f..32ab16b30e 100644 --- a/wpimath/src/test/java/org/wpilib/math/trajectory/DifferentialDriveKinematicsConstraintTest.java +++ b/wpimath/src/test/java/org/wpilib/math/trajectory/DifferentialDriveKinematicsConstraintTest.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.trajectory; +package org.wpilib.math.trajectory; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.math.kinematics.DifferentialDriveKinematics; -import edu.wpi.first.math.trajectory.constraint.DifferentialDriveKinematicsConstraint; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.kinematics.ChassisSpeeds; +import org.wpilib.math.kinematics.DifferentialDriveKinematics; +import org.wpilib.math.trajectory.constraint.DifferentialDriveKinematicsConstraint; +import org.wpilib.math.util.Units; import java.util.Collections; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/trajectory/DifferentialDriveVoltageConstraintTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/DifferentialDriveVoltageConstraintTest.java index 3e1b443f86..939a4d30ff 100644 --- a/wpimath/src/test/java/org/wpilib/math/trajectory/DifferentialDriveVoltageConstraintTest.java +++ b/wpimath/src/test/java/org/wpilib/math/trajectory/DifferentialDriveVoltageConstraintTest.java @@ -2,18 +2,18 @@ // 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 edu.wpi.first.math.trajectory; +package org.wpilib.math.trajectory; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.controller.SimpleMotorFeedforward; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.kinematics.ChassisSpeeds; -import edu.wpi.first.math.kinematics.DifferentialDriveKinematics; -import edu.wpi.first.math.trajectory.constraint.DifferentialDriveVoltageConstraint; +import org.wpilib.math.controller.SimpleMotorFeedforward; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.kinematics.ChassisSpeeds; +import org.wpilib.math.kinematics.DifferentialDriveKinematics; +import org.wpilib.math.trajectory.constraint.DifferentialDriveVoltageConstraint; import java.util.ArrayList; import java.util.Collections; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/trajectory/EllipticalRegionConstraintTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/EllipticalRegionConstraintTest.java index 6ea18e540d..130ff1e1af 100644 --- a/wpimath/src/test/java/org/wpilib/math/trajectory/EllipticalRegionConstraintTest.java +++ b/wpimath/src/test/java/org/wpilib/math/trajectory/EllipticalRegionConstraintTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.math.trajectory; +package org.wpilib.math.trajectory; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.geometry.Ellipse2d; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.trajectory.constraint.EllipticalRegionConstraint; -import edu.wpi.first.math.trajectory.constraint.MaxVelocityConstraint; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.geometry.Ellipse2d; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.trajectory.constraint.EllipticalRegionConstraint; +import org.wpilib.math.trajectory.constraint.MaxVelocityConstraint; +import org.wpilib.math.util.Units; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/trajectory/ExponentialProfileTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/ExponentialProfileTest.java index a71bfefe43..9727ca00d0 100644 --- a/wpimath/src/test/java/org/wpilib/math/trajectory/ExponentialProfileTest.java +++ b/wpimath/src/test/java/org/wpilib/math/trajectory/ExponentialProfileTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.math.trajectory; +package org.wpilib.math.trajectory; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.controller.SimpleMotorFeedforward; +import org.wpilib.math.controller.SimpleMotorFeedforward; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/trajectory/RectangularRegionConstraintTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/RectangularRegionConstraintTest.java index 75f9300601..fd8616d4b2 100644 --- a/wpimath/src/test/java/org/wpilib/math/trajectory/RectangularRegionConstraintTest.java +++ b/wpimath/src/test/java/org/wpilib/math/trajectory/RectangularRegionConstraintTest.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.trajectory; +package org.wpilib.math.trajectory; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.geometry.Rectangle2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.trajectory.constraint.MaxVelocityConstraint; -import edu.wpi.first.math.trajectory.constraint.RectangularRegionConstraint; -import edu.wpi.first.math.util.Units; +import org.wpilib.math.geometry.Rectangle2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.trajectory.constraint.MaxVelocityConstraint; +import org.wpilib.math.trajectory.constraint.RectangularRegionConstraint; +import org.wpilib.math.util.Units; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/trajectory/TrajectoryConcatenateTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/TrajectoryConcatenateTest.java index b1e07c9b38..255447c23a 100644 --- a/wpimath/src/test/java/org/wpilib/math/trajectory/TrajectoryConcatenateTest.java +++ b/wpimath/src/test/java/org/wpilib/math/trajectory/TrajectoryConcatenateTest.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.math.trajectory; +package org.wpilib.math.trajectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/trajectory/TrajectoryGeneratorTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/TrajectoryGeneratorTest.java index 0e9c6d8647..060ab0e147 100644 --- a/wpimath/src/test/java/org/wpilib/math/trajectory/TrajectoryGeneratorTest.java +++ b/wpimath/src/test/java/org/wpilib/math/trajectory/TrajectoryGeneratorTest.java @@ -2,19 +2,19 @@ // 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 edu.wpi.first.math.trajectory; +package org.wpilib.math.trajectory; -import static edu.wpi.first.math.util.Units.feetToMeters; +import static org.wpilib.math.util.Units.feetToMeters; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Transform2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.trajectory.constraint.TrajectoryConstraint; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Transform2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.trajectory.constraint.TrajectoryConstraint; import java.util.ArrayList; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/trajectory/TrajectoryTransformTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/TrajectoryTransformTest.java index 08ca37198d..4f2b405eca 100644 --- a/wpimath/src/test/java/org/wpilib/math/trajectory/TrajectoryTransformTest.java +++ b/wpimath/src/test/java/org/wpilib/math/trajectory/TrajectoryTransformTest.java @@ -2,14 +2,14 @@ // 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 edu.wpi.first.math.trajectory; +package org.wpilib.math.trajectory; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Transform2d; -import edu.wpi.first.math.geometry.Translation2d; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Transform2d; +import org.wpilib.math.geometry.Translation2d; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/trajectory/TrapezoidProfileTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/TrapezoidProfileTest.java index 82661295c1..62b603a5d5 100644 --- a/wpimath/src/test/java/org/wpilib/math/trajectory/TrapezoidProfileTest.java +++ b/wpimath/src/test/java/org/wpilib/math/trajectory/TrapezoidProfileTest.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 edu.wpi.first.math.trajectory; +package org.wpilib.math.trajectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/wpimath/src/test/java/org/wpilib/math/trajectory/proto/TrajectoryProtoTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/proto/TrajectoryProtoTest.java index 0477bb7dcf..4fbb3ca4e1 100644 --- a/wpimath/src/test/java/org/wpilib/math/trajectory/proto/TrajectoryProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/trajectory/proto/TrajectoryProtoTest.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.trajectory.proto; +package org.wpilib.math.trajectory.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.proto.Trajectory.ProtobufTrajectory; -import edu.wpi.first.math.trajectory.Trajectory; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.proto.Trajectory.ProtobufTrajectory; +import org.wpilib.math.trajectory.Trajectory; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/trajectory/proto/TrajectoryStateProtoTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/proto/TrajectoryStateProtoTest.java index b5e6402183..67d4af67d5 100644 --- a/wpimath/src/test/java/org/wpilib/math/trajectory/proto/TrajectoryStateProtoTest.java +++ b/wpimath/src/test/java/org/wpilib/math/trajectory/proto/TrajectoryStateProtoTest.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.trajectory.proto; +package org.wpilib.math.trajectory.proto; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.proto.Trajectory.ProtobufTrajectoryState; -import edu.wpi.first.math.trajectory.Trajectory; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.proto.Trajectory.ProtobufTrajectoryState; +import org.wpilib.math.trajectory.Trajectory; import org.junit.jupiter.api.Test; class TrajectoryStateProtoTest { diff --git a/wpimath/src/test/java/org/wpilib/math/trajectory/struct/ExponentialProfileStateStructTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/struct/ExponentialProfileStateStructTest.java index 18a13bfffc..e318dfcb71 100644 --- a/wpimath/src/test/java/org/wpilib/math/trajectory/struct/ExponentialProfileStateStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/trajectory/struct/ExponentialProfileStateStructTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.trajectory.struct; +package org.wpilib.math.trajectory.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.trajectory.ExponentialProfile; +import org.wpilib.math.trajectory.ExponentialProfile; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/trajectory/struct/TrapezoidProfileStateStructTest.java b/wpimath/src/test/java/org/wpilib/math/trajectory/struct/TrapezoidProfileStateStructTest.java index 84497c95e7..c0a3f8d942 100644 --- a/wpimath/src/test/java/org/wpilib/math/trajectory/struct/TrapezoidProfileStateStructTest.java +++ b/wpimath/src/test/java/org/wpilib/math/trajectory/struct/TrapezoidProfileStateStructTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.trajectory.struct; +package org.wpilib.math.trajectory.struct; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.trajectory.TrapezoidProfile; +import org.wpilib.math.trajectory.TrapezoidProfile; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/util/ComputerVisionUtilTest.java b/wpimath/src/test/java/org/wpilib/math/util/ComputerVisionUtilTest.java index 3c281e559a..0cb3347cae 100644 --- a/wpimath/src/test/java/org/wpilib/math/util/ComputerVisionUtilTest.java +++ b/wpimath/src/test/java/org/wpilib/math/util/ComputerVisionUtilTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.math; +package org.wpilib.math.util; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.math.geometry.Pose3d; -import edu.wpi.first.math.geometry.Rotation3d; -import edu.wpi.first.math.geometry.Transform3d; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.math.util.Units; -import edu.wpi.first.wpilibj.UtilityClassTest; +import org.wpilib.math.geometry.Pose3d; +import org.wpilib.math.geometry.Rotation3d; +import org.wpilib.math.geometry.Transform3d; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.math.util.Units; +import org.wpilib.UtilityClassTest; import org.junit.jupiter.api.Test; class ComputerVisionUtilTest extends UtilityClassTest { diff --git a/wpimath/src/test/java/org/wpilib/math/util/MathUtilTest.java b/wpimath/src/test/java/org/wpilib/math/util/MathUtilTest.java index 83ff5b39fe..039effa5c4 100644 --- a/wpimath/src/test/java/org/wpilib/math/util/MathUtilTest.java +++ b/wpimath/src/test/java/org/wpilib/math/util/MathUtilTest.java @@ -2,15 +2,15 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math; +package org.wpilib.math.util; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.geometry.Translation3d; -import edu.wpi.first.wpilibj.UtilityClassTest; +import org.wpilib.math.geometry.Translation2d; +import org.wpilib.math.geometry.Translation3d; +import org.wpilib.UtilityClassTest; import org.junit.jupiter.api.Test; class MathUtilTest extends UtilityClassTest { diff --git a/wpimath/src/test/java/org/wpilib/math/util/StateSpaceUtilTest.java b/wpimath/src/test/java/org/wpilib/math/util/StateSpaceUtilTest.java index 1715d93dc6..a9d0b8efb9 100644 --- a/wpimath/src/test/java/org/wpilib/math/util/StateSpaceUtilTest.java +++ b/wpimath/src/test/java/org/wpilib/math/util/StateSpaceUtilTest.java @@ -2,17 +2,17 @@ // 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 edu.wpi.first.math; +package org.wpilib.math.util; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.numbers.N1; -import edu.wpi.first.math.numbers.N2; -import edu.wpi.first.wpilibj.UtilityClassTest; +import org.wpilib.math.geometry.Pose2d; +import org.wpilib.math.geometry.Rotation2d; +import org.wpilib.math.numbers.N1; +import org.wpilib.math.numbers.N2; +import org.wpilib.UtilityClassTest; import java.util.ArrayList; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/wpimath/src/test/java/org/wpilib/math/util/UnitsTest.java b/wpimath/src/test/java/org/wpilib/math/util/UnitsTest.java index bade348768..b24cb9acc3 100644 --- a/wpimath/src/test/java/org/wpilib/math/util/UnitsTest.java +++ b/wpimath/src/test/java/org/wpilib/math/util/UnitsTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.math.util; +package org.wpilib.math.util; import static org.junit.jupiter.api.Assertions.assertEquals; -import edu.wpi.first.wpilibj.UtilityClassTest; +import org.wpilib.UtilityClassTest; import org.junit.jupiter.api.Test; class UnitsTest extends UtilityClassTest { diff --git a/wpinet/src/dev/java/org/wpilib/net/DevMain.java b/wpinet/src/dev/java/org/wpilib/net/DevMain.java index 5ced60a314..82617988b3 100644 --- a/wpinet/src/dev/java/org/wpilib/net/DevMain.java +++ b/wpinet/src/dev/java/org/wpilib/net/DevMain.java @@ -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. -package edu.wpi.first.net; +package org.wpilib.net; -import edu.wpi.first.util.CombinedRuntimeLoader; +import org.wpilib.util.runtime.CombinedRuntimeLoader; public final class DevMain { /** Main entry point. */ diff --git a/wpinet/src/main/java/org/wpilib/net/MulticastServiceAnnouncer.java b/wpinet/src/main/java/org/wpilib/net/MulticastServiceAnnouncer.java index 27c55b8c95..cabf790ec5 100644 --- a/wpinet/src/main/java/org/wpilib/net/MulticastServiceAnnouncer.java +++ b/wpinet/src/main/java/org/wpilib/net/MulticastServiceAnnouncer.java @@ -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. -package edu.wpi.first.net; +package org.wpilib.net; -import edu.wpi.first.util.WPICleaner; +import org.wpilib.util.cleanup.WPICleaner; import java.lang.ref.Cleaner.Cleanable; import java.util.Map; diff --git a/wpinet/src/main/java/org/wpilib/net/MulticastServiceResolver.java b/wpinet/src/main/java/org/wpilib/net/MulticastServiceResolver.java index fd7fd49111..2f042122bc 100644 --- a/wpinet/src/main/java/org/wpilib/net/MulticastServiceResolver.java +++ b/wpinet/src/main/java/org/wpilib/net/MulticastServiceResolver.java @@ -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. -package edu.wpi.first.net; +package org.wpilib.net; -import edu.wpi.first.util.WPICleaner; +import org.wpilib.util.cleanup.WPICleaner; import java.lang.ref.Cleaner.Cleanable; /** Class to resolve a service over mDNS. */ diff --git a/wpinet/src/main/java/org/wpilib/net/PortForwarder.java b/wpinet/src/main/java/org/wpilib/net/PortForwarder.java index 904e4f03f2..a803e55ff2 100644 --- a/wpinet/src/main/java/org/wpilib/net/PortForwarder.java +++ b/wpinet/src/main/java/org/wpilib/net/PortForwarder.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 edu.wpi.first.net; +package org.wpilib.net; /** * Forward ports to another host. This is primarily useful for accessing Ethernet-connected devices diff --git a/wpinet/src/main/java/org/wpilib/net/ServiceData.java b/wpinet/src/main/java/org/wpilib/net/ServiceData.java index 9dd40ce9d5..fb5e585d9d 100644 --- a/wpinet/src/main/java/org/wpilib/net/ServiceData.java +++ b/wpinet/src/main/java/org/wpilib/net/ServiceData.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 edu.wpi.first.net; +package org.wpilib.net; import java.util.HashMap; import java.util.Map; diff --git a/wpinet/src/main/java/org/wpilib/net/WPINetJNI.java b/wpinet/src/main/java/org/wpilib/net/WPINetJNI.java index a4bfadf2b3..332900883c 100644 --- a/wpinet/src/main/java/org/wpilib/net/WPINetJNI.java +++ b/wpinet/src/main/java/org/wpilib/net/WPINetJNI.java @@ -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. -package edu.wpi.first.net; +package org.wpilib.net; -import edu.wpi.first.util.RuntimeLoader; +import org.wpilib.util.runtime.RuntimeLoader; import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/wpinet/src/main/java/org/wpilib/net/WebServer.java b/wpinet/src/main/java/org/wpilib/net/WebServer.java index e7a71a5e79..535be8279d 100644 --- a/wpinet/src/main/java/org/wpilib/net/WebServer.java +++ b/wpinet/src/main/java/org/wpilib/net/WebServer.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 edu.wpi.first.net; +package org.wpilib.net; /** A web server using the HTTP protocol. */ public final class WebServer { diff --git a/wpinet/src/main/native/cpp/jni/WPINetJNI.cpp b/wpinet/src/main/native/cpp/jni/WPINetJNI.cpp index 04efdab204..fb6351bee6 100644 --- a/wpinet/src/main/native/cpp/jni/WPINetJNI.cpp +++ b/wpinet/src/main/native/cpp/jni/WPINetJNI.cpp @@ -12,7 +12,7 @@ #include #include "../MulticastHandleManager.h" -#include "edu_wpi_first_net_WPINetJNI.h" +#include "org_wpilib_net_WPINetJNI.h" #include "wpinet/MulticastServiceAnnouncer.h" #include "wpinet/MulticastServiceResolver.h" #include "wpinet/PortForwarder.h" @@ -31,7 +31,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) { return JNI_ERR; } - serviceDataCls = JClass{env, "edu/wpi/first/net/ServiceData"}; + serviceDataCls = JClass{env, "org/wpilib/net/ServiceData"}; if (!serviceDataCls) { return JNI_ERR; } @@ -56,12 +56,12 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM* vm, void* reserved) { } /* - * Class: edu_wpi_first_net_WPINetJNI + * Class: org_wpilib_net_WPINetJNI * Method: addPortForwarder * Signature: (ILjava/lang/String;I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_net_WPINetJNI_addPortForwarder +Java_org_wpilib_net_WPINetJNI_addPortForwarder (JNIEnv* env, jclass, jint port, jstring remoteHost, jint remotePort) { wpi::PortForwarder::GetInstance().Add(static_cast(port), @@ -70,24 +70,24 @@ Java_edu_wpi_first_net_WPINetJNI_addPortForwarder } /* - * Class: edu_wpi_first_net_WPINetJNI + * Class: org_wpilib_net_WPINetJNI * Method: removePortForwarder * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_net_WPINetJNI_removePortForwarder +Java_org_wpilib_net_WPINetJNI_removePortForwarder (JNIEnv* env, jclass, jint port) { wpi::PortForwarder::GetInstance().Remove(port); } /* - * Class: edu_wpi_first_net_WPINetJNI + * Class: org_wpilib_net_WPINetJNI * Method: startWebServer * Signature: (ILjava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_net_WPINetJNI_startWebServer +Java_org_wpilib_net_WPINetJNI_startWebServer (JNIEnv* env, jclass, jint port, jstring path) { wpi::WebServer::GetInstance().Start(static_cast(port), @@ -95,24 +95,24 @@ Java_edu_wpi_first_net_WPINetJNI_startWebServer } /* - * Class: edu_wpi_first_net_WPINetJNI + * Class: org_wpilib_net_WPINetJNI * Method: stopWebServer * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_net_WPINetJNI_stopWebServer +Java_org_wpilib_net_WPINetJNI_stopWebServer (JNIEnv* env, jclass, jint port) { wpi::WebServer::GetInstance().Stop(port); } /* - * Class: edu_wpi_first_net_WPINetJNI + * Class: org_wpilib_net_WPINetJNI * Method: createMulticastServiceAnnouncer * Signature: (Ljava/lang/String;Ljava/lang/String;I[Ljava/lang/Object;[Ljava/lang/Object;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_net_WPINetJNI_createMulticastServiceAnnouncer +Java_org_wpilib_net_WPINetJNI_createMulticastServiceAnnouncer (JNIEnv* env, jclass, jstring serviceName, jstring serviceType, jint port, jobjectArray keys, jobjectArray values) { @@ -150,12 +150,12 @@ Java_edu_wpi_first_net_WPINetJNI_createMulticastServiceAnnouncer } /* - * Class: edu_wpi_first_net_WPINetJNI + * Class: org_wpilib_net_WPINetJNI * Method: freeMulticastServiceAnnouncer * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_net_WPINetJNI_freeMulticastServiceAnnouncer +Java_org_wpilib_net_WPINetJNI_freeMulticastServiceAnnouncer (JNIEnv* env, jclass, jint handle) { auto& manager = wpi::GetMulticastManager(); @@ -165,12 +165,12 @@ Java_edu_wpi_first_net_WPINetJNI_freeMulticastServiceAnnouncer } /* - * Class: edu_wpi_first_net_WPINetJNI + * Class: org_wpilib_net_WPINetJNI * Method: startMulticastServiceAnnouncer * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_net_WPINetJNI_startMulticastServiceAnnouncer +Java_org_wpilib_net_WPINetJNI_startMulticastServiceAnnouncer (JNIEnv* env, jclass, jint handle) { auto& manager = wpi::GetMulticastManager(); @@ -180,12 +180,12 @@ Java_edu_wpi_first_net_WPINetJNI_startMulticastServiceAnnouncer } /* - * Class: edu_wpi_first_net_WPINetJNI + * Class: org_wpilib_net_WPINetJNI * Method: stopMulticastServiceAnnouncer * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_net_WPINetJNI_stopMulticastServiceAnnouncer +Java_org_wpilib_net_WPINetJNI_stopMulticastServiceAnnouncer (JNIEnv* env, jclass, jint handle) { auto& manager = wpi::GetMulticastManager(); @@ -195,12 +195,12 @@ Java_edu_wpi_first_net_WPINetJNI_stopMulticastServiceAnnouncer } /* - * Class: edu_wpi_first_net_WPINetJNI + * Class: org_wpilib_net_WPINetJNI * Method: getMulticastServiceAnnouncerHasImplementation * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_net_WPINetJNI_getMulticastServiceAnnouncerHasImplementation +Java_org_wpilib_net_WPINetJNI_getMulticastServiceAnnouncerHasImplementation (JNIEnv* env, jclass, jint handle) { auto& manager = wpi::GetMulticastManager(); @@ -210,12 +210,12 @@ Java_edu_wpi_first_net_WPINetJNI_getMulticastServiceAnnouncerHasImplementation } /* - * Class: edu_wpi_first_net_WPINetJNI + * Class: org_wpilib_net_WPINetJNI * Method: createMulticastServiceResolver * Signature: (Ljava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_net_WPINetJNI_createMulticastServiceResolver +Java_org_wpilib_net_WPINetJNI_createMulticastServiceResolver (JNIEnv* env, jclass, jstring serviceType) { auto& manager = wpi::GetMulticastManager(); @@ -233,12 +233,12 @@ Java_edu_wpi_first_net_WPINetJNI_createMulticastServiceResolver } /* - * Class: edu_wpi_first_net_WPINetJNI + * Class: org_wpilib_net_WPINetJNI * Method: freeMulticastServiceResolver * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_net_WPINetJNI_freeMulticastServiceResolver +Java_org_wpilib_net_WPINetJNI_freeMulticastServiceResolver (JNIEnv* env, jclass, jint handle) { auto& manager = wpi::GetMulticastManager(); @@ -248,12 +248,12 @@ Java_edu_wpi_first_net_WPINetJNI_freeMulticastServiceResolver } /* - * Class: edu_wpi_first_net_WPINetJNI + * Class: org_wpilib_net_WPINetJNI * Method: startMulticastServiceResolver * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_net_WPINetJNI_startMulticastServiceResolver +Java_org_wpilib_net_WPINetJNI_startMulticastServiceResolver (JNIEnv* env, jclass, jint handle) { auto& manager = wpi::GetMulticastManager(); @@ -263,12 +263,12 @@ Java_edu_wpi_first_net_WPINetJNI_startMulticastServiceResolver } /* - * Class: edu_wpi_first_net_WPINetJNI + * Class: org_wpilib_net_WPINetJNI * Method: stopMulticastServiceResolver * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_net_WPINetJNI_stopMulticastServiceResolver +Java_org_wpilib_net_WPINetJNI_stopMulticastServiceResolver (JNIEnv* env, jclass, jint handle) { auto& manager = wpi::GetMulticastManager(); @@ -278,12 +278,12 @@ Java_edu_wpi_first_net_WPINetJNI_stopMulticastServiceResolver } /* - * Class: edu_wpi_first_net_WPINetJNI + * Class: org_wpilib_net_WPINetJNI * Method: getMulticastServiceResolverHasImplementation * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_net_WPINetJNI_getMulticastServiceResolverHasImplementation +Java_org_wpilib_net_WPINetJNI_getMulticastServiceResolverHasImplementation (JNIEnv* env, jclass, jint handle) { auto& manager = wpi::GetMulticastManager(); @@ -293,12 +293,12 @@ Java_edu_wpi_first_net_WPINetJNI_getMulticastServiceResolverHasImplementation } /* - * Class: edu_wpi_first_net_WPINetJNI + * Class: org_wpilib_net_WPINetJNI * Method: getMulticastServiceResolverEventHandle * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_net_WPINetJNI_getMulticastServiceResolverEventHandle +Java_org_wpilib_net_WPINetJNI_getMulticastServiceResolverEventHandle (JNIEnv* env, jclass, jint handle) { auto& manager = wpi::GetMulticastManager(); @@ -308,12 +308,12 @@ Java_edu_wpi_first_net_WPINetJNI_getMulticastServiceResolverEventHandle } /* - * Class: edu_wpi_first_net_WPINetJNI + * Class: org_wpilib_net_WPINetJNI * Method: getMulticastServiceResolverData * Signature: (I)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_first_net_WPINetJNI_getMulticastServiceResolverData +Java_org_wpilib_net_WPINetJNI_getMulticastServiceResolverData (JNIEnv* env, jclass, jint handle) { static jmethodID constructor = diff --git a/wpinet/src/test/java/org/wpilib/net/WPINetJNITest.java b/wpinet/src/test/java/org/wpilib/net/WPINetJNITest.java index dfa6d4d952..7e086a51a6 100644 --- a/wpinet/src/test/java/org/wpilib/net/WPINetJNITest.java +++ b/wpinet/src/test/java/org/wpilib/net/WPINetJNITest.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 edu.wpi.first.net; +package org.wpilib.net; import java.io.IOException; import org.junit.jupiter.api.Test; diff --git a/wpiunits/src/dev/java/org/wpilib/units/DevMain.java b/wpiunits/src/dev/java/org/wpilib/units/DevMain.java index 0d4dcdd2a4..214ad33362 100644 --- a/wpiunits/src/dev/java/org/wpilib/units/DevMain.java +++ b/wpiunits/src/dev/java/org/wpilib/units/DevMain.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 edu.wpi.first.units; +package org.wpilib.units; public final class DevMain { /** Main entry point. */ diff --git a/wpiunits/src/generate/main/java/Measure-implementation.java.jinja b/wpiunits/src/generate/main/java/Measure-implementation.java.jinja index 3a303f832e..c63cb75b24 100644 --- a/wpiunits/src/generate/main/java/Measure-implementation.java.jinja +++ b/wpiunits/src/generate/main/java/Measure-implementation.java.jinja @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record {{ helpers['type_decl'](name) }}(double magnitude, double baseUnitMagnitude, {{ helpers['mtou'](name) }} unit) implements Measure<{{ helpers['mtou'](name) }}> { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Acceleration.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Acceleration.java index 17badc4684..050cd4c2b9 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Acceleration.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Acceleration.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record Acceleration(double magnitude, double baseUnitMagnitude, AccelerationUnit unit) implements Measure> { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Angle.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Angle.java index 467904ae1a..22fd5580e8 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Angle.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Angle.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record Angle(double magnitude, double baseUnitMagnitude, AngleUnit unit) implements Measure { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/AngularAcceleration.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/AngularAcceleration.java index 0a9f54d1c0..514a20cbae 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/AngularAcceleration.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/AngularAcceleration.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record AngularAcceleration(double magnitude, double baseUnitMagnitude, AngularAccelerationUnit unit) implements Measure { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/AngularMomentum.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/AngularMomentum.java index ad4ddd3d11..9028709d6a 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/AngularMomentum.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/AngularMomentum.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record AngularMomentum(double magnitude, double baseUnitMagnitude, AngularMomentumUnit unit) implements Measure { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/AngularVelocity.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/AngularVelocity.java index 471c005497..930e1b3d15 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/AngularVelocity.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/AngularVelocity.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record AngularVelocity(double magnitude, double baseUnitMagnitude, AngularVelocityUnit unit) implements Measure { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Current.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Current.java index ae80809314..083ace2a30 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Current.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Current.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record Current(double magnitude, double baseUnitMagnitude, CurrentUnit unit) implements Measure { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Dimensionless.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Dimensionless.java index 8f9ca0473b..f205bb5de8 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Dimensionless.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Dimensionless.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record Dimensionless(double magnitude, double baseUnitMagnitude, DimensionlessUnit unit) implements Measure { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Distance.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Distance.java index 7bb1cd1754..429f0bec38 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Distance.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Distance.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record Distance(double magnitude, double baseUnitMagnitude, DistanceUnit unit) implements Measure { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Energy.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Energy.java index 5158029b45..4b871d0ebd 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Energy.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Energy.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record Energy(double magnitude, double baseUnitMagnitude, EnergyUnit unit) implements Measure { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Force.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Force.java index e31fd0aad4..cd61dc4da5 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Force.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Force.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record Force(double magnitude, double baseUnitMagnitude, ForceUnit unit) implements Measure { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Frequency.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Frequency.java index 351e799f87..590d50694e 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Frequency.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Frequency.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record Frequency(double magnitude, double baseUnitMagnitude, FrequencyUnit unit) implements Measure { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/LinearAcceleration.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/LinearAcceleration.java index 62725432a5..03d9529672 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/LinearAcceleration.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/LinearAcceleration.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record LinearAcceleration(double magnitude, double baseUnitMagnitude, LinearAccelerationUnit unit) implements Measure { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/LinearMomentum.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/LinearMomentum.java index c254d2f419..6d54075830 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/LinearMomentum.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/LinearMomentum.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record LinearMomentum(double magnitude, double baseUnitMagnitude, LinearMomentumUnit unit) implements Measure { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/LinearVelocity.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/LinearVelocity.java index 1e92346535..801b8e64bc 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/LinearVelocity.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/LinearVelocity.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record LinearVelocity(double magnitude, double baseUnitMagnitude, LinearVelocityUnit unit) implements Measure { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Mass.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Mass.java index a3df3d4dc4..200237f6b4 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Mass.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Mass.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record Mass(double magnitude, double baseUnitMagnitude, MassUnit unit) implements Measure { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/MomentOfInertia.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/MomentOfInertia.java index 5f4498c19a..ffa7dd9f7a 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/MomentOfInertia.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/MomentOfInertia.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record MomentOfInertia(double magnitude, double baseUnitMagnitude, MomentOfInertiaUnit unit) implements Measure { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Mult.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Mult.java index a535d0438c..7220b2b21a 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Mult.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Mult.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record Mult(double magnitude, double baseUnitMagnitude, MultUnit unit) implements Measure> { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Per.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Per.java index c9d1607356..43ccbd9745 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Per.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Per.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record Per(double magnitude, double baseUnitMagnitude, PerUnit unit) implements Measure> { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Power.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Power.java index fc9fe2ef88..dfe7570388 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Power.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Power.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record Power(double magnitude, double baseUnitMagnitude, PowerUnit unit) implements Measure { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Resistance.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Resistance.java index bba5902571..1af3106538 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Resistance.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Resistance.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record Resistance(double magnitude, double baseUnitMagnitude, ResistanceUnit unit) implements Measure { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Temperature.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Temperature.java index 05a5f62879..59ef059c2d 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Temperature.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Temperature.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record Temperature(double magnitude, double baseUnitMagnitude, TemperatureUnit unit) implements Measure { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Time.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Time.java index 29afd979df..f2eb7bb039 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Time.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Time.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record Time(double magnitude, double baseUnitMagnitude, TimeUnit unit) implements Measure { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Torque.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Torque.java index bfa6873c6e..9f921eff6f 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Torque.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Torque.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record Torque(double magnitude, double baseUnitMagnitude, TorqueUnit unit) implements Measure { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Velocity.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Velocity.java index a8df85d3b7..b84ec4b6d9 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Velocity.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Velocity.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record Velocity(double magnitude, double baseUnitMagnitude, VelocityUnit unit) implements Measure> { diff --git a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Voltage.java b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Voltage.java index 94aa0a6460..c827944355 100644 --- a/wpiunits/src/generated/main/java/org/wpilib/units/measure/Voltage.java +++ b/wpiunits/src/generated/main/java/org/wpilib/units/measure/Voltage.java @@ -4,10 +4,10 @@ // THIS FILE WAS AUTO-GENERATED BY ./wpiunits/generate_units.py. DO NOT MODIFY -package edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.*; -import edu.wpi.first.units.*; +import static org.wpilib.units.Units.*; +import org.wpilib.units.*; @SuppressWarnings({"unchecked", "cast", "checkstyle"}) public record Voltage(double magnitude, double baseUnitMagnitude, VoltageUnit unit) implements Measure { diff --git a/wpiunits/src/main/java/org/wpilib/units/AccelerationUnit.java b/wpiunits/src/main/java/org/wpilib/units/AccelerationUnit.java index dfc953b377..5315af8160 100644 --- a/wpiunits/src/main/java/org/wpilib/units/AccelerationUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/AccelerationUnit.java @@ -2,18 +2,18 @@ // 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 edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.Acceleration; +import org.wpilib.units.measure.Acceleration; /** * A generic unit of acceleration. * *

NOTE: This type is not compatible with unit-specific accelerations like - * {@link edu.wpi.first.units.measure.LinearAcceleration}. Authors of APIs that need to interact + * {@link org.wpilib.units.measure.LinearAcceleration}. Authors of APIs that need to interact * with all types should consider using a generic {@code Measure], TimeUnit>, TimeUnit>}. Bounded wildcards are necessary in order to - * interoperate with any subclass of the {@link edu.wpi.first.units.measure.Per} measurement + * interoperate with any subclass of the {@link org.wpilib.units.measure.Per} measurement * type. * * @param the unit of the accelerating quantity diff --git a/wpiunits/src/main/java/org/wpilib/units/AngleUnit.java b/wpiunits/src/main/java/org/wpilib/units/AngleUnit.java index e00f4ce7fc..bbe62575c4 100644 --- a/wpiunits/src/main/java/org/wpilib/units/AngleUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/AngleUnit.java @@ -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. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.Angle; +import org.wpilib.units.measure.Angle; /** * Unit of angular dimension. diff --git a/wpiunits/src/main/java/org/wpilib/units/AngularAccelerationUnit.java b/wpiunits/src/main/java/org/wpilib/units/AngularAccelerationUnit.java index 00aae31033..2d286eb067 100644 --- a/wpiunits/src/main/java/org/wpilib/units/AngularAccelerationUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/AngularAccelerationUnit.java @@ -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. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.AngularAcceleration; +import org.wpilib.units.measure.AngularAcceleration; /** A unit of angular acceleration, such as {@link Units#RadiansPerSecondPerSecond}. */ public final class AngularAccelerationUnit extends PerUnit { diff --git a/wpiunits/src/main/java/org/wpilib/units/AngularMomentumUnit.java b/wpiunits/src/main/java/org/wpilib/units/AngularMomentumUnit.java index 77f3ec6851..43759f4ec1 100644 --- a/wpiunits/src/main/java/org/wpilib/units/AngularMomentumUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/AngularMomentumUnit.java @@ -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. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.AngularMomentum; +import org.wpilib.units.measure.AngularMomentum; /** * A unit of angular momentum, modeled as linear momentum of an object rotating some distance away diff --git a/wpiunits/src/main/java/org/wpilib/units/AngularVelocityUnit.java b/wpiunits/src/main/java/org/wpilib/units/AngularVelocityUnit.java index 6b087abc98..6912c9640b 100644 --- a/wpiunits/src/main/java/org/wpilib/units/AngularVelocityUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/AngularVelocityUnit.java @@ -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. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.AngularVelocity; +import org.wpilib.units.measure.AngularVelocity; /** A unit of angular velocity like {@link Units#RadiansPerSecond}. */ public final class AngularVelocityUnit extends PerUnit { diff --git a/wpiunits/src/main/java/org/wpilib/units/BaseUnits.java b/wpiunits/src/main/java/org/wpilib/units/BaseUnits.java index 9794087d07..65af090863 100644 --- a/wpiunits/src/main/java/org/wpilib/units/BaseUnits.java +++ b/wpiunits/src/main/java/org/wpilib/units/BaseUnits.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 edu.wpi.first.units; +package org.wpilib.units; /** The base units of measure. */ public final class BaseUnits { diff --git a/wpiunits/src/main/java/org/wpilib/units/CombinatoryUnitCache.java b/wpiunits/src/main/java/org/wpilib/units/CombinatoryUnitCache.java index 53dc51cb47..46f4300229 100644 --- a/wpiunits/src/main/java/org/wpilib/units/CombinatoryUnitCache.java +++ b/wpiunits/src/main/java/org/wpilib/units/CombinatoryUnitCache.java @@ -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. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.collections.LongToObjectHashMap; +import org.wpilib.units.collections.LongToObjectHashMap; import java.util.Objects; import java.util.function.BiFunction; diff --git a/wpiunits/src/main/java/org/wpilib/units/CurrentUnit.java b/wpiunits/src/main/java/org/wpilib/units/CurrentUnit.java index 4e51a543d7..03e2dfdb26 100644 --- a/wpiunits/src/main/java/org/wpilib/units/CurrentUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/CurrentUnit.java @@ -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. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.Current; +import org.wpilib.units.measure.Current; /** * Unit of electric current dimension. diff --git a/wpiunits/src/main/java/org/wpilib/units/DimensionlessUnit.java b/wpiunits/src/main/java/org/wpilib/units/DimensionlessUnit.java index bdf0b650c9..3b3b526b36 100644 --- a/wpiunits/src/main/java/org/wpilib/units/DimensionlessUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/DimensionlessUnit.java @@ -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. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.Dimensionless; +import org.wpilib.units.measure.Dimensionless; /** * A type of unit that corresponds to raw values and not any physical dimension, such as percentage. diff --git a/wpiunits/src/main/java/org/wpilib/units/DistanceUnit.java b/wpiunits/src/main/java/org/wpilib/units/DistanceUnit.java index 57bd7be1bf..caad0477b5 100644 --- a/wpiunits/src/main/java/org/wpilib/units/DistanceUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/DistanceUnit.java @@ -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. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.Distance; +import org.wpilib.units.measure.Distance; /** * Unit of linear dimension. diff --git a/wpiunits/src/main/java/org/wpilib/units/EnergyUnit.java b/wpiunits/src/main/java/org/wpilib/units/EnergyUnit.java index d31bc3cbbf..42d7eedff5 100644 --- a/wpiunits/src/main/java/org/wpilib/units/EnergyUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/EnergyUnit.java @@ -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. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.Energy; +import org.wpilib.units.measure.Energy; /** * Unit of energy dimension. diff --git a/wpiunits/src/main/java/org/wpilib/units/ForceUnit.java b/wpiunits/src/main/java/org/wpilib/units/ForceUnit.java index 407e0301f7..f50874ebb6 100644 --- a/wpiunits/src/main/java/org/wpilib/units/ForceUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/ForceUnit.java @@ -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. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.Force; +import org.wpilib.units.measure.Force; /** A unit of force like {@link Units#Newtons}. */ public final class ForceUnit extends MultUnit { diff --git a/wpiunits/src/main/java/org/wpilib/units/FrequencyUnit.java b/wpiunits/src/main/java/org/wpilib/units/FrequencyUnit.java index a2f44cec60..aec3e31a1c 100644 --- a/wpiunits/src/main/java/org/wpilib/units/FrequencyUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/FrequencyUnit.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.units; +package org.wpilib.units; -import static edu.wpi.first.units.Units.Value; +import static org.wpilib.units.Units.Value; -import edu.wpi.first.units.measure.Frequency; +import org.wpilib.units.measure.Frequency; -/** A unit of frequency like {@link edu.wpi.first.units.Units#Hertz}. */ +/** A unit of frequency like {@link org.wpilib.units.Units#Hertz}. */ public final class FrequencyUnit extends PerUnit { private static final CombinatoryUnitCache cache = new CombinatoryUnitCache<>(FrequencyUnit::new); diff --git a/wpiunits/src/main/java/org/wpilib/units/ImmutableMeasure.java b/wpiunits/src/main/java/org/wpilib/units/ImmutableMeasure.java index 6d16cdde66..b6cf6be32f 100644 --- a/wpiunits/src/main/java/org/wpilib/units/ImmutableMeasure.java +++ b/wpiunits/src/main/java/org/wpilib/units/ImmutableMeasure.java @@ -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. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.Dimensionless; +import org.wpilib.units.measure.Dimensionless; /** * A measure holds the magnitude and unit of some dimension, such as distance, time, or speed. An diff --git a/wpiunits/src/main/java/org/wpilib/units/LinearAccelerationUnit.java b/wpiunits/src/main/java/org/wpilib/units/LinearAccelerationUnit.java index 343024a3a1..3d5e12aa4c 100644 --- a/wpiunits/src/main/java/org/wpilib/units/LinearAccelerationUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/LinearAccelerationUnit.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.LinearAcceleration; +import org.wpilib.units.measure.LinearAcceleration; /** - * A unit of linear acceleration like {@link edu.wpi.first.units.Units#MetersPerSecondPerSecond}. + * A unit of linear acceleration like {@link org.wpilib.units.Units#MetersPerSecondPerSecond}. */ public final class LinearAccelerationUnit extends PerUnit { private static final CombinatoryUnitCache diff --git a/wpiunits/src/main/java/org/wpilib/units/LinearMomentumUnit.java b/wpiunits/src/main/java/org/wpilib/units/LinearMomentumUnit.java index c323204d01..61c208927f 100644 --- a/wpiunits/src/main/java/org/wpilib/units/LinearMomentumUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/LinearMomentumUnit.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.LinearMomentum; +import org.wpilib.units.measure.LinearMomentum; -/** A unit of linear momentum like {@link edu.wpi.first.units.Units#KilogramMetersPerSecond}. */ +/** A unit of linear momentum like {@link org.wpilib.units.Units#KilogramMetersPerSecond}. */ public final class LinearMomentumUnit extends MultUnit { private static final CombinatoryUnitCache cache = new CombinatoryUnitCache<>(LinearMomentumUnit::new); diff --git a/wpiunits/src/main/java/org/wpilib/units/LinearVelocityUnit.java b/wpiunits/src/main/java/org/wpilib/units/LinearVelocityUnit.java index 24dd61acc2..4beb1d530f 100644 --- a/wpiunits/src/main/java/org/wpilib/units/LinearVelocityUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/LinearVelocityUnit.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.LinearVelocity; +import org.wpilib.units.measure.LinearVelocity; -/** A unit of linear velocity like {@link edu.wpi.first.units.Units#MetersPerSecond}. */ +/** A unit of linear velocity like {@link org.wpilib.units.Units#MetersPerSecond}. */ public final class LinearVelocityUnit extends PerUnit { private static final CombinatoryUnitCache cache = new CombinatoryUnitCache<>(LinearVelocityUnit::new); diff --git a/wpiunits/src/main/java/org/wpilib/units/MassUnit.java b/wpiunits/src/main/java/org/wpilib/units/MassUnit.java index 630c4de5c8..9dbc3ce5cc 100644 --- a/wpiunits/src/main/java/org/wpilib/units/MassUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/MassUnit.java @@ -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. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.Mass; +import org.wpilib.units.measure.Mass; /** * Unit of mass dimension. diff --git a/wpiunits/src/main/java/org/wpilib/units/Measure.java b/wpiunits/src/main/java/org/wpilib/units/Measure.java index 2c28754195..14fb5a07a8 100644 --- a/wpiunits/src/main/java/org/wpilib/units/Measure.java +++ b/wpiunits/src/main/java/org/wpilib/units/Measure.java @@ -2,35 +2,35 @@ // 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 edu.wpi.first.units; +package org.wpilib.units; -import static edu.wpi.first.units.Units.Value; +import static org.wpilib.units.Units.Value; -import edu.wpi.first.units.measure.Acceleration; -import edu.wpi.first.units.measure.Angle; -import edu.wpi.first.units.measure.AngularAcceleration; -import edu.wpi.first.units.measure.AngularMomentum; -import edu.wpi.first.units.measure.AngularVelocity; -import edu.wpi.first.units.measure.Current; -import edu.wpi.first.units.measure.Dimensionless; -import edu.wpi.first.units.measure.Distance; -import edu.wpi.first.units.measure.Energy; -import edu.wpi.first.units.measure.Force; -import edu.wpi.first.units.measure.Frequency; -import edu.wpi.first.units.measure.LinearAcceleration; -import edu.wpi.first.units.measure.LinearMomentum; -import edu.wpi.first.units.measure.LinearVelocity; -import edu.wpi.first.units.measure.Mass; -import edu.wpi.first.units.measure.MomentOfInertia; -import edu.wpi.first.units.measure.Mult; -import edu.wpi.first.units.measure.Per; -import edu.wpi.first.units.measure.Power; -import edu.wpi.first.units.measure.Resistance; -import edu.wpi.first.units.measure.Temperature; -import edu.wpi.first.units.measure.Time; -import edu.wpi.first.units.measure.Torque; -import edu.wpi.first.units.measure.Velocity; -import edu.wpi.first.units.measure.Voltage; +import org.wpilib.units.measure.Acceleration; +import org.wpilib.units.measure.Angle; +import org.wpilib.units.measure.AngularAcceleration; +import org.wpilib.units.measure.AngularMomentum; +import org.wpilib.units.measure.AngularVelocity; +import org.wpilib.units.measure.Current; +import org.wpilib.units.measure.Dimensionless; +import org.wpilib.units.measure.Distance; +import org.wpilib.units.measure.Energy; +import org.wpilib.units.measure.Force; +import org.wpilib.units.measure.Frequency; +import org.wpilib.units.measure.LinearAcceleration; +import org.wpilib.units.measure.LinearMomentum; +import org.wpilib.units.measure.LinearVelocity; +import org.wpilib.units.measure.Mass; +import org.wpilib.units.measure.MomentOfInertia; +import org.wpilib.units.measure.Mult; +import org.wpilib.units.measure.Per; +import org.wpilib.units.measure.Power; +import org.wpilib.units.measure.Resistance; +import org.wpilib.units.measure.Temperature; +import org.wpilib.units.measure.Time; +import org.wpilib.units.measure.Torque; +import org.wpilib.units.measure.Velocity; +import org.wpilib.units.measure.Voltage; /** * A measure holds the magnitude and unit of some dimension, such as distance, time, or speed. Two diff --git a/wpiunits/src/main/java/org/wpilib/units/MomentOfInertiaUnit.java b/wpiunits/src/main/java/org/wpilib/units/MomentOfInertiaUnit.java index 6279ea9a7e..db9bb916b8 100644 --- a/wpiunits/src/main/java/org/wpilib/units/MomentOfInertiaUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/MomentOfInertiaUnit.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.MomentOfInertia; +import org.wpilib.units.measure.MomentOfInertia; /** - * A unit of moment of inertia, like {@link edu.wpi.first.units.Units#KilogramSquareMeters}. Moments + * A unit of moment of inertia, like {@link org.wpilib.units.Units#KilogramSquareMeters}. Moments * of inertia describe how much an object resists being rotated, analogous to mass's resistance to * being accelerated along a line. */ diff --git a/wpiunits/src/main/java/org/wpilib/units/MultUnit.java b/wpiunits/src/main/java/org/wpilib/units/MultUnit.java index 1ca2f520da..b8a02d4069 100644 --- a/wpiunits/src/main/java/org/wpilib/units/MultUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/MultUnit.java @@ -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. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.Mult; +import org.wpilib.units.measure.Mult; import java.util.Objects; /** @@ -91,7 +91,7 @@ public class MultUnit extends Unit { * {@inheritDoc} * *

Note: When called on an object of type {@code MultUnit} (and not a subclass!), this - * method will always return a {@link edu.wpi.first.units.measure.Mult} instance. If you want to + * method will always return a {@link org.wpilib.units.measure.Mult} instance. If you want to * avoid casting, use {@link #ofNativeBaseUnits(double)} that returns a {@code Per} instance * directly. * @@ -107,7 +107,7 @@ public class MultUnit extends Unit { * {@inheritDoc} * *

Note: When called on an object of type {@code MultUnit} (and not a subclass!), this - * method will always return a {@link edu.wpi.first.units.measure.Mult} instance. If you want to + * method will always return a {@link org.wpilib.units.measure.Mult} instance. If you want to * avoid casting, use {@link #ofNativeBaseUnits(double)} that returns a {@code Per} instance * directly. * diff --git a/wpiunits/src/main/java/org/wpilib/units/PerUnit.java b/wpiunits/src/main/java/org/wpilib/units/PerUnit.java index a52a20f010..f41fd32955 100644 --- a/wpiunits/src/main/java/org/wpilib/units/PerUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/PerUnit.java @@ -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. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.Per; +import org.wpilib.units.measure.Per; import java.util.Objects; /** @@ -157,7 +157,7 @@ public class PerUnit extends Unit { * {@inheritDoc} * *

Note: When called on an object of type {@code PerUnit} (and not a subclass!), this - * method will always return a {@link edu.wpi.first.units.measure.Per} instance. If you want to + * method will always return a {@link org.wpilib.units.measure.Per} instance. If you want to * avoid casting, use {@link #ofNative(double)} that returns a {@code Per} instance directly. * * @param magnitude the magnitude of the measure @@ -172,7 +172,7 @@ public class PerUnit extends Unit { * {@inheritDoc} * *

Note: When called on an object of type {@code PerUnit} (and not a subclass!), this - * method will always return a {@link edu.wpi.first.units.measure.Per} instance. If you want to + * method will always return a {@link org.wpilib.units.measure.Per} instance. If you want to * avoid casting, use {@link #ofNativeBaseUnits(double)} that returns a {@code Per} instance * directly. * diff --git a/wpiunits/src/main/java/org/wpilib/units/PowerUnit.java b/wpiunits/src/main/java/org/wpilib/units/PowerUnit.java index 677e0b20a4..10c0c5b080 100644 --- a/wpiunits/src/main/java/org/wpilib/units/PowerUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/PowerUnit.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.units; +package org.wpilib.units; -import static edu.wpi.first.units.Units.Joules; -import static edu.wpi.first.units.Units.Seconds; +import static org.wpilib.units.Units.Joules; +import static org.wpilib.units.Units.Seconds; -import edu.wpi.first.units.measure.Power; +import org.wpilib.units.measure.Power; /** * Unit of power dimension. diff --git a/wpiunits/src/main/java/org/wpilib/units/ResistanceUnit.java b/wpiunits/src/main/java/org/wpilib/units/ResistanceUnit.java index 57ed168952..fb90eead3f 100644 --- a/wpiunits/src/main/java/org/wpilib/units/ResistanceUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/ResistanceUnit.java @@ -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. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.Resistance; +import org.wpilib.units.measure.Resistance; /** * Unit of resistance dimension. diff --git a/wpiunits/src/main/java/org/wpilib/units/TemperatureUnit.java b/wpiunits/src/main/java/org/wpilib/units/TemperatureUnit.java index de3bec9fb8..65d95841ee 100644 --- a/wpiunits/src/main/java/org/wpilib/units/TemperatureUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/TemperatureUnit.java @@ -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. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.Temperature; +import org.wpilib.units.measure.Temperature; /** * Unit of temperature dimension. diff --git a/wpiunits/src/main/java/org/wpilib/units/TimeUnit.java b/wpiunits/src/main/java/org/wpilib/units/TimeUnit.java index 9029e35148..726eb2829b 100644 --- a/wpiunits/src/main/java/org/wpilib/units/TimeUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/TimeUnit.java @@ -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. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.Time; +import org.wpilib.units.measure.Time; /** * Unit of time dimension. diff --git a/wpiunits/src/main/java/org/wpilib/units/TorqueUnit.java b/wpiunits/src/main/java/org/wpilib/units/TorqueUnit.java index ea7b5ab2f3..a266c25f2d 100644 --- a/wpiunits/src/main/java/org/wpilib/units/TorqueUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/TorqueUnit.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.Torque; +import org.wpilib.units.measure.Torque; -/** A unit of torque like {@link edu.wpi.first.units.Units#NewtonMeters}. */ +/** A unit of torque like {@link org.wpilib.units.Units#NewtonMeters}. */ public final class TorqueUnit extends MultUnit { private static final CombinatoryUnitCache cache = new CombinatoryUnitCache<>(TorqueUnit::new); diff --git a/wpiunits/src/main/java/org/wpilib/units/UnaryFunction.java b/wpiunits/src/main/java/org/wpilib/units/UnaryFunction.java index 440b1cb3c6..2c05d6f24d 100644 --- a/wpiunits/src/main/java/org/wpilib/units/UnaryFunction.java +++ b/wpiunits/src/main/java/org/wpilib/units/UnaryFunction.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 edu.wpi.first.units; +package org.wpilib.units; import java.util.Objects; diff --git a/wpiunits/src/main/java/org/wpilib/units/Unit.java b/wpiunits/src/main/java/org/wpilib/units/Unit.java index 2b6da66432..4ed2f652ba 100644 --- a/wpiunits/src/main/java/org/wpilib/units/Unit.java +++ b/wpiunits/src/main/java/org/wpilib/units/Unit.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 edu.wpi.first.units; +package org.wpilib.units; import java.util.Objects; diff --git a/wpiunits/src/main/java/org/wpilib/units/UnitBuilder.java b/wpiunits/src/main/java/org/wpilib/units/UnitBuilder.java index f3541b2874..6a4866284a 100644 --- a/wpiunits/src/main/java/org/wpilib/units/UnitBuilder.java +++ b/wpiunits/src/main/java/org/wpilib/units/UnitBuilder.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 edu.wpi.first.units; +package org.wpilib.units; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/wpiunits/src/main/java/org/wpilib/units/Units.java b/wpiunits/src/main/java/org/wpilib/units/Units.java index 6397c8ca3d..0f755d0b7b 100644 --- a/wpiunits/src/main/java/org/wpilib/units/Units.java +++ b/wpiunits/src/main/java/org/wpilib/units/Units.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 edu.wpi.first.units; +package org.wpilib.units; import java.util.Locale; diff --git a/wpiunits/src/main/java/org/wpilib/units/VelocityUnit.java b/wpiunits/src/main/java/org/wpilib/units/VelocityUnit.java index 2792ebe842..6b55d00184 100644 --- a/wpiunits/src/main/java/org/wpilib/units/VelocityUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/VelocityUnit.java @@ -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. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.Velocity; +import org.wpilib.units.measure.Velocity; /** * Unit of velocity dimension that is a combination of a distance unit (numerator) and a time unit diff --git a/wpiunits/src/main/java/org/wpilib/units/VoltageUnit.java b/wpiunits/src/main/java/org/wpilib/units/VoltageUnit.java index ab768e450f..eb066b2e17 100644 --- a/wpiunits/src/main/java/org/wpilib/units/VoltageUnit.java +++ b/wpiunits/src/main/java/org/wpilib/units/VoltageUnit.java @@ -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. -package edu.wpi.first.units; +package org.wpilib.units; -import edu.wpi.first.units.measure.Voltage; +import org.wpilib.units.measure.Voltage; /** * Unit of electric voltage dimension. diff --git a/wpiunits/src/main/java/org/wpilib/units/collections/LongToObjectHashMap.java b/wpiunits/src/main/java/org/wpilib/units/collections/LongToObjectHashMap.java index 2a18d7d6de..4ea8bcc363 100644 --- a/wpiunits/src/main/java/org/wpilib/units/collections/LongToObjectHashMap.java +++ b/wpiunits/src/main/java/org/wpilib/units/collections/LongToObjectHashMap.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 edu.wpi.first.units.collections; +package org.wpilib.units.collections; import java.util.ArrayList; import java.util.Arrays; diff --git a/wpiunits/src/main/java/org/wpilib/units/collections/ReadOnlyPrimitiveLongSet.java b/wpiunits/src/main/java/org/wpilib/units/collections/ReadOnlyPrimitiveLongSet.java index 744d35879a..a4644ec0b0 100644 --- a/wpiunits/src/main/java/org/wpilib/units/collections/ReadOnlyPrimitiveLongSet.java +++ b/wpiunits/src/main/java/org/wpilib/units/collections/ReadOnlyPrimitiveLongSet.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 edu.wpi.first.units.collections; +package org.wpilib.units.collections; import java.util.Arrays; import java.util.Iterator; diff --git a/wpiunits/src/test/java/org/wpilib/units/CurrentUnitTest.java b/wpiunits/src/test/java/org/wpilib/units/CurrentUnitTest.java index 5c215f7bf3..e288d07961 100644 --- a/wpiunits/src/test/java/org/wpilib/units/CurrentUnitTest.java +++ b/wpiunits/src/test/java/org/wpilib/units/CurrentUnitTest.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 edu.wpi.first.units; +package org.wpilib.units; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/wpiunits/src/test/java/org/wpilib/units/DistanceUnitTest.java b/wpiunits/src/test/java/org/wpilib/units/DistanceUnitTest.java index 08a6612172..08fe6229ce 100644 --- a/wpiunits/src/test/java/org/wpilib/units/DistanceUnitTest.java +++ b/wpiunits/src/test/java/org/wpilib/units/DistanceUnitTest.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 edu.wpi.first.units; +package org.wpilib.units; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/wpiunits/src/test/java/org/wpilib/units/ExampleUnit.java b/wpiunits/src/test/java/org/wpilib/units/ExampleUnit.java index c4e047ff41..9c940f6f72 100644 --- a/wpiunits/src/test/java/org/wpilib/units/ExampleUnit.java +++ b/wpiunits/src/test/java/org/wpilib/units/ExampleUnit.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 edu.wpi.first.units; +package org.wpilib.units; class ExampleUnit extends Unit { ExampleUnit(double baseUnitEquivalent) { diff --git a/wpiunits/src/test/java/org/wpilib/units/MeasureTest.java b/wpiunits/src/test/java/org/wpilib/units/MeasureTest.java index 25667d8f09..aef23c1243 100644 --- a/wpiunits/src/test/java/org/wpilib/units/MeasureTest.java +++ b/wpiunits/src/test/java/org/wpilib/units/MeasureTest.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 edu.wpi.first.units; +package org.wpilib.units; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -11,12 +11,12 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.wpi.first.units.measure.Angle; -import edu.wpi.first.units.measure.AngularMomentum; -import edu.wpi.first.units.measure.Distance; -import edu.wpi.first.units.measure.LinearVelocity; -import edu.wpi.first.units.measure.Per; -import edu.wpi.first.units.measure.Time; +import org.wpilib.units.measure.Angle; +import org.wpilib.units.measure.AngularMomentum; +import org.wpilib.units.measure.Distance; +import org.wpilib.units.measure.LinearVelocity; +import org.wpilib.units.measure.Per; +import org.wpilib.units.measure.Time; import org.junit.jupiter.api.Test; class MeasureTest { diff --git a/wpiunits/src/test/java/org/wpilib/units/MultUnitTest.java b/wpiunits/src/test/java/org/wpilib/units/MultUnitTest.java index 8815e81d50..d7c0c13974 100644 --- a/wpiunits/src/test/java/org/wpilib/units/MultUnitTest.java +++ b/wpiunits/src/test/java/org/wpilib/units/MultUnitTest.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 edu.wpi.first.units; +package org.wpilib.units; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; diff --git a/wpiunits/src/test/java/org/wpilib/units/PerUnitTest.java b/wpiunits/src/test/java/org/wpilib/units/PerUnitTest.java index c964684c51..845be52a5d 100644 --- a/wpiunits/src/test/java/org/wpilib/units/PerUnitTest.java +++ b/wpiunits/src/test/java/org/wpilib/units/PerUnitTest.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.units; +package org.wpilib.units; -import static edu.wpi.first.units.Units.Degrees; -import static edu.wpi.first.units.Units.Foot; -import static edu.wpi.first.units.Units.Inches; +import static org.wpilib.units.Units.Degrees; +import static org.wpilib.units.Units.Foot; +import static org.wpilib.units.Units.Inches; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertSame; diff --git a/wpiunits/src/test/java/org/wpilib/units/UnaryFunctionTest.java b/wpiunits/src/test/java/org/wpilib/units/UnaryFunctionTest.java index e711fa6f4c..0a89d889dc 100644 --- a/wpiunits/src/test/java/org/wpilib/units/UnaryFunctionTest.java +++ b/wpiunits/src/test/java/org/wpilib/units/UnaryFunctionTest.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 edu.wpi.first.units; +package org.wpilib.units; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/wpiunits/src/test/java/org/wpilib/units/UnitTest.java b/wpiunits/src/test/java/org/wpilib/units/UnitTest.java index 46453ddf67..080622a892 100644 --- a/wpiunits/src/test/java/org/wpilib/units/UnitTest.java +++ b/wpiunits/src/test/java/org/wpilib/units/UnitTest.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 edu.wpi.first.units; +package org.wpilib.units; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/wpiunits/src/test/java/org/wpilib/units/UnitsTest.java b/wpiunits/src/test/java/org/wpilib/units/UnitsTest.java index 723b1db78e..47d6ea9476 100644 --- a/wpiunits/src/test/java/org/wpilib/units/UnitsTest.java +++ b/wpiunits/src/test/java/org/wpilib/units/UnitsTest.java @@ -2,43 +2,43 @@ // 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 edu.wpi.first.units; +package org.wpilib.units; -import static edu.wpi.first.units.Units.Amps; -import static edu.wpi.first.units.Units.Celsius; -import static edu.wpi.first.units.Units.Centimeters; -import static edu.wpi.first.units.Units.Degrees; -import static edu.wpi.first.units.Units.Fahrenheit; -import static edu.wpi.first.units.Units.Feet; -import static edu.wpi.first.units.Units.FeetPerSecond; -import static edu.wpi.first.units.Units.Grams; -import static edu.wpi.first.units.Units.Gs; -import static edu.wpi.first.units.Units.Horsepower; -import static edu.wpi.first.units.Units.Inches; -import static edu.wpi.first.units.Units.Kelvin; -import static edu.wpi.first.units.Units.Kilo; -import static edu.wpi.first.units.Units.Kilograms; -import static edu.wpi.first.units.Units.Meters; -import static edu.wpi.first.units.Units.MetersPerSecond; -import static edu.wpi.first.units.Units.MetersPerSecondPerSecond; -import static edu.wpi.first.units.Units.Microseconds; -import static edu.wpi.first.units.Units.Milli; -import static edu.wpi.first.units.Units.Milliamps; -import static edu.wpi.first.units.Units.Millimeters; -import static edu.wpi.first.units.Units.Milliseconds; -import static edu.wpi.first.units.Units.Millivolts; -import static edu.wpi.first.units.Units.Milliwatts; -import static edu.wpi.first.units.Units.Minutes; -import static edu.wpi.first.units.Units.Ounces; -import static edu.wpi.first.units.Units.Percent; -import static edu.wpi.first.units.Units.Pounds; -import static edu.wpi.first.units.Units.Radians; -import static edu.wpi.first.units.Units.Revolutions; -import static edu.wpi.first.units.Units.Second; -import static edu.wpi.first.units.Units.Seconds; -import static edu.wpi.first.units.Units.Value; -import static edu.wpi.first.units.Units.Volts; -import static edu.wpi.first.units.Units.Watts; +import static org.wpilib.units.Units.Amps; +import static org.wpilib.units.Units.Celsius; +import static org.wpilib.units.Units.Centimeters; +import static org.wpilib.units.Units.Degrees; +import static org.wpilib.units.Units.Fahrenheit; +import static org.wpilib.units.Units.Feet; +import static org.wpilib.units.Units.FeetPerSecond; +import static org.wpilib.units.Units.Grams; +import static org.wpilib.units.Units.Gs; +import static org.wpilib.units.Units.Horsepower; +import static org.wpilib.units.Units.Inches; +import static org.wpilib.units.Units.Kelvin; +import static org.wpilib.units.Units.Kilo; +import static org.wpilib.units.Units.Kilograms; +import static org.wpilib.units.Units.Meters; +import static org.wpilib.units.Units.MetersPerSecond; +import static org.wpilib.units.Units.MetersPerSecondPerSecond; +import static org.wpilib.units.Units.Microseconds; +import static org.wpilib.units.Units.Milli; +import static org.wpilib.units.Units.Milliamps; +import static org.wpilib.units.Units.Millimeters; +import static org.wpilib.units.Units.Milliseconds; +import static org.wpilib.units.Units.Millivolts; +import static org.wpilib.units.Units.Milliwatts; +import static org.wpilib.units.Units.Minutes; +import static org.wpilib.units.Units.Ounces; +import static org.wpilib.units.Units.Percent; +import static org.wpilib.units.Units.Pounds; +import static org.wpilib.units.Units.Radians; +import static org.wpilib.units.Units.Revolutions; +import static org.wpilib.units.Units.Second; +import static org.wpilib.units.Units.Seconds; +import static org.wpilib.units.Units.Value; +import static org.wpilib.units.Units.Volts; +import static org.wpilib.units.Units.Watts; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/wpiunits/src/test/java/org/wpilib/units/VelocityUnitTest.java b/wpiunits/src/test/java/org/wpilib/units/VelocityUnitTest.java index f392ceca37..eaf10ee4df 100644 --- a/wpiunits/src/test/java/org/wpilib/units/VelocityUnitTest.java +++ b/wpiunits/src/test/java/org/wpilib/units/VelocityUnitTest.java @@ -2,18 +2,18 @@ // 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 edu.wpi.first.units; +package org.wpilib.units; -import static edu.wpi.first.units.Units.Feet; -import static edu.wpi.first.units.Units.FeetPerSecond; -import static edu.wpi.first.units.Units.Meters; -import static edu.wpi.first.units.Units.MetersPerSecond; -import static edu.wpi.first.units.Units.MetersPerSecondPerSecond; -import static edu.wpi.first.units.Units.Millisecond; -import static edu.wpi.first.units.Units.Minute; -import static edu.wpi.first.units.Units.Radians; -import static edu.wpi.first.units.Units.Second; -import static edu.wpi.first.units.Units.Seconds; +import static org.wpilib.units.Units.Feet; +import static org.wpilib.units.Units.FeetPerSecond; +import static org.wpilib.units.Units.Meters; +import static org.wpilib.units.Units.MetersPerSecond; +import static org.wpilib.units.Units.MetersPerSecondPerSecond; +import static org.wpilib.units.Units.Millisecond; +import static org.wpilib.units.Units.Minute; +import static org.wpilib.units.Units.Radians; +import static org.wpilib.units.Units.Second; +import static org.wpilib.units.Units.Seconds; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/wpiunits/src/test/java/org/wpilib/units/VoltageUnitTest.java b/wpiunits/src/test/java/org/wpilib/units/VoltageUnitTest.java index 3696b06cda..8ea108a0af 100644 --- a/wpiunits/src/test/java/org/wpilib/units/VoltageUnitTest.java +++ b/wpiunits/src/test/java/org/wpilib/units/VoltageUnitTest.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 edu.wpi.first.units; +package org.wpilib.units; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/wpiunits/src/test/java/org/wpilib/units/collections/LongToObjectHashMapTest.java b/wpiunits/src/test/java/org/wpilib/units/collections/LongToObjectHashMapTest.java index 6194691fd1..090ee17278 100644 --- a/wpiunits/src/test/java/org/wpilib/units/collections/LongToObjectHashMapTest.java +++ b/wpiunits/src/test/java/org/wpilib/units/collections/LongToObjectHashMapTest.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 edu.wpi.first.units.collections; +package org.wpilib.units.collections; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/wpiunits/src/test/java/org/wpilib/units/measure/VelocityTest.java b/wpiunits/src/test/java/org/wpilib/units/measure/VelocityTest.java index 177769acd3..1daa362153 100644 --- a/wpiunits/src/test/java/org/wpilib/units/measure/VelocityTest.java +++ b/wpiunits/src/test/java/org/wpilib/units/measure/VelocityTest.java @@ -2,16 +2,16 @@ // 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 edu.wpi.first.units.measure; +package org.wpilib.units.measure; -import static edu.wpi.first.units.Units.Milliseconds; -import static edu.wpi.first.units.Units.Seconds; -import static edu.wpi.first.units.Units.Volts; +import static org.wpilib.units.Units.Milliseconds; +import static org.wpilib.units.Units.Seconds; +import static org.wpilib.units.Units.Volts; import static org.junit.jupiter.api.Assertions.assertInstanceOf; -import edu.wpi.first.units.Measure; -import edu.wpi.first.units.VelocityUnit; -import edu.wpi.first.units.VoltageUnit; +import org.wpilib.units.Measure; +import org.wpilib.units.VelocityUnit; +import org.wpilib.units.VoltageUnit; import org.junit.jupiter.api.Test; class VelocityTest { diff --git a/wpiutil/src/dev/java/org/wpilib/util/DevMain.java b/wpiutil/src/dev/java/org/wpilib/util/DevMain.java index dd06a454ba..00fd245996 100644 --- a/wpiutil/src/dev/java/org/wpilib/util/DevMain.java +++ b/wpiutil/src/dev/java/org/wpilib/util/DevMain.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 edu.wpi.first.util; +package org.wpilib.util; public final class DevMain { /** Main entry point. */ diff --git a/wpiutil/src/main/java/org/wpilib/util/ErrorMessages.java b/wpiutil/src/main/java/org/wpilib/util/ErrorMessages.java index 9292ed9401..51c70f079c 100644 --- a/wpiutil/src/main/java/org/wpilib/util/ErrorMessages.java +++ b/wpiutil/src/main/java/org/wpilib/util/ErrorMessages.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 edu.wpi.first.util; +package org.wpilib.util; import static java.util.Objects.requireNonNull; diff --git a/wpiutil/src/main/java/org/wpilib/util/PixelFormat.java b/wpiutil/src/main/java/org/wpilib/util/PixelFormat.java index 9951f8683a..4b6d65321c 100644 --- a/wpiutil/src/main/java/org/wpilib/util/PixelFormat.java +++ b/wpiutil/src/main/java/org/wpilib/util/PixelFormat.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 edu.wpi.first.util; +package org.wpilib.util; /** Image pixel format. */ public enum PixelFormat { diff --git a/wpiutil/src/main/java/org/wpilib/util/RawFrame.java b/wpiutil/src/main/java/org/wpilib/util/RawFrame.java index dd12d84a98..3dd9b495fe 100644 --- a/wpiutil/src/main/java/org/wpilib/util/RawFrame.java +++ b/wpiutil/src/main/java/org/wpilib/util/RawFrame.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 edu.wpi.first.util; +package org.wpilib.util; import java.nio.ByteBuffer; diff --git a/wpiutil/src/main/java/org/wpilib/util/TimestampSource.java b/wpiutil/src/main/java/org/wpilib/util/TimestampSource.java index f1da693228..cdd1e0e843 100644 --- a/wpiutil/src/main/java/org/wpilib/util/TimestampSource.java +++ b/wpiutil/src/main/java/org/wpilib/util/TimestampSource.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 edu.wpi.first.util; +package org.wpilib.util; /** * Options for where the timestamp an {@link RawFrame} was captured at can be measured relative to. diff --git a/wpiutil/src/main/java/org/wpilib/util/WPISerializable.java b/wpiutil/src/main/java/org/wpilib/util/WPISerializable.java index 200deb5496..40b13b6fe2 100644 --- a/wpiutil/src/main/java/org/wpilib/util/WPISerializable.java +++ b/wpiutil/src/main/java/org/wpilib/util/WPISerializable.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 edu.wpi.first.util; +package org.wpilib.util; /** Marker interface to indicate a class is serializable using WPI serialization methods. */ public interface WPISerializable {} diff --git a/wpiutil/src/main/java/org/wpilib/util/WPIUtilJNI.java b/wpiutil/src/main/java/org/wpilib/util/WPIUtilJNI.java index acd93408e6..0560785875 100644 --- a/wpiutil/src/main/java/org/wpilib/util/WPIUtilJNI.java +++ b/wpiutil/src/main/java/org/wpilib/util/WPIUtilJNI.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 edu.wpi.first.util; +package org.wpilib.util; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/wpiutil/src/main/java/org/wpilib/util/cleanup/CleanupPool.java b/wpiutil/src/main/java/org/wpilib/util/cleanup/CleanupPool.java index 4b8c21115f..5a721bc463 100644 --- a/wpiutil/src/main/java/org/wpilib/util/cleanup/CleanupPool.java +++ b/wpiutil/src/main/java/org/wpilib/util/cleanup/CleanupPool.java @@ -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. -package edu.wpi.first.util.cleanup; +package org.wpilib.util.cleanup; -import edu.wpi.first.util.ErrorMessages; +import org.wpilib.util.ErrorMessages; import java.util.ArrayDeque; import java.util.Deque; diff --git a/wpiutil/src/main/java/org/wpilib/util/cleanup/ReflectionCleanup.java b/wpiutil/src/main/java/org/wpilib/util/cleanup/ReflectionCleanup.java index bed453ef21..7c68a3c918 100644 --- a/wpiutil/src/main/java/org/wpilib/util/cleanup/ReflectionCleanup.java +++ b/wpiutil/src/main/java/org/wpilib/util/cleanup/ReflectionCleanup.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 edu.wpi.first.util.cleanup; +package org.wpilib.util.cleanup; import java.lang.reflect.Field; diff --git a/wpiutil/src/main/java/org/wpilib/util/cleanup/SkipCleanup.java b/wpiutil/src/main/java/org/wpilib/util/cleanup/SkipCleanup.java index fcbcb7e896..51c622465a 100644 --- a/wpiutil/src/main/java/org/wpilib/util/cleanup/SkipCleanup.java +++ b/wpiutil/src/main/java/org/wpilib/util/cleanup/SkipCleanup.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 edu.wpi.first.util.cleanup; +package org.wpilib.util.cleanup; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/wpiutil/src/main/java/org/wpilib/util/cleanup/WPICleaner.java b/wpiutil/src/main/java/org/wpilib/util/cleanup/WPICleaner.java index 0c497d4368..882268d905 100644 --- a/wpiutil/src/main/java/org/wpilib/util/cleanup/WPICleaner.java +++ b/wpiutil/src/main/java/org/wpilib/util/cleanup/WPICleaner.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 edu.wpi.first.util; +package org.wpilib.util.cleanup; import java.lang.ref.Cleaner; import java.lang.ref.Cleaner.Cleanable; diff --git a/wpiutil/src/main/java/org/wpilib/util/concurrent/Event.java b/wpiutil/src/main/java/org/wpilib/util/concurrent/Event.java index bda2e8868f..9eb8d87d9a 100644 --- a/wpiutil/src/main/java/org/wpilib/util/concurrent/Event.java +++ b/wpiutil/src/main/java/org/wpilib/util/concurrent/Event.java @@ -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. -package edu.wpi.first.util.concurrent; +package org.wpilib.util.concurrent; -import edu.wpi.first.util.WPIUtilJNI; +import org.wpilib.util.WPIUtilJNI; /** * An atomic signaling event for synchronization. diff --git a/wpiutil/src/main/java/org/wpilib/util/concurrent/EventVector.java b/wpiutil/src/main/java/org/wpilib/util/concurrent/EventVector.java index 9257d9706f..94afa96e24 100644 --- a/wpiutil/src/main/java/org/wpilib/util/concurrent/EventVector.java +++ b/wpiutil/src/main/java/org/wpilib/util/concurrent/EventVector.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 edu.wpi.first.util; +package org.wpilib.util.concurrent; import java.util.ArrayList; import java.util.List; diff --git a/wpiutil/src/main/java/org/wpilib/util/concurrent/Semaphore.java b/wpiutil/src/main/java/org/wpilib/util/concurrent/Semaphore.java index 66c28a2964..4bfde55428 100644 --- a/wpiutil/src/main/java/org/wpilib/util/concurrent/Semaphore.java +++ b/wpiutil/src/main/java/org/wpilib/util/concurrent/Semaphore.java @@ -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. -package edu.wpi.first.util.concurrent; +package org.wpilib.util.concurrent; -import edu.wpi.first.util.WPIUtilJNI; +import org.wpilib.util.WPIUtilJNI; /** * A semaphore for synchronization. diff --git a/wpiutil/src/main/java/org/wpilib/util/container/CircularBuffer.java b/wpiutil/src/main/java/org/wpilib/util/container/CircularBuffer.java index e99bc2b237..a4cd04853a 100644 --- a/wpiutil/src/main/java/org/wpilib/util/container/CircularBuffer.java +++ b/wpiutil/src/main/java/org/wpilib/util/container/CircularBuffer.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 edu.wpi.first.util; +package org.wpilib.util.container; /** * This is a simple circular buffer so we don't need to "bucket brigade" copy old values. diff --git a/wpiutil/src/main/java/org/wpilib/util/container/DoubleCircularBuffer.java b/wpiutil/src/main/java/org/wpilib/util/container/DoubleCircularBuffer.java index 548f14bf0a..1270a59b47 100644 --- a/wpiutil/src/main/java/org/wpilib/util/container/DoubleCircularBuffer.java +++ b/wpiutil/src/main/java/org/wpilib/util/container/DoubleCircularBuffer.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 edu.wpi.first.util; +package org.wpilib.util.container; import java.util.Arrays; diff --git a/wpiutil/src/main/java/org/wpilib/util/function/BooleanConsumer.java b/wpiutil/src/main/java/org/wpilib/util/function/BooleanConsumer.java index 5c357e8457..8ad2025402 100644 --- a/wpiutil/src/main/java/org/wpilib/util/function/BooleanConsumer.java +++ b/wpiutil/src/main/java/org/wpilib/util/function/BooleanConsumer.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 edu.wpi.first.util.function; +package org.wpilib.util.function; /** * Represents an operation that accepts a single boolean-valued argument and returns no result. This diff --git a/wpiutil/src/main/java/org/wpilib/util/function/FloatConsumer.java b/wpiutil/src/main/java/org/wpilib/util/function/FloatConsumer.java index 77970d87be..3e48d1e04d 100644 --- a/wpiutil/src/main/java/org/wpilib/util/function/FloatConsumer.java +++ b/wpiutil/src/main/java/org/wpilib/util/function/FloatConsumer.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 edu.wpi.first.util.function; +package org.wpilib.util.function; /** * Represents an operation that accepts a single float-valued argument and returns no result. This diff --git a/wpiutil/src/main/java/org/wpilib/util/function/FloatSupplier.java b/wpiutil/src/main/java/org/wpilib/util/function/FloatSupplier.java index eb94b2bb4a..8640908a7c 100644 --- a/wpiutil/src/main/java/org/wpilib/util/function/FloatSupplier.java +++ b/wpiutil/src/main/java/org/wpilib/util/function/FloatSupplier.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 edu.wpi.first.util.function; +package org.wpilib.util.function; /** * Represents a supplier of float-valued results. diff --git a/wpiutil/src/main/java/org/wpilib/util/protobuf/Protobuf.java b/wpiutil/src/main/java/org/wpilib/util/protobuf/Protobuf.java index e6fda0bee0..2fc1378f40 100644 --- a/wpiutil/src/main/java/org/wpilib/util/protobuf/Protobuf.java +++ b/wpiutil/src/main/java/org/wpilib/util/protobuf/Protobuf.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 edu.wpi.first.util.protobuf; +package org.wpilib.util.protobuf; import java.lang.reflect.Array; import java.util.function.BiConsumer; diff --git a/wpiutil/src/main/java/org/wpilib/util/protobuf/ProtobufBuffer.java b/wpiutil/src/main/java/org/wpilib/util/protobuf/ProtobufBuffer.java index 1f8fdf090a..933c0fd69b 100644 --- a/wpiutil/src/main/java/org/wpilib/util/protobuf/ProtobufBuffer.java +++ b/wpiutil/src/main/java/org/wpilib/util/protobuf/ProtobufBuffer.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 edu.wpi.first.util.protobuf; +package org.wpilib.util.protobuf; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/wpiutil/src/main/java/org/wpilib/util/protobuf/ProtobufSerializable.java b/wpiutil/src/main/java/org/wpilib/util/protobuf/ProtobufSerializable.java index b991e941ca..93f7e47278 100644 --- a/wpiutil/src/main/java/org/wpilib/util/protobuf/ProtobufSerializable.java +++ b/wpiutil/src/main/java/org/wpilib/util/protobuf/ProtobufSerializable.java @@ -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. -package edu.wpi.first.util.protobuf; +package org.wpilib.util.protobuf; -import edu.wpi.first.util.WPISerializable; +import org.wpilib.util.WPISerializable; /** * Marker interface to indicate a class is serializable using Protobuf serialization. diff --git a/wpiutil/src/main/java/org/wpilib/util/runtime/ClassPreloader.java b/wpiutil/src/main/java/org/wpilib/util/runtime/ClassPreloader.java index ee8194452e..0155162827 100644 --- a/wpiutil/src/main/java/org/wpilib/util/runtime/ClassPreloader.java +++ b/wpiutil/src/main/java/org/wpilib/util/runtime/ClassPreloader.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 edu.wpi.first.util; +package org.wpilib.util.runtime; import java.io.BufferedReader; import java.io.IOException; diff --git a/wpiutil/src/main/java/org/wpilib/util/runtime/CombinedRuntimeLoader.java b/wpiutil/src/main/java/org/wpilib/util/runtime/CombinedRuntimeLoader.java index f03448c18f..e96391b5ad 100644 --- a/wpiutil/src/main/java/org/wpilib/util/runtime/CombinedRuntimeLoader.java +++ b/wpiutil/src/main/java/org/wpilib/util/runtime/CombinedRuntimeLoader.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 edu.wpi.first.util; +package org.wpilib.util.runtime; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/wpiutil/src/main/java/org/wpilib/util/runtime/MsvcRuntimeException.java b/wpiutil/src/main/java/org/wpilib/util/runtime/MsvcRuntimeException.java index d473cb4031..037405229e 100644 --- a/wpiutil/src/main/java/org/wpilib/util/runtime/MsvcRuntimeException.java +++ b/wpiutil/src/main/java/org/wpilib/util/runtime/MsvcRuntimeException.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 edu.wpi.first.util; +package org.wpilib.util.runtime; /** Exception thrown due to a bad MSVC Runtime. */ public class MsvcRuntimeException extends RuntimeException { diff --git a/wpiutil/src/main/java/org/wpilib/util/runtime/RuntimeDetector.java b/wpiutil/src/main/java/org/wpilib/util/runtime/RuntimeDetector.java index b5c5b13f81..ec6023e1c8 100644 --- a/wpiutil/src/main/java/org/wpilib/util/runtime/RuntimeDetector.java +++ b/wpiutil/src/main/java/org/wpilib/util/runtime/RuntimeDetector.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 edu.wpi.first.util; +package org.wpilib.util.runtime; import java.io.File; diff --git a/wpiutil/src/main/java/org/wpilib/util/runtime/RuntimeLoader.java b/wpiutil/src/main/java/org/wpilib/util/runtime/RuntimeLoader.java index 5ceaa076ad..7b04fa81b7 100644 --- a/wpiutil/src/main/java/org/wpilib/util/runtime/RuntimeLoader.java +++ b/wpiutil/src/main/java/org/wpilib/util/runtime/RuntimeLoader.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 edu.wpi.first.util; +package org.wpilib.util.runtime; import java.io.IOException; diff --git a/wpiutil/src/main/java/org/wpilib/util/sendable/Sendable.java b/wpiutil/src/main/java/org/wpilib/util/sendable/Sendable.java index e593e48c2e..61dd5ecea7 100644 --- a/wpiutil/src/main/java/org/wpilib/util/sendable/Sendable.java +++ b/wpiutil/src/main/java/org/wpilib/util/sendable/Sendable.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 edu.wpi.first.util.sendable; +package org.wpilib.util.sendable; /** The base interface for objects that can be sent over the network. */ @SuppressWarnings("PMD.ImplicitFunctionalInterface") diff --git a/wpiutil/src/main/java/org/wpilib/util/sendable/SendableBuilder.java b/wpiutil/src/main/java/org/wpilib/util/sendable/SendableBuilder.java index 748f38508d..06229ae11d 100644 --- a/wpiutil/src/main/java/org/wpilib/util/sendable/SendableBuilder.java +++ b/wpiutil/src/main/java/org/wpilib/util/sendable/SendableBuilder.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.util.sendable; +package org.wpilib.util.sendable; -import edu.wpi.first.util.function.BooleanConsumer; -import edu.wpi.first.util.function.FloatConsumer; -import edu.wpi.first.util.function.FloatSupplier; +import org.wpilib.util.function.BooleanConsumer; +import org.wpilib.util.function.FloatConsumer; +import org.wpilib.util.function.FloatSupplier; import java.util.function.BooleanSupplier; import java.util.function.Consumer; import java.util.function.DoubleConsumer; diff --git a/wpiutil/src/main/java/org/wpilib/util/sendable/SendableRegistry.java b/wpiutil/src/main/java/org/wpilib/util/sendable/SendableRegistry.java index 7aaa512be4..9af0a18787 100644 --- a/wpiutil/src/main/java/org/wpilib/util/sendable/SendableRegistry.java +++ b/wpiutil/src/main/java/org/wpilib/util/sendable/SendableRegistry.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 edu.wpi.first.util.sendable; +package org.wpilib.util.sendable; import java.lang.ref.WeakReference; import java.util.Arrays; diff --git a/wpiutil/src/main/java/org/wpilib/util/struct/BadSchemaException.java b/wpiutil/src/main/java/org/wpilib/util/struct/BadSchemaException.java index ebc3361fe9..837b75375c 100644 --- a/wpiutil/src/main/java/org/wpilib/util/struct/BadSchemaException.java +++ b/wpiutil/src/main/java/org/wpilib/util/struct/BadSchemaException.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 edu.wpi.first.util.struct; +package org.wpilib.util.struct; /** Exception thrown when encountering a bad schema. */ public class BadSchemaException extends Exception { diff --git a/wpiutil/src/main/java/org/wpilib/util/struct/DynamicStruct.java b/wpiutil/src/main/java/org/wpilib/util/struct/DynamicStruct.java index 4ab2686960..0b0a88359b 100644 --- a/wpiutil/src/main/java/org/wpilib/util/struct/DynamicStruct.java +++ b/wpiutil/src/main/java/org/wpilib/util/struct/DynamicStruct.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 edu.wpi.first.util.struct; +package org.wpilib.util.struct; import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; diff --git a/wpiutil/src/main/java/org/wpilib/util/struct/Struct.java b/wpiutil/src/main/java/org/wpilib/util/struct/Struct.java index 8e408ceb31..b60258ea16 100644 --- a/wpiutil/src/main/java/org/wpilib/util/struct/Struct.java +++ b/wpiutil/src/main/java/org/wpilib/util/struct/Struct.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 edu.wpi.first.util.struct; +package org.wpilib.util.struct; import java.lang.reflect.Array; import java.nio.ByteBuffer; diff --git a/wpiutil/src/main/java/org/wpilib/util/struct/StructBuffer.java b/wpiutil/src/main/java/org/wpilib/util/struct/StructBuffer.java index a5d04e0968..711eaf7f9d 100644 --- a/wpiutil/src/main/java/org/wpilib/util/struct/StructBuffer.java +++ b/wpiutil/src/main/java/org/wpilib/util/struct/StructBuffer.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 edu.wpi.first.util.struct; +package org.wpilib.util.struct; import java.lang.reflect.Array; import java.nio.ByteBuffer; diff --git a/wpiutil/src/main/java/org/wpilib/util/struct/StructDescriptor.java b/wpiutil/src/main/java/org/wpilib/util/struct/StructDescriptor.java index 16d01328fe..bf1d73d3e2 100644 --- a/wpiutil/src/main/java/org/wpilib/util/struct/StructDescriptor.java +++ b/wpiutil/src/main/java/org/wpilib/util/struct/StructDescriptor.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 edu.wpi.first.util.struct; +package org.wpilib.util.struct; import java.util.ArrayList; import java.util.HashMap; diff --git a/wpiutil/src/main/java/org/wpilib/util/struct/StructDescriptorDatabase.java b/wpiutil/src/main/java/org/wpilib/util/struct/StructDescriptorDatabase.java index 14515a50a6..f7b5be041c 100644 --- a/wpiutil/src/main/java/org/wpilib/util/struct/StructDescriptorDatabase.java +++ b/wpiutil/src/main/java/org/wpilib/util/struct/StructDescriptorDatabase.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.util.struct; +package org.wpilib.util.struct; -import edu.wpi.first.util.struct.parser.ParseException; -import edu.wpi.first.util.struct.parser.ParsedDeclaration; -import edu.wpi.first.util.struct.parser.ParsedSchema; -import edu.wpi.first.util.struct.parser.Parser; +import org.wpilib.util.struct.parser.ParseException; +import org.wpilib.util.struct.parser.ParsedDeclaration; +import org.wpilib.util.struct.parser.ParsedSchema; +import org.wpilib.util.struct.parser.Parser; import java.util.HashMap; import java.util.Map; import java.util.Stack; diff --git a/wpiutil/src/main/java/org/wpilib/util/struct/StructFetcher.java b/wpiutil/src/main/java/org/wpilib/util/struct/StructFetcher.java index dbfef7cc08..dde2d347b7 100644 --- a/wpiutil/src/main/java/org/wpilib/util/struct/StructFetcher.java +++ b/wpiutil/src/main/java/org/wpilib/util/struct/StructFetcher.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 edu.wpi.first.util.struct; +package org.wpilib.util.struct; import java.util.Optional; diff --git a/wpiutil/src/main/java/org/wpilib/util/struct/StructFieldDescriptor.java b/wpiutil/src/main/java/org/wpilib/util/struct/StructFieldDescriptor.java index d6a1edaa57..d624b7d4b7 100644 --- a/wpiutil/src/main/java/org/wpilib/util/struct/StructFieldDescriptor.java +++ b/wpiutil/src/main/java/org/wpilib/util/struct/StructFieldDescriptor.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 edu.wpi.first.util.struct; +package org.wpilib.util.struct; import java.util.Map; diff --git a/wpiutil/src/main/java/org/wpilib/util/struct/StructFieldType.java b/wpiutil/src/main/java/org/wpilib/util/struct/StructFieldType.java index 4b3cf179d3..ffbd3252a8 100644 --- a/wpiutil/src/main/java/org/wpilib/util/struct/StructFieldType.java +++ b/wpiutil/src/main/java/org/wpilib/util/struct/StructFieldType.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 edu.wpi.first.util.struct; +package org.wpilib.util.struct; /** Known data types for raw struct dynamic fields (see StructFieldDescriptor). */ public enum StructFieldType { diff --git a/wpiutil/src/main/java/org/wpilib/util/struct/StructGenerator.java b/wpiutil/src/main/java/org/wpilib/util/struct/StructGenerator.java index e883d9da76..d46005b4ea 100644 --- a/wpiutil/src/main/java/org/wpilib/util/struct/StructGenerator.java +++ b/wpiutil/src/main/java/org/wpilib/util/struct/StructGenerator.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 edu.wpi.first.util.struct; +package org.wpilib.util.struct; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/wpiutil/src/main/java/org/wpilib/util/struct/StructSerializable.java b/wpiutil/src/main/java/org/wpilib/util/struct/StructSerializable.java index d3f8db5e0a..1cc80d1c89 100644 --- a/wpiutil/src/main/java/org/wpilib/util/struct/StructSerializable.java +++ b/wpiutil/src/main/java/org/wpilib/util/struct/StructSerializable.java @@ -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. -package edu.wpi.first.util.struct; +package org.wpilib.util.struct; -import edu.wpi.first.util.WPISerializable; +import org.wpilib.util.WPISerializable; /** * Marker interface to indicate a class is serializable using Struct serialization. diff --git a/wpiutil/src/main/java/org/wpilib/util/struct/parser/Lexer.java b/wpiutil/src/main/java/org/wpilib/util/struct/parser/Lexer.java index 34c49bb8a7..103f77e529 100644 --- a/wpiutil/src/main/java/org/wpilib/util/struct/parser/Lexer.java +++ b/wpiutil/src/main/java/org/wpilib/util/struct/parser/Lexer.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 edu.wpi.first.util.struct.parser; +package org.wpilib.util.struct.parser; /** Raw struct schema lexer. */ public class Lexer { diff --git a/wpiutil/src/main/java/org/wpilib/util/struct/parser/ParseException.java b/wpiutil/src/main/java/org/wpilib/util/struct/parser/ParseException.java index fec3fb4823..d452c42fa2 100644 --- a/wpiutil/src/main/java/org/wpilib/util/struct/parser/ParseException.java +++ b/wpiutil/src/main/java/org/wpilib/util/struct/parser/ParseException.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 edu.wpi.first.util.struct.parser; +package org.wpilib.util.struct.parser; /** Exception for parsing errors. */ public class ParseException extends Exception { diff --git a/wpiutil/src/main/java/org/wpilib/util/struct/parser/ParsedDeclaration.java b/wpiutil/src/main/java/org/wpilib/util/struct/parser/ParsedDeclaration.java index 29743ab05a..5b7a5e09bc 100644 --- a/wpiutil/src/main/java/org/wpilib/util/struct/parser/ParsedDeclaration.java +++ b/wpiutil/src/main/java/org/wpilib/util/struct/parser/ParsedDeclaration.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 edu.wpi.first.util.struct.parser; +package org.wpilib.util.struct.parser; import java.util.Map; diff --git a/wpiutil/src/main/java/org/wpilib/util/struct/parser/ParsedSchema.java b/wpiutil/src/main/java/org/wpilib/util/struct/parser/ParsedSchema.java index 2f7312af9a..767765a88d 100644 --- a/wpiutil/src/main/java/org/wpilib/util/struct/parser/ParsedSchema.java +++ b/wpiutil/src/main/java/org/wpilib/util/struct/parser/ParsedSchema.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 edu.wpi.first.util.struct.parser; +package org.wpilib.util.struct.parser; import java.util.ArrayList; import java.util.List; diff --git a/wpiutil/src/main/java/org/wpilib/util/struct/parser/Parser.java b/wpiutil/src/main/java/org/wpilib/util/struct/parser/Parser.java index 7aba1adaa6..df2c1b3ec5 100644 --- a/wpiutil/src/main/java/org/wpilib/util/struct/parser/Parser.java +++ b/wpiutil/src/main/java/org/wpilib/util/struct/parser/Parser.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 edu.wpi.first.util.struct.parser; +package org.wpilib.util.struct.parser; import java.util.HashMap; import java.util.Map; diff --git a/wpiutil/src/main/java/org/wpilib/util/struct/parser/TokenKind.java b/wpiutil/src/main/java/org/wpilib/util/struct/parser/TokenKind.java index fb74c6f811..583ef47173 100644 --- a/wpiutil/src/main/java/org/wpilib/util/struct/parser/TokenKind.java +++ b/wpiutil/src/main/java/org/wpilib/util/struct/parser/TokenKind.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 edu.wpi.first.util.struct.parser; +package org.wpilib.util.struct.parser; /** A lexed raw struct schema token. */ public enum TokenKind { diff --git a/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp b/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp index 3fc818fb82..805cc14486 100644 --- a/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp +++ b/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp @@ -6,7 +6,7 @@ #include -#include "edu_wpi_first_util_WPIUtilJNI.h" +#include "org_wpilib_util_WPIUtilJNI.h" #include "wpi/RawFrame.h" #include "wpi/RuntimeCheck.h" #include "wpi/Synchronization.h" @@ -32,7 +32,7 @@ static const JExceptionInit exceptions[] = { {"java/lang/InterruptedException", &interruptedEx}, {"java/io/IOException", &ioEx}, {"java/lang/NullPointerException", &nullPointerEx}, - {"edu/wpi/first/util/MsvcRuntimeException", &msvcRuntimeEx}}; + {"org/wpilib/util/MsvcRuntimeException", &msvcRuntimeEx}}; void wpi::ThrowIllegalArgumentException(JNIEnv* env, std::string_view msg) { illegalArgEx.Throw(env, msg); @@ -80,12 +80,12 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM* vm, void* reserved) { } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: checkMsvcRuntime * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_checkMsvcRuntime +Java_org_wpilib_util_WPIUtilJNI_checkMsvcRuntime (JNIEnv* env, jclass) { uint32_t foundMajor; @@ -108,24 +108,24 @@ Java_edu_wpi_first_util_WPIUtilJNI_checkMsvcRuntime } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: writeStderr * Signature: (Ljava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_writeStderr +Java_org_wpilib_util_WPIUtilJNI_writeStderr (JNIEnv* env, jclass, jstring str) { wpi::print(stderr, "{}", JStringRef{env, str}.str()); } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: enableMockTime * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_enableMockTime +Java_org_wpilib_util_WPIUtilJNI_enableMockTime (JNIEnv*, jclass) { #ifdef __FRC_SYSTEMCORE__ @@ -137,12 +137,12 @@ Java_edu_wpi_first_util_WPIUtilJNI_enableMockTime } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: disableMockTime * Signature: ()V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_disableMockTime +Java_org_wpilib_util_WPIUtilJNI_disableMockTime (JNIEnv*, jclass) { mockTimeEnabled = false; @@ -150,24 +150,24 @@ Java_edu_wpi_first_util_WPIUtilJNI_disableMockTime } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: setMockTime * Signature: (J)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_setMockTime +Java_org_wpilib_util_WPIUtilJNI_setMockTime (JNIEnv*, jclass, jlong time) { mockNow = time; } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: now * Signature: ()J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_now +Java_org_wpilib_util_WPIUtilJNI_now (JNIEnv*, jclass) { if (mockTimeEnabled) { @@ -178,108 +178,108 @@ Java_edu_wpi_first_util_WPIUtilJNI_now } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: getSystemTime * Signature: ()J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_getSystemTime +Java_org_wpilib_util_WPIUtilJNI_getSystemTime (JNIEnv*, jclass) { return wpi::GetSystemTime(); } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: createEvent * Signature: (ZZ)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_createEvent +Java_org_wpilib_util_WPIUtilJNI_createEvent (JNIEnv*, jclass, jboolean manualReset, jboolean initialState) { return wpi::CreateEvent(manualReset, initialState); } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: destroyEvent * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_destroyEvent +Java_org_wpilib_util_WPIUtilJNI_destroyEvent (JNIEnv*, jclass, jint eventHandle) { wpi::DestroyEvent(eventHandle); } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: setEvent * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_setEvent +Java_org_wpilib_util_WPIUtilJNI_setEvent (JNIEnv*, jclass, jint eventHandle) { wpi::SetEvent(eventHandle); } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: resetEvent * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_resetEvent +Java_org_wpilib_util_WPIUtilJNI_resetEvent (JNIEnv*, jclass, jint eventHandle) { wpi::ResetEvent(eventHandle); } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: createSemaphore * Signature: (II)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_createSemaphore +Java_org_wpilib_util_WPIUtilJNI_createSemaphore (JNIEnv*, jclass, jint initialCount, jint maximumCount) { return wpi::CreateSemaphore(initialCount, maximumCount); } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: destroySemaphore * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_destroySemaphore +Java_org_wpilib_util_WPIUtilJNI_destroySemaphore (JNIEnv*, jclass, jint semHandle) { wpi::DestroySemaphore(semHandle); } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: releaseSemaphore * Signature: (II)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_releaseSemaphore +Java_org_wpilib_util_WPIUtilJNI_releaseSemaphore (JNIEnv*, jclass, jint semHandle, jint releaseCount) { return wpi::ReleaseSemaphore(semHandle, releaseCount); } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: waitForObject * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_waitForObject +Java_org_wpilib_util_WPIUtilJNI_waitForObject (JNIEnv* env, jclass, jint handle) { if (!wpi::WaitForObject(handle)) { @@ -288,12 +288,12 @@ Java_edu_wpi_first_util_WPIUtilJNI_waitForObject } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: waitForObjectTimeout * Signature: (ID)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_waitForObjectTimeout +Java_org_wpilib_util_WPIUtilJNI_waitForObjectTimeout (JNIEnv* env, jclass, jint handle, jdouble timeout) { bool timedOut; @@ -305,12 +305,12 @@ Java_edu_wpi_first_util_WPIUtilJNI_waitForObjectTimeout } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: waitForObjects * Signature: ([I)[I */ JNIEXPORT jintArray JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_waitForObjects +Java_org_wpilib_util_WPIUtilJNI_waitForObjects (JNIEnv* env, jclass, jintArray handles) { JSpan handlesArr{env, handles}; @@ -329,12 +329,12 @@ Java_edu_wpi_first_util_WPIUtilJNI_waitForObjects } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: waitForObjectsTimeout * Signature: ([ID)[I */ JNIEXPORT jintArray JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_waitForObjectsTimeout +Java_org_wpilib_util_WPIUtilJNI_waitForObjectsTimeout (JNIEnv* env, jclass, jintArray handles, jdouble timeout) { JSpan handlesArr{env, handles}; @@ -355,36 +355,36 @@ Java_edu_wpi_first_util_WPIUtilJNI_waitForObjectsTimeout } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: allocateRawFrame * Signature: ()J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_allocateRawFrame +Java_org_wpilib_util_WPIUtilJNI_allocateRawFrame (JNIEnv*, jclass) { return reinterpret_cast(new wpi::RawFrame); } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: freeRawFrame * Signature: (J)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_freeRawFrame +Java_org_wpilib_util_WPIUtilJNI_freeRawFrame (JNIEnv*, jclass, jlong frame) { delete reinterpret_cast(frame); } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: getRawFrameDataPtr * Signature: (J)J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_getRawFrameDataPtr +Java_org_wpilib_util_WPIUtilJNI_getRawFrameDataPtr (JNIEnv* env, jclass, jlong frame) { auto* f = reinterpret_cast(frame); @@ -396,12 +396,12 @@ Java_edu_wpi_first_util_WPIUtilJNI_getRawFrameDataPtr } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: setRawFrameData * Signature: (JLjava/lang/Object;IIIII)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_setRawFrameData +Java_org_wpilib_util_WPIUtilJNI_setRawFrameData (JNIEnv* env, jclass, jlong frame, jobject data, jint size, jint width, jint height, jint stride, jint pixelFormat) { @@ -425,12 +425,12 @@ Java_edu_wpi_first_util_WPIUtilJNI_setRawFrameData } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: setRawFrameTime * Signature: (JJI)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_setRawFrameTime +Java_org_wpilib_util_WPIUtilJNI_setRawFrameTime (JNIEnv* env, jclass, jlong frame, jlong time, jint timeSource) { auto* f = reinterpret_cast(frame); @@ -443,12 +443,12 @@ Java_edu_wpi_first_util_WPIUtilJNI_setRawFrameTime } /* - * Class: edu_wpi_first_util_WPIUtilJNI + * Class: org_wpilib_util_WPIUtilJNI * Method: setRawFrameInfo * Signature: (JIIIII)V */ JNIEXPORT void JNICALL -Java_edu_wpi_first_util_WPIUtilJNI_setRawFrameInfo +Java_org_wpilib_util_WPIUtilJNI_setRawFrameInfo (JNIEnv* env, jclass, jlong frame, jint size, jint width, jint height, jint stride, jint pixelFormat) { diff --git a/wpiutil/src/test/java/org/wpilib/util/ErrorMessagesTest.java b/wpiutil/src/test/java/org/wpilib/util/ErrorMessagesTest.java index 94e8bea929..8ef9f6bd14 100644 --- a/wpiutil/src/test/java/org/wpilib/util/ErrorMessagesTest.java +++ b/wpiutil/src/test/java/org/wpilib/util/ErrorMessagesTest.java @@ -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. -package edu.wpi.first.util; +package org.wpilib.util; -import static edu.wpi.first.util.ErrorMessages.requireNonNullParam; +import static org.wpilib.util.ErrorMessages.requireNonNullParam; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/wpiutil/src/test/java/org/wpilib/util/WPIUtilJNITest.java b/wpiutil/src/test/java/org/wpilib/util/WPIUtilJNITest.java index 7d5b229cb8..1bf15141a0 100644 --- a/wpiutil/src/test/java/org/wpilib/util/WPIUtilJNITest.java +++ b/wpiutil/src/test/java/org/wpilib/util/WPIUtilJNITest.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 edu.wpi.first.util; +package org.wpilib.util; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; diff --git a/wpiutil/src/test/java/org/wpilib/util/cleanup/CleanupPoolTest.java b/wpiutil/src/test/java/org/wpilib/util/cleanup/CleanupPoolTest.java index 2906bf2f9f..688fe803fe 100644 --- a/wpiutil/src/test/java/org/wpilib/util/cleanup/CleanupPoolTest.java +++ b/wpiutil/src/test/java/org/wpilib/util/cleanup/CleanupPoolTest.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 edu.wpi.first.util.cleanup; +package org.wpilib.util.cleanup; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/wpiutil/src/test/java/org/wpilib/util/cleanup/ReflectionCleanupTest.java b/wpiutil/src/test/java/org/wpilib/util/cleanup/ReflectionCleanupTest.java index 7bf3d64683..786e8e5c9c 100644 --- a/wpiutil/src/test/java/org/wpilib/util/cleanup/ReflectionCleanupTest.java +++ b/wpiutil/src/test/java/org/wpilib/util/cleanup/ReflectionCleanupTest.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 edu.wpi.first.util.cleanup; +package org.wpilib.util.cleanup; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/wpiutil/src/test/java/org/wpilib/util/container/CircularBufferTest.java b/wpiutil/src/test/java/org/wpilib/util/container/CircularBufferTest.java index a040ba5642..b905b80229 100644 --- a/wpiutil/src/test/java/org/wpilib/util/container/CircularBufferTest.java +++ b/wpiutil/src/test/java/org/wpilib/util/container/CircularBufferTest.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 edu.wpi.first.util; +package org.wpilib.util.container; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/wpiutil/src/test/java/org/wpilib/util/container/DoubleCircularBufferTest.java b/wpiutil/src/test/java/org/wpilib/util/container/DoubleCircularBufferTest.java index 58a39f4b0a..d17670e3e6 100644 --- a/wpiutil/src/test/java/org/wpilib/util/container/DoubleCircularBufferTest.java +++ b/wpiutil/src/test/java/org/wpilib/util/container/DoubleCircularBufferTest.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 edu.wpi.first.util; +package org.wpilib.util.container; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/wpiutil/src/test/java/org/wpilib/util/struct/DynamicStructTest.java b/wpiutil/src/test/java/org/wpilib/util/struct/DynamicStructTest.java index 376ed803e6..8e922e79f8 100644 --- a/wpiutil/src/test/java/org/wpilib/util/struct/DynamicStructTest.java +++ b/wpiutil/src/test/java/org/wpilib/util/struct/DynamicStructTest.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 edu.wpi.first.util.struct; +package org.wpilib.util.struct; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/wpiutil/src/test/java/org/wpilib/util/struct/StructGeneratorTest.java b/wpiutil/src/test/java/org/wpilib/util/struct/StructGeneratorTest.java index c5a1eea25b..1cc97da488 100644 --- a/wpiutil/src/test/java/org/wpilib/util/struct/StructGeneratorTest.java +++ b/wpiutil/src/test/java/org/wpilib/util/struct/StructGeneratorTest.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.util.struct; +package org.wpilib.util.struct; -import static edu.wpi.first.util.struct.StructGenerator.genEnum; -import static edu.wpi.first.util.struct.StructGenerator.genRecord; +import static org.wpilib.util.struct.StructGenerator.genEnum; +import static org.wpilib.util.struct.StructGenerator.genRecord; import static org.junit.jupiter.api.Assertions.assertEquals; import java.nio.ByteBuffer; diff --git a/wpiutil/src/test/java/org/wpilib/util/struct/parser/ParserTest.java b/wpiutil/src/test/java/org/wpilib/util/struct/parser/ParserTest.java index b985b2ae2b..fac77caa0e 100644 --- a/wpiutil/src/test/java/org/wpilib/util/struct/parser/ParserTest.java +++ b/wpiutil/src/test/java/org/wpilib/util/struct/parser/ParserTest.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 edu.wpi.first.util.struct.parser; +package org.wpilib.util.struct.parser; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/xrpVendordep/src/dev/java/org/wpilib/xrp/DevMain.java b/xrpVendordep/src/dev/java/org/wpilib/xrp/DevMain.java index a9487bf962..4320336fb8 100644 --- a/xrpVendordep/src/dev/java/org/wpilib/xrp/DevMain.java +++ b/xrpVendordep/src/dev/java/org/wpilib/xrp/DevMain.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.xrp; +package org.wpilib.xrp; -import edu.wpi.first.hal.HALUtil; -import edu.wpi.first.networktables.NetworkTablesJNI; -import edu.wpi.first.util.CombinedRuntimeLoader; +import org.wpilib.hardware.hal.HALUtil; +import org.wpilib.networktables.NetworkTablesJNI; +import org.wpilib.util.runtime.CombinedRuntimeLoader; public final class DevMain { /** Main entry point. */ diff --git a/xrpVendordep/src/main/java/org/wpilib/xrp/XRPGyro.java b/xrpVendordep/src/main/java/org/wpilib/xrp/XRPGyro.java index 1c6403edfe..c3e01e1c58 100644 --- a/xrpVendordep/src/main/java/org/wpilib/xrp/XRPGyro.java +++ b/xrpVendordep/src/main/java/org/wpilib/xrp/XRPGyro.java @@ -2,12 +2,12 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.xrp; +package org.wpilib.xrp; -import edu.wpi.first.hal.SimDevice; -import edu.wpi.first.hal.SimDevice.Direction; -import edu.wpi.first.hal.SimDouble; -import edu.wpi.first.math.geometry.Rotation2d; +import org.wpilib.hardware.hal.SimDevice; +import org.wpilib.hardware.hal.SimDevice.Direction; +import org.wpilib.hardware.hal.SimDouble; +import org.wpilib.math.geometry.Rotation2d; /** * Use a rate gyro to return the robots heading relative to a starting position. diff --git a/xrpVendordep/src/main/java/org/wpilib/xrp/XRPMotor.java b/xrpVendordep/src/main/java/org/wpilib/xrp/XRPMotor.java index f99173a6eb..c35aeb7b93 100644 --- a/xrpVendordep/src/main/java/org/wpilib/xrp/XRPMotor.java +++ b/xrpVendordep/src/main/java/org/wpilib/xrp/XRPMotor.java @@ -2,13 +2,13 @@ // 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 edu.wpi.first.wpilibj.xrp; +package org.wpilib.xrp; -import edu.wpi.first.hal.SimBoolean; -import edu.wpi.first.hal.SimDevice; -import edu.wpi.first.hal.SimDevice.Direction; -import edu.wpi.first.hal.SimDouble; -import edu.wpi.first.wpilibj.motorcontrol.MotorController; +import org.wpilib.hardware.hal.SimBoolean; +import org.wpilib.hardware.hal.SimDevice; +import org.wpilib.hardware.hal.SimDevice.Direction; +import org.wpilib.hardware.hal.SimDouble; +import org.wpilib.hardware.motor.MotorController; import java.util.HashMap; import java.util.HashSet; diff --git a/xrpVendordep/src/main/java/org/wpilib/xrp/XRPOnBoardIO.java b/xrpVendordep/src/main/java/org/wpilib/xrp/XRPOnBoardIO.java index 8a0f2f276d..203dbfc629 100644 --- a/xrpVendordep/src/main/java/org/wpilib/xrp/XRPOnBoardIO.java +++ b/xrpVendordep/src/main/java/org/wpilib/xrp/XRPOnBoardIO.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.xrp; +package org.wpilib.xrp; -import edu.wpi.first.wpilibj.DigitalInput; -import edu.wpi.first.wpilibj.DigitalOutput; +import org.wpilib.hardware.discrete.DigitalInput; +import org.wpilib.hardware.discrete.DigitalOutput; /** * This class represents the onboard IO of the XRP Reference Robot. This includes the USER diff --git a/xrpVendordep/src/main/java/org/wpilib/xrp/XRPRangefinder.java b/xrpVendordep/src/main/java/org/wpilib/xrp/XRPRangefinder.java index 3ac74229e9..185f29fedd 100644 --- a/xrpVendordep/src/main/java/org/wpilib/xrp/XRPRangefinder.java +++ b/xrpVendordep/src/main/java/org/wpilib/xrp/XRPRangefinder.java @@ -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. -package edu.wpi.first.wpilibj.xrp; +package org.wpilib.xrp; -import edu.wpi.first.wpilibj.AnalogInput; +import org.wpilib.hardware.discrete.AnalogInput; /** This class represents the ultrasonic rangefinder on an XRP robot. */ public class XRPRangefinder { diff --git a/xrpVendordep/src/main/java/org/wpilib/xrp/XRPReflectanceSensor.java b/xrpVendordep/src/main/java/org/wpilib/xrp/XRPReflectanceSensor.java index 623215bf55..84b8d8f451 100644 --- a/xrpVendordep/src/main/java/org/wpilib/xrp/XRPReflectanceSensor.java +++ b/xrpVendordep/src/main/java/org/wpilib/xrp/XRPReflectanceSensor.java @@ -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. -package edu.wpi.first.wpilibj.xrp; +package org.wpilib.xrp; -import edu.wpi.first.wpilibj.AnalogInput; +import org.wpilib.hardware.discrete.AnalogInput; /** This class represents the reflectance sensor pair on an XRP robot. */ public class XRPReflectanceSensor { diff --git a/xrpVendordep/src/main/java/org/wpilib/xrp/XRPServo.java b/xrpVendordep/src/main/java/org/wpilib/xrp/XRPServo.java index cbd8f61725..152fee7ff8 100644 --- a/xrpVendordep/src/main/java/org/wpilib/xrp/XRPServo.java +++ b/xrpVendordep/src/main/java/org/wpilib/xrp/XRPServo.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.first.wpilibj.xrp; +package org.wpilib.xrp; -import edu.wpi.first.hal.SimDevice; -import edu.wpi.first.hal.SimDevice.Direction; -import edu.wpi.first.hal.SimDouble; +import org.wpilib.hardware.hal.SimDevice; +import org.wpilib.hardware.hal.SimDevice.Direction; +import org.wpilib.hardware.hal.SimDouble; import java.util.HashMap; import java.util.HashSet;