Merge remote-tracking branch 'origin/master'

.idea/misc.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java

@@ -17,16 +17,20 @@ public class dance extends CyberarmState {
     @Override
     public void exec() {
         float rotation = robot.getIMURotation();
- if (rotation <RotationLimit) {
-     powerWorks = -speed;
- }else {
-     powerWorks = speed;
 
- }
         robot.driveBackRight.setPower(powerWorks);
         robot.driveBackLeft.setPower(-powerWorks);
     robot.driveFrontLeft.setPower(-powerWorks);
     robot.driveFrontRight.setPower(powerWorks);
 
+    if (1 < rotation && rotation< 15){
+        powerWorks = 0;
+
+    }
+
+    }
+
+    @Override
+    public void telemetry() {engine.telemetry.addData("rotation",robot.getIMURotation());
     }
 }

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));
     }
 }

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) {
@@ -39,38 +41,30 @@ 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);
             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){
+        boolean a = engine.gamepad1.a;
-            robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.GREEN);
+        if (engine.gamepad1.a && !aPrev) {
-        robot.driveFrontLeft.setPower(-1);
+            if (drivepower == 1) {
-        robot.driveFrontRight.setPower(-1);
+                drivepower = 0.5;
-        robot.driveBackLeft.setPower(-1);
+            } else {
-        robot.driveBackRight.setPower(-1);
+                drivepower = 1;
             }
-        */
+            engine.gamepad1.a = aPrev;
+
+
 
             /*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 +73,57 @@ 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*/
+            boolean changed = false; //outside of loop
-        if (y) {
+            if (engine.gamepad1.y && !changed) {
-            robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.RED);
+                if (robot.launchMotor.getPower() == 0) robot.launchMotor.setPower(1);
-            robot.launchMotor.setPower(1);
+                else robot.launchMotor.setPower(0);
-        } else if (a) {
+                changed = true;
-            robot.launchMotor.setPower(0);
+            } else if (!engine.gamepad1.y) changed = false;
-            robot.ledDriver.setPattern(RevBlinkinLedDriver.BlinkinPattern.GREEN);
-        }
 
             /*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);
+            } else {
-        }
+                robot.collectionMotor.setPower(0);
-        /*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);
-        }
 
             }
+
+            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) {
+                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);
+            }
+        }
+    }
 }