From 39bf721f38544cf53236ae30afe6ac0d5d5a8628 Mon Sep 17 00:00:00 2001 From: Brian Semrau Date: Sat, 10 Feb 2018 16:10:25 -0500 Subject: [PATCH] Removed private instances of subsystems --- 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 | 6 +----- 4 files changed, 1 insertion(+), 22 deletions(-) diff --git a/src/org/usfirst/frc/team4737/robot/subsystems/Climber.java b/src/org/usfirst/frc/team4737/robot/subsystems/Climber.java index ad6e329..896678c 100644 --- a/src/org/usfirst/frc/team4737/robot/subsystems/Climber.java +++ b/src/org/usfirst/frc/team4737/robot/subsystems/Climber.java @@ -9,11 +9,6 @@ */ 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 c5ddcc4..3e358c1 100644 --- a/src/org/usfirst/frc/team4737/robot/subsystems/Drivetrain.java +++ b/src/org/usfirst/frc/team4737/robot/subsystems/Drivetrain.java @@ -11,12 +11,6 @@ */ 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. private WPI_TalonSRX leftFrontMaster; diff --git a/src/org/usfirst/frc/team4737/robot/subsystems/Elevator.java b/src/org/usfirst/frc/team4737/robot/subsystems/Elevator.java index 312b1d3..32d594d 100644 --- a/src/org/usfirst/frc/team4737/robot/subsystems/Elevator.java +++ b/src/org/usfirst/frc/team4737/robot/subsystems/Elevator.java @@ -12,12 +12,6 @@ */ 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 49fb554..24c0250 100644 --- a/src/org/usfirst/frc/team4737/robot/subsystems/Intake.java +++ b/src/org/usfirst/frc/team4737/robot/subsystems/Intake.java @@ -12,11 +12,6 @@ */ 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. @@ -42,4 +37,5 @@ public void initDefaultCommand() { public void setSpeed(double speed) { // TODO } + }