Merge remote-tracking branch 'origin/Train' into Train

svhsrobotics · Oct 10, 2024 · f529b30 · f529b30
2 parents b561675 + 8fa9954
commit f529b30
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 6 deletions.
diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/opmode/PatrickTeleOP.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/opmode/PatrickTeleOP.java
@@ -23,12 +23,35 @@ public void runOpMode() throws InterruptedException {
         back_right = hardwareMap.get(DcMotor.class, "right_back_right_dw");
 
         while (opModeIsActive()) {
-            if (gamepad1.left_stick_x > 0) {
+            if (gamepad1.left_stick_x > 0.3) {
+                front_left.setPower(1);
+                front_right.setPower(1);
+                back_left.setPower(1);
+                back_right.setPower(1);
+            }
+            if (gamepad1.left_stick_x < 0.3) {
+                front_left.setPower(0);
+                front_right.setPower(0);
+                back_right.setPower(0);
+                back_left.setPower(0);
+            }
+            if (gamepad1.left_bumper) {
+                front_left.setPower(1);
+                back_left.setPower(1);
+            }
+            else {
+                front_left.setPower(0);
+                back_left.setPower(0);
+            }
+            if (gamepad1.right_bumper) {
+                front_right.setPower(1);
+                back_right.setPower(1);
+            }
+            else {
+                front_right.setPower(0);
+                back_right.setPower(0);
+            }
             }
         }
-
     }
 
-
-}
-
diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/opmode/THEONE.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/opmode/THEONE.java
@@ -71,7 +71,7 @@ public void runOpMode() throws InterruptedException {
                 previous_error = current_error
                 previous_time = current_time
                 Arm.setZeroPowerBehavior(DcMotor.ZeroPowerBehavior.BRAKE);
-                Arm.setPower(0);
+                Arm.setPower(0);*/
             }
             //3 hours for 1 bracket... always remember to click code->reformat code