From 918c5238b1fe2f6769b1e8cfddebbb619b299e0e Mon Sep 17 00:00:00 2001 From: Jason Israilov Date: Sat, 10 Feb 2018 15:44:00 -0500 Subject: [PATCH] Added subsystem instances --- src/org/usfirst/frc/team4737/robot/RobotMap.java | 3 --- src/org/usfirst/frc/team4737/robot/subsystems/Climber.java | 5 +++++ .../usfirst/frc/team4737/robot/subsystems/Drivetrain.java | 6 ++++++ src/org/usfirst/frc/team4737/robot/subsystems/Elevator.java | 6 ++++++ src/org/usfirst/frc/team4737/robot/subsystems/Intake.java | 5 +++++ 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/org/usfirst/frc/team4737/robot/RobotMap.java b/src/org/usfirst/frc/team4737/robot/RobotMap.java index d3b6232..a0c1a67 100644 --- a/src/org/usfirst/frc/team4737/robot/RobotMap.java +++ b/src/org/usfirst/frc/team4737/robot/RobotMap.java @@ -16,19 +16,16 @@ 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; // Intake - public static final int INTAKE_LEFT = 15; public static final int INTAKE_RIGHT = 16; // Elevator - public static final int ELEVATOR_MOTOR_A = 17; public static final int ELEVATOR_MOTOR_B = 18; diff --git a/src/org/usfirst/frc/team4737/robot/subsystems/Climber.java b/src/org/usfirst/frc/team4737/robot/subsystems/Climber.java index 896678c..99c4207 100644 --- a/src/org/usfirst/frc/team4737/robot/subsystems/Climber.java +++ b/src/org/usfirst/frc/team4737/robot/subsystems/Climber.java @@ -9,6 +9,11 @@ */ public class Climber extends Subsystem { + private static Climber instance = new Climber (); + + public static Climber getInstance() { + return instance; + } // Put methods for controlling this subsystem // here. Call these from Commands. diff --git a/src/org/usfirst/frc/team4737/robot/subsystems/Drivetrain.java b/src/org/usfirst/frc/team4737/robot/subsystems/Drivetrain.java index 3e358c1..b04aa8a 100644 --- a/src/org/usfirst/frc/team4737/robot/subsystems/Drivetrain.java +++ b/src/org/usfirst/frc/team4737/robot/subsystems/Drivetrain.java @@ -10,6 +10,12 @@ * */ public class Drivetrain extends Subsystem { + + private static Drivetrain instance = new Drivetrain(); + + public static Drivetrain getInstance() { + return instance; + } // Put methods for controlling this subsystem // here. Call these from Commands. diff --git a/src/org/usfirst/frc/team4737/robot/subsystems/Elevator.java b/src/org/usfirst/frc/team4737/robot/subsystems/Elevator.java index 6d2a7a4..cf1e9f5 100644 --- a/src/org/usfirst/frc/team4737/robot/subsystems/Elevator.java +++ b/src/org/usfirst/frc/team4737/robot/subsystems/Elevator.java @@ -10,6 +10,12 @@ * */ public class Elevator extends Subsystem { + + private static Elevator instance = new Elevator(); + + public static Elevator getInstance() { + return instance; + } // Put methods for controlling this subsystem // here. Call these from Commands. diff --git a/src/org/usfirst/frc/team4737/robot/subsystems/Intake.java b/src/org/usfirst/frc/team4737/robot/subsystems/Intake.java index d23ab9a..4054077 100644 --- a/src/org/usfirst/frc/team4737/robot/subsystems/Intake.java +++ b/src/org/usfirst/frc/team4737/robot/subsystems/Intake.java @@ -11,6 +11,11 @@ */ public class Intake extends Subsystem { + private static Intake instance = new Intake(); + + public static Intake getInstance() { + return instance; + } // Put methods for controlling this subsystem // here. Call these from Commands.