From 9fb8294667c55644166a125c6fc16c04ac64903c Mon Sep 17 00:00:00 2001 From: Brian Semrau Date: Sat, 10 Feb 2018 16:03:42 -0500 Subject: [PATCH] Added subsystem instances to Robot.java --- src/org/usfirst/frc/team4737/robot/Robot.java | 17 +++++++++++------ .../usfirst/frc/team4737/robot/RobotMap.java | 8 ++++---- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/org/usfirst/frc/team4737/robot/Robot.java b/src/org/usfirst/frc/team4737/robot/Robot.java index 5690480..4b488b1 100644 --- 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 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 index a0c1a67..9a54b66 100644 --- 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;