From b485f38d0bf0643f64c6dde01b34a57ad9cb1b53 Mon Sep 17 00:00:00 2001 From: scottbadger777 <37743855+scottbadger777@users.noreply.github.com> Date: Thu, 12 Aug 2021 19:01:03 -0500 Subject: [PATCH] UwU --- .../shelved.patch | 70 ------------------- ..._8_3_2021_8_33_PM__Default_Changelist_.xml | 4 -- .../timecrafters/javaClass/aubrey/dance.java | 10 +-- 3 files changed, 5 insertions(+), 79 deletions(-) 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 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/aubrey/dance.java b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java index abd84e3..e828cce 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java @@ -17,16 +17,16 @@ public class dance extends CyberarmState { @Override public void exec() { float rotation = robot.getIMURotation(); - if (rotation