Skip to content

Commit 0bf1de2

Browse files
author
glingy
committed
Removed DcMotorSimple because it was redundant
1 parent b5141b8 commit 0bf1de2

File tree

7 files changed

+12
-19
lines changed

7 files changed

+12
-19
lines changed

‎MainBot/autonomous/AutoDriveLinearOp.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
44
import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
55
import com.qualcomm.robotcore.hardware.DcMotor;
6-
import com.qualcomm.robotcore.hardware.DcMotorSimple;
76

87
import org.firstinspires.ftc.teamcode.MainBot.teleop.CrossCommunicator;
98

@@ -24,7 +23,7 @@ public void runOpMode() throws InterruptedException {
2423
frontRightMotor = hardwareMap.dcMotor.get(CrossCommunicator.Drive.MOTOR_FRONT_RIGHT);
2524
frontRightMotor.resetDeviceConfigurationForOpMode();
2625
frontRightMotor.setMode(DcMotor.RunMode.RUN_USING_ENCODER);
27-
frontRightMotor.setDirection(DcMotorSimple.Direction.REVERSE);
26+
frontRightMotor.setDirection(DcMotor.Direction.REVERSE);
2827

2928
backLeftMotor = hardwareMap.dcMotor.get(CrossCommunicator.Drive.MOTOR_BACK_LEFT);
3029
backLeftMotor.resetDeviceConfigurationForOpMode();
@@ -33,7 +32,7 @@ public void runOpMode() throws InterruptedException {
3332
backRightMotor = hardwareMap.dcMotor.get(CrossCommunicator.Drive.MOTOR_BACK_RIGHT);
3433
backRightMotor.resetDeviceConfigurationForOpMode();
3534
backRightMotor.setMode(DcMotor.RunMode.RUN_USING_ENCODER);
36-
backRightMotor.setDirection(DcMotorSimple.Direction.REVERSE);
35+
backRightMotor.setDirection(DcMotor.Direction.REVERSE);
3736

3837
telemetry.addData("Status", "Initialized and ready!");
3938
telemetry.update();

‎MainBot/teleop/DriveAssembly/DriveController.java

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

33
import com.qualcomm.robotcore.hardware.DcMotor;
4-
import com.qualcomm.robotcore.hardware.DcMotorSimple;
54
import com.qualcomm.robotcore.hardware.Gamepad;
65
import com.qualcomm.robotcore.hardware.HardwareMap;
76
import com.qualcomm.robotcore.util.Range;
@@ -43,7 +42,7 @@ public Integer value() {
4342
frontRightMotor = hardwareMap.dcMotor.get(CrossCommunicator.Drive.MOTOR_FRONT_RIGHT);
4443
frontRightMotor.resetDeviceConfigurationForOpMode();
4544
frontRightMotor.setMode(DcMotor.RunMode.RUN_USING_ENCODER);
46-
frontRightMotor.setDirection(DcMotorSimple.Direction.REVERSE);
45+
frontRightMotor.setDirection(DcMotor.Direction.REVERSE);
4746

4847
telemetry.addData("Front Right Power", new Func<Double>() {
4948
@Override
@@ -90,7 +89,7 @@ public Integer value() {
9089
backRightMotor = hardwareMap.dcMotor.get(CrossCommunicator.Drive.MOTOR_BACK_RIGHT);
9190
backRightMotor.resetDeviceConfigurationForOpMode();
9291
backRightMotor.setMode(DcMotor.RunMode.RUN_USING_ENCODER);
93-
backRightMotor.setDirection(DcMotorSimple.Direction.REVERSE);
92+
backRightMotor.setDirection(DcMotor.Direction.REVERSE);
9493

9594
telemetry.addData("Back Right Power", new Func<Double>() {
9695
@Override

‎MainBot/teleop/ElevatorAssembly/ElevatorController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.firstinspires.ftc.teamcode.MainBot.teleop.ElevatorAssembly;
22

33
import com.qualcomm.robotcore.hardware.DcMotor;
4-
import com.qualcomm.robotcore.hardware.DcMotorSimple;
54
import com.qualcomm.robotcore.hardware.Gamepad;
65
import com.qualcomm.robotcore.hardware.HardwareMap;
76
import com.qualcomm.robotcore.hardware.Servo;
@@ -21,7 +20,7 @@ public void init(Telemetry telemetry, HardwareMap hardwareMap) {
2120
motor = hardwareMap.dcMotor.get(CrossCommunicator.Elevator.MOTOR);
2221
motor.resetDeviceConfigurationForOpMode();
2322
motor.setMode(DcMotor.RunMode.RUN_TO_POSITION);
24-
motor.setDirection(DcMotorSimple.Direction.REVERSE);
23+
motor.setDirection(DcMotor.Direction.REVERSE);
2524

2625
telemetry.addData("Elevator Power", new Func<Double>() {
2726
@Override

‎MainBot/teleop/IntakeAssembly/IntakeController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.firstinspires.ftc.teamcode.MainBot.teleop.IntakeAssembly;
22

33
import com.qualcomm.robotcore.hardware.DcMotor;
4-
import com.qualcomm.robotcore.hardware.DcMotorSimple;
54
import com.qualcomm.robotcore.hardware.Gamepad;
65
import com.qualcomm.robotcore.hardware.HardwareMap;
76

@@ -17,7 +16,7 @@ public void init(Telemetry telemetry, HardwareMap hardwareMap) {
1716
motor = hardwareMap.dcMotor.get(CrossCommunicator.Intake.MOTOR);
1817
motor.resetDeviceConfigurationForOpMode();
1918
motor.setMode(DcMotor.RunMode.RUN_WITHOUT_ENCODER);
20-
motor.setDirection(DcMotorSimple.Direction.REVERSE);
19+
motor.setDirection(DcMotor.Direction.REVERSE);
2120

2221
telemetry.addData("Intake Power", new Func<Double>() {
2322
@Override

‎MiniBot/autonomous/AutoDriveLinearOp.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
44
import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
55
import com.qualcomm.robotcore.hardware.DcMotor;
6-
import com.qualcomm.robotcore.hardware.DcMotorSimple;
76

87
import org.firstinspires.ftc.teamcode.MiniBot.teleop.CrossCommunicator;
98

@@ -17,7 +16,7 @@ public class AutoDriveLinearOp extends LinearOpMode {
1716
public void runOpMode() throws InterruptedException {
1817
leftMotor = hardwareMap.dcMotor.get(CrossCommunicator.Drive.MOTOR_LEFT);
1918
leftMotor.resetDeviceConfigurationForOpMode();
20-
leftMotor.setDirection(DcMotorSimple.Direction.REVERSE);
19+
leftMotor.setDirection(DcMotor.Direction.REVERSE);
2120

2221
rightMotor = hardwareMap.dcMotor.get(CrossCommunicator.Drive.MOTOR_RIGHT);
2322
rightMotor.resetDeviceConfigurationForOpMode();

‎MiniBot/teleop/CircularDriveAssembly/CircularDriveController.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.firstinspires.ftc.teamcode.MiniBot.teleop.CircularDriveAssembly;
22

33
import com.qualcomm.robotcore.hardware.DcMotor;
4-
import com.qualcomm.robotcore.hardware.DcMotorSimple;
54
import com.qualcomm.robotcore.hardware.Gamepad;
65
import com.qualcomm.robotcore.hardware.HardwareMap;
76

@@ -15,7 +14,7 @@ public class CircularDriveController {
1514

1615
public void init(Telemetry telemetry, HardwareMap hardwareMap) {
1716
right = hardwareMap.dcMotor.get(CrossCommunicator.Drive.MOTOR_RIGHT);
18-
right.setDirection(DcMotorSimple.Direction.FORWARD);
17+
right.setDirection(DcMotor.Direction.FORWARD);
1918

2019
telemetry.addData("Right Power", new Func<Double>() {
2120
@Override
@@ -42,10 +41,10 @@ public void start() {
4241

4342
public void loop(Gamepad gamepad1, Gamepad gamepad2) {
4443
if (gamepad1.right_bumper) {
45-
right.setDirection(DcMotorSimple.Direction.FORWARD);
44+
right.setDirection(DcMotor.Direction.FORWARD);
4645
right.setPower(1);
4746
} else if (gamepad1.left_bumper) {
48-
right.setDirection(DcMotorSimple.Direction.REVERSE);
47+
right.setDirection(DcMotor.Direction.REVERSE);
4948
right.setPower(1);
5049
} else {
5150
right.setPower(0);

‎MiniBot/teleop/DriveAssembly/DriveController.java

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

33
import com.qualcomm.robotcore.hardware.DcMotor;
4-
import com.qualcomm.robotcore.hardware.DcMotorSimple;
54
import com.qualcomm.robotcore.hardware.Gamepad;
65
import com.qualcomm.robotcore.hardware.HardwareMap;
76

@@ -15,7 +14,7 @@ public class DriveController {
1514

1615
public void init(Telemetry telemetry, HardwareMap hardwareMap) {
1716
left = hardwareMap.dcMotor.get(CrossCommunicator.Drive.MOTOR_LEFT);
18-
left.setDirection(DcMotorSimple.Direction.REVERSE);
17+
left.setDirection(DcMotor.Direction.REVERSE);
1918

2019
telemetry.addData("Left Power", new Func<Double>() {
2120
@Override
@@ -37,7 +36,7 @@ public Integer value() {
3736
});
3837

3938
right = hardwareMap.dcMotor.get(CrossCommunicator.Drive.MOTOR_RIGHT);
40-
right.setDirection(DcMotorSimple.Direction.FORWARD);
39+
right.setDirection(DcMotor.Direction.FORWARD);
4140

4241
telemetry.addData("Right Power", new Func<Double>() {
4342
@Override

0 commit comments

Comments
 (0)