diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/constants/ShooterVars.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/constants/ShooterVars.java new file mode 100644 index 0000000..b2c70b8 --- /dev/null +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/constants/ShooterVars.java @@ -0,0 +1,10 @@ +package org.firstinspires.ftc.teamcode.constants; + +import com.acmerobotics.dashboard.config.Config; + +@Config +public class ShooterVars { + public static double turret_GearRatio = 0.9974; + + public static double turret_Range = 355; +} diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystems/Intake.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystems/Intake.java index 331c1e1..1de9132 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystems/Intake.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystems/Intake.java @@ -43,8 +43,7 @@ public class Intake implements Subsystem { } public void intakeMinPower(){ - intakePower = 0.5; - intakeState = 1; + intakeState = 2; } public void intake(){ @@ -57,7 +56,7 @@ public class Intake implements Subsystem { public void stop(){ - intakeState =-1; + intakeState =0; } @@ -70,7 +69,9 @@ public class Intake implements Subsystem { intake.setPower(intakePower); } else if (intakeState == -1){ intake.setPower(-intakePower); - } else { + } else if (intakeState == 2){ + intake.setPower(intakePower); + }else { intake.setPower(0); }