Skip to content

Commit a4d786d

Browse files
6-BennyLi-96-BennyLi-9
committed
移动测试
1 parent 8207c9f commit a4d786d

File tree

159 files changed

+618
-2403
lines changed

Some content is hidden

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

159 files changed

+618
-2403
lines changed

‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ric/DefaultKeyMapController.java renamed to ‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DefaultKeyMapController.java

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

33
import androidx.annotation.NonNull;
44

5-
import org.firstinspires.ftc.teamcode.ric.keymap.KeyMap;
5+
import org.firstinspires.ftc.teamcode.keymap.KeyMap;
66

77
public class DefaultKeyMapController extends KeyMapController{
88
@Override

‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ric/DefaultParamsController.java renamed to ‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DefaultParamsController.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.ric;
1+
package org.firstinspires.ftc.teamcode;
22

33
public class DefaultParamsController extends ParamsController{
44
@Override

‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ric/Global.java renamed to ‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Global.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
package org.firstinspires.ftc.teamcode.ric;
1+
package org.firstinspires.ftc.teamcode;
22

33
import androidx.annotation.NonNull;
44

55
import com.qualcomm.robotcore.hardware.Gamepad;
66

7-
import org.firstinspires.ftc.teamcode.ric.drives.controls.definition.DriverProgram;
8-
import org.firstinspires.ftc.teamcode.ric.hardwares.integration.IntegrationGamepad;
9-
import org.firstinspires.ftc.teamcode.ric.hardwares.integration.IntegrationHardwareMap;
10-
import org.firstinspires.ftc.teamcode.ric.utils.ActionBox;
11-
import org.firstinspires.ftc.teamcode.ric.utils.annotations.UserRequirementFunctions;
12-
import org.firstinspires.ftc.teamcode.ric.utils.clients.Client;
13-
import org.firstinspires.ftc.teamcode.ric.utils.enums.RunningMode;
7+
import org.firstinspires.ftc.teamcode.drives.controls.definition.DriverProgram;
8+
import org.firstinspires.ftc.teamcode.hardwares.integration.IntegrationGamepad;
9+
import org.firstinspires.ftc.teamcode.hardwares.integration.IntegrationHardwareMap;
10+
import org.firstinspires.ftc.teamcode.utils.ActionBox;
11+
import org.firstinspires.ftc.teamcode.utils.annotations.UserRequirementFunctions;
12+
import org.firstinspires.ftc.teamcode.utils.clients.Client;
13+
import org.firstinspires.ftc.teamcode.utils.enums.RunningMode;
1414

1515
public final class Global {
1616
public static Robot robot;

‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ric/KeyMapController.java renamed to ‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/KeyMapController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package org.firstinspires.ftc.teamcode.ric;
1+
package org.firstinspires.ftc.teamcode;
22

33
import androidx.annotation.NonNull;
44

5-
import org.firstinspires.ftc.teamcode.ric.keymap.KeyMap;
6-
import org.firstinspires.ftc.teamcode.ric.utils.annotations.UserRequirementFunctions;
5+
import org.firstinspires.ftc.teamcode.keymap.KeyMap;
6+
import org.firstinspires.ftc.teamcode.utils.annotations.UserRequirementFunctions;
77

88
/**
99
* @see Robot

‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ric/Params.java renamed to ‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Params.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package org.firstinspires.ftc.teamcode.ric;
1+
package org.firstinspires.ftc.teamcode;
22

33
import com.acmerobotics.dashboard.config.Config;
44

5-
import org.firstinspires.ftc.teamcode.ric.codes.tunings.SecPowerPerInchTuner;
6-
import org.firstinspires.ftc.teamcode.ric.codes.tunings.ThreeInOne_DeadWheelTuner;
5+
import org.firstinspires.ftc.teamcode.codes.tunings.SecPowerPerInchTuner;
6+
import org.firstinspires.ftc.teamcode.codes.tunings.ThreeInOne_DeadWheelTuner;
77

88
@Config
99
public class Params {

‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ric/ParamsController.java renamed to ‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ParamsController.java

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

3-
import org.firstinspires.ftc.teamcode.ric.utils.annotations.UserRequirementFunctions;
3+
import org.firstinspires.ftc.teamcode.utils.annotations.UserRequirementFunctions;
44

55
/**
66
* @see Robot

‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ric/README.md renamed to ‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/README.md

File renamed without changes.

‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ric/README_CN.md renamed to ‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/README_CN.md

File renamed without changes.

‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ric/Robot.java renamed to ‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Robot.java

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.firstinspires.ftc.teamcode.ric;
1+
package org.firstinspires.ftc.teamcode;
22

33
import android.util.Log;
44

@@ -12,29 +12,29 @@
1212
import com.qualcomm.robotcore.hardware.HardwareMap;
1313

1414
import org.firstinspires.ftc.robotcore.external.Telemetry;
15-
import org.firstinspires.ftc.teamcode.ric.drives.controls.MecanumDrive;
16-
import org.firstinspires.ftc.teamcode.ric.drives.controls.definition.DriveOrderBuilder;
17-
import org.firstinspires.ftc.teamcode.ric.drives.controls.definition.DriverProgram;
18-
import org.firstinspires.ftc.teamcode.ric.drives.controls.SimpleMecanumDrive;
19-
import org.firstinspires.ftc.teamcode.ric.hardwares.basic.Motors;
20-
import org.firstinspires.ftc.teamcode.ric.hardwares.basic.Sensors;
21-
import org.firstinspires.ftc.teamcode.ric.hardwares.basic.Servos;
22-
import org.firstinspires.ftc.teamcode.ric.hardwares.Chassis;
23-
import org.firstinspires.ftc.teamcode.ric.hardwares.integration.IntegrationHardwareMap;
24-
import org.firstinspires.ftc.teamcode.ric.hardwares.integration.IntegrationGamepad;
25-
import org.firstinspires.ftc.teamcode.ric.hardwares.Structure;
26-
import org.firstinspires.ftc.teamcode.ric.hardwares.Webcam;
27-
import org.firstinspires.ftc.teamcode.ric.utils.ActionBox;
28-
import org.firstinspires.ftc.teamcode.ric.utils.annotations.ExtractedInterfaces;
29-
import org.firstinspires.ftc.teamcode.ric.utils.annotations.UserRequirementFunctions;
30-
import org.firstinspires.ftc.teamcode.ric.utils.clients.Client;
31-
import org.firstinspires.ftc.teamcode.ric.hardwares.basic.ClipPosition;
32-
import org.firstinspires.ftc.teamcode.ric.utils.enums.RunningMode;
33-
import org.firstinspires.ftc.teamcode.ric.utils.enums.RobotState;
34-
import org.firstinspires.ftc.teamcode.ric.utils.exceptions.DeviceDisabledException;
35-
import org.firstinspires.ftc.teamcode.ric.utils.exceptions.UnKnownErrorsException;
36-
import org.firstinspires.ftc.teamcode.ric.utils.PID.PidProcessor;
37-
import org.firstinspires.ftc.teamcode.ric.utils.Timer;
15+
import org.firstinspires.ftc.teamcode.drives.controls.MecanumDrive;
16+
import org.firstinspires.ftc.teamcode.drives.controls.definition.DriveOrderBuilder;
17+
import org.firstinspires.ftc.teamcode.drives.controls.definition.DriverProgram;
18+
import org.firstinspires.ftc.teamcode.drives.controls.SimpleMecanumDrive;
19+
import org.firstinspires.ftc.teamcode.hardwares.basic.Motors;
20+
import org.firstinspires.ftc.teamcode.hardwares.basic.Sensors;
21+
import org.firstinspires.ftc.teamcode.hardwares.basic.Servos;
22+
import org.firstinspires.ftc.teamcode.hardwares.Chassis;
23+
import org.firstinspires.ftc.teamcode.hardwares.integration.IntegrationHardwareMap;
24+
import org.firstinspires.ftc.teamcode.hardwares.integration.IntegrationGamepad;
25+
import org.firstinspires.ftc.teamcode.hardwares.Structure;
26+
import org.firstinspires.ftc.teamcode.hardwares.Webcam;
27+
import org.firstinspires.ftc.teamcode.utils.ActionBox;
28+
import org.firstinspires.ftc.teamcode.utils.annotations.ExtractedInterfaces;
29+
import org.firstinspires.ftc.teamcode.utils.annotations.UserRequirementFunctions;
30+
import org.firstinspires.ftc.teamcode.utils.clients.Client;
31+
import org.firstinspires.ftc.teamcode.hardwares.basic.ClipPosition;
32+
import org.firstinspires.ftc.teamcode.utils.enums.RunningMode;
33+
import org.firstinspires.ftc.teamcode.utils.enums.RobotState;
34+
import org.firstinspires.ftc.teamcode.utils.exceptions.DeviceDisabledException;
35+
import org.firstinspires.ftc.teamcode.utils.exceptions.UnKnownErrorsException;
36+
import org.firstinspires.ftc.teamcode.utils.PID.PidProcessor;
37+
import org.firstinspires.ftc.teamcode.utils.Timer;
3838

3939
public class Robot {
4040
public IntegrationHardwareMap lazyIntegratedDevices;

‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ric/RoboticActions.java renamed to ‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RoboticActions.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package org.firstinspires.ftc.teamcode.ric;
1+
package org.firstinspires.ftc.teamcode;
22

33
import com.qualcomm.robotcore.hardware.HardwareMap;
44

5-
import org.firstinspires.ftc.teamcode.ric.utils.clients.Client;
6-
import org.firstinspires.ftc.teamcode.ric.utils.enums.RunningMode;
5+
import org.firstinspires.ftc.teamcode.utils.clients.Client;
6+
import org.firstinspires.ftc.teamcode.utils.enums.RunningMode;
77

88
@Deprecated
99
public class RoboticActions extends Robot{

‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ric/actions/ClipOptionAction.java renamed to ‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/actions/ClipOptionAction.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
package org.firstinspires.ftc.teamcode.ric.actions;
1+
package org.firstinspires.ftc.teamcode.actions;
22

33
import androidx.annotation.NonNull;
44

55
import com.acmerobotics.dashboard.telemetry.TelemetryPacket;
66
import com.acmerobotics.roadrunner.Action;
77

8-
import org.firstinspires.ftc.teamcode.ric.hardwares.basic.ClipPosition;
9-
import org.firstinspires.ftc.teamcode.ric.hardwares.basic.Servos;
10-
import org.firstinspires.ftc.teamcode.ric.hardwares.Structure;
11-
import org.firstinspires.ftc.teamcode.ric.Params;
12-
import org.firstinspires.ftc.teamcode.ric.utils.annotations.UserRequirementFunctions;
8+
import org.firstinspires.ftc.teamcode.hardwares.basic.ClipPosition;
9+
import org.firstinspires.ftc.teamcode.hardwares.basic.Servos;
10+
import org.firstinspires.ftc.teamcode.hardwares.Structure;
11+
import org.firstinspires.ftc.teamcode.Params;
12+
import org.firstinspires.ftc.teamcode.utils.annotations.UserRequirementFunctions;
1313

1414
@Deprecated
1515
public class ClipOptionAction implements Action {

‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ric/actions/MotorControllerAction.java renamed to ‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/actions/MotorControllerAction.java

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

33
import androidx.annotation.NonNull;
44

55
import com.acmerobotics.dashboard.telemetry.TelemetryPacket;
66
import com.acmerobotics.roadrunner.Action;
77

8-
import org.firstinspires.ftc.teamcode.ric.hardwares.integration.PositionalIntegrationMotor;
8+
import org.firstinspires.ftc.teamcode.hardwares.integration.PositionalIntegrationMotor;
99

1010
public class MotorControllerAction implements Action {
1111
private final PositionalIntegrationMotor motor;

‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ric/actions/StructureActions.java renamed to ‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/actions/StructureActions.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package org.firstinspires.ftc.teamcode.ric.actions;
1+
package org.firstinspires.ftc.teamcode.actions;
22

33
import androidx.annotation.NonNull;
44

55
import com.acmerobotics.dashboard.telemetry.TelemetryPacket;
66
import com.acmerobotics.roadrunner.Action;
77
import com.acmerobotics.roadrunner.ParallelAction;
88

9-
import org.firstinspires.ftc.teamcode.ric.hardwares.integration.IntegrationServo;
10-
import org.firstinspires.ftc.teamcode.ric.hardwares.Structure;
11-
import org.firstinspires.ftc.teamcode.ric.utils.annotations.UserRequirementFunctions;
9+
import org.firstinspires.ftc.teamcode.hardwares.integration.IntegrationServo;
10+
import org.firstinspires.ftc.teamcode.hardwares.Structure;
11+
import org.firstinspires.ftc.teamcode.utils.annotations.UserRequirementFunctions;
1212

1313
public class StructureActions {
1414
public Structure controller;

‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ric/codes/samples/AutonomousSample2024.java renamed to ‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/codes/samples/AutonomousSample2024.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
package org.firstinspires.ftc.teamcode.ric.codes.samples;
1+
package org.firstinspires.ftc.teamcode.codes.samples;
22

33
import com.acmerobotics.roadrunner.Pose2d;
44
import com.acmerobotics.roadrunner.Vector2d;
55
import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
66
import com.qualcomm.robotcore.eventloop.opmode.Disabled;
77

8-
import org.firstinspires.ftc.teamcode.ric.Params;
9-
import org.firstinspires.ftc.teamcode.ric.codes.templates.AutonomousProgramTemplate;
10-
import org.firstinspires.ftc.teamcode.ric.drives.controls.commands.DriveCommandPackage;
11-
import org.firstinspires.ftc.teamcode.ric.hardwares.Webcam;
12-
import org.firstinspires.ftc.teamcode.ric.utils.enums.AutonomousLocation;
8+
import org.firstinspires.ftc.teamcode.Params;
9+
import org.firstinspires.ftc.teamcode.codes.templates.AutonomousProgramTemplate;
10+
import org.firstinspires.ftc.teamcode.drives.controls.commands.DriveCommandPackage;
11+
import org.firstinspires.ftc.teamcode.hardwares.Webcam;
12+
import org.firstinspires.ftc.teamcode.utils.enums.AutonomousLocation;
1313

1414
/**
1515
* A sample of 2023-2024 season basic Autonomous.

‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ric/codes/samples/CameraDetection.java renamed to ‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/codes/samples/CameraDetection.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package org.firstinspires.ftc.teamcode.ric.codes.samples;
1+
package org.firstinspires.ftc.teamcode.codes.samples;
22

33
import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
44
import com.qualcomm.robotcore.eventloop.opmode.Disabled;
55

66
import org.firstinspires.ftc.robotcore.external.hardware.camera.WebcamName;
7-
import org.firstinspires.ftc.teamcode.ric.Params;
8-
import org.firstinspires.ftc.teamcode.ric.codes.templates.AutonomousProgramTemplate;
9-
import org.firstinspires.ftc.teamcode.ric.hardwares.basic.Camera;
7+
import org.firstinspires.ftc.teamcode.Params;
8+
import org.firstinspires.ftc.teamcode.codes.templates.AutonomousProgramTemplate;
9+
import org.firstinspires.ftc.teamcode.hardwares.basic.Camera;
1010
import org.openftc.easyopencv.OpenCvCamera;
1111
import org.openftc.easyopencv.OpenCvCameraFactory;
1212
import org.openftc.easyopencv.OpenCvCameraRotation;

‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ric/codes/samples/ClientUsage.java renamed to ‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/codes/samples/ClientUsage.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package org.firstinspires.ftc.teamcode.ric.codes.samples;
1+
package org.firstinspires.ftc.teamcode.codes.samples;
22

33
import com.acmerobotics.roadrunner.SleepAction;
44
import com.acmerobotics.roadrunner.ftc.Actions;
55
import com.qualcomm.robotcore.eventloop.opmode.Disabled;
66
import com.qualcomm.robotcore.eventloop.opmode.OpMode;
77
import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
88

9-
import org.firstinspires.ftc.teamcode.ric.Params;
10-
import org.firstinspires.ftc.teamcode.ric.utils.clients.Client;
9+
import org.firstinspires.ftc.teamcode.Params;
10+
import org.firstinspires.ftc.teamcode.utils.clients.Client;
1111

1212
@TeleOp(name = "ClientUsage",group = Params.Configs.SampleOpModesGroup)
1313
@Disabled

‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ric/codes/samples/CompareTelemetryAndClient.java renamed to ‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/codes/samples/CompareTelemetryAndClient.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package org.firstinspires.ftc.teamcode.ric.codes.samples;
1+
package org.firstinspires.ftc.teamcode.codes.samples;
22

33
import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
44
import com.qualcomm.robotcore.eventloop.opmode.Disabled;
55
import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
66

77
import org.firstinspires.ftc.robotcore.external.Telemetry;
8-
import org.firstinspires.ftc.teamcode.ric.Params;
9-
import org.firstinspires.ftc.teamcode.ric.utils.annotations.Beta;
10-
import org.firstinspires.ftc.teamcode.ric.utils.clients.Client;
8+
import org.firstinspires.ftc.teamcode.Params;
9+
import org.firstinspires.ftc.teamcode.utils.annotations.Beta;
10+
import org.firstinspires.ftc.teamcode.utils.clients.Client;
1111

1212
/**
1313
* 用于演示 Telemetry 和 Client 的区别

‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ric/codes/samples/ManualCodeSample.java renamed to ‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/codes/samples/ManualCodeSample.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package org.firstinspires.ftc.teamcode.ric.codes.samples;
1+
package org.firstinspires.ftc.teamcode.codes.samples;
22

33
import com.qualcomm.robotcore.eventloop.opmode.Disabled;
44
import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
55

6-
import org.firstinspires.ftc.teamcode.ric.Params;
7-
import org.firstinspires.ftc.teamcode.ric.codes.templates.TeleopProgramTemplate;
6+
import org.firstinspires.ftc.teamcode.Params;
7+
import org.firstinspires.ftc.teamcode.codes.templates.TeleopProgramTemplate;
88

99
@TeleOp(name = "ManualCodeSample",group = Params.Configs.SampleOpModesGroup)
1010
@Disabled

‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ric/codes/samples/ManualCodeSample2.java renamed to ‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/codes/samples/ManualCodeSample2.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package org.firstinspires.ftc.teamcode.ric.codes.samples;
1+
package org.firstinspires.ftc.teamcode.codes.samples;
22

33
import com.qualcomm.robotcore.eventloop.opmode.Disabled;
44
import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
55

6-
import org.firstinspires.ftc.teamcode.ric.Params;
7-
import org.firstinspires.ftc.teamcode.ric.codes.templates.TeleopProgramTemplate;
6+
import org.firstinspires.ftc.teamcode.Params;
7+
import org.firstinspires.ftc.teamcode.codes.templates.TeleopProgramTemplate;
88

99
@TeleOp(name = "ManualCodeSample2",group = Params.Configs.SampleOpModesGroup)
1010
@Disabled

‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ric/codes/samples/ManualDriveSample.java renamed to ‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/codes/samples/ManualDriveSample.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package org.firstinspires.ftc.teamcode.ric.codes.samples;
1+
package org.firstinspires.ftc.teamcode.codes.samples;
22

33
import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
44

5-
import org.firstinspires.ftc.teamcode.ric.Params;
6-
import org.firstinspires.ftc.teamcode.ric.codes.templates.TeleopProgramTemplate;
7-
import org.firstinspires.ftc.teamcode.ric.hardwares.integration.gamepads.KeyMapSettingType;
8-
import org.firstinspires.ftc.teamcode.ric.hardwares.integration.gamepads.KeyRodType;
9-
import org.firstinspires.ftc.teamcode.ric.hardwares.integration.gamepads.KeyTag;
5+
import org.firstinspires.ftc.teamcode.Params;
6+
import org.firstinspires.ftc.teamcode.codes.templates.TeleopProgramTemplate;
7+
import org.firstinspires.ftc.teamcode.hardwares.integration.gamepads.KeyMapSettingType;
8+
import org.firstinspires.ftc.teamcode.hardwares.integration.gamepads.KeyRodType;
9+
import org.firstinspires.ftc.teamcode.hardwares.integration.gamepads.KeyTag;
1010

1111
@TeleOp(name = "ManualDriveSample",group = Params.Configs.SampleOpModesGroup)
1212
public class ManualDriveSample extends TeleopProgramTemplate {

‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ric/codes/samples/WebcamDetection.java renamed to ‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/codes/samples/WebcamDetection.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package org.firstinspires.ftc.teamcode.ric.codes.samples;
1+
package org.firstinspires.ftc.teamcode.codes.samples;
22

33
import com.acmerobotics.roadrunner.SleepAction;
44
import com.acmerobotics.roadrunner.ftc.Actions;
55
import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
66
import com.qualcomm.robotcore.eventloop.opmode.Disabled;
77

8-
import org.firstinspires.ftc.teamcode.ric.Params;
9-
import org.firstinspires.ftc.teamcode.ric.codes.templates.AutonomousProgramTemplate;
10-
import org.firstinspires.ftc.teamcode.ric.hardwares.Webcam;
8+
import org.firstinspires.ftc.teamcode.Params;
9+
import org.firstinspires.ftc.teamcode.codes.templates.AutonomousProgramTemplate;
10+
import org.firstinspires.ftc.teamcode.hardwares.Webcam;
1111

1212
@Disabled
1313
@Autonomous (name = "WebcamDetection",group = Params.Configs.SampleOpModesGroup)

‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ric/codes/templates/AutonomousProgramTemplate.java renamed to ‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/codes/templates/AutonomousProgramTemplate.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
package org.firstinspires.ftc.teamcode.ric.codes.templates;
1+
package org.firstinspires.ftc.teamcode.codes.templates;
22

33
import com.acmerobotics.dashboard.FtcDashboard;
44
import com.acmerobotics.dashboard.telemetry.TelemetryPacket;
55
import com.acmerobotics.roadrunner.Pose2d;
66
import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
77

8-
import org.firstinspires.ftc.teamcode.ric.Global;
9-
import org.firstinspires.ftc.teamcode.ric.codes.samples.AutonomousSample2024;
10-
import org.firstinspires.ftc.teamcode.ric.drives.controls.SimpleMecanumDrive;
11-
import org.firstinspires.ftc.teamcode.ric.Robot;
12-
import org.firstinspires.ftc.teamcode.ric.utils.annotations.Templates;
13-
import org.firstinspires.ftc.teamcode.ric.utils.enums.RunningMode;
8+
import org.firstinspires.ftc.teamcode.Global;
9+
import org.firstinspires.ftc.teamcode.codes.samples.AutonomousSample2024;
10+
import org.firstinspires.ftc.teamcode.drives.controls.SimpleMecanumDrive;
11+
import org.firstinspires.ftc.teamcode.Robot;
12+
import org.firstinspires.ftc.teamcode.utils.annotations.Templates;
13+
import org.firstinspires.ftc.teamcode.utils.enums.RunningMode;
1414

1515

1616
/**

‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ric/codes/templates/DebugProgramTemplate.java renamed to ‎TeamCode/src/main/java/org/firstinspires/ftc/teamcode/codes/templates/DebugProgramTemplate.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package org.firstinspires.ftc.teamcode.ric.codes.templates;
1+
package org.firstinspires.ftc.teamcode.codes.templates;
22

33
import com.qualcomm.robotcore.eventloop.opmode.OpMode;
44

5-
import org.firstinspires.ftc.teamcode.ric.Global;
6-
import org.firstinspires.ftc.teamcode.ric.utils.annotations.Templates;
7-
import org.firstinspires.ftc.teamcode.ric.utils.clients.Client;
8-
import org.firstinspires.ftc.teamcode.ric.utils.Timer;
5+
import org.firstinspires.ftc.teamcode.Global;
6+
import org.firstinspires.ftc.teamcode.utils.annotations.Templates;
7+
import org.firstinspires.ftc.teamcode.utils.clients.Client;
8+
import org.firstinspires.ftc.teamcode.utils.Timer;
99

1010
@Templates
1111
public abstract class DebugProgramTemplate extends OpMode {

0 commit comments

Comments
 (0)