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

fnc n

Browse Source
This commit is contained in:
EdwardFaucher 2023-03-08 19:50:49 -05:00
parent da23e4dfeb
commit 50cf278f00
3 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,11 +13,8 @@ import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab;
import frc.robot.Constants; import frc.robot.Constants;
public class Gratte extends SubsystemBase { public class Gratte extends SubsystemBase {
<<<<<<< HEAD
ShuffleboardTab teb = Shuffleboard.getTab("teb");
=======
ShuffleboardTab teb = Shuffleboard.getTab("teb"); ShuffleboardTab teb = Shuffleboard.getTab("teb");
>>>>>>> fc4607f3c6d7203a155182eded4626d37f75de5e
ShuffleboardLayout limitswitchgratte = Shuffleboard.getTab("teb") ShuffleboardLayout limitswitchgratte = Shuffleboard.getTab("teb")
.getLayout("limitswitchsgratte", BuiltInLayouts.kList) .getLayout("limitswitchsgratte", BuiltInLayouts.kList)
.withSize(2, 2); .withSize(2, 2);

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

@ -12,14 +12,14 @@ import edu.wpi.first.wpilibj.DigitalInput;
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;
import edu.wpi.first.wpilibj.shuffleboard.BuiltInLayouts;
import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard; import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardLayout;
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;
import frc.robot.Constants; import frc.robot.Constants;
public class BrasTelescopique extends SubsystemBase { public class BrasTelescopique extends SubsystemBase {
<<<<<<< HEAD
ShuffleboardTab teb = Shuffleboard.getTab("teb");
ShuffleboardLayout layout = Shuffleboard.getTab("teb") ShuffleboardLayout layout = Shuffleboard.getTab("teb")
.getLayout("layout", BuiltInLayouts.kList) .getLayout("layout", BuiltInLayouts.kList)
.withSize(2, 2); .withSize(2, 2);
@ -27,9 +27,7 @@ public class BrasTelescopique extends SubsystemBase {
ShuffleboardLayout bras = Shuffleboard.getTab("teb") ShuffleboardLayout bras = Shuffleboard.getTab("teb")
.getLayout("bras", BuiltInLayouts.kList) .getLayout("bras", BuiltInLayouts.kList)
.withSize(2, 2); .withSize(2, 2);
=======
ShuffleboardTab teb = Shuffleboard.getTab("teb"); ShuffleboardTab teb = Shuffleboard.getTab("teb");
>>>>>>> fc4607f3c6d7203a155182eded4626d37f75de5e
/** Creates a new BrasTelescopique. */ /** Creates a new BrasTelescopique. */
public BrasTelescopique() { public BrasTelescopique() {
teb .add("photocell",0.1); teb .add("photocell",0.1);

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

@ -14,12 +14,9 @@ import com.revrobotics.CANSparkMax;
import com.revrobotics.CANSparkMaxLowLevel.MotorType; import com.revrobotics.CANSparkMaxLowLevel.MotorType;
public class Pivot extends SubsystemBase { public class Pivot extends SubsystemBase {
<<<<<<< HEAD
ShuffleboardTab teb = Shuffleboard.getTab("teb");
=======
ShuffleboardTab teb = Shuffleboard.getTab("teb"); ShuffleboardTab teb = Shuffleboard.getTab("teb");
>>>>>>> fc4607f3c6d7203a155182eded4626d37f75de5e
// moteur // moteur
private CANSparkMax pivot = new CANSparkMax(Constants.pivot,MotorType.kBrushless); private CANSparkMax pivot = new CANSparkMax(Constants.pivot,MotorType.kBrushless);
private DigitalInput limitpivot = new DigitalInput(Constants.limitpivot); private DigitalInput limitpivot = new DigitalInput(Constants.limitpivot);
@ -46,7 +43,6 @@ public class Pivot extends SubsystemBase {
@Override @Override
public void periodic() { public void periodic() {
} }
<<<<<<< HEAD
@ -55,7 +51,5 @@ public class Pivot extends SubsystemBase {
teb.add ("encodeur pivot",0.1); teb.add ("encodeur pivot",0.1);
} }
} }
=======
}
>>>>>>> fc4607f3c6d7203a155182eded4626d37f75de5e