add something

This commit is contained in:
Zelina974 2024-03-31 15:58:19 +02:00
parent 2f6da412ad
commit 6eed14fe81
2 changed files with 2 additions and 5 deletions

View file

@ -32,11 +32,7 @@ public class Ftc2024_autonome_api extends LinearOpMode {
public void runOpMode() { public void runOpMode() {
lm = hardwareMap.get(DcMotor.class, "blm"); lm = hardwareMap.get(DcMotor.class, "blm");
rm = hardwareMap.get(DcMotor.class, "brm"); rm = hardwareMap.get(DcMotor.class, "brm");
<<<<<<< HEAD
harvestmotor = hardwareMap.get(DcMotor.class, "moissonneuse"); harvestmotor = hardwareMap.get(DcMotor.class, "moissonneuse");
=======
harvestmotor = hardwareMap.get(DcMotor.class, "moissoneuse");
>>>>>>> a8ae6d3 (hello)
rm.setDirection(DcMotor.Direction.REVERSE); rm.setDirection(DcMotor.Direction.REVERSE);

View file

@ -252,6 +252,7 @@ public class Werobot_FTC2024_carlike extends LinearOpMode {
already_down = false; already_down = false;
} }
// commentaires supprimés dans le robot
// if (gamepad1.x && !already_x){ // if (gamepad1.x && !already_x){
// int targetPos = 0; // int targetPos = 0;
@ -329,7 +330,7 @@ public class Werobot_FTC2024_carlike extends LinearOpMode {
if (gamepad1.right_bumper && gamepad1.left_bumper){ if (gamepad1.right_bumper && gamepad1.left_bumper){
// launch the plane // launch the plane
} }
telemetry.addData("x", x); telemetry.addData("x", x);
telemetry.addData("y", y); telemetry.addData("y", y);
telemetry.addData("lpow", lpower); telemetry.addData("lpow", lpower);