sdesharnais/Rebuilt-2026
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.demerso.net/sdesharnais/Rebuilt-2026

Browse Source
This commit is contained in:
samuel desharnais
2026-03-31 17:54:41 -04:00
parent 10b0110315 098f16665a
commit ae9a6bd046
9 changed files with 96 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/frc/robot/commands/Lancer.java
View File

@@ -39,7 +39,8 @@ public class Lancer extends Command {
public void initialize() { public void initialize() {
if(limeLight3G.getV()){} if(limeLight3G.getV()){}
pidController = new PIDController(0.0007, 0,0, 0.001); pidController = new PIDController(0.0007, 0,0, 0.001);
timer.reset(); timer.reset();
alliance = DriverStation.getAlliance();
} }
// Called every time the scheduler runs while the command is scheduled. // Called every time the scheduler runs while the command is scheduled.

32
src/main/java/frc/robot/commands/Limelighter.java
View File

@@ -43,7 +43,9 @@ public class Limelighter extends Command {
// Called when the command is initially scheduled. // Called when the command is initially scheduled.
@Override @Override
public void initialize() {} public void initialize() {
alliance = DriverStation.getAlliance();
}
// Called every time the scheduler runs while the command is scheduled. // Called every time the scheduler runs while the command is scheduled.
@Override @Override
@@ -51,41 +53,45 @@ public class Limelighter extends Command {
double[] BotPose = new double[6]; double[] BotPose = new double[6];
System.out.println("e"); System.out.println("e");
if (limelight3g.getV()) { if (limelight3g.getV()) {
BotPose = limelight3g.getBotPoseBlue(); // BotPose = limelight3g.getBotPoseBlue();
if (!alliance.isPresent()) { if (!alliance.isPresent()) {
return; return;
} }
if (alliance.get() == Alliance.Blue) { if (alliance.get() == Alliance.Blue) {
x = 4; x = 4.6;
BotPose = limelight3g.getBotPoseBlue();
} }
else { else {
x = 11.915394; x = 11.915394;
BotPose = limelight3g.getBotPoseRed();
} }
botx = BotPose[1]; botx = BotPose[1];
boty = BotPose[0]; boty = BotPose[0];
angle = drivetrain.getPigeon2().getYaw().getValueAsDouble(); angle = drivetrain.getPigeon2().getYaw().getValueAsDouble();
calcul = limelight3g.Calcule(botx, x, boty, 4.6, angle); calcul = limelight3g.Calcule(botx, x, boty, 4, angle);
if(calcul < -3 && calcul > -180){ if(calcul < -5 && calcul > -180){
drivetrain.setControl( drivetrain.setControl(
drive.withRotationalRate(-1.5)); drive.withRotationalRate(0.5*(2*Math.PI)));
} }
else if(calcul > 3 && calcul < 180){ else if(calcul > 5 && calcul < 180){
drivetrain.setControl( drivetrain.setControl(
drive.withRotationalRate(-1.5)); drive.withRotationalRate(-0.5*(2*Math.PI)));
} }
else if(calcul >= 180){ else if(calcul < -5){
drivetrain.setControl( drivetrain.setControl(
drive.withRotationalRate(-1.5)); drive.withRotationalRate(-0.5*(2*Math.PI)));
} }
else if(calcul <= -180){ else if(calcul <= -180){
drivetrain.setControl( drivetrain.setControl(
drive.withRotationalRate(1.5)); drive.withRotationalRate(0.5*(2*Math.PI)));
} }
else{ else{
drivetrain.setControl( drivetrain.setControl(
drive.withRotationalRate(0)); drive.withRotationalRate(0));
} }
System.out.println(calcul); drivetrain.setControl(
drive.withVelocityX(0).withVelocityY(0).withRotationalRate(calcul));
System.out.println(angle);
if (calcul < 0.2 && calcul > -0.2) { if (calcul < 0.2 && calcul > -0.2) {
drivetrain.setControl(drive.withRotationalRate(0)); drivetrain.setControl(drive.withRotationalRate(0));
} }

4
src/main/java/frc/robot/commands/ModeAuto/GrimperMur.java
View File

@@ -47,7 +47,9 @@ public class GrimperMur extends Command {
// Called when the command is initially scheduled. // Called when the command is initially scheduled.
@Override @Override
public void initialize() {} public void initialize() {
alliance = DriverStation.getAlliance();
}
// Called every time the scheduler runs while the command is scheduled. // Called every time the scheduler runs while the command is scheduled.
@Override @Override

4
src/main/java/frc/robot/commands/ModeAuto/GrimperReservoir.java
View File

@@ -48,7 +48,9 @@ public class GrimperReservoir extends Command {
// Called when the command is initially scheduled. // Called when the command is initially scheduled.
@Override @Override
public void initialize() {} public void initialize() {
alliance = DriverStation.getAlliance();
}
// Called every time the scheduler runs while the command is scheduled. // Called every time the scheduler runs while the command is scheduled.
@Override @Override

1
src/main/java/frc/robot/commands/ModeAuto/LancerAuto.java
View File

@@ -38,6 +38,7 @@ public class LancerAuto extends Command {
public void initialize() { public void initialize() {
pidController = new PIDController(0.0007, 0, 0, 0.001); pidController = new PIDController(0.0007, 0, 0, 0.001);
timer.reset(); timer.reset();
alliance = DriverStation.getAlliance();
} }
// Called every time the scheduler runs while the command is scheduled. // Called every time the scheduler runs while the command is scheduled.

66
src/main/java/frc/robot/commands/ModeAuto/LimelighterAuto.java
View File

@@ -43,7 +43,9 @@ public class LimelighterAuto extends Command {
// Called when the command is initially scheduled. // Called when the command is initially scheduled.
@Override @Override
public void initialize() {} public void initialize() {
alliance = DriverStation.getAlliance();
}
// Called every time the scheduler runs while the command is scheduled. // Called every time the scheduler runs while the command is scheduled.
@Override @Override
@@ -51,44 +53,63 @@ public class LimelighterAuto extends Command {
double[] BotPose = new double[6]; double[] BotPose = new double[6];
System.out.println("e"); System.out.println("e");
if (limelight3g.getV()) { if (limelight3g.getV()) {
if (!alliance.isPresent()) { // BotPose = limelight3g.getBotPoseBlue();
if (!alliance.isPresent()) {
return; return;
} }
if (alliance.get() == Alliance.Blue) { if (alliance.get() == Alliance.Blue) {
x = 4.6; x = 4.6;
BotPose = limelight3g.getBotPoseBlue();
} }
else { else {
x = 11.915394; x = 11.915394;
BotPose = limelight3g.getBotPoseRed();
} }
BotPose = limelight3g.getBotPoseBlue();
botx = BotPose[1]; botx = BotPose[1];
boty = BotPose[0]; boty = BotPose[0];
angle = drivetrain.getPigeon2().getYaw().getValueAsDouble(); angle = drivetrain.getPigeon2().getYaw().getValueAsDouble();
calcul = limelight3g.Calcule(botx, x, boty, 4, angle); calcul = limelight3g.Calcule(botx, x, boty, 4, angle);
if(calcul < -5 && calcul > -180){ if(angle > 180){
drivetrain.setControl( angle -= 360;
drive.withRotationalRate(0.5*(2*Math.PI)));
} }
else if(calcul > 5 && calcul < 180){ if(calcul > -5 && calcul < 5){
drivetrain.setControl( drivetrain.setControl(
drive.withRotationalRate(-0.5*(2*Math.PI))); drive.withRotationalRate(0));
} }
else if(calcul >= 180){ else if(calcul > 5){
drivetrain.setControl( drivetrain.setControl(
drive.withRotationalRate(-0.5*(2*Math.PI))); drive.withRotationalRate(-0.5*(2*Math.PI)));
} }
else if(calcul <= -180){ else if(calcul < -5){
drivetrain.setControl( drivetrain.setControl(
drive.withRotationalRate(0.5*(2*Math.PI))); drive.withRotationalRate(-0.5*(2*Math.PI)));
}
else{
drivetrain.setControl(
drive.withRotationalRate(0));
}
System.out.println(angle);
if (calcul < 0.2 && calcul > -0.2) {
drivetrain.setControl(drive.withRotationalRate(0));
} }
// if(calcul < -5 && calcul > -180){
// drivetrain.setControl(
// drive.withRotationalRate(0.5*(2*Math.PI)));
// }
// else if(calcul > 5 && calcul < 180){
// drivetrain.setControl(
// drive.withRotationalRate(-0.5*(2*Math.PI)));
// }
// else if(calcul >= 180){
// drivetrain.setControl(
// drive.withRotationalRate(-0.5*(2*Math.PI)));
// }
// else if(calcul <= -180){
// drivetrain.setControl(
// drive.withRotationalRate(0.5*(2*Math.PI)));
// }
// else{
// drivetrain.setControl(
// drive.withRotationalRate(0));
// }
// drivetrain.setControl(
// drive.withVelocityX(0).withVelocityY(0).withRotationalRate(calcul));
// System.out.println(angle);
// if (calcul < 0.2 && calcul > -0.2) {
// drivetrain.setControl(drive.withRotationalRate(0));
// }
} }
else{ else{
drivetrain.setControl(drive.withRotationalRate(0)); drivetrain.setControl(drive.withRotationalRate(0));
@@ -105,7 +126,6 @@ public class LimelighterAuto extends Command {
// Returns true when the command should end. // Returns true when the command should end.
@Override @Override
public boolean isFinished() { public boolean isFinished() {
return calcul < 5 && calcul > -5; return calcul > -5 && calcul < 5;
} }
} }

4
src/main/java/frc/robot/commands/ModeAuto/TournerVersMur.java
View File

@@ -37,7 +37,9 @@ public class TournerVersMur extends Command {
// Called when the command is initially scheduled. // Called when the command is initially scheduled.
@Override @Override
public void initialize() {} public void initialize() {
alliance = DriverStation.getAlliance();
}
// Called every time the scheduler runs while the command is scheduled. // Called every time the scheduler runs while the command is scheduled.
@Override @Override

4
src/main/java/frc/robot/commands/ModeAuto/TournerVersReservoir.java
View File

@@ -37,7 +37,9 @@ public class TournerVersReservoir extends Command {
// Called when the command is initially scheduled. // Called when the command is initially scheduled.
@Override @Override
public void initialize() {} public void initialize() {
alliance = DriverStation.getAlliance();
}
// Called every time the scheduler runs while the command is scheduled. // Called every time the scheduler runs while the command is scheduled.
@Override @Override

32
src/main/java/frc/robot/subsystems/Limelight3G.java
View File

@@ -52,22 +52,28 @@ NetworkTable table = NetworkTableInstance.getDefault().getTable("limelight-tag")
} }
public double Calcule(double x1, double x2, double y1, double y2, double angle) public double Calcule(double x1, double x2, double y1, double y2, double angle)
{ {
if(x1 > x2){ // if(x1 > x2){
if(y1 > y2){ // if(y1 > y2){
return Math.atan((x2 - x1) / (y2 - y1)* (180/Math.PI)) - angle; // return Math.atan(90-((x2 - x1) / (y2 - y1))) * (180 / Math.PI) - angle;
// }
// else{
// return Math.atan((x2 - x1) / (y2 - y1)) * (180 / Math.PI)+90 - angle;
// }
// }
// else{
// if(y1 > y2){
// return Math.atan((x2 - x1) / (y2 - y1))* (180 / Math.PI)+270 - angle;
// }
// else{
// return Math.atan(90-((x2 - x1) / (y2 - y1))) * (180 / Math.PI)+180 - angle;
// }
// }
if(y1 > y2){
return Math.atan((x2 - x1) / (y2 - y1)) * (180 / Math.PI) - angle;
} }
else{ else{
return Math.atan((x2 - x1) / (y2 - y1)* (180/Math.PI)) + 180 - angle; return Math.atan((x2 - x1) / (y2 - y1)) * (180 / Math.PI)-360 - angle;
} }
}
else{
if(y1 > y2){
return 90 -(Math.atan((x2 - x1) / (y2 - y1)) * (180/Math.PI)) + 270 - angle;
}
else{
return Math.atan((x2 - x1) / (y2 - y1)* (180/Math.PI)) - angle;
}
}
} }
@Override @Override
public void periodic() { public void periodic() {