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

commitrewsedrtyygfdf

Browse Source
This commit is contained in:
Olivier Dubois
2023-02-22 18:50:04 -05:00
parent c0eefcad23
commit e557d1bc6c
6 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,15 +8,14 @@ package frc.robot.subsystems.bras;
import com.revrobotics.CANSparkMax;
import com.revrobotics.CANSparkMaxLowLevel.MotorType;
<<<<<<< HEAD
import edu.wpi.first.wpilibj.DigitalInput;
=======
>>>>>>> Dash
import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab;
import edu.wpi.first.wpilibj2.command.SubsystemBase;
import frc.robot.Constants;
public class BrasTelescopique extends SubsystemBase {
ShuffleboardTab teb = Shuffleboard.getTab("teb");
/** Creates a new BrasTelescopique. */
public BrasTelescopique() {}
final CANSparkMax Winch = new CANSparkMax(Constants.BrasTelescopique,MotorType.kBrushless);
@ -35,10 +34,7 @@ public class BrasTelescopique extends SubsystemBase {
}
@Override
public void periodic() {
<<<<<<< HEAD
Shuffleboard.getTab("SmartDashBoard") .add("photocell",0.1);
=======
Shuffleboard.getTab("SmartDashBoard") .add("winch",0.1);
>>>>>>> Dash
teb .add("``photocell``",0.1);
teb .add("winch",0.1);
}
}

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

@ -8,9 +8,12 @@ import edu.wpi.first.wpilibj.DoubleSolenoid;
import edu.wpi.first.wpilibj.PneumaticsModuleType;
import edu.wpi.first.wpilibj2.command.SubsystemBase;
import edu.wpi.first.wpilibj.DoubleSolenoid.Value;
import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab;
import frc.robot.Constants;
public class Pince extends SubsystemBase {
public class Pince extends SubsystemBase{
private DoubleSolenoid pistonPince = new DoubleSolenoid(PneumaticsModuleType.CTREPCM,Constants.pistonpinceouvre, Constants.pistonpinceferme);
/** Creates a new Pince. */
public Pince() {
@ -23,6 +26,5 @@ public class Pince extends SubsystemBase {
}
@Override
public void periodic() {
}
}

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

@ -4,11 +4,9 @@
package frc.robot.subsystems.bras;
<<<<<<< HEAD
import edu.wpi.first.wpilibj.DigitalInput;
=======
>>>>>>> Dash
import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab;
import edu.wpi.first.wpilibj2.command.SubsystemBase;
import frc.robot.Constants;
@ -16,6 +14,7 @@ import com.revrobotics.CANSparkMax;
import com.revrobotics.CANSparkMaxLowLevel.MotorType;
public class Pivot extends SubsystemBase {
ShuffleboardTab teb = Shuffleboard.getTab("teb");
// moteur
private CANSparkMax pivot = new CANSparkMax(Constants.pivot,MotorType.kBrushless);
private DigitalInput limitpivot = new DigitalInput(Constants.limitpivot);
@ -37,11 +36,6 @@ public class Pivot extends SubsystemBase {
}
@Override
public void periodic() {
<<<<<<< HEAD
Shuffleboard.getTab("SmartDashBoard") .add("limitpivot",0.1);
teb .add("encodeur", 0.1);
}
=======
Shuffleboard.getTab("SmartDashBoard") .add("pivot encodeur",0.1);
}
>>>>>>> Dash
}