Skip to content

Commit 6f9a2e8

Browse files
committed
删除不必要的接口方法
1 parent d7d8e78 commit 6f9a2e8

File tree

9 files changed

+14
-34
lines changed

9 files changed

+14
-34
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,6 @@ public Pose2d NEXT() {
112112
);
113113
}
114114

115-
@Override
116-
public double getBufVal() {
117-
return BufPower;
118-
}
119-
120115
@Override
121116
public Pose2d getPose() {
122117
return pose;

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,4 @@ public LinkedList<DriveOrder> getOrder() {
2121
return res;
2222
}
2323

24-
@Override
25-
public void setOrder(LinkedList<DriveOrder> val) {
26-
if(val != null) {
27-
actions=new LinkedList<>();
28-
for (DriveOrder order : val) {
29-
actions.push((DriveAction) order);
30-
}
31-
}else{
32-
throw new NullPointerException();
33-
}
34-
}
3524
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,6 @@ public Pose2d NEXT() {
108108
);
109109
}
110110

111-
@Override
112-
public double getBufVal() {
113-
return BufPower;
114-
}
115-
116111
@Override
117112
public Pose2d getPose() {
118113
return pose;

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,4 @@ public LinkedList<DriveOrder> getOrder() {
2424
return res;
2525
}
2626

27-
@Override
28-
public void setOrder(LinkedList<DriveOrder> val) {
29-
if(val != null) {
30-
commands=new LinkedList<>();
31-
for (DriveOrder order : val) {
32-
commands.push((DriveCommand) order);
33-
}
34-
}else{
35-
throw new NullPointerException();
36-
}
37-
}
3827
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.firstinspires.ftc.teamcode.Hardwares.basic.Motors;
2323
import org.firstinspires.ftc.teamcode.Params;
2424
import org.firstinspires.ftc.teamcode.Robot;
25+
import org.firstinspires.ftc.teamcode.Utils.Annotations.DrivingPrograms;
2526
import org.firstinspires.ftc.teamcode.Utils.Client;
2627
import org.firstinspires.ftc.teamcode.Utils.Client.Drawing;
2728
import org.firstinspires.ftc.teamcode.Utils.Enums.State;
@@ -31,6 +32,7 @@
3132

3233
import java.util.LinkedList;
3334

35+
@DrivingPrograms
3436
public class MecanumDrive implements DriverProgram{
3537
public final Classic classic;
3638
private final Motors motors;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public interface DriveOrder {
4242
@NonNull
4343
Pose2d NEXT();
4444

45-
double getBufVal();
4645
Pose2d getPose();
4746
TrajectoryType getState();
4847
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@
44

55
public interface DriveOrderPackage {
66
LinkedList<DriveOrder> getOrder();
7-
void setOrder(LinkedList<DriveOrder> val);
87
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.firstinspires.ftc.teamcode.Hardwares.basic.Motors;
2020
import org.firstinspires.ftc.teamcode.Params;
2121
import org.firstinspires.ftc.teamcode.Robot;
22+
import org.firstinspires.ftc.teamcode.Utils.Annotations.DrivingPrograms;
2223
import org.firstinspires.ftc.teamcode.Utils.Client;
2324
import org.firstinspires.ftc.teamcode.Utils.Enums.State;
2425
import org.firstinspires.ftc.teamcode.Utils.Functions;
@@ -27,6 +28,7 @@
2728

2829
import java.util.LinkedList;
2930

31+
@DrivingPrograms
3032
public class SimpleMecanumDrive implements DriverProgram{
3133
public final Classic classic;
3234
private final Motors motors;
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package org.firstinspires.ftc.teamcode.Utils.Annotations;
2+
3+
import java.lang.annotation.Documented;
4+
import java.lang.annotation.ElementType;
5+
import java.lang.annotation.Target;
6+
7+
@Target({ElementType.TYPE})
8+
@Documented
9+
public @interface DrivingPrograms {
10+
}

0 commit comments

Comments
 (0)