diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/BlueBasketAutoWithDrop1.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/BlueBasketAutoWithDrop1.java index 562f014..083284c 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/BlueBasketAutoWithDrop1.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/BlueBasketAutoWithDrop1.java @@ -12,7 +12,7 @@ import org.firstinspires.ftc.teamcode.pedroPathing.pathGeneration.BezierCurve; import org.firstinspires.ftc.teamcode.pedroPathing.pathGeneration.PathChain; import org.firstinspires.ftc.teamcode.pedroPathing.pathGeneration.Point; -@Autonomous(name = "Auto Test", group = "Dev") +@Autonomous(name = "Auto Test1", group = "Dev") public class BlueBasketAutoWithDrop1 extends OpMode { private Telemetry telemetryA; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/BlueBasketAutoWithDrop2.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/BlueBasketAutoWithDrop2.java index c08d8d4..78b32bb 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/BlueBasketAutoWithDrop2.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/BlueBasketAutoWithDrop2.java @@ -12,7 +12,7 @@ import org.firstinspires.ftc.teamcode.pedroPathing.pathGeneration.BezierCurve; import org.firstinspires.ftc.teamcode.pedroPathing.pathGeneration.PathChain; import org.firstinspires.ftc.teamcode.pedroPathing.pathGeneration.Point; -@Autonomous(name = "Auto Test", group = "Dev") +@Autonomous(name = "Auto Test2", group = "Dev") public class BlueBasketAutoWithDrop2 extends OpMode { private Telemetry telemetryA; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/CometBotTeleopCompetition.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/CometBotTeleopCompetition.java index df66154..eac0db5 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/CometBotTeleopCompetition.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/CometBotTeleopCompetition.java @@ -102,7 +102,7 @@ public class CometBotTeleopCompetition { this.decreaseMaxPower(); this.increaseMaxPower(); this.raiseSkyHook(); - this.lowerSkyHook(); + //this.lowerSkyHook(); Actions.runBlocking(this.lift.toFloorPosition()); @@ -253,17 +253,31 @@ public class CometBotTeleopCompetition { } public void lowerSkyHook() { - if (this.currentGP2.dpad_down && !this.previousGP2.dpad_down) { + if (this.currentGP2.dpad_down) { hook.lowerHook(1.00); } + else{ + hook.lowerHook(0.00); + } + } public void raiseSkyHook() { - if (this.currentGP2.dpad_up && !this.previousGP2.dpad_up) { + if (this.currentGP2.dpad_down) { + hook.lowerHook(1.00); + } + else if (this.currentGP2.dpad_up) { hook.raiseHook(1.00); } + else{ + hook.raiseHook(0.00); + hook.lowerHook(0.00); + } + } + + /* Type: PS4 Controller: 2 diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystem/SkyHookSubsystem.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystem/SkyHookSubsystem.java index 1be7b54..ada6f6e 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystem/SkyHookSubsystem.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystem/SkyHookSubsystem.java @@ -28,12 +28,12 @@ public class SkyHookSubsystem { public void raiseHook(double power){ this.hook.setPower(power); this.hook.setDirection(DcMotorSimple.Direction.FORWARD); - this.setState(SkyHookState.UP); + //this.setState(SkyHookState.UP); } public void lowerHook(double power){ this.hook.setPower(power); this.hook.setDirection(DcMotorSimple.Direction.REVERSE); - this.setState(SkyHookState.DOWN); + //this.setState(SkyHookState.DOWN); } public void init() {