diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/CustomizeLocalizer.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/CustomizeLocalizer.java index 309b519..f44c130 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/CustomizeLocalizer.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/CustomizeLocalizer.java @@ -10,7 +10,7 @@ import org.firstinspires.ftc.teamcode.DriveControls.Localizers.plugins.DeadWheelLocalizer; import org.firstinspires.ftc.teamcode.DriveControls.Localizers.plugins.ImuLocalizer; import org.firstinspires.ftc.teamcode.Hardwares.Classic; -import org.firstinspires.ftc.teamcode.utils.Annotation.LocalizationSubassembly; +import org.firstinspires.ftc.teamcode.utils.Annotations.LocalizationSubassembly; @LocalizationSubassembly public class CustomizeLocalizer extends SubassemblyLocalizer implements Localizer { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/DeadWheelSubassemblyLocalizer.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/DeadWheelSubassemblyLocalizer.java index cb89bbb..26aedc7 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/DeadWheelSubassemblyLocalizer.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/DeadWheelSubassemblyLocalizer.java @@ -6,7 +6,7 @@ import org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition.SubassemblyLocalizer; import org.firstinspires.ftc.teamcode.DriveControls.Localizers.plugins.DeadWheelLocalizer; import org.firstinspires.ftc.teamcode.Hardwares.Classic; -import org.firstinspires.ftc.teamcode.utils.Annotation.LocalizationSubassembly; +import org.firstinspires.ftc.teamcode.utils.Annotations.LocalizationSubassembly; @LocalizationSubassembly public class DeadWheelSubassemblyLocalizer extends SubassemblyLocalizer implements Localizer { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/IMUSubassemblyLocalizer.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/IMUSubassemblyLocalizer.java index 1771ea9..a6219d3 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/IMUSubassemblyLocalizer.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/IMUSubassemblyLocalizer.java @@ -6,7 +6,7 @@ import org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition.Localizer; import org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition.SubassemblyLocalizer; import org.firstinspires.ftc.teamcode.Hardwares.Classic; -import org.firstinspires.ftc.teamcode.utils.Annotation.LocalizationSubassembly; +import org.firstinspires.ftc.teamcode.utils.Annotations.LocalizationSubassembly; @LocalizationSubassembly public class IMUSubassemblyLocalizer extends SubassemblyLocalizer implements Localizer { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/SimpleSubassemblyLocalizer.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/SimpleSubassemblyLocalizer.java index 4ad80c0..3f447ce 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/SimpleSubassemblyLocalizer.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/SimpleSubassemblyLocalizer.java @@ -7,7 +7,7 @@ import org.firstinspires.ftc.teamcode.DriveControls.Localizers.plugins.DeadWheelHeadingLocalizer; import org.firstinspires.ftc.teamcode.DriveControls.Localizers.plugins.ImuVectorPositionLocalizer; import org.firstinspires.ftc.teamcode.Hardwares.Classic; -import org.firstinspires.ftc.teamcode.utils.Annotation.LocalizationSubassembly; +import org.firstinspires.ftc.teamcode.utils.Annotations.LocalizationSubassembly; @LocalizationSubassembly public class SimpleSubassemblyLocalizer extends SubassemblyLocalizer implements Localizer { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/DeadWheelHeadingLocalizer.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/DeadWheelHeadingLocalizer.java index 570eec4..26f43e1 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/DeadWheelHeadingLocalizer.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/DeadWheelHeadingLocalizer.java @@ -6,7 +6,7 @@ import org.firstinspires.ftc.teamcode.Hardwares.Classic; import org.firstinspires.ftc.teamcode.Hardwares.basic.DeadWheelEncoders; import org.firstinspires.ftc.teamcode.Params; -import org.firstinspires.ftc.teamcode.utils.Annotation.LocalizationPlugin; +import org.firstinspires.ftc.teamcode.utils.Annotations.LocalizationPlugin; @LocalizationPlugin public final class DeadWheelHeadingLocalizer implements HeadingLocalizerPlugin { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/DeadWheelLocalizer.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/DeadWheelLocalizer.java index d023938..9f97771 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/DeadWheelLocalizer.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/DeadWheelLocalizer.java @@ -8,7 +8,7 @@ import org.firstinspires.ftc.teamcode.Hardwares.Classic; import org.firstinspires.ftc.teamcode.Hardwares.basic.DeadWheelEncoders; import org.firstinspires.ftc.teamcode.Params; -import org.firstinspires.ftc.teamcode.utils.Annotation.LocalizationPlugin; +import org.firstinspires.ftc.teamcode.utils.Annotations.LocalizationPlugin; import org.firstinspires.ftc.teamcode.utils.Complex; import org.firstinspires.ftc.teamcode.utils.Mathematics; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/DeadWheelVectorPositionLocalizer.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/DeadWheelVectorPositionLocalizer.java index d987952..5b34098 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/DeadWheelVectorPositionLocalizer.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/DeadWheelVectorPositionLocalizer.java @@ -6,7 +6,7 @@ import org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition.VectorPositionLocalizerPlugin; import org.firstinspires.ftc.teamcode.Hardwares.Classic; -import org.firstinspires.ftc.teamcode.utils.Annotation.LocalizationPlugin; +import org.firstinspires.ftc.teamcode.utils.Annotations.LocalizationPlugin; @LocalizationPlugin public final class DeadWheelVectorPositionLocalizer extends DeadWheelLocalizer implements VectorPositionLocalizerPlugin { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/ImuLocalizer.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/ImuLocalizer.java index a0f8c09..efbac06 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/ImuLocalizer.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/ImuLocalizer.java @@ -9,7 +9,7 @@ import org.firstinspires.ftc.teamcode.Hardwares.Classic; import org.firstinspires.ftc.teamcode.Hardwares.basic.Sensors; import org.firstinspires.ftc.teamcode.Params; -import org.firstinspires.ftc.teamcode.utils.Annotation.LocalizationPlugin; +import org.firstinspires.ftc.teamcode.utils.Annotations.LocalizationPlugin; import org.firstinspires.ftc.teamcode.utils.Complex; @LocalizationPlugin diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/ImuVectorPositionLocalizer.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/ImuVectorPositionLocalizer.java index c3e5cc0..6095118 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/ImuVectorPositionLocalizer.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/ImuVectorPositionLocalizer.java @@ -4,7 +4,7 @@ import org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition.VectorPositionLocalizerPlugin; import org.firstinspires.ftc.teamcode.Hardwares.Classic; -import org.firstinspires.ftc.teamcode.utils.Annotation.LocalizationPlugin; +import org.firstinspires.ftc.teamcode.utils.Annotations.LocalizationPlugin; @LocalizationPlugin public final class ImuVectorPositionLocalizer extends ImuLocalizer implements VectorPositionLocalizerPlugin { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/NewImuLocalizer.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/NewImuLocalizer.java index 8badf1a..d9a76dc 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/NewImuLocalizer.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/NewImuLocalizer.java @@ -8,7 +8,7 @@ import org.firstinspires.ftc.teamcode.Hardwares.Classic; import org.firstinspires.ftc.teamcode.Hardwares.basic.Sensors; import org.firstinspires.ftc.teamcode.Params; -import org.firstinspires.ftc.teamcode.utils.Annotation.LocalizationPlugin; +import org.firstinspires.ftc.teamcode.utils.Annotations.LocalizationPlugin; import org.firstinspires.ftc.teamcode.utils.Complex; @LocalizationPlugin diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/SimpleMecanumDrive.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/SimpleMecanumDrive.java index e13af70..95f351b 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/SimpleMecanumDrive.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/SimpleMecanumDrive.java @@ -22,9 +22,9 @@ import org.firstinspires.ftc.teamcode.utils.Complex; import org.firstinspires.ftc.teamcode.utils.Mathematics; import org.firstinspires.ftc.teamcode.utils.PID_processor; -import org.firstinspires.ftc.teamcode.utils.enums.State; -import org.firstinspires.ftc.teamcode.utils.enums.TrajectoryType; -import org.firstinspires.ftc.teamcode.utils.enums.driveDirection; +import org.firstinspires.ftc.teamcode.utils.Enums.State; +import org.firstinspires.ftc.teamcode.utils.Enums.TrajectoryType; +import org.firstinspires.ftc.teamcode.utils.Enums.driveDirection; import java.util.Arrays; import java.util.LinkedList; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/Classic.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/Classic.java index f3027e1..51821ce 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/Classic.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/Classic.java @@ -12,8 +12,8 @@ import org.firstinspires.ftc.teamcode.Params; import org.firstinspires.ftc.teamcode.RuntimeOption; import org.firstinspires.ftc.teamcode.utils.Mathematics; -import org.firstinspires.ftc.teamcode.utils.enums.driveDirection; -import org.firstinspires.ftc.teamcode.utils.enums.Quadrant; +import org.firstinspires.ftc.teamcode.utils.Enums.driveDirection; +import org.firstinspires.ftc.teamcode.utils.Enums.Quadrant; public class Classic { public Motors motors; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/Structure.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/Structure.java index c0087f8..a1ff933 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/Structure.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/Structure.java @@ -10,7 +10,7 @@ import org.firstinspires.ftc.teamcode.Hardwares.basic.Motors; import org.firstinspires.ftc.teamcode.Hardwares.basic.Servos; import org.firstinspires.ftc.teamcode.RuntimeOption; -import org.firstinspires.ftc.teamcode.utils.enums.ClipPosition; +import org.firstinspires.ftc.teamcode.utils.Enums.ClipPosition; public class Structure { Motors motors; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/Webcam.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/Webcam.java index e68f442..ac51d25 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/Webcam.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/Webcam.java @@ -4,7 +4,7 @@ import org.firstinspires.ftc.robotcore.external.hardware.camera.WebcamName; import org.firstinspires.ftc.teamcode.Hardwares.basic.Camera; -import org.firstinspires.ftc.teamcode.utils.enums.AutonomousLocation; +import org.firstinspires.ftc.teamcode.utils.Enums.AutonomousLocation; import org.openftc.easyopencv.OpenCvCamera; import org.openftc.easyopencv.OpenCvCameraFactory; import org.openftc.easyopencv.OpenCvCameraRotation; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/basic/Camera.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/basic/Camera.java index bf0cabe..0b2315e 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/basic/Camera.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/basic/Camera.java @@ -1,7 +1,7 @@ package org.firstinspires.ftc.teamcode.Hardwares.basic; import org.firstinspires.ftc.robotcore.external.Telemetry; -import org.firstinspires.ftc.teamcode.utils.enums.AutonomousLocation; +import org.firstinspires.ftc.teamcode.utils.Enums.AutonomousLocation; import org.opencv.core.Core; import org.opencv.core.Mat; import org.opencv.core.Point; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/basic/DeadWheelEncoders.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/basic/DeadWheelEncoders.java index d37d194..e4e1203 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/basic/DeadWheelEncoders.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/basic/DeadWheelEncoders.java @@ -13,7 +13,7 @@ import com.qualcomm.robotcore.hardware.DcMotorSimple; import org.firstinspires.ftc.teamcode.Hardwares.namespace.HardwareDevices; -import org.firstinspires.ftc.teamcode.utils.enums.DeadWheelsType; +import org.firstinspires.ftc.teamcode.utils.Enums.DeadWheelsType; public class DeadWheelEncoders { //TODO:按需求修改 diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/basic/DeviceMap.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/basic/DeviceMap.java index 1ce17b7..f3fd9c7 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/basic/DeviceMap.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/basic/DeviceMap.java @@ -10,7 +10,7 @@ import com.qualcomm.robotcore.hardware.Servo; import org.firstinspires.ftc.teamcode.Hardwares.namespace.HardwareDevices; -import org.firstinspires.ftc.teamcode.utils.enums.HardwareState; +import org.firstinspires.ftc.teamcode.utils.Enums.HardwareState; import java.util.HashMap; import java.util.Map; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/namespace/HardwareDevices.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/namespace/HardwareDevices.java index e0de259..fd47de6 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/namespace/HardwareDevices.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/namespace/HardwareDevices.java @@ -3,7 +3,7 @@ import com.qualcomm.robotcore.hardware.DcMotorEx; import com.qualcomm.robotcore.hardware.Servo; -import org.firstinspires.ftc.teamcode.utils.enums.HardwareState; +import org.firstinspires.ftc.teamcode.utils.Enums.HardwareState; //TODO:以下名字均为我们团队所测定的 /** diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_samples/AutonomousSample.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_samples/AutonomousSample.java index cd813cf..2aefdd6 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_samples/AutonomousSample.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_samples/AutonomousSample.java @@ -6,7 +6,7 @@ import org.firstinspires.ftc.teamcode.DriveControls.SimpleMecanumDrive.DriveCommandPackage; import org.firstinspires.ftc.teamcode.utils.AutonomousProgramTemplate; -import org.firstinspires.ftc.teamcode.utils.enums.AutonomousLocation; +import org.firstinspires.ftc.teamcode.utils.Enums.AutonomousLocation; @Autonomous(name = "AutonomousSample",group = "SAMPLE") public class AutonomousSample extends AutonomousProgramTemplate { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_samples/ClientUsage.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_samples/ClientUsage.java index f4d0d21..aa29f62 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_samples/ClientUsage.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_samples/ClientUsage.java @@ -5,7 +5,7 @@ import com.qualcomm.robotcore.eventloop.opmode.OpMode; import com.qualcomm.robotcore.eventloop.opmode.TeleOp; -import org.firstinspires.ftc.teamcode.utils.Annotation.TuningOpModes; +import org.firstinspires.ftc.teamcode.utils.Annotations.TuningOpModes; import org.firstinspires.ftc.teamcode.utils.Client; @TuningOpModes diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_samples/ManualCodeSample.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_samples/ManualCodeSample.java index 91c7409..2bc1b9f 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_samples/ManualCodeSample.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_samples/ManualCodeSample.java @@ -4,7 +4,7 @@ import com.qualcomm.robotcore.eventloop.opmode.TeleOp; import org.firstinspires.ftc.teamcode.Robot; -import org.firstinspires.ftc.teamcode.utils.enums.runningState; +import org.firstinspires.ftc.teamcode.utils.Enums.runningState; @TeleOp(name = "ManualCodeSample",group = "samples") public class ManualCodeSample extends OpMode { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/AutoIMUPositionTuner.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/AutoIMUPositionTuner.java index c69c5b1..f26b3e8 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/AutoIMUPositionTuner.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/AutoIMUPositionTuner.java @@ -3,10 +3,10 @@ import com.qualcomm.robotcore.eventloop.opmode.Autonomous; import org.firstinspires.ftc.teamcode.Robot; -import org.firstinspires.ftc.teamcode.utils.Annotation.TuningOpModes; +import org.firstinspires.ftc.teamcode.utils.Annotations.TuningOpModes; import org.firstinspires.ftc.teamcode.utils.AutonomousProgramTemplate; -import org.firstinspires.ftc.teamcode.utils.enums.driveDirection; -import org.firstinspires.ftc.teamcode.utils.enums.runningState; +import org.firstinspires.ftc.teamcode.utils.Enums.driveDirection; +import org.firstinspires.ftc.teamcode.utils.Enums.runningState; /** * 1.运行程序 diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/AxialInchPerTickTest.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/AxialInchPerTickTest.java index f39bc6d..e6dcdb3 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/AxialInchPerTickTest.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/AxialInchPerTickTest.java @@ -4,7 +4,7 @@ import com.qualcomm.robotcore.eventloop.opmode.TeleOp; import org.firstinspires.ftc.teamcode.Params; -import org.firstinspires.ftc.teamcode.utils.Annotation.TuningOpModes; +import org.firstinspires.ftc.teamcode.utils.Annotations.TuningOpModes; import org.firstinspires.ftc.teamcode.utils.AutonomousProgramTemplate; @TeleOp(name = "AxialInchPerTickTest",group = "tune") diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/DWETest.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/DWETest.java index 62c76e1..09980fa 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/DWETest.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/DWETest.java @@ -3,7 +3,7 @@ import com.acmerobotics.roadrunner.Pose2d; import com.qualcomm.robotcore.eventloop.opmode.TeleOp; -import org.firstinspires.ftc.teamcode.utils.Annotation.TuningOpModes; +import org.firstinspires.ftc.teamcode.utils.Annotations.TuningOpModes; import org.firstinspires.ftc.teamcode.utils.AutonomousProgramTemplate; @TeleOp(name = "DeadWheelEncoders_Test",group = "tune") diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/IMUPositionTuner.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/IMUPositionTuner.java index 10b5945..71c3d64 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/IMUPositionTuner.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/IMUPositionTuner.java @@ -3,7 +3,7 @@ import com.acmerobotics.roadrunner.Pose2d; import com.qualcomm.robotcore.eventloop.opmode.TeleOp; -import org.firstinspires.ftc.teamcode.utils.Annotation.TuningOpModes; +import org.firstinspires.ftc.teamcode.utils.Annotations.TuningOpModes; import org.firstinspires.ftc.teamcode.utils.AutonomousProgramTemplate; /** diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/LateralInchPerTickTest.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/LateralInchPerTickTest.java index a1e9007..60e8b9b 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/LateralInchPerTickTest.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/LateralInchPerTickTest.java @@ -3,7 +3,7 @@ import com.acmerobotics.roadrunner.Pose2d; import com.qualcomm.robotcore.eventloop.opmode.TeleOp; -import org.firstinspires.ftc.teamcode.utils.Annotation.TuningOpModes; +import org.firstinspires.ftc.teamcode.utils.Annotations.TuningOpModes; import org.firstinspires.ftc.teamcode.utils.AutonomousProgramTemplate; @TeleOp(name = "LateralInchPerTickTest",group = "tune") diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/LocalizationTest.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/LocalizationTest.java index 9300788..1394eac 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/LocalizationTest.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/LocalizationTest.java @@ -4,7 +4,7 @@ import com.qualcomm.robotcore.eventloop.opmode.TeleOp; import org.firstinspires.ftc.teamcode.DriveControls.SimpleMecanumDrive; -import org.firstinspires.ftc.teamcode.utils.Annotation.TuningOpModes; +import org.firstinspires.ftc.teamcode.utils.Annotations.TuningOpModes; import org.firstinspires.ftc.teamcode.utils.TeleopProgramTemplate; @TeleOp(name = "LocalizationTest",group = "tune") diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/SMDTest.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/SMDTest.java index d32887f..b737ded 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/SMDTest.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/SMDTest.java @@ -7,9 +7,9 @@ import org.firstinspires.ftc.teamcode.DriveControls.SimpleMecanumDrive; import org.firstinspires.ftc.teamcode.DriveControls.SimpleMecanumDrive.DriveCommandPackage; import org.firstinspires.ftc.teamcode.Robot; -import org.firstinspires.ftc.teamcode.utils.Annotation.TuningOpModes; +import org.firstinspires.ftc.teamcode.utils.Annotations.TuningOpModes; import org.firstinspires.ftc.teamcode.utils.AutonomousProgramTemplate; -import org.firstinspires.ftc.teamcode.utils.enums.runningState; +import org.firstinspires.ftc.teamcode.utils.Enums.runningState; @Autonomous(name = "SimpleMecanumDrive_Test",group = "tune") @TuningOpModes diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/TurningDegPerTickTest.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/TurningDegPerTickTest.java index 90cd7c1..bf39d9d 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/TurningDegPerTickTest.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/TurningDegPerTickTest.java @@ -3,7 +3,7 @@ import com.acmerobotics.roadrunner.Pose2d; import com.qualcomm.robotcore.eventloop.opmode.TeleOp; -import org.firstinspires.ftc.teamcode.utils.Annotation.TuningOpModes; +import org.firstinspires.ftc.teamcode.utils.Annotations.TuningOpModes; import org.firstinspires.ftc.teamcode.utils.AutonomousProgramTemplate; @TeleOp(name = "TurningDegPerTickTest",group = "tune") diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Robot.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Robot.java index 9771798..3233d7f 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Robot.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Robot.java @@ -22,9 +22,9 @@ import org.firstinspires.ftc.teamcode.Hardwares.basic.Servos; import org.firstinspires.ftc.teamcode.utils.Client; import org.firstinspires.ftc.teamcode.utils.PID_processor; -import org.firstinspires.ftc.teamcode.utils.enums.ClipPosition; -import org.firstinspires.ftc.teamcode.utils.enums.State; -import org.firstinspires.ftc.teamcode.utils.enums.runningState; +import org.firstinspires.ftc.teamcode.utils.Enums.ClipPosition; +import org.firstinspires.ftc.teamcode.utils.Enums.State; +import org.firstinspires.ftc.teamcode.utils.Enums.runningState; import java.util.Objects; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RoboticActions.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RoboticActions.java index b6f737b..a2f8ff8 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RoboticActions.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RoboticActions.java @@ -3,7 +3,7 @@ import com.qualcomm.robotcore.hardware.HardwareMap; import org.firstinspires.ftc.teamcode.utils.Client; -import org.firstinspires.ftc.teamcode.utils.enums.runningState; +import org.firstinspires.ftc.teamcode.utils.Enums.runningState; public class RoboticActions extends Robot{ public RoboticActions(HardwareMap hardwareMap, runningState state, Client client) { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Annotation/LocalizationPlugin.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Annotations/LocalizationPlugin.java similarity index 86% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Annotation/LocalizationPlugin.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Annotations/LocalizationPlugin.java index 9d023db..88b03e6 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Annotation/LocalizationPlugin.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Annotations/LocalizationPlugin.java @@ -1,4 +1,4 @@ -package org.firstinspires.ftc.teamcode.utils.Annotation; +package org.firstinspires.ftc.teamcode.utils.Annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Annotation/LocalizationSubassembly.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Annotations/LocalizationSubassembly.java similarity index 88% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Annotation/LocalizationSubassembly.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Annotations/LocalizationSubassembly.java index cd5e75d..f849bc8 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Annotation/LocalizationSubassembly.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Annotations/LocalizationSubassembly.java @@ -1,4 +1,4 @@ -package org.firstinspires.ftc.teamcode.utils.Annotation; +package org.firstinspires.ftc.teamcode.utils.Annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Annotation/TuningOpModes.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Annotations/TuningOpModes.java similarity index 86% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Annotation/TuningOpModes.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Annotations/TuningOpModes.java index 4357e9c..eec6e27 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Annotation/TuningOpModes.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Annotations/TuningOpModes.java @@ -1,4 +1,4 @@ -package org.firstinspires.ftc.teamcode.utils.Annotation; +package org.firstinspires.ftc.teamcode.utils.Annotations; import com.qualcomm.robotcore.eventloop.opmode.Disabled; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/AutonomousProgramTemplate.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/AutonomousProgramTemplate.java index 3741c82..9858011 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/AutonomousProgramTemplate.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/AutonomousProgramTemplate.java @@ -5,7 +5,7 @@ import org.firstinspires.ftc.teamcode.DriveControls.SimpleMecanumDrive; import org.firstinspires.ftc.teamcode.Robot; -import org.firstinspires.ftc.teamcode.utils.enums.runningState; +import org.firstinspires.ftc.teamcode.utils.Enums.runningState; public abstract class AutonomousProgramTemplate extends LinearOpMode { public Robot robot; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Complex.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Complex.java index f405931..35b60ab 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Complex.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Complex.java @@ -4,7 +4,7 @@ import com.acmerobotics.roadrunner.Vector2d; -import org.firstinspires.ftc.teamcode.utils.enums.Quadrant; +import org.firstinspires.ftc.teamcode.utils.Enums.Quadrant; /** * 但凡Java支持重载运算符，都不至于写得这么复杂 diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/AutonomousLocation.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/AutonomousLocation.java similarity index 56% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/AutonomousLocation.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/AutonomousLocation.java index 68b0967..b3d8f71 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/AutonomousLocation.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/AutonomousLocation.java @@ -1,4 +1,4 @@ -package org.firstinspires.ftc.teamcode.utils.enums; +package org.firstinspires.ftc.teamcode.utils.Enums; public enum AutonomousLocation { left, diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/ClipPosition.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/ClipPosition.java new file mode 100644 index 0000000..b18ad14 --- /dev/null +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/ClipPosition.java @@ -0,0 +1,6 @@ +package org.firstinspires.ftc.teamcode.utils.Enums; + +public enum ClipPosition { + Open, + Close +} diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/DeadWheelsType.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/DeadWheelsType.java similarity index 63% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/DeadWheelsType.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/DeadWheelsType.java index 53f9a9a..9a2c473 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/DeadWheelsType.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/DeadWheelsType.java @@ -1,4 +1,4 @@ -package org.firstinspires.ftc.teamcode.utils.enums; +package org.firstinspires.ftc.teamcode.utils.Enums; public enum DeadWheelsType { BE_NOT_USING_DEAD_WHEELS, diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/HardwareState.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/HardwareState.java new file mode 100644 index 0000000..c32f23a --- /dev/null +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/HardwareState.java @@ -0,0 +1,6 @@ +package org.firstinspires.ftc.teamcode.utils.Enums; + +public enum HardwareState { + Enabled, + Disabled +} diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/Quadrant.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/Quadrant.java similarity index 86% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/Quadrant.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/Quadrant.java index 68f6fb5..4f7ec79 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/Quadrant.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/Quadrant.java @@ -1,4 +1,4 @@ -package org.firstinspires.ftc.teamcode.utils.enums; +package org.firstinspires.ftc.teamcode.utils.Enums; public enum Quadrant { /** diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/State.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/State.java similarity index 69% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/State.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/State.java index 0ebc0f9..ad626c5 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/State.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/State.java @@ -1,4 +1,4 @@ -package org.firstinspires.ftc.teamcode.utils.enums; +package org.firstinspires.ftc.teamcode.utils.Enums; public enum State { FollowSpline, diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/TrajectoryType.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/TrajectoryType.java similarity index 67% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/TrajectoryType.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/TrajectoryType.java index ef45d24..e5dd741 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/TrajectoryType.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/TrajectoryType.java @@ -1,4 +1,4 @@ -package org.firstinspires.ftc.teamcode.utils.enums; +package org.firstinspires.ftc.teamcode.utils.Enums; public enum TrajectoryType { LinerStrafe, diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/driveDirection.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/driveDirection.java similarity index 60% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/driveDirection.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/driveDirection.java index b57c27f..74555bb 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/driveDirection.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/driveDirection.java @@ -1,4 +1,4 @@ -package org.firstinspires.ftc.teamcode.utils.enums; +package org.firstinspires.ftc.teamcode.utils.Enums; public enum driveDirection { back, diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/runningState.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/runningState.java similarity index 51% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/runningState.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/runningState.java index 7cd7da8..32df9f0 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/runningState.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Enums/runningState.java @@ -1,4 +1,4 @@ -package org.firstinspires.ftc.teamcode.utils.enums; +package org.firstinspires.ftc.teamcode.utils.Enums; public enum runningState { Autonomous, diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/TeleopProgramTemplate.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/TeleopProgramTemplate.java index 4dd2a5b..71b544f 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/TeleopProgramTemplate.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/TeleopProgramTemplate.java @@ -3,7 +3,7 @@ import com.qualcomm.robotcore.eventloop.opmode.OpMode; import org.firstinspires.ftc.teamcode.Robot; -import org.firstinspires.ftc.teamcode.utils.enums.runningState; +import org.firstinspires.ftc.teamcode.utils.Enums.runningState; public abstract class TeleopProgramTemplate extends OpMode { public Robot robot; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/ClipPosition.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/ClipPosition.java deleted file mode 100644 index 11ec374..0000000 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/ClipPosition.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.firstinspires.ftc.teamcode.utils.enums; - -public enum ClipPosition { - Open, - Close -} diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/HardwareState.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/HardwareState.java deleted file mode 100644 index be4a7b9..0000000 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/enums/HardwareState.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.firstinspires.ftc.teamcode.utils.enums; - -public enum HardwareState { - Enabled, - Disabled -}