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

tdyjhgmvj

Browse Source
This commit is contained in:
samuel desharnais 2023-02-20 20:04:43 -05:00
parent 085dc6ae04
commit 02c52c24bf
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java
View File

@ -8,10 +8,7 @@ package frc.robot.subsystems.bras;
import com.revrobotics.CANSparkMax; import com.revrobotics.CANSparkMax;
import com.revrobotics.CANSparkMaxLowLevel.MotorType; import com.revrobotics.CANSparkMaxLowLevel.MotorType;
<<<<<<< HEAD
import edu.wpi.first.wpilibj.DigitalInput; import edu.wpi.first.wpilibj.DigitalInput;
=======
>>>>>>> Dash
import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard; import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
import edu.wpi.first.wpilibj2.command.SubsystemBase; import edu.wpi.first.wpilibj2.command.SubsystemBase;
import frc.robot.Constants; import frc.robot.Constants;
@ -35,10 +32,7 @@ public class BrasTelescopique extends SubsystemBase {
} }
@Override @Override
public void periodic() { public void periodic() {
<<<<<<< HEAD
Shuffleboard.getTab("SmartDashBoard") .add("photocell",0.1); Shuffleboard.getTab("SmartDashBoard") .add("photocell",0.1);
=======
Shuffleboard.getTab("SmartDashBoard") .add("winch",0.1); Shuffleboard.getTab("SmartDashBoard") .add("winch",0.1);
>>>>>>> Dash
} }
} }

8
src/main/java/frc/robot/subsystems/bras/Pivot.java
View File

@ -4,10 +4,7 @@
package frc.robot.subsystems.bras; package frc.robot.subsystems.bras;
<<<<<<< HEAD
import edu.wpi.first.wpilibj.DigitalInput; import edu.wpi.first.wpilibj.DigitalInput;
=======
>>>>>>> Dash
import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard; import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
import edu.wpi.first.wpilibj2.command.SubsystemBase; import edu.wpi.first.wpilibj2.command.SubsystemBase;
import frc.robot.Constants; import frc.robot.Constants;
@ -37,11 +34,8 @@ public class Pivot extends SubsystemBase {
} }
@Override @Override
public void periodic() { public void periodic() {
<<<<<<< HEAD
Shuffleboard.getTab("SmartDashBoard") .add("limitpivot",0.1); Shuffleboard.getTab("SmartDashBoard") .add("limitpivot",0.1);
} }
=======
Shuffleboard.getTab("SmartDashBoard") .add("pivot encodeur",0.1); Shuffleboard.getTab("SmartDashBoard") .add("pivot encodeur",0.1);
} }
>>>>>>> Dash
}