Skip to content

Commit 0ef6a03

Browse files
committed
移动 Templates
1 parent b491674 commit 0ef6a03

15 files changed

+25
-27
lines changed

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/basic/Sensors.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.qualcomm.hardware.bosch.BNO055IMU;
1010
import com.qualcomm.hardware.bosch.JustLoggingAccelerationIntegrator;
1111
import com.qualcomm.robotcore.hardware.DcMotorEx;
12-
import com.qualcomm.robotcore.hardware.DcMotorSimple;
1312

1413
import org.firstinspires.ftc.robotcore.external.navigation.AngleUnit;
1514
import org.firstinspires.ftc.robotcore.external.navigation.AxesOrder;
@@ -54,11 +53,6 @@ public Sensors(@NonNull DeviceMap deviceMap){
5453
LastLeftTick=0;
5554
LastMiddleTick=0;
5655
LastRightTick=0;
57-
58-
//TODO:根据实际需求修改
59-
Left.setDirection(DcMotorSimple.Direction.REVERSE);
60-
Middle.setDirection(DcMotorSimple.Direction.REVERSE);
61-
Right.setDirection(DcMotorSimple.Direction.REVERSE);
6256
}
6357

6458
public void update(){

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/namespace/HardwareDevices.java

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package org.firstinspires.ftc.teamcode.Hardwares.namespace;
22

3+
import static com.qualcomm.robotcore.hardware.DcMotorSimple.Direction.REVERSE;
4+
5+
import static org.firstinspires.ftc.teamcode.Utils.Enums.HardwareState.*;
6+
37
import com.qualcomm.hardware.bosch.BNO055IMU;
48
import com.qualcomm.robotcore.hardware.DcMotorEx;
59
import com.qualcomm.robotcore.hardware.DcMotorSimple.Direction;
@@ -19,14 +23,14 @@ public enum HardwareDevices {
1923
RightFront(namespace.RightFront, DcMotorEx.class),
2024
LeftRear(namespace.LeftRear, DcMotorEx.class),
2125
RightRear(namespace.RightRear, DcMotorEx.class),
22-
PlacementArm(namespace.PlacementArm, DcMotorEx.class,HardwareState.Disabled),
23-
Intake(namespace.Intake, DcMotorEx.class,HardwareState.Disabled),
24-
FrontClip(namespace.FrontClip, Servo.class,HardwareState.Disabled),
25-
RearClip(namespace.RearClip, Servo.class,HardwareState.Disabled),
26-
SuspensionArm(namespace.SuspensionArm, DcMotorEx.class,HardwareState.Disabled),
27-
LeftDeadWheel(LeftRear.deviceName, DcMotorEx.class),
28-
MiddleDeadWheel(LeftFront.deviceName,DcMotorEx.class),
29-
RightDeadWheel(RightFront.deviceName, DcMotorEx.class),
26+
PlacementArm(namespace.PlacementArm, DcMotorEx.class, Disabled),
27+
Intake(namespace.Intake, DcMotorEx.class, Disabled),
28+
FrontClip(namespace.FrontClip, Servo.class, Disabled),
29+
RearClip(namespace.RearClip, Servo.class, Disabled),
30+
SuspensionArm(namespace.SuspensionArm, DcMotorEx.class, Disabled),
31+
LeftDeadWheel(LeftRear.deviceName, DcMotorEx.class, REVERSE),
32+
MiddleDeadWheel(LeftFront.deviceName,DcMotorEx.class, REVERSE),
33+
RightDeadWheel(RightFront.deviceName, DcMotorEx.class, REVERSE),
3034
imu(namespace.Imu, BNO055IMU .class);
3135
public final String deviceName;
3236
public final Class<?> classType;

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_samples/AutonomousSample.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
66

77
import org.firstinspires.ftc.teamcode.DriveControls.Commands.DriveCommandPackage;
8-
import org.firstinspires.ftc.teamcode.Utils.Templates.AutonomousProgramTemplate;
8+
import org.firstinspires.ftc.teamcode.RIC_samples.Templates.AutonomousProgramTemplate;
99
import org.firstinspires.ftc.teamcode.Utils.Enums.AutonomousLocation;
1010

1111
@Autonomous(name = "AutonomousSample",group = "SAMPLE")

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_samples/CameraDetection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import org.firstinspires.ftc.robotcore.external.hardware.camera.WebcamName;
77
import org.firstinspires.ftc.teamcode.Hardwares.basic.Camera;
8-
import org.firstinspires.ftc.teamcode.Utils.Templates.AutonomousProgramTemplate;
8+
import org.firstinspires.ftc.teamcode.RIC_samples.Templates.AutonomousProgramTemplate;
99
import org.openftc.easyopencv.OpenCvCamera;
1010
import org.openftc.easyopencv.OpenCvCameraFactory;
1111
import org.openftc.easyopencv.OpenCvCameraRotation;

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Utils/Templates/AutonomousProgramTemplate.java renamed to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_samples/Templates/AutonomousProgramTemplate.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.Utils.Templates;
1+
package org.firstinspires.ftc.teamcode.RIC_samples.Templates;
22

33
import com.acmerobotics.roadrunner.Pose2d;
44
import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Utils/Templates/TeleopProgramTemplate.java renamed to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_samples/Templates/TeleopProgramTemplate.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.Utils.Templates;
1+
package org.firstinspires.ftc.teamcode.RIC_samples.Templates;
22

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

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_samples/WebcamDetection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.qualcomm.robotcore.eventloop.opmode.Disabled;
77

88
import org.firstinspires.ftc.teamcode.Hardwares.Webcam;
9-
import org.firstinspires.ftc.teamcode.Utils.Templates.AutonomousProgramTemplate;
9+
import org.firstinspires.ftc.teamcode.RIC_samples.Templates.AutonomousProgramTemplate;
1010

1111
@Disabled
1212
@Autonomous (name = "WebcamDetection",group = "sample")

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/AutoIMUPositionTuner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import org.firstinspires.ftc.teamcode.Robot;
66
import org.firstinspires.ftc.teamcode.Utils.Annotations.TuningOpModes;
7-
import org.firstinspires.ftc.teamcode.Utils.Templates.AutonomousProgramTemplate;
7+
import org.firstinspires.ftc.teamcode.RIC_samples.Templates.AutonomousProgramTemplate;
88
import org.firstinspires.ftc.teamcode.Utils.Enums.driveDirection;
99
import org.firstinspires.ftc.teamcode.Utils.Enums.runningState;
1010

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/AxialInchPerTickTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import org.firstinspires.ftc.teamcode.Params;
77
import org.firstinspires.ftc.teamcode.Utils.Annotations.TuningOpModes;
8-
import org.firstinspires.ftc.teamcode.Utils.Templates.AutonomousProgramTemplate;
8+
import org.firstinspires.ftc.teamcode.RIC_samples.Templates.AutonomousProgramTemplate;
99

1010
@TeleOp(name = "AxialInchPerTickTest",group = "tune")
1111
@TuningOpModes

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/DWETest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
55

66
import org.firstinspires.ftc.teamcode.Utils.Annotations.TuningOpModes;
7-
import org.firstinspires.ftc.teamcode.Utils.Templates.AutonomousProgramTemplate;
7+
import org.firstinspires.ftc.teamcode.RIC_samples.Templates.AutonomousProgramTemplate;
88

99
@TeleOp(name = "DeadWheelEncoders_Test",group = "tune")
1010
@TuningOpModes

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/IMUPositionTuner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
55

66
import org.firstinspires.ftc.teamcode.Utils.Annotations.TuningOpModes;
7-
import org.firstinspires.ftc.teamcode.Utils.Templates.AutonomousProgramTemplate;
7+
import org.firstinspires.ftc.teamcode.RIC_samples.Templates.AutonomousProgramTemplate;
88

99
/**
1010
* 1.把机器的正方向的边缘对齐放在地垫的交界处

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/LateralInchPerTickTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import org.firstinspires.ftc.teamcode.Params;
77
import org.firstinspires.ftc.teamcode.Utils.Annotations.TuningOpModes;
8-
import org.firstinspires.ftc.teamcode.Utils.Templates.AutonomousProgramTemplate;
8+
import org.firstinspires.ftc.teamcode.RIC_samples.Templates.AutonomousProgramTemplate;
99

1010
@TeleOp(name = "LateralInchPerTickTest",group = "tune")
1111
@TuningOpModes

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/LocalizationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import org.firstinspires.ftc.teamcode.DriveControls.SimpleMecanumDrive;
77
import org.firstinspires.ftc.teamcode.Utils.Annotations.TuningOpModes;
8-
import org.firstinspires.ftc.teamcode.Utils.Templates.TeleopProgramTemplate;
8+
import org.firstinspires.ftc.teamcode.RIC_samples.Templates.TeleopProgramTemplate;
99

1010
@TeleOp(name = "LocalizationTest",group = "tune")
1111
@TuningOpModes

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/SMDTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.firstinspires.ftc.teamcode.DriveControls.Commands.DriveCommandPackage;
99
import org.firstinspires.ftc.teamcode.Robot;
1010
import org.firstinspires.ftc.teamcode.Utils.Annotations.TuningOpModes;
11-
import org.firstinspires.ftc.teamcode.Utils.Templates.AutonomousProgramTemplate;
11+
import org.firstinspires.ftc.teamcode.RIC_samples.Templates.AutonomousProgramTemplate;
1212
import org.firstinspires.ftc.teamcode.Utils.Enums.runningState;
1313

1414
@Autonomous(name = "SimpleMecanumDrive_Test",group = "tune")

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RIC_tuning/TurningDegPerTickTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import org.firstinspires.ftc.teamcode.Params;
77
import org.firstinspires.ftc.teamcode.Utils.Annotations.TuningOpModes;
8-
import org.firstinspires.ftc.teamcode.Utils.Templates.AutonomousProgramTemplate;
8+
import org.firstinspires.ftc.teamcode.RIC_samples.Templates.AutonomousProgramTemplate;
99

1010
@TeleOp(name = "TurningDegPerTickTest",group = "tune")
1111
@TuningOpModes

0 commit comments

Comments
 (0)