Skip to content

Commit 52e893e

Browse files
committed
重命名了一堆文件
1 parent aa8f3ea commit 52e893e

File tree

76 files changed

+170
-171
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+170
-171
lines changed

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Actions/DriveAction.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
import com.acmerobotics.roadrunner.Vector2d;
99
import com.acmerobotics.roadrunner.ftc.Actions;
1010

11-
import org.firstinspires.ftc.teamcode.DriveControls.DriveOrder;
11+
import org.firstinspires.ftc.teamcode.DriveControls.OrderDefinition.DriveOrder;
1212
import org.firstinspires.ftc.teamcode.Hardwares.Classic;
13-
import org.firstinspires.ftc.teamcode.utils.Complex;
14-
import org.firstinspires.ftc.teamcode.utils.Enums.TrajectoryType;
15-
import org.firstinspires.ftc.teamcode.utils.Enums.driveDirection;
16-
import org.firstinspires.ftc.teamcode.utils.Mathematics;
13+
import org.firstinspires.ftc.teamcode.Utils.Complex;
14+
import org.firstinspires.ftc.teamcode.Utils.Enums.TrajectoryType;
15+
import org.firstinspires.ftc.teamcode.Utils.Enums.driveDirection;
16+
import org.firstinspires.ftc.teamcode.Utils.Mathematics;
1717

