From e57f044ba01886f8f8f73d57ca70c9ff8963180e Mon Sep 17 00:00:00 2001 From: scottbadger777 <37743855+scottbadger777@users.noreply.github.com> Date: Tue, 10 Aug 2021 20:24:37 -0500 Subject: [PATCH] cool dude --- .idea/misc.xml | 3 ++- ...before_Update_at_8_3_2021_6_38_PM__Default_Changelist_.xml | 4 ---- .../org/timecrafters/javaClass/samples/AubreyFirstEngine.java | 3 ++- .../org/timecrafters/javaClass/samples/CaydenFirstEngine.java | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_6_38_PM__Default_Changelist_.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index d5d35ec..ba9cfe8 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,7 @@ - + + diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_6_38_PM__Default_Changelist_.xml b/.idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_6_38_PM__Default_Changelist_.xml deleted file mode 100644 index 0cc2877..0000000 --- a/.idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_6_38_PM__Default_Changelist_.xml +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/AubreyFirstEngine.java b/TeamCode/src/main/java/org/timecrafters/javaClass/samples/AubreyFirstEngine.java index 769f194..837582d 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/AubreyFirstEngine.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/samples/AubreyFirstEngine.java @@ -5,6 +5,7 @@ import com.qualcomm.robotcore.eventloop.opmode.Autonomous; import org.cyberarm.engine.V2.CyberarmEngine; import org.timecrafters.UltimateGoal.Competition.Robot; import org.timecrafters.javaClass.aubrey.AubreyFirstState; +import org.timecrafters.javaClass.aubrey.dance; @Autonomous(name = "Aubrey: First Program", group = "aubrey") public class AubreyFirstEngine extends CyberarmEngine { @@ -21,6 +22,6 @@ public class AubreyFirstEngine extends CyberarmEngine { @Override public void setup() { - addState(new AubreyFirstState(robot)); + addState(new dance(robot)); } } diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/CaydenFirstEngine.java b/TeamCode/src/main/java/org/timecrafters/javaClass/samples/CaydenFirstEngine.java index 468094e..a723430 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/CaydenFirstEngine.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/samples/CaydenFirstEngine.java @@ -21,6 +21,6 @@ public class CaydenFirstEngine extends CyberarmEngine { @Override public void setup() { - addState(new CaydenFirstState(robot)); + // addState(new CaydenFirstState(robot)); } }