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

# Conflicts: # gradle.properties
svhsrobotics · Oct 17, 2024 · daf54a6 · daf54a6
2 parents 8c74472 + af652fc
commit daf54a6
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 0 deletions.
diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/drive/tuning/NickTeleOp.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/drive/tuning/NickTeleOp.java
@@ -7,6 +7,8 @@
 import com.qualcomm.robotcore.hardware.DcMotor;
 import com.qualcomm.robotcore.hardware.DcMotorSimple;
 
+import org.firstinspires.ftc.robotcore.internal.camera.delegating.DelegatingCaptureSequence;
+
 @Config
 @TeleOp
 public class NickTeleOp extends LinearOpMode {
@@ -57,6 +59,28 @@ public void runOpMode() throws InterruptedException {
                     Grabber.setPower(0.0);
                 }
             }
+//            if (gamepad1.left_stick_y >.5 ) {
+//                leftFrontMotor.setPower(1.0);
+//                leftBackMotor.setPower(1.0);
+//                rightBackMotor.setPower(1.0);
+//                rightFrontMotor.setPower(1.0);
+//
+//
+//
+//            } else if  (gamepad1.left_stick_y <-.5 ) {
+//                leftFrontMotor.setPower(-1.0);
+//                leftBackMotor.setPower(-1.0);
+//                rightBackMotor.setPower(-1.0);
+//                rightFrontMotor.setPower(-1.0);
+//
+//
+//
+//            } else {leftFrontMotor.setPower(0);
+//                leftBackMotor.setPower(0);
+//                rightBackMotor.setPower(0);
+//                rightFrontMotor.setPower(0);}
+//
+
         }
     }
 }
diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/opmode/tictacs.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/opmode/tictacs.java
@@ -0,0 +1,15 @@
+package org.firstinspires.ftc.teamcode.opmode;
+
+public class tictacs {
+    public String material = "plastic";
+    public int TicTac = 200;
+    public String  expiration = String.valueOf(2025);
+    public String Color = "red";
+    public tictacs TicTacs  () {
+
+        return null;
+    }
+
+
+
+}