Red side now defaults to center for now. SJ meet

MICDSRobotics-5190 · Jan 20, 2018 · ce7ea6c · ce7ea6c
1 parent 8a5c33b
commit ce7ea6c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/compautonomous/BlueLeft.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/compautonomous/BlueLeft.java
@@ -99,6 +99,10 @@ public void runOpMode() throws InterruptedException {
 
         sleep(1000);
 
+        raiser.setPower(1);
+        sleep(150);
+        raiser.setPower(0);
+
         armExtender.setPosition(1);
         armRotator.setPosition(0.5);
 

diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/compautonomous/BlueRight.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/compautonomous/BlueRight.java
@@ -104,6 +104,10 @@ public void runOpMode() throws InterruptedException {
 
         sleep(1000);
 
+        raiser.setPower(1);
+        sleep(150);
+        raiser.setPower(0);
+
         armExtender.setPosition(1);
         armRotator.setPosition(0.5);
 

diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/compautonomous/RedLeft.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/compautonomous/RedLeft.java
@@ -116,7 +116,7 @@ public void runOpMode() throws InterruptedException {
 
         boolean kill = false;
 
-        switch (relicRecoveryVuMark) {
+        /*switch (relicRecoveryVuMark) {
             case LEFT: telemetry.addData("Column", "Putting it in the left");
                 drivetrain.complexDrive(MecanumDrive.Direction.LEFT.angle(), 0.75, 0);
                 sleep((long)(sideShort) - 80);
@@ -138,7 +138,10 @@ public void runOpMode() throws InterruptedException {
                 drivetrain.complexDrive(MecanumDrive.Direction.UP.angle(), 0.75, 0);
                 sleep((long)(sideShort));
                 break;
-        }
+        }*/
+
+        drivetrain.complexDrive(MecanumDrive.Direction.UP.angle(), 0.75, 0);
+        sleep((long)(sideShort));
         this.drivetrain.stopMoving();
 
         sleep(3000);

diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/compautonomous/RedRight.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/compautonomous/RedRight.java
@@ -114,7 +114,7 @@ public void runOpMode() throws InterruptedException {
         sleep(4*rotate90 - 250);
         this.drivetrain.stopMoving();
 
-        switch (relicRecoveryVuMark) {
+        /*switch (relicRecoveryVuMark) {
             case LEFT: telemetry.addData("Column", "Putting it in the left");
                 drivetrain.complexDrive(MecanumDrive.Direction.LEFT.angle(), 0.75, 0);
                 sleep((long)(sideShort));
@@ -129,7 +129,11 @@ public void runOpMode() throws InterruptedException {
                 drivetrain.complexDrive(MecanumDrive.Direction.UP.angle(), 0.75, 0);
                 sleep((long)(sideShort));
                 break;
-        }
+        }*/
+
+        drivetrain.complexDrive(MecanumDrive.Direction.UP.angle(), 0.75, 0);
+        sleep((long)(sideShort));
+        this.drivetrain.stopMoving();
 
         sleep(3000);
         this.drivetrain.stopMoving();