From 6eb0f4e9718ccba385cd2ba9e1525173e1a22e87 Mon Sep 17 00:00:00 2001 From: Nathaniel Palme Date: Tue, 1 Dec 2020 18:51:13 -0600 Subject: [PATCH] Prepared Autonomous and TeleOp Workspaces --- .../main/java/org/timecrafters/UltimateGoal/AutoEngine.java | 4 ++++ .../UltimateGoal/HardwareTesting/MecanumFunctionTest.java | 2 +- .../src/main/java/org/timecrafters/UltimateGoal/Robot.java | 2 +- .../main/java/org/timecrafters/UltimateGoal/TeleOpEngine.java | 4 ++++ .../main/java/org/timecrafters/UltimateGoal/TeleOpState.java | 4 ++++ 5 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 TeamCode/src/main/java/org/timecrafters/UltimateGoal/AutoEngine.java create mode 100644 TeamCode/src/main/java/org/timecrafters/UltimateGoal/TeleOpEngine.java create mode 100644 TeamCode/src/main/java/org/timecrafters/UltimateGoal/TeleOpState.java diff --git a/TeamCode/src/main/java/org/timecrafters/UltimateGoal/AutoEngine.java b/TeamCode/src/main/java/org/timecrafters/UltimateGoal/AutoEngine.java new file mode 100644 index 0000000..7fa87d2 --- /dev/null +++ b/TeamCode/src/main/java/org/timecrafters/UltimateGoal/AutoEngine.java @@ -0,0 +1,4 @@ +package org.timecrafters.UltimateGoal; + +public class AutoEngine { +} diff --git a/TeamCode/src/main/java/org/timecrafters/UltimateGoal/HardwareTesting/MecanumFunctionTest.java b/TeamCode/src/main/java/org/timecrafters/UltimateGoal/HardwareTesting/MecanumFunctionTest.java index 3dc46de..d3d599c 100644 --- a/TeamCode/src/main/java/org/timecrafters/UltimateGoal/HardwareTesting/MecanumFunctionTest.java +++ b/TeamCode/src/main/java/org/timecrafters/UltimateGoal/HardwareTesting/MecanumFunctionTest.java @@ -47,7 +47,7 @@ public class MecanumFunctionTest extends CyberarmState { double[] powers = robot.getMecanumPowers(leftJoystickDegrees, leftJoystickMagnitude, leftJoystickDegrees); powerFrontLeft = powers[0]; powerFrontRight = powers[1]; - powerBackLeft = powers[2]; + powerBackLeft = powers[2]; powerBackRight = powers[3]; } else { if (leftJoystickMagnitude == 0) { diff --git a/TeamCode/src/main/java/org/timecrafters/UltimateGoal/Robot.java b/TeamCode/src/main/java/org/timecrafters/UltimateGoal/Robot.java index 3a575bf..05e27d5 100644 --- a/TeamCode/src/main/java/org/timecrafters/UltimateGoal/Robot.java +++ b/TeamCode/src/main/java/org/timecrafters/UltimateGoal/Robot.java @@ -74,12 +74,12 @@ public class Robot { public double locationY; private float rotation; + //Debugging public double visionX; public double visionY; public float rawAngle; private String TestingRecord = "X,Y,Angle"; - public double traveledLeft; public double traveledRight; diff --git a/TeamCode/src/main/java/org/timecrafters/UltimateGoal/TeleOpEngine.java b/TeamCode/src/main/java/org/timecrafters/UltimateGoal/TeleOpEngine.java new file mode 100644 index 0000000..2549857 --- /dev/null +++ b/TeamCode/src/main/java/org/timecrafters/UltimateGoal/TeleOpEngine.java @@ -0,0 +1,4 @@ +package org.timecrafters.UltimateGoal; + +public class TeleOpEngine { +} diff --git a/TeamCode/src/main/java/org/timecrafters/UltimateGoal/TeleOpState.java b/TeamCode/src/main/java/org/timecrafters/UltimateGoal/TeleOpState.java new file mode 100644 index 0000000..892949d --- /dev/null +++ b/TeamCode/src/main/java/org/timecrafters/UltimateGoal/TeleOpState.java @@ -0,0 +1,4 @@ +package org.timecrafters.UltimateGoal; + +public class TeleOpState { +}