PLS5618/robot-2023
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wQA

Browse Source
This commit is contained in:
Olivier Dubois
2023-02-15 19:52:10 -05:00
parent b4d38706ee
commit 0fabe373fa
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/frc/robot/subsystems/Gratte.java
View File

@ -7,10 +7,7 @@ package frc.robot.subsystems;
import edu.wpi.first.wpilibj2.command.SubsystemBase;
import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX;
import edu.wpi.first.wpilibj.DigitalInput;
<<<<<<< HEAD
import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
=======
>>>>>>> b20ba544a81d82752f6f8e390de38cbcfdc79f08
import frc.robot.Constants;
public class Gratte extends SubsystemBase {

3
src/main/java/frc/robot/subsystems/Limelight.java
View File

@ -4,15 +4,12 @@
package frc.robot.subsystems;
<<<<<<< HEAD
import edu.wpi.first.cameraserver.CameraServer;
import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
=======
import org.photonvision.PhotonCamera;
import org.photonvision.common.hardware.VisionLEDMode;
import edu.wpi.first.net.PortForwarder;
>>>>>>> b20ba544a81d82752f6f8e390de38cbcfdc79f08
import edu.wpi.first.wpilibj2.command.SubsystemBase;