tcfnjkm
This commit is contained in:
		| @@ -20,29 +20,7 @@ public class Constants { | ||||
|     public static int limitbg = 2; | ||||
|     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 | ||||
|  | ||||
| } | ||||
|    | ||||
| @@ -33,7 +33,7 @@ public class Gyro extends CommandBase { | ||||
|    } | ||||
|    else | ||||
|    { | ||||
|      basvjePilotable.drive(0, 0, 0);  | ||||
|      basePilotable.drive(0, 0, 0);  | ||||
|    } | ||||
| } | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user