From 4d6360c6c01e78e81024f3d3707f526a2c98fab1 Mon Sep 17 00:00:00 2001 From: Nathaniel Palme Date: Tue, 17 Aug 2021 15:20:49 -0500 Subject: [PATCH] Reorganized some things to clean up --- .../samples/ConceptTensorFlowObjectDetectionWebcam.java | 2 +- .../samples/ConceptVuMarkIdentificationWebcam.java | 2 +- .../ConceptVuforiaUltimateGoalNavigationWebcam.java | 2 +- .../javaClass/{samples => aubrey}/AubreyFirstEngine.java | 4 ++-- .../javaClass/{samples => cayden}/CaydenFirstEngine.java | 2 +- .../javaClass/samples/{samples => }/blankTHing.java | 2 +- .../javaClass/{samples => spencer}/SpencerFirstEngine.java | 7 ++----- .../javaClass/{samples => spencer}/Spencer_buttons.java | 4 +++- .../{samples => spencer}/spencer_robotrun_engine.java | 3 ++- 9 files changed, 14 insertions(+), 14 deletions(-) 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%) rename TeamCode/src/main/java/org/timecrafters/javaClass/{samples => aubrey}/AubreyFirstEngine.java (85%) rename TeamCode/src/main/java/org/timecrafters/javaClass/{samples => cayden}/CaydenFirstEngine.java (94%) rename TeamCode/src/main/java/org/timecrafters/javaClass/samples/{samples => }/blankTHing.java (93%) rename TeamCode/src/main/java/org/timecrafters/javaClass/{samples => spencer}/SpencerFirstEngine.java (71%) rename TeamCode/src/main/java/org/timecrafters/javaClass/{samples => spencer}/Spencer_buttons.java (92%) rename TeamCode/src/main/java/org/timecrafters/javaClass/{samples => spencer}/spencer_robotrun_engine.java (89%) diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/ConceptTensorFlowObjectDetectionWebcam.java b/TeamCode/src/main/java/org/samples/ConceptTensorFlowObjectDetectionWebcam.java similarity index 99% rename from TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/ConceptTensorFlowObjectDetectionWebcam.java rename to TeamCode/src/main/java/org/samples/ConceptTensorFlowObjectDetectionWebcam.java index 1a1857f..3226b79 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/ConceptTensorFlowObjectDetectionWebcam.java +++ b/TeamCode/src/main/java/org/samples/ConceptTensorFlowObjectDetectionWebcam.java @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.timecrafters.javaClass.samples.samples; +package org.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/samples/samples/ConceptVuMarkIdentificationWebcam.java b/TeamCode/src/main/java/org/samples/ConceptVuMarkIdentificationWebcam.java similarity index 99% rename from TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/ConceptVuMarkIdentificationWebcam.java rename to TeamCode/src/main/java/org/samples/ConceptVuMarkIdentificationWebcam.java index 73ddc93..c7b7c89 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/ConceptVuMarkIdentificationWebcam.java +++ b/TeamCode/src/main/java/org/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.timecrafters.javaClass.samples.samples; +package org.samples; import com.qualcomm.robotcore.eventloop.opmode.TeleOp; import com.qualcomm.robotcore.eventloop.opmode.Disabled; diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/ConceptVuforiaUltimateGoalNavigationWebcam.java b/TeamCode/src/main/java/org/samples/ConceptVuforiaUltimateGoalNavigationWebcam.java similarity index 99% rename from TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/ConceptVuforiaUltimateGoalNavigationWebcam.java rename to TeamCode/src/main/java/org/samples/ConceptVuforiaUltimateGoalNavigationWebcam.java index c84e1d5..530a3b8 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/ConceptVuforiaUltimateGoalNavigationWebcam.java +++ b/TeamCode/src/main/java/org/samples/ConceptVuforiaUltimateGoalNavigationWebcam.java @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.timecrafters.javaClass.samples.samples; +package org.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/samples/AubreyFirstEngine.java b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/AubreyFirstEngine.java similarity index 85% rename from TeamCode/src/main/java/org/timecrafters/javaClass/samples/AubreyFirstEngine.java rename to TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/AubreyFirstEngine.java index 837582d..c1b3424 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/AubreyFirstEngine.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/aubrey/AubreyFirstEngine.java @@ -1,4 +1,4 @@ -package org.timecrafters.javaClass.samples; +package org.timecrafters.javaClass.aubrey; import com.qualcomm.robotcore.eventloop.opmode.Autonomous; @@ -6,8 +6,8 @@ import org.cyberarm.engine.V2.CyberarmEngine; import org.timecrafters.UltimateGoal.Competition.Robot; import org.timecrafters.javaClass.aubrey.AubreyFirstState; import org.timecrafters.javaClass.aubrey.dance; +import org.timecrafters.javaClass.samples.SampleRobot; -@Autonomous(name = "Aubrey: First Program", group = "aubrey") public class AubreyFirstEngine extends CyberarmEngine { SampleRobot robot; diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/CaydenFirstEngine.java b/TeamCode/src/main/java/org/timecrafters/javaClass/cayden/CaydenFirstEngine.java similarity index 94% rename from TeamCode/src/main/java/org/timecrafters/javaClass/samples/CaydenFirstEngine.java rename to TeamCode/src/main/java/org/timecrafters/javaClass/cayden/CaydenFirstEngine.java index 0146442..45a680d 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/CaydenFirstEngine.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/cayden/CaydenFirstEngine.java @@ -1,4 +1,4 @@ -package org.timecrafters.javaClass.samples; +package org.timecrafters.javaClass.cayden; import com.qualcomm.robotcore.eventloop.opmode.Autonomous; diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/blankTHing.java b/TeamCode/src/main/java/org/timecrafters/javaClass/samples/blankTHing.java similarity index 93% rename from TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/blankTHing.java rename to TeamCode/src/main/java/org/timecrafters/javaClass/samples/blankTHing.java index f73b4ea..82dae1c 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/samples/blankTHing.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/samples/blankTHing.java @@ -1,4 +1,4 @@ -package org.timecrafters.javaClass.samples.samples; +package org.timecrafters.javaClass.samples; import com.qualcomm.robotcore.hardware.DcMotor; diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/SpencerFirstEngine.java b/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerFirstEngine.java similarity index 71% rename from TeamCode/src/main/java/org/timecrafters/javaClass/samples/SpencerFirstEngine.java rename to TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerFirstEngine.java index 2114dc5..fa421bc 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/SpencerFirstEngine.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/SpencerFirstEngine.java @@ -1,13 +1,10 @@ -package org.timecrafters.javaClass.samples; +package org.timecrafters.javaClass.spencer; import com.qualcomm.hardware.rev.RevBlinkinLedDriver; -import com.qualcomm.robotcore.eventloop.opmode.Autonomous; import com.qualcomm.robotcore.eventloop.opmode.TeleOp; import org.cyberarm.engine.V2.CyberarmEngine; -import org.timecrafters.UltimateGoal.Competition.Robot; -import org.timecrafters.javaClass.aubrey.AubreyFirstState; -import org.timecrafters.javaClass.spencer.SpencerFirstState; +import org.timecrafters.javaClass.samples.SampleRobot; @TeleOp(name = "Spencer: Buttons", group = "spencer") public class SpencerFirstEngine extends CyberarmEngine { diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/Spencer_buttons.java b/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/Spencer_buttons.java similarity index 92% rename from TeamCode/src/main/java/org/timecrafters/javaClass/samples/Spencer_buttons.java rename to TeamCode/src/main/java/org/timecrafters/javaClass/spencer/Spencer_buttons.java index 00c2775..433121d 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/Spencer_buttons.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/Spencer_buttons.java @@ -1,7 +1,8 @@ -package org.timecrafters.javaClass.samples; +package org.timecrafters.javaClass.spencer; import com.qualcomm.hardware.rev.RevBlinkinLedDriver; import org.cyberarm.engine.V2.CyberarmState; +import org.timecrafters.javaClass.samples.SampleRobot; public class Spencer_buttons extends CyberarmState { public Spencer_buttons(SampleRobot robot, boolean yBeingPressed) { @@ -13,6 +14,7 @@ public class Spencer_buttons extends CyberarmState { int Lights = 0; @Override public void exec() { + if (engine.gamepad1.y && !yBeingPressed){ yBeingPressed = true; Lights ++; diff --git a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/spencer_robotrun_engine.java b/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/spencer_robotrun_engine.java similarity index 89% rename from TeamCode/src/main/java/org/timecrafters/javaClass/samples/spencer_robotrun_engine.java rename to TeamCode/src/main/java/org/timecrafters/javaClass/spencer/spencer_robotrun_engine.java index 9881e5b..40ae236 100644 --- a/TeamCode/src/main/java/org/timecrafters/javaClass/samples/spencer_robotrun_engine.java +++ b/TeamCode/src/main/java/org/timecrafters/javaClass/spencer/spencer_robotrun_engine.java @@ -1,4 +1,4 @@ -package org.timecrafters.javaClass.samples; +package org.timecrafters.javaClass.spencer; import com.qualcomm.hardware.rev.RevBlinkinLedDriver; import com.qualcomm.robotcore.eventloop.opmode.Autonomous; @@ -7,6 +7,7 @@ import com.qualcomm.robotcore.eventloop.opmode.TeleOp; import org.cyberarm.engine.V2.CyberarmEngine; import org.timecrafters.UltimateGoal.Competition.Robot; import org.timecrafters.javaClass.aubrey.AubreyFirstState; +import org.timecrafters.javaClass.samples.SampleRobot; import org.timecrafters.javaClass.spencer.SpencerFirstState; @TeleOp(name = "Spencer: runrobot", group = "spencer")