Compare commits
	
		
			7 Commits
		
	
	
		
			2b94ebcc95
			...
			elevateur
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 36456f1fe4 | ||
|  | 0567735a6f | ||
|  | 0fdfa4269d | ||
|  | e7b4b47928 | ||
|  | 0577ce368a | ||
|  | 7521c0d94e | ||
|  | b16d11b70a | 
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -6,11 +6,8 @@ package frc.robot; | |||||||
|  |  | ||||||
| import edu.wpi.first.wpilibj2.command.Command; | import edu.wpi.first.wpilibj2.command.Command; | ||||||
| import edu.wpi.first.wpilibj2.command.Commands; | import edu.wpi.first.wpilibj2.command.Commands; | ||||||
| import edu.wpi.first.wpilibj2.command.button.CommandXboxController; |  | ||||||
|  |  | ||||||
| public class RobotContainer { | public class RobotContainer { | ||||||
|   CommandXboxController manette1 = new CommandXboxController(0); |  | ||||||
|   CommandXboxController manette2 = new CommandXboxController(0); |  | ||||||
|   public RobotContainer() { |   public RobotContainer() { | ||||||
|     configureBindings(); |     configureBindings(); | ||||||
|   } |   } | ||||||
|   | |||||||
| @@ -5,15 +5,15 @@ | |||||||
| package frc.robot.commands; | package frc.robot.commands; | ||||||
| 
 | 
 | ||||||
| import edu.wpi.first.wpilibj2.command.Command; | import edu.wpi.first.wpilibj2.command.Command; | ||||||
| import frc.robot.subsystems.Limelight3G; | import frc.robot.subsystems.Elevateur; | ||||||
| 
 | 
 | ||||||
| /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */ | /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */ | ||||||
| public class AprilTag3G extends Command { | public class Depart extends Command { | ||||||
|   private Limelight3G limelight3g; |   private Elevateur elevateur; | ||||||
|   /** Creates a new AprilTag3G. */ |   /** Creates a new L2. */ | ||||||
|   public AprilTag3G(Limelight3G limelight3g) { |   public Depart(Elevateur elevateur) { | ||||||
|     this.limelight3g = limelight3g; |     this.elevateur = elevateur; | ||||||
|     addRequirements(limelight3g); |     addRequirements(elevateur); | ||||||
|     // Use addRequirements() here to declare subsystem dependencies. |     // Use addRequirements() here to declare subsystem dependencies. | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
| @@ -24,23 +24,24 @@ public class AprilTag3G extends Command { | |||||||
|   // Called every time the scheduler runs while the command is scheduled. |   // Called every time the scheduler runs while the command is scheduled. | ||||||
|   @Override |   @Override | ||||||
|   public void execute() { |   public void execute() { | ||||||
|     if(limelight3g.getV() == true){ |     if(elevateur.limit2()==true){ | ||||||
|        |       elevateur.vitesse(0); | ||||||
|  |       elevateur.reset(); | ||||||
|     } |     } | ||||||
|     else{ |     else{ | ||||||
|        |       elevateur.vitesse(-.5); | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   // Called once the command ends or is interrupted. |   // Called once the command ends or is interrupted. | ||||||
|   @Override |   @Override | ||||||
|   public void end(boolean interrupted) { |   public void end(boolean interrupted) { | ||||||
|      |     elevateur.vitesse(0); | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   // Returns true when the command should end. |   // Returns true when the command should end. | ||||||
|   @Override |   @Override | ||||||
|   public boolean isFinished() { |   public boolean isFinished() { | ||||||
|     return false; |     return elevateur.limit2()==true; | ||||||
|   } |   } | ||||||
| } | } | ||||||
							
								
								
									
										48
									
								
								src/main/java/frc/robot/commands/ElevateurManuel.java
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										48
									
								
								src/main/java/frc/robot/commands/ElevateurManuel.java
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,48 @@ | |||||||
|  | // Copyright (c) FIRST and other WPILib contributors. | ||||||
|  | // Open Source Software; you can modify and/or share it under the terms of | ||||||
|  | // the WPILib BSD license file in the root directory of this project. | ||||||
|  |  | ||||||
|  | package frc.robot.commands; | ||||||
|  |  | ||||||
|  | import java.util.function.DoubleSupplier; | ||||||
|  |  | ||||||
|  | import edu.wpi.first.wpilibj2.command.Command; | ||||||
|  | import frc.robot.subsystems.Elevateur; | ||||||
|  |  | ||||||
|  | /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */ | ||||||
|  | public class ElevateurManuel extends Command { | ||||||
|  |   private DoubleSupplier doubleSupplier; | ||||||
|  |   private Elevateur elevateur; | ||||||
|  |   /** Creates a new ElevateurManuel. */ | ||||||
|  |   public ElevateurManuel(Elevateur elevateur,DoubleSupplier doubleSupplier) { | ||||||
|  |     this.doubleSupplier = doubleSupplier; | ||||||
|  |     this.elevateur = elevateur; | ||||||
|  |     addRequirements(elevateur); | ||||||
|  |     // Use addRequirements() here to declare subsystem dependencies. | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   // Called when the command is initially scheduled. | ||||||
|  |   @Override | ||||||
|  |   public void initialize() {} | ||||||
|  |  | ||||||
|  |   // Called every time the scheduler runs while the command is scheduled. | ||||||
|  |   @Override | ||||||
|  |   public void execute() { | ||||||
|  |     if(elevateur.limit2()==true){ | ||||||
|  |       elevateur.vitesse(0); | ||||||
|  |     } | ||||||
|  |     elevateur.vitesse(doubleSupplier.getAsDouble()); | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   // Called once the command ends or is interrupted. | ||||||
|  |   @Override | ||||||
|  |   public void end(boolean interrupted) { | ||||||
|  |     elevateur.vitesse(0); | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   // Returns true when the command should end. | ||||||
|  |   @Override | ||||||
|  |   public boolean isFinished() { | ||||||
|  |     return false; | ||||||
|  |   } | ||||||
|  | } | ||||||
| @@ -5,39 +5,42 @@ | |||||||
| package frc.robot.commands; | package frc.robot.commands; | ||||||
| 
 | 
 | ||||||
| import edu.wpi.first.wpilibj2.command.Command; | import edu.wpi.first.wpilibj2.command.Command; | ||||||
| import frc.robot.subsystems.Limelight3; | import frc.robot.subsystems.Elevateur; | ||||||
| import frc.robot.subsystems.Limelight3G; |  | ||||||
| 
 | 
 | ||||||
| /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */ | /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */ | ||||||
| public class Forme3 extends Command { | public class L2 extends Command { | ||||||
|   private Limelight3 limelight3; |   private Elevateur elevateur; | ||||||
|   /** Creates a new Forme3. */ |   /** Creates a new L2. */ | ||||||
|   public Forme3(Limelight3 limelight3) { |   public L2(Elevateur elevateur) { | ||||||
|     this.limelight3 = limelight3; |     this.elevateur = elevateur; | ||||||
|     addRequirements(limelight3); |     addRequirements(elevateur); | ||||||
|     // Use addRequirements() here to declare subsystem dependencies. |     // Use addRequirements() here to declare subsystem dependencies. | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   // Called when the command is initially scheduled. |   // Called when the command is initially scheduled. | ||||||
|   @Override |   @Override | ||||||
|   public void initialize() { |   public void initialize() {} | ||||||
|     limelight3.Forme(); |  | ||||||
|   } |  | ||||||
| 
 | 
 | ||||||
|   // Called every time the scheduler runs while the command is scheduled. |   // Called every time the scheduler runs while the command is scheduled. | ||||||
|   @Override |   @Override | ||||||
|   public void execute() { |   public void execute() { | ||||||
|     if(limelight3.getV() == true){ |     if(elevateur.position()>=500 && elevateur.position()<=510){ | ||||||
|        |       elevateur.vitesse(0); | ||||||
|  |     } | ||||||
|  |     else if(elevateur.position()>=510){ | ||||||
|  |       elevateur.vitesse(-0.3); | ||||||
|     } |     } | ||||||
|     else{ |     else{ | ||||||
|        |       elevateur.vitesse(.3); | ||||||
|     } |     } | ||||||
|  | 
 | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   // Called once the command ends or is interrupted. |   // Called once the command ends or is interrupted. | ||||||
|   @Override |   @Override | ||||||
|   public void end(boolean interrupted) {} |   public void end(boolean interrupted) { | ||||||
|  |     elevateur.vitesse(0); | ||||||
|  |   } | ||||||
| 
 | 
 | ||||||
|   // Returns true when the command should end. |   // Returns true when the command should end. | ||||||
|   @Override |   @Override | ||||||
| @@ -5,39 +5,41 @@ | |||||||
| package frc.robot.commands; | package frc.robot.commands; | ||||||
| 
 | 
 | ||||||
| import edu.wpi.first.wpilibj2.command.Command; | import edu.wpi.first.wpilibj2.command.Command; | ||||||
| import frc.robot.subsystems.Limelight3; | import frc.robot.subsystems.Elevateur; | ||||||
| import frc.robot.subsystems.Limelight3G; |  | ||||||
| 
 | 
 | ||||||
| /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */ | /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */ | ||||||
| public class AprilTag3 extends Command { | public class L3 extends Command { | ||||||
|   private Limelight3 limelight3; |   private Elevateur elevateur; | ||||||
|   /** Creates a new AprilTag3G. */ |   /** Creates a new L2. */ | ||||||
|   public AprilTag3(Limelight3 limelight3) { |   public L3(Elevateur elevateur) { | ||||||
|     this.limelight3 = limelight3; |     this.elevateur = elevateur; | ||||||
|     addRequirements(limelight3); |     addRequirements(elevateur); | ||||||
|     // Use addRequirements() here to declare subsystem dependencies. |     // Use addRequirements() here to declare subsystem dependencies. | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   // Called when the command is initially scheduled. |   // Called when the command is initially scheduled. | ||||||
|   @Override |   @Override | ||||||
|   public void initialize() { |   public void initialize() {} | ||||||
|     limelight3.Apriltag(); |  | ||||||
|   } |  | ||||||
| 
 | 
 | ||||||
|   // Called every time the scheduler runs while the command is scheduled. |   // Called every time the scheduler runs while the command is scheduled. | ||||||
|   @Override |   @Override | ||||||
|   public void execute() { |   public void execute() { | ||||||
|     if(limelight3.getV() == true){ |     if(elevateur.position()>=700 && elevateur.position()<=710){ | ||||||
|        |       elevateur.vitesse(0); | ||||||
|  |     } | ||||||
|  |     else if(elevateur.position()>=510){ | ||||||
|  |       elevateur.vitesse(-0.5); | ||||||
|     } |     } | ||||||
|     else{ |     else{ | ||||||
|        |       elevateur.vitesse(.5); | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   // Called once the command ends or is interrupted. |   // Called once the command ends or is interrupted. | ||||||
|   @Override |   @Override | ||||||
|   public void end(boolean interrupted) {} |   public void end(boolean interrupted) { | ||||||
|  |     elevateur.vitesse(0); | ||||||
|  |   } | ||||||
| 
 | 
 | ||||||
|   // Returns true when the command should end. |   // Returns true when the command should end. | ||||||
|   @Override |   @Override | ||||||
							
								
								
									
										49
									
								
								src/main/java/frc/robot/commands/L4.java
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										49
									
								
								src/main/java/frc/robot/commands/L4.java
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,49 @@ | |||||||
|  | // Copyright (c) FIRST and other WPILib contributors. | ||||||
|  | // Open Source Software; you can modify and/or share it under the terms of | ||||||
|  | // the WPILib BSD license file in the root directory of this project. | ||||||
|  |  | ||||||
|  | package frc.robot.commands; | ||||||
|  |  | ||||||
|  | import edu.wpi.first.wpilibj2.command.Command; | ||||||
|  | import frc.robot.subsystems.Elevateur; | ||||||
|  |  | ||||||
|  | /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */ | ||||||
|  | public class L4 extends Command { | ||||||
|  |   private Elevateur elevateur; | ||||||
|  |   /** Creates a new L2. */ | ||||||
|  |   public L4(Elevateur elevateur) { | ||||||
|  |     this.elevateur = elevateur; | ||||||
|  |     addRequirements(elevateur); | ||||||
|  |     // Use addRequirements() here to declare subsystem dependencies. | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   // Called when the command is initially scheduled. | ||||||
|  |   @Override | ||||||
|  |   public void initialize() {} | ||||||
|  |  | ||||||
|  |   // Called every time the scheduler runs while the command is scheduled. | ||||||
|  |   @Override | ||||||
|  |   public void execute() { | ||||||
|  |     if(elevateur.position()>=800 && elevateur.position()<=810){ | ||||||
|  |       elevateur.vitesse(0); | ||||||
|  |     } | ||||||
|  |     else if(elevateur.position()>=810){ | ||||||
|  |       elevateur.vitesse(-0.5); | ||||||
|  |     } | ||||||
|  |     else{ | ||||||
|  |       elevateur.vitesse(.5); | ||||||
|  |     } | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   // Called once the command ends or is interrupted. | ||||||
|  |   @Override | ||||||
|  |   public void end(boolean interrupted) { | ||||||
|  |     elevateur.vitesse(0); | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   // Returns true when the command should end. | ||||||
|  |   @Override | ||||||
|  |   public boolean isFinished() { | ||||||
|  |     return elevateur.position()>=800; | ||||||
|  |   } | ||||||
|  | } | ||||||
							
								
								
									
										32
									
								
								src/main/java/frc/robot/subsystems/Elevateur.java
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										32
									
								
								src/main/java/frc/robot/subsystems/Elevateur.java
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,32 @@ | |||||||
|  | // Copyright (c) FIRST and other WPILib contributors. | ||||||
|  | // Open Source Software; you can modify and/or share it under the terms of | ||||||
|  | // the WPILib BSD license file in the root directory of this project. | ||||||
|  |  | ||||||
|  | package frc.robot.subsystems; | ||||||
|  |  | ||||||
|  | import edu.wpi.first.wpilibj.DigitalInput; | ||||||
|  | import edu.wpi.first.wpilibj2.command.SubsystemBase; | ||||||
|  | import com.revrobotics.spark.SparkMax; | ||||||
|  | import com.revrobotics.spark.SparkLowLevel.MotorType; | ||||||
|  | public class Elevateur extends SubsystemBase { | ||||||
|  |   /** Creates a new Elevateur. */ | ||||||
|  |   public Elevateur() {} | ||||||
|  |   final SparkMax  monte = new SparkMax(22, MotorType.kBrushless); | ||||||
|  |   final DigitalInput limit2 = new DigitalInput(0); | ||||||
|  |   public double position(){ | ||||||
|  |     return monte.getEncoder().getPosition(); | ||||||
|  |   } | ||||||
|  |   public void vitesse(double vitesse){ | ||||||
|  |     monte.set(vitesse); | ||||||
|  |   } | ||||||
|  |   public boolean limit2(){ | ||||||
|  |     return limit2.get(); | ||||||
|  |   }  | ||||||
|  |   public void reset(){ | ||||||
|  |     monte.getEncoder().setPosition(0); | ||||||
|  |   } | ||||||
|  |   @Override | ||||||
|  |   public void periodic() { | ||||||
|  |     // This method will be called once per scheduler run | ||||||
|  |   } | ||||||
|  | } | ||||||
| @@ -1,39 +0,0 @@ | |||||||
| // Copyright (c) FIRST and other WPILib contributors. |  | ||||||
| // Open Source Software; you can modify and/or share it under the terms of |  | ||||||
| // the WPILib BSD license file in the root directory of this project. |  | ||||||
|  |  | ||||||
| package frc.robot.subsystems; |  | ||||||
|  |  | ||||||
| import edu.wpi.first.net.PortForwarder; |  | ||||||
| import edu.wpi.first.networktables.NetworkTable; |  | ||||||
| import edu.wpi.first.networktables.NetworkTableEntry; |  | ||||||
| import edu.wpi.first.networktables.NetworkTableInstance; |  | ||||||
| import edu.wpi.first.wpilibj2.command.SubsystemBase; |  | ||||||
| import frc.robot.LimelightHelpers; |  | ||||||
|  |  | ||||||
| public class Limelight3 extends SubsystemBase { |  | ||||||
|   NetworkTable table = NetworkTableInstance.getDefault().getTable("limelight-balon"); |  | ||||||
|   NetworkTableEntry pipeline = table.getEntry("pipeline"); |  | ||||||
|   /** Creates a new Limelight3. */ |  | ||||||
|   public Limelight3() { |  | ||||||
|     for(int port = 5800; port <=5807; port++){ |  | ||||||
|       PortForwarder.add(port, "limelight.local", port); |  | ||||||
|     } |  | ||||||
|   } |  | ||||||
|   public double getX(){ |  | ||||||
|     return LimelightHelpers.getTX("limelight-balon"); |  | ||||||
|   } |  | ||||||
|   public boolean getV(){ |  | ||||||
|     return LimelightHelpers.getTV("limelight-balon"); |  | ||||||
|   } |  | ||||||
|   public void Apriltag(){ |  | ||||||
|     pipeline.setNumber(1); |  | ||||||
|   } |  | ||||||
|   public void Forme(){ |  | ||||||
|     pipeline.setNumber(0); |  | ||||||
|   } |  | ||||||
|   @Override |  | ||||||
|   public void periodic() { |  | ||||||
|     // This method will be called once per scheduler run |  | ||||||
|   } |  | ||||||
| } |  | ||||||
| @@ -1,28 +0,0 @@ | |||||||
| // Copyright (c) FIRST and other WPILib contributors. |  | ||||||
| // Open Source Software; you can modify and/or share it under the terms of |  | ||||||
| // the WPILib BSD license file in the root directory of this project. |  | ||||||
|  |  | ||||||
| package frc.robot.subsystems; |  | ||||||
|  |  | ||||||
| import edu.wpi.first.net.PortForwarder; |  | ||||||
| import edu.wpi.first.wpilibj2.command.SubsystemBase; |  | ||||||
| import frc.robot.LimelightHelpers; |  | ||||||
|  |  | ||||||
| public class Limelight3G extends SubsystemBase { |  | ||||||
|   /** Creates a new Limelight3. */ |  | ||||||
|   public Limelight3G() { |  | ||||||
|     for(int port = 5800; port <=5807; port++){ |  | ||||||
|       PortForwarder.add(port, "limelight.local", port); |  | ||||||
|     } |  | ||||||
|   } |  | ||||||
|   public double getX(){ |  | ||||||
|     return LimelightHelpers.getTX("limelight-tag"); |  | ||||||
|   } |  | ||||||
|   public boolean getV(){ |  | ||||||
|     return LimelightHelpers.getTV("limelight-tag"); |  | ||||||
|   } |  | ||||||
|   @Override |  | ||||||
|   public void periodic() { |  | ||||||
|     // This method will be called once per scheduler run |  | ||||||
|   } |  | ||||||
| } |  | ||||||
		Reference in New Issue
	
	Block a user