diff --git a/.idea/misc.xml b/.idea/misc.xml index 860da66..d5d35ec 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + 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 new file mode 100644 index 0000000..4713977 --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_6_38_PM_[Default_Changelist]/shelved.patch @@ -0,0 +1,19 @@ +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/.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 new file mode 100644 index 0000000..0cc2877 --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_6_38_PM__Default_Changelist_.xml @@ -0,0 +1,4 @@ + + \ 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 new file mode 100644 index 0000000..ee13ab2 --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_8_33_PM_[Default_Changelist]/shelved.patch @@ -0,0 +1,70 @@ +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 new file mode 100644 index 0000000..9b72770 --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_8_33_PM__Default_Changelist_.xml @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/CaydenFirstState.java b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/CaydenFirstState.java index dcf0607..a979e39 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/CaydenFirstState.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/CaydenFirstState.java @@ -17,10 +17,31 @@ public class CaydenFirstState extends CyberarmState { //This one is set up to repeat every few milliseconds @Override public void exec() { - robot.launchMotor.setPower(engine.gamepad1.left_stick_y); - robot.ringBeltMotor.setPower(engine.gamepad1.right_trigger - ); - if (robot.limitSwitch.isPressed()) { + + if (engine.gamepad1.y){ + robot.collectionMotor.setPower(.5); + } + else{ + robot.collectionMotor.setPower(0); + } + + if(engine.gamepad1.b){ + robot.ringBeltMotor.setPower(.75); + } + else{ + robot.ringBeltMotor.setPower(0); + } + + + robot.driveFrontRight.setPower(-engine.gamepad1.right_stick_y); + robot.driveBackRight.setPower(-engine.gamepad1.right_stick_y); + robot.driveFrontLeft.setPower(-engine.gamepad1.left_stick_y); + robot.driveBackLeft.setPower(-engine.gamepad1.right_stick_y); + + + robot.ringBeltMotor.setPower(engine.gamepad1.right_trigger); + + if (robot.wobbleTouchSensor.isPressed()) { robot.launchMotor.setPower(0.5); }else{ robot.launchMotor.setPower(0); diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerDriveFoward.java b/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerDriveFoward.java new file mode 100644 index 0000000..973af18 --- /dev/null +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerDriveFoward.java @@ -0,0 +1,21 @@ +package org.timecrafters.javaClass.spencer; + +import org.cyberarm.engine.V2.CyberarmState; +import org.timecrafters.javaClass.samples.SampleRobot; + +public class SpencerDriveFoward extends CyberarmState { + + + private SampleRobot robot; + + public SpencerDriveFoward(SampleRobot robot) { + this.robot = robot; + } + + @Override + public void exec() { + if () + + } + +} 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 b50d769..650b372 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerFirstState.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerFirstState.java @@ -7,7 +7,10 @@ public class SpencerFirstState extends CyberarmState { //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; + private boolean leftBumper; + private boolean rightBumper; //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 +20,27 @@ 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); + } + } }