From 897f821710f4c6b1ad4897edb1e9e80317e6b5b2 Mon Sep 17 00:00:00 2001 From: Picklze1 Date: Mon, 11 Dec 2023 09:01:51 -0700 Subject: [PATCH 1/5] Swaped Controls on clawLock and autoscoring / reset pos --- .../org/firstinspires/ftc/teamcode/teleop/TeleOp.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleOp.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleOp.java index 3b99ac94..7d1f5380 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleOp.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleOp.java @@ -116,21 +116,21 @@ public void loop() { telemetry.addData("rightBPower: ", rightBPower); // Calling scoring() via left bumper and resetting via left trigger - if (gamepad2.left_bumper) { + if (gamepad2.x) { scoring(); - } else if (gamepad2.left_trigger > 0.5 && !scoringATM) { + } else if (gamepad2.y && !scoringATM) { resetPos(); telemetry.addData("Scoring Pos", "Reset"); } // Move claw via x and y. - if (gamepad2.x) { + if (gamepad2.left_bumper) { robot.get("clawLock").setPosition(robot.get("clawLock").getPosition() + -0.125); - } else if (gamepad2.y) { + } else if (gamepad2.left_trigger > 0.5) { robot.get("clawLock").setPosition(robot.get("clawLock").getPosition() + 0.125); } - // Moving VS maually via dpad up and down. + // Moving VS manually via dpad up and down. if (gamepad2.dpad_up) { robot.get("leftViperSlide").setPower(0.5); robot.get("rightViperSlide").setPower(0.5); From 58396101a289a027691b4e3fae339dab47339bc8 Mon Sep 17 00:00:00 2001 From: Picklze1 Date: Mon, 11 Dec 2023 10:14:36 -0700 Subject: [PATCH 2/5] comments Fixed --- .../org/firstinspires/ftc/teamcode/teleop/TeleOp.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleOp.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleOp.java index 7d1f5380..6bcc4b1a 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleOp.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleOp.java @@ -90,11 +90,11 @@ public void loop() { * Gamepad 2 * Right Bumper = Claw Joint + * Right Trigger = Claw Joint - - * Left Bumper = Automatic Scoring - * Left Trigger = VS, Arm and Claw reset (Automatic Scoring Reset) + * X = Automatic Scoring + * Y = VS, Arm and Claw reset (Automatic Scoring Reset) * A = Activate Intake (Hold) - * X = Claw Lock + (Manual) - * Y = Claw Lock - (Manual) + * Left Bumper = Claw Lock + (Manual) + * Left Trigger = Claw Lock - (Manual) * D Pad Up = VS Up (Manual) * D Pad Down = VS Down (Manual) */ From 6d47077f0b2ad35167979db8af882ff04d7b6700 Mon Sep 17 00:00:00 2001 From: Picklze1 Date: Mon, 11 Dec 2023 10:25:33 -0700 Subject: [PATCH 3/5] Telemetry Fixed --- .../org/firstinspires/ftc/teamcode/teleop/TeleOp.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleOp.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleOp.java index 6bcc4b1a..aa229a67 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleOp.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleOp.java @@ -70,13 +70,13 @@ public void init() { " * Gamepad 2\n" + " * Right Bumper = Claw Joint +\n" + " * Right Trigger = Claw Joint -\n" + - " * Left Bumper = Automatic Scoring\n" + - " * Left Trigger = VS, Arm and Claw reset (Automatic Scoring Reset)\n" + + " * X = Automatic Scoring\n" + + " * Y = VS, Arm and Claw reset (Automatic Scoring Reset)\n" + " * A = Activate Intake (Hold)\n" + - " * X = Claw Lock + (Manual)\n" + - " * Y = Claw Lock - (Manual)\n" + + " * Left Bumper = Claw Lock + (Manual)\n" + + " * Left Trigger = Claw Lock - (Manual)\n" + " * D Pad Up = VS Up (Manual)\n" + - " * D Pad Down = VS Down (Manual)\n"); + " * D Pad Down = VS Down (Manual)"); } @Override From 74b8ec14efaaf866bda5712bfabddee4e5291685 Mon Sep 17 00:00:00 2001 From: Picklze1 Date: Mon, 11 Dec 2023 13:52:19 -0700 Subject: [PATCH 4/5] Control Comment Removed --- .../ftc/teamcode/teleop/TeleOp.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleOp.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleOp.java index aa229a67..e41fdf62 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleOp.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleOp.java @@ -81,23 +81,7 @@ public void init() { @Override public void loop() { - /** Controls: - * Gamepad 1 - * Left Stick y = Drive - * Left Stick x = Strafe - * Right Stick x = Turn - * - * Gamepad 2 - * Right Bumper = Claw Joint + - * Right Trigger = Claw Joint - - * X = Automatic Scoring - * Y = VS, Arm and Claw reset (Automatic Scoring Reset) - * A = Activate Intake (Hold) - * Left Bumper = Claw Lock + (Manual) - * Left Trigger = Claw Lock - (Manual) - * D Pad Up = VS Up (Manual) - * D Pad Down = VS Down (Manual) - */ + // Values for drive. drive = gamepad1.left_stick_y * 0.8; From 09727a20bdd46c3fddc226d0a17983bafae02aab Mon Sep 17 00:00:00 2001 From: Picklze1 Date: Mon, 11 Dec 2023 15:43:53 -0700 Subject: [PATCH 5/5] Deleted Enter --- .../main/java/org/firstinspires/ftc/teamcode/teleop/TeleOp.java | 1 - 1 file changed, 1 deletion(-) diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleOp.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleOp.java index e41fdf62..1b9433be 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleOp.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleOp.java @@ -82,7 +82,6 @@ public void init() { @Override public void loop() { - // Values for drive. drive = gamepad1.left_stick_y * 0.8; turn = -gamepad1.right_stick_x * 0.6;