werobot/ftc2024-robotcode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

h

Browse source
This commit is contained in:
GZod01 2024-04-06 10:44:43 +02:00
parent 9336aeb5ab
commit 56d69e5e08
1 changed files with 9 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
FTC2024WeRobotControl.java
View file

@ -58,7 +58,6 @@ public class FTC2024WeRobotControl {
this.timer = new ElapsedTime();
}
<<<<<<< HEAD
public void boxElv() {
Parent.lmelevator.setVelocity(600);
Parent.rmelevator.setVelocity(600);
@ -70,28 +69,7 @@ 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);
@ -105,6 +83,12 @@ 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;