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

Merge branch 'main' of https://demerso.net/pls5618/2023/robot

Browse Source
This commit is contained in:
Antoine PerreaultE
2023-03-20 18:10:05 -04:00
parent ee40b0a976 18e7c292ce
commit da4e3ccd21
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/frc/robot/RobotContainer.java
View File

@@ -55,6 +55,7 @@ public class RobotContainer {
CommandXboxController manette1 = new CommandXboxController(0); CommandXboxController manette1 = new CommandXboxController(0);
CommandXboxController manette2 = new CommandXboxController(1); CommandXboxController manette2 = new CommandXboxController(1);
<<<<<<< HEAD
// dashboard // dashboard
SendableChooser<String> chooser = new SendableChooser<>(); SendableChooser<String> chooser = new SendableChooser<>();
@@ -62,6 +63,8 @@ String enhaut = "en haut";
String aumilieux = "au milieux"; String aumilieux = "au milieux";
String enbas = "en bas"; String enbas = "en bas";
String nulpart = "nul part"; String nulpart = "nul part";
=======
>>>>>>> 18e7c292ce3d2882eb58ef622b7e497d43d99fea
ShuffleboardLayout layoutauto = Shuffleboard.getTab("teb").getLayout("auto",BuiltInLayouts.kList) ShuffleboardLayout layoutauto = Shuffleboard.getTab("teb").getLayout("auto",BuiltInLayouts.kList)
.withSize(2, 2).withProperties(Map.of("Label position","LEFT")); .withSize(2, 2).withProperties(Map.of("Label position","LEFT"));
GenericEntry autobalance = layoutauto.add("choix balance",true).withWidget(BuiltInWidgets.kToggleSwitch).getEntry(); GenericEntry autobalance = layoutauto.add("choix balance",true).withWidget(BuiltInWidgets.kToggleSwitch).getEntry();
@@ -102,6 +105,12 @@ Tape tape = new Tape(limelight, basePilotable, null);
PivotManuel pivotManuel = new PivotManuel(pivot,manette2::getLeftX); PivotManuel pivotManuel = new PivotManuel(pivot,manette2::getLeftX);
BrasManuel brasManuel = new BrasManuel(brasTelescopique,manette2::getLeftY); BrasManuel brasManuel = new BrasManuel(brasTelescopique,manette2::getLeftY);
SendableChooser<String> chooser = new SendableChooser<>();
String enhaut = "en bas";
String aumilieux = "au milieux";
String enbas = "en bas";
String nulpart = "nul part";
public RobotContainer() { public RobotContainer() {
chooser.addOption(enhaut, enhaut); chooser.addOption(enhaut, enhaut);
chooser.addOption(enbas, enbas); chooser.addOption(enbas, enbas);