From 76eac94686b913baac7169e69378c1157706237f Mon Sep 17 00:00:00 2001 From: robotics2 Date: Tue, 28 Nov 2023 16:52:22 -0800 Subject: [PATCH] speed buttons added, extra steps taken out of auto. --- .../ftc/teamcode/{bluefront.java => BlueBackStage.java} | 4 +--- .../ftc/teamcode/{Autonomoustest.java => RedBackStage.java} | 4 +--- .../firstinspires/ftc/teamcode/{arm.java => manual.java} | 6 +----- 3 files changed, 3 insertions(+), 11 deletions(-) rename TeamCode/src/main/java/org/firstinspires/ftc/teamcode/{bluefront.java => BlueBackStage.java} (99%) rename TeamCode/src/main/java/org/firstinspires/ftc/teamcode/{Autonomoustest.java => RedBackStage.java} (99%) rename TeamCode/src/main/java/org/firstinspires/ftc/teamcode/{arm.java => manual.java} (97%) diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/bluefront.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/BlueBackStage.java similarity index 99% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/bluefront.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/BlueBackStage.java index 3aa88df..6d44fd0 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/bluefront.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/BlueBackStage.java @@ -31,9 +31,7 @@ package org.firstinspires.ftc.teamcode; import com.qualcomm.robotcore.eventloop.opmode.Autonomous; import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode; -import com.qualcomm.robotcore.hardware.ColorSensor; import com.qualcomm.robotcore.hardware.DcMotor; -import com.qualcomm.robotcore.hardware.DcMotorSimple; import com.qualcomm.robotcore.hardware.DistanceSensor; import com.qualcomm.robotcore.hardware.Servo; import com.qualcomm.robotcore.util.ElapsedTime; @@ -68,7 +66,7 @@ import org.firstinspires.ftc.robotcore.external.navigation.DistanceUnit; @Autonomous(name="Blue (Backstage)", group="Robot") //@Disabled -public class bluefront extends LinearOpMode { +public class BlueBackStage extends LinearOpMode { /* Declare OpMode members. */ private DcMotor leftDrive = null; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Autonomoustest.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RedBackStage.java similarity index 99% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Autonomoustest.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RedBackStage.java index 07518e0..d3c0efd 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Autonomoustest.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RedBackStage.java @@ -33,9 +33,7 @@ import android.annotation.SuppressLint; import com.qualcomm.robotcore.eventloop.opmode.Autonomous; import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode; -import com.qualcomm.robotcore.hardware.ColorSensor; import com.qualcomm.robotcore.hardware.DcMotor; -import com.qualcomm.robotcore.hardware.DcMotorSimple; import com.qualcomm.robotcore.hardware.DistanceSensor; import com.qualcomm.robotcore.hardware.Servo; import com.qualcomm.robotcore.util.ElapsedTime; @@ -70,7 +68,7 @@ import org.firstinspires.ftc.robotcore.external.navigation.DistanceUnit; @Autonomous(name="red (backstage)", group="Robot") //@Disabled -public class Autonomoustest extends LinearOpMode { +public class RedBackStage extends LinearOpMode { /* Declare OpMode members. */ private DcMotor leftDrive = null; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/arm.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/manual.java similarity index 97% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/arm.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/manual.java index 341acdb..0ceea52 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/arm.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/manual.java @@ -4,15 +4,11 @@ package org.firstinspires.ftc.teamcode; import com.qualcomm.robotcore.eventloop.opmode.TeleOp; import com.qualcomm.robotcore.eventloop.opmode.OpMode; import com.qualcomm.robotcore.hardware.DcMotor; -import com.qualcomm.robotcore.hardware.DcMotorSimple; -import com.qualcomm.robotcore.hardware.Gamepad; import com.qualcomm.robotcore.hardware.Servo; -import com.qualcomm.robotcore.util.ElapsedTime; - @TeleOp( name = "manual control") -public class arm extends OpMode { +public class manual extends OpMode { DcMotor arm; Servo gripper;