From 7d4b7a639fde9776549a7fdf6171ac4d5ad548b0 Mon Sep 17 00:00:00 2001 From: Carlos Date: Thu, 2 Nov 2023 07:00:33 -0700 Subject: [PATCH] Moved threaded coded into proper package --- .../org/firstinspires/ftc/teamcode/TestCode.java | 12 +++++++++++- .../ftc/teamcode}/threaded/TaskThread.java | 2 +- .../ftc/teamcode}/threaded/ThreadOpMode.java | 2 +- .../teamcode}/threaded/example/ThreadedOpMode.java | 4 +++- 4 files changed, 16 insertions(+), 4 deletions(-) rename TeamCode/{ => src/main/java/org/firstinspires/ftc/teamcode}/threaded/TaskThread.java (97%) rename TeamCode/{ => src/main/java/org/firstinspires/ftc/teamcode}/threaded/ThreadOpMode.java (97%) rename TeamCode/{ => src/main/java/org/firstinspires/ftc/teamcode}/threaded/example/ThreadedOpMode.java (88%) diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/TestCode.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/TestCode.java index 0bb623d..76d788d 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/TestCode.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/TestCode.java @@ -1,4 +1,14 @@ package org.firstinspires.ftc.teamcode; +import org.firstinspires.ftc.teamcode.threaded.*; -public class TestCode { +public class TestCode extends ThreadOpMode { + @Override + public void mainInit() { + + } + + @Override + public void mainLoop() { + + } } diff --git a/TeamCode/threaded/TaskThread.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/threaded/TaskThread.java similarity index 97% rename from TeamCode/threaded/TaskThread.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/threaded/TaskThread.java index ca573c5..e69bc00 100644 --- a/TeamCode/threaded/TaskThread.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/threaded/TaskThread.java @@ -1,4 +1,4 @@ -package org.firstinspires.ftc.teamcode.threadopmode; +package org.firstinspires.ftc.teamcode.threaded; public class TaskThread { diff --git a/TeamCode/threaded/ThreadOpMode.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/threaded/ThreadOpMode.java similarity index 97% rename from TeamCode/threaded/ThreadOpMode.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/threaded/ThreadOpMode.java index a638279..9eb3336 100644 --- a/TeamCode/threaded/ThreadOpMode.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/threaded/ThreadOpMode.java @@ -1,4 +1,4 @@ -package org.firstinspires.ftc.teamcode.threadopmode; +package org.firstinspires.ftc.teamcode.threaded; import com.qualcomm.robotcore.eventloop.opmode.OpMode; diff --git a/TeamCode/threaded/example/ThreadedOpMode.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/threaded/example/ThreadedOpMode.java similarity index 88% rename from TeamCode/threaded/example/ThreadedOpMode.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/threaded/example/ThreadedOpMode.java index a3f6b56..baf23e2 100644 --- a/TeamCode/threaded/example/ThreadedOpMode.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/threaded/example/ThreadedOpMode.java @@ -1,4 +1,6 @@ -import org.firstinspires.ftc.teamcode.threadopmode.*; +package org.firstinspires.ftc.teamcode.threaded.example; + +import org.firstinspires.ftc.teamcode.threaded.*; import com.qualcomm.robotcore.hardware.DcMotor;