From c36a8e031281450c38db05df83fc278f99780808 Mon Sep 17 00:00:00 2001 From: Cyberarm Date: Sun, 5 Mar 2023 07:15:09 -0600 Subject: [PATCH] Stop moving Phoenix stuff around! Refactored Phoenix stuff into its own package. --- .../Engines/LeftSideAutonomousEngine.java | 25 ++++++++-------- .../Engines/LeftStateAutoEngine.java | 4 +-- .../Engines/LeftTwoConeAutonomousEngine.java | 28 ++++++++--------- .../Engines/RightSideAutonomousEngine.java | 22 +++++++------- .../Engines/RightStateAutoEngine.java | 9 ++---- .../Engines/RightTwoConeAutonomousEngine.java | 30 +++++++++---------- .../Autonomous/States/BottomArm.java | 4 +-- .../States/CollectorDistanceState.java | 4 +-- .../Autonomous/States/CollectorState.java | 4 +-- .../Autonomous/States/ConeIdentification.java | 4 +-- .../States/DriverParkPlaceState.java | 4 +-- .../Autonomous/States/DriverState.java | 4 +-- .../States/DriverStateWithOdometer.java | 4 +-- .../States/JunctionAllignmentAngleState.java | 4 +-- .../JunctionAllignmentDistanceState.java | 4 +-- .../Autonomous/States/PathDecision.java | 4 +-- .../Autonomous/States/RotationState.java | 4 +-- .../Autonomous/States/ServoCameraRotate.java | 4 +-- .../Autonomous/States/TopArm.java | 4 +-- .../Autonomous/States/TopArmResetState.java | 4 +-- .../Autonomous/States/TopArmv2.java | 4 +-- .../states => Phoenix}/PhoenixBot1.java | 2 +- .../TeleOp/engine/CameraTestEngine.java | 2 +- .../TeleOp/engine/DriveDebugEngine.java | 4 +-- .../TeleOp/engine/DynamicSetupEngine.java | 2 +- .../TeleOp/engine/PhoenixTeleOP.java | 8 ++--- .../TeleOp/engine/PhoenixWingEngine.java | 2 +- .../TeleOp/engine/SodiEngine.java | 4 +-- .../TeleOp/engine/SpeedrunEngine.java | 6 ++-- .../TeleOp/engine/SterringDriveEngine.java | 6 ++-- .../TeleOp/states/CameraTestCommon.java | 2 +- .../TeleOp/states/CameraTestState.java | 2 +- .../TeleOp/states/DynamicSetupState.java | 4 +-- .../TeleOp/states/LaserServoHeight.java | 2 +- .../TeleOp/states/LaserState.java | 2 +- .../TeleOp/states/PhoenixTeleOPState.java | 3 +- .../TeleOp/states/PhoenixTeleOPv2.java | 3 +- .../TeleOp/states/PhoenixWingState.java | 2 +- .../TeleOp/states/SodiLEDState.java | 2 +- .../TeleOp/states/SodiState.java | 2 +- .../states/SteeringDriveExperiment.java | 3 +- .../TeleOp/states/TeleOPArmDriver.java | 3 +- .../TeleOp/states/TeleOPSpeedrunState.java | 3 +- .../TeleOp/states/TeleOPTankDriver.java | 3 +- 44 files changed, 124 insertions(+), 126 deletions(-) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/Autonomous/Engines/LeftSideAutonomousEngine.java (84%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/Autonomous/Engines/LeftStateAutoEngine.java (88%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/Autonomous/Engines/LeftTwoConeAutonomousEngine.java (88%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/Autonomous/Engines/RightSideAutonomousEngine.java (86%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/Autonomous/Engines/RightStateAutoEngine.java (93%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/Autonomous/Engines/RightTwoConeAutonomousEngine.java (89%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/Autonomous/States/BottomArm.java (96%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/Autonomous/States/CollectorDistanceState.java (98%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/Autonomous/States/CollectorState.java (94%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/Autonomous/States/ConeIdentification.java (97%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/Autonomous/States/DriverParkPlaceState.java (99%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/Autonomous/States/DriverState.java (97%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/Autonomous/States/DriverStateWithOdometer.java (99%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/Autonomous/States/JunctionAllignmentAngleState.java (98%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/Autonomous/States/JunctionAllignmentDistanceState.java (98%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/Autonomous/States/PathDecision.java (88%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/Autonomous/States/RotationState.java (98%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/Autonomous/States/ServoCameraRotate.java (87%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/Autonomous/States/TopArm.java (96%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/Autonomous/States/TopArmResetState.java (94%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/Autonomous/States/TopArmv2.java (91%) rename TeamCode/src/main/java/org/timecrafters/{TeleOp/states => Phoenix}/PhoenixBot1.java (99%) rename TeamCode/src/main/java/org/timecrafters/{Autonomous => Phoenix}/TeleOp/engine/CameraTestEngine.java (75%) rename TeamCode/src/main/java/org/timecrafters/{Autonomous => Phoenix}/TeleOp/engine/DriveDebugEngine.java (65%) rename TeamCode/src/main/java/org/timecrafters/{Autonomous => Phoenix}/TeleOp/engine/DynamicSetupEngine.java (94%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/TeleOp/engine/PhoenixTeleOP.java (65%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/TeleOp/engine/PhoenixWingEngine.java (93%) rename TeamCode/src/main/java/org/timecrafters/{Autonomous => Phoenix}/TeleOp/engine/SodiEngine.java (78%) rename TeamCode/src/main/java/org/timecrafters/{Autonomous => Phoenix}/TeleOp/engine/SpeedrunEngine.java (89%) rename TeamCode/src/main/java/org/timecrafters/{Autonomous => Phoenix}/TeleOp/engine/SterringDriveEngine.java (73%) rename TeamCode/src/main/java/org/timecrafters/{Autonomous => Phoenix}/TeleOp/states/CameraTestCommon.java (97%) rename TeamCode/src/main/java/org/timecrafters/{Autonomous => Phoenix}/TeleOp/states/CameraTestState.java (74%) rename TeamCode/src/main/java/org/timecrafters/{Autonomous => Phoenix}/TeleOp/states/DynamicSetupState.java (85%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/TeleOp/states/LaserServoHeight.java (96%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/TeleOp/states/LaserState.java (97%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/TeleOp/states/PhoenixTeleOPState.java (99%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/TeleOp/states/PhoenixTeleOPv2.java (93%) rename TeamCode/src/main/java/org/timecrafters/{ => Phoenix}/TeleOp/states/PhoenixWingState.java (75%) rename TeamCode/src/main/java/org/timecrafters/{Autonomous => Phoenix}/TeleOp/states/SodiLEDState.java (96%) rename TeamCode/src/main/java/org/timecrafters/{Autonomous => Phoenix}/TeleOp/states/SodiState.java (96%) rename TeamCode/src/main/java/org/timecrafters/{Autonomous => Phoenix}/TeleOp/states/SteeringDriveExperiment.java (95%) rename TeamCode/src/main/java/org/timecrafters/{Autonomous => Phoenix}/TeleOp/states/TeleOPArmDriver.java (99%) rename TeamCode/src/main/java/org/timecrafters/{Autonomous => Phoenix}/TeleOp/states/TeleOPSpeedrunState.java (93%) rename TeamCode/src/main/java/org/timecrafters/{Autonomous => Phoenix}/TeleOp/states/TeleOPTankDriver.java (98%) diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/Engines/LeftSideAutonomousEngine.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/Engines/LeftSideAutonomousEngine.java similarity index 84% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/Engines/LeftSideAutonomousEngine.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/Engines/LeftSideAutonomousEngine.java index 36bcd6f..814936d 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/Engines/LeftSideAutonomousEngine.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/Engines/LeftSideAutonomousEngine.java @@ -1,20 +1,19 @@ -package org.timecrafters.Autonomous.Engines; +package org.timecrafters.Phoenix.Autonomous.Engines; -import com.qualcomm.robotcore.eventloop.opmode.Autonomous; import com.qualcomm.robotcore.eventloop.opmode.Disabled; import org.cyberarm.engine.V2.CyberarmEngine; -import org.timecrafters.Autonomous.States.BottomArm; -import org.timecrafters.Autonomous.States.CollectorDistanceState; -import org.timecrafters.Autonomous.States.CollectorState; -import org.timecrafters.Autonomous.States.ConeIdentification; -import org.timecrafters.Autonomous.States.DriverParkPlaceState; -import org.timecrafters.Autonomous.States.DriverState; -import org.timecrafters.Autonomous.States.PathDecision; -import org.timecrafters.Autonomous.States.RotationState; -import org.timecrafters.Autonomous.States.ServoCameraRotate; -import org.timecrafters.Autonomous.States.TopArm; -import org.timecrafters.TeleOp.states.PhoenixBot1; +import org.timecrafters.Phoenix.Autonomous.States.BottomArm; +import org.timecrafters.Phoenix.Autonomous.States.CollectorDistanceState; +import org.timecrafters.Phoenix.Autonomous.States.CollectorState; +import org.timecrafters.Phoenix.Autonomous.States.ConeIdentification; +import org.timecrafters.Phoenix.Autonomous.States.DriverParkPlaceState; +import org.timecrafters.Phoenix.Autonomous.States.DriverState; +import org.timecrafters.Phoenix.Autonomous.States.PathDecision; +import org.timecrafters.Phoenix.Autonomous.States.RotationState; +import org.timecrafters.Phoenix.Autonomous.States.ServoCameraRotate; +import org.timecrafters.Phoenix.Autonomous.States.TopArm; +import org.timecrafters.Phoenix.PhoenixBot1; //@Autonomous (name = "Left Side") @Disabled diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/Engines/LeftStateAutoEngine.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/Engines/LeftStateAutoEngine.java similarity index 88% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/Engines/LeftStateAutoEngine.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/Engines/LeftStateAutoEngine.java index 8587bc5..8ebc26d 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/Engines/LeftStateAutoEngine.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/Engines/LeftStateAutoEngine.java @@ -1,9 +1,9 @@ -package org.timecrafters.Autonomous.Engines; +package org.timecrafters.Phoenix.Autonomous.Engines; import com.qualcomm.robotcore.eventloop.opmode.Autonomous; import org.cyberarm.engine.V2.CyberarmEngine; -import org.timecrafters.TeleOp.states.PhoenixBot1; +import org.timecrafters.Phoenix.PhoenixBot1; @Autonomous(name = "Left Side", group = "A Phoenix", preselectTeleOp = "APhoenixTeleOP") public class LeftStateAutoEngine extends CyberarmEngine { diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/Engines/LeftTwoConeAutonomousEngine.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/Engines/LeftTwoConeAutonomousEngine.java similarity index 88% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/Engines/LeftTwoConeAutonomousEngine.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/Engines/LeftTwoConeAutonomousEngine.java index 5e63cb9..9c044d2 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/Engines/LeftTwoConeAutonomousEngine.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/Engines/LeftTwoConeAutonomousEngine.java @@ -1,19 +1,19 @@ -package org.timecrafters.Autonomous.Engines; +package org.timecrafters.Phoenix.Autonomous.Engines; import org.cyberarm.engine.V2.CyberarmEngine; -import org.timecrafters.Autonomous.States.BottomArm; -import org.timecrafters.Autonomous.States.CollectorDistanceState; -import org.timecrafters.Autonomous.States.CollectorState; -import org.timecrafters.Autonomous.States.ConeIdentification; -import org.timecrafters.Autonomous.States.DriverParkPlaceState; -import org.timecrafters.Autonomous.States.DriverStateWithOdometer; -import org.timecrafters.Autonomous.States.JunctionAllignmentAngleState; -import org.timecrafters.Autonomous.States.JunctionAllignmentDistanceState; -import org.timecrafters.Autonomous.States.PathDecision; -import org.timecrafters.Autonomous.States.RotationState; -import org.timecrafters.Autonomous.States.ServoCameraRotate; -import org.timecrafters.Autonomous.States.TopArm; -import org.timecrafters.TeleOp.states.PhoenixBot1; +import org.timecrafters.Phoenix.Autonomous.States.BottomArm; +import org.timecrafters.Phoenix.Autonomous.States.CollectorDistanceState; +import org.timecrafters.Phoenix.Autonomous.States.CollectorState; +import org.timecrafters.Phoenix.Autonomous.States.ConeIdentification; +import org.timecrafters.Phoenix.Autonomous.States.DriverParkPlaceState; +import org.timecrafters.Phoenix.Autonomous.States.DriverStateWithOdometer; +import org.timecrafters.Phoenix.Autonomous.States.JunctionAllignmentAngleState; +import org.timecrafters.Phoenix.Autonomous.States.JunctionAllignmentDistanceState; +import org.timecrafters.Phoenix.Autonomous.States.PathDecision; +import org.timecrafters.Phoenix.Autonomous.States.RotationState; +import org.timecrafters.Phoenix.Autonomous.States.ServoCameraRotate; +import org.timecrafters.Phoenix.Autonomous.States.TopArm; +import org.timecrafters.Phoenix.PhoenixBot1; //@Autonomous (name = "left 2 cone auto") diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/Engines/RightSideAutonomousEngine.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/Engines/RightSideAutonomousEngine.java similarity index 86% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/Engines/RightSideAutonomousEngine.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/Engines/RightSideAutonomousEngine.java index 2b61508..48393be 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/Engines/RightSideAutonomousEngine.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/Engines/RightSideAutonomousEngine.java @@ -1,19 +1,19 @@ -package org.timecrafters.Autonomous.Engines; +package org.timecrafters.Phoenix.Autonomous.Engines; import com.qualcomm.robotcore.eventloop.opmode.Autonomous; import com.qualcomm.robotcore.eventloop.opmode.Disabled; import org.cyberarm.engine.V2.CyberarmEngine; -import org.timecrafters.Autonomous.States.CollectorDistanceState; -import org.timecrafters.Autonomous.States.CollectorState; -import org.timecrafters.Autonomous.States.DriverParkPlaceState; -import org.timecrafters.Autonomous.States.DriverState; -import org.timecrafters.Autonomous.States.BottomArm; -import org.timecrafters.Autonomous.States.PathDecision; -import org.timecrafters.Autonomous.States.RotationState; -import org.timecrafters.Autonomous.States.ServoCameraRotate; -import org.timecrafters.Autonomous.States.TopArm; -import org.timecrafters.Autonomous.TeleOp.states.PhoenixBot1; +import org.timecrafters.Phoenix.Autonomous.States.CollectorDistanceState; +import org.timecrafters.Phoenix.Autonomous.States.CollectorState; +import org.timecrafters.Phoenix.Autonomous.States.DriverParkPlaceState; +import org.timecrafters.Phoenix.Autonomous.States.DriverState; +import org.timecrafters.Phoenix.Autonomous.States.BottomArm; +import org.timecrafters.Phoenix.Autonomous.States.PathDecision; +import org.timecrafters.Phoenix.Autonomous.States.RotationState; +import org.timecrafters.Phoenix.Autonomous.States.ServoCameraRotate; +import org.timecrafters.Phoenix.Autonomous.States.TopArm; +import org.timecrafters.Phoenix.PhoenixBot1; @Autonomous (name = "Right ") @Disabled diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/Engines/RightStateAutoEngine.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/Engines/RightStateAutoEngine.java similarity index 93% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/Engines/RightStateAutoEngine.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/Engines/RightStateAutoEngine.java index 566872a..7da4a34 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/Engines/RightStateAutoEngine.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/Engines/RightStateAutoEngine.java @@ -1,14 +1,9 @@ -package org.timecrafters.Autonomous.Engines; +package org.timecrafters.Phoenix.Autonomous.Engines; import com.qualcomm.robotcore.eventloop.opmode.Autonomous; import org.cyberarm.engine.V2.CyberarmEngine; -import org.timecrafters.Autonomous.States.DriverParkPlaceState; -import org.timecrafters.Autonomous.States.DriverStateWithOdometer; -import org.timecrafters.Autonomous.States.PathDecision; -import org.timecrafters.Autonomous.States.RotationState; -import org.timecrafters.Autonomous.States.TopArmv2; -import org.timecrafters.Autonomous.TeleOp.states.PhoenixBot1; +import org.timecrafters.Phoenix.PhoenixBot1; @Autonomous(name = "Right Side", group = "A Phoenix", preselectTeleOp = "APhoenixTeleOP") public class RightStateAutoEngine extends CyberarmEngine { diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/Engines/RightTwoConeAutonomousEngine.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/Engines/RightTwoConeAutonomousEngine.java similarity index 89% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/Engines/RightTwoConeAutonomousEngine.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/Engines/RightTwoConeAutonomousEngine.java index ae94713..82eb901 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/Engines/RightTwoConeAutonomousEngine.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/Engines/RightTwoConeAutonomousEngine.java @@ -1,21 +1,19 @@ -package org.timecrafters.Autonomous.Engines; - -import com.qualcomm.robotcore.eventloop.opmode.Autonomous; +package org.timecrafters.Phoenix.Autonomous.Engines; import org.cyberarm.engine.V2.CyberarmEngine; -import org.timecrafters.Autonomous.States.BottomArm; -import org.timecrafters.Autonomous.States.CollectorDistanceState; -import org.timecrafters.Autonomous.States.CollectorState; -import org.timecrafters.Autonomous.States.ConeIdentification; -import org.timecrafters.Autonomous.States.DriverParkPlaceState; -import org.timecrafters.Autonomous.States.DriverStateWithOdometer; -import org.timecrafters.Autonomous.States.JunctionAllignmentAngleState; -import org.timecrafters.Autonomous.States.JunctionAllignmentDistanceState; -import org.timecrafters.Autonomous.States.PathDecision; -import org.timecrafters.Autonomous.States.RotationState; -import org.timecrafters.Autonomous.States.ServoCameraRotate; -import org.timecrafters.Autonomous.States.TopArm; -import org.timecrafters.Autonomous.TeleOp.states.PhoenixBot1; +import org.timecrafters.Phoenix.Autonomous.States.BottomArm; +import org.timecrafters.Phoenix.Autonomous.States.CollectorDistanceState; +import org.timecrafters.Phoenix.Autonomous.States.CollectorState; +import org.timecrafters.Phoenix.Autonomous.States.ConeIdentification; +import org.timecrafters.Phoenix.Autonomous.States.DriverParkPlaceState; +import org.timecrafters.Phoenix.Autonomous.States.DriverStateWithOdometer; +import org.timecrafters.Phoenix.Autonomous.States.JunctionAllignmentAngleState; +import org.timecrafters.Phoenix.Autonomous.States.JunctionAllignmentDistanceState; +import org.timecrafters.Phoenix.Autonomous.States.PathDecision; +import org.timecrafters.Phoenix.Autonomous.States.RotationState; +import org.timecrafters.Phoenix.Autonomous.States.ServoCameraRotate; +import org.timecrafters.Phoenix.Autonomous.States.TopArm; +import org.timecrafters.Phoenix.PhoenixBot1; //@Autonomous (name = "Right 2 cone auto") diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/BottomArm.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/BottomArm.java similarity index 96% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/States/BottomArm.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/BottomArm.java index e5dfcfa..3370751 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/BottomArm.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/BottomArm.java @@ -1,7 +1,7 @@ -package org.timecrafters.Autonomous.States; +package org.timecrafters.Phoenix.Autonomous.States; import org.cyberarm.engine.V2.CyberarmState; -import org.timecrafters.Autonomous.TeleOp.states.PhoenixBot1; +import org.timecrafters.Phoenix.PhoenixBot1; public class BottomArm extends CyberarmState { diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/CollectorDistanceState.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/CollectorDistanceState.java similarity index 98% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/States/CollectorDistanceState.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/CollectorDistanceState.java index b87775b..12e15d2 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/CollectorDistanceState.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/CollectorDistanceState.java @@ -1,10 +1,10 @@ -package org.timecrafters.Autonomous.States; +package org.timecrafters.Phoenix.Autonomous.States; import com.qualcomm.robotcore.hardware.DcMotor; import org.cyberarm.engine.V2.CyberarmState; import org.firstinspires.ftc.robotcore.external.navigation.DistanceUnit; -import org.timecrafters.Autonomous.TeleOp.states.PhoenixBot1; +import org.timecrafters.Phoenix.PhoenixBot1; public class CollectorDistanceState extends CyberarmState { diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/CollectorState.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/CollectorState.java similarity index 94% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/States/CollectorState.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/CollectorState.java index e8b67b6..73f0b7c 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/CollectorState.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/CollectorState.java @@ -1,8 +1,8 @@ -package org.timecrafters.Autonomous.States; +package org.timecrafters.Phoenix.Autonomous.States; import org.cyberarm.engine.V2.CyberarmState; import org.firstinspires.ftc.robotcore.external.navigation.DistanceUnit; -import org.timecrafters.Autonomous.TeleOp.states.PhoenixBot1; +import org.timecrafters.Phoenix.PhoenixBot1; public class CollectorState extends CyberarmState { diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/ConeIdentification.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/ConeIdentification.java similarity index 97% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/States/ConeIdentification.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/ConeIdentification.java index 892f409..c717118 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/ConeIdentification.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/ConeIdentification.java @@ -1,8 +1,8 @@ -package org.timecrafters.Autonomous.States; +package org.timecrafters.Phoenix.Autonomous.States; import org.cyberarm.engine.V2.CyberarmState; import org.firstinspires.ftc.robotcore.external.tfod.Recognition; -import org.timecrafters.Autonomous.TeleOp.states.PhoenixBot1; +import org.timecrafters.Phoenix.PhoenixBot1; import java.util.List; diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/DriverParkPlaceState.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/DriverParkPlaceState.java similarity index 99% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/States/DriverParkPlaceState.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/DriverParkPlaceState.java index 4a43010..fbea4a1 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/DriverParkPlaceState.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/DriverParkPlaceState.java @@ -1,10 +1,10 @@ -package org.timecrafters.Autonomous.States; +package org.timecrafters.Phoenix.Autonomous.States; import com.qualcomm.robotcore.hardware.DcMotor; import org.cyberarm.engine.V2.CyberarmState; import org.firstinspires.ftc.robotcore.external.navigation.AngleUnit; -import org.timecrafters.Autonomous.TeleOp.states.PhoenixBot1; +import org.timecrafters.Phoenix.PhoenixBot1; public class DriverParkPlaceState extends CyberarmState { private final boolean stateDisabled; diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/DriverState.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/DriverState.java similarity index 97% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/States/DriverState.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/DriverState.java index 183128c..19a9e02 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/DriverState.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/DriverState.java @@ -1,9 +1,9 @@ -package org.timecrafters.Autonomous.States; +package org.timecrafters.Phoenix.Autonomous.States; import com.qualcomm.robotcore.hardware.DcMotor; import org.cyberarm.engine.V2.CyberarmState; -import org.timecrafters.Autonomous.TeleOp.states.PhoenixBot1; +import org.timecrafters.Phoenix.PhoenixBot1; public class DriverState extends CyberarmState { private final boolean stateDisabled; diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/DriverStateWithOdometer.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/DriverStateWithOdometer.java similarity index 99% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/States/DriverStateWithOdometer.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/DriverStateWithOdometer.java index 8327a04..8b6ab5a 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/DriverStateWithOdometer.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/DriverStateWithOdometer.java @@ -1,10 +1,10 @@ -package org.timecrafters.Autonomous.States; +package org.timecrafters.Phoenix.Autonomous.States; import com.qualcomm.robotcore.hardware.DcMotor; import org.cyberarm.engine.V2.CyberarmState; import org.firstinspires.ftc.robotcore.external.navigation.AngleUnit; -import org.timecrafters.Autonomous.TeleOp.states.PhoenixBot1; +import org.timecrafters.Phoenix.PhoenixBot1; public class DriverStateWithOdometer extends CyberarmState { private final boolean stateDisabled; diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/JunctionAllignmentAngleState.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/JunctionAllignmentAngleState.java similarity index 98% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/States/JunctionAllignmentAngleState.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/JunctionAllignmentAngleState.java index 21a7af8..e281979 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/JunctionAllignmentAngleState.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/JunctionAllignmentAngleState.java @@ -1,11 +1,11 @@ -package org.timecrafters.Autonomous.States; +package org.timecrafters.Phoenix.Autonomous.States; import com.qualcomm.robotcore.hardware.DcMotor; import org.cyberarm.engine.V2.CyberarmState; import org.firstinspires.ftc.robotcore.external.navigation.AngleUnit; import org.firstinspires.ftc.robotcore.external.navigation.DistanceUnit; -import org.timecrafters.TeleOp.states.PhoenixBot1; +import org.timecrafters.Phoenix.PhoenixBot1; public class JunctionAllignmentAngleState extends CyberarmState { private final boolean stateDisabled; diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/JunctionAllignmentDistanceState.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/JunctionAllignmentDistanceState.java similarity index 98% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/States/JunctionAllignmentDistanceState.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/JunctionAllignmentDistanceState.java index 15c18b6..0c3775c 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/JunctionAllignmentDistanceState.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/JunctionAllignmentDistanceState.java @@ -1,8 +1,8 @@ -package org.timecrafters.Autonomous.States; +package org.timecrafters.Phoenix.Autonomous.States; import org.cyberarm.engine.V2.CyberarmState; import org.firstinspires.ftc.robotcore.external.navigation.DistanceUnit; -import org.timecrafters.TeleOp.states.PhoenixBot1; +import org.timecrafters.Phoenix.PhoenixBot1; public class JunctionAllignmentDistanceState extends CyberarmState { private final boolean stateDisabled; diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/PathDecision.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/PathDecision.java similarity index 88% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/States/PathDecision.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/PathDecision.java index 37278b6..3767170 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/PathDecision.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/PathDecision.java @@ -1,7 +1,7 @@ -package org.timecrafters.Autonomous.States; +package org.timecrafters.Phoenix.Autonomous.States; import org.cyberarm.engine.V2.CyberarmState; -import org.timecrafters.TeleOp.states.PhoenixBot1; +import org.timecrafters.Phoenix.PhoenixBot1; public class PathDecision extends CyberarmState { PhoenixBot1 robot; diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/RotationState.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/RotationState.java similarity index 98% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/States/RotationState.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/RotationState.java index 62d0504..cd4ae67 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/RotationState.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/RotationState.java @@ -1,8 +1,8 @@ -package org.timecrafters.Autonomous.States; +package org.timecrafters.Phoenix.Autonomous.States; import org.cyberarm.engine.V2.CyberarmState; import org.firstinspires.ftc.robotcore.external.navigation.AngleUnit; -import org.timecrafters.Autonomous.TeleOp.states.PhoenixBot1; +import org.timecrafters.Phoenix.PhoenixBot1; public class RotationState extends CyberarmState { private final boolean stateDisabled; diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/ServoCameraRotate.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/ServoCameraRotate.java similarity index 87% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/States/ServoCameraRotate.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/ServoCameraRotate.java index ede974a..66dd826 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/ServoCameraRotate.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/ServoCameraRotate.java @@ -1,7 +1,7 @@ -package org.timecrafters.Autonomous.States; +package org.timecrafters.Phoenix.Autonomous.States; import org.cyberarm.engine.V2.CyberarmState; -import org.timecrafters.Autonomous.TeleOp.states.PhoenixBot1; +import org.timecrafters.Phoenix.PhoenixBot1; public class ServoCameraRotate extends CyberarmState { private final boolean stateDisabled; diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/TopArm.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/TopArm.java similarity index 96% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/States/TopArm.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/TopArm.java index a34cac5..62e7e11 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/TopArm.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/TopArm.java @@ -1,7 +1,7 @@ -package org.timecrafters.Autonomous.States; +package org.timecrafters.Phoenix.Autonomous.States; import org.cyberarm.engine.V2.CyberarmState; -import org.timecrafters.Autonomous.TeleOp.states.PhoenixBot1; +import org.timecrafters.Phoenix.PhoenixBot1; public class TopArm extends CyberarmState { diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/TopArmResetState.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/TopArmResetState.java similarity index 94% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/States/TopArmResetState.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/TopArmResetState.java index c5fe128..ec944c4 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/TopArmResetState.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/TopArmResetState.java @@ -1,9 +1,9 @@ -package org.timecrafters.Autonomous.States; +package org.timecrafters.Phoenix.Autonomous.States; import com.qualcomm.robotcore.hardware.DcMotor; import org.cyberarm.engine.V2.CyberarmState; -import org.timecrafters.Autonomous.TeleOp.states.PhoenixBot1; +import org.timecrafters.Phoenix.PhoenixBot1; public class TopArmResetState extends CyberarmState { private final PhoenixBot1 robot; diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/TopArmv2.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/TopArmv2.java similarity index 91% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/States/TopArmv2.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/TopArmv2.java index dfac375..e97bd89 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/TopArmv2.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/Autonomous/States/TopArmv2.java @@ -1,9 +1,9 @@ -package org.timecrafters.Autonomous.States; +package org.timecrafters.Phoenix.Autonomous.States; import com.qualcomm.robotcore.hardware.DcMotor; import org.cyberarm.engine.V2.CyberarmState; -import org.timecrafters.Autonomous.TeleOp.states.PhoenixBot1; +import org.timecrafters.Phoenix.PhoenixBot1; public class TopArmv2 extends CyberarmState { private final PhoenixBot1 robot; diff --git a/TeamCode/src/main/java/org/timecrafters/TeleOp/states/PhoenixBot1.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/PhoenixBot1.java similarity index 99% rename from TeamCode/src/main/java/org/timecrafters/TeleOp/states/PhoenixBot1.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/PhoenixBot1.java index b9474a9..c28a445 100644 --- a/TeamCode/src/main/java/org/timecrafters/TeleOp/states/PhoenixBot1.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/PhoenixBot1.java @@ -1,4 +1,4 @@ -package org.timecrafters.TeleOp.states; +package org.timecrafters.Phoenix; import com.qualcomm.hardware.adafruit.AdafruitI2cColorSensor; import com.qualcomm.hardware.bosch.BNO055IMU; diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/engine/CameraTestEngine.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/CameraTestEngine.java similarity index 75% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/engine/CameraTestEngine.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/CameraTestEngine.java index d71d94b..c55522a 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/engine/CameraTestEngine.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/CameraTestEngine.java @@ -1,4 +1,4 @@ -package org.timecrafters.Autonomous.TeleOp.engine; +package org.timecrafters.Phoenix.TeleOp.engine; import org.cyberarm.engine.V2.CyberarmEngine; diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/engine/DriveDebugEngine.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/DriveDebugEngine.java similarity index 65% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/engine/DriveDebugEngine.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/DriveDebugEngine.java index 4e37154..fd97ad1 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/engine/DriveDebugEngine.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/DriveDebugEngine.java @@ -1,7 +1,7 @@ -package org.timecrafters.Autonomous.TeleOp.engine; +package org.timecrafters.Phoenix.TeleOp.engine; import org.cyberarm.engine.V2.CyberarmEngine; -import org.timecrafters.Autonomous.TeleOp.states.PhoenixBot1; +import org.timecrafters.Phoenix.PhoenixBot1; public class DriveDebugEngine extends CyberarmEngine { diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/engine/DynamicSetupEngine.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/DynamicSetupEngine.java similarity index 94% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/engine/DynamicSetupEngine.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/DynamicSetupEngine.java index a16d1d1..ba90593 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/engine/DynamicSetupEngine.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/DynamicSetupEngine.java @@ -1,4 +1,4 @@ -package org.timecrafters.Autonomous.TeleOp.engine; +package org.timecrafters.Phoenix.TeleOp.engine; import com.qualcomm.robotcore.eventloop.opmode.Disabled; import com.qualcomm.robotcore.eventloop.opmode.TeleOp; diff --git a/TeamCode/src/main/java/org/timecrafters/TeleOp/engine/PhoenixTeleOP.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/PhoenixTeleOP.java similarity index 65% rename from TeamCode/src/main/java/org/timecrafters/TeleOp/engine/PhoenixTeleOP.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/PhoenixTeleOP.java index a31849d..90bc29a 100644 --- a/TeamCode/src/main/java/org/timecrafters/TeleOp/engine/PhoenixTeleOP.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/PhoenixTeleOP.java @@ -1,11 +1,11 @@ -package org.timecrafters.TeleOp.engine; +package org.timecrafters.Phoenix.TeleOp.engine; import com.qualcomm.robotcore.eventloop.opmode.TeleOp; import org.cyberarm.engine.V2.CyberarmEngine; -import org.timecrafters.TeleOp.states.PhoenixBot1; -import org.timecrafters.TeleOp.states.TeleOPArmDriver; -import org.timecrafters.TeleOp.states.TeleOPTankDriver; +import org.timecrafters.Phoenix.PhoenixBot1; +import org.timecrafters.Phoenix.TeleOp.states.TeleOPArmDriver; +import org.timecrafters.Phoenix.TeleOp.states.TeleOPTankDriver; @TeleOp (name = "APhoenixTeleOP") diff --git a/TeamCode/src/main/java/org/timecrafters/TeleOp/engine/PhoenixWingEngine.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/PhoenixWingEngine.java similarity index 93% rename from TeamCode/src/main/java/org/timecrafters/TeleOp/engine/PhoenixWingEngine.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/PhoenixWingEngine.java index e842f5e..5f0f32c 100644 --- a/TeamCode/src/main/java/org/timecrafters/TeleOp/engine/PhoenixWingEngine.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/PhoenixWingEngine.java @@ -1,4 +1,4 @@ -package org.timecrafters.TeleOp.engine; +package org.timecrafters.Phoenix.TeleOp.engine; import com.qualcomm.hardware.bosch.BNO055IMU; import com.qualcomm.robotcore.hardware.CRServo; diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/engine/SodiEngine.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/SodiEngine.java similarity index 78% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/engine/SodiEngine.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/SodiEngine.java index 7cce9a6..b1edbba 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/engine/SodiEngine.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/SodiEngine.java @@ -1,10 +1,10 @@ -package org.timecrafters.Autonomous.TeleOp.engine; +package org.timecrafters.Phoenix.TeleOp.engine; import com.qualcomm.robotcore.eventloop.opmode.Disabled; import com.qualcomm.robotcore.eventloop.opmode.TeleOp; import org.cyberarm.engine.V2.CyberarmEngine; -import org.timecrafters.Autonomous.TeleOp.states.LaserState; +import org.timecrafters.Phoenix.TeleOp.states.LaserState; @Disabled @TeleOp(name = "Wheel") diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/engine/SpeedrunEngine.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/SpeedrunEngine.java similarity index 89% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/engine/SpeedrunEngine.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/SpeedrunEngine.java index a0c5fba..46352f3 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/engine/SpeedrunEngine.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/SpeedrunEngine.java @@ -1,4 +1,4 @@ -package org.timecrafters.Autonomous.TeleOp.engine; +package org.timecrafters.Phoenix.TeleOp.engine; import com.qualcomm.robotcore.eventloop.opmode.Disabled; import com.qualcomm.robotcore.eventloop.opmode.TeleOp; @@ -6,9 +6,9 @@ import com.qualcomm.robotcore.hardware.Gamepad; import org.cyberarm.engine.V2.CyberarmEngine; import org.cyberarm.engine.V2.GamepadChecker; -import org.timecrafters.Autonomous.TeleOp.states.PhoenixBot1; +import org.timecrafters.Phoenix.TeleOp.states.TeleOPSpeedrunState; +import org.timecrafters.Phoenix.PhoenixBot1; import org.timecrafters.TimeCraftersConfigurationTool.library.TimeCraftersConfiguration; -import org.timecrafters.Autonomous.TeleOp.states.TeleOPSpeedrunState; @Disabled @TeleOp (name = "Speedrun Engine") diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/engine/SterringDriveEngine.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/SterringDriveEngine.java similarity index 73% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/engine/SterringDriveEngine.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/SterringDriveEngine.java index c26bfff..0e63b7a 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/engine/SterringDriveEngine.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/engine/SterringDriveEngine.java @@ -1,11 +1,11 @@ -package org.timecrafters.Autonomous.TeleOp.engine; +package org.timecrafters.Phoenix.TeleOp.engine; import com.qualcomm.robotcore.eventloop.opmode.Disabled; import com.qualcomm.robotcore.eventloop.opmode.TeleOp; import org.cyberarm.engine.V2.CyberarmEngine; -import org.timecrafters.Autonomous.TeleOp.states.PhoenixBot1; -import org.timecrafters.Autonomous.TeleOp.states.SteeringDriveExperiment; +import org.timecrafters.Phoenix.TeleOp.states.SteeringDriveExperiment; +import org.timecrafters.Phoenix.PhoenixBot1; @Disabled @TeleOp(name = "Steering Drive Test") diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/CameraTestCommon.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/CameraTestCommon.java similarity index 97% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/CameraTestCommon.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/CameraTestCommon.java index 0841190..ec92fa7 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/CameraTestCommon.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/CameraTestCommon.java @@ -1,4 +1,4 @@ -package org.timecrafters.Autonomous.TeleOp.states; +package org.timecrafters.Phoenix.TeleOp.states; import org.cyberarm.engine.V2.CyberarmEngine; import org.firstinspires.ftc.robotcore.external.tfod.Recognition; diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/CameraTestState.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/CameraTestState.java similarity index 74% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/CameraTestState.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/CameraTestState.java index 994e31f..240911b 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/CameraTestState.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/CameraTestState.java @@ -1,4 +1,4 @@ -package org.timecrafters.Autonomous.TeleOp.states; +package org.timecrafters.Phoenix.TeleOp.states; import org.cyberarm.engine.V2.CyberarmState; diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/DynamicSetupState.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/DynamicSetupState.java similarity index 85% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/DynamicSetupState.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/DynamicSetupState.java index c284bb4..1c34b14 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/DynamicSetupState.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/DynamicSetupState.java @@ -1,7 +1,7 @@ -package org.timecrafters.Autonomous.TeleOp.states; +package org.timecrafters.Phoenix.TeleOp.states; import org.cyberarm.engine.V2.CyberarmState; -import org.timecrafters.Autonomous.TeleOp.engine.DynamicSetupEngine; +import org.timecrafters.Phoenix.TeleOp.engine.DynamicSetupEngine; public class DynamicSetupState extends CyberarmState { private long delay; diff --git a/TeamCode/src/main/java/org/timecrafters/TeleOp/states/LaserServoHeight.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/LaserServoHeight.java similarity index 96% rename from TeamCode/src/main/java/org/timecrafters/TeleOp/states/LaserServoHeight.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/LaserServoHeight.java index 5844f69..5eba59e 100644 --- a/TeamCode/src/main/java/org/timecrafters/TeleOp/states/LaserServoHeight.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/LaserServoHeight.java @@ -1,4 +1,4 @@ -package org.timecrafters.TeleOp.states; +package org.timecrafters.Phoenix.TeleOp.states; import com.qualcomm.hardware.rev.Rev2mDistanceSensor; import com.qualcomm.robotcore.hardware.Servo; diff --git a/TeamCode/src/main/java/org/timecrafters/TeleOp/states/LaserState.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/LaserState.java similarity index 97% rename from TeamCode/src/main/java/org/timecrafters/TeleOp/states/LaserState.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/LaserState.java index 868dedc..1e46dd1 100644 --- a/TeamCode/src/main/java/org/timecrafters/TeleOp/states/LaserState.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/LaserState.java @@ -1,4 +1,4 @@ -package org.timecrafters.TeleOp.states; +package org.timecrafters.Phoenix.TeleOp.states; import com.qualcomm.hardware.rev.Rev2mDistanceSensor; import com.qualcomm.hardware.rev.RevBlinkinLedDriver; diff --git a/TeamCode/src/main/java/org/timecrafters/TeleOp/states/PhoenixTeleOPState.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/PhoenixTeleOPState.java similarity index 99% rename from TeamCode/src/main/java/org/timecrafters/TeleOp/states/PhoenixTeleOPState.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/PhoenixTeleOPState.java index 7aa57f0..1e08ce5 100644 --- a/TeamCode/src/main/java/org/timecrafters/TeleOp/states/PhoenixTeleOPState.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/PhoenixTeleOPState.java @@ -1,4 +1,4 @@ -package org.timecrafters.TeleOp.states; +package org.timecrafters.Phoenix.TeleOp.states; import android.annotation.SuppressLint; @@ -10,6 +10,7 @@ import org.cyberarm.engine.V2.CyberarmState; import org.cyberarm.engine.V2.GamepadChecker; import org.firstinspires.ftc.robotcore.external.navigation.AngleUnit; import org.firstinspires.ftc.robotcore.external.navigation.DistanceUnit; +import org.timecrafters.Phoenix.PhoenixBot1; public class PhoenixTeleOPState extends CyberarmState { diff --git a/TeamCode/src/main/java/org/timecrafters/TeleOp/states/PhoenixTeleOPv2.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/PhoenixTeleOPv2.java similarity index 93% rename from TeamCode/src/main/java/org/timecrafters/TeleOp/states/PhoenixTeleOPv2.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/PhoenixTeleOPv2.java index ec67479..6384de1 100644 --- a/TeamCode/src/main/java/org/timecrafters/TeleOp/states/PhoenixTeleOPv2.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/PhoenixTeleOPv2.java @@ -1,6 +1,7 @@ -package org.timecrafters.TeleOp.states; +package org.timecrafters.Phoenix.TeleOp.states; import org.cyberarm.engine.V2.CyberarmState; +import org.timecrafters.Phoenix.PhoenixBot1; public class PhoenixTeleOPv2 extends CyberarmState { private double drivePower = 1; diff --git a/TeamCode/src/main/java/org/timecrafters/TeleOp/states/PhoenixWingState.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/PhoenixWingState.java similarity index 75% rename from TeamCode/src/main/java/org/timecrafters/TeleOp/states/PhoenixWingState.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/PhoenixWingState.java index 1418adb..343b925 100644 --- a/TeamCode/src/main/java/org/timecrafters/TeleOp/states/PhoenixWingState.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/PhoenixWingState.java @@ -1,4 +1,4 @@ -package org.timecrafters.TeleOp.states; +package org.timecrafters.Phoenix.TeleOp.states; import org.cyberarm.engine.V2.CyberarmState; diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/SodiLEDState.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/SodiLEDState.java similarity index 96% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/SodiLEDState.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/SodiLEDState.java index 90c5d49..cf7b95b 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/SodiLEDState.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/SodiLEDState.java @@ -1,4 +1,4 @@ -package org.timecrafters.Autonomous.TeleOp.states; +package org.timecrafters.Phoenix.TeleOp.states; import com.qualcomm.hardware.rev.RevBlinkinLedDriver; diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/SodiState.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/SodiState.java similarity index 96% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/SodiState.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/SodiState.java index 777409f..6e56396 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/SodiState.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/SodiState.java @@ -1,4 +1,4 @@ -package org.timecrafters.Autonomous.TeleOp.states; +package org.timecrafters.Phoenix.TeleOp.states; import com.qualcomm.robotcore.hardware.CRServo; import com.qualcomm.robotcore.hardware.DcMotor; diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/SteeringDriveExperiment.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/SteeringDriveExperiment.java similarity index 95% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/SteeringDriveExperiment.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/SteeringDriveExperiment.java index 9876abe..1ce64d8 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/SteeringDriveExperiment.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/SteeringDriveExperiment.java @@ -1,6 +1,7 @@ -package org.timecrafters.Autonomous.TeleOp.states; +package org.timecrafters.Phoenix.TeleOp.states; import org.cyberarm.engine.V2.CyberarmState; +import org.timecrafters.Phoenix.PhoenixBot1; public class SteeringDriveExperiment extends CyberarmState { diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/TeleOPArmDriver.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/TeleOPArmDriver.java similarity index 99% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/TeleOPArmDriver.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/TeleOPArmDriver.java index 407f6fc..8a996df 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/TeleOPArmDriver.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/TeleOPArmDriver.java @@ -1,4 +1,4 @@ -package org.timecrafters.Autonomous.TeleOp.states; +package org.timecrafters.Phoenix.TeleOp.states; import com.qualcomm.robotcore.hardware.DcMotor; import com.qualcomm.robotcore.hardware.Gamepad; @@ -6,6 +6,7 @@ import com.qualcomm.robotcore.hardware.Servo; import org.cyberarm.engine.V2.CyberarmState; import org.cyberarm.engine.V2.GamepadChecker; +import org.timecrafters.Phoenix.PhoenixBot1; public class TeleOPArmDriver extends CyberarmState { private final PhoenixBot1 robot; diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/TeleOPSpeedrunState.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/TeleOPSpeedrunState.java similarity index 93% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/TeleOPSpeedrunState.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/TeleOPSpeedrunState.java index 6f526c5..7bedd76 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/TeleOPSpeedrunState.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/TeleOPSpeedrunState.java @@ -1,8 +1,9 @@ -package org.timecrafters.Autonomous.TeleOp.states; +package org.timecrafters.Phoenix.TeleOp.states; import com.qualcomm.robotcore.hardware.DcMotor; import org.cyberarm.engine.V2.CyberarmState; +import org.timecrafters.Phoenix.PhoenixBot1; import org.timecrafters.TimeCraftersConfigurationTool.library.TimeCraftersConfiguration; public class TeleOPSpeedrunState extends CyberarmState { diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/TeleOPTankDriver.java b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/TeleOPTankDriver.java similarity index 98% rename from TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/TeleOPTankDriver.java rename to TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/TeleOPTankDriver.java index 0f0769f..77b63ee 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/TeleOp/states/TeleOPTankDriver.java +++ b/TeamCode/src/main/java/org/timecrafters/Phoenix/TeleOp/states/TeleOPTankDriver.java @@ -1,10 +1,11 @@ -package org.timecrafters.Autonomous.TeleOp.states; +package org.timecrafters.Phoenix.TeleOp.states; import com.qualcomm.robotcore.hardware.Gamepad; import org.cyberarm.engine.V2.CyberarmState; import org.cyberarm.engine.V2.GamepadChecker; import org.firstinspires.ftc.robotcore.external.navigation.AngleUnit; +import org.timecrafters.Phoenix.PhoenixBot1; public class TeleOPTankDriver extends CyberarmState {