diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/NewShooterTest.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/NewShooterTest.java index 883eb44..b5e381f 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/NewShooterTest.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/NewShooterTest.java @@ -32,6 +32,7 @@ public class NewShooterTest extends LinearOpMode { public static int flywheelVelo = 0; public static double hoodPos = 0.5; + public static double transferPower = -0.7; // public static double turretPos = 0.51; @Override @@ -119,7 +120,7 @@ public class NewShooterTest extends LinearOpMode { TELE.addData("Distance From Goal", commander.getDistance()); TELE.addData("Hood Position", commander.getHoodPredicted()); - TELE.addData("Transfer Power", robot.transfer.getPower()); + TELE.addData("Transfer Power", commander.getTransferPow()); TELE.addData("Theoretical Velocity RPM", commander.getPredictedRPM()); TELE.addData("Actual Velocity RPM", flywheel.getAverageVelocity()); diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utilsv2/Shooter.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utilsv2/Shooter.java index a1d0acc..cde9526 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utilsv2/Shooter.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utilsv2/Shooter.java @@ -22,6 +22,7 @@ public class Shooter { double turretGoalY = 0; private boolean red = true; + public static boolean manualFlywheel = false; Follower follow; @@ -89,6 +90,7 @@ public class Shooter { case NOTHING: break; case MANUAL: + manualFlywheel = true; commander.getVeloPredictive( (goalX - follow.getPose().getX() - shooterDistFromCenter*Math.cos(follow.getHeading())), (goalY - follow.getPose().getY() - shooterDistFromCenter*Math.sin(follow.getHeading())), @@ -104,6 +106,7 @@ public class Shooter { turr.manual(turretPosition); break; case TRACK_GOAL: + manualFlywheel = false; turr.trackGoal( (turretGoalX - follow.getPose().getX() - shooterDistFromCenter*Math.cos(follow.getHeading())), (turretGoalY - follow.getPose().getY() - shooterDistFromCenter*Math.sin(follow.getHeading())), @@ -132,6 +135,7 @@ public class Shooter { fly.setF(voltage); break; case READ_OBELISK: + manualFlywheel = false; turr.trackObelisk( (obeliskX - follow.getPose().getX() - shooterDistFromCenter*Math.cos(follow.getHeading())), (obeliskY - follow.getPose().getY() - shooterDistFromCenter*Math.sin(follow.getHeading())), @@ -155,6 +159,7 @@ public class Shooter { break; case MANUAL_TURRET_TRACK_FLY: + manualFlywheel = false; turr.manual(turretPosition); commander.getVeloPredictive( (goalX - follow.getPose().getX() - shooterDistFromCenter*Math.cos(follow.getHeading())), @@ -173,6 +178,7 @@ public class Shooter { break; case MANUAL_FLYWHEEL_TRACK_TURR: + manualFlywheel = true; turr.trackGoal( (turretGoalX - follow.getPose().getX() - shooterDistFromCenter*Math.cos(follow.getHeading())), (turretGoalY - follow.getPose().getY() - shooterDistFromCenter*Math.sin(follow.getHeading())), diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utilsv2/SpindexerTransferIntake.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utilsv2/SpindexerTransferIntake.java index e619532..baeb872 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utilsv2/SpindexerTransferIntake.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utilsv2/SpindexerTransferIntake.java @@ -7,6 +7,7 @@ import com.acmerobotics.dashboard.telemetry.MultipleTelemetry; import org.firstinspires.ftc.robotcore.external.navigation.DistanceUnit; import org.firstinspires.ftc.teamcode.constants.ServoPositions; +import org.firstinspires.ftc.teamcode.tests.NewShooterTest; @Config public class SpindexerTransferIntake { @@ -163,7 +164,11 @@ public class SpindexerTransferIntake { setRapidMode(RapidMode.SHOOT); } - robot.setTransferPower(commander.getTransferPow()); + if (Shooter.manualFlywheel){ + robot.setTransferPower(NewShooterTest.transferPower); + } else { + robot.setTransferPower(commander.getTransferPow()); + } break;