From e3c5115e5fd5d6974a307c1bbb06bb6a7dbccb5e Mon Sep 17 00:00:00 2001 From: SafePencil Date: Tue, 10 Aug 2021 20:21:37 -0500 Subject: [PATCH] a thing --- .../javaClass/cayden/CaydenFirstState.java | 11 ++++++++--- .../javaClass/samples/CaydenFirstEngine.java | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/cayden/CaydenFirstState.java b/TeamCode/src/main/java/org/timecrafters/javaClass/cayden/CaydenFirstState.java index 29d2a86..bdee630 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/cayden/CaydenFirstState.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/cayden/CaydenFirstState.java @@ -20,7 +20,7 @@ public class CaydenFirstState extends CyberarmState { public void exec() { if (engine.gamepad1.y){ - robot.collectionMotor.setPower(1); + robot.collectionMotor.setPower(.75); } else{ robot.collectionMotor.setPower(0); @@ -37,7 +37,7 @@ public class CaydenFirstState extends CyberarmState { robot.driveFrontRight.setPower(-engine.gamepad1.right_stick_y); robot.driveBackRight.setPower(-engine.gamepad1.right_stick_y); robot.driveFrontLeft.setPower(-engine.gamepad1.left_stick_y); - robot.driveBackLeft.setPower(-engine.gamepad1.right_stick_y); + robot.driveBackLeft.setPower(-engine.gamepad1.left_stick_y); if (engine.gamepad1.left_bumper) { robot.driveFrontLeft.setPower(-1); @@ -58,8 +58,13 @@ public class CaydenFirstState extends CyberarmState { }else{ robot.launchMotor.setPower(0); - robot.webCamServo.setPosition(robot.CAM_SERVO_DOWN); + + } + if (engine.gamepad1.dpad_up){ + robot.webCamServo.setPosition(0); + }else if (engine.gamepad1.dpad_down){ + robot.webCamServo.setPosition(robot.CAM_SERVO_DOWN); } } } diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/CaydenFirstEngine.java b/TeamCode/src/main/java/org/timecrafters/javaClass/samples/CaydenFirstEngine.java index 468094e..4a36655 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/CaydenFirstEngine.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/samples/CaydenFirstEngine.java @@ -9,11 +9,11 @@ import org.timecrafters.javaClass.cayden.CaydenFirstState; @Autonomous (name = "Cayden: First Program", group = "caden") public class CaydenFirstEngine extends CyberarmEngine { - SampleRobot robot; + Robot robot; @Override public void init() { - robot = new SampleRobot(hardwareMap); + robot = new Robot(hardwareMap); robot.initHardware(); robot.wobbleGrabServo.setPosition(Robot.WOBBLE_SERVO_CLOSED); super.init();