This commit is contained in:
Antoine PerreaultE 2023-02-13 19:14:01 -05:00
parent 42f4fd28ab
commit 862c449dc8
4 changed files with 2 additions and 24 deletions

Binary file not shown.

View File

@ -21,28 +21,6 @@ public class Constants {
public static int limithd = 3;
public static int limithg = 1;
public static int BrasTelescopique = 5;
<<<<<<< HEAD
public static int actuateur = 4;
public static int actuateur = 4;
// pneumatique
public static int pistonpinceouvre = 0;
public static int pistonpinceferme = 1;
public static int BrasTelescopique = 5;
public static int actuateur = 4;
=======
>>>>>>> 0c37463a91f99a8623a1405743145ad70a140362
}

View File

@ -33,7 +33,7 @@ public class Gyro extends CommandBase {
}
else
{
basvjePilotable.drive(0, 0, 0);
basePilotable.drive(0, 0, 0);
}
}