From 7e1c38b7abc6f7f93b4fb23151b5e20d250deec8 Mon Sep 17 00:00:00 2001 From: Ton-of-Ash Date: Sun, 16 Feb 2020 16:48:02 -0700 Subject: [PATCH] started the auto selection --- .../frc/robot/Autonomous/AutoMissions.java | 22 ++++++++++++++++--- FRC2020/src/main/java/frc/robot/Robot.java | 16 ++++++++++++++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/FRC2020/src/main/java/frc/robot/Autonomous/AutoMissions.java b/FRC2020/src/main/java/frc/robot/Autonomous/AutoMissions.java index 4a115f7..fad0e6b 100644 --- a/FRC2020/src/main/java/frc/robot/Autonomous/AutoMissions.java +++ b/FRC2020/src/main/java/frc/robot/Autonomous/AutoMissions.java @@ -1,14 +1,30 @@ package frc.robot.Autonomous; -public class AutoMissions{ +import frc.robot.Map; - public static void TrenchAuto(){ +public class AutoMissions { + + public static String CurrentAuto = "None Selected"; + public static double SelectedAuto = 0; + //SmartDashboard.putString("Auto Mode", AutoMissions.CurrentAuto); + + public static void NoAutoSelected(){ + CurrentAuto = "None Selected"; + Map.driveTrain.lf.set(0); + Map.driveTrain.lr.set(0); + Map.driveTrain.rf.set(0); + Map.driveTrain.rr.set(0); + } + + public static void TrenchRun(){ + CurrentAuto = "TrenchRun"; } public static void GeneratorAuto(){ + CurrentAuto = "GeneratorAuto"; + - } } \ No newline at end of file diff --git a/FRC2020/src/main/java/frc/robot/Robot.java b/FRC2020/src/main/java/frc/robot/Robot.java index c627cb1..236c11d 100644 --- a/FRC2020/src/main/java/frc/robot/Robot.java +++ b/FRC2020/src/main/java/frc/robot/Robot.java @@ -2,6 +2,7 @@ import edu.wpi.first.wpilibj.TimedRobot; import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; +import frc.robot.Autonomous.AutoMissions; import frc.robot.Cartridge.pixyControl; import frc.robot.Color_Wheel.ColorSensor; import frc.robot.Turret.TurretControl; @@ -18,11 +19,26 @@ public void robotInit() { } public void robotPeriodic(){ + SmartDashboard.putString("Auto Mode", AutoMissions.CurrentAuto); + SmartDashboard.getNumber("Auto Selection", AutoMissions.SelectedAuto); + + + } @Override public void autonomousInit() { + if(AutoMissions.SelectedAuto == 0){ + AutoMissions.NoAutoSelected(); + } + if(AutoMissions.SelectedAuto == 1){ + AutoMissions.TrenchRun(); + } + + if(AutoMissions.SelectedAuto == 2){ + AutoMissions.GeneratorAuto(); + } } @Override