Skip to content

Commit

Permalink
重命名
Browse files Browse the repository at this point in the history
  • Loading branch information
6-BennyLi-9 committed Aug 24, 2024
1 parent 761facd commit 9cc713b
Show file tree
Hide file tree
Showing 48 changed files with 64 additions and 64 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:按需求修改
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:以下名字均为我们团队所测定的
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.运行程序
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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支持重载运算符,都不至于写得这么复杂
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.firstinspires.ftc.teamcode.utils.enums;
package org.firstinspires.ftc.teamcode.utils.Enums;

public enum AutonomousLocation {
left,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package org.firstinspires.ftc.teamcode.utils.Enums;

public enum ClipPosition {
Open,
Close
}
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package org.firstinspires.ftc.teamcode.utils.Enums;

public enum HardwareState {
Enabled,
Disabled
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.firstinspires.ftc.teamcode.utils.enums;
package org.firstinspires.ftc.teamcode.utils.Enums;

public enum Quadrant {
/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.firstinspires.ftc.teamcode.utils.enums;
package org.firstinspires.ftc.teamcode.utils.Enums;

public enum State {
FollowSpline,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.firstinspires.ftc.teamcode.utils.enums;
package org.firstinspires.ftc.teamcode.utils.Enums;

public enum TrajectoryType {
LinerStrafe,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.firstinspires.ftc.teamcode.utils.enums;
package org.firstinspires.ftc.teamcode.utils.Enums;

public enum driveDirection {
back,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.firstinspires.ftc.teamcode.utils.enums;
package org.firstinspires.ftc.teamcode.utils.Enums;

public enum runningState {
Autonomous,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading

0 comments on commit 9cc713b

Please sign in to comment.