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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
SafePencil
2021-08-10 18:50:51 -05:00
parent 99c22338b9 4f957ea101
commit e61d762d74
3 changed files with 116 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
.idea/shelf/Uncommitted_changes_before_Update_at_8_3_2021_6_38_PM_[Default_Changelist]/shelved.patch generated
View File

@@ -1,19 +0,0 @@
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_11\" 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 93fcfef1c6b9eb5b7347612b8253482f812352ff)
+++ b/.idea/misc.xml (date 1627949578712)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ExternalStorageConfigurationManager" enabled="true" />
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

32
TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/dance.java Normal file
View File

@@ -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 <RotationLimit) {
powerWorks = -speed;
}else {
powerWorks = speed;
}
robot.driveBackRight.setPower(powerWorks);
robot.driveBackLeft.setPower(-powerWorks);
robot.driveFrontLeft.setPower(-powerWorks);
robot.driveFrontRight.setPower(powerWorks);
}
}

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

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