From aee6927782583cc6433feac1c6d4a19cefaedba6 Mon Sep 17 00:00:00 2001 From: scottbadger777 <37743855+scottbadger777@users.noreply.github.com> Date: Thu, 12 Aug 2021 19:23:06 -0500 Subject: [PATCH 1/6] UwU --- .../main/java/org/timecrafters/javaClass/aubrey/dance.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java index e828cce..30a42a9 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java @@ -29,4 +29,8 @@ public class dance extends CyberarmState { } } + + @Override + public void telemetry() {engine.telemetry.addData("rotation",robot.getIMURotation()); + } } From a8f4c09b516360f91a8d947932c5a089190e333f Mon Sep 17 00:00:00 2001 From: SafePencil Date: Thu, 12 Aug 2021 19:36:44 -0500 Subject: [PATCH 2/6] a thing --- ..._8_3_2021_6_38_PM__Default_Changelist_.xml | 4 -- .../shelved.patch | 70 ------------------- ..._8_3_2021_8_33_PM__Default_Changelist_.xml | 4 -- .../javaClass/cayden/CaydenFirstState.java | 1 + .../javaClass/cayden/Cayden_Autonomous.java | 30 ++++++++ 5 files changed, 31 insertions(+), 78 deletions(-) delete mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_6_38_PM__Default_Changelist_.xml delete mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_8_33_PM_[Default_Changelist]/shelved.patch delete mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_8_33_PM__Default_Changelist_.xml create mode 100644 TeamCode/src/main/java/org/timecrafters/javaClass/cayden/Cayden_Autonomous.java 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/.idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_8_33_PM_[Default_Changelist]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_8_33_PM_[Default_Changelist]/shelved.patch deleted file mode 100644 index ee13ab2..0000000 --- a/.idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_8_33_PM_[Default_Changelist]/shelved.patch +++ /dev/null @@ -1,70 +0,0 @@ -Index: TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerFirstState.java -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP -<+>package org.timecrafters.javaClass.spencer;\r\n\r\nimport org.cyberarm.engine.V2.CyberarmState;\r\nimport org.timecrafters.javaClass.samples.SampleRobot;\r\n\r\npublic class SpencerFirstState extends CyberarmState {\r\n\r\n //here, you'll find some of your variables. you can add more as you need them.\r\n private SampleRobot robot;\r\n\r\n //This is the constructor. It lets other code bits run use the code you put here\r\n public SpencerFirstState(SampleRobot robot) {\r\n this.robot = robot;\r\n }\r\n\r\n //This is a method. methods are bits of code that can be run elsewhere.\r\n //This one is set up to repeat every few milliseconds\r\n @Override\r\n public void exec() {\r\n\r\n }\r\n}\r\n -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerFirstState.java b/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerFirstState.java ---- a/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerFirstState.java (revision a456b9a0029643112cbcd2236d74ae2477fb7278) -+++ b/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerFirstState.java (date 1628040144672) -@@ -7,7 +7,8 @@ - - //here, you'll find some of your variables. you can add more as you need them. - private SampleRobot robot; -- -+ private double rightStick; -+ private double leftStick; - //This is the constructor. It lets other code bits run use the code you put here - public SpencerFirstState(SampleRobot robot) { - this.robot = robot; -@@ -17,6 +18,12 @@ - //This one is set up to repeat every few milliseconds - @Override - public void exec() { -+ rightStick = engine.gamepad1.right_stick_y; -+ leftStick = engine.gamepad1.left_stick_y; -+ robot.driveFrontLeft.setPower(-leftStick); -+ robot.driveFrontRight.setPower(-rightStick); -+ robot.driveBackLeft.setPower(-rightStick); -+ robot.driveBackRight.setPower(-leftStick); - - } - } -Index: .idea/compiler.xml -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP -<+>\r\n\r\n \r\n \r\n \r\n -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/.idea/compiler.xml b/.idea/compiler.xml ---- a/.idea/compiler.xml (revision a456b9a0029643112cbcd2236d74ae2477fb7278) -+++ b/.idea/compiler.xml (date 1628037945639) -@@ -1,6 +1,6 @@ - - - -- -+ - - -\ No newline at end of file -Index: .idea/misc.xml -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP -<+>\r\n\r\n \r\n \r\n \r\n \r\n \r\n -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/.idea/misc.xml b/.idea/misc.xml ---- a/.idea/misc.xml (revision a456b9a0029643112cbcd2236d74ae2477fb7278) -+++ b/.idea/misc.xml (date 1628037945616) -@@ -1,6 +1,6 @@ - - -- -+ - - - diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_8_33_PM__Default_Changelist_.xml b/.idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_8_33_PM__Default_Changelist_.xml deleted file mode 100644 index 9b72770..0000000 --- a/.idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_8_33_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/cayden/CaydenFirstState.java b/TeamCode/src/main/java/org/timecrafters/javaClass/cayden/CaydenFirstState.java index bdee630..bdd8001 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/cayden/CaydenFirstState.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/cayden/CaydenFirstState.java @@ -8,6 +8,7 @@ public class CaydenFirstState extends CyberarmState { //here, you'll find some of your variables. you can add more as you need them. private Robot robot; + private double variable=1; //This is the constructor. It lets other code bits run use the code you put here public CaydenFirstState(Robot robot) { diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/cayden/Cayden_Autonomous.java b/TeamCode/src/main/java/org/timecrafters/javaClass/cayden/Cayden_Autonomous.java new file mode 100644 index 0000000..346cc42 --- /dev/null +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/cayden/Cayden_Autonomous.java @@ -0,0 +1,30 @@ +package org.timecrafters.javaClass.cayden; + +import org.cyberarm.engine.V2.CyberarmState; +import org.timecrafters.UltimateGoal.Competition.Robot; + +public class Cayden_Autonomous extends CyberarmState { + private Robot robot; + private double variable=.5; + + + + + public Cayden_Autonomous(Robot robot) { + this.robot = robot; + } + @Override + public void exec() { + + robot.driveFrontRight.setPower(variable); + robot.driveBackRight.setPower(variable); + robot.driveFrontLeft.setPower(variable); + robot.driveBackLeft.setPower(variable); + + if (robot.encoderLeft.getCurrentPosition()>=300){ + variable=0; + } + + + } +} From 45997445160367564d6f0c204ac8e3fb4aeb925c Mon Sep 17 00:00:00 2001 From: scottbadger777 <37743855+scottbadger777@users.noreply.github.com> Date: Thu, 12 Aug 2021 19:39:34 -0500 Subject: [PATCH 3/6] UwU --- .../src/main/java/org/timecrafters/javaClass/aubrey/dance.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java index 30a42a9..d4d0923 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java @@ -23,7 +23,7 @@ public class dance extends CyberarmState { robot.driveFrontLeft.setPower(-powerWorks); robot.driveFrontRight.setPower(powerWorks); - if (1 < rotation && rotation< 15){ + if (-1 > rotation && rotation> -15){ powerWorks = 0; } From feb3e23a37ac0d743e60ef41d3f88cb41a7cf583 Mon Sep 17 00:00:00 2001 From: SafePencil Date: Thu, 12 Aug 2021 19:42:36 -0500 Subject: [PATCH 4/6] a thing --- .../org/timecrafters/javaClass/samples/CaydenFirstEngine.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 4a36655..2c1f73b 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/CaydenFirstEngine.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/samples/CaydenFirstEngine.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.cayden.CaydenFirstState; +import org.timecrafters.javaClass.cayden.Cayden_Autonomous; @Autonomous (name = "Cayden: First Program", group = "caden") public class CaydenFirstEngine extends CyberarmEngine { @@ -21,6 +22,6 @@ public class CaydenFirstEngine extends CyberarmEngine { @Override public void setup() { - addState(new CaydenFirstState(robot)); + addState(new Cayden_Autonomous(robot)); } } From 39ee83435f90341103a5d9295b3fcbce77baba56 Mon Sep 17 00:00:00 2001 From: scottbadger777 <37743855+scottbadger777@users.noreply.github.com> Date: Thu, 12 Aug 2021 19:57:15 -0500 Subject: [PATCH 5/6] UwU --- .../main/java/org/timecrafters/javaClass/aubrey/dance.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java index d4d0923..9b1cf97 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java @@ -1,5 +1,7 @@ package org.timecrafters.javaClass.aubrey; +import com.qualcomm.hardware.rev.RevBlinkinLedDriver; + import org.cyberarm.engine.V2.CyberarmState; import org.timecrafters.javaClass.samples.SampleRobot; @@ -27,7 +29,7 @@ public class dance extends CyberarmState { powerWorks = 0; } - +robot. ledDriver. setPattern(RevBlinkinLedDriver.BlinkinPattern.CP1_2_COLOR_GRADIENT); } @Override From a324a0f1d18ba2e71d438b2e75b753e49fbf7772 Mon Sep 17 00:00:00 2001 From: scottbadger777 <37743855+scottbadger777@users.noreply.github.com> Date: Thu, 12 Aug 2021 20:02:16 -0500 Subject: [PATCH 6/6] UwU --- .../src/main/java/org/timecrafters/javaClass/aubrey/dance.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java index 9b1cf97..2aed0a7 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java @@ -29,7 +29,7 @@ public class dance extends CyberarmState { powerWorks = 0; } -robot. ledDriver. setPattern(RevBlinkinLedDriver.BlinkinPattern.CP1_2_COLOR_GRADIENT); +robot. ledDriver. setPattern(RevBlinkinLedDriver.BlinkinPattern.RAINBOW_RAINBOW_PALETTE); } @Override