From a21f02d39340c1799fede4e49bbd1f6ee602552d Mon Sep 17 00:00:00 2001 From: Spencer Date: Wed, 11 Aug 2021 17:15:51 -0500 Subject: [PATCH 1/3] (: --- .idea/misc.xml | 2 +- .../shelved.patch | 70 ------------------- ..._8_3_2021_8_33_PM__Default_Changelist_.xml | 4 -- .../javaClass/spencer/SpencerFirstState.java | 61 ++++++++++------ 4 files changed, 40 insertions(+), 97 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/misc.xml b/.idea/misc.xml index ba9cfe8..5c9f89f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - + 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/spencer/SpencerFirstState.java b/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerFirstState.java index b4ce545..f4aced1 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerFirstState.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerFirstState.java @@ -39,12 +39,11 @@ public class SpencerFirstState extends CyberarmState { a = engine.gamepad1.a; x = engine.gamepad1.x; rightTrigger = engine.gamepad1.right_trigger; - leftTrigger = engine.gamepad1.right_trigger; + leftTrigger = engine.gamepad1.left_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); @@ -52,7 +51,6 @@ public class SpencerFirstState extends CyberarmState { } /* if (x) { - robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.ORANGE); robot.driveFrontLeft.setPower(-.5); robot.driveFrontRight.setPower(-.5); robot.driveBackLeft.setPower(-.5); @@ -60,7 +58,6 @@ public class SpencerFirstState extends CyberarmState { } if (b){ - robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.GREEN); robot.driveFrontLeft.setPower(-1); robot.driveFrontRight.setPower(-1); robot.driveBackLeft.setPower(-1); @@ -70,7 +67,6 @@ public class SpencerFirstState extends CyberarmState { /*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); @@ -79,33 +75,54 @@ public class SpencerFirstState extends CyberarmState { /* 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); + } else { + robot.driveFrontLeft.setPower(-leftStick); + robot.driveFrontRight.setPower(-rightStick); + robot.driveBackLeft.setPower(-leftStick); + robot.driveBackRight.setPower(-rightStick); } + /* y section ... when y is pressed fly wheel starts, when y is pressed again fly wheel stops*/ - /* 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); - } + boolean changed = false; //outside of loop + if (engine.gamepad1.y && !changed) { + if (robot.launchMotor.getPower() == 0) robot.launchMotor.setPower(1); + else robot.launchMotor.setPower(0); + changed = true; + } else if (!engine.gamepad1.y) changed = false; /*right Trigger section ... when right trigger is held collection wheels suck rings*/ - if (rightTrigger>=0.5){ + boolean rightTriggerB = (rightTrigger >= 0.5); + if (rightTriggerB) { 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); + } else { + robot.collectionMotor.setPower(0); + } + + /*left trigger ... when left trigger is held tracks moves ring, when trigger is let go track stops*/ + + if (leftTrigger >= 0.5) { + robot.ringBeltMotor.setPower(1); + } + else { + robot.ringBeltMotor.setPower(0); + } + + if (robot.launchMotor.getPower() == 1) { + robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.RED); + }else if (leftTrigger >= 0.5) { + robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.BLUE); + } + else if (rightTriggerB) { + robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.GOLD); + } else { + robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.GREEN); + } + } } -} From 124dd0090596f3bbd7af31b195178c53c617e14d Mon Sep 17 00:00:00 2001 From: Spencer Date: Thu, 12 Aug 2021 13:39:39 -0500 Subject: [PATCH 2/3] (: --- .../javaClass/spencer/SpencerFirstState.java | 139 +++++++++--------- 1 file changed, 69 insertions(+), 70 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 f4aced1..7094ac0 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerFirstState.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerFirstState.java @@ -19,6 +19,8 @@ public class SpencerFirstState extends CyberarmState { private float leftTrigger; private boolean x; private boolean b; + private boolean aPrev; + private double drivepower = 1; //This is the constructor. It lets other code bits run use the code you put here public SpencerFirstState(SampleRobot robot) { @@ -49,80 +51,77 @@ public class SpencerFirstState extends CyberarmState { robot.driveBackLeft.setPower(-leftStick); robot.driveBackRight.setPower(-rightStick); } - /* - if (x) { - robot.driveFrontLeft.setPower(-.5); - robot.driveFrontRight.setPower(-.5); - robot.driveBackLeft.setPower(-.5); - robot.driveBackRight.setPower(-.5); - } - if (b){ - 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.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.driveFrontLeft.setPower(1); - robot.driveFrontRight.setPower(-1); - robot.driveBackLeft.setPower(-1); - robot.driveBackRight.setPower(1); - } else { - robot.driveFrontLeft.setPower(-leftStick); - robot.driveFrontRight.setPower(-rightStick); - robot.driveBackLeft.setPower(-leftStick); - robot.driveBackRight.setPower(-rightStick); - } - /* y section ... when y is pressed fly wheel starts, when y is pressed again fly wheel stops*/ - - boolean changed = false; //outside of loop - if (engine.gamepad1.y && !changed) { - if (robot.launchMotor.getPower() == 0) robot.launchMotor.setPower(1); - else robot.launchMotor.setPower(0); - changed = true; - } else if (!engine.gamepad1.y) changed = false; - - /*right Trigger section ... when right trigger is held collection wheels suck rings*/ - - boolean rightTriggerB = (rightTrigger >= 0.5); - if (rightTriggerB) { - robot.collectionMotor.setPower(1); - } else { - robot.collectionMotor.setPower(0); - - } + boolean a = engine.gamepad1.a; + if (engine.gamepad1.a && !aPrev) { + if (drivepower == 1) { + drivepower = 0.5; + } else { + drivepower = 1; + } + engine.gamepad1.a = aPrev; - /*left trigger ... when left trigger is held tracks moves ring, when trigger is let go track stops*/ - if (leftTrigger >= 0.5) { - robot.ringBeltMotor.setPower(1); - } - else { - robot.ringBeltMotor.setPower(0); - } + /*this is left bumper section... strafe to the left*/ + if (leftBumper) { + robot.driveFrontLeft.setPower(-1); + robot.driveFrontRight.setPower(1); + robot.driveBackLeft.setPower(1); + robot.driveBackRight.setPower(-1); + } - if (robot.launchMotor.getPower() == 1) { - robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.RED); - }else if (leftTrigger >= 0.5) { - robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.BLUE); - } - else if (rightTriggerB) { - robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.GOLD); - } else { - robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.GREEN); + /* right bumper section ... strafe to the right*/ + else if (rightBumper) { + robot.driveFrontLeft.setPower(1); + robot.driveFrontRight.setPower(-1); + robot.driveBackLeft.setPower(-1); + robot.driveBackRight.setPower(1); + } else { + robot.driveFrontLeft.setPower(-leftStick); + robot.driveFrontRight.setPower(-rightStick); + robot.driveBackLeft.setPower(-leftStick); + robot.driveBackRight.setPower(-rightStick); + } + /* y section ... when y is pressed fly wheel starts, when y is pressed again fly wheel stops*/ + + boolean changed = false; //outside of loop + if (engine.gamepad1.y && !changed) { + if (robot.launchMotor.getPower() == 0) robot.launchMotor.setPower(1); + else robot.launchMotor.setPower(0); + changed = true; + } else if (!engine.gamepad1.y) changed = false; + + /*right Trigger section ... when right trigger is held collection wheels suck rings*/ + + boolean rightTriggerB = (rightTrigger >= 0.5); + if (rightTriggerB) { + robot.collectionMotor.setPower(1); + } else { + robot.collectionMotor.setPower(0); + + } + + + /*left trigger ... when left trigger is held tracks moves ring, when trigger is let go track stops*/ + + if (leftTrigger >= 0.5) { + robot.ringBeltMotor.setPower(1); + } else { + robot.ringBeltMotor.setPower(0); + } + + if (robot.launchMotor.getPower() == 1) { + robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.RED); + } else if (leftTrigger >= 0.5) { + robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.BLUE); + } else if (rightTriggerB) { + robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.GOLD); + } else if (drivepower == 0.5){ + robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.ORANGE); + } else { + robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.GREEN); + } } } - } +} From 2acadd41a0137d862cd0b2ef48478970efb548c8 Mon Sep 17 00:00:00 2001 From: Spencer Date: Thu, 12 Aug 2021 17:00:17 -0500 Subject: [PATCH 3/3] (: --- .../org/timecrafters/javaClass/spencer/SpencerFirstState.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 7094ac0..2a6c040 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerFirstState.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerFirstState.java @@ -102,7 +102,9 @@ public class SpencerFirstState extends CyberarmState { } - + if (engine.gamepad1.b) { + robot.ringBeltMotor.setPower(-0.5); + } /*left trigger ... when left trigger is held tracks moves ring, when trigger is let go track stops*/ if (leftTrigger >= 0.5) {