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

2023-02-08 20:17:19 -05:00
parent 020649251b 48259c9fce
commit 30277d3523
1 changed files with 8 additions and 0 deletions
--- a/src/main/java/frc/robot/Constants.java
+++ b/src/main/java/frc/robot/Constants.java
@@ -7,6 +7,7 @@ public class Constants {
    public static int arrieregauche = 3;
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
    public static int leverGratte = 0;
    public static int baisserGratte = 1;
@@ -38,4 +39,11 @@ public class Constants {
 =======
    public static int actuateur = 4;
 >>>>>>> Gratte
+=======
+    // pneumatique
+    public static int pistonpinceouvre = 0;
+    public static int pistonpinceferme = 1;
+    public static int BrasTelescopique = 5;
+    public static int actuateur = 4;
+>>>>>>> 48259c9fcef533cfc4c76020b5b7862858c0627b
 }