mirror of
https://github.com/TimeCrafters/UltimateGoal.git
synced 2025-12-16 06:02:33 +00:00
Reorganized some things to clean up
This commit is contained in:
@@ -27,7 +27,7 @@
|
|||||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* 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.Disabled;
|
||||||
import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
|
import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
|
||||||
@@ -26,7 +26,7 @@
|
|||||||
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
* 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.
|
* 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.TeleOp;
|
||||||
import com.qualcomm.robotcore.eventloop.opmode.Disabled;
|
import com.qualcomm.robotcore.eventloop.opmode.Disabled;
|
||||||
@@ -27,7 +27,7 @@
|
|||||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* 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.Disabled;
|
||||||
import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
|
import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package org.timecrafters.javaClass.samples;
|
package org.timecrafters.javaClass.aubrey;
|
||||||
|
|
||||||
import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
|
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.UltimateGoal.Competition.Robot;
|
||||||
import org.timecrafters.javaClass.aubrey.AubreyFirstState;
|
import org.timecrafters.javaClass.aubrey.AubreyFirstState;
|
||||||
import org.timecrafters.javaClass.aubrey.dance;
|
import org.timecrafters.javaClass.aubrey.dance;
|
||||||
|
import org.timecrafters.javaClass.samples.SampleRobot;
|
||||||
|
|
||||||
@Autonomous(name = "Aubrey: First Program", group = "aubrey")
|
|
||||||
public class AubreyFirstEngine extends CyberarmEngine {
|
public class AubreyFirstEngine extends CyberarmEngine {
|
||||||
|
|
||||||
SampleRobot robot;
|
SampleRobot robot;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package org.timecrafters.javaClass.samples;
|
package org.timecrafters.javaClass.cayden;
|
||||||
|
|
||||||
import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
|
import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package org.timecrafters.javaClass.samples.samples;
|
package org.timecrafters.javaClass.samples;
|
||||||
|
|
||||||
import com.qualcomm.robotcore.hardware.DcMotor;
|
import com.qualcomm.robotcore.hardware.DcMotor;
|
||||||
|
|
||||||
@@ -1,13 +1,10 @@
|
|||||||
package org.timecrafters.javaClass.samples;
|
package org.timecrafters.javaClass.spencer;
|
||||||
|
|
||||||
import com.qualcomm.hardware.rev.RevBlinkinLedDriver;
|
import com.qualcomm.hardware.rev.RevBlinkinLedDriver;
|
||||||
import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
|
|
||||||
import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
|
import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
|
||||||
|
|
||||||
import org.cyberarm.engine.V2.CyberarmEngine;
|
import org.cyberarm.engine.V2.CyberarmEngine;
|
||||||
import org.timecrafters.UltimateGoal.Competition.Robot;
|
import org.timecrafters.javaClass.samples.SampleRobot;
|
||||||
import org.timecrafters.javaClass.aubrey.AubreyFirstState;
|
|
||||||
import org.timecrafters.javaClass.spencer.SpencerFirstState;
|
|
||||||
|
|
||||||
@TeleOp(name = "Spencer: Buttons", group = "spencer")
|
@TeleOp(name = "Spencer: Buttons", group = "spencer")
|
||||||
public class SpencerFirstEngine extends CyberarmEngine {
|
public class SpencerFirstEngine extends CyberarmEngine {
|
||||||
@@ -1,7 +1,8 @@
|
|||||||
package org.timecrafters.javaClass.samples;
|
package org.timecrafters.javaClass.spencer;
|
||||||
import com.qualcomm.hardware.rev.RevBlinkinLedDriver;
|
import com.qualcomm.hardware.rev.RevBlinkinLedDriver;
|
||||||
|
|
||||||
import org.cyberarm.engine.V2.CyberarmState;
|
import org.cyberarm.engine.V2.CyberarmState;
|
||||||
|
import org.timecrafters.javaClass.samples.SampleRobot;
|
||||||
|
|
||||||
public class Spencer_buttons extends CyberarmState {
|
public class Spencer_buttons extends CyberarmState {
|
||||||
public Spencer_buttons(SampleRobot robot, boolean yBeingPressed) {
|
public Spencer_buttons(SampleRobot robot, boolean yBeingPressed) {
|
||||||
@@ -13,6 +14,7 @@ public class Spencer_buttons extends CyberarmState {
|
|||||||
int Lights = 0;
|
int Lights = 0;
|
||||||
@Override
|
@Override
|
||||||
public void exec() {
|
public void exec() {
|
||||||
|
|
||||||
if (engine.gamepad1.y && !yBeingPressed){
|
if (engine.gamepad1.y && !yBeingPressed){
|
||||||
yBeingPressed = true;
|
yBeingPressed = true;
|
||||||
Lights ++;
|
Lights ++;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package org.timecrafters.javaClass.samples;
|
package org.timecrafters.javaClass.spencer;
|
||||||
|
|
||||||
import com.qualcomm.hardware.rev.RevBlinkinLedDriver;
|
import com.qualcomm.hardware.rev.RevBlinkinLedDriver;
|
||||||
import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
|
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.cyberarm.engine.V2.CyberarmEngine;
|
||||||
import org.timecrafters.UltimateGoal.Competition.Robot;
|
import org.timecrafters.UltimateGoal.Competition.Robot;
|
||||||
import org.timecrafters.javaClass.aubrey.AubreyFirstState;
|
import org.timecrafters.javaClass.aubrey.AubreyFirstState;
|
||||||
|
import org.timecrafters.javaClass.samples.SampleRobot;
|
||||||
import org.timecrafters.javaClass.spencer.SpencerFirstState;
|
import org.timecrafters.javaClass.spencer.SpencerFirstState;
|
||||||
|
|
||||||
@TeleOp(name = "Spencer: runrobot", group = "spencer")
|
@TeleOp(name = "Spencer: runrobot", group = "spencer")
|
||||||
Reference in New Issue
Block a user