format fix
authorKaitlyn <kaitlyn@10.17.72.18>
Sat, 30 Jan 2016 04:23:26 +0000 (20:23 -0800)
committerKaitlyn <kaitlyn@10.17.72.18>
Sat, 30 Jan 2016 04:23:26 +0000 (20:23 -0800)
src/org/usfirst/frc/team3501/robot/subsystems/Scaler.java

index 4442d6abea5d56aaff11d8b8602ea5e4ffaa2c2f..f16f424bf6e05ad5927476ab311bbf28944078e1 100755 (executable)
@@ -11,7 +11,6 @@ public class Scaler extends Subsystem {
        private DoubleSolenoid piston;
        private CANTalon winch;
        
-       
        public Scaler() {
                piston = new DoubleSolenoid(Constants.Scaler.FORWARD_CHANNEL, Constants.Scaler.REVERSE_CHANNEL);
                winch = new CANTalon(Constants.Scaler.WINCH_MOTOR);
@@ -21,20 +20,20 @@ public class Scaler extends Subsystem {
        protected void initDefaultCommand() {
 
        }
+       
        public Value getSolenoidValue(){
                return piston.get();
        }
        
-       public void lift(){
+       public void liftScissorLift(){
                piston.set(DoubleSolenoid.Value.kReverse);
        }
        
-       public void lower(){
+       public void lowerScissorLift(){
                piston.set(DoubleSolenoid.Value.kForward);
        }
        
        public void disengageHook(){
-               
        }
        
        public void runWinch(double speed){
@@ -45,5 +44,4 @@ public class Scaler extends Subsystem {
                
                winch.set(speed);
        }
-       
 }