TimeCrafters/UltimateGoal
1
0
Fork 0
mirror of https://github.com/TimeCrafters/UltimateGoal.git synced 2025-12-15 05:52:35 +00:00
Code Issues Projects Releases Wiki Activity

(:

Browse Source
This commit is contained in:
Spencer
2021-08-11 17:15:51 -05:00
parent a647d6026a
commit a21f02d393
4 changed files with 40 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<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">

70
.idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_8_33_PM_[Default_Changelist]/shelved.patch generated
View File

@@ -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
<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project version=\"4\">\r\n <component name=\"CompilerConfiguration\">\r\n <bytecodeTargetLevel target=\"1.8\" />\r\n </component>\r\n</project>
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 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
- <bytecodeTargetLevel target="1.8" />
+ <bytecodeTargetLevel target="11" />
</component>
</project>
\ No newline at end of file
Index: .idea/misc.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project version=\"4\">\r\n <component name=\"ProjectRootManager\" version=\"2\" languageLevel=\"JDK_1_8\" default=\"true\" project-jdk-name=\"1.8\" project-jdk-type=\"JavaSDK\">\r\n <output url=\"file://$PROJECT_DIR$/build/classes\" />\r\n </component>\r\n <component name=\"ProjectType\">\r\n <option name=\"id\" value=\"Android\" />\r\n </component>\r\n</project>
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 @@
<?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="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">

4
.idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_8_33_PM__Default_Changelist_.xml generated
View File

@@ -1,4 +0,0 @@
<changelist name="Uncommitted_changes_before_Update_at_8_3_2021_8_33_PM_[Default_Changelist]" date="1628040852375" recycled="true" deleted="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_8_33_PM_[Default_Changelist]/shelved.patch" />
<option name="DESCRIPTION" value="Uncommitted changes before Update at 8/3/2021 8:33 PM [Default Changelist]" />
</changelist>

61
TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerFirstState.java
View File

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