From 485c92d43c38a6a5be88163c2a8a5d4ea1e5d86a Mon Sep 17 00:00:00 2001 From: scottbadger777 <37743855+scottbadger777@users.noreply.github.com> Date: Tue, 3 Aug 2021 20:37:33 -0500 Subject: [PATCH 1/4] Aubrey stuff --- .../org/timecrafters/javaClass/aubrey/AubreyFirstState.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/AubreyFirstState.java b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/AubreyFirstState.java index 502ed0b..a89e578 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/AubreyFirstState.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/AubreyFirstState.java @@ -20,8 +20,8 @@ public class AubreyFirstState extends CyberarmState { //This one is set up to repeat every few milliseconds @Override public void exec() { - UwU= engine.gamepad1.left_stick_y ; - OwO= engine.gamepad1. right_stick_y; + UwU= -engine.gamepad1.left_stick_y ; + OwO= -engine.gamepad1. right_stick_y; robot.driveBackLeft.setPower(UwU); robot.driveFrontLeft.setPower(UwU); From 6648f3d5088ddc5d2489dd15479aca0cb82e2a82 Mon Sep 17 00:00:00 2001 From: scottbadger777 <37743855+scottbadger777@users.noreply.github.com> Date: Thu, 5 Aug 2021 19:07:47 -0500 Subject: [PATCH 2/4] Aubrey stuff --- .../javaClass/aubrey/AubreyFirstState.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/AubreyFirstState.java b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/AubreyFirstState.java index a89e578..194cc57 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/AubreyFirstState.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/AubreyFirstState.java @@ -23,10 +23,20 @@ public class AubreyFirstState extends CyberarmState { UwU= -engine.gamepad1.left_stick_y ; OwO= -engine.gamepad1. right_stick_y; robot.driveBackLeft.setPower(UwU); + if(robot. limitSwitch. isPressed()) { + double power = .5; + robot.driveFrontLeft.setPower(-power); + robot.driveFrontRight.setPower(power); + robot.driveBackLeft.setPower(-power); + robot.driveBackRight.setPower(power); + + + }else { + robot.driveFrontLeft.setPower(UwU); + robot.driveBackRight. setPower(OwO); + robot.driveBackLeft. setPower(OwO); + } - robot.driveFrontLeft.setPower(UwU); - robot.driveBackRight. setPower(OwO); - robot.driveBackLeft. setPower(OwO); } From 8c87c1b2b566abd812f1766e4944a95381c52e8a Mon Sep 17 00:00:00 2001 From: SafePencil Date: Thu, 5 Aug 2021 19:12:16 -0500 Subject: [PATCH 3/4] a thing --- .idea/compiler.xml | 2 +- .idea/misc.xml | 2 +- .../{CadenFirstState.java => CaydenFirstState.java} | 13 ++++++++++--- ...adenrFirstEngine.java => CaydenFirstEngine.java} | 7 ++++--- 4 files changed, 16 insertions(+), 8 deletions(-) rename TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/{CadenFirstState.java => CaydenFirstState.java} (58%) rename TeamCode/src/main/java/org/timecrafters/javaClass/samples/{CadenrFirstEngine.java => CaydenFirstEngine.java} (71%) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 61a9130..fb7f4a8 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index d5d35ec..860da66 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/CadenFirstState.java b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/CaydenFirstState.java similarity index 58% rename from TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/CadenFirstState.java rename to TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/CaydenFirstState.java index d15e7ad..dcf0607 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/CadenFirstState.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/CaydenFirstState.java @@ -3,13 +3,13 @@ package org.timecrafters.javaClass.aubrey; import org.cyberarm.engine.V2.CyberarmState; import org.timecrafters.javaClass.samples.SampleRobot; -public class CadenFirstState extends CyberarmState { +public class CaydenFirstState extends CyberarmState { //here, you'll find some of your variables. you can add more as you need them. private SampleRobot robot; //This is the constructor. It lets other code bits run use the code you put here - public CadenFirstState(SampleRobot robot) { + public CaydenFirstState(SampleRobot robot) { this.robot = robot; } @@ -17,6 +17,13 @@ public class CadenFirstState 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()) { + robot.launchMotor.setPower(0.5); + }else{ + robot.launchMotor.setPower(0); + } } } diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/CadenrFirstEngine.java b/TeamCode/src/main/java/org/timecrafters/javaClass/samples/CaydenFirstEngine.java similarity index 71% rename from TeamCode/src/main/java/org/timecrafters/javaClass/samples/CadenrFirstEngine.java rename to TeamCode/src/main/java/org/timecrafters/javaClass/samples/CaydenFirstEngine.java index 4bae5fc..02af382 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/CadenrFirstEngine.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/samples/CaydenFirstEngine.java @@ -4,10 +4,11 @@ import com.qualcomm.robotcore.eventloop.opmode.Autonomous; import org.cyberarm.engine.V2.CyberarmEngine; import org.timecrafters.UltimateGoal.Competition.Robot; +import org.timecrafters.javaClass.aubrey.CaydenFirstState; import org.timecrafters.javaClass.spencer.SpencerFirstState; -@Autonomous (name = "Caden: First Program", group = "caden") -public class CadenrFirstEngine extends CyberarmEngine { +@Autonomous (name = "Cayden: First Program", group = "caden") +public class CaydenFirstEngine extends CyberarmEngine { SampleRobot robot; @@ -21,6 +22,6 @@ public class CadenrFirstEngine extends CyberarmEngine { @Override public void setup() { - addState(new SpencerFirstState(robot)); + addState(new CaydenFirstState(robot)); } } From 2ffd95802f9d2e08e224e3e841ede39f613336c8 Mon Sep 17 00:00:00 2001 From: scottbadger777 <37743855+scottbadger777@users.noreply.github.com> Date: Thu, 5 Aug 2021 19:41:08 -0500 Subject: [PATCH 4/4] Aubrey stuff --- .../javaClass/aubrey/AubreyFirstState.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/AubreyFirstState.java b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/AubreyFirstState.java index 194cc57..f6c870e 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/AubreyFirstState.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/AubreyFirstState.java @@ -21,9 +21,8 @@ public class AubreyFirstState extends CyberarmState { @Override public void exec() { UwU= -engine.gamepad1.left_stick_y ; - OwO= -engine.gamepad1. right_stick_y; - robot.driveBackLeft.setPower(UwU); - if(robot. limitSwitch. isPressed()) { + OwO= -engine.gamepad1.right_stick_y; + if(robot.wobbleTouchSensor.isPressed()) { double power = .5; robot.driveFrontLeft.setPower(-power); robot.driveFrontRight.setPower(power); @@ -33,8 +32,9 @@ public class AubreyFirstState extends CyberarmState { }else { robot.driveFrontLeft.setPower(UwU); - robot.driveBackRight. setPower(OwO); - robot.driveBackLeft. setPower(OwO); + robot.driveBackRight.setPower(OwO); + robot.driveBackLeft.setPower(OwO); + robot.driveBackLeft.setPower(UwU); }