1818
public class DriveAction implements DriveOrder {
1919
private final Classic classic;

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Actions/DriveActionPackage.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package org.firstinspires.ftc.teamcode.DriveControls.Actions;
22

3-
import org.firstinspires.ftc.teamcode.DriveControls.Commands.DriveCommand;
4-
import org.firstinspires.ftc.teamcode.DriveControls.DriveOrder;
5-
import org.firstinspires.ftc.teamcode.DriveControls.DriveOrderPackage;
3+
import org.firstinspires.ftc.teamcode.DriveControls.OrderDefinition.DriveOrder;
4+
import org.firstinspires.ftc.teamcode.DriveControls.OrderDefinition.DriveOrderPackage;
65

76
import java.util.LinkedList;
87

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Actions/DrivingActionsBuilder.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
import com.acmerobotics.roadrunner.Vector2d;
66

7-
import org.firstinspires.ftc.teamcode.DriveControls.DriveOrderBuilder;
8-
import org.firstinspires.ftc.teamcode.DriveControls.DriveOrderPackage;
7+
import org.firstinspires.ftc.teamcode.DriveControls.OrderDefinition.DriveOrderBuilder;
8+
import org.firstinspires.ftc.teamcode.DriveControls.OrderDefinition.DriveOrderPackage;
99
import org.firstinspires.ftc.teamcode.DriveControls.DriverProgram;
1010
import org.firstinspires.ftc.teamcode.DriveControls.SimpleMecanumDrive;
11-
import org.firstinspires.ftc.teamcode.utils.Enums.TrajectoryType;
12-
import org.firstinspires.ftc.teamcode.utils.Mathematics;
11+
import org.firstinspires.ftc.teamcode.Utils.Enums.TrajectoryType;
12+
import org.firstinspires.ftc.teamcode.Utils.Mathematics;
1313

1414
public class DrivingActionsBuilder implements DriveOrderBuilder {
1515
private final DriveActionPackage actionPackage;

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Commands/DriveCommand.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
import com.acmerobotics.roadrunner.Pose2d;
66
import com.acmerobotics.roadrunner.Vector2d;
77

8-
import org.firstinspires.ftc.teamcode.DriveControls.DriveOrder;
8+
import org.firstinspires.ftc.teamcode.DriveControls.OrderDefinition.DriveOrder;
99
import org.firstinspires.ftc.teamcode.Hardwares.Classic;
10-
import org.firstinspires.ftc.teamcode.utils.Complex;
11-
import org.firstinspires.ftc.teamcode.utils.Enums.TrajectoryType;
12-
import org.firstinspires.ftc.teamcode.utils.Enums.driveDirection;
13-
import org.firstinspires.ftc.teamcode.utils.Mathematics;
10+
import org.firstinspires.ftc.teamcode.Utils.Complex;
11+
import org.firstinspires.ftc.teamcode.Utils.Enums.TrajectoryType;
12+
import org.firstinspires.ftc.teamcode.Utils.Enums.driveDirection;
13+
import org.firstinspires.ftc.teamcode.Utils.Mathematics;
1414

1515
public class DriveCommand implements DriveOrder {
1616
private final Classic classic;

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Commands/DriveCommandPackage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.firstinspires.ftc.teamcode.DriveControls.Commands;
22

3-
import org.firstinspires.ftc.teamcode.DriveControls.DriveOrder;
4-
import org.firstinspires.ftc.teamcode.DriveControls.DriveOrderPackage;
3+
import org.firstinspires.ftc.teamcode.DriveControls.OrderDefinition.DriveOrder;
4+
import org.firstinspires.ftc.teamcode.DriveControls.OrderDefinition.DriveOrderPackage;
55

66
import java.util.LinkedList;
77

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Commands/DrivingCommandsBuilder.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
import com.acmerobotics.roadrunner.Vector2d;
66

7-
import org.firstinspires.ftc.teamcode.DriveControls.DriveOrderBuilder;
7+
import org.firstinspires.ftc.teamcode.DriveControls.OrderDefinition.DriveOrderBuilder;
88
import org.firstinspires.ftc.teamcode.DriveControls.DriverProgram;
99
import org.firstinspires.ftc.teamcode.DriveControls.SimpleMecanumDrive;
10-
import org.firstinspires.ftc.teamcode.utils.Enums.TrajectoryType;
11-
import org.firstinspires.ftc.teamcode.utils.Mathematics;
10+
import org.firstinspires.ftc.teamcode.Utils.Enums.TrajectoryType;
11+
import org.firstinspires.ftc.teamcode.Utils.Mathematics;
1212

1313
public class DrivingCommandsBuilder implements DriveOrderBuilder {
1414
private final DriveCommandPackage commandPackage;

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/CustomizeLocalizer.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
import androidx.annotation.NonNull;
44

5-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition.Localizer;
6-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition.LocalizerPlugin;
7-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition.SubassemblyLocalizer;
8-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.plugins.DeadWheelLocalizer;
9-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.plugins.ImuLocalizer;
5+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition.Localizer;
6+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition.LocalizerPlugin;
7+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition.SubassemblyLocalizer;
8+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerPlugins.DeadWheelLocalizer;
9+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerPlugins.ImuLocalizer;
1010
import org.firstinspires.ftc.teamcode.Hardwares.Classic;
11-
import org.firstinspires.ftc.teamcode.utils.Annotations.LocalizationSubassembly;
11+
import org.firstinspires.ftc.teamcode.Utils.Annotations.LocalizationSubassembly;
1212

1313
@LocalizationSubassembly
1414
public class CustomizeLocalizer extends SubassemblyLocalizer implements Localizer {

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/DeadWheelSubassemblyLocalizer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
import com.acmerobotics.roadrunner.Pose2d;
44

5-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition.Localizer;
6-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition.SubassemblyLocalizer;
7-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.plugins.DeadWheelLocalizer;
5+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition.Localizer;
6+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition.SubassemblyLocalizer;
7+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerPlugins.DeadWheelLocalizer;
88
import org.firstinspires.ftc.teamcode.Hardwares.Classic;
9-
import org.firstinspires.ftc.teamcode.utils.Annotations.LocalizationSubassembly;
9+
import org.firstinspires.ftc.teamcode.Utils.Annotations.LocalizationSubassembly;
1010

1111
@LocalizationSubassembly
1212
public class DeadWheelSubassemblyLocalizer extends SubassemblyLocalizer implements Localizer {

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/IMUSubassemblyLocalizer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
import com.acmerobotics.roadrunner.Pose2d;
44

5-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.plugins.ImuLocalizer;
6-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition.Localizer;
7-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition.SubassemblyLocalizer;
5+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerPlugins.ImuLocalizer;
6+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition.Localizer;
7+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition.SubassemblyLocalizer;
88
import org.firstinspires.ftc.teamcode.Hardwares.Classic;
9-
import org.firstinspires.ftc.teamcode.utils.Annotations.LocalizationSubassembly;
9+
import org.firstinspires.ftc.teamcode.Utils.Annotations.LocalizationSubassembly;
1010

1111
@LocalizationSubassembly
1212
public class IMUSubassemblyLocalizer extends SubassemblyLocalizer implements Localizer {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition;
1+
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition;
22

33
public interface HeadingLocalizerPlugin extends LocalizerPlugin{
44
double getHeadingDeg();

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/definition/Localizer.java renamed to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/LocalizerDefinition/Localizer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition;
1+
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition;
22

33
import com.acmerobotics.roadrunner.Pose2d;
44

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition;
1+
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition;
22

33
public interface LocalizerPlugin extends Localizer{}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition;
1+
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition;
22

33
import com.acmerobotics.roadrunner.Pose2d;
44

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition;
1+
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition;
22

33
import androidx.annotation.NonNull;
44

55
import com.acmerobotics.roadrunner.Pose2d;
66

7-
import org.firstinspires.ftc.teamcode.utils.Exceptions.UnKnownErrorsException;
7+
import org.firstinspires.ftc.teamcode.Utils.Exceptions.UnKnownErrorsException;
88

99
public abstract class SubassemblyLocalizer implements Localizer{
1010
public final LocalizerPlugin[] plugins;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition;
1+
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition;
22

33
import com.acmerobotics.roadrunner.Pose2d;
44
import com.acmerobotics.roadrunner.Vector2d;
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.plugins;
1+
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerPlugins;
22

33
import androidx.annotation.NonNull;
44

5-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition.HeadingLocalizerPlugin;
5+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition.HeadingLocalizerPlugin;
66
import org.firstinspires.ftc.teamcode.Hardwares.Classic;
77
import org.firstinspires.ftc.teamcode.Hardwares.basic.Sensors;
88
import org.firstinspires.ftc.teamcode.Params;
9-
import org.firstinspires.ftc.teamcode.utils.Annotations.LocalizationPlugin;
9+
import org.firstinspires.ftc.teamcode.Utils.Annotations.LocalizationPlugin;
1010

1111
@LocalizationPlugin
1212
public final class DeadWheelHeadingLocalizer implements HeadingLocalizerPlugin {
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.plugins;
1+
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerPlugins;
22

33
import androidx.annotation.NonNull;
44

55
import com.acmerobotics.roadrunner.Pose2d;
66

7-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition.HeadingLocalizerPlugin;
8-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition.PositionLocalizerPlugin;
7+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition.HeadingLocalizerPlugin;
8+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition.PositionLocalizerPlugin;
99
import org.firstinspires.ftc.teamcode.Hardwares.Classic;
10-
import org.firstinspires.ftc.teamcode.utils.Annotations.LocalizationPlugin;
10+
import org.firstinspires.ftc.teamcode.Utils.Annotations.LocalizationPlugin;
1111

1212
@LocalizationPlugin
1313
public class DeadWheelLocalizer implements PositionLocalizerPlugin {
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.plugins;
1+
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerPlugins;
22

33
import static org.firstinspires.ftc.teamcode.Params.AxialInchPerTick;
44
import static org.firstinspires.ftc.teamcode.Params.LateralInchPerTick;
@@ -8,10 +8,10 @@
88

99
import com.acmerobotics.roadrunner.Vector2d;
1010

11-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition.VectorPositionLocalizerPlugin;
11+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition.VectorPositionLocalizerPlugin;
1212
import org.firstinspires.ftc.teamcode.Hardwares.Classic;
1313
import org.firstinspires.ftc.teamcode.Hardwares.basic.Sensors;
14-
import org.firstinspires.ftc.teamcode.utils.Annotations.LocalizationPlugin;
14+
import org.firstinspires.ftc.teamcode.Utils.Annotations.LocalizationPlugin;
1515

1616
@LocalizationPlugin
1717
public final class DeadWheelVectorPositionLocalizer implements VectorPositionLocalizerPlugin {
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.plugins;
1+
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerPlugins;
22

33
import androidx.annotation.NonNull;
44

5-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition.HeadingLocalizerPlugin;
5+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition.HeadingLocalizerPlugin;
66
import org.firstinspires.ftc.teamcode.Hardwares.Classic;
77
import org.firstinspires.ftc.teamcode.Hardwares.basic.Sensors;
8-
import org.firstinspires.ftc.teamcode.utils.Annotations.LocalizationPlugin;
8+
import org.firstinspires.ftc.teamcode.Utils.Annotations.LocalizationPlugin;
99

1010
@LocalizationPlugin
1111
public class ImuHeadingLocalizer implements HeadingLocalizerPlugin {

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/ImuLocalizer.java renamed to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/LocalizerPlugins/ImuLocalizer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.plugins;
1+
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerPlugins;
22

33
import androidx.annotation.NonNull;
44

55
import com.acmerobotics.roadrunner.Pose2d;
66
import com.acmerobotics.roadrunner.Vector2d;
77

8-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition.PositionLocalizerPlugin;
8+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition.PositionLocalizerPlugin;
99
import org.firstinspires.ftc.teamcode.Hardwares.Classic;
1010
import org.firstinspires.ftc.teamcode.Hardwares.basic.Sensors;
1111
import org.firstinspires.ftc.teamcode.Params;
12-
import org.firstinspires.ftc.teamcode.utils.Annotations.LocalizationPlugin;
13-
import org.firstinspires.ftc.teamcode.utils.Complex;
12+
import org.firstinspires.ftc.teamcode.Utils.Annotations.LocalizationPlugin;
13+
import org.firstinspires.ftc.teamcode.Utils.Complex;
1414

1515
@LocalizationPlugin
1616
public class ImuLocalizer implements PositionLocalizerPlugin {
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.plugins;
1+
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerPlugins;
22

33
import com.acmerobotics.roadrunner.Vector2d;
44

5-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition.VectorPositionLocalizerPlugin;
5+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition.VectorPositionLocalizerPlugin;
66
import org.firstinspires.ftc.teamcode.Hardwares.Classic;
7-
import org.firstinspires.ftc.teamcode.utils.Annotations.LocalizationPlugin;
7+
import org.firstinspires.ftc.teamcode.Utils.Annotations.LocalizationPlugin;
88

99
@LocalizationPlugin
1010
public final class ImuVectorPositionLocalizer extends ImuLocalizer implements VectorPositionLocalizerPlugin {

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/plugins/NewImuLocalizer.java renamed to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/LocalizerPlugins/NewImuLocalizer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.plugins;
1+
package org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerPlugins;
22

33
import androidx.annotation.NonNull;
44

55
import com.acmerobotics.roadrunner.Pose2d;
66

7-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition.PositionLocalizerPlugin;
7+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition.PositionLocalizerPlugin;
88
import org.firstinspires.ftc.teamcode.Hardwares.Classic;
99
import org.firstinspires.ftc.teamcode.Hardwares.basic.Sensors;
1010
import org.firstinspires.ftc.teamcode.Params;
11-
import org.firstinspires.ftc.teamcode.utils.Annotations.LocalizationPlugin;
12-
import org.firstinspires.ftc.teamcode.utils.Complex;
11+
import org.firstinspires.ftc.teamcode.Utils.Annotations.LocalizationPlugin;
12+
import org.firstinspires.ftc.teamcode.Utils.Complex;
1313

1414
@LocalizationPlugin
1515
public class NewImuLocalizer implements PositionLocalizerPlugin {

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/Localizers/SimpleSubassemblyLocalizer.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import com.acmerobotics.roadrunner.Pose2d;
44

5-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition.Localizer;
6-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition.SubassemblyLocalizer;
7-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.plugins.DeadWheelHeadingLocalizer;
8-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.plugins.ImuVectorPositionLocalizer;
5+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition.Localizer;
6+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition.SubassemblyLocalizer;
7+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerPlugins.DeadWheelHeadingLocalizer;
8+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerPlugins.ImuVectorPositionLocalizer;
99
import org.firstinspires.ftc.teamcode.Hardwares.Classic;
10-
import org.firstinspires.ftc.teamcode.utils.Annotations.LocalizationSubassembly;
10+
import org.firstinspires.ftc.teamcode.Utils.Annotations.LocalizationSubassembly;
1111

1212
@LocalizationSubassembly
1313
public class SimpleSubassemblyLocalizer extends SubassemblyLocalizer implements Localizer {

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/DriveOrder.java renamed to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/OrderDefinition/DriveOrder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.firstinspires.ftc.teamcode.DriveControls;
1+
package org.firstinspires.ftc.teamcode.DriveControls.OrderDefinition;
22

33
import androidx.annotation.NonNull;
44

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/DriveOrderBuilder.java renamed to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/OrderDefinition/DriveOrderBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.firstinspires.ftc.teamcode.DriveControls;
1+
package org.firstinspires.ftc.teamcode.DriveControls.OrderDefinition;
22

33
import com.acmerobotics.roadrunner.Vector2d;
44

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/DriveOrderPackage.java renamed to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/OrderDefinition/DriveOrderPackage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.firstinspires.ftc.teamcode.DriveControls;
1+
package org.firstinspires.ftc.teamcode.DriveControls.OrderDefinition;
22

33
import java.util.LinkedList;
44

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveControls/SimpleMecanumDrive.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
import org.firstinspires.ftc.teamcode.DriveControls.Commands.DriveCommandPackage;
1414
import org.firstinspires.ftc.teamcode.DriveControls.Commands.DrivingCommandsBuilder;
1515
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.DeadWheelSubassemblyLocalizer;
16-
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.definition.Localizer;
16+
import org.firstinspires.ftc.teamcode.DriveControls.Localizers.LocalizerDefinition.Localizer;
1717
import org.firstinspires.ftc.teamcode.Hardwares.Classic;
1818
import org.firstinspires.ftc.teamcode.Hardwares.basic.Motors;
1919
import org.firstinspires.ftc.teamcode.Params;
2020
import org.firstinspires.ftc.teamcode.Robot;
21-
import org.firstinspires.ftc.teamcode.utils.Client;
22-
import org.firstinspires.ftc.teamcode.utils.Complex;
23-
import org.firstinspires.ftc.teamcode.utils.Enums.State;
24-
import org.firstinspires.ftc.teamcode.utils.PID_processor;
25-
import org.firstinspires.ftc.teamcode.utils.Timer;
21+
import org.firstinspires.ftc.teamcode.Utils.Client;
22+
import org.firstinspires.ftc.teamcode.Utils.Complex;
23+
import org.firstinspires.ftc.teamcode.Utils.Enums.State;
24+
import org.firstinspires.ftc.teamcode.Utils.PID_processor;
25+
import org.firstinspires.ftc.teamcode.Utils.Timer;
2626

2727
import java.util.LinkedList;
2828

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/Classic.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import org.firstinspires.ftc.teamcode.Hardwares.basic.Motors;
1010
import org.firstinspires.ftc.teamcode.Hardwares.basic.Sensors;
1111
import org.firstinspires.ftc.teamcode.Params;
12-
import org.firstinspires.ftc.teamcode.utils.Enums.Quadrant;
13-
import org.firstinspires.ftc.teamcode.utils.Enums.driveDirection;
14-
import org.firstinspires.ftc.teamcode.utils.Mathematics;
12+
import org.firstinspires.ftc.teamcode.Utils.Enums.Quadrant;
13+
import org.firstinspires.ftc.teamcode.Utils.Enums.driveDirection;
14+
import org.firstinspires.ftc.teamcode.Utils.Mathematics;
1515

1616
public class Classic {
1717
public Motors motors;

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/Structure.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import org.firstinspires.ftc.teamcode.Hardwares.basic.Motors;
1111
import org.firstinspires.ftc.teamcode.Hardwares.basic.Servos;
1212
import org.firstinspires.ftc.teamcode.Params;
13-
import org.firstinspires.ftc.teamcode.utils.Enums.ClipPosition;
14-
import org.firstinspires.ftc.teamcode.utils.Exceptions.UnKnownErrorsException;
13+
import org.firstinspires.ftc.teamcode.Utils.Enums.ClipPosition;
14+
import org.firstinspires.ftc.teamcode.Utils.Exceptions.UnKnownErrorsException;
1515

1616
public class Structure {
1717
Motors motors;

0 commit comments

Comments
 (0)