Merge pull request FIRST-Tech-Challenge#4 from aashrithbandaru/master

12/22/20 Update
ishgar686 · Dec 22, 2020 · 670fd15 · 670fd15
2 parents 1920ecf + f7b6fdb
commit 670fd15
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriverControl.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriverControl.java
@@ -117,3 +117,5 @@ public void runOpModeImpl() {
 
     }
 }
+
+
diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/IntakeClass.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/IntakeClass.java
@@ -13,6 +13,7 @@ abstract class IntakeClass extends LinearOpMode
 
     protected DcMotor intake;
     protected DcMotor hopper;
+    protected DcMotor outtake;
 
     public void runOpMode() {
         setupDriveMotors();
@@ -28,6 +29,7 @@ protected void setupDriveMotors() {
         updateTelemetryMessage("Initializing Motors");
         intake = hardwareMap.get(DcMotor.class, "intake");
         hopper = hardwareMap.get(DcMotor.class, "hopper");
+        outtake = hardwareMap.get(DcMotor.class, "outtake");
 
 
         // Most robots need the motor on one side to be reve`rsed to drive goBackward

diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/testing.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/testing.java
@@ -34,6 +34,17 @@ public void runOpModeImpl() {
                     if (gamepad2.y) {
                         hopper.setPower(0);
                     }
+
+                    if (gamepad1.dpad_up) {
+                        outtake.setPower(1);
+                    }
+
+                    if (gamepad1.dpad_down) {
+                        outtake.setPower(0);
+                    }
+
+
+
                     // left bumper - to close claw (front servo)