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:
Olivier Dubois 2023-02-08 20:17:19 -05:00
commit 30277d3523
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/frc/robot/Constants.java
View File

@ -7,6 +7,7 @@ public class Constants {
public static int arrieregauche = 3; public static int arrieregauche = 3;
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
======= =======
public static int leverGratte = 0; public static int leverGratte = 0;
public static int baisserGratte = 1; public static int baisserGratte = 1;
@ -38,4 +39,11 @@ public class Constants {
======= =======
public static int actuateur = 4; public static int actuateur = 4;
>>>>>>> Gratte >>>>>>> Gratte
=======
// pneumatique
public static int pistonpinceouvre = 0;
public static int pistonpinceferme = 1;
public static int BrasTelescopique = 5;
public static int actuateur = 4;
>>>>>>> 48259c9fcef533cfc4c76020b5b7862858c0627b
} }