diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ArmTest.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ArmTest.java index 273ea09..66e656d 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ArmTest.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ArmTest.java @@ -29,62 +29,14 @@ package org.firstinspires.ftc.teamcode; -import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_ENCODER; -import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_ENCODER_DIRECTION; -import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_LEFT_MOTOR; -import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_LEFT_MOTOR_DIRECTION; -import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_RIGHT_MOTOR; -import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_RIGHT_MOTOR_DIRECTION; -import static org.firstinspires.ftc.teamcode.PedroConstants.FRONT_LEFT_MOTOR; -import static org.firstinspires.ftc.teamcode.PedroConstants.FRONT_LEFT_MOTOR_DIRECTION; -import static org.firstinspires.ftc.teamcode.PedroConstants.FRONT_RIGHT_MOTOR; -import static org.firstinspires.ftc.teamcode.PedroConstants.FRONT_RIGHT_MOTOR_DIRECTION; -import static org.firstinspires.ftc.teamcode.PedroConstants.LEFT_ENCODER; -import static org.firstinspires.ftc.teamcode.PedroConstants.LEFT_ENCODER_DIRECTION; -import static org.firstinspires.ftc.teamcode.PedroConstants.RIGHT_ENCODER; -import static org.firstinspires.ftc.teamcode.PedroConstants.RIGHT_ENCODER_DIRECTION; - import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode; import com.qualcomm.robotcore.eventloop.opmode.TeleOp; -import com.qualcomm.robotcore.hardware.DcMotor; -import com.qualcomm.robotcore.hardware.DcMotorEx; import com.qualcomm.robotcore.hardware.Gamepad; -import com.qualcomm.robotcore.hardware.ServoImplEx; import com.qualcomm.robotcore.util.ElapsedTime; -import org.firstinspires.ftc.teamcode.pedroPathing.localization.Encoder; import org.firstinspires.ftc.teamcode.subsystem.ArmSubsystem; -import org.firstinspires.ftc.teamcode.subsystem.ClawSubsystem; -/* - * This file contains an example of a Linear "OpMode". - * An OpMode is a 'program' that runs in either the autonomous or the teleop period of an FTC match. - * The names of OpModes appear on the menu of the FTC Driver Station. - * When a selection is made from the menu, the corresponding OpMode is executed. - * - * This particular OpMode illustrates driving a 4-motor Omni-Directional (or Holonomic) robot. - * This code will work with either a Mecanum-Drive or an X-Drive train. - * Both of these drives are illustrated at https://gm0.org/en/latest/docs/robot-design/drivetrains/holonomic.html - * Note that a Mecanum drive must display an X roller-pattern when viewed from above. - * - * Also note that it is critical to set the correct rotation direction for each motor. See details below. - * - * Holonomic drives provide the ability for the robot to move in three axes (directions) simultaneously. - * Each motion axis is controlled by one Joystick axis. - * - * 1) Axial: Driving forward and backward Left-joystick Forward/Backward - * 2) Lateral: Strafing right and left Left-joystick Right and Left - * 3) Yaw: Rotating Clockwise and counter clockwise Right-joystick Right and Left - * - * This code is written assuming that the right-side motors need to be reversed for the robot to drive forward. - * When you first test your robot, if it moves backward when you push the left stick forward, then you must flip - * the direction of all 4 motors (see code below). - * - * Use Android Studio to Copy this Class, and Paste it into your team's code folder with a new name. - * Remove or comment out the @Disabled line to add this OpMode to the Driver Station OpMode list - */ - -@TeleOp(name="Arm Test", group="Debug") +@TeleOp(name = "Arm Test", group = "Debug") public class ArmTest extends LinearOpMode { // Declare OpMode members for each of the 4 motors. @@ -134,10 +86,10 @@ public class ArmTest extends LinearOpMode { arm.setPosition(arm.getPosition() + .05); } - // Show the elapsed game time and wheel power. telemetry.addData("Status", "Run Time: " + runtime.toString()); telemetry.addData("Arm State", arm.getState()); telemetry.addData("Arm Position", arm.getPosition()); telemetry.update(); } - }} + } +} diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ClawTest.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ClawTest.java index 8c1ae29..e7bfa4c 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ClawTest.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ClawTest.java @@ -29,61 +29,14 @@ package org.firstinspires.ftc.teamcode; -import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_ENCODER; -import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_ENCODER_DIRECTION; -import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_LEFT_MOTOR; -import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_LEFT_MOTOR_DIRECTION; -import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_RIGHT_MOTOR; -import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_RIGHT_MOTOR_DIRECTION; -import static org.firstinspires.ftc.teamcode.PedroConstants.FRONT_LEFT_MOTOR; -import static org.firstinspires.ftc.teamcode.PedroConstants.FRONT_LEFT_MOTOR_DIRECTION; -import static org.firstinspires.ftc.teamcode.PedroConstants.FRONT_RIGHT_MOTOR; -import static org.firstinspires.ftc.teamcode.PedroConstants.FRONT_RIGHT_MOTOR_DIRECTION; -import static org.firstinspires.ftc.teamcode.PedroConstants.LEFT_ENCODER; -import static org.firstinspires.ftc.teamcode.PedroConstants.LEFT_ENCODER_DIRECTION; -import static org.firstinspires.ftc.teamcode.PedroConstants.RIGHT_ENCODER; -import static org.firstinspires.ftc.teamcode.PedroConstants.RIGHT_ENCODER_DIRECTION; - import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode; import com.qualcomm.robotcore.eventloop.opmode.TeleOp; -import com.qualcomm.robotcore.hardware.DcMotor; -import com.qualcomm.robotcore.hardware.DcMotorEx; import com.qualcomm.robotcore.hardware.Gamepad; -import com.qualcomm.robotcore.hardware.ServoImplEx; import com.qualcomm.robotcore.util.ElapsedTime; -import org.firstinspires.ftc.teamcode.pedroPathing.localization.Encoder; import org.firstinspires.ftc.teamcode.subsystem.ClawSubsystem; -/* - * This file contains an example of a Linear "OpMode". - * An OpMode is a 'program' that runs in either the autonomous or the teleop period of an FTC match. - * The names of OpModes appear on the menu of the FTC Driver Station. - * When a selection is made from the menu, the corresponding OpMode is executed. - * - * This particular OpMode illustrates driving a 4-motor Omni-Directional (or Holonomic) robot. - * This code will work with either a Mecanum-Drive or an X-Drive train. - * Both of these drives are illustrated at https://gm0.org/en/latest/docs/robot-design/drivetrains/holonomic.html - * Note that a Mecanum drive must display an X roller-pattern when viewed from above. - * - * Also note that it is critical to set the correct rotation direction for each motor. See details below. - * - * Holonomic drives provide the ability for the robot to move in three axes (directions) simultaneously. - * Each motion axis is controlled by one Joystick axis. - * - * 1) Axial: Driving forward and backward Left-joystick Forward/Backward - * 2) Lateral: Strafing right and left Left-joystick Right and Left - * 3) Yaw: Rotating Clockwise and counter clockwise Right-joystick Right and Left - * - * This code is written assuming that the right-side motors need to be reversed for the robot to drive forward. - * When you first test your robot, if it moves backward when you push the left stick forward, then you must flip - * the direction of all 4 motors (see code below). - * - * Use Android Studio to Copy this Class, and Paste it into your team's code folder with a new name. - * Remove or comment out the @Disabled line to add this OpMode to the Driver Station OpMode list - */ - -@TeleOp(name="Claw Test", group="Debug") +@TeleOp(name = "Claw Test", group = "Debug") public class ClawTest extends LinearOpMode { // Declare OpMode members for each of the 4 motors. diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/LiftTest.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/LiftTest.java index bd188db..dfe93a7 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/LiftTest.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/LiftTest.java @@ -36,34 +36,6 @@ import com.qualcomm.robotcore.hardware.DcMotorSimple; import com.qualcomm.robotcore.hardware.Gamepad; import com.qualcomm.robotcore.util.ElapsedTime; -/* - * This file contains an example of a Linear "OpMode". - * An OpMode is a 'program' that runs in either the autonomous or the teleop period of an FTC match. - * The names of OpModes appear on the menu of the FTC Driver Station. - * When a selection is made from the menu, the corresponding OpMode is executed. - * - * This particular OpMode illustrates driving a 4-motor Omni-Directional (or Holonomic) robot. - * This code will work with either a Mecanum-Drive or an X-Drive train. - * Both of these drives are illustrated at https://gm0.org/en/latest/docs/robot-design/drivetrains/holonomic.html - * Note that a Mecanum drive must display an X roller-pattern when viewed from above. - * - * Also note that it is critical to set the correct rotation direction for each motor. See details below. - * - * Holonomic drives provide the ability for the robot to move in three axes (directions) simultaneously. - * Each motion axis is controlled by one Joystick axis. - * - * 1) Axial: Driving forward and backward Left-joystick Forward/Backward - * 2) Lateral: Strafing right and left Left-joystick Right and Left - * 3) Yaw: Rotating Clockwise and counter clockwise Right-joystick Right and Left - * - * This code is written assuming that the right-side motors need to be reversed for the robot to drive forward. - * When you first test your robot, if it moves backward when you push the left stick forward, then you must flip - * the direction of all 4 motors (see code below). - * - * Use Android Studio to Copy this Class, and Paste it into your team's code folder with a new name. - * Remove or comment out the @Disabled line to add this OpMode to the Driver Station OpMode list - */ - @TeleOp(name = "Lift Test", group = "Debug") public class LiftTest extends LinearOpMode { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/WristTest.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/WristTest.java index d323c2f..296ae94 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/WristTest.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/WristTest.java @@ -36,34 +36,6 @@ import com.qualcomm.robotcore.util.ElapsedTime; import org.firstinspires.ftc.teamcode.subsystem.WristSubsystem; -/* - * This file contains an example of a Linear "OpMode". - * An OpMode is a 'program' that runs in either the autonomous or the teleop period of an FTC match. - * The names of OpModes appear on the menu of the FTC Driver Station. - * When a selection is made from the menu, the corresponding OpMode is executed. - * - * This particular OpMode illustrates driving a 4-motor Omni-Directional (or Holonomic) robot. - * This code will work with either a Mecanum-Drive or an X-Drive train. - * Both of these drives are illustrated at https://gm0.org/en/latest/docs/robot-design/drivetrains/holonomic.html - * Note that a Mecanum drive must display an X roller-pattern when viewed from above. - * - * Also note that it is critical to set the correct rotation direction for each motor. See details below. - * - * Holonomic drives provide the ability for the robot to move in three axes (directions) simultaneously. - * Each motion axis is controlled by one Joystick axis. - * - * 1) Axial: Driving forward and backward Left-joystick Forward/Backward - * 2) Lateral: Strafing right and left Left-joystick Right and Left - * 3) Yaw: Rotating Clockwise and counter clockwise Right-joystick Right and Left - * - * This code is written assuming that the right-side motors need to be reversed for the robot to drive forward. - * When you first test your robot, if it moves backward when you push the left stick forward, then you must flip - * the direction of all 4 motors (see code below). - * - * Use Android Studio to Copy this Class, and Paste it into your team's code folder with a new name. - * Remove or comment out the @Disabled line to add this OpMode to the Driver Station OpMode list - */ - @TeleOp(name = "Wrist Test", group = "Debug") public class WristTest extends LinearOpMode { @@ -114,7 +86,6 @@ public class WristTest extends LinearOpMode { wrist.setPosition(wrist.getPosition() + .05); } - // Show the elapsed game time and wheel power. telemetry.addData("Status", "Run Time: " + runtime.toString()); telemetry.addData("Wrist State", wrist.getState());