From a8ccb64504567f06f5d445145888d43f4783a0e5 Mon Sep 17 00:00:00 2001 From: scottbadger777 <37743855+scottbadger777@users.noreply.github.com> Date: Thu, 5 Aug 2021 19:55:09 -0500 Subject: [PATCH 1/2] Aubrey stuff --- .../org/timecrafters/javaClass/aubrey/AubreyFirstState.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f6c870e..7b8658b 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/AubreyFirstState.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/AubreyFirstState.java @@ -33,7 +33,7 @@ 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(UwU); } From c5d44672a17f154e4b6998a0cda5ce69ff6a16ae Mon Sep 17 00:00:00 2001 From: Nathaniel Palme Date: Thu, 5 Aug 2021 20:00:31 -0500 Subject: [PATCH 2/2] moved cayden's stuff into his own package --- .idea/compiler.xml | 2 +- .../javaClass/aubrey/AubreyFirstState.java | 2 +- .../{aubrey => cayden}/CaydenFirstState.java | 2 +- .../javaClass/samples/CaydenFirstEngine.java | 3 +-- .../javaClass/samples/samples/BlankStuff.java | 27 +++++++++++++++++++ ...onceptTensorFlowObjectDetectionWebcam.java | 2 +- .../ConceptVuMarkIdentificationWebcam.java | 2 +- ...ptVuforiaUltimateGoalNavigationWebcam.java | 2 +- .../javaClass/spencer/SpencerDriveFoward.java | 1 - 9 files changed, 34 insertions(+), 9 deletions(-) rename TeamCode/src/main/java/org/timecrafters/javaClass/{aubrey => cayden}/CaydenFirstState.java (97%) create mode 100644 TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/BlankStuff.java rename TeamCode/src/main/java/org/{ => timecrafters/javaClass/samples}/samples/ConceptTensorFlowObjectDetectionWebcam.java (99%) rename TeamCode/src/main/java/org/{ => timecrafters/javaClass/samples}/samples/ConceptVuMarkIdentificationWebcam.java (99%) rename TeamCode/src/main/java/org/{ => timecrafters/javaClass/samples}/samples/ConceptVuforiaUltimateGoalNavigationWebcam.java (99%) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index fb7f4a8..61a9130 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file 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 7b8658b..c21d311 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/AubreyFirstState.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/AubreyFirstState.java @@ -32,7 +32,7 @@ public class AubreyFirstState extends CyberarmState { }else { robot.driveFrontLeft.setPower(UwU); - robot.driveBackRight.setPower(OwO); + robot.driveFrontRight.setPower(OwO); robot.driveBackRight.setPower(OwO); robot.driveBackLeft.setPower(UwU); } diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/CaydenFirstState.java b/TeamCode/src/main/java/org/timecrafters/javaClass/cayden/CaydenFirstState.java similarity index 97% rename from TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/CaydenFirstState.java rename to TeamCode/src/main/java/org/timecrafters/javaClass/cayden/CaydenFirstState.java index a979e39..82f7119 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/CaydenFirstState.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/cayden/CaydenFirstState.java @@ -1,4 +1,4 @@ -package org.timecrafters.javaClass.aubrey; +package org.timecrafters.javaClass.cayden; import org.cyberarm.engine.V2.CyberarmState; import org.timecrafters.javaClass.samples.SampleRobot; diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/CaydenFirstEngine.java b/TeamCode/src/main/java/org/timecrafters/javaClass/samples/CaydenFirstEngine.java index 02af382..468094e 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/CaydenFirstEngine.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/samples/CaydenFirstEngine.java @@ -4,8 +4,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.CaydenFirstState; -import org.timecrafters.javaClass.spencer.SpencerFirstState; +import org.timecrafters.javaClass.cayden.CaydenFirstState; @Autonomous (name = "Cayden: First Program", group = "caden") public class CaydenFirstEngine extends CyberarmEngine { diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/BlankStuff.java b/TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/BlankStuff.java new file mode 100644 index 0000000..5c215eb --- /dev/null +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/BlankStuff.java @@ -0,0 +1,27 @@ +package org.timecrafters.javaClass.samples.samples; + +import org.cyberarm.engine.V2.CyberarmState; +import org.timecrafters.javaClass.samples.SampleRobot; + +public class BlankStuff 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 BlankStuff(SampleRobot robot) { + this.robot = robot; + } + + //This is a method. methods are bits of code that can be run elsewhere. + //This one is set up to repeat every few milliseconds + @Override + public void exec() { + + double targetDistance = robot.inchesToTicks(12); + if (robot.encoderLeft.getCurrentPosition() <= targetDistance) { + robot.driveBackRight.setPower(1); + } + + } +} diff --git a/TeamCode/src/main/java/org/samples/ConceptTensorFlowObjectDetectionWebcam.java b/TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/ConceptTensorFlowObjectDetectionWebcam.java similarity index 99% rename from TeamCode/src/main/java/org/samples/ConceptTensorFlowObjectDetectionWebcam.java rename to TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/ConceptTensorFlowObjectDetectionWebcam.java index 3226b79..1a1857f 100644 --- a/TeamCode/src/main/java/org/samples/ConceptTensorFlowObjectDetectionWebcam.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/ConceptTensorFlowObjectDetectionWebcam.java @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.samples; +package org.timecrafters.javaClass.samples.samples; import com.qualcomm.robotcore.eventloop.opmode.Disabled; import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode; diff --git a/TeamCode/src/main/java/org/samples/ConceptVuMarkIdentificationWebcam.java b/TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/ConceptVuMarkIdentificationWebcam.java similarity index 99% rename from TeamCode/src/main/java/org/samples/ConceptVuMarkIdentificationWebcam.java rename to TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/ConceptVuMarkIdentificationWebcam.java index c7b7c89..73ddc93 100644 --- a/TeamCode/src/main/java/org/samples/ConceptVuMarkIdentificationWebcam.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/ConceptVuMarkIdentificationWebcam.java @@ -26,7 +26,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.samples; +package org.timecrafters.javaClass.samples.samples; import com.qualcomm.robotcore.eventloop.opmode.TeleOp; import com.qualcomm.robotcore.eventloop.opmode.Disabled; diff --git a/TeamCode/src/main/java/org/samples/ConceptVuforiaUltimateGoalNavigationWebcam.java b/TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/ConceptVuforiaUltimateGoalNavigationWebcam.java similarity index 99% rename from TeamCode/src/main/java/org/samples/ConceptVuforiaUltimateGoalNavigationWebcam.java rename to TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/ConceptVuforiaUltimateGoalNavigationWebcam.java index 530a3b8..c84e1d5 100644 --- a/TeamCode/src/main/java/org/samples/ConceptVuforiaUltimateGoalNavigationWebcam.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/ConceptVuforiaUltimateGoalNavigationWebcam.java @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.samples; +package org.timecrafters.javaClass.samples.samples; import com.qualcomm.robotcore.eventloop.opmode.Disabled; import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode; diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerDriveFoward.java b/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerDriveFoward.java index 973af18..20c1cba 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerDriveFoward.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerDriveFoward.java @@ -14,7 +14,6 @@ public class SpencerDriveFoward extends CyberarmState { @Override public void exec() { - if () }