Removed 2nd Outerintake servo

rh-robotics · Jan 2, 2024 · 01daf82 · 01daf82
1 parent 6e5a55d
commit 01daf82
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/ClawCode.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/ClawCode.java
@@ -24,6 +24,7 @@ public void init() {
     }
 
     @Override
+
     public void loop() {
         /* Rotating servos based on user input. */
         if (gamepad1.a) {
@@ -43,4 +44,3 @@ public void loop() {
         telemetry.addData("clawLock position", robot.<Servo>get("clawLock").getPosition());
         telemetry.addData("clawJoint position", robot.<CRServo>get("clawJoint").getPower());
     }
-}
diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/IntakeRunningCode.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/IntakeRunningCode.java
@@ -19,8 +19,7 @@ public void init() {
         robot.introduce(new HardwareElement<>(CRServo.class, hardwareMap, "intakeTube"));
         robot.introduce(new HardwareElement<>(CRServo.class, hardwareMap, "outerIntakeJoint1"));
         robot.introduce(new HardwareElement<>(CRServo.class, hardwareMap, "outerIntakeJoint2"));
-        robot.introduce(new HardwareElement<>(CRServo.class, hardwareMap, "outerIntakeTube1"));
-        robot.introduce(new HardwareElement<>(CRServo.class, hardwareMap, "outerIntakeTube2"));
+        robot.introduce(new HardwareElement<>(CRServo.class, hardwareMap, "outerIntakeTube"));
 
         telemetry.addData("Status", "Initialized");
     }
@@ -41,14 +40,12 @@ public void loop() {
         if (gamepad1.a) {
             robot.<CRServo>get("intakeTube").setPower(0.5);
             robot.<CRServo>get("intakeGeckoWheels").setPower(0.5);
-            robot.<CRServo>get("outerIntakeTube1").setPower(0.5);
-            robot.<CRServo>get("outerIntakeTube2").setPower(-0.5);
+            robot.<CRServo>get("outerIntakeTube").setPower(0.5);
             telemetry.addData("Intake", "Running");
         } else {
             robot.<CRServo>get("intakeTube").setPower(0);
             robot.<CRServo>get("intakeGeckoWheels").setPower(0);
-            robot.<CRServo>get("outerIntakeTube1").setPower(0);
-            robot.<CRServo>get("outerIntakeTube2").setPower(0);
+            robot.<CRServo>get("outerIntakeTube").setPower(0);
             telemetry.addData("Intake", "Stopped");
         }