diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/Robot.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/Robot.java index 36fea3e..623cf5a 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/Robot.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/Robot.java @@ -32,10 +32,7 @@ public class Robot extends IterativeRobot - public static final Elevator elevator = new Elevator(); - - - + public static final Arm arm = new Arm(); public static final Climber climber = new Climber(); public static final Pnumatics pnumatics = new Pnumatics(); public static final long periodMS = 10; diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Elevator.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Arm.java similarity index 99% rename from 2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Elevator.java rename to 2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Arm.java index 4a17e98..f81e98e 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Elevator.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Arm.java @@ -31,7 +31,7 @@ import com.ctre.phoenix.motorcontrol.NeutralMode; import com.ctre.phoenix.motorcontrol.SensorCollection; import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX; -public class Elevator extends Subsystem implements ControlLoopable +public class Arm extends Subsystem implements ControlLoopable { //PID encoder and motor private CANTalonEncoder elevatorRight;