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

hiuuujujujuuuuu

Browse Source
This commit is contained in:
Olivier Dubois
2023-02-22 18:53:57 -05:00
parent 909d3f424b
commit 306e70101f
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,12 +9,9 @@ import com.revrobotics.CANSparkMax;
import com.revrobotics.CANSparkMaxLowLevel.MotorType; import com.revrobotics.CANSparkMaxLowLevel.MotorType;
import edu.wpi.first.wpilibj.DigitalInput; import edu.wpi.first.wpilibj.DigitalInput;
<<<<<<< HEAD
=======
import edu.wpi.first.wpilibj.DoubleSolenoid; import edu.wpi.first.wpilibj.DoubleSolenoid;
import edu.wpi.first.wpilibj.PneumaticsModuleType; import edu.wpi.first.wpilibj.PneumaticsModuleType;
import edu.wpi.first.wpilibj.DoubleSolenoid.Value; import edu.wpi.first.wpilibj.DoubleSolenoid.Value;
>>>>>>> 2c79346ce98c80f71d749f5cfbe0025b5dedf77a
import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard; import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab; import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab;
import edu.wpi.first.wpilibj2.command.SubsystemBase; import edu.wpi.first.wpilibj2.command.SubsystemBase;
@ -47,12 +44,9 @@ public class BrasTelescopique extends SubsystemBase {
} }
@Override @Override
public void periodic() { public void periodic() {
<<<<<<< HEAD
teb .add("``photocell``",0.1); teb .add("``photocell``",0.1);
teb .add("winch",0.1); teb .add("winch",0.1);
=======
Shuffleboard.getTab("SmartDashBoard") .add("photocell",0.1);
Shuffleboard.getTab("SmartDashBoard") .add("winch",0.1);
>>>>>>> 2c79346ce98c80f71d749f5cfbe0025b5dedf77a
} }
} }

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

@ -36,14 +36,6 @@ public class Pivot extends SubsystemBase {
} }
@Override @Override
public void periodic() { public void periodic() {
<<<<<<< HEAD
teb .add("encodeur", 0.1); teb .add("encodeur", 0.1);
} }
} }
=======
Shuffleboard.getTab("SmartDashBoard") .add("limitpivot",0.1);
Shuffleboard.getTab("SmartDashBoard") .add("pivot encodeur",0.1);
}
}
>>>>>>> 2c79346ce98c80f71d749f5cfbe0025b5dedf77a