From 56d69e5e080b3122eab50c7a4c35b0c6d561a698 Mon Sep 17 00:00:00 2001
From: G_Zod01 <gzod01@gzod01.fr>
Date: Sat, 6 Apr 2024 10:44:43 +0200
Subject: [PATCH] h

---
 FTC2024WeRobotControl.java | 34 +++++++++-------------------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/FTC2024WeRobotControl.java b/FTC2024WeRobotControl.java
index 5d6ef89..ca4b52b 100644
--- a/FTC2024WeRobotControl.java
+++ b/FTC2024WeRobotControl.java
@@ -58,7 +58,6 @@ public class FTC2024WeRobotControl {
 		this.timer = new ElapsedTime();
 	}
 
-<<<<<<< HEAD
 	public void boxElv() {
 		Parent.lmelevator.setVelocity(600);
 		Parent.rmelevator.setVelocity(600);
@@ -70,29 +69,8 @@ public class FTC2024WeRobotControl {
 		Parent.rmelevator.setMode(DcMotor.RunMode.RUN_TO_POSITION);
 		Parent.rotation.setMode(DcMotor.RunMode.RUN_TO_POSITION);
 	}
-	/*
-	 * return a metre/sec speed
-	 *
-	 * @param motor_speed = (optional) double between 0 and 1; motor power; default
-	 * to 1
-	 */
-=======
-    /*
-     * return a metre/sec speed
-     *
-     * @param motor_speed = (optional) double between 0 and 1; motor power; default
-     * to 1
-     */
-    
-    public void boxElv(){
-        Parent.lmelevator.setVelocity(600);
-        Parent.rmelevator.setVelocity(600);
-        Parent.lmelevator.setTargetPosition(90);
-        Parent.rmelevator.setTargetPosition(90);
-        Parent.lmelevator.setMode(DcMotor.RunMode.RUN_TO_POSITION);
-        Parent.rmelevator.setMode(DcMotor.RunMode.RUN_TO_POSITION);
-        }
-        
+	
+ 
     public void posBasse(){
         Parent.lmelevator.setVelocity(600);
         Parent.rmelevator.setVelocity(600);
@@ -105,7 +83,13 @@ public class FTC2024WeRobotControl {
         Parent.rotation.setMode(DcMotor.RunMode.RUN_TO_POSITION);
         
     }
-        
+	/*
+	 * return a metre/sec speed
+	 *
+	 * @param motor_speed = (optional) double between 0 and 1; motor power; default
+	 * to 1
+	 */
+             
     public double getSpeedFromMotorSpeed(double motor_speed) {
         double speed_tour_par_minutes = this.tour_par_minutes * motor_speed;
         double speed = (speed_tour_par_minutes / 60) * this.wheel_perimeter;