From 3a422b491798c759fd87a870bf7d66162c6f0435 Mon Sep 17 00:00:00 2001 From: Spencer Date: Sat, 7 Aug 2021 20:13:09 -0500 Subject: [PATCH 1/2] (: --- .../javaClass/spencer/SpencerFirstState.java | 103 ++++++++++++++---- 1 file changed, 84 insertions(+), 19 deletions(-) diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerFirstState.java b/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerFirstState.java index 650b372..b4ce545 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerFirstState.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerFirstState.java @@ -1,5 +1,7 @@ package org.timecrafters.javaClass.spencer; +import com.qualcomm.hardware.rev.RevBlinkinLedDriver; + import org.cyberarm.engine.V2.CyberarmState; import org.timecrafters.javaClass.samples.SampleRobot; @@ -11,6 +13,13 @@ public class SpencerFirstState extends CyberarmState { private double leftStick; private boolean leftBumper; private boolean rightBumper; + private boolean y; + private boolean a; + private float rightTrigger; + private float leftTrigger; + private boolean x; + private boolean b; + //This is the constructor. It lets other code bits run use the code you put here public SpencerFirstState(SampleRobot robot) { this.robot = robot; @@ -20,27 +29,83 @@ public class SpencerFirstState extends CyberarmState { //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; - leftBumper = engine.gamepad1.left_bumper; - rightBumper = engine.gamepad1.right_bumper; - robot.driveFrontLeft.setPower(-leftStick); - robot.driveFrontRight.setPower(-rightStick); - robot.driveBackLeft.setPower(-leftStick); - robot.driveBackRight.setPower(-rightStick); - if (leftBumper) { - robot.driveFrontLeft.setPower(-1); - robot.driveFrontRight.setPower(-1); - robot.driveBackLeft.setPower(-1); - robot.driveBackRight.setPower(-1); - } else if (rightBumper) { - robot.driveFrontLeft.setPower(1); - robot.driveFrontRight.setPower(1); - robot.driveBackLeft.setPower(1); - robot.driveBackRight.setPower(1); - } + /* game pad read*/ + rightStick = engine.gamepad1.right_stick_y; + leftStick = engine.gamepad1.left_stick_y; + leftBumper = engine.gamepad1.left_bumper; + rightBumper = engine.gamepad1.right_bumper; + y = engine.gamepad1.y; + a = engine.gamepad1.a; + x = engine.gamepad1.x; + rightTrigger = engine.gamepad1.right_trigger; + leftTrigger = engine.gamepad1.right_trigger; + b = engine.gamepad1.b; + /*this section is no bumpers... tank drive*/ + if (!leftBumper && !rightBumper) { + robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.GREEN); + robot.driveFrontLeft.setPower(-leftStick); + robot.driveFrontRight.setPower(-rightStick); + robot.driveBackLeft.setPower(-leftStick); + robot.driveBackRight.setPower(-rightStick); + } + /* + if (x) { + robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.ORANGE); + robot.driveFrontLeft.setPower(-.5); + robot.driveFrontRight.setPower(-.5); + robot.driveBackLeft.setPower(-.5); + robot.driveBackRight.setPower(-.5); + } + + if (b){ + robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.GREEN); + robot.driveFrontLeft.setPower(-1); + robot.driveFrontRight.setPower(-1); + robot.driveBackLeft.setPower(-1); + robot.driveBackRight.setPower(-1); + } + */ + + /*this is left bumper section... strafe to the left*/ + if (leftBumper) { + robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.GREEN); + robot.driveFrontLeft.setPower(-1); + robot.driveFrontRight.setPower(1); + robot.driveBackLeft.setPower(1); + robot.driveBackRight.setPower(-1); + } + + /* right bumper section ... strafe to the right*/ + else if (rightBumper) { + robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.GREEN); + robot.driveFrontLeft.setPower(1); + robot.driveFrontRight.setPower(-1); + robot.driveBackLeft.setPower(-1); + robot.driveBackRight.setPower(1); + } + + /* y section ... when y is pressed fly wheel starts, when a is pressed fly wheel stops*/ + if (y) { + robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.RED); + robot.launchMotor.setPower(1); + } else if (a) { + robot.launchMotor.setPower(0); + robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.GREEN); + } + + /*right Trigger section ... when right trigger is held collection wheels suck rings*/ + + if (rightTrigger>=0.5){ + robot.collectionMotor.setPower(1); + robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.BLUE); + } + /*left trigger ... when left trigger is held tracks moves ring, when trigger is let go track stops*/ + else if (leftTrigger>=0.5) { + robot.ringBeltMotor.setPower(1); + robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.GOLD); + } } } From 5f0469093a0b569c2c4d99df99468fd8e08953b9 Mon Sep 17 00:00:00 2001 From: scottbadger777 <37743855+scottbadger777@users.noreply.github.com> Date: Tue, 10 Aug 2021 18:48:12 -0500 Subject: [PATCH 2/2] Aubrey stuff --- .../shelved.patch | 19 ----------- .../timecrafters/javaClass/aubrey/dance.java | 32 +++++++++++++++++++ 2 files changed, 32 insertions(+), 19 deletions(-) delete mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_6_38_PM_[Default_Changelist]/shelved.patch create mode 100644 TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_6_38_PM_[Default_Changelist]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_6_38_PM_[Default_Changelist]/shelved.patch deleted file mode 100644 index 4713977..0000000 --- a/.idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_6_38_PM_[Default_Changelist]/shelved.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 93fcfef1c6b9eb5b7347612b8253482f812352ff) -+++ b/.idea/misc.xml (date 1627949578712) -@@ -1,6 +1,7 @@ - - -- -+ -+ - - - diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java new file mode 100644 index 0000000..abd84e3 --- /dev/null +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java @@ -0,0 +1,32 @@ +package org.timecrafters.javaClass.aubrey; + +import org.cyberarm.engine.V2.CyberarmState; +import org.timecrafters.javaClass.samples.SampleRobot; + +public class dance extends CyberarmState { + + private SampleRobot robot; + private double speed =0.5; + private float RotationLimit =20; + private double powerWorks =0.5; + + public dance(SampleRobot robot) { + this.robot = robot; + } + + @Override + public void exec() { + float rotation = robot.getIMURotation(); + if (rotation