Added subsystem instances to Robot.java

WBHSRobotics4737 · Feb 10, 2018 · 9fb8294 · 9fb8294
1 parent e9006e1
commit 9fb8294
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/src/org/usfirst/frc/team4737/robot/Robot.java b/src/org/usfirst/frc/team4737/robot/Robot.java
@@ -7,6 +7,11 @@
 
 package org.usfirst.frc.team4737.robot;
 
+import org.usfirst.frc.team4737.robot.subsystems.Climber;
+import org.usfirst.frc.team4737.robot.subsystems.Drivetrain;
+import org.usfirst.frc.team4737.robot.subsystems.Elevator;
+import org.usfirst.frc.team4737.robot.subsystems.Intake;
+
 import edu.wpi.first.wpilibj.TimedRobot;
 import edu.wpi.first.wpilibj.command.Command;
 import edu.wpi.first.wpilibj.command.Scheduler;
@@ -21,11 +26,12 @@
  * project.
  */
 public class Robot extends TimedRobot {
-	/*
-	 * public static final ExampleSubsystem kExampleSubsystem = new
-	 * ExampleSubsystem();
-	 */
-	public static OI m_oi;
+
+	public static final OI OI = new OI();
+	public static final Drivetrain DRIVETRAIN = new Drivetrain();
+	public static final Elevator ELEVATOR = new Elevator();
+	public static final Intake INTAKE = new Intake();
+	public static final Climber CLIMBER = new Climber();
 
 	Command m_autonomousCommand;
 	SendableChooser<Command> m_chooser = new SendableChooser<>();
@@ -36,7 +42,6 @@ public class Robot extends TimedRobot {
 	 */
 	@Override
 	public void robotInit() {
-		m_oi = new OI();
 		// m_chooser.addDefault("Default Auto", new ExampleCommand());
 		// chooser.addObject("My Auto", new MyAutoCommand());
 		SmartDashboard.putData("Auto mode", m_chooser);

diff --git a/src/org/usfirst/frc/team4737/robot/RobotMap.java b/src/org/usfirst/frc/team4737/robot/RobotMap.java
@@ -16,10 +16,10 @@
 public class RobotMap {
 
 	// Drivetrain
-	public static int DRIVE_LEFT_MASTER = 11;
-	public static int DRIVE_LEFT_SLAVE = 12;
-	public static int DRIVE_RIGHT_MASTER = 13;
-	public static int DRIVE_RIGHT_SLAVE = 14;
+	public static final int DRIVE_LEFT_MASTER = 11;
+	public static final int DRIVE_LEFT_SLAVE = 12;
+	public static final int DRIVE_RIGHT_MASTER = 13;
+	public static final int DRIVE_RIGHT_SLAVE = 14;
 
 	// Intake
 	public static final int INTAKE_LEFT = 15;