使用 DcMotorSimple.Direction 代替 DeviceDirection

6-BennyLi-9 · 6-BennyLi-9 · commit 0e80f1ace059 · 2024-09-06T21:34:11.000+08:00
diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/namespace/DeviceMap.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/namespace/DeviceMap.java
@@ -10,7 +10,6 @@
 import com.qualcomm.robotcore.hardware.Servo;
 
 import org.firstinspires.ftc.teamcode.Hardwares.basic.Servos;
-import org.firstinspires.ftc.teamcode.Utils.Enums.DeviceDirection;
 import org.firstinspires.ftc.teamcode.Utils.Enums.HardwareState;
 import org.firstinspires.ftc.teamcode.Utils.Exceptions.DeviceDisabledException;
 
diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/namespace/HardwareDevices.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Hardwares/namespace/HardwareDevices.java
@@ -2,11 +2,11 @@
 
 import com.qualcomm.hardware.bosch.BNO055IMU;
 import com.qualcomm.robotcore.hardware.DcMotorEx;
+import com.qualcomm.robotcore.hardware.DcMotorSimple.Direction;
 import com.qualcomm.robotcore.hardware.Servo;
 
 import org.firstinspires.ftc.teamcode.Params.namespace;
 import org.firstinspires.ftc.teamcode.Utils.DeviceConfigPackage;
-import org.firstinspires.ftc.teamcode.Utils.Enums.DeviceDirection;
 import org.firstinspires.ftc.teamcode.Utils.Enums.HardwareState;
 
 /**
@@ -42,13 +42,13 @@ public enum HardwareDevices {
 	HardwareDevices(String deviceName, Class<?> classType,HardwareState state){
 		this(deviceName,classType,new DeviceConfigPackage().AddConfig(state));
 	}
-	HardwareDevices(String deviceName, Class<?> classType, DeviceDirection direction){
+	HardwareDevices(String deviceName, Class<?> classType, Direction direction){
 		this(deviceName,classType,new DeviceConfigPackage().AddConfig(direction));
 	}
-	HardwareDevices(String deviceName, Class<?> classType,HardwareState state, DeviceDirection direction){
+	HardwareDevices(String deviceName, Class<?> classType,HardwareState state, Direction direction){
 		this(deviceName,classType,new DeviceConfigPackage().AddConfig(direction).AddConfig(state));
 	}
-	HardwareDevices(String deviceName, Class<?> classType, DeviceDirection direction,HardwareState state){
+	HardwareDevices(String deviceName, Class<?> classType, Direction direction,HardwareState state){
 		this(deviceName,classType,new DeviceConfigPackage().AddConfig(direction).AddConfig(state));
 	}
 }
diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Utils/DeviceConfigPackage.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Utils/DeviceConfigPackage.java
@@ -1,25 +1,26 @@
 package org.firstinspires.ftc.teamcode.Utils;
 
-import org.firstinspires.ftc.teamcode.Utils.Enums.DeviceDirection;
+import com.qualcomm.robotcore.hardware.DcMotorSimple.Direction;
+
 import org.firstinspires.ftc.teamcode.Utils.Enums.HardwareState;
 
 public class DeviceConfigPackage {
 	public HardwareState state;
-	public DeviceDirection direction;
+	public Direction direction;
 	public DeviceConfigPackage(){
 		state=null;
 		direction=null;
 	}
 	public DeviceConfigPackage AutoComplete(){
 		if(state==null)state=HardwareState.Enabled;
-		if(direction==null)direction=DeviceDirection.FORWARD;
+		if(direction==null)direction= Direction.FORWARD;
 		return this;
 	}
 	public DeviceConfigPackage AddConfig(HardwareState state){
 		this.state=state;
 		return this;
 	}
-	public DeviceConfigPackage AddConfig(DeviceDirection direction){
+	public DeviceConfigPackage AddConfig(Direction direction){
 		this.direction=direction;
 		return this;
 	}
diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Utils/Enums/DeviceDirection.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Utils/Enums/DeviceDirection.java

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,11 @@`
`2`	`2`
`3`	`3`	`import com.qualcomm.hardware.bosch.BNO055IMU;`
`4`	`4`	`import com.qualcomm.robotcore.hardware.DcMotorEx;`
	`5`	`+import com.qualcomm.robotcore.hardware.DcMotorSimple.Direction;`
`5`	`6`	`import com.qualcomm.robotcore.hardware.Servo;`
`6`	`7`
`7`	`8`	`import org.firstinspires.ftc.teamcode.Params.namespace;`
`8`	`9`	`import org.firstinspires.ftc.teamcode.Utils.DeviceConfigPackage;`
`9`		`-import org.firstinspires.ftc.teamcode.Utils.Enums.DeviceDirection;`
`10`	`10`	`import org.firstinspires.ftc.teamcode.Utils.Enums.HardwareState;`
`11`	`11`
`12`	`12`	`/**`
`@@ -42,13 +42,13 @@ public enum HardwareDevices {`
`42`	`42`	`HardwareDevices(String deviceName, Class<?> classType,HardwareState state){`
`43`	`43`	`this(deviceName,classType,new DeviceConfigPackage().AddConfig(state));`
`44`	`44`	`}`
`45`		`- HardwareDevices(String deviceName, Class<?> classType, DeviceDirection direction){`
	`45`	`+ HardwareDevices(String deviceName, Class<?> classType, Direction direction){`
`46`	`46`	`this(deviceName,classType,new DeviceConfigPackage().AddConfig(direction));`
`47`	`47`	`}`
`48`		`- HardwareDevices(String deviceName, Class<?> classType,HardwareState state, DeviceDirection direction){`
	`48`	`+ HardwareDevices(String deviceName, Class<?> classType,HardwareState state, Direction direction){`
`49`	`49`	`this(deviceName,classType,new DeviceConfigPackage().AddConfig(direction).AddConfig(state));`
`50`	`50`	`}`
`51`		`- HardwareDevices(String deviceName, Class<?> classType, DeviceDirection direction,HardwareState state){`
	`51`	`+ HardwareDevices(String deviceName, Class<?> classType, Direction direction,HardwareState state){`
`52`	`52`	`this(deviceName,classType,new DeviceConfigPackage().AddConfig(direction).AddConfig(state));`
`53`	`53`	`}`
`54`	`54`	`}`