diff --git a/src/main/java/frc/robot/commands/Lancer.java b/src/main/java/frc/robot/commands/Lancer.java index f090317..66a39fb 100644 --- a/src/main/java/frc/robot/commands/Lancer.java +++ b/src/main/java/frc/robot/commands/Lancer.java @@ -64,7 +64,7 @@ public class Lancer extends Command { lanceur.Lancer(output); if(lanceur.Vitesse() >= vitesse-800){ timer.start(); - if(timer.get() >0.5){ + if(timer.get() >1){ lanceur.Demeler(1); } diff --git a/src/main/java/frc/robot/commands/ModeAuto/LancerAuto.java b/src/main/java/frc/robot/commands/ModeAuto/LancerAuto.java index a617c26..cc036e0 100644 --- a/src/main/java/frc/robot/commands/ModeAuto/LancerAuto.java +++ b/src/main/java/frc/robot/commands/ModeAuto/LancerAuto.java @@ -43,13 +43,14 @@ public class LancerAuto extends Command { public void execute() { double[] BotPose = new double[6]; if(limelight3g.getV()){ - + if(alliance.isPresent()){ if(alliance.get() == Alliance.Blue){ BotPose = limelight3g.getBotPoseBlue(); } else{ BotPose = limelight3g.getBotPoseRed(); } + } botx = BotPose[0]; boty = BotPose[1]; } @@ -62,7 +63,7 @@ public class LancerAuto extends Command { lanceur.Lancer(output); if(lanceur.Vitesse() >= vitesse-800){ timer.start(); - if(timer.get() >0.5){ + if(timer.get() >1){ lanceur.Demeler(1); } diff --git a/src/main/java/frc/robot/commands/ModeAuto/LimelighterAuto.java b/src/main/java/frc/robot/commands/ModeAuto/LimelighterAuto.java index 516fec2..f4b4bbc 100644 --- a/src/main/java/frc/robot/commands/ModeAuto/LimelighterAuto.java +++ b/src/main/java/frc/robot/commands/ModeAuto/LimelighterAuto.java @@ -30,7 +30,7 @@ public class LimelighterAuto extends Command { double boty; double angle; double calcul; - Optional alliance = DriverStation.getAlliance(); + Optional alliance = DriverStation.getAlliance(); private final SwerveRequest.FieldCentric drive = new SwerveRequest.FieldCentric() .withDeadband(MaxSpeed * 0.1).withRotationalDeadband(MaxAngularRate * 0.1) .withDriveRequestType(DriveRequestType.OpenLoopVoltage); @@ -45,21 +45,24 @@ public class LimelighterAuto extends Command { // Called when the command is initially scheduled. @Override - public void initialize() {} + public void initialize() { + + } // Called every time the scheduler runs while the command is scheduled. @Override public void execute() { double[] BotPose = new double[6]; - System.out.println("e"); + System.out.println("a"); if (limelight3g.getV()) { - if(alliance.get() == Alliance.Blue){ + if(alliance.isPresent()){ + if(alliance.get() == Alliance.Blue){ BotPose = limelight3g.getBotPoseBlue(); } else{ BotPose = limelight3g.getBotPoseRed(); } - + } botx = BotPose[1]; boty = BotPose[0]; angle = drivetrain.getPigeon2().getYaw().getValueAsDouble